VirtualBox

Changeset 76177 in vbox


Ignore:
Timestamp:
Dec 12, 2018 1:38:57 PM (6 years ago)
Author:
vboxsync
Message:

FE/Qt: bugref:6699. Rename 'guest control file manager' to 'file manager'. that was a mouthful

Location:
trunk/src/VBox/Frontends/VirtualBox
Files:
12 edited
22 moved

Legend:

Unmodified
Added
Removed

  • trunk/src/VBox/Frontends/VirtualBox/Makefile.kmk

    r76021 r76177  
    851851        src/runtime/information/UIVMInformationDialog.h \
    852852        src/guestctrl/UIGuestControlConsole.h \
    853         src/guestctrl/UIGuestControlFileManager.h \
    854         src/guestctrl/UIGuestControlFileManagerDialog.h \
    855         src/guestctrl/UIGuestControlFileManagerLogPanel.h \
    856         src/guestctrl/UIGuestControlFileManagerOperationsPanel.h \
    857         src/guestctrl/UIGuestControlFileManagerOptionsPanel.h \
    858         src/guestctrl/UIGuestControlFileManagerPanel.h \
    859         src/guestctrl/UIGuestControlFileManagerSessionPanel.h \
    860         src/guestctrl/UIGuestControlFileModel.h \
    861         src/guestctrl/UIGuestControlFileTable.h \
     853        src/guestctrl/UIFileManager.h \
     854        src/guestctrl/UIFileManagerDialog.h \
     855        src/guestctrl/UIFileManagerLogPanel.h \
     856        src/guestctrl/UIFileManagerOperationsPanel.h \
     857        src/guestctrl/UIFileManagerOptionsPanel.h \
     858        src/guestctrl/UIFileManagerPanel.h \
     859        src/guestctrl/UIFileManagerSessionPanel.h \
     860        src/guestctrl/UIFileManagerModel.h \
     861        src/guestctrl/UIFileManagerTable.h \
    862862        src/guestctrl/UIGuestControlInterface.h \
    863863        src/guestctrl/UIGuestControlTreeItem.h \
    864         src/guestctrl/UIGuestFileTable.h \
     864        src/guestctrl/UIFileManagerGuestTable.h \
    865865        src/guestctrl/UIGuestProcessControlDialog.h \
    866866        src/guestctrl/UIGuestProcessControlWidget.h \
    867         src/guestctrl/UIHostFileTable.h \
     867        src/guestctrl/UIFileManagerHostTable.h \
    868868        src/runtime/normal/UIKeyboardHandlerNormal.h \
    869869        src/runtime/normal/UIMachineLogicNormal.h \
    … …  
    10071007        src/runtime/information/UIVMInformationDialog.h \
    10081008        src/guestctrl/UIGuestControlConsole.h \
    1009         src/guestctrl/UIGuestControlFileManager.h \
    1010         src/guestctrl/UIGuestControlFileManagerDialog.h \
    1011         src/guestctrl/UIGuestControlFileManagerLogPanel.h \
    1012         src/guestctrl/UIGuestControlFileManagerOperationsPanel.h \
    1013         src/guestctrl/UIGuestControlFileManagerOptionsPanel.h \
    1014         src/guestctrl/UIGuestControlFileManagerPanel.h \
    1015         src/guestctrl/UIGuestControlFileManagerSessionPanel.h \
    1016         src/guestctrl/UIGuestControlFileModel.h \
    1017         src/guestctrl/UIGuestControlFileTable.h \
     1009        src/guestctrl/UIFileManager.h \
     1010        src/guestctrl/UIFileManagerDialog.h \
     1011        src/guestctrl/UIFileManagerLogPanel.h \
     1012        src/guestctrl/UIFileManagerOperationsPanel.h \
     1013        src/guestctrl/UIFileManagerOptionsPanel.h \
     1014        src/guestctrl/UIFileManagerPanel.h \
     1015        src/guestctrl/UIFileManagerSessionPanel.h \
     1016        src/guestctrl/UIFileManagerModel.h \
     1017        src/guestctrl/UIFileManagerTable.h \
    10181018        src/guestctrl/UIGuestControlInterface.h \
    10191019        src/guestctrl/UIGuestControlTreeItem.h \
    1020         src/guestctrl/UIGuestFileTable.h \
     1020        src/guestctrl/UIFileManagerGuestTable.h \
    10211021        src/guestctrl/UIGuestProcessControlDialog.h \
    10221022        src/guestctrl/UIGuestProcessControlWidget.h \
    1023         src/guestctrl/UIHostFileTable.h \
     1023        src/guestctrl/UIFileManagerHostTable.h \
    10241024        src/runtime/normal/UIKeyboardHandlerNormal.h \
    10251025        src/runtime/normal/UIMachineLogicNormal.h \
    … …  
    12381238        src/runtime/UIFrameBuffer.cpp \
    12391239        src/runtime/UIIndicatorsPool.cpp \
    1240         src/guestctrl/UIGuestControlFileManager.cpp \
    1241         src/guestctrl/UIGuestControlFileManagerLogPanel.cpp \
    1242         src/guestctrl/UIGuestControlFileManagerOperationsPanel.cpp \
    1243         src/guestctrl/UIGuestControlFileTable.cpp \
    1244         src/guestctrl/UIGuestFileTable.cpp \
     1240        src/guestctrl/UIFileManager.cpp \
     1241        src/guestctrl/UIFileManagerLogPanel.cpp \
     1242        src/guestctrl/UIFileManagerOperationsPanel.cpp \
     1243        src/guestctrl/UIFileManagerTable.cpp \
     1244        src/guestctrl/UIFileManagerGuestTable.cpp \
    12451245        src/guestctrl/UIGuestProcessControlWidget.cpp \
    1246         src/guestctrl/UIHostFileTable.cpp \
     1246        src/guestctrl/UIFileManagerHostTable.cpp \
    12471247        src/settings/global/UIGlobalSettingsInput.cpp \
    12481248        src/settings/machine/UIMachineSettingsNetwork.cpp \
    … …  
    12891289        src/runtime/UIFrameBuffer.cpp \
    12901290        src/runtime/UIIndicatorsPool.cpp \
    1291         src/guestctrl/UIGuestControlFileManager.cpp \
    1292         src/guestctrl/UIGuestControlFileManagerLogPanel.cpp \
    1293         src/guestctrl/UIGuestControlFileManagerOperationsPanel.cpp \
    1294         src/guestctrl/UIGuestControlFileManagerSessionPanel.cpp \
    1295         src/guestctrl/UIGuestControlFileTable.cpp \
    1296         src/guestctrl/UIGuestFileTable.cpp \
     1291        src/guestctrl/UIFileManager.cpp \
     1292        src/guestctrl/UIFileManagerLogPanel.cpp \
     1293        src/guestctrl/UIFileManagerOperationsPanel.cpp \
     1294        src/guestctrl/UIFileManagerSessionPanel.cpp \
     1295        src/guestctrl/UIFileManagerTable.cpp \
     1296        src/guestctrl/UIFileManagerGuestTable.cpp \
    12971297        src/guestctrl/UIGuestProcessControlWidget.cpp \
    1298         src/guestctrl/UIHostFileTable.cpp \
     1298        src/guestctrl/UIFileManagerHostTable.cpp \
    12991299        src/widgets/UIMiniToolBar.cpp
    13001300
    … …  
    15691569        src/runtime/information/UIVMInformationDialog.cpp \
    15701570        src/guestctrl/UIGuestControlConsole.cpp \
    1571         src/guestctrl/UIGuestControlFileManager.cpp \
    1572         src/guestctrl/UIGuestControlFileManagerDialog.cpp \
    1573         src/guestctrl/UIGuestControlFileManagerLogPanel.cpp \
    1574         src/guestctrl/UIGuestControlFileManagerOperationsPanel.cpp \
    1575         src/guestctrl/UIGuestControlFileManagerOptionsPanel.cpp \
    1576         src/guestctrl/UIGuestControlFileManagerPanel.cpp \
    1577         src/guestctrl/UIGuestControlFileManagerSessionPanel.cpp \
    1578         src/guestctrl/UIGuestControlFileModel.cpp \
    1579         src/guestctrl/UIGuestControlFileTable.cpp \
     1571        src/guestctrl/UIFileManager.cpp \
     1572        src/guestctrl/UIFileManagerDialog.cpp \
     1573        src/guestctrl/UIFileManagerLogPanel.cpp \
     1574        src/guestctrl/UIFileManagerOperationsPanel.cpp \
     1575        src/guestctrl/UIFileManagerOptionsPanel.cpp \
     1576        src/guestctrl/UIFileManagerPanel.cpp \
     1577        src/guestctrl/UIFileManagerSessionPanel.cpp \
     1578        src/guestctrl/UIFileManagerModel.cpp \
     1579        src/guestctrl/UIFileManagerTable.cpp \
    15801580        src/guestctrl/UIGuestControlInterface.cpp \
    15811581        src/guestctrl/UIGuestControlTreeItem.cpp \
    1582         src/guestctrl/UIGuestFileTable.cpp \
     1582        src/guestctrl/UIFileManagerGuestTable.cpp \
    15831583        src/guestctrl/UIGuestProcessControlDialog.cpp \
    15841584        src/guestctrl/UIGuestProcessControlWidget.cpp \
    1585         src/guestctrl/UIHostFileTable.cpp \
     1585        src/guestctrl/UIFileManagerHostTable.cpp \
    15861586        src/runtime/normal/UIKeyboardHandlerNormal.cpp \
    15871587        src/runtime/normal/UIMachineLogicNormal.cpp \
    … …  
    17481748        src/runtime/information/UIVMInformationDialog.cpp \
    17491749        src/guestctrl/UIGuestControlConsole.cpp \
    1750         src/guestctrl/UIGuestControlFileManager.cpp \
    1751         src/guestctrl/UIGuestControlFileManagerDialog.cpp \
    1752         src/guestctrl/UIGuestControlFileManagerLogPanel.cpp \
    1753         src/guestctrl/UIGuestControlFileManagerOperationsPanel.cpp \
    1754         src/guestctrl/UIGuestControlFileManagerOptionsPanel.cpp \
    1755         src/guestctrl/UIGuestControlFileManagerPanel.cpp \
    1756         src/guestctrl/UIGuestControlFileManagerSessionPanel.cpp \
    1757         src/guestctrl/UIGuestControlFileModel.cpp \
    1758         src/guestctrl/UIGuestControlFileTable.cpp \
     1750        src/guestctrl/UIFileManager.cpp \
     1751        src/guestctrl/UIFileManagerDialog.cpp \
     1752        src/guestctrl/UIFileManagerLogPanel.cpp \
     1753        src/guestctrl/UIFileManagerOperationsPanel.cpp \
     1754        src/guestctrl/UIFileManagerOptionsPanel.cpp \
     1755        src/guestctrl/UIFileManagerPanel.cpp \
     1756        src/guestctrl/UIFileManagerSessionPanel.cpp \
     1757        src/guestctrl/UIFileManagerModel.cpp \
     1758        src/guestctrl/UIFileManagerTable.cpp \
    17591759        src/guestctrl/UIGuestControlInterface.cpp \
    17601760        src/guestctrl/UIGuestControlTreeItem.cpp \
    1761         src/guestctrl/UIGuestFileTable.cpp \
     1761        src/guestctrl/UIFileManagerGuestTable.cpp \
    17621762        src/guestctrl/UIGuestProcessControlWidget.cpp \
    17631763        src/guestctrl/UIGuestProcessControlDialog.cpp \
    1764         src/guestctrl/UIHostFileTable.cpp \
     1764        src/guestctrl/UIFileManagerHostTable.cpp \
    17651765        src/runtime/normal/UIKeyboardHandlerNormal.cpp \
    17661766        src/runtime/normal/UIMachineLogicNormal.cpp \

  • trunk/src/VBox/Frontends/VirtualBox/src/converter/UIConverterBackendGlobal.cpp

    r76059 r76177  
    561561        case UIExtraDataMetaDefs::RuntimeMenuMachineActionType_TakeSnapshot:                  strResult = "TakeSnapshot"; break;
    562562        case UIExtraDataMetaDefs::RuntimeMenuMachineActionType_InformationDialog:             strResult = "InformationDialog"; break;
    563         case UIExtraDataMetaDefs::RuntimeMenuMachineActionType_GuestControlFileManagerDialog: strResult = "GuestControlFileManagerDialog"; break;
     563        case UIExtraDataMetaDefs::RuntimeMenuMachineActionType_FileManagerDialog:             strResult = "FileManagerDialog"; break;
    564564        case UIExtraDataMetaDefs::RuntimeMenuMachineActionType_GuestProcessControlDialog:     strResult = "GuestProcessControlDialog"; break;
    565565        case UIExtraDataMetaDefs::RuntimeMenuMachineActionType_Pause:                         strResult = "Pause"; break;
    … …  
    589589    keys << "TakeSnapshot";                  values << UIExtraDataMetaDefs::RuntimeMenuMachineActionType_TakeSnapshot;
    590590    keys << "InformationDialog";             values << UIExtraDataMetaDefs::RuntimeMenuMachineActionType_InformationDialog;
    591     keys << "GuestControlFileManagerDialog"; values << UIExtraDataMetaDefs::RuntimeMenuMachineActionType_GuestControlFileManagerDialog;
     591    keys << "FileManagerDialog";             values << UIExtraDataMetaDefs::RuntimeMenuMachineActionType_FileManagerDialog;
    592592    keys << "GuestProcessControlDialog";     values << UIExtraDataMetaDefs::RuntimeMenuMachineActionType_GuestProcessControlDialog;
    593593    keys << "Pause";                         values << UIExtraDataMetaDefs::RuntimeMenuMachineActionType_Pause;

  • trunk/src/VBox/Frontends/VirtualBox/src/extradata/UIExtraDataDefs.cpp

    r75642 r76177  
    204204const char *UIExtraDataDefs::GUI_GuestControl_ProcessControlDialogGeometry = "GUI/GuestControl/ProcessControlDialogGeometry";
    205205
    206 /* Guest Control file manager options: */
     206/* File Manager options: */
    207207const char *UIExtraDataDefs::GUI_GuestControl_FileManagerOptions = "GUI/GuestControl/FileManagerOptions";
    208208const char *UIExtraDataDefs::GUI_GuestControl_FileManagerListDirectoriesFirst = "ListDirectoriesFirst";

  • trunk/src/VBox/Frontends/VirtualBox/src/extradata/UIExtraDataDefs.h

    r75966 r76177  
    365365    /** @} */
    366366
    367     /** @name Guest Control file manager options
     367    /** @name File Manager options
    368368      * @{ */
    369369        extern const char *GUI_GuestControl_FileManagerOptions;
    … …  
    501501        RuntimeMenuMachineActionType_TakeSnapshot                  = RT_BIT(1),
    502502        RuntimeMenuMachineActionType_InformationDialog             = RT_BIT(2),
    503         RuntimeMenuMachineActionType_GuestControlFileManagerDialog = RT_BIT(3),
     503        RuntimeMenuMachineActionType_FileManagerDialog            = RT_BIT(3),
    504504        RuntimeMenuMachineActionType_GuestProcessControlDialog     = RT_BIT(4),
    505505        RuntimeMenuMachineActionType_Pause                         = RT_BIT(5),

  • trunk/src/VBox/Frontends/VirtualBox/src/extradata/UIExtraDataManager.cpp

    r76164 r76177  
    42194219}
    42204220
    4221 QRect UIExtraDataManager::guestControlFileManagerDialogGeometry(QWidget *pWidget, const QRect &defaultGeometry)
     4221QRect UIExtraDataManager::fileManagerDialogGeometry(QWidget *pWidget, const QRect &defaultGeometry)
    42224222{
    42234223    return dialogGeometry(GUI_GuestControl_FileManagerDialogGeometry, pWidget, defaultGeometry);
    42244224}
    42254225
    4226 bool UIExtraDataManager::guestControlFileManagerDialogShouldBeMaximized()
     4226bool UIExtraDataManager::fileManagerDialogShouldBeMaximized()
    42274227{
    42284228    /* Get corresponding extra-data: */
    … …  
    42334233}
    42344234
    4235 void UIExtraDataManager::setGuestControlFileManagerDialogGeometry(const QRect &geometry, bool fMaximized)
     4235void UIExtraDataManager::setFileManagerDialogGeometry(const QRect &geometry, bool fMaximized)
    42364236{
    42374237    setDialogGeometry(GUI_GuestControl_FileManagerDialogGeometry, geometry, fMaximized);
    42384238}
    42394239
    4240 void UIExtraDataManager::setGuestControlFileManagerVisiblePanels(const QStringList &panelNameList)
     4240void UIExtraDataManager::setFileManagerVisiblePanels(const QStringList &panelNameList)
    42414241{
    42424242    setExtraDataStringList(GUI_GuestControl_FileManagerVisiblePanels, panelNameList);
    42434243}
    42444244
    4245 QStringList UIExtraDataManager::guestControlFileManagerVisiblePanels()
     4245QStringList UIExtraDataManager::fileManagerVisiblePanels()
    42464246{
    42474247    return extraDataStringList(GUI_GuestControl_FileManagerVisiblePanels);
    42484248}
    42494249
    4250 void UIExtraDataManager::setGuestControlFileManagerOptions(bool fListDirectoriesFirst,
    4251                                        bool fShowDeleteConfirmation, bool fShowHumanReadableSizes)
     4250void UIExtraDataManager::setFileManagerOptions(bool fListDirectoriesFirst,
     4251                                               bool fShowDeleteConfirmation, bool fShowHumanReadableSizes)
    42524252{
    42534253    /* Serialize passed values: */
    … …  
    42654265}
    42664266
    4267 bool UIExtraDataManager::guestControlFileManagerListDirectoriesFirst()
     4267bool UIExtraDataManager::fileManagerListDirectoriesFirst()
    42684268{
    42694269    const QStringList data = extraDataStringList(GUI_GuestControl_FileManagerOptions);
    … …  
    42764276}
    42774277
    4278 bool UIExtraDataManager::guestControlFileManagerShowDeleteConfirmation()
     4278bool UIExtraDataManager::fileManagerShowDeleteConfirmation()
    42794279{
    42804280    const QStringList data = extraDataStringList(GUI_GuestControl_FileManagerOptions);
    … …  
    42874287}
    42884288
    4289 bool UIExtraDataManager::guestControlFileManagerShowHumanReadableSizes()
     4289bool UIExtraDataManager::fileManagerShowHumanReadableSizes()
    42904290{
    42914291    const QStringList data = extraDataStringList(GUI_GuestControl_FileManagerOptions);

  • trunk/src/VBox/Frontends/VirtualBox/src/extradata/UIExtraDataManager.h

    r75642 r76177  
    638638        void setGuestControlProcessControlSplitterHints(const QList<int> &hints);
    639639        QList<int> guestControlProcessControlSplitterHints();
    640         QRect guestControlFileManagerDialogGeometry(QWidget *pWidget, const QRect &defaultGeometry);
    641         bool guestControlFileManagerDialogShouldBeMaximized();
    642         void setGuestControlFileManagerDialogGeometry(const QRect &geometry, bool fMaximized);
     640        QRect fileManagerDialogGeometry(QWidget *pWidget, const QRect &defaultGeometry);
     641        bool fileManagerDialogShouldBeMaximized();
     642        void setFileManagerDialogGeometry(const QRect &geometry, bool fMaximized);
    643643        QRect guestProcessControlDialogGeometry(QWidget *pWidget, const QRect &defaultGeometry);
    644644        bool guestProcessControlDialogShouldBeMaximized();
    645645        void setGuestProcessControlDialogGeometry(const QRect &geometry, bool fMaximized);
    646         void setGuestControlFileManagerVisiblePanels(const QStringList &panelNameList);
    647         QStringList guestControlFileManagerVisiblePanels();
    648     /** @} */
    649 
    650     /** @name Guest Control file manager options
    651       * @{ */
    652         void setGuestControlFileManagerOptions(bool fListDirectoriesFirst,
    653                                                bool fShowDeleteConfirmation, bool fshowHumanReadableSizes);
    654         bool guestControlFileManagerListDirectoriesFirst();
    655         bool guestControlFileManagerShowDeleteConfirmation();
    656         bool guestControlFileManagerShowHumanReadableSizes();
     646        void setFileManagerVisiblePanels(const QStringList &panelNameList);
     647        QStringList fileManagerVisiblePanels();
     648    /** @} */
     649
     650    /** @name File Manager options
     651      * @{ */
     652        void setFileManagerOptions(bool fListDirectoriesFirst,
     653                                   bool fShowDeleteConfirmation, bool fshowHumanReadableSizes);
     654        bool fileManagerListDirectoriesFirst();
     655        bool fileManagerShowDeleteConfirmation();
     656        bool fileManagerShowHumanReadableSizes();
    657657    /** @} */
    658658

  • trunk/src/VBox/Frontends/VirtualBox/src/globals/UIActionPool.cpp

    r76176 r76177  
    14501450};
    14511451
    1452 /** Menu action extension, used as 'Guest Control File Manager' menu class. */
    1453 class UIActionMenuGuestControlFileManager : public UIActionMenu
    1454 {
    1455     Q_OBJECT;
    1456 
    1457 public:
    1458 
    1459     /** Constructs action passing @a pParent to the base-class. */
    1460     UIActionMenuGuestControlFileManager(UIActionPool *pParent)
     1452/** Menu action extension, used as 'File Manager' menu class. */
     1453class UIActionMenuFileManager : public UIActionMenu
     1454{
     1455    Q_OBJECT;
     1456
     1457public:
     1458
     1459    /** Constructs action passing @a pParent to the base-class. */
     1460    UIActionMenuFileManager(UIActionPool *pParent)
    14611461        : UIActionMenu(pParent)
    14621462    {}
    … …  
    14671467    virtual QString shortcutExtraDataID() const /* override */
    14681468    {
    1469         return QString("GuestControlFileManagerMenu");
     1469        return QString("FileManagerMenu");
    14701470    }
    14711471
    … …  
    14781478};
    14791479
    1480 class UIActionMenuGuestControlFileManagerHostSubmenu : public UIActionMenu
    1481 {
    1482     Q_OBJECT;
    1483 
    1484 public:
    1485 
    1486     /** Constructs action passing @a pParent to the base-class. */
    1487     UIActionMenuGuestControlFileManagerHostSubmenu(UIActionPool *pParent)
     1480class UIActionMenuFileManagerHostSubmenu : public UIActionMenu
     1481{
     1482    Q_OBJECT;
     1483
     1484public:
     1485
     1486    /** Constructs action passing @a pParent to the base-class. */
     1487    UIActionMenuFileManagerHostSubmenu(UIActionPool *pParent)
    14881488        : UIActionMenu(pParent)
    14891489    {}
    … …  
    14941494    virtual QString shortcutExtraDataID() const /* override */
    14951495    {
    1496         return QString("GuestControlFileManagerHostSubmenu");
     1496        return QString("FileManagerHostSubmenu");
    14971497    }
    14981498
    … …  
    15051505};
    15061506
    1507 class UIActionMenuGuestControlFileManagerGuestSubmenu : public UIActionMenu
    1508 {
    1509     Q_OBJECT;
    1510 
    1511 public:
    1512 
    1513     /** Constructs action passing @a pParent to the base-class. */
    1514     UIActionMenuGuestControlFileManagerGuestSubmenu(UIActionPool *pParent)
     1507class UIActionMenuFileManagerGuestSubmenu : public UIActionMenu
     1508{
     1509    Q_OBJECT;
     1510
     1511public:
     1512
     1513    /** Constructs action passing @a pParent to the base-class. */
     1514    UIActionMenuFileManagerGuestSubmenu(UIActionPool *pParent)
    15151515        : UIActionMenu(pParent)
    15161516    {}
    … …  
    15211521    virtual QString shortcutExtraDataID() const /* override */
    15221522    {
    1523         return QString("GuestControlFileManagerGuestSubmenu");
     1523        return QString("FileManagerGuestSubmenu");
    15241524    }
    15251525
    … …  
    15331533
    15341534
    1535 /** Simple action extension, used as 'Copy to Guest' in guest control file manager action class. */
    1536 class UIActionMenuGuestControlFileManagerCopyToGuest : public UIActionSimple
    1537 {
    1538     Q_OBJECT;
    1539 
    1540 public:
    1541 
    1542     /** Constructs action passing @a pParent to the base-class. */
    1543     UIActionMenuGuestControlFileManagerCopyToGuest(UIActionPool *pParent)
     1535/** Simple action extension, used as 'Copy to Guest' in file manager action class. */
     1536class UIActionMenuFileManagerCopyToGuest : public UIActionSimple
     1537{
     1538    Q_OBJECT;
     1539
     1540public:
     1541
     1542    /** Constructs action passing @a pParent to the base-class. */
     1543    UIActionMenuFileManagerCopyToGuest(UIActionPool *pParent)
    15441544        : UIActionSimple(pParent,
    15451545                         ":/file_manager_copy_to_guest_24px.png", ":/file_manager_copy_to_guest_16px.png",
    … …  
    15641564    {
    15651565        setName(QApplication::translate("UIActionPool", "Copy to guest"));
    1566         setShortcutScope(QApplication::translate("UIActionPool", "Guest Control File Manager"));
     1566        setShortcutScope(QApplication::translate("UIActionPool", "File Manager"));
    15671567        setToolTip(QApplication::translate("UIActionPool", "Copy the Selected Object(s) from Host to Guest"));
    15681568        setStatusTip(QApplication::translate("UIActionPool", "Copy the selected object(s) from host to guest"));
    … …  
    15701570};
    15711571
    1572 /** Simple action extension, used as 'Copy to Host' in guest control file manager action class. */
    1573 class UIActionMenuGuestControlFileManagerCopyToHost : public UIActionSimple
    1574 {
    1575     Q_OBJECT;
    1576 
    1577 public:
    1578 
    1579     /** Constructs action passing @a pParent to the base-class. */
    1580     UIActionMenuGuestControlFileManagerCopyToHost(UIActionPool *pParent)
     1572/** Simple action extension, used as 'Copy to Host' in file manager action class. */
     1573class UIActionMenuFileManagerCopyToHost : public UIActionSimple
     1574{
     1575    Q_OBJECT;
     1576
     1577public:
     1578
     1579    /** Constructs action passing @a pParent to the base-class. */
     1580    UIActionMenuFileManagerCopyToHost(UIActionPool *pParent)
    15811581        : UIActionSimple(pParent,
    15821582                         ":/file_manager_copy_to_host_24px.png", ":/file_manager_copy_to_host_16px.png",
    … …  
    16011601    {
    16021602        setName(QApplication::translate("UIActionPool", "Copy to host"));
    1603         setShortcutScope(QApplication::translate("UIActionPool", "Guest Control File Manager"));
     1603        setShortcutScope(QApplication::translate("UIActionPool", "File Manager"));
    16041604        setToolTip(QApplication::translate("UIActionPool", "Copy the Selected Object(s) from Guest to Host"));
    16051605        setStatusTip(QApplication::translate("UIActionPool", "Copy the selected object(s) from guest to host"));
    … …  
    16071607};
    16081608
    1609 /** Toggle action extension, used to toggle 'File Manager Options' panel in guest control file manager. */
    1610 class UIActionMenuGuestControlFileManagerOptions : public UIActionToggle
    1611 {
    1612     Q_OBJECT;
    1613 
    1614 public:
    1615 
    1616     /** Constructs action passing @a pParent to the base-class. */
    1617     UIActionMenuGuestControlFileManagerOptions(UIActionPool *pParent)
     1609/** Toggle action extension, used to toggle 'File Manager Options' panel in file manager. */
     1610class UIActionMenuFileManagerOptions : public UIActionToggle
     1611{
     1612    Q_OBJECT;
     1613
     1614public:
     1615
     1616    /** Constructs action passing @a pParent to the base-class. */
     1617    UIActionMenuFileManagerOptions(UIActionPool *pParent)
    16181618        : UIActionToggle(pParent)
    16191619    {
    … …  
    16471647};
    16481648
    1649 /** Toggle action extension, used to toggle 'File Manager Log' panel in guest control file manager. */
    1650 class UIActionMenuGuestControlFileManagerLog : public UIActionToggle
    1651 {
    1652     Q_OBJECT;
    1653 
    1654 public:
    1655 
    1656     /** Constructs action passing @a pParent to the base-class. */
    1657     UIActionMenuGuestControlFileManagerLog(UIActionPool *pParent)
     1649/** Toggle action extension, used to toggle 'File Manager Log' panel in file manager. */
     1650class UIActionMenuFileManagerLog : public UIActionToggle
     1651{
     1652    Q_OBJECT;
     1653
     1654public:
     1655
     1656    /** Constructs action passing @a pParent to the base-class. */
     1657    UIActionMenuFileManagerLog(UIActionPool *pParent)
    16581658        : UIActionToggle(pParent)
    16591659    {
    … …  
    16871687};
    16881688
    1689 /** Toggle action extension, used to toggle 'File Manager File Operations' panel in guest control file manager. */
    1690 class UIActionMenuGuestControlFileManagerFileOperations : public UIActionToggle
    1691 {
    1692     Q_OBJECT;
    1693 
    1694 public:
    1695 
    1696     /** Constructs action passing @a pParent to the base-class. */
    1697     UIActionMenuGuestControlFileManagerFileOperations(UIActionPool *pParent)
     1689/** Toggle action extension, used to toggle 'File Manager Operations' panel in file manager. */
     1690class UIActionMenuFileManagerOperations : public UIActionToggle
     1691{
     1692    Q_OBJECT;
     1693
     1694public:
     1695
     1696    /** Constructs action passing @a pParent to the base-class. */
     1697    UIActionMenuFileManagerOperations(UIActionPool *pParent)
    16981698        : UIActionToggle(pParent)
    16991699    {
    … …  
    17081708    virtual QString shortcutExtraDataID() const /* override */
    17091709    {
    1710         return QString("ToggleFileManagerFileOperationsPanel");
     1710        return QString("ToggleFileManagerOperationsPanel");
    17111711    }
    17121712
    … …  
    17271727};
    17281728
    1729 /** Toggle action extension, used to toggle 'File Manager Session' panel in guest control file manager. */
    1730 class UIActionMenuGuestControlFileManagerSession : public UIActionToggle
    1731 {
    1732     Q_OBJECT;
    1733 
    1734 public:
    1735 
    1736     /** Constructs action passing @a pParent to the base-class. */
    1737     UIActionMenuGuestControlFileManagerSession(UIActionPool *pParent)
     1729/** Toggle action extension, used to toggle 'File Manager Session' panel in file manager. */
     1730class UIActionMenuFileManagerSession : public UIActionToggle
     1731{
     1732    Q_OBJECT;
     1733
     1734public:
     1735
     1736    /** Constructs action passing @a pParent to the base-class. */
     1737    UIActionMenuFileManagerSession(UIActionPool *pParent)
    17381738        : UIActionToggle(pParent)
    17391739    {
    … …  
    17671767};
    17681768
    1769 /** Simple action extension, used as 'Perform GoUp' in guest control file manager action class. */
    1770 class UIActionMenuGuestControlFileManagerGoUp : public UIActionSimple
    1771 {
    1772     Q_OBJECT;
    1773 
    1774 public:
    1775 
    1776     /** Constructs action passing @a pParent to the base-class. */
    1777     UIActionMenuGuestControlFileManagerGoUp(UIActionPool *pParent)
     1769/** Simple action extension, used as 'Perform GoUp' in file manager action class. */
     1770class UIActionMenuFileManagerGoUp : public UIActionSimple
     1771{
     1772    Q_OBJECT;
     1773
     1774public:
     1775
     1776    /** Constructs action passing @a pParent to the base-class. */
     1777    UIActionMenuFileManagerGoUp(UIActionPool *pParent)
    17781778        : UIActionSimple(pParent,
    17791779                         ":/file_manager_go_up_24px.png", ":/file_manager_go_up_16px.png",
    … …  
    17991799    {
    18001800        setName(QApplication::translate("UIActionPool", "Go Up"));
    1801         setShortcutScope(QApplication::translate("UIActionPool", "Guest Control File Manager"));
     1801        setShortcutScope(QApplication::translate("UIActionPool", "File Manager"));
    18021802        setStatusTip(QApplication::translate("UIActionPool", "Go one level up to parent folder"));
    18031803        setToolTip(QApplication::translate("UIActionPool", "Go One Level Up to Parent Folder"));
    … …  
    18061806
    18071807
    1808 /** Simple action extension, used as 'Perform GoHome' in guest control file manager action class. */
    1809 class UIActionMenuGuestControlFileManagerGoHome : public UIActionSimple
    1810 {
    1811     Q_OBJECT;
    1812 
    1813 public:
    1814 
    1815     /** Constructs action passing @a pParent to the base-class. */
    1816     UIActionMenuGuestControlFileManagerGoHome(UIActionPool *pParent)
     1808/** Simple action extension, used as 'Perform GoHome' in file manager action class. */
     1809class UIActionMenuFileManagerGoHome : public UIActionSimple
     1810{
     1811    Q_OBJECT;
     1812
     1813public:
     1814
     1815    /** Constructs action passing @a pParent to the base-class. */
     1816    UIActionMenuFileManagerGoHome(UIActionPool *pParent)
    18171817        : UIActionSimple(pParent,
    18181818                         ":/file_manager_go_home_24px.png", ":/file_manager_go_home_16px.png",
    … …  
    18381838    {
    18391839        setName(QApplication::translate("UIActionPool", "Go Home"));
    1840         setShortcutScope(QApplication::translate("UIActionPool", "Guest Control File Manager"));
     1840        setShortcutScope(QApplication::translate("UIActionPool", "File Manager"));
    18411841        setStatusTip(QApplication::translate("UIActionPool", "Go to home folder"));
    18421842        setToolTip(QApplication::translate("UIActionPool", "Go to Home Folder"));
    … …  
    18451845
    18461846
    1847 /** Simple action extension, used as 'Perform Delete' in guest control file manager action class. */
    1848 class UIActionMenuGuestControlFileManagerDelete : public UIActionSimple
    1849 {
    1850     Q_OBJECT;
    1851 
    1852 public:
    1853 
    1854     /** Constructs action passing @a pParent to the base-class. */
    1855     UIActionMenuGuestControlFileManagerDelete(UIActionPool *pParent)
     1847/** Simple action extension, used as 'Perform Delete' in file manager action class. */
     1848class UIActionMenuFileManagerDelete : public UIActionSimple
     1849{
     1850    Q_OBJECT;
     1851
     1852public:
     1853
     1854    /** Constructs action passing @a pParent to the base-class. */
     1855    UIActionMenuFileManagerDelete(UIActionPool *pParent)
    18561856        : UIActionSimple(pParent,
    18571857                         ":/file_manager_delete_24px.png", ":/file_manager_delete_16px.png",
    … …  
    18771877    {
    18781878        setName(QApplication::translate("UIActionPool", "Delete"));
    1879         setShortcutScope(QApplication::translate("UIActionPool", "Guest Control File Manager"));
     1879        setShortcutScope(QApplication::translate("UIActionPool", "File Manager"));
    18801880        setStatusTip(QApplication::translate("UIActionPool", "Delete selected file object(s)"));
    18811881        setToolTip(QApplication::translate("UIActionPool", "Delete Selected File Object(s)"));
    … …  
    18831883};
    18841884
    1885 /** Simple action extension, used as 'Perform Refresh' in guest control file manager action class. */
    1886 class UIActionMenuGuestControlFileManagerRefresh : public UIActionSimple
    1887 {
    1888     Q_OBJECT;
    1889 
    1890 public:
    1891 
    1892     /** Constructs action passing @a pParent to the base-class. */
    1893     UIActionMenuGuestControlFileManagerRefresh(UIActionPool *pParent)
     1885/** Simple action extension, used as 'Perform Refresh' in file manager action class. */
     1886class UIActionMenuFileManagerRefresh : public UIActionSimple
     1887{
     1888    Q_OBJECT;
     1889
     1890public:
     1891
     1892    /** Constructs action passing @a pParent to the base-class. */
     1893    UIActionMenuFileManagerRefresh(UIActionPool *pParent)
    18941894        : UIActionSimple(pParent,
    18951895                         ":/file_manager_refresh_24px.png", ":/file_manager_refresh_16px.png",
    … …  
    19151915    {
    19161916        setName(QApplication::translate("UIActionPool", "Refresh"));
    1917         setShortcutScope(QApplication::translate("UIActionPool", "Guest Control File Manager"));
     1917        setShortcutScope(QApplication::translate("UIActionPool", "File Manager"));
    19181918        setStatusTip(QApplication::translate("UIActionPool", "Refresh"));
    19191919        setToolTip(QApplication::translate("UIActionPool", "Refresh"));
    … …  
    19221922
    19231923
    1924 /** Simple action extension, used as 'Perform Rename' in guest control file manager action class. */
    1925 class UIActionMenuGuestControlFileManagerRename : public UIActionSimple
    1926 {
    1927     Q_OBJECT;
    1928 
    1929 public:
    1930 
    1931     /** Constructs action passing @a pParent to the base-class. */
    1932     UIActionMenuGuestControlFileManagerRename(UIActionPool *pParent)
     1924/** Simple action extension, used as 'Perform Rename' in file manager action class. */
     1925class UIActionMenuFileManagerRename : public UIActionSimple
     1926{
     1927    Q_OBJECT;
     1928
     1929public:
     1930
     1931    /** Constructs action passing @a pParent to the base-class. */
     1932    UIActionMenuFileManagerRename(UIActionPool *pParent)
    19331933        : UIActionSimple(pParent,
    19341934                         ":/file_manager_rename_24px.png", ":/file_manager_rename_16px.png",
    … …  
    19531953    {
    19541954        setName(QApplication::translate("UIActionPool", "Rename"));
    1955         setShortcutScope(QApplication::translate("UIActionPool", "Guest Control File Manager"));
     1955        setShortcutScope(QApplication::translate("UIActionPool", "File Manager"));
    19561956        setStatusTip(QApplication::translate("UIActionPool", "Rename"));
    19571957        setToolTip(QApplication::translate("UIActionPool", "Rename"));
    … …  
    19591959};
    19601960
    1961 /** Simple action extension, used as 'Perform Rename' in guest control file manager action class. */
    1962 class UIActionMenuGuestControlFileManagerCreateNewDirectory : public UIActionSimple
    1963 {
    1964     Q_OBJECT;
    1965 
    1966 public:
    1967 
    1968     /** Constructs action passing @a pParent to the base-class. */
    1969     UIActionMenuGuestControlFileManagerCreateNewDirectory(UIActionPool *pParent)
     1961/** Simple action extension, used as 'Perform Rename' in file manager action class. */
     1962class UIActionMenuFileManagerCreateNewDirectory : public UIActionSimple
     1963{
     1964    Q_OBJECT;
     1965
     1966public:
     1967
     1968    /** Constructs action passing @a pParent to the base-class. */
     1969    UIActionMenuFileManagerCreateNewDirectory(UIActionPool *pParent)
    19701970        : UIActionSimple(pParent,
    19711971                         ":/file_manager_new_directory_24px.png", ":/file_manager_new_directory_16px.png",
    … …  
    19901990    {
    19911991        setName(QApplication::translate("UIActionPool", "Create New Directory"));
    1992         setShortcutScope(QApplication::translate("UIActionPool", "Guest Control File Manager"));
     1992        setShortcutScope(QApplication::translate("UIActionPool", "File Manager"));
    19931993        setStatusTip(QApplication::translate("UIActionPool", "Create New Directory"));
    19941994        setToolTip(QApplication::translate("UIActionPool", "Create New Directory"));
    … …  
    19971997
    19981998
    1999 /** Simple action extension, used as 'Perform Copy' in guest control file manager action class. */
    2000 class UIActionMenuGuestControlFileManagerCopy : public UIActionSimple
    2001 {
    2002     Q_OBJECT;
    2003 
    2004 public:
    2005 
    2006     /** Constructs action passing @a pParent to the base-class. */
    2007     UIActionMenuGuestControlFileManagerCopy(UIActionPool *pParent)
     1999/** Simple action extension, used as 'Perform Copy' in file manager action class. */
     2000class UIActionMenuFileManagerCopy : public UIActionSimple
     2001{
     2002    Q_OBJECT;
     2003
     2004public:
     2005
     2006    /** Constructs action passing @a pParent to the base-class. */
     2007    UIActionMenuFileManagerCopy(UIActionPool *pParent)
    20082008        : UIActionSimple(pParent,
    20092009                         ":/file_manager_copy_24px.png", ":/file_manager_copy_16px.png",
    … …  
    20282028    {
    20292029        setName(QApplication::translate("UIActionPool", "Copy"));
    2030         setShortcutScope(QApplication::translate("UIActionPool", "Guest Control File Manager"));
     2030        setShortcutScope(QApplication::translate("UIActionPool", "File Manager"));
    20312031        setStatusTip(QApplication::translate("UIActionPool", "Copy selected file object(s)"));
    20322032        setToolTip(QApplication::translate("UIActionPool", "Copy Selected File Object(s)"));
    … …  
    20342034};
    20352035
    2036 /** Simple action extension, used as 'Perform Cut' in guest control file manager action class. */
    2037 class UIActionMenuGuestControlFileManagerCut : public UIActionSimple
    2038 {
    2039     Q_OBJECT;
    2040 
    2041 public:
    2042 
    2043     /** Constructs action passing @a pParent to the base-class. */
    2044     UIActionMenuGuestControlFileManagerCut(UIActionPool *pParent)
     2036/** Simple action extension, used as 'Perform Cut' in file manager action class. */
     2037class UIActionMenuFileManagerCut : public UIActionSimple
     2038{
     2039    Q_OBJECT;
     2040
     2041public:
     2042
     2043    /** Constructs action passing @a pParent to the base-class. */
     2044    UIActionMenuFileManagerCut(UIActionPool *pParent)
    20452045        : UIActionSimple(pParent,
    20462046                         ":/file_manager_cut_24px.png", ":/file_manager_cut_16px.png",
    … …  
    20652065    {
    20662066        setName(QApplication::translate("UIActionPool", "Cut"));
    2067         setShortcutScope(QApplication::translate("UIActionPool", "Guest Control File Manager"));
     2067        setShortcutScope(QApplication::translate("UIActionPool", "File Manager"));
    20682068        setStatusTip(QApplication::translate("UIActionPool", "Cut selected file object(s)"));
    20692069        setToolTip(QApplication::translate("UIActionPool", "Cut Selected File Object(s)"));
    … …  
    20712071};
    20722072
    2073 /** Simple action extension, used as 'Perform Paste' in guest control file manager action class. */
    2074 class UIActionMenuGuestControlFileManagerPaste : public UIActionSimple
    2075 {
    2076     Q_OBJECT;
    2077 
    2078 public:
    2079 
    2080     /** Constructs action passing @a pParent to the base-class. */
    2081     UIActionMenuGuestControlFileManagerPaste(UIActionPool *pParent)
     2073/** Simple action extension, used as 'Perform Paste' in file manager action class. */
     2074class UIActionMenuFileManagerPaste : public UIActionSimple
     2075{
     2076    Q_OBJECT;
     2077
     2078public:
     2079
     2080    /** Constructs action passing @a pParent to the base-class. */
     2081    UIActionMenuFileManagerPaste(UIActionPool *pParent)
    20822082        : UIActionSimple(pParent,
    20832083                         ":/file_manager_paste_24px.png", ":/file_manager_paste_16px.png",
    … …  
    21022102    {
    21032103        setName(QApplication::translate("UIActionPool", "Paste"));
    2104         setShortcutScope(QApplication::translate("UIActionPool", "Guest Control File Manager"));
     2104        setShortcutScope(QApplication::translate("UIActionPool", "File Manager"));
    21052105        setStatusTip(QApplication::translate("UIActionPool", "Paste copied/cut file object(s)"));
    21062106        setToolTip(QApplication::translate("UIActionPool", "Paste Copied/Cut File Object(s)"));
    … …  
    21082108};
    21092109
    2110 /** Simple action extension, used as 'Select All' in guest control file manager action class. */
    2111 class UIActionMenuGuestControlFileManagerSelectAll : public UIActionSimple
    2112 {
    2113     Q_OBJECT;
    2114 
    2115 public:
    2116 
    2117     /** Constructs action passing @a pParent to the base-class. */
    2118     UIActionMenuGuestControlFileManagerSelectAll(UIActionPool *pParent)
     2110/** Simple action extension, used as 'Select All' in file manager action class. */
     2111class UIActionMenuFileManagerSelectAll : public UIActionSimple
     2112{
     2113    Q_OBJECT;
     2114
     2115public:
     2116
     2117    /** Constructs action passing @a pParent to the base-class. */
     2118    UIActionMenuFileManagerSelectAll(UIActionPool *pParent)
    21192119        : UIActionSimple(pParent,
    21202120                         ":/file_manager_select_all_24px.png", ":/file_manager_select_all_16px.png",
    … …  
    21392139    {
    21402140        setName(QApplication::translate("UIActionPool", "Select All"));
    2141         setShortcutScope(QApplication::translate("UIActionPool", "Guest Control File Manager"));
     2141        setShortcutScope(QApplication::translate("UIActionPool", "File Manager"));
    21422142        setStatusTip(QApplication::translate("UIActionPool", "Select all files objects"));
    21432143        setToolTip(QApplication::translate("UIActionPool", "Select All Files Objects"));
    … …  
    21462146
    21472147
    2148 /** Simple action extension, used as 'Invert Selection' in guest control file manager action class. */
    2149 class UIActionMenuGuestControlFileManagerInvertSelection : public UIActionSimple
    2150 {
    2151     Q_OBJECT;
    2152 
    2153 public:
    2154 
    2155     /** Constructs action passing @a pParent to the base-class. */
    2156     UIActionMenuGuestControlFileManagerInvertSelection(UIActionPool *pParent)
     2148/** Simple action extension, used as 'Invert Selection' in file manager action class. */
     2149class UIActionMenuFileManagerInvertSelection : public UIActionSimple
     2150{
     2151    Q_OBJECT;
     2152
     2153public:
     2154
     2155    /** Constructs action passing @a pParent to the base-class. */
     2156    UIActionMenuFileManagerInvertSelection(UIActionPool *pParent)
    21572157        : UIActionSimple(pParent,
    21582158                         ":/file_manager_invert_selection_24px.png", ":/file_manager_invert_selection_16px.png",
    … …  
    21772177    {
    21782178        setName(QApplication::translate("UIActionPool", "Invert Selection"));
    2179         setShortcutScope(QApplication::translate("UIActionPool", "Guest Control File Manager"));
     2179        setShortcutScope(QApplication::translate("UIActionPool", "File Manager"));
    21802180        setStatusTip(QApplication::translate("UIActionPool", "Invert the current selection"));
    21812181        setToolTip(QApplication::translate("UIActionPool", "Invert the Current Selection"));
    … …  
    21842184
    21852185
    2186 /** Simple action extension, used as 'Show Properties' in guest control file manager action class. */
    2187 class UIActionMenuGuestControlFileManagerShowProperties : public UIActionSimple
    2188 {
    2189     Q_OBJECT;
    2190 
    2191 public:
    2192 
    2193     /** Constructs action passing @a pParent to the base-class. */
    2194     UIActionMenuGuestControlFileManagerShowProperties(UIActionPool *pParent)
     2186/** Simple action extension, used as 'Show Properties' in file manager action class. */
     2187class UIActionMenuFileManagerShowProperties : public UIActionSimple
     2188{
     2189    Q_OBJECT;
     2190
     2191public:
     2192
     2193    /** Constructs action passing @a pParent to the base-class. */
     2194    UIActionMenuFileManagerShowProperties(UIActionPool *pParent)
    21952195        : UIActionSimple(pParent,
    21962196                         ":/file_manager_properties_24px.png", ":/file_manager_properties_16px.png",
    … …  
    22152215    {
    22162216        setName(QApplication::translate("UIActionPool", "Show Properties"));
    2217         setShortcutScope(QApplication::translate("UIActionPool", "Guest Control File Manager"));
     2217        setShortcutScope(QApplication::translate("UIActionPool", "File Manager"));
    22182218        setStatusTip(QApplication::translate("UIActionPool", "Show the properties of currently selected file object(s)"));
    22192219        setToolTip(QApplication::translate("UIActionPool", "Show the Properties of Currently Selected File Object(s)"));
    … …  
    24302430    m_pool[UIActionIndex_M_Log_S_Save] = new UIActionMenuSelectorLogPerformSave(this);
    24312431
    2432     /* Create 'Guest Control File Manager' actions: */
    2433     m_pool[UIActionIndex_M_GuestControlFileManager] = new UIActionMenuGuestControlFileManager(this);
    2434     m_pool[UIActionIndex_M_GuestControlFileManager_M_HostSubmenu] = new UIActionMenuGuestControlFileManagerHostSubmenu(this);
    2435     m_pool[UIActionIndex_M_GuestControlFileManager_M_GuestSubmenu] = new UIActionMenuGuestControlFileManagerGuestSubmenu(this);
    2436     m_pool[UIActionIndex_M_GuestControlFileManager_S_CopyToGuest] = new  UIActionMenuGuestControlFileManagerCopyToGuest(this);
    2437     m_pool[UIActionIndex_M_GuestControlFileManager_S_CopyToHost] = new  UIActionMenuGuestControlFileManagerCopyToHost(this);
    2438 
    2439     m_pool[UIActionIndex_M_GuestControlFileManager_T_Options] = new UIActionMenuGuestControlFileManagerOptions(this);
    2440     m_pool[UIActionIndex_M_GuestControlFileManager_T_Log] = new UIActionMenuGuestControlFileManagerLog(this);
    2441     m_pool[UIActionIndex_M_GuestControlFileManager_T_FileOperations] = new UIActionMenuGuestControlFileManagerFileOperations(this);
    2442     m_pool[UIActionIndex_M_GuestControlFileManager_T_Session] = new UIActionMenuGuestControlFileManagerSession(this);
    2443 
    2444     m_pool[UIActionIndex_M_GuestControlFileManager_S_Host_GoUp] = new UIActionMenuGuestControlFileManagerGoUp(this);
    2445     m_pool[UIActionIndex_M_GuestControlFileManager_S_Guest_GoUp] = new UIActionMenuGuestControlFileManagerGoUp(this);
    2446     m_pool[UIActionIndex_M_GuestControlFileManager_S_Host_GoHome] = new UIActionMenuGuestControlFileManagerGoHome(this);
    2447     m_pool[UIActionIndex_M_GuestControlFileManager_S_Guest_GoHome] = new UIActionMenuGuestControlFileManagerGoHome(this);
    2448     m_pool[UIActionIndex_M_GuestControlFileManager_S_Host_Refresh] = new UIActionMenuGuestControlFileManagerRefresh(this);
    2449     m_pool[UIActionIndex_M_GuestControlFileManager_S_Guest_Refresh] = new UIActionMenuGuestControlFileManagerRefresh(this);
    2450     m_pool[UIActionIndex_M_GuestControlFileManager_S_Host_Delete] = new UIActionMenuGuestControlFileManagerDelete(this);
    2451     m_pool[UIActionIndex_M_GuestControlFileManager_S_Guest_Delete] = new UIActionMenuGuestControlFileManagerDelete(this);
    2452     m_pool[UIActionIndex_M_GuestControlFileManager_S_Host_Rename] = new UIActionMenuGuestControlFileManagerRename(this);
    2453     m_pool[UIActionIndex_M_GuestControlFileManager_S_Guest_Rename] = new UIActionMenuGuestControlFileManagerRename(this);
    2454     m_pool[UIActionIndex_M_GuestControlFileManager_S_Host_CreateNewDirectory] = new UIActionMenuGuestControlFileManagerCreateNewDirectory(this);
    2455     m_pool[UIActionIndex_M_GuestControlFileManager_S_Guest_CreateNewDirectory] = new UIActionMenuGuestControlFileManagerCreateNewDirectory(this);
    2456     m_pool[UIActionIndex_M_GuestControlFileManager_S_Host_Copy] = new UIActionMenuGuestControlFileManagerCopy(this);
    2457     m_pool[UIActionIndex_M_GuestControlFileManager_S_Guest_Copy] = new UIActionMenuGuestControlFileManagerCopy(this);
    2458     m_pool[UIActionIndex_M_GuestControlFileManager_S_Host_Cut] = new UIActionMenuGuestControlFileManagerCut(this);
    2459     m_pool[UIActionIndex_M_GuestControlFileManager_S_Guest_Cut] = new UIActionMenuGuestControlFileManagerCut(this);
    2460     m_pool[UIActionIndex_M_GuestControlFileManager_S_Host_Paste] = new UIActionMenuGuestControlFileManagerPaste(this);
    2461     m_pool[UIActionIndex_M_GuestControlFileManager_S_Guest_Paste] = new UIActionMenuGuestControlFileManagerPaste(this);
    2462     m_pool[UIActionIndex_M_GuestControlFileManager_S_Host_SelectAll] = new UIActionMenuGuestControlFileManagerSelectAll(this);
    2463     m_pool[UIActionIndex_M_GuestControlFileManager_S_Guest_SelectAll] = new UIActionMenuGuestControlFileManagerSelectAll(this);
    2464     m_pool[UIActionIndex_M_GuestControlFileManager_S_Host_InvertSelection] = new UIActionMenuGuestControlFileManagerInvertSelection(this);
    2465     m_pool[UIActionIndex_M_GuestControlFileManager_S_Guest_InvertSelection] = new UIActionMenuGuestControlFileManagerInvertSelection(this);
    2466     m_pool[UIActionIndex_M_GuestControlFileManager_S_Host_ShowProperties] = new UIActionMenuGuestControlFileManagerShowProperties(this);
    2467     m_pool[UIActionIndex_M_GuestControlFileManager_S_Guest_ShowProperties] = new UIActionMenuGuestControlFileManagerShowProperties(this);
     2432    /* Create 'File Manager' actions: */
     2433    m_pool[UIActionIndex_M_FileManager] = new UIActionMenuFileManager(this);
     2434    m_pool[UIActionIndex_M_FileManager_M_HostSubmenu] = new UIActionMenuFileManagerHostSubmenu(this);
     2435    m_pool[UIActionIndex_M_FileManager_M_GuestSubmenu] = new UIActionMenuFileManagerGuestSubmenu(this);
     2436    m_pool[UIActionIndex_M_FileManager_S_CopyToGuest] = new  UIActionMenuFileManagerCopyToGuest(this);
     2437    m_pool[UIActionIndex_M_FileManager_S_CopyToHost] = new  UIActionMenuFileManagerCopyToHost(this);
     2438
     2439    m_pool[UIActionIndex_M_FileManager_T_Options] = new UIActionMenuFileManagerOptions(this);
     2440    m_pool[UIActionIndex_M_FileManager_T_Log] = new UIActionMenuFileManagerLog(this);
     2441    m_pool[UIActionIndex_M_FileManager_T_Operations] = new UIActionMenuFileManagerOperations(this);
     2442    m_pool[UIActionIndex_M_FileManager_T_Session] = new UIActionMenuFileManagerSession(this);
     2443
     2444    m_pool[UIActionIndex_M_FileManager_S_Host_GoUp] = new UIActionMenuFileManagerGoUp(this);
     2445    m_pool[UIActionIndex_M_FileManager_S_Guest_GoUp] = new UIActionMenuFileManagerGoUp(this);
     2446    m_pool[UIActionIndex_M_FileManager_S_Host_GoHome] = new UIActionMenuFileManagerGoHome(this);
     2447    m_pool[UIActionIndex_M_FileManager_S_Guest_GoHome] = new UIActionMenuFileManagerGoHome(this);
     2448    m_pool[UIActionIndex_M_FileManager_S_Host_Refresh] = new UIActionMenuFileManagerRefresh(this);
     2449    m_pool[UIActionIndex_M_FileManager_S_Guest_Refresh] = new UIActionMenuFileManagerRefresh(this);
     2450    m_pool[UIActionIndex_M_FileManager_S_Host_Delete] = new UIActionMenuFileManagerDelete(this);
     2451    m_pool[UIActionIndex_M_FileManager_S_Guest_Delete] = new UIActionMenuFileManagerDelete(this);
     2452    m_pool[UIActionIndex_M_FileManager_S_Host_Rename] = new UIActionMenuFileManagerRename(this);
     2453    m_pool[UIActionIndex_M_FileManager_S_Guest_Rename] = new UIActionMenuFileManagerRename(this);
     2454    m_pool[UIActionIndex_M_FileManager_S_Host_CreateNewDirectory] = new UIActionMenuFileManagerCreateNewDirectory(this);
     2455    m_pool[UIActionIndex_M_FileManager_S_Guest_CreateNewDirectory] = new UIActionMenuFileManagerCreateNewDirectory(this);
     2456    m_pool[UIActionIndex_M_FileManager_S_Host_Copy] = new UIActionMenuFileManagerCopy(this);
     2457    m_pool[UIActionIndex_M_FileManager_S_Guest_Copy] = new UIActionMenuFileManagerCopy(this);
     2458    m_pool[UIActionIndex_M_FileManager_S_Host_Cut] = new UIActionMenuFileManagerCut(this);
     2459    m_pool[UIActionIndex_M_FileManager_S_Guest_Cut] = new UIActionMenuFileManagerCut(this);
     2460    m_pool[UIActionIndex_M_FileManager_S_Host_Paste] = new UIActionMenuFileManagerPaste(this);
     2461    m_pool[UIActionIndex_M_FileManager_S_Guest_Paste] = new UIActionMenuFileManagerPaste(this);
     2462    m_pool[UIActionIndex_M_FileManager_S_Host_SelectAll] = new UIActionMenuFileManagerSelectAll(this);
     2463    m_pool[UIActionIndex_M_FileManager_S_Guest_SelectAll] = new UIActionMenuFileManagerSelectAll(this);
     2464    m_pool[UIActionIndex_M_FileManager_S_Host_InvertSelection] = new UIActionMenuFileManagerInvertSelection(this);
     2465    m_pool[UIActionIndex_M_FileManager_S_Guest_InvertSelection] = new UIActionMenuFileManagerInvertSelection(this);
     2466    m_pool[UIActionIndex_M_FileManager_S_Host_ShowProperties] = new UIActionMenuFileManagerShowProperties(this);
     2467    m_pool[UIActionIndex_M_FileManager_S_Guest_ShowProperties] = new UIActionMenuFileManagerShowProperties(this);
    24682468
    24692469
    … …  
    24772477    m_menuUpdateHandlers[UIActionIndex_M_Log].ptf = &UIActionPool::updateMenuLogViewer;
    24782478
    2479     m_menuUpdateHandlers[UIActionIndex_M_GuestControlFileManager].ptf = &UIActionPool::updateMenuGuestControlFileManager;
     2479    m_menuUpdateHandlers[UIActionIndex_M_FileManager].ptf = &UIActionPool::updateMenuFileManager;
    24802480
    24812481    /* Invalidate all known menus: */
    … …  
    27752775}
    27762776
    2777 void UIActionPool::updateMenuGuestControlFileManager()
    2778 {
    2779     updateMenuGuestControlFileManagerWrapper(action(UIActionIndex_M_GuestControlFileManager)->menu());
     2777void UIActionPool::updateMenuFileManager()
     2778{
     2779    updateMenuFileManagerWrapper(action(UIActionIndex_M_FileManager)->menu());
    27802780
    27812781    /* Mark menu as valid: */
    2782     m_invalidations.remove(UIActionIndex_M_GuestControlFileManager);
    2783 }
    2784 
    2785 void UIActionPool::updateMenuGuestControlFileManagerWrapper(UIMenu *pMenu)
    2786 {
    2787     addAction(pMenu, action(UIActionIndex_M_GuestControlFileManager_T_Session));
    2788     addAction(pMenu, action(UIActionIndex_M_GuestControlFileManager_T_Options));
    2789     addAction(pMenu, action(UIActionIndex_M_GuestControlFileManager_T_FileOperations));
    2790     addAction(pMenu, action(UIActionIndex_M_GuestControlFileManager_T_Log));
    2791 
    2792     addAction(pMenu, action(UIActionIndex_M_GuestControlFileManager_M_HostSubmenu));
    2793     addAction(pMenu, action(UIActionIndex_M_GuestControlFileManager_M_GuestSubmenu));
    2794 
    2795     UIMenu *pHostSubmenu = action(UIActionIndex_M_GuestControlFileManager_M_HostSubmenu)->menu();
     2782    m_invalidations.remove(UIActionIndex_M_FileManager);
     2783}
     2784
     2785void UIActionPool::updateMenuFileManagerWrapper(UIMenu *pMenu)
     2786{
     2787    addAction(pMenu, action(UIActionIndex_M_FileManager_T_Session));
     2788    addAction(pMenu, action(UIActionIndex_M_FileManager_T_Options));
     2789    addAction(pMenu, action(UIActionIndex_M_FileManager_T_Operations));
     2790    addAction(pMenu, action(UIActionIndex_M_FileManager_T_Log));
     2791
     2792    addAction(pMenu, action(UIActionIndex_M_FileManager_M_HostSubmenu));
     2793    addAction(pMenu, action(UIActionIndex_M_FileManager_M_GuestSubmenu));
     2794
     2795    UIMenu *pHostSubmenu = action(UIActionIndex_M_FileManager_M_HostSubmenu)->menu();
    27962796    if (pHostSubmenu)
    27972797    {
    2798         addAction(pHostSubmenu, action(UIActionIndex_M_GuestControlFileManager_S_Host_GoUp));
    2799         addAction(pHostSubmenu, action(UIActionIndex_M_GuestControlFileManager_S_Host_GoHome));
    2800         addAction(pHostSubmenu, action(UIActionIndex_M_GuestControlFileManager_S_Host_Refresh));
    2801         addAction(pHostSubmenu, action(UIActionIndex_M_GuestControlFileManager_S_Host_Delete));
    2802         addAction(pHostSubmenu, action(UIActionIndex_M_GuestControlFileManager_S_Host_Rename));
    2803         addAction(pHostSubmenu, action(UIActionIndex_M_GuestControlFileManager_S_Host_CreateNewDirectory));
    2804         addAction(pHostSubmenu, action(UIActionIndex_M_GuestControlFileManager_S_Host_Copy));
    2805         addAction(pHostSubmenu, action(UIActionIndex_M_GuestControlFileManager_S_Host_Cut));
    2806         addAction(pHostSubmenu, action(UIActionIndex_M_GuestControlFileManager_S_Host_Paste));
    2807         addAction(pHostSubmenu, action(UIActionIndex_M_GuestControlFileManager_S_Host_SelectAll));
    2808         addAction(pHostSubmenu, action(UIActionIndex_M_GuestControlFileManager_S_Host_InvertSelection));
    2809         addAction(pHostSubmenu, action(UIActionIndex_M_GuestControlFileManager_S_Host_ShowProperties));
    2810     }
    2811 
    2812     UIMenu *pGuestSubmenu = action(UIActionIndex_M_GuestControlFileManager_M_GuestSubmenu)->menu();
     2798        addAction(pHostSubmenu, action(UIActionIndex_M_FileManager_S_Host_GoUp));
     2799        addAction(pHostSubmenu, action(UIActionIndex_M_FileManager_S_Host_GoHome));
     2800        addAction(pHostSubmenu, action(UIActionIndex_M_FileManager_S_Host_Refresh));
     2801        addAction(pHostSubmenu, action(UIActionIndex_M_FileManager_S_Host_Delete));
     2802        addAction(pHostSubmenu, action(UIActionIndex_M_FileManager_S_Host_Rename));
     2803        addAction(pHostSubmenu, action(UIActionIndex_M_FileManager_S_Host_CreateNewDirectory));
     2804        addAction(pHostSubmenu, action(UIActionIndex_M_FileManager_S_Host_Copy));
     2805        addAction(pHostSubmenu, action(UIActionIndex_M_FileManager_S_Host_Cut));
     2806        addAction(pHostSubmenu, action(UIActionIndex_M_FileManager_S_Host_Paste));
     2807        addAction(pHostSubmenu, action(UIActionIndex_M_FileManager_S_Host_SelectAll));
     2808        addAction(pHostSubmenu, action(UIActionIndex_M_FileManager_S_Host_InvertSelection));
     2809        addAction(pHostSubmenu, action(UIActionIndex_M_FileManager_S_Host_ShowProperties));
     2810    }
     2811
     2812    UIMenu *pGuestSubmenu = action(UIActionIndex_M_FileManager_M_GuestSubmenu)->menu();
    28132813    if (pGuestSubmenu)
    28142814    {
    2815         addAction(pGuestSubmenu, action(UIActionIndex_M_GuestControlFileManager_S_Host_GoUp));
    2816         addAction(pGuestSubmenu, action(UIActionIndex_M_GuestControlFileManager_S_Guest_GoHome));
    2817         addAction(pGuestSubmenu, action(UIActionIndex_M_GuestControlFileManager_S_Guest_Refresh));
    2818         addAction(pGuestSubmenu, action(UIActionIndex_M_GuestControlFileManager_S_Guest_Delete));
    2819         addAction(pGuestSubmenu, action(UIActionIndex_M_GuestControlFileManager_S_Guest_Rename));
    2820         addAction(pGuestSubmenu, action(UIActionIndex_M_GuestControlFileManager_S_Guest_CreateNewDirectory));
    2821         addAction(pGuestSubmenu, action(UIActionIndex_M_GuestControlFileManager_S_Guest_Copy));
    2822         addAction(pGuestSubmenu, action(UIActionIndex_M_GuestControlFileManager_S_Guest_Cut));
    2823         addAction(pGuestSubmenu, action(UIActionIndex_M_GuestControlFileManager_S_Guest_Paste));
    2824         addAction(pGuestSubmenu, action(UIActionIndex_M_GuestControlFileManager_S_Guest_SelectAll));
    2825         addAction(pGuestSubmenu, action(UIActionIndex_M_GuestControlFileManager_S_Guest_InvertSelection));
    2826         addAction(pGuestSubmenu, action(UIActionIndex_M_GuestControlFileManager_S_Guest_ShowProperties));
     2815        addAction(pGuestSubmenu, action(UIActionIndex_M_FileManager_S_Host_GoUp));
     2816        addAction(pGuestSubmenu, action(UIActionIndex_M_FileManager_S_Guest_GoHome));
     2817        addAction(pGuestSubmenu, action(UIActionIndex_M_FileManager_S_Guest_Refresh));
     2818        addAction(pGuestSubmenu, action(UIActionIndex_M_FileManager_S_Guest_Delete));
     2819        addAction(pGuestSubmenu, action(UIActionIndex_M_FileManager_S_Guest_Rename));
     2820        addAction(pGuestSubmenu, action(UIActionIndex_M_FileManager_S_Guest_CreateNewDirectory));
     2821        addAction(pGuestSubmenu, action(UIActionIndex_M_FileManager_S_Guest_Copy));
     2822        addAction(pGuestSubmenu, action(UIActionIndex_M_FileManager_S_Guest_Cut));
     2823        addAction(pGuestSubmenu, action(UIActionIndex_M_FileManager_S_Guest_Paste));
     2824        addAction(pGuestSubmenu, action(UIActionIndex_M_FileManager_S_Guest_SelectAll));
     2825        addAction(pGuestSubmenu, action(UIActionIndex_M_FileManager_S_Guest_InvertSelection));
     2826        addAction(pGuestSubmenu, action(UIActionIndex_M_FileManager_S_Guest_ShowProperties));
    28272827    }
    28282828}

  • trunk/src/VBox/Frontends/VirtualBox/src/globals/UIActionPool.h

    r75903 r76177  
    9898    UIActionIndex_M_Log_S_Save,
    9999
    100     /* Guest control file manager actions: */
    101     UIActionIndex_M_GuestControlFileManager,
    102     UIActionIndex_M_GuestControlFileManager_M_HostSubmenu,
    103     UIActionIndex_M_GuestControlFileManager_M_GuestSubmenu,
    104     UIActionIndex_M_GuestControlFileManager_S_CopyToGuest,
    105     UIActionIndex_M_GuestControlFileManager_S_CopyToHost,
    106     UIActionIndex_M_GuestControlFileManager_T_Options,
    107     UIActionIndex_M_GuestControlFileManager_T_Log,
    108     UIActionIndex_M_GuestControlFileManager_T_FileOperations,
    109     UIActionIndex_M_GuestControlFileManager_T_Session,
    110     UIActionIndex_M_GuestControlFileManager_S_Host_GoUp,
    111     UIActionIndex_M_GuestControlFileManager_S_Guest_GoUp,
    112     UIActionIndex_M_GuestControlFileManager_S_Host_GoHome,
    113     UIActionIndex_M_GuestControlFileManager_S_Guest_GoHome,
    114     UIActionIndex_M_GuestControlFileManager_S_Host_Refresh,
    115     UIActionIndex_M_GuestControlFileManager_S_Guest_Refresh,
    116     UIActionIndex_M_GuestControlFileManager_S_Host_Delete,
    117     UIActionIndex_M_GuestControlFileManager_S_Guest_Delete,
    118     UIActionIndex_M_GuestControlFileManager_S_Host_Rename,
    119     UIActionIndex_M_GuestControlFileManager_S_Guest_Rename,
    120     UIActionIndex_M_GuestControlFileManager_S_Host_CreateNewDirectory,
    121     UIActionIndex_M_GuestControlFileManager_S_Guest_CreateNewDirectory,
    122     UIActionIndex_M_GuestControlFileManager_S_Host_Copy,
    123     UIActionIndex_M_GuestControlFileManager_S_Guest_Copy,
    124     UIActionIndex_M_GuestControlFileManager_S_Host_Cut,
    125     UIActionIndex_M_GuestControlFileManager_S_Guest_Cut,
    126     UIActionIndex_M_GuestControlFileManager_S_Host_Paste,
    127     UIActionIndex_M_GuestControlFileManager_S_Guest_Paste,
    128     UIActionIndex_M_GuestControlFileManager_S_Host_SelectAll,
    129     UIActionIndex_M_GuestControlFileManager_S_Guest_SelectAll,
    130     UIActionIndex_M_GuestControlFileManager_S_Host_InvertSelection,
    131     UIActionIndex_M_GuestControlFileManager_S_Guest_InvertSelection,
    132     UIActionIndex_M_GuestControlFileManager_S_Host_ShowProperties,
    133     UIActionIndex_M_GuestControlFileManager_S_Guest_ShowProperties,
     100    /* File Manager actions: */
     101    UIActionIndex_M_FileManager,
     102    UIActionIndex_M_FileManager_M_HostSubmenu,
     103    UIActionIndex_M_FileManager_M_GuestSubmenu,
     104    UIActionIndex_M_FileManager_S_CopyToGuest,
     105    UIActionIndex_M_FileManager_S_CopyToHost,
     106    UIActionIndex_M_FileManager_T_Options,
     107    UIActionIndex_M_FileManager_T_Log,
     108    UIActionIndex_M_FileManager_T_Operations,
     109    UIActionIndex_M_FileManager_T_Session,
     110    UIActionIndex_M_FileManager_S_Host_GoUp,
     111    UIActionIndex_M_FileManager_S_Guest_GoUp,
     112    UIActionIndex_M_FileManager_S_Host_GoHome,
     113    UIActionIndex_M_FileManager_S_Guest_GoHome,
     114    UIActionIndex_M_FileManager_S_Host_Refresh,
     115    UIActionIndex_M_FileManager_S_Guest_Refresh,
     116    UIActionIndex_M_FileManager_S_Host_Delete,
     117    UIActionIndex_M_FileManager_S_Guest_Delete,
     118    UIActionIndex_M_FileManager_S_Host_Rename,
     119    UIActionIndex_M_FileManager_S_Guest_Rename,
     120    UIActionIndex_M_FileManager_S_Host_CreateNewDirectory,
     121    UIActionIndex_M_FileManager_S_Guest_CreateNewDirectory,
     122    UIActionIndex_M_FileManager_S_Host_Copy,
     123    UIActionIndex_M_FileManager_S_Guest_Copy,
     124    UIActionIndex_M_FileManager_S_Host_Cut,
     125    UIActionIndex_M_FileManager_S_Guest_Cut,
     126    UIActionIndex_M_FileManager_S_Host_Paste,
     127    UIActionIndex_M_FileManager_S_Guest_Paste,
     128    UIActionIndex_M_FileManager_S_Host_SelectAll,
     129    UIActionIndex_M_FileManager_S_Guest_SelectAll,
     130    UIActionIndex_M_FileManager_S_Host_InvertSelection,
     131    UIActionIndex_M_FileManager_S_Guest_InvertSelection,
     132    UIActionIndex_M_FileManager_S_Host_ShowProperties,
     133    UIActionIndex_M_FileManager_S_Guest_ShowProperties,
    134134
    135135
    … …  
    612612    virtual void updateMenuLogViewerWrapper(UIMenu *pMenu);
    613613
    614     /** Updates 'Guest Control Window' menu. */
    615     virtual void updateMenuGuestControlFileManager();
    616     /** Updates 'Guest Control' @a pMenu. */
    617     virtual void updateMenuGuestControlFileManagerWrapper(UIMenu *pMenu);
     614    /** Updates 'File Manager' menu. */
     615    virtual void updateMenuFileManager();
     616    /** Updates 'File Manager' @a pMenu. */
     617    virtual void updateMenuFileManagerWrapper(UIMenu *pMenu);
    618618
    619619    /** Updates shortcuts. */

  • trunk/src/VBox/Frontends/VirtualBox/src/globals/UIActionPoolRuntime.cpp

    r76062 r76177  
    230230};
    231231
    232 /** Simple action extension, used as 'Show Guest Control File Manager Dialog' action class. */
    233 class UIActionSimpleRuntimeShowGuestControlFileManagerDialog : public UIActionSimple
    234 {
    235     Q_OBJECT;
    236 
    237 public:
    238 
    239     /** Constructs action passing @a pParent to the base-class. */
    240     UIActionSimpleRuntimeShowGuestControlFileManagerDialog(UIActionPool *pParent)
     232/** Simple action extension, used as 'Show File Manager Dialog' action class. */
     233class UIActionSimpleRuntimeShowFileManagerDialog : public UIActionSimple
     234{
     235    Q_OBJECT;
     236
     237public:
     238
     239    /** Constructs action passing @a pParent to the base-class. */
     240    UIActionSimpleRuntimeShowFileManagerDialog(UIActionPool *pParent)
    241241        : UIActionSimple(pParent, ":/session_info_16px.png", ":/session_info_disabled_16px.png", true)
    242242    {}
    … …  
    247247    virtual int extraDataID() const /* override */
    248248    {
    249         return UIExtraDataMetaDefs::RuntimeMenuMachineActionType_GuestControlFileManagerDialog;
    250     }
    251     /** Returns action extra-data key. */
    252     virtual QString extraDataKey() const /* override */
    253     {
    254         return gpConverter->toInternalString(UIExtraDataMetaDefs::RuntimeMenuMachineActionType_GuestControlFileManagerDialog);
    255     }
    256     /** Returns whether action is allowed. */
    257     virtual bool isAllowed() const /* override */
    258     {
    259         return actionPool()->toRuntime()->isAllowedInMenuMachine(UIExtraDataMetaDefs::RuntimeMenuMachineActionType_GuestControlFileManagerDialog);
    260     }
    261 
    262     /** Returns shortcut extra-data ID. */
    263     virtual QString shortcutExtraDataID() const /* override */
    264     {
    265         return QString("GuestControlFileManagerDialog");
     249        return UIExtraDataMetaDefs::RuntimeMenuMachineActionType_FileManagerDialog;
     250    }
     251    /** Returns action extra-data key. */
     252    virtual QString extraDataKey() const /* override */
     253    {
     254        return gpConverter->toInternalString(UIExtraDataMetaDefs::RuntimeMenuMachineActionType_FileManagerDialog);
     255    }
     256    /** Returns whether action is allowed. */
     257    virtual bool isAllowed() const /* override */
     258    {
     259        return actionPool()->toRuntime()->isAllowedInMenuMachine(UIExtraDataMetaDefs::RuntimeMenuMachineActionType_FileManagerDialog);
     260    }
     261
     262    /** Returns shortcut extra-data ID. */
     263    virtual QString shortcutExtraDataID() const /* override */
     264    {
     265        return QString("FileManagerDialog");
    266266    }
    267267
    … …  
    276276    {
    277277        setName(QApplication::translate("UIActionPool", "File Manager..."));
    278         setStatusTip(QApplication::translate("UIActionPool", "Display the virtual machine guest control file manager window"));
     278        setStatusTip(QApplication::translate("UIActionPool", "Display the virtual machine file manager window"));
    279279    }
    280280};
    … …  
    33233323    m_pool[UIActionIndexRT_M_Machine_S_TakeSnapshot] = new UIActionSimpleRuntimePerformTakeSnapshot(this);
    33243324    m_pool[UIActionIndexRT_M_Machine_S_ShowInformation] = new UIActionSimpleRuntimeShowInformationDialog(this);
    3325     m_pool[UIActionIndexRT_M_Machine_S_ShowGuestControlFileManager] = new UIActionSimpleRuntimeShowGuestControlFileManagerDialog(this);
     3325    m_pool[UIActionIndexRT_M_Machine_S_ShowFileManager] = new UIActionSimpleRuntimeShowFileManagerDialog(this);
    33263326    m_pool[UIActionIndexRT_M_Machine_S_ShowGuestProcessControl] = new UIActionSimpleRuntimeShowGuestProcessControlDialog(this);
    33273327    m_pool[UIActionIndexRT_M_Machine_T_Pause] = new UIActionToggleRuntimePause(this);
    … …  
    36033603    updateMenuLogViewerWindow();
    36043604
    3605     /* 'Guest Control File Manager' menu: */
    3606     updateMenuGuestControlFileManager();
     3605    /* 'File Manager' menu: */
     3606    updateMenuFileManager();
    36073607}
    36083608
    … …  
    36323632    /* 'Information Dialog' action: */
    36333633    fSeparator = addAction(pMenu, action(UIActionIndexRT_M_Machine_S_ShowInformation)) || fSeparator;
    3634     fSeparator = addAction(pMenu, action(UIActionIndexRT_M_Machine_S_ShowGuestControlFileManager)) || fSeparator;
     3634    fSeparator = addAction(pMenu, action(UIActionIndexRT_M_Machine_S_ShowFileManager)) || fSeparator;
    36353635#ifdef VBOX_GUI_WITH_GUEST_CONTROL_UI
    36363636    fSeparator = addAction(pMenu, action(UIActionIndexRT_M_Machine_S_ShowGuestProcessControl)) || fSeparator;

  • trunk/src/VBox/Frontends/VirtualBox/src/globals/UIActionPoolRuntime.h

    r76062 r76177  
    4343    UIActionIndexRT_M_Machine_S_TakeSnapshot,
    4444    UIActionIndexRT_M_Machine_S_ShowInformation,
    45     UIActionIndexRT_M_Machine_S_ShowGuestControlFileManager,
     45    UIActionIndexRT_M_Machine_S_ShowFileManager,
    4646    UIActionIndexRT_M_Machine_S_ShowGuestProcessControl,
    4747    UIActionIndexRT_M_Machine_T_Pause,

  • trunk/src/VBox/Frontends/VirtualBox/src/guestctrl/UIFileManager.cpp

    r76176 r76177  
    11/* $Id$ */
    22/** @file
    3  * VBox Qt GUI - UIGuestControlFileManager class implementation.
     3 * VBox Qt GUI - UIFileManager class implementation.
    44 */
    55
    … …  
    4141# include "UIIconPool.h"
    4242# include "UIGuestControlConsole.h"
    43 # include "UIGuestControlFileManager.h"
    44 # include "UIGuestControlFileManagerSessionPanel.h"
    45 # include "UIGuestControlFileManagerOptionsPanel.h"
    46 # include "UIGuestControlFileManagerLogPanel.h"
    47 # include "UIGuestControlFileManagerOperationsPanel.h"
    48 # include "UIGuestFileTable.h"
     43# include "UIFileManager.h"
     44# include "UIFileManagerSessionPanel.h"
     45# include "UIFileManagerOptionsPanel.h"
     46# include "UIFileManagerLogPanel.h"
     47# include "UIFileManagerOperationsPanel.h"
     48# include "UIFileManagerGuestTable.h"
    4949# include "UIGuestControlInterface.h"
    50 # include "UIHostFileTable.h"
     50# include "UIFileManagerHostTable.h"
    5151# include "UIToolBar.h"
    5252# include "VBoxGlobal.h"
    … …  
    7979
    8080/*********************************************************************************************************************************
    81 *   UIGuestControlFileManagerOptions implementation.                                                                             *
     81*   UIFileManagerOptions implementation.                                                                             *
    8282*********************************************************************************************************************************/
    8383
    84 UIGuestControlFileManagerOptions *UIGuestControlFileManagerOptions::m_pInstance = 0;
    85 
    86 UIGuestControlFileManagerOptions* UIGuestControlFileManagerOptions::instance()
     84UIFileManagerOptions *UIFileManagerOptions::m_pInstance = 0;
     85
     86UIFileManagerOptions* UIFileManagerOptions::instance()
    8787{
    8888    if (!m_pInstance)
    89     m_pInstance = new UIGuestControlFileManagerOptions;
     89    m_pInstance = new UIFileManagerOptions;
    9090    return m_pInstance;
    9191}
    9292
    93 void UIGuestControlFileManagerOptions::create()
     93void UIFileManagerOptions::create()
    9494{
    9595    if (m_pInstance)
    9696        return;
    97     m_pInstance = new UIGuestControlFileManagerOptions;
    98 }
    99 
    100 void UIGuestControlFileManagerOptions::destroy()
     97    m_pInstance = new UIFileManagerOptions;
     98}
     99
     100void UIFileManagerOptions::destroy()
    101101{
    102102    delete m_pInstance;
    … …  
    104104}
    105105
    106  UIGuestControlFileManagerOptions::~UIGuestControlFileManagerOptions()
    107 {
    108 
    109 }
    110 
    111 UIGuestControlFileManagerOptions::UIGuestControlFileManagerOptions()
     106 UIFileManagerOptions::~UIFileManagerOptions()
     107{
     108
     109}
     110
     111UIFileManagerOptions::UIFileManagerOptions()
    112112    : bListDirectoriesOnTop(true)
    113113    , bAskDeleteConfirmation(false)
    … …  
    126126
    127127/*********************************************************************************************************************************
    128 *   UIGuestControlFileManager implementation.                                                                                    *
     128*   UIFileManager implementation.                                                                                    *
    129129*********************************************************************************************************************************/
    130130
    131 UIGuestControlFileManager::UIGuestControlFileManager(EmbedTo enmEmbedding, UIActionPool *pActionPool,
     131UIFileManager::UIFileManager(EmbedTo enmEmbedding, UIActionPool *pActionPool,
    132132                                                     const CGuest &comGuest, QWidget *pParent, bool fShowToolbar /* = true */)
    133133    : QIWithRetranslateUI<QWidget>(pParent)
    … …  
    153153    retranslateUi();
    154154    restorePanelVisibility();
    155     UIGuestControlFileManagerOptions::create();
    156 }
    157 
    158 UIGuestControlFileManager::~UIGuestControlFileManager()
     155    UIFileManagerOptions::create();
     156}
     157
     158UIFileManager::~UIFileManager()
    159159{
    160160    if (m_comGuest.isOk() && m_pQtGuestListener && m_comGuestListener.isOk())
    … …  
    167167
    168168    saveOptions();
    169     UIGuestControlFileManagerOptions::destroy();
    170 }
    171 
    172 QMenu *UIGuestControlFileManager::menu() const
     169    UIFileManagerOptions::destroy();
     170}
     171
     172QMenu *UIFileManager::menu() const
    173173{
    174174    if (!m_pActionPool)
    175175        return 0;
    176     return m_pActionPool->action(UIActionIndex_M_GuestControlFileManager)->menu();
    177 }
    178 
    179 void UIGuestControlFileManager::retranslateUi()
    180 {
    181 }
    182 
    183 void UIGuestControlFileManager::prepareGuestListener()
     176    return m_pActionPool->action(UIActionIndex_M_FileManager)->menu();
     177}
     178
     179void UIFileManager::retranslateUi()
     180{
     181}
     182
     183void UIFileManager::prepareGuestListener()
    184184{
    185185    if (m_comGuest.isOk())
    … …  
    193193}
    194194
    195 void UIGuestControlFileManager::prepareObjects()
     195void UIFileManager::prepareObjects()
    196196{
    197197    /* m_pMainLayout is the outer most layout containing the main toolbar and splitter widget: */
    … …  
    239239        pFileTableContainerLayout->setSpacing(0);
    240240        pFileTableContainerLayout->setContentsMargins(0, 0, 0, 0);
    241         m_pGuestFileTable = new UIGuestFileTable(m_pActionPool);
     241        m_pGuestFileTable = new UIFileManagerGuestTable(m_pActionPool);
    242242        m_pGuestFileTable->setEnabled(false);
    243243
    244         m_pHostFileTable = new UIHostFileTable(m_pActionPool);
     244        m_pHostFileTable = new UIFileManagerHostTable(m_pActionPool);
    245245        if (m_pHostFileTable)
    246246        {
    247             connect(m_pHostFileTable, &UIHostFileTable::sigLogOutput,
    248                     this, &UIGuestControlFileManager::sltReceieveLogOutput);
    249             connect(m_pHostFileTable, &UIHostFileTable::sigDeleteConfirmationOptionChanged,
    250                     this, &UIGuestControlFileManager::sltHandleOptionsUpdated);
     247            connect(m_pHostFileTable, &UIFileManagerHostTable::sigLogOutput,
     248                    this, &UIFileManager::sltReceieveLogOutput);
     249            connect(m_pHostFileTable, &UIFileManagerHostTable::sigDeleteConfirmationOptionChanged,
     250                    this, &UIFileManager::sltHandleOptionsUpdated);
    251251            pFileTableContainerLayout->addWidget(m_pHostFileTable);
    252252        }
    … …  
    254254        if (m_pGuestFileTable)
    255255        {
    256             connect(m_pGuestFileTable, &UIGuestFileTable::sigLogOutput,
    257                     this, &UIGuestControlFileManager::sltReceieveLogOutput);
    258             connect(m_pGuestFileTable, &UIGuestFileTable::sigNewFileOperation,
    259                     this, &UIGuestControlFileManager::sltReceieveNewFileOperation);
    260             connect(m_pGuestFileTable, &UIGuestFileTable::sigDeleteConfirmationOptionChanged,
    261                     this, &UIGuestControlFileManager::sltHandleOptionsUpdated);
     256            connect(m_pGuestFileTable, &UIFileManagerGuestTable::sigLogOutput,
     257                    this, &UIFileManager::sltReceieveLogOutput);
     258            connect(m_pGuestFileTable, &UIFileManagerGuestTable::sigNewFileOperation,
     259                    this, &UIFileManager::sltReceieveNewFileOperation);
     260            connect(m_pGuestFileTable, &UIFileManagerGuestTable::sigDeleteConfirmationOptionChanged,
     261                    this, &UIFileManager::sltHandleOptionsUpdated);
    262262            pFileTableContainerLayout->addWidget(m_pGuestFileTable);
    263263        }
    … …  
    265265
    266266    pTopLayout->addLayout(pFileTableContainerLayout);
    267     m_pSessionPanel = new UIGuestControlFileManagerSessionPanel(this /* manager dialog */, 0 /*parent */);
     267    m_pSessionPanel = new UIFileManagerSessionPanel(this /* manager dialog */, 0 /*parent */);
    268268    if (m_pSessionPanel)
    269269    {
    270270        m_pSessionPanel->hide();
    271         m_panelActionMap.insert(m_pSessionPanel, m_pActionPool->action(UIActionIndex_M_GuestControlFileManager_T_Session));
     271        m_panelActionMap.insert(m_pSessionPanel, m_pActionPool->action(UIActionIndex_M_FileManager_T_Session));
    272272        pTopLayout->addWidget(m_pSessionPanel);
    273273    }
    274274
    275275    m_pOptionsPanel =
    276         new UIGuestControlFileManagerOptionsPanel(this /* manager dialog */,
    277                                                    0 /*parent */, UIGuestControlFileManagerOptions::instance());
     276        new UIFileManagerOptionsPanel(this /* manager dialog */,
     277                                                   0 /*parent */, UIFileManagerOptions::instance());
    278278    if (m_pOptionsPanel)
    279279    {
    280280        m_pOptionsPanel->hide();
    281         m_panelActionMap.insert(m_pOptionsPanel, m_pActionPool->action(UIActionIndex_M_GuestControlFileManager_T_Options));
    282         connect(m_pOptionsPanel, &UIGuestControlFileManagerOptionsPanel::sigOptionsChanged,
    283                 this, &UIGuestControlFileManager::sltListDirectoriesBeforeChanged);
     281        m_panelActionMap.insert(m_pOptionsPanel, m_pActionPool->action(UIActionIndex_M_FileManager_T_Options));
     282        connect(m_pOptionsPanel, &UIFileManagerOptionsPanel::sigOptionsChanged,
     283                this, &UIFileManager::sltListDirectoriesBeforeChanged);
    284284        pTopLayout->addWidget(m_pOptionsPanel);
    285285    }
    … …  
    288288
    289289    m_pOperationsPanel =
    290         new UIGuestControlFileManagerOperationsPanel(this /* manager dialog */, 0 /*parent */);
     290        new UIFileManagerOperationsPanel(this /* manager dialog */, 0 /*parent */);
    291291    if (m_pOperationsPanel)
    292292    {
    293293        m_pOperationsPanel->hide();
    294         connect(m_pOperationsPanel, &UIGuestControlFileManagerOperationsPanel::sigFileOperationComplete,
    295                 this, &UIGuestControlFileManager::sltFileOperationComplete);
    296         connect(m_pOperationsPanel, &UIGuestControlFileManagerOperationsPanel::sigFileOperationFail,
    297                 this, &UIGuestControlFileManager::sltReceieveLogOutput);
    298         m_panelActionMap.insert(m_pOperationsPanel, m_pActionPool->action(UIActionIndex_M_GuestControlFileManager_T_FileOperations));
    299     }
    300 
    301     m_pLogPanel = new UIGuestControlFileManagerLogPanel(this /* manager dialog */, 0 /*parent */);
     294        connect(m_pOperationsPanel, &UIFileManagerOperationsPanel::sigFileOperationComplete,
     295                this, &UIFileManager::sltFileOperationComplete);
     296        connect(m_pOperationsPanel, &UIFileManagerOperationsPanel::sigFileOperationFail,
     297                this, &UIFileManager::sltReceieveLogOutput);
     298        m_panelActionMap.insert(m_pOperationsPanel, m_pActionPool->action(UIActionIndex_M_FileManager_T_Operations));
     299    }
     300
     301    m_pLogPanel = new UIFileManagerLogPanel(this /* manager dialog */, 0 /*parent */);
    302302    if (m_pLogPanel)
    303303    {
    304304        m_pLogPanel->hide();
    305         m_panelActionMap.insert(m_pLogPanel, m_pActionPool->action(UIActionIndex_M_GuestControlFileManager_T_Log));
     305        m_panelActionMap.insert(m_pLogPanel, m_pActionPool->action(UIActionIndex_M_FileManager_T_Log));
    306306    }
    307307
    … …  
    317317}
    318318
    319 void UIGuestControlFileManager::prepareVerticalToolBar(QHBoxLayout *layout)
     319void UIFileManager::prepareVerticalToolBar(QHBoxLayout *layout)
    320320{
    321321    m_pVerticalToolBar = new UIToolBar;
    … …  
    335335
    336336    m_pVerticalToolBar->addWidget(topSpacerWidget);
    337     m_pVerticalToolBar->addAction(m_pActionPool->action(UIActionIndex_M_GuestControlFileManager_S_CopyToHost));
    338     m_pVerticalToolBar->addAction(m_pActionPool->action(UIActionIndex_M_GuestControlFileManager_S_CopyToGuest));
     337    m_pVerticalToolBar->addAction(m_pActionPool->action(UIActionIndex_M_FileManager_S_CopyToHost));
     338    m_pVerticalToolBar->addAction(m_pActionPool->action(UIActionIndex_M_FileManager_S_CopyToGuest));
    339339    m_pVerticalToolBar->addWidget(bottomSpacerWidget);
    340340
    341     connect(m_pActionPool->action(UIActionIndex_M_GuestControlFileManager_S_CopyToHost), &QAction::triggered,
    342             this, &UIGuestControlFileManager::sltCopyGuestToHost);
    343     connect(m_pActionPool->action(UIActionIndex_M_GuestControlFileManager_S_CopyToGuest), &QAction::triggered,
    344              this, &UIGuestControlFileManager::sltCopyHostToGuest);
     341    connect(m_pActionPool->action(UIActionIndex_M_FileManager_S_CopyToHost), &QAction::triggered,
     342            this, &UIFileManager::sltCopyGuestToHost);
     343    connect(m_pActionPool->action(UIActionIndex_M_FileManager_S_CopyToGuest), &QAction::triggered,
     344             this, &UIFileManager::sltCopyHostToGuest);
    345345
    346346    layout ->addWidget(m_pVerticalToolBar);
    347347}
    348348
    349 void UIGuestControlFileManager::prepareConnections()
     349void UIFileManager::prepareConnections()
    350350{
    351351    if (m_pQtGuestListener)
    352352    {
    353353        connect(m_pQtGuestListener->getWrapped(), &UIMainEventListener::sigGuestSessionUnregistered,
    354                 this, &UIGuestControlFileManager::sltGuestSessionUnregistered);
     354                this, &UIFileManager::sltGuestSessionUnregistered);
    355355    }
    356356    if (m_pSessionPanel)
    357357    {
    358         connect(m_pSessionPanel, &UIGuestControlFileManagerSessionPanel::sigCreateSession,
    359                 this, &UIGuestControlFileManager::sltCreateSession);
    360         connect(m_pSessionPanel, &UIGuestControlFileManagerSessionPanel::sigCloseSession,
    361                 this, &UIGuestControlFileManager::sltCloseSession);
    362     }
    363 }
    364 
    365 void UIGuestControlFileManager::prepareToolBar()
     358        connect(m_pSessionPanel, &UIFileManagerSessionPanel::sigCreateSession,
     359                this, &UIFileManager::sltCreateSession);
     360        connect(m_pSessionPanel, &UIFileManagerSessionPanel::sigCloseSession,
     361                this, &UIFileManager::sltCloseSession);
     362    }
     363}
     364
     365void UIFileManager::prepareToolBar()
    366366{
    367367    /* Create toolbar: */
    … …  
    374374        m_pToolBar->setToolButtonStyle(Qt::ToolButtonTextUnderIcon);
    375375
    376         m_pToolBar->addAction(m_pActionPool->action(UIActionIndex_M_GuestControlFileManager_T_Session));
    377         m_pToolBar->addAction(m_pActionPool->action(UIActionIndex_M_GuestControlFileManager_T_Options));
    378         m_pToolBar->addAction(m_pActionPool->action(UIActionIndex_M_GuestControlFileManager_T_FileOperations));
    379         m_pToolBar->addAction(m_pActionPool->action(UIActionIndex_M_GuestControlFileManager_T_Log));
    380 
    381         connect(m_pActionPool->action(UIActionIndex_M_GuestControlFileManager_T_Options), &QAction::toggled,
    382                 this, &UIGuestControlFileManager::sltPanelActionToggled);
    383         connect(m_pActionPool->action(UIActionIndex_M_GuestControlFileManager_T_Log), &QAction::toggled,
    384                 this, &UIGuestControlFileManager::sltPanelActionToggled);
    385         connect(m_pActionPool->action(UIActionIndex_M_GuestControlFileManager_T_Session), &QAction::toggled,
    386                 this, &UIGuestControlFileManager::sltPanelActionToggled);
    387         connect(m_pActionPool->action(UIActionIndex_M_GuestControlFileManager_T_FileOperations), &QAction::toggled,
    388                 this, &UIGuestControlFileManager::sltPanelActionToggled);
     376        m_pToolBar->addAction(m_pActionPool->action(UIActionIndex_M_FileManager_T_Session));
     377        m_pToolBar->addAction(m_pActionPool->action(UIActionIndex_M_FileManager_T_Options));
     378        m_pToolBar->addAction(m_pActionPool->action(UIActionIndex_M_FileManager_T_Operations));
     379        m_pToolBar->addAction(m_pActionPool->action(UIActionIndex_M_FileManager_T_Log));
     380
     381        connect(m_pActionPool->action(UIActionIndex_M_FileManager_T_Options), &QAction::toggled,
     382                this, &UIFileManager::sltPanelActionToggled);
     383        connect(m_pActionPool->action(UIActionIndex_M_FileManager_T_Log), &QAction::toggled,
     384                this, &UIFileManager::sltPanelActionToggled);
     385        connect(m_pActionPool->action(UIActionIndex_M_FileManager_T_Session), &QAction::toggled,
     386                this, &UIFileManager::sltPanelActionToggled);
     387        connect(m_pActionPool->action(UIActionIndex_M_FileManager_T_Operations), &QAction::toggled,
     388                this, &UIFileManager::sltPanelActionToggled);
    389389
    390390#ifdef TEST_COPY
    … …  
    397397
    398398        connect(pSession, &QAction::triggered,
    399                 this, &UIGuestControlFileManager::sltTestSession);
     399                this, &UIFileManager::sltTestSession);
    400400        connect(pCopy, &QAction::triggered,
    401                 this, &UIGuestControlFileManager::sltTestCopy);
     401                this, &UIFileManager::sltTestCopy);
    402402
    403403#endif
    … …  
    418418
    419419
    420 void UIGuestControlFileManager::sltGuestSessionUnregistered(CGuestSession guestSession)
     420void UIFileManager::sltGuestSessionUnregistered(CGuestSession guestSession)
    421421{
    422422    if (guestSession.isNull())
    … …  
    429429}
    430430
    431 void UIGuestControlFileManager::sltCreateSession(QString strUserName, QString strPassword)
     431void UIFileManager::sltCreateSession(QString strUserName, QString strPassword)
    432432{
    433433    if (!UIGuestControlInterface::isGuestAdditionsAvailable(m_comGuest))
    … …  
    445445}
    446446
    447 void UIGuestControlFileManager::sltCloseSession()
     447void UIFileManager::sltCloseSession()
    448448{
    449449    if (!m_comGuestSession.isOk())
    … …  
    464464}
    465465
    466 void UIGuestControlFileManager::sltGuestSessionStateChanged(const CGuestSessionStateChangedEvent &cEvent)
     466void UIFileManager::sltGuestSessionStateChanged(const CGuestSessionStateChangedEvent &cEvent)
    467467{
    468468    if (cEvent.isOk() /*&& m_comGuestSession.isOk()*/)
    … …  
    483483}
    484484
    485 void UIGuestControlFileManager::sltReceieveLogOutput(QString strOutput, FileManagerLogType eLogType)
     485void UIFileManager::sltReceieveLogOutput(QString strOutput, FileManagerLogType eLogType)
    486486{
    487487    appendLog(strOutput, eLogType);
    488488}
    489489
    490 void UIGuestControlFileManager::sltCopyGuestToHost()
     490void UIFileManager::sltCopyGuestToHost()
    491491{
    492492    copyToHost();
    493493}
    494494
    495 void UIGuestControlFileManager::sltCopyHostToGuest()
     495void UIFileManager::sltCopyHostToGuest()
    496496{
    497497    copyToGuest();
    498498}
    499499
    500 void UIGuestControlFileManager::sltPanelActionToggled(bool fChecked)
     500void UIFileManager::sltPanelActionToggled(bool fChecked)
    501501{
    502502    QAction *pSenderAction = qobject_cast<QAction*>(sender());
    503503    if (!pSenderAction)
    504504        return;
    505     UIGuestControlFileManagerPanel* pPanel = 0;
     505    UIFileManagerPanel* pPanel = 0;
    506506    /* Look for the sender() within the m_panelActionMap's values: */
    507     for (QMap<UIGuestControlFileManagerPanel*, QAction*>::const_iterator iterator = m_panelActionMap.begin();
     507    for (QMap<UIFileManagerPanel*, QAction*>::const_iterator iterator = m_panelActionMap.begin();
    508508        iterator != m_panelActionMap.end(); ++iterator)
    509509    {
    … …  
    519519}
    520520
    521 void UIGuestControlFileManager::sltListDirectoriesBeforeChanged()
     521void UIFileManager::sltListDirectoriesBeforeChanged()
    522522{
    523523    if (m_pGuestFileTable)
    … …  
    527527}
    528528
    529 void UIGuestControlFileManager::sltReceieveNewFileOperation(const CProgress &comProgress)
     529void UIFileManager::sltReceieveNewFileOperation(const CProgress &comProgress)
    530530{
    531531    if (m_pOperationsPanel)
    … …  
    533533}
    534534
    535 void UIGuestControlFileManager::sltFileOperationComplete(QUuid progressId)
     535void UIFileManager::sltFileOperationComplete(QUuid progressId)
    536536{
    537537    Q_UNUSED(progressId);
    … …  
    543543}
    544544
    545 void UIGuestControlFileManager::sltHandleOptionsUpdated()
     545void UIFileManager::sltHandleOptionsUpdated()
    546546{
    547547    if (m_pOptionsPanel)
    … …  
    551551}
    552552
    553 void UIGuestControlFileManager::copyToHost()
     553void UIFileManager::copyToHost()
    554554{
    555555    if (!m_pGuestFileTable || !m_pHostFileTable)
    … …  
    560560}
    561561
    562 void UIGuestControlFileManager::copyToGuest()
     562void UIFileManager::copyToGuest()
    563563{
    564564    if (!m_pGuestFileTable || !m_pHostFileTable)
    … …  
    569569}
    570570
    571 void UIGuestControlFileManager::initFileTable()
     571void UIFileManager::initFileTable()
    572572{
    573573    if (!m_comGuestSession.isOk() || m_comGuestSession.GetStatus() != KGuestSessionStatus_Started)
    … …  
    578578}
    579579
    580 void UIGuestControlFileManager::postSessionCreated()
     580void UIFileManager::postSessionCreated()
    581581{
    582582    if (m_pSessionPanel)
    … …  
    588588}
    589589
    590 void UIGuestControlFileManager::postSessionClosed()
     590void UIFileManager::postSessionClosed()
    591591{
    592592    if (m_pSessionPanel)
    … …  
    598598}
    599599
    600 bool UIGuestControlFileManager::createSession(const QString& strUserName, const QString& strPassword,
     600bool UIFileManager::createSession(const QString& strUserName, const QString& strPassword,
    601601                                              const QString& strDomain /* not used currently */)
    602602{
    … …  
    627627
    628628    connect(m_pQtSessionListener->getWrapped(), &UIMainEventListener::sigGuestSessionStatedChanged,
    629             this, &UIGuestControlFileManager::sltGuestSessionStateChanged);
     629            this, &UIFileManager::sltGuestSessionStateChanged);
    630630     /* Wait session to start. For some reason we cannot get GuestSessionStatusChanged event
    631631        consistently. So we wait: */
    … …  
    642642}
    643643
    644 void UIGuestControlFileManager::prepareListener(ComObjPtr<UIMainEventListenerImpl> &QtListener,
     644void UIFileManager::prepareListener(ComObjPtr<UIMainEventListenerImpl> &QtListener,
    645645                                                CEventListener &comEventListener,
    646646                                                CEventSource comEventSource, QVector<KVBoxEventType>& eventTypes)
    … …  
    665665}
    666666
    667 void UIGuestControlFileManager::cleanupListener(ComObjPtr<UIMainEventListenerImpl> &QtListener,
     667void UIFileManager::cleanupListener(ComObjPtr<UIMainEventListenerImpl> &QtListener,
    668668                                                CEventListener &comEventListener,
    669669                                                CEventSource comEventSource)
    … …  
    687687
    688688template<typename T>
    689 QStringList UIGuestControlFileManager::getFsObjInfoStringList(const T &fsObjectInfo) const
     689QStringList UIFileManager::getFsObjInfoStringList(const T &fsObjectInfo) const
    690690{
    691691    QStringList objectInfo;
    … …  
    696696}
    697697
    698 void UIGuestControlFileManager::saveOptions()
     698void UIFileManager::saveOptions()
    699699{
    700700    /* Save a list of currently visible panels: */
    701701    QStringList strNameList;
    702     foreach(UIGuestControlFileManagerPanel* pPanel, m_visiblePanelsList)
     702    foreach(UIFileManagerPanel* pPanel, m_visiblePanelsList)
    703703        strNameList.append(pPanel->panelName());
    704     gEDataManager->setGuestControlFileManagerVisiblePanels(strNameList);
     704    gEDataManager->setFileManagerVisiblePanels(strNameList);
    705705    /* Save the options: */
    706     UIGuestControlFileManagerOptions *pOptions = UIGuestControlFileManagerOptions::instance();
     706    UIFileManagerOptions *pOptions = UIFileManagerOptions::instance();
    707707    if (pOptions)
    708708    {
    709         gEDataManager->setGuestControlFileManagerOptions(pOptions->bListDirectoriesOnTop,
     709        gEDataManager->setFileManagerOptions(pOptions->bListDirectoriesOnTop,
    710710                                                         pOptions->bAskDeleteConfirmation,
    711711                                                         pOptions->bShowHumanReadableSizes);
    … …  
    713713}
    714714
    715 void UIGuestControlFileManager::restorePanelVisibility()
     715void UIFileManager::restorePanelVisibility()
    716716{
    717717    /** Make sure the actions are set to not-checked. this prevents an unlikely
    … …  
    725725
    726726    /* Load the visible panel list and show them: */
    727     QStringList strNameList = gEDataManager->guestControlFileManagerVisiblePanels();
     727    QStringList strNameList = gEDataManager->fileManagerVisiblePanels();
    728728    foreach(const QString strName, strNameList)
    729729    {
    730         foreach(UIGuestControlFileManagerPanel* pPanel, m_panelActionMap.keys())
     730        foreach(UIFileManagerPanel* pPanel, m_panelActionMap.keys())
    731731        {
    732732            if (strName == pPanel->panelName())
    … …  
    739739}
    740740
    741 void UIGuestControlFileManager::loadOptions()
     741void UIFileManager::loadOptions()
    742742{
    743743    /* Load options: */
    744     UIGuestControlFileManagerOptions *pOptions = UIGuestControlFileManagerOptions::instance();
     744    UIFileManagerOptions *pOptions = UIFileManagerOptions::instance();
    745745    if (pOptions)
    746746    {
    747         pOptions->bListDirectoriesOnTop = gEDataManager->guestControlFileManagerListDirectoriesFirst();
    748         pOptions->bAskDeleteConfirmation = gEDataManager->guestControlFileManagerShowDeleteConfirmation();
    749         pOptions->bShowHumanReadableSizes = gEDataManager->guestControlFileManagerShowHumanReadableSizes();
    750     }
    751 }
    752 
    753 void UIGuestControlFileManager::hidePanel(UIGuestControlFileManagerPanel* panel)
     747        pOptions->bListDirectoriesOnTop = gEDataManager->fileManagerListDirectoriesFirst();
     748        pOptions->bAskDeleteConfirmation = gEDataManager->fileManagerShowDeleteConfirmation();
     749        pOptions->bShowHumanReadableSizes = gEDataManager->fileManagerShowHumanReadableSizes();
     750    }
     751}
     752
     753void UIFileManager::hidePanel(UIFileManagerPanel* panel)
    754754{
    755755    if (panel && panel->isVisible())
    756756        panel->setVisible(false);
    757     QMap<UIGuestControlFileManagerPanel*, QAction*>::iterator iterator = m_panelActionMap.find(panel);
     757    QMap<UIFileManagerPanel*, QAction*>::iterator iterator = m_panelActionMap.find(panel);
    758758    if (iterator != m_panelActionMap.end())
    759759    {
    … …  
    765765}
    766766
    767 void UIGuestControlFileManager::showPanel(UIGuestControlFileManagerPanel* panel)
     767void UIFileManager::showPanel(UIFileManagerPanel* panel)
    768768{
    769769    if (panel && panel->isHidden())
    770770        panel->setVisible(true);
    771     QMap<UIGuestControlFileManagerPanel*, QAction*>::iterator iterator = m_panelActionMap.find(panel);
     771    QMap<UIFileManagerPanel*, QAction*>::iterator iterator = m_panelActionMap.find(panel);
    772772    if (iterator != m_panelActionMap.end())
    773773    {
    … …  
    780780}
    781781
    782 void UIGuestControlFileManager::manageEscapeShortCut()
     782void UIFileManager::manageEscapeShortCut()
    783783{
    784784    /* if there is no visible panels give the escape shortcut to parent dialog: */
    … …  
    799799}
    800800
    801 void UIGuestControlFileManager::appendLog(const QString &strLog, FileManagerLogType eLogType)
     801void UIFileManager::appendLog(const QString &strLog, FileManagerLogType eLogType)
    802802{
    803803    if (!m_pLogPanel)
    … …  
    806806}
    807807
    808 void UIGuestControlFileManager::sltTestSession()
     808void UIFileManager::sltTestSession()
    809809{
    810810    createSession("vbox", "password");
    811811}
    812812
    813 void UIGuestControlFileManager::sltTestCopy()
     813void UIFileManager::sltTestCopy()
    814814{
    815815    QStringList sources;
    … …  
    819819}
    820820
    821 #include "UIGuestControlFileManager.moc"
     821#include "UIFileManager.moc"

  • trunk/src/VBox/Frontends/VirtualBox/src/guestctrl/UIFileManager.h

    r76176 r76177  
    11/* $Id$ */
    22/** @file
    3  * VBox Qt GUI - UIGuestControlFileManager class declaration.
     3 * VBox Qt GUI - UIFileManager class declaration.
    44 */
    55
    … …  
    1616 */
    1717
    18 #ifndef ___UIGuestControlFileManager_h___
    19 #define ___UIGuestControlFileManager_h___
     18#ifndef ___UIFileManager_h___
     19#define ___UIFileManager_h___
    2020
    2121/* Qt includes: */
    … …  
    4747class UIGuestControlConsole;
    4848class UIGuestControlInterface;
    49 class UIGuestControlFileManagerPanel;
    50 class UIGuestControlFileManagerLogPanel;
    51 class UIGuestControlFileManagerOperationsPanel;
    52 class UIGuestControlFileManagerSessionPanel;
    53 class UIGuestControlFileManagerOptionsPanel;
    54 class UIGuestFileTable;
    55 class UIHostFileTable;
     49class UIFileManagerPanel;
     50class UIFileManagerLogPanel;
     51class UIFileManagerOperationsPanel;
     52class UIFileManagerSessionPanel;
     53class UIFileManagerOptionsPanel;
     54class UIFileManagerGuestTable;
     55class UIFileManagerHostTable;
    5656class UIGuestSessionCreateWidget;
    5757class UIToolBar;
    5858
    5959/** A Utility class to manage file  manager options. */
    60 class UIGuestControlFileManagerOptions
     60class UIFileManagerOptions
    6161{
    6262
    6363public:
    6464
    65     static UIGuestControlFileManagerOptions* instance();
     65    static UIFileManagerOptions* instance();
    6666    static void create();
    6767    static void destroy();
    … …  
    7373private:
    7474
    75     UIGuestControlFileManagerOptions();
    76     ~UIGuestControlFileManagerOptions();
    77 
    78     static UIGuestControlFileManagerOptions *m_pInstance;
     75    UIFileManagerOptions();
     76    ~UIFileManagerOptions();
     77
     78    static UIFileManagerOptions *m_pInstance;
    7979};
    8080
    … …  
    8282 *  one host and one guest file table views, a log viewer
    8383 *  and some other file manager related widgets. */
    84 class UIGuestControlFileManager : public QIWithRetranslateUI<QWidget>
     84class UIFileManager : public QIWithRetranslateUI<QWidget>
    8585{
    8686    Q_OBJECT;
    … …  
    8888public:
    8989
    90     UIGuestControlFileManager(EmbedTo enmEmbedding, UIActionPool *pActionPool,
     90    UIFileManager(EmbedTo enmEmbedding, UIActionPool *pActionPool,
    9191                              const CGuest &comGuest, QWidget *pParent, bool fShowToolbar = true);
    92     ~UIGuestControlFileManager();
     92    ~UIFileManager();
    9393    QMenu *menu() const;
    9494
    … …  
    157157     *  since some widgets are initilized with these options */
    158158    void loadOptions();
    159     void hidePanel(UIGuestControlFileManagerPanel *panel);
    160     void showPanel(UIGuestControlFileManagerPanel *panel);
     159    void hidePanel(UIFileManagerPanel *panel);
     160    void showPanel(UIFileManagerPanel *panel);
    161161    /** Makes sure escape key is assigned to only a single widget. This is done by checking
    162162        several things in the following order:
    … …  
    179179    UIGuestControlConsole    *m_pConsole;
    180180    UIGuestControlInterface  *m_pControlInterface;
    181     UIGuestFileTable         *m_pGuestFileTable;
    182     UIHostFileTable          *m_pHostFileTable;
     181    UIFileManagerGuestTable         *m_pGuestFileTable;
     182    UIFileManagerHostTable   *m_pHostFileTable;
    183183
    184184    ComObjPtr<UIMainEventListenerImpl> m_pQtGuestListener;
    … …  
    189189    UIActionPool  *m_pActionPool;
    190190    const bool     m_fShowToolbar;
    191     QMap<UIGuestControlFileManagerPanel*, QAction*> m_panelActionMap;
    192     QList<UIGuestControlFileManagerPanel*>          m_visiblePanelsList;
    193     UIGuestControlFileManagerOptionsPanel          *m_pOptionsPanel;
    194     UIGuestControlFileManagerLogPanel              *m_pLogPanel;
    195     UIGuestControlFileManagerSessionPanel          *m_pSessionPanel;
    196     UIGuestControlFileManagerOperationsPanel       *m_pOperationsPanel;
    197     friend class UIGuestControlFileManagerOptionsPanel;
    198     friend class UIGuestControlFileManagerPanel;
    199     friend class UIGuestControlFileManagerDialog;
     191    QMap<UIFileManagerPanel*, QAction*> m_panelActionMap;
     192    QList<UIFileManagerPanel*>          m_visiblePanelsList;
     193    UIFileManagerOptionsPanel          *m_pOptionsPanel;
     194    UIFileManagerLogPanel              *m_pLogPanel;
     195    UIFileManagerSessionPanel          *m_pSessionPanel;
     196    UIFileManagerOperationsPanel       *m_pOperationsPanel;
     197    friend class UIFileManagerOptionsPanel;
     198    friend class UIFileManagerPanel;
     199    friend class UIFileManagerDialog;
    200200};
    201201
    202 #endif /* !___UIGuestControlFileManager_h___ */
     202#endif /* !___UIFileManager_h___ */

  • trunk/src/VBox/Frontends/VirtualBox/src/guestctrl/UIFileManagerDialog.cpp

    r76176 r76177  
    11/* $Id$ */
    22/** @file
    3  * VBox Qt GUI - UIGuestControlFileManagerDialog class implementation.
     3 * VBox Qt GUI - UIFileManagerDialog class implementation.
    44 */
    55
    … …  
    2828# include "UIExtraDataManager.h"
    2929# include "UIIconPool.h"
    30 # include "UIGuestControlFileManager.h"
    31 # include "UIGuestControlFileManagerDialog.h"
     30# include "UIFileManager.h"
     31# include "UIFileManagerDialog.h"
    3232# include "VBoxGlobal.h"
    3333# ifdef VBOX_WS_MAC
    … …  
    3939
    4040/*********************************************************************************************************************************
    41 *   Class UIGuestControlFileManagerDialogFactory implementation.                                                                 *
     41*   Class UIFileManagerDialogFactory implementation.                                                                 *
    4242*********************************************************************************************************************************/
    4343
    44 UIGuestControlFileManagerDialogFactory::UIGuestControlFileManagerDialogFactory(UIActionPool *pActionPool /* = 0 */,
     44UIFileManagerDialogFactory::UIFileManagerDialogFactory(UIActionPool *pActionPool /* = 0 */,
    4545                                                         const CGuest &comGuest /* = CGuest() */,
    4646                                                         const QString &strMachineName /* = QString() */)
    … …  
    5151}
    5252
    53 void UIGuestControlFileManagerDialogFactory::create(QIManagerDialog *&pDialog, QWidget *pCenterWidget)
     53void UIFileManagerDialogFactory::create(QIManagerDialog *&pDialog, QWidget *pCenterWidget)
    5454{
    55     pDialog = new UIGuestControlFileManagerDialog(pCenterWidget, m_pActionPool, m_comGuest, m_strMachineName);
     55    pDialog = new UIFileManagerDialog(pCenterWidget, m_pActionPool, m_comGuest, m_strMachineName);
    5656}
    5757
    5858
    5959/*********************************************************************************************************************************
    60 *   Class UIGuestControlFileManagerDialog implementation.                                                                        *
     60*   Class UIFileManagerDialog implementation.                                                                        *
    6161*********************************************************************************************************************************/
    6262
    63 UIGuestControlFileManagerDialog::UIGuestControlFileManagerDialog(QWidget *pCenterWidget,
     63UIFileManagerDialog::UIFileManagerDialog(QWidget *pCenterWidget,
    6464                                           UIActionPool *pActionPool,
    6565                                           const CGuest &comGuest,
    … …  
    7272}
    7373
    74 void UIGuestControlFileManagerDialog::retranslateUi()
     74void UIFileManagerDialog::retranslateUi()
    7575{
    7676    /* Translate window title: */
    77     setWindowTitle(UIGuestControlFileManager::tr("%1 - Guest Control File Manager").arg(m_strMachineName));
     77    setWindowTitle(UIFileManager::tr("%1 - File Manager").arg(m_strMachineName));
    7878    /* Translate buttons: */
    79     button(ButtonType_Close)->setText(UIGuestControlFileManager::tr("Close"));
     79    button(ButtonType_Close)->setText(UIFileManager::tr("Close"));
    8080}
    8181
    82 void UIGuestControlFileManagerDialog::configure()
     82void UIFileManagerDialog::configure()
    8383{
    8484    /* Apply window icons: */
    … …  
    8686}
    8787
    88 void UIGuestControlFileManagerDialog::configureCentralWidget()
     88void UIFileManagerDialog::configureCentralWidget()
    8989{
    9090    /* Create widget: */
    91     UIGuestControlFileManager *pWidget = new UIGuestControlFileManager(EmbedTo_Dialog, m_pActionPool,
     91    UIFileManager *pWidget = new UIFileManager(EmbedTo_Dialog, m_pActionPool,
    9292                                                                       m_comGuest, this);
    9393
    … …  
    100100        setWidgetToolbar(pWidget->toolbar());
    101101#endif
    102         connect(pWidget, &UIGuestControlFileManager::sigSetCloseButtonShortCut,
    103                 this, &UIGuestControlFileManagerDialog::sltSetCloseButtonShortCut);
     102        connect(pWidget, &UIFileManager::sigSetCloseButtonShortCut,
     103                this, &UIFileManagerDialog::sltSetCloseButtonShortCut);
    104104
    105105        /* Add into layout: */
    … …  
    108108}
    109109
    110 void UIGuestControlFileManagerDialog::finalize()
     110void UIFileManagerDialog::finalize()
    111111{
    112112    /* Apply language settings: */
    … …  
    115115}
    116116
    117 void UIGuestControlFileManagerDialog::loadSettings()
     117void UIFileManagerDialog::loadSettings()
    118118{
    119119    const QRect desktopRect = gpDesktop->availableGeometry(this);
    … …  
    126126
    127127    /* Load geometry from extradata: */
    128     QRect geometry = gEDataManager->guestControlFileManagerDialogGeometry(this, defaultGeometry);
     128    QRect geometry = gEDataManager->fileManagerDialogGeometry(this, defaultGeometry);
    129129
    130130    /* Restore geometry: */
    131     LogRel2(("GUI: UIGuestControlFileManagerDialog: Restoring geometry to: Origin=%dx%d, Size=%dx%d\n",
     131    LogRel2(("GUI: UIFileManagerDialog: Restoring geometry to: Origin=%dx%d, Size=%dx%d\n",
    132132             geometry.x(), geometry.y(), geometry.width(), geometry.height()));
    133133    setDialogGeometry(geometry);
    134134}
    135135
    136 void UIGuestControlFileManagerDialog::saveSettings() const
     136void UIFileManagerDialog::saveSettings() const
    137137{
    138138    /* Save window geometry to extradata: */
    … …  
    141141    /* darwinIsWindowMaximized expects a non-const QWidget*. thus const_cast: */
    142142    QWidget *pw = const_cast<QWidget*>(qobject_cast<const QWidget*>(this));
    143     gEDataManager->setGuestControlFileManagerDialogGeometry(saveGeometry, ::darwinIsWindowMaximized(pw));
     143    gEDataManager->setFileManagerDialogGeometry(saveGeometry, ::darwinIsWindowMaximized(pw));
    144144#else /* !VBOX_WS_MAC */
    145     gEDataManager->setGuestControlFileManagerDialogGeometry(saveGeometry, isMaximized());
     145    gEDataManager->setFileManagerDialogGeometry(saveGeometry, isMaximized());
    146146#endif /* !VBOX_WS_MAC */
    147     LogRel2(("GUI: Guest Control File Manager Dialog: Geometry saved as: Origin=%dx%d, Size=%dx%d\n",
     147    LogRel2(("GUI: File Manager Dialog: Geometry saved as: Origin=%dx%d, Size=%dx%d\n",
    148148             saveGeometry.x(), saveGeometry.y(), saveGeometry.width(), saveGeometry.height()));
    149149}
    150150
    151 bool UIGuestControlFileManagerDialog::shouldBeMaximized() const
     151bool UIFileManagerDialog::shouldBeMaximized() const
    152152{
    153     return gEDataManager->guestControlFileManagerDialogShouldBeMaximized();
     153    return gEDataManager->fileManagerDialogShouldBeMaximized();
    154154}
    155155
    156 void UIGuestControlFileManagerDialog::sltSetCloseButtonShortCut(QKeySequence shortcut)
     156void UIFileManagerDialog::sltSetCloseButtonShortCut(QKeySequence shortcut)
    157157{
    158158    if (button(ButtonType_Close))
    … …  
    160160}
    161161
    162 void UIGuestControlFileManagerDialog::manageEscapeShortCut()
     162void UIFileManagerDialog::manageEscapeShortCut()
    163163{
    164     UIGuestControlFileManager *pWidget = qobject_cast<UIGuestControlFileManager*>(widget());
     164    UIFileManager *pWidget = qobject_cast<UIFileManager*>(widget());
    165165    if (!pWidget)
    166166        return;

  • trunk/src/VBox/Frontends/VirtualBox/src/guestctrl/UIFileManagerDialog.h

    r76176 r76177  
    11/* $Id$ */
    22/** @file
    3  * VBox Qt GUI - UIGuestControlFileManagerDialog class declaration.
     3 * VBox Qt GUI - UIFileManagerDialog class declaration.
    44 */
    55
    … …  
    1616 */
    1717
    18 #ifndef ___UIGuestControlFileManagerDialog_h___
    19 #define ___UIGuestControlFileManagerDialog_h___
     18#ifndef ___UIFileManagerDialog_h___
     19#define ___UIFileManagerDialog_h___
    2020
    2121/* Qt includes: */
    … …  
    3434class QVBoxLayout;
    3535class UIActionPool;
    36 class UIGuestControlFileManagerDialog;
     36class UIFileManagerDialog;
    3737class CGuest;
    3838
    3939
    40 /** QIManagerDialogFactory extension used as a factory for the Guest Control dialog. */
    41 class UIGuestControlFileManagerDialogFactory : public QIManagerDialogFactory
     40/** QIManagerDialogFactory extension used as a factory for the file manager dialog. */
     41class UIFileManagerDialogFactory : public QIManagerDialogFactory
    4242{
    4343public:
    4444
    45     UIGuestControlFileManagerDialogFactory(UIActionPool *pActionPool = 0, const CGuest &comGuest = CGuest(), const QString &strMachineName = QString());
     45    UIFileManagerDialogFactory(UIActionPool *pActionPool = 0, const CGuest &comGuest = CGuest(), const QString &strMachineName = QString());
    4646
    4747protected:
    … …  
    5757
    5858
    59 /** QIManagerDialog extension providing GUI with the dialog displaying guest control releated logs. */
    60 class UIGuestControlFileManagerDialog : public QIWithRetranslateUI<QIManagerDialog>
     59/** QIManagerDialog extension providing GUI with the dialog displaying file manager releated logs. */
     60class UIFileManagerDialog : public QIWithRetranslateUI<QIManagerDialog>
    6161{
    6262    Q_OBJECT;
    … …  
    6464public:
    6565
    66     /** Constructs Guest Control dialog.
     66    /** Constructs File Manager dialog.
    6767      * @param  pCenterWidget  Passes the widget reference to center according to.
    6868      * @param  pActionPool    Passes the action-pool reference.
    6969      * @param  comGuest       Passes the com-guest reference. */
    70     UIGuestControlFileManagerDialog(QWidget *pCenterWidget, UIActionPool *pActionPool, const CGuest &comGuest, const QString &strMachineName = QString());
     70    UIFileManagerDialog(QWidget *pCenterWidget, UIActionPool *pActionPool, const CGuest &comGuest, const QString &strMachineName = QString());
    7171
    7272protected:
    … …  
    112112
    113113
    114 #endif /* !___UIGuestControlFileManagerDialog_h___ */
     114#endif /* !___UIFileManagerDialog_h___ */

  • trunk/src/VBox/Frontends/VirtualBox/src/guestctrl/UIFileManagerGuestTable.cpp

    r76176 r76177  
    11/* $Id$ */
    22/** @file
    3  * VBox Qt GUI - UIGuestFileTable class implementation.
     3 * VBox Qt GUI - UIFileManagerGuestTable class implementation.
    44 */
    55
    … …  
    2929# include "UIActionPool.h"
    3030# include "UIErrorString.h"
    31 # include "UIGuestControlFileManager.h"
    32 # include "UIGuestFileTable.h"
     31# include "UIFileManager.h"
     32# include "UIFileManagerGuestTable.h"
    3333# include "UIMessageCenter.h"
    3434# include "UIToolBar.h"
    … …  
    147147}
    148148
    149 UIGuestFileTable::UIGuestFileTable(UIActionPool *pActionPool, QWidget *pParent /*= 0*/)
    150     :UIGuestControlFileTable(pActionPool, pParent)
     149UIFileManagerGuestTable::UIFileManagerGuestTable(UIActionPool *pActionPool, QWidget *pParent /*= 0*/)
     150    :UIFileManagerTable(pActionPool, pParent)
    151151{
    152152    prepareToolbar();
    … …  
    155155}
    156156
    157 void UIGuestFileTable::initGuestFileTable(const CGuestSession &session)
     157void UIFileManagerGuestTable::initGuestFileTable(const CGuestSession &session)
    158158{
    159159    if (!session.isOk())
    … …  
    165165}
    166166
    167 void UIGuestFileTable::retranslateUi()
     167void UIFileManagerGuestTable::retranslateUi()
    168168{
    169169    if (m_pLocationLabel)
    170         m_pLocationLabel->setText(UIGuestControlFileManager::tr("Guest System"));
    171     UIGuestControlFileTable::retranslateUi();
    172 }
    173 
    174 void UIGuestFileTable::readDirectory(const QString& strPath,
     170        m_pLocationLabel->setText(UIFileManager::tr("Guest System"));
     171    UIFileManagerTable::retranslateUi();
     172}
     173
     174void UIFileManagerGuestTable::readDirectory(const QString& strPath,
    175175                                     UIFileTableItem *parent, bool isStartDir /*= false*/)
    176176
    … …  
    241241}
    242242
    243 void UIGuestFileTable::deleteByItem(UIFileTableItem *item)
     243void UIFileManagerGuestTable::deleteByItem(UIFileTableItem *item)
    244244{
    245245    if (!item)
    … …  
    262262}
    263263
    264 void UIGuestFileTable::deleteByPath(const QStringList &pathList)
     264void UIFileManagerGuestTable::deleteByPath(const QStringList &pathList)
    265265{
    266266    foreach (const QString &strPath, pathList)
    … …  
    281281}
    282282
    283 void UIGuestFileTable::goToHomeDirectory()
     283void UIFileManagerGuestTable::goToHomeDirectory()
    284284{
    285285    if (m_comGuestSession.isNull())
    … …  
    301301}
    302302
    303 bool UIGuestFileTable::renameItem(UIFileTableItem *item, QString newBaseName)
     303bool UIFileManagerGuestTable::renameItem(UIFileTableItem *item, QString newBaseName)
    304304{
    305305
    … …  
    320320}
    321321
    322 bool UIGuestFileTable::createDirectory(const QString &path, const QString &directoryName)
     322bool UIFileManagerGuestTable::createDirectory(const QString &path, const QString &directoryName)
    323323{
    324324    QString newDirectoryPath = UIPathOperations::mergePaths(path, directoryName);
    … …  
    337337}
    338338
    339 void UIGuestFileTable::copyHostToGuest(const QStringList &hostSourcePathList,
     339void UIFileManagerGuestTable::copyHostToGuest(const QStringList &hostSourcePathList,
    340340                                        const QString &strDestination /* = QString() */)
    341341{
    … …  
    366366}
    367367
    368 void UIGuestFileTable::copyGuestToHost(const QString& hostDestinationPath)
     368void UIFileManagerGuestTable::copyGuestToHost(const QString& hostDestinationPath)
    369369{
    370370    if (!checkGuestSession())
    … …  
    391391}
    392392
    393 FileObjectType UIGuestFileTable::fileType(const CFsObjInfo &fsInfo)
     393FileObjectType UIFileManagerGuestTable::fileType(const CFsObjInfo &fsInfo)
    394394{
    395395    if (fsInfo.isNull() || !fsInfo.isOk())
    … …  
    405405}
    406406
    407 FileObjectType UIGuestFileTable::fileType(const CGuestFsObjInfo &fsInfo)
     407FileObjectType UIFileManagerGuestTable::fileType(const CGuestFsObjInfo &fsInfo)
    408408{
    409409    if (fsInfo.isNull() || !fsInfo.isOk())
    … …  
    420420
    421421
    422 QString UIGuestFileTable::fsObjectPropertyString()
     422QString UIFileManagerGuestTable::fsObjectPropertyString()
    423423{
    424424    QStringList selectedObjects = selectedItemPathList();
    … …  
    444444        /* Size: */
    445445        LONG64 size = fileInfo.GetObjectSize();
    446         propertyStringList << UIGuestControlFileManager::tr("<b>Size:</b> %1 bytes").arg(QString::number(size));
    447         if (size >= UIGuestControlFileTable::m_iKiloByte)
     446        propertyStringList << UIFileManager::tr("<b>Size:</b> %1 bytes").arg(QString::number(size));
     447        if (size >= UIFileManagerTable::m_iKiloByte)
    448448            propertyStringList << QString(" (%1)<br/>").arg(humanReadableSize(size));
    449449        else
    … …  
    452452        /* Allocated size: */
    453453        size = fileInfo.GetAllocatedSize();
    454         propertyStringList << UIGuestControlFileManager::tr("<b>Allocated:</b> %1 bytes").arg(QString::number(size));
    455         if (size >= UIGuestControlFileTable::m_iKiloByte)
     454        propertyStringList << UIFileManager::tr("<b>Allocated:</b> %1 bytes").arg(QString::number(size));
     455        if (size >= UIFileManagerTable::m_iKiloByte)
    456456            propertyStringList << QString(" (%1)<br/>").arg(humanReadableSize(size));
    457457        else
    … …  
    474474            default:                    str = tr("illegal-value"); break;
    475475        }
    476         propertyStringList <<  UIGuestControlFileManager::tr("<b>Type:</b> %1<br/>").arg(str);
     476        propertyStringList <<  UIFileManager::tr("<b>Type:</b> %1<br/>").arg(str);
    477477
    478478        /* INode number, device, link count: */
    479         propertyStringList << UIGuestControlFileManager::tr("<b>INode:</b> %1<br/>").arg(fileInfo.GetNodeId());
    480         propertyStringList << UIGuestControlFileManager::tr("<b>Device:</b> %1<br/>").arg(fileInfo.GetNodeIdDevice());  /** @todo hex */
    481         propertyStringList << UIGuestControlFileManager::tr("<b>Hardlinks:</b> %1<br/>").arg(fileInfo.GetHardLinks());
     479        propertyStringList << UIFileManager::tr("<b>INode:</b> %1<br/>").arg(fileInfo.GetNodeId());
     480        propertyStringList << UIFileManager::tr("<b>Device:</b> %1<br/>").arg(fileInfo.GetNodeIdDevice());  /** @todo hex */
     481        propertyStringList << UIFileManager::tr("<b>Hardlinks:</b> %1<br/>").arg(fileInfo.GetHardLinks());
    482482
    483483        /* Attributes: */
    … …  
    488488            if (offSpace < 0)
    489489                offSpace = str.length();
    490             propertyStringList << UIGuestControlFileManager::tr("<b>Mode:</b> %1<br/>").arg(str.left(offSpace));
    491             propertyStringList << UIGuestControlFileManager::tr("<b>Attributes:</b> %1<br/>").arg(str.mid(offSpace + 1).trimmed());
     490            propertyStringList << UIFileManager::tr("<b>Mode:</b> %1<br/>").arg(str.left(offSpace));
     491            propertyStringList << UIFileManager::tr("<b>Attributes:</b> %1<br/>").arg(str.mid(offSpace + 1).trimmed());
    492492        }
    493493
    … …  
    495495        ULONG uDeviceNo = fileInfo.GetDeviceNumber();
    496496        if (uDeviceNo != 0 || enmType == KFsObjType_DevChar || enmType == KFsObjType_DevBlock)
    497             propertyStringList << UIGuestControlFileManager::tr("<b>Device ID:</b> %1<br/>").arg(uDeviceNo); /** @todo hex */
     497            propertyStringList << UIFileManager::tr("<b>Device ID:</b> %1<br/>").arg(uDeviceNo); /** @todo hex */
    498498
    499499        /* Owner: */
    500         propertyStringList << UIGuestControlFileManager::tr("<b>Owner:</b> %1 (%2)<br/>").
     500        propertyStringList << UIFileManager::tr("<b>Owner:</b> %1 (%2)<br/>").
    501501            arg(fileInfo.GetUserName()).arg(fileInfo.GetUID());
    502         propertyStringList << UIGuestControlFileManager::tr("<b>Group:</b> %1 (%2)<br/>").
     502        propertyStringList << UIFileManager::tr("<b>Group:</b> %1 (%2)<br/>").
    503503            arg(fileInfo.GetGroupName()).arg(fileInfo.GetGID());
    504504
    505505        /* Timestamps: */
    506         propertyStringList << UIGuestControlFileManager::tr("<b>Birth:</b> %1<br/>").
     506        propertyStringList << UIFileManager::tr("<b>Birth:</b> %1<br/>").
    507507            arg(QDateTime::fromMSecsSinceEpoch(fileInfo.GetBirthTime() / RT_NS_1MS).toString());
    508         propertyStringList << UIGuestControlFileManager::tr("<b>Change:</b> %1<br/>").
     508        propertyStringList << UIFileManager::tr("<b>Change:</b> %1<br/>").
    509509            arg(QDateTime::fromMSecsSinceEpoch(fileInfo.GetChangeTime() / RT_NS_1MS).toString());
    510         propertyStringList << UIGuestControlFileManager::tr("<b>Modified:</b> %1<br/>").
     510        propertyStringList << UIFileManager::tr("<b>Modified:</b> %1<br/>").
    511511            arg(QDateTime::fromMSecsSinceEpoch(fileInfo.GetModificationTime() / RT_NS_1MS).toString());
    512         propertyStringList << UIGuestControlFileManager::tr("<b>Access:</b> %1<br/>").
     512        propertyStringList << UIFileManager::tr("<b>Access:</b> %1<br/>").
    513513            arg(QDateTime::fromMSecsSinceEpoch(fileInfo.GetAccessTime() / RT_NS_1MS).toString());
    514514
    … …  
    539539    }
    540540    QStringList propertyStringList;
    541     propertyStringList << UIGuestControlFileManager::tr("<b>Selected:</b> %1 files and %2 directories<br/>").
     541    propertyStringList << UIFileManager::tr("<b>Selected:</b> %1 files and %2 directories<br/>").
    542542        arg(QString::number(fileCount)).arg(QString::number(directoryCount));
    543     propertyStringList << UIGuestControlFileManager::tr("<b>Size (non-recursive):</b> %1 bytes").arg(QString::number(totalSize));
     543    propertyStringList << UIFileManager::tr("<b>Size (non-recursive):</b> %1 bytes").arg(QString::number(totalSize));
    544544    if (totalSize >= m_iKiloByte)
    545545        propertyStringList << QString(" (%1)").arg(humanReadableSize(totalSize));
    … …  
    548548}
    549549
    550 void UIGuestFileTable::showProperties()
     550void UIFileManagerGuestTable::showProperties()
    551551{
    552552    if (m_comGuestSession.isNull())
    … …  
    577577    //     {
    578578    //         connect(directoryThread, &UIGuestDirectoryDiskUsageComputer::sigResultUpdated,
    579     //                 this, &UIGuestFileTable::sltReceiveDirectoryStatistics/*, Qt::DirectConnection*/);
     579    //                 this, &UIFileManagerGuestTable::sltReceiveDirectoryStatistics/*, Qt::DirectConnection*/);
    580580    //         directoryThread->start();
    581581    //     }
    582582    // }
    583583
    584     m_pPropertiesDialog->setWindowTitle(UIGuestControlFileManager::tr("Properties"));
     584    m_pPropertiesDialog->setWindowTitle(UIFileManager::tr("Properties"));
    585585    m_pPropertiesDialog->setPropertyText(fsPropertyString);
    586586    m_pPropertiesDialog->execute();
    … …  
    591591    //         directoryThread->stopRecursion();
    592592    //     disconnect(directoryThread, &UIGuestDirectoryDiskUsageComputer::sigResultUpdated,
    593     //                this, &UIGuestFileTable::sltReceiveDirectoryStatistics/*, Qt::DirectConnection*/);
     593    //                this, &UIFileManagerGuestTable::sltReceiveDirectoryStatistics/*, Qt::DirectConnection*/);
    594594    // }
    595595
    … …  
    600600}
    601601
    602 void UIGuestFileTable::determineDriveLetters()
     602void UIFileManagerGuestTable::determineDriveLetters()
    603603{
    604604    if (m_comGuestSession.isNull())
    … …  
    621621}
    622622
    623 void UIGuestFileTable::prepareToolbar()
     623void UIFileManagerGuestTable::prepareToolbar()
    624624{
    625625    if (m_pToolBar && m_pActionPool)
    626626    {
    627         m_pToolBar->addAction(m_pActionPool->action(UIActionIndex_M_GuestControlFileManager_S_Guest_GoUp));
    628         m_pToolBar->addAction(m_pActionPool->action(UIActionIndex_M_GuestControlFileManager_S_Guest_GoHome));
    629         m_pToolBar->addAction(m_pActionPool->action(UIActionIndex_M_GuestControlFileManager_S_Guest_Refresh));
     627        m_pToolBar->addAction(m_pActionPool->action(UIActionIndex_M_FileManager_S_Guest_GoUp));
     628        m_pToolBar->addAction(m_pActionPool->action(UIActionIndex_M_FileManager_S_Guest_GoHome));
     629        m_pToolBar->addAction(m_pActionPool->action(UIActionIndex_M_FileManager_S_Guest_Refresh));
    630630        m_pToolBar->addSeparator();
    631         m_pToolBar->addAction(m_pActionPool->action(UIActionIndex_M_GuestControlFileManager_S_Guest_Delete));
    632         m_pToolBar->addAction(m_pActionPool->action(UIActionIndex_M_GuestControlFileManager_S_Guest_Rename));
    633         m_pToolBar->addAction(m_pActionPool->action(UIActionIndex_M_GuestControlFileManager_S_Guest_CreateNewDirectory));
    634 
    635         m_pToolBar->addAction(m_pActionPool->action(UIActionIndex_M_GuestControlFileManager_S_Guest_Copy));
    636         m_pToolBar->addAction(m_pActionPool->action(UIActionIndex_M_GuestControlFileManager_S_Guest_Cut));
    637         m_pToolBar->addAction(m_pActionPool->action(UIActionIndex_M_GuestControlFileManager_S_Guest_Paste));
     631        m_pToolBar->addAction(m_pActionPool->action(UIActionIndex_M_FileManager_S_Guest_Delete));
     632        m_pToolBar->addAction(m_pActionPool->action(UIActionIndex_M_FileManager_S_Guest_Rename));
     633        m_pToolBar->addAction(m_pActionPool->action(UIActionIndex_M_FileManager_S_Guest_CreateNewDirectory));
     634
     635        m_pToolBar->addAction(m_pActionPool->action(UIActionIndex_M_FileManager_S_Guest_Copy));
     636        m_pToolBar->addAction(m_pActionPool->action(UIActionIndex_M_FileManager_S_Guest_Cut));
     637        m_pToolBar->addAction(m_pActionPool->action(UIActionIndex_M_FileManager_S_Guest_Paste));
    638638        m_pToolBar->addSeparator();
    639         m_pToolBar->addAction(m_pActionPool->action(UIActionIndex_M_GuestControlFileManager_S_Guest_SelectAll));
    640         m_pToolBar->addAction(m_pActionPool->action(UIActionIndex_M_GuestControlFileManager_S_Guest_InvertSelection));
     639        m_pToolBar->addAction(m_pActionPool->action(UIActionIndex_M_FileManager_S_Guest_SelectAll));
     640        m_pToolBar->addAction(m_pActionPool->action(UIActionIndex_M_FileManager_S_Guest_InvertSelection));
    641641        m_pToolBar->addSeparator();
    642         m_pToolBar->addAction(m_pActionPool->action(UIActionIndex_M_GuestControlFileManager_S_Guest_ShowProperties));
    643         m_selectionDependentActions.insert(m_pActionPool->action(UIActionIndex_M_GuestControlFileManager_S_Guest_Delete));
    644         m_selectionDependentActions.insert(m_pActionPool->action(UIActionIndex_M_GuestControlFileManager_S_Guest_Rename));
    645         m_selectionDependentActions.insert(m_pActionPool->action(UIActionIndex_M_GuestControlFileManager_S_Guest_Copy));
    646         m_selectionDependentActions.insert(m_pActionPool->action(UIActionIndex_M_GuestControlFileManager_S_Guest_Cut));
    647         m_selectionDependentActions.insert(m_pActionPool->action(UIActionIndex_M_GuestControlFileManager_S_Guest_ShowProperties));
     642        m_pToolBar->addAction(m_pActionPool->action(UIActionIndex_M_FileManager_S_Guest_ShowProperties));
     643        m_selectionDependentActions.insert(m_pActionPool->action(UIActionIndex_M_FileManager_S_Guest_Delete));
     644        m_selectionDependentActions.insert(m_pActionPool->action(UIActionIndex_M_FileManager_S_Guest_Rename));
     645        m_selectionDependentActions.insert(m_pActionPool->action(UIActionIndex_M_FileManager_S_Guest_Copy));
     646        m_selectionDependentActions.insert(m_pActionPool->action(UIActionIndex_M_FileManager_S_Guest_Cut));
     647        m_selectionDependentActions.insert(m_pActionPool->action(UIActionIndex_M_FileManager_S_Guest_ShowProperties));
    648648
    649649        /* Hide these actions for now until we have a suitable guest-to-guest copy function: */
    650         m_pActionPool->action(UIActionIndex_M_GuestControlFileManager_S_Guest_Copy)->setVisible(false);
    651         m_pActionPool->action(UIActionIndex_M_GuestControlFileManager_S_Guest_Cut)->setVisible(false);
    652         m_pActionPool->action(UIActionIndex_M_GuestControlFileManager_S_Guest_Paste)->setVisible(false);
     650        m_pActionPool->action(UIActionIndex_M_FileManager_S_Guest_Copy)->setVisible(false);
     651        m_pActionPool->action(UIActionIndex_M_FileManager_S_Guest_Cut)->setVisible(false);
     652        m_pActionPool->action(UIActionIndex_M_FileManager_S_Guest_Paste)->setVisible(false);
    653653    }
    654654    setSelectionDependentActionsEnabled(false);
    … …  
    656656}
    657657
    658 void UIGuestFileTable::createFileViewContextMenu(const QWidget *pWidget, const QPoint &point)
     658void UIFileManagerGuestTable::createFileViewContextMenu(const QWidget *pWidget, const QPoint &point)
    659659{
    660660    if (!pWidget)
    … …  
    662662
    663663    QMenu menu;
    664     menu.addAction(m_pActionPool->action(UIActionIndex_M_GuestControlFileManager_S_Guest_GoUp));
    665 
    666     menu.addAction(m_pActionPool->action(UIActionIndex_M_GuestControlFileManager_S_Guest_GoHome));
    667     menu.addAction(m_pActionPool->action(UIActionIndex_M_GuestControlFileManager_S_Guest_Refresh));
     664    menu.addAction(m_pActionPool->action(UIActionIndex_M_FileManager_S_Guest_GoUp));
     665
     666    menu.addAction(m_pActionPool->action(UIActionIndex_M_FileManager_S_Guest_GoHome));
     667    menu.addAction(m_pActionPool->action(UIActionIndex_M_FileManager_S_Guest_Refresh));
    668668    menu.addSeparator();
    669     menu.addAction(m_pActionPool->action(UIActionIndex_M_GuestControlFileManager_S_Guest_Delete));
    670     menu.addAction(m_pActionPool->action(UIActionIndex_M_GuestControlFileManager_S_Guest_Rename));
    671     menu.addAction(m_pActionPool->action(UIActionIndex_M_GuestControlFileManager_S_Guest_CreateNewDirectory));
     669    menu.addAction(m_pActionPool->action(UIActionIndex_M_FileManager_S_Guest_Delete));
     670    menu.addAction(m_pActionPool->action(UIActionIndex_M_FileManager_S_Guest_Rename));
     671    menu.addAction(m_pActionPool->action(UIActionIndex_M_FileManager_S_Guest_CreateNewDirectory));
    672672    menu.addSeparator();
    673     menu.addAction(m_pActionPool->action(UIActionIndex_M_GuestControlFileManager_S_Guest_Copy));
    674     menu.addAction(m_pActionPool->action(UIActionIndex_M_GuestControlFileManager_S_Guest_Cut));
    675     menu.addAction(m_pActionPool->action(UIActionIndex_M_GuestControlFileManager_S_Guest_Paste));
     673    menu.addAction(m_pActionPool->action(UIActionIndex_M_FileManager_S_Guest_Copy));
     674    menu.addAction(m_pActionPool->action(UIActionIndex_M_FileManager_S_Guest_Cut));
     675    menu.addAction(m_pActionPool->action(UIActionIndex_M_FileManager_S_Guest_Paste));
    676676    menu.addSeparator();
    677     menu.addAction(m_pActionPool->action(UIActionIndex_M_GuestControlFileManager_S_Guest_SelectAll));
    678     menu.addAction(m_pActionPool->action(UIActionIndex_M_GuestControlFileManager_S_Guest_InvertSelection));
     677    menu.addAction(m_pActionPool->action(UIActionIndex_M_FileManager_S_Guest_SelectAll));
     678    menu.addAction(m_pActionPool->action(UIActionIndex_M_FileManager_S_Guest_InvertSelection));
    679679    menu.addSeparator();
    680     menu.addAction(m_pActionPool->action(UIActionIndex_M_GuestControlFileManager_S_Guest_ShowProperties));
     680    menu.addAction(m_pActionPool->action(UIActionIndex_M_FileManager_S_Guest_ShowProperties));
    681681    menu.exec(pWidget->mapToGlobal(point));
    682682}
    683683
    684 void UIGuestFileTable::setPasteActionEnabled(bool fEnabled)
    685 {
    686     m_pActionPool->action(UIActionIndex_M_GuestControlFileManager_S_Guest_Paste)->setEnabled(fEnabled);
    687 }
    688 
    689 void UIGuestFileTable::pasteCutCopiedObjects()
     684void UIFileManagerGuestTable::setPasteActionEnabled(bool fEnabled)
     685{
     686    m_pActionPool->action(UIActionIndex_M_FileManager_S_Guest_Paste)->setEnabled(fEnabled);
     687}
     688
     689void UIFileManagerGuestTable::pasteCutCopiedObjects()
    690690{
    691691    /** Wait until we have a API function that would take multiple source objects
    … …  
    701701
    702702
    703 void UIGuestFileTable::prepareActionConnections()
    704 {
    705     connect(m_pActionPool->action(UIActionIndex_M_GuestControlFileManager_S_Guest_GoUp), &QAction::triggered,
    706             this, &UIGuestControlFileTable::sltGoUp);
    707     connect(m_pActionPool->action(UIActionIndex_M_GuestControlFileManager_S_Guest_GoHome), &QAction::triggered,
    708             this, &UIGuestControlFileTable::sltGoHome);
    709     connect(m_pActionPool->action(UIActionIndex_M_GuestControlFileManager_S_Guest_Refresh), &QAction::triggered,
    710             this, &UIGuestControlFileTable::sltRefresh);
    711     connect(m_pActionPool->action(UIActionIndex_M_GuestControlFileManager_S_Guest_Delete), &QAction::triggered,
    712             this, &UIGuestControlFileTable::sltDelete);
    713     connect(m_pActionPool->action(UIActionIndex_M_GuestControlFileManager_S_Guest_Rename), &QAction::triggered,
    714             this, &UIGuestControlFileTable::sltRename);
    715     connect(m_pActionPool->action(UIActionIndex_M_GuestControlFileManager_S_Guest_Copy), &QAction::triggered,
    716             this, &UIGuestControlFileTable::sltCopy);
    717     connect(m_pActionPool->action(UIActionIndex_M_GuestControlFileManager_S_Guest_Cut), &QAction::triggered,
    718             this, &UIGuestControlFileTable::sltCut);
    719     connect(m_pActionPool->action(UIActionIndex_M_GuestControlFileManager_S_Guest_Paste), &QAction::triggered,
    720             this, &UIGuestControlFileTable::sltPaste);
    721     connect(m_pActionPool->action(UIActionIndex_M_GuestControlFileManager_S_Guest_SelectAll), &QAction::triggered,
    722             this, &UIGuestControlFileTable::sltSelectAll);
    723     connect(m_pActionPool->action(UIActionIndex_M_GuestControlFileManager_S_Guest_InvertSelection), &QAction::triggered,
    724             this, &UIGuestControlFileTable::sltInvertSelection);
    725     connect(m_pActionPool->action(UIActionIndex_M_GuestControlFileManager_S_Guest_ShowProperties), &QAction::triggered,
    726             this, &UIGuestControlFileTable::sltShowProperties);
    727     connect(m_pActionPool->action(UIActionIndex_M_GuestControlFileManager_S_Guest_CreateNewDirectory), &QAction::triggered,
    728             this, &UIGuestControlFileTable::sltCreateNewDirectory);
    729 }
    730 
    731 bool UIGuestFileTable::checkGuestSession()
     703void UIFileManagerGuestTable::prepareActionConnections()
     704{
     705    connect(m_pActionPool->action(UIActionIndex_M_FileManager_S_Guest_GoUp), &QAction::triggered,
     706            this, &UIFileManagerTable::sltGoUp);
     707    connect(m_pActionPool->action(UIActionIndex_M_FileManager_S_Guest_GoHome), &QAction::triggered,
     708            this, &UIFileManagerTable::sltGoHome);
     709    connect(m_pActionPool->action(UIActionIndex_M_FileManager_S_Guest_Refresh), &QAction::triggered,
     710            this, &UIFileManagerTable::sltRefresh);
     711    connect(m_pActionPool->action(UIActionIndex_M_FileManager_S_Guest_Delete), &QAction::triggered,
     712            this, &UIFileManagerTable::sltDelete);
     713    connect(m_pActionPool->action(UIActionIndex_M_FileManager_S_Guest_Rename), &QAction::triggered,
     714            this, &UIFileManagerTable::sltRename);
     715    connect(m_pActionPool->action(UIActionIndex_M_FileManager_S_Guest_Copy), &QAction::triggered,
     716            this, &UIFileManagerTable::sltCopy);
     717    connect(m_pActionPool->action(UIActionIndex_M_FileManager_S_Guest_Cut), &QAction::triggered,
     718            this, &UIFileManagerTable::sltCut);
     719    connect(m_pActionPool->action(UIActionIndex_M_FileManager_S_Guest_Paste), &QAction::triggered,
     720            this, &UIFileManagerTable::sltPaste);
     721    connect(m_pActionPool->action(UIActionIndex_M_FileManager_S_Guest_SelectAll), &QAction::triggered,
     722            this, &UIFileManagerTable::sltSelectAll);
     723    connect(m_pActionPool->action(UIActionIndex_M_FileManager_S_Guest_InvertSelection), &QAction::triggered,
     724            this, &UIFileManagerTable::sltInvertSelection);
     725    connect(m_pActionPool->action(UIActionIndex_M_FileManager_S_Guest_ShowProperties), &QAction::triggered,
     726            this, &UIFileManagerTable::sltShowProperties);
     727    connect(m_pActionPool->action(UIActionIndex_M_FileManager_S_Guest_CreateNewDirectory), &QAction::triggered,
     728            this, &UIFileManagerTable::sltCreateNewDirectory);
     729}
     730
     731bool UIFileManagerGuestTable::checkGuestSession()
    732732{
    733733    if (!m_comGuestSession.isOk())
    … …  
    739739}
    740740
    741 QString UIGuestFileTable::permissionString(const CFsObjInfo &fsInfo)
     741QString UIFileManagerGuestTable::permissionString(const CFsObjInfo &fsInfo)
    742742{
    743743    /* Attributes: */
    … …  
    753753}
    754754
    755 #include "UIGuestFileTable.moc"
     755#include "UIFileManagerGuestTable.moc"

  • trunk/src/VBox/Frontends/VirtualBox/src/guestctrl/UIFileManagerGuestTable.h

    r76176 r76177  
    11/* $Id$ */
    22/** @file
    3  * VBox Qt GUI - UIGuestFileTable class declaration.
     3 * VBox Qt GUI - UIFileManagerGuestTable class declaration.
    44 */
    55
    … …  
    2727
    2828/* GUI includes: */
    29 #include "UIGuestControlFileTable.h"
     29#include "UIFileManagerTable.h"
    3030
    3131/* Forward declarations: */
    … …  
    3434/** This class scans the guest file system by using the VBox Guest Control API
    3535 *  and populates the UIGuestControlFileModel*/
    36 class UIGuestFileTable : public UIGuestControlFileTable
     36class UIFileManagerGuestTable : public UIFileManagerTable
    3737{
    3838    Q_OBJECT;
    … …  
    4040public:
    4141
    42     UIGuestFileTable(UIActionPool *pActionPool, QWidget *pParent = 0);
     42    UIFileManagerGuestTable(UIActionPool *pActionPool, QWidget *pParent = 0);
    4343    void initGuestFileTable(const CGuestSession &session);
    4444    void copyGuestToHost(const QString& hostDestinationPath);
    … …  
    8282};
    8383
    84 #endif /* !___UIGuestFileTable_h___ */
     84#endif /* !___UIFileManagerGuestTable_h___ */

  • trunk/src/VBox/Frontends/VirtualBox/src/guestctrl/UIFileManagerHostTable.cpp

    r76176 r76177  
    11/* $Id$ */
    22/** @file
    3  * VBox Qt GUI - UIGuestControlFileTable class implementation.
     3 * VBox Qt GUI - UIFileManagerHostTable class implementation.
    44 */
    55
    … …  
    2828# include "QILabel.h"
    2929# include "UIActionPool.h"
    30 # include "UIGuestControlFileManager.h"
    31 # include "UIGuestControlFileModel.h"
    32 # include "UIHostFileTable.h"
     30# include "UIFileManager.h"
     31# include "UIFileManagerModel.h"
     32# include "UIFileManagerHostTable.h"
    3333# include "UIToolBar.h"
    3434
    … …  
    105105        const QFileInfo &entryInfo = entryList.at(i);
    106106        if (entryInfo.baseName().isEmpty() || entryInfo.baseName() == "." ||
    107             entryInfo.baseName() == UIGuestControlFileModel::strUpDirectoryString)
     107            entryInfo.baseName() == UIFileManagerModel::strUpDirectoryString)
    108108            continue;
    109109        statistics.m_totalSize += entryInfo.size();
    … …  
    123123
    124124/*********************************************************************************************************************************
    125 *   UIHostFileTable implementation.                                                                                              *
     125*   UIFileManagerHostTable implementation.                                                                                       *
    126126*********************************************************************************************************************************/
    127127
    128 UIHostFileTable::UIHostFileTable(UIActionPool *pActionPool, QWidget *pParent /* = 0 */)
    129     :UIGuestControlFileTable(pActionPool, pParent)
     128UIFileManagerHostTable::UIFileManagerHostTable(UIActionPool *pActionPool, QWidget *pParent /* = 0 */)
     129    :UIFileManagerTable(pActionPool, pParent)
    130130{
    131131    initializeFileTree();
    … …  
    135135}
    136136
    137 void UIHostFileTable::retranslateUi()
     137void UIFileManagerHostTable::retranslateUi()
    138138{
    139139    if (m_pLocationLabel)
    140         m_pLocationLabel->setText(UIGuestControlFileManager::tr("Host System"));
    141     UIGuestControlFileTable::retranslateUi();
    142 }
    143 
    144 void UIHostFileTable::prepareToolbar()
     140        m_pLocationLabel->setText(UIFileManager::tr("Host System"));
     141    UIFileManagerTable::retranslateUi();
     142}
     143
     144void UIFileManagerHostTable::prepareToolbar()
    145145{
    146146    if (m_pToolBar && m_pActionPool)
    147147    {
    148         m_pToolBar->addAction(m_pActionPool->action(UIActionIndex_M_GuestControlFileManager_S_Host_GoUp));
    149         m_pToolBar->addAction(m_pActionPool->action(UIActionIndex_M_GuestControlFileManager_S_Host_GoHome));
    150         m_pToolBar->addAction(m_pActionPool->action(UIActionIndex_M_GuestControlFileManager_S_Host_Refresh));
     148        m_pToolBar->addAction(m_pActionPool->action(UIActionIndex_M_FileManager_S_Host_GoUp));
     149        m_pToolBar->addAction(m_pActionPool->action(UIActionIndex_M_FileManager_S_Host_GoHome));
     150        m_pToolBar->addAction(m_pActionPool->action(UIActionIndex_M_FileManager_S_Host_Refresh));
    151151        m_pToolBar->addSeparator();
    152         m_pToolBar->addAction(m_pActionPool->action(UIActionIndex_M_GuestControlFileManager_S_Host_Delete));
    153         m_pToolBar->addAction(m_pActionPool->action(UIActionIndex_M_GuestControlFileManager_S_Host_Rename));
    154         m_pToolBar->addAction(m_pActionPool->action(UIActionIndex_M_GuestControlFileManager_S_Host_CreateNewDirectory));
     152        m_pToolBar->addAction(m_pActionPool->action(UIActionIndex_M_FileManager_S_Host_Delete));
     153        m_pToolBar->addAction(m_pActionPool->action(UIActionIndex_M_FileManager_S_Host_Rename));
     154        m_pToolBar->addAction(m_pActionPool->action(UIActionIndex_M_FileManager_S_Host_CreateNewDirectory));
    155155        /* Hide cut, copy, and paste for now. We will implement those
    156156           when we have an API for host file operations: */
    157157        // m_pToolBar->addSeparator();
    158         // m_pToolBar->addAction(m_pActionPool->action(UIActionIndex_M_GuestControlFileManager_S_Host_Copy));
    159         // m_pToolBar->addAction(m_pActionPool->action(UIActionIndex_M_GuestControlFileManager_S_Host_Cut));
    160         // m_pToolBar->addAction(m_pActionPool->action(UIActionIndex_M_GuestControlFileManager_S_Host_Paste));
     158        // m_pToolBar->addAction(m_pActionPool->action(UIActionIndex_M_FileManager_S_Host_Copy));
     159        // m_pToolBar->addAction(m_pActionPool->action(UIActionIndex_M_FileManager_S_Host_Cut));
     160        // m_pToolBar->addAction(m_pActionPool->action(UIActionIndex_M_FileManager_S_Host_Paste));
    161161        m_pToolBar->addSeparator();
    162         m_pToolBar->addAction(m_pActionPool->action(UIActionIndex_M_GuestControlFileManager_S_Host_SelectAll));
    163         m_pToolBar->addAction(m_pActionPool->action(UIActionIndex_M_GuestControlFileManager_S_Host_InvertSelection));
     162        m_pToolBar->addAction(m_pActionPool->action(UIActionIndex_M_FileManager_S_Host_SelectAll));
     163        m_pToolBar->addAction(m_pActionPool->action(UIActionIndex_M_FileManager_S_Host_InvertSelection));
    164164        m_pToolBar->addSeparator();
    165         m_pToolBar->addAction(m_pActionPool->action(UIActionIndex_M_GuestControlFileManager_S_Host_ShowProperties));
    166 
    167         m_selectionDependentActions.insert(m_pActionPool->action(UIActionIndex_M_GuestControlFileManager_S_Host_Delete));
    168         m_selectionDependentActions.insert(m_pActionPool->action(UIActionIndex_M_GuestControlFileManager_S_Host_Rename));
    169         m_selectionDependentActions.insert(m_pActionPool->action(UIActionIndex_M_GuestControlFileManager_S_Host_ShowProperties));
     165        m_pToolBar->addAction(m_pActionPool->action(UIActionIndex_M_FileManager_S_Host_ShowProperties));
     166
     167        m_selectionDependentActions.insert(m_pActionPool->action(UIActionIndex_M_FileManager_S_Host_Delete));
     168        m_selectionDependentActions.insert(m_pActionPool->action(UIActionIndex_M_FileManager_S_Host_Rename));
     169        m_selectionDependentActions.insert(m_pActionPool->action(UIActionIndex_M_FileManager_S_Host_ShowProperties));
    170170    }
    171171
    … …  
    173173}
    174174
    175 void UIHostFileTable::createFileViewContextMenu(const QWidget *pWidget, const QPoint &point)
     175void UIFileManagerHostTable::createFileViewContextMenu(const QWidget *pWidget, const QPoint &point)
    176176{
    177177    if (!pWidget)
    … …  
    179179
    180180    QMenu menu;
    181     menu.addAction(m_pActionPool->action(UIActionIndex_M_GuestControlFileManager_S_Host_GoUp));
    182 
    183     menu.addAction(m_pActionPool->action(UIActionIndex_M_GuestControlFileManager_S_Host_GoHome));
    184     menu.addAction(m_pActionPool->action(UIActionIndex_M_GuestControlFileManager_S_Host_Refresh));
     181    menu.addAction(m_pActionPool->action(UIActionIndex_M_FileManager_S_Host_GoUp));
     182
     183    menu.addAction(m_pActionPool->action(UIActionIndex_M_FileManager_S_Host_GoHome));
     184    menu.addAction(m_pActionPool->action(UIActionIndex_M_FileManager_S_Host_Refresh));
    185185    menu.addSeparator();
    186     menu.addAction(m_pActionPool->action(UIActionIndex_M_GuestControlFileManager_S_Host_Delete));
    187     menu.addAction(m_pActionPool->action(UIActionIndex_M_GuestControlFileManager_S_Host_Rename));
    188     menu.addAction(m_pActionPool->action(UIActionIndex_M_GuestControlFileManager_S_Host_CreateNewDirectory));
     186    menu.addAction(m_pActionPool->action(UIActionIndex_M_FileManager_S_Host_Delete));
     187    menu.addAction(m_pActionPool->action(UIActionIndex_M_FileManager_S_Host_Rename));
     188    menu.addAction(m_pActionPool->action(UIActionIndex_M_FileManager_S_Host_CreateNewDirectory));
    189189    /* Hide cut, copy, and paste for now. We will implement those
    190190       when we have an API for host file operations: */
    191191    // menu.addSeparator();
    192     // menu.addAction(m_pActionPool->action(UIActionIndex_M_GuestControlFileManager_S_Host_Copy));
    193     // menu.addAction(m_pActionPool->action(UIActionIndex_M_GuestControlFileManager_S_Host_Cut));
    194     // menu.addAction(m_pActionPool->action(UIActionIndex_M_GuestControlFileManager_S_Host_Paste));
     192    // menu.addAction(m_pActionPool->action(UIActionIndex_M_FileManager_S_Host_Copy));
     193    // menu.addAction(m_pActionPool->action(UIActionIndex_M_FileManager_S_Host_Cut));
     194    // menu.addAction(m_pActionPool->action(UIActionIndex_M_FileManager_S_Host_Paste));
    195195    menu.addSeparator();
    196     menu.addAction(m_pActionPool->action(UIActionIndex_M_GuestControlFileManager_S_Host_SelectAll));
    197     menu.addAction(m_pActionPool->action(UIActionIndex_M_GuestControlFileManager_S_Host_InvertSelection));
     196    menu.addAction(m_pActionPool->action(UIActionIndex_M_FileManager_S_Host_SelectAll));
     197    menu.addAction(m_pActionPool->action(UIActionIndex_M_FileManager_S_Host_InvertSelection));
    198198    menu.addSeparator();
    199     menu.addAction(m_pActionPool->action(UIActionIndex_M_GuestControlFileManager_S_Host_ShowProperties));
     199    menu.addAction(m_pActionPool->action(UIActionIndex_M_FileManager_S_Host_ShowProperties));
    200200    menu.exec(pWidget->mapToGlobal(point));
    201201}
    202202
    203 void UIHostFileTable::readDirectory(const QString& strPath, UIFileTableItem *parent, bool isStartDir /*= false*/)
     203void UIFileManagerHostTable::readDirectory(const QString& strPath, UIFileTableItem *parent, bool isStartDir /*= false*/)
    204204{
    205205    if (!parent)
    … …  
    249249}
    250250
    251 void UIHostFileTable::deleteByItem(UIFileTableItem *item)
     251void UIFileManagerHostTable::deleteByItem(UIFileTableItem *item)
    252252{
    253253    if (item->isUpDirectory())
    … …  
    271271}
    272272
    273 void UIHostFileTable::deleteByPath(const QStringList &pathList)
     273void UIFileManagerHostTable::deleteByPath(const QStringList &pathList)
    274274{
    275275    foreach (const QString &strPath, pathList)
    … …  
    292292}
    293293
    294 void UIHostFileTable::goToHomeDirectory()
     294void UIFileManagerHostTable::goToHomeDirectory()
    295295{
    296296    if (!m_pRootItem || m_pRootItem->childCount() <= 0)
    … …  
    304304}
    305305
    306 bool UIHostFileTable::renameItem(UIFileTableItem *item, QString newBaseName)
     306bool UIFileManagerHostTable::renameItem(UIFileTableItem *item, QString newBaseName)
    307307{
    308308    if (!item || item->isUpDirectory() || newBaseName.isEmpty())
    … …  
    318318}
    319319
    320 bool UIHostFileTable::createDirectory(const QString &path, const QString &directoryName)
     320bool UIFileManagerHostTable::createDirectory(const QString &path, const QString &directoryName)
    321321{
    322322    QDir parentDir(path);
    … …  
    330330}
    331331
    332 FileObjectType UIHostFileTable::fileType(const QFileInfo &fsInfo)
     332FileObjectType UIFileManagerHostTable::fileType(const QFileInfo &fsInfo)
    333333{
    334334    if (!fsInfo.exists())
    … …  
    346346}
    347347
    348 QString UIHostFileTable::fsObjectPropertyString()
     348QString UIFileManagerHostTable::fsObjectPropertyString()
    349349{
    350350    QStringList selectedObjects = selectedItemPathList();
    … …  
    360360        QStringList propertyStringList;
    361361        /* Name: */
    362         propertyStringList << UIGuestControlFileManager::tr("<b>Name:</b> %1<br/>").arg(fileInfo.fileName());
     362        propertyStringList << UIFileManager::tr("<b>Name:</b> %1<br/>").arg(fileInfo.fileName());
    363363        /* Size: */
    364         propertyStringList << UIGuestControlFileManager::tr("<b>Size:</b> %1 bytes").arg(QString::number(fileInfo.size()));
     364        propertyStringList << UIFileManager::tr("<b>Size:</b> %1 bytes").arg(QString::number(fileInfo.size()));
    365365        if (fileInfo.size() >= m_iKiloByte)
    366366            propertyStringList << QString(" (%1)").arg(humanReadableSize(fileInfo.size()));
    367367        propertyStringList << "<br/>";
    368368        /* Type: */
    369         propertyStringList << UIGuestControlFileManager::tr("<b>Type:</b> %1<br/>").arg(fileTypeString(fileType(fileInfo)));
     369        propertyStringList << UIFileManager::tr("<b>Type:</b> %1<br/>").arg(fileTypeString(fileType(fileInfo)));
    370370        /* Creation Date: */
    371         propertyStringList << UIGuestControlFileManager::tr("<b>Created:</b> %1<br/>").arg(fileInfo.created().toString());
     371        propertyStringList << UIFileManager::tr("<b>Created:</b> %1<br/>").arg(fileInfo.created().toString());
    372372        /* Last Modification Date: */
    373         propertyStringList << UIGuestControlFileManager::tr("<b>Modified:</b> %1<br/>").arg(fileInfo.lastModified().toString());
     373        propertyStringList << UIFileManager::tr("<b>Modified:</b> %1<br/>").arg(fileInfo.lastModified().toString());
    374374        /* Owner: */
    375         propertyStringList << UIGuestControlFileManager::tr("<b>Owner:</b> %1").arg(fileInfo.owner());
     375        propertyStringList << UIFileManager::tr("<b>Owner:</b> %1").arg(fileInfo.owner());
    376376
    377377        return propertyStringList.join(QString());;
    … …  
    394394    }
    395395    QStringList propertyStringList;
    396     propertyStringList << UIGuestControlFileManager::tr("<b>Selected:</b> %1 files and %2 directories<br/>").
     396    propertyStringList << UIFileManager::tr("<b>Selected:</b> %1 files and %2 directories<br/>").
    397397        arg(QString::number(fileCount)).arg(QString::number(directoryCount));
    398     propertyStringList << UIGuestControlFileManager::tr("<b>Size:</b> %1 bytes").arg(QString::number(totalSize));
     398    propertyStringList << UIFileManager::tr("<b>Size:</b> %1 bytes").arg(QString::number(totalSize));
    399399    if (totalSize >= m_iKiloByte)
    400400        propertyStringList << QString(" (%1)").arg(humanReadableSize(totalSize));
    … …  
    403403}
    404404
    405 void  UIHostFileTable::showProperties()
     405void  UIFileManagerHostTable::showProperties()
    406406{
    407407    qRegisterMetaType<UIDirectoryStatistics>();
    … …  
    424424        {
    425425            connect(directoryThread, &UIHostDirectoryDiskUsageComputer::sigResultUpdated,
    426                     this, &UIHostFileTable::sltReceiveDirectoryStatistics/*, Qt::DirectConnection*/);
     426                    this, &UIFileManagerHostTable::sltReceiveDirectoryStatistics/*, Qt::DirectConnection*/);
    427427            directoryThread->start();
    428428        }
    … …  
    436436            directoryThread->stopRecursion();
    437437        disconnect(directoryThread, &UIHostDirectoryDiskUsageComputer::sigResultUpdated,
    438                 this, &UIHostFileTable::sltReceiveDirectoryStatistics/*, Qt::DirectConnection*/);
     438                this, &UIFileManagerHostTable::sltReceiveDirectoryStatistics/*, Qt::DirectConnection*/);
    439439        directoryThread->wait();
    440440    }
    441441}
    442442
    443 void UIHostFileTable::determineDriveLetters()
     443void UIFileManagerHostTable::determineDriveLetters()
    444444{
    445445    QFileInfoList drive = QDir::drives();
    … …  
    453453}
    454454
    455 QString UIHostFileTable::permissionString(QFileDevice::Permissions permissions)
     455QString UIFileManagerHostTable::permissionString(QFileDevice::Permissions permissions)
    456456{
    457457    QString strPermissions;
    … …  
    503503}
    504504
    505 void UIHostFileTable::prepareActionConnections()
    506 {
    507     connect(m_pActionPool->action(UIActionIndex_M_GuestControlFileManager_S_Host_GoUp), &QAction::triggered,
    508             this, &UIGuestControlFileTable::sltGoUp);
    509     connect(m_pActionPool->action(UIActionIndex_M_GuestControlFileManager_S_Host_GoHome), &QAction::triggered,
    510             this, &UIGuestControlFileTable::sltGoHome);
    511     connect(m_pActionPool->action(UIActionIndex_M_GuestControlFileManager_S_Host_Refresh), &QAction::triggered,
    512             this, &UIGuestControlFileTable::sltRefresh);
    513     connect(m_pActionPool->action(UIActionIndex_M_GuestControlFileManager_S_Host_Delete), &QAction::triggered,
    514             this, &UIGuestControlFileTable::sltDelete);
    515     connect(m_pActionPool->action(UIActionIndex_M_GuestControlFileManager_S_Host_Rename), &QAction::triggered,
    516             this, &UIGuestControlFileTable::sltRename);
    517     connect(m_pActionPool->action(UIActionIndex_M_GuestControlFileManager_S_Host_Copy), &QAction::triggered,
    518             this, &UIGuestControlFileTable::sltCopy);
    519     connect(m_pActionPool->action(UIActionIndex_M_GuestControlFileManager_S_Host_Cut), &QAction::triggered,
    520             this, &UIGuestControlFileTable::sltCut);
    521     connect(m_pActionPool->action(UIActionIndex_M_GuestControlFileManager_S_Host_Paste), &QAction::triggered,
    522             this, &UIGuestControlFileTable::sltPaste);
    523     connect(m_pActionPool->action(UIActionIndex_M_GuestControlFileManager_S_Host_SelectAll), &QAction::triggered,
    524             this, &UIGuestControlFileTable::sltSelectAll);
    525     connect(m_pActionPool->action(UIActionIndex_M_GuestControlFileManager_S_Host_InvertSelection), &QAction::triggered,
    526             this, &UIGuestControlFileTable::sltInvertSelection);
    527     connect(m_pActionPool->action(UIActionIndex_M_GuestControlFileManager_S_Host_ShowProperties), &QAction::triggered,
    528             this, &UIGuestControlFileTable::sltShowProperties);
    529     connect(m_pActionPool->action(UIActionIndex_M_GuestControlFileManager_S_Host_CreateNewDirectory), &QAction::triggered,
    530             this, &UIGuestControlFileTable::sltCreateNewDirectory);
    531 }
    532 
    533 #include "UIHostFileTable.moc"
     505void UIFileManagerHostTable::prepareActionConnections()
     506{
     507    connect(m_pActionPool->action(UIActionIndex_M_FileManager_S_Host_GoUp), &QAction::triggered,
     508            this, &UIFileManagerTable::sltGoUp);
     509    connect(m_pActionPool->action(UIActionIndex_M_FileManager_S_Host_GoHome), &QAction::triggered,
     510            this, &UIFileManagerTable::sltGoHome);
     511    connect(m_pActionPool->action(UIActionIndex_M_FileManager_S_Host_Refresh), &QAction::triggered,
     512            this, &UIFileManagerTable::sltRefresh);
     513    connect(m_pActionPool->action(UIActionIndex_M_FileManager_S_Host_Delete), &QAction::triggered,
     514            this, &UIFileManagerTable::sltDelete);
     515    connect(m_pActionPool->action(UIActionIndex_M_FileManager_S_Host_Rename), &QAction::triggered,
     516            this, &UIFileManagerTable::sltRename);
     517    connect(m_pActionPool->action(UIActionIndex_M_FileManager_S_Host_Copy), &QAction::triggered,
     518            this, &UIFileManagerTable::sltCopy);
     519    connect(m_pActionPool->action(UIActionIndex_M_FileManager_S_Host_Cut), &QAction::triggered,
     520            this, &UIFileManagerTable::sltCut);
     521    connect(m_pActionPool->action(UIActionIndex_M_FileManager_S_Host_Paste), &QAction::triggered,
     522            this, &UIFileManagerTable::sltPaste);
     523    connect(m_pActionPool->action(UIActionIndex_M_FileManager_S_Host_SelectAll), &QAction::triggered,
     524            this, &UIFileManagerTable::sltSelectAll);
     525    connect(m_pActionPool->action(UIActionIndex_M_FileManager_S_Host_InvertSelection), &QAction::triggered,
     526            this, &UIFileManagerTable::sltInvertSelection);
     527    connect(m_pActionPool->action(UIActionIndex_M_FileManager_S_Host_ShowProperties), &QAction::triggered,
     528            this, &UIFileManagerTable::sltShowProperties);
     529    connect(m_pActionPool->action(UIActionIndex_M_FileManager_S_Host_CreateNewDirectory), &QAction::triggered,
     530            this, &UIFileManagerTable::sltCreateNewDirectory);
     531}
     532
     533#include "UIFileManagerHostTable.moc"

  • trunk/src/VBox/Frontends/VirtualBox/src/guestctrl/UIFileManagerHostTable.h

    r76176 r76177  
    11/* $Id$ */
    22/** @file
    3  * VBox Qt GUI - UIHostFileTable class declaration.
     3 * VBox Qt GUI - UIFileManagerHostTable class declaration.
    44 */
    55
    … …  
    1616 */
    1717
    18 #ifndef ___UIHostFileTable_h___
    19 #define ___UIHostFileTable_h___
     18#ifndef ___UIFileManagerHostTable_h___
     19#define ___UIFileManagerHostTable_h___
    2020
    2121/* GUI includes: */
    22 #include "UIGuestControlFileTable.h"
     22#include "UIFileManagerTable.h"
    2323
    2424/* Forward declarations: */
    … …  
    2626
    2727/** This class scans the host file system by using the Qt API
    28     and connects to the UIGuestControlFileModel*/
    29 class UIHostFileTable : public UIGuestControlFileTable
     28    and connects to the UIFileManagerModel*/
     29class UIFileManagerHostTable : public UIFileManagerTable
    3030{
    3131    Q_OBJECT;
    … …  
    3333public:
    3434
    35     UIHostFileTable(UIActionPool *pActionPool, QWidget *pParent = 0);
     35    UIFileManagerHostTable(UIActionPool *pActionPool, QWidget *pParent = 0);
    3636
    3737protected:
    … …  
    6464};
    6565
    66 #endif /* !___UIHostFileTable_h___ */
     66#endif /* !___UIFileManagerHostTable_h___ */

  • trunk/src/VBox/Frontends/VirtualBox/src/guestctrl/UIFileManagerLogPanel.cpp

    r76176 r76177  
    3030# include "QIToolButton.h"
    3131# include "UIIconPool.h"
    32 # include "UIGuestControlFileManager.h"
    33 # include "UIGuestControlFileManagerLogPanel.h"
     32# include "UIFileManager.h"
     33# include "UIFileManagerLogPanel.h"
    3434
    3535#endif /* !VBOX_WITH_PRECOMPILED_HEADERS */
    … …  
    7373    QMenu *menu = createStandardContextMenu();
    7474
    75     QAction *pClearAction = menu->addAction(UIGuestControlFileManager::tr("Clear"));
     75    QAction *pClearAction = menu->addAction(UIFileManager::tr("Clear"));
    7676    connect(pClearAction, &QAction::triggered, this, &UIFileManagerLogViewer::sltClear);
    7777    menu->exec(event->globalPos());
    … …  
    8686
    8787/*********************************************************************************************************************************
    88 *   UIGuestControlFileManagerLogPanel implementation.                                                                            *
     88*   UIFileManagerLogPanel implementation.                                                                            *
    8989*********************************************************************************************************************************/
    9090
    91 UIGuestControlFileManagerLogPanel::UIGuestControlFileManagerLogPanel(UIGuestControlFileManager *pManagerWidget, QWidget *pParent)
    92     : UIGuestControlFileManagerPanel(pManagerWidget, pParent)
     91UIFileManagerLogPanel::UIFileManagerLogPanel(UIFileManager *pManagerWidget, QWidget *pParent)
     92    : UIFileManagerPanel(pManagerWidget, pParent)
    9393    , m_pLogTextEdit(0)
    9494{
    … …  
    9696}
    9797
    98 void UIGuestControlFileManagerLogPanel::appendLog(const QString &strLog, FileManagerLogType eLogType)
     98void UIFileManagerLogPanel::appendLog(const QString &strLog, FileManagerLogType eLogType)
    9999{
    100100    if (!m_pLogTextEdit)
    … …  
    109109}
    110110
    111 QString UIGuestControlFileManagerLogPanel::panelName() const
     111QString UIFileManagerLogPanel::panelName() const
    112112{
    113113    return "LogPanel";
    114114}
    115115
    116 void UIGuestControlFileManagerLogPanel::prepareWidgets()
     116void UIFileManagerLogPanel::prepareWidgets()
    117117{
    118118    if (!mainLayout())
    … …  
    125125}
    126126
    127 void UIGuestControlFileManagerLogPanel::prepareConnections()
     127void UIFileManagerLogPanel::prepareConnections()
    128128{
    129129}
    130130
    131 void UIGuestControlFileManagerLogPanel::retranslateUi()
     131void UIFileManagerLogPanel::retranslateUi()
    132132{
    133     UIGuestControlFileManagerPanel::retranslateUi();
     133    UIFileManagerPanel::retranslateUi();
    134134
    135135}
    136136
    137137
    138 #include "UIGuestControlFileManagerLogPanel.moc"
     138#include "UIFileManagerLogPanel.moc"

  • trunk/src/VBox/Frontends/VirtualBox/src/guestctrl/UIFileManagerLogPanel.h

    r76176 r76177  
    1616 */
    1717
    18 #ifndef ___UIGuestControlFileManagerLogPanel_h___
    19 #define ___UIGuestControlFileManagerLogPanel_h___
     18#ifndef ___UIFileManagerLogPanel_h___
     19#define ___UIFileManagerLogPanel_h___
    2020
    2121/* GUI includes: */
    2222#include "UIGuestControlDefs.h"
    23 #include "UIGuestControlFileManagerPanel.h"
     23#include "UIFileManagerPanel.h"
    2424
    2525/* Forward declarations: */
    2626class QTextEdit;
    27 class UIGuestControlFileManager;
     27class UIFileManager;
    2828
    29 /** UIGuestControlFileManagerPanel extension to display file manager logs. */
    30 class UIGuestControlFileManagerLogPanel : public UIGuestControlFileManagerPanel
     29/** UIFileManagerPanel extension to display file manager logs. */
     30class UIFileManagerLogPanel : public UIFileManagerPanel
    3131{
    3232    Q_OBJECT;
    … …  
    3434public:
    3535
    36     UIGuestControlFileManagerLogPanel(UIGuestControlFileManager *pManagerWidget, QWidget *pParent);
     36    UIFileManagerLogPanel(UIFileManager *pManagerWidget, QWidget *pParent);
    3737    void appendLog(const QString &str, FileManagerLogType);
    3838    virtual QString panelName() const /* override */;
    … …  
    5454};
    5555
    56 #endif /* !___UIGuestControlFileManagerLogPanel_h___ */
     56#endif /* !___UIFileManagerLogPanel_h___ */

  • trunk/src/VBox/Frontends/VirtualBox/src/guestctrl/UIFileManagerModel.cpp

    r76176 r76177  
    11/* $Id$ */
    22/** @file
    3  * VBox Qt GUI - UIGuestControlFileModel class implementation.
     3 * VBox Qt GUI - UIFileManagerModel class implementation.
    44 */
    55
    … …  
    2626/* GUI includes: */
    2727# include "UIErrorString.h"
    28 # include "UIGuestControlFileModel.h"
    29 # include "UIGuestControlFileTable.h"
    30 # include "UIGuestControlFileManager.h"
     28# include "UIFileManagerModel.h"
     29# include "UIFileManagerTable.h"
     30# include "UIFileManager.h"
    3131
    3232
    3333#endif /* !VBOX_WITH_PRECOMPILED_HEADERS */
    3434
    35 const char* UIGuestControlFileModel::strUpDirectoryString = "..";
     35const char* UIFileManagerModel::strUpDirectoryString = "..";
    3636
    3737UIGuestControlFileProxyModel::UIGuestControlFileProxyModel(QObject *parent /* = 0 */)
    … …  
    4545    UIFileTableItem *pRightItem = static_cast<UIFileTableItem*>(right.internalPointer());
    4646
    47     UIGuestControlFileManagerOptions *pOptions = UIGuestControlFileManagerOptions::instance();
     47    UIFileManagerOptions *pOptions = UIFileManagerOptions::instance();
    4848
    4949    if (pLeftItem && pRightItem)
    … …  
    6464
    6565        /* If the sort column is QDateTime than handle it correctly: */
    66         if (sortColumn() == UIGuestControlFileModelColumn_ChangeTime)
    67         {
    68             QVariant dataLeft = pLeftItem->data(UIGuestControlFileModelColumn_ChangeTime);
    69             QVariant dataRight = pRightItem->data(UIGuestControlFileModelColumn_ChangeTime);
     66        if (sortColumn() == UIFileManagerModelColumn_ChangeTime)
     67        {
     68            QVariant dataLeft = pLeftItem->data(UIFileManagerModelColumn_ChangeTime);
     69            QVariant dataRight = pRightItem->data(UIFileManagerModelColumn_ChangeTime);
    7070            QDateTime leftDateTime = dataLeft.toDateTime();
    7171            QDateTime rightDateTime = dataRight.toDateTime();
    … …  
    7373        }
    7474        /* When we show human readble sizes in size column sorting gets confused, so do it here: */
    75         else if(sortColumn() == UIGuestControlFileModelColumn_Size)
    76         {
    77             qulonglong leftSize = pLeftItem->data(UIGuestControlFileModelColumn_Size).toULongLong();
    78             qulonglong rightSize = pRightItem->data(UIGuestControlFileModelColumn_Size).toULongLong();
     75        else if(sortColumn() == UIFileManagerModelColumn_Size)
     76        {
     77            qulonglong leftSize = pLeftItem->data(UIFileManagerModelColumn_Size).toULongLong();
     78            qulonglong rightSize = pRightItem->data(UIFileManagerModelColumn_Size).toULongLong();
    7979            return (leftSize < rightSize);
    8080
    … …  
    8484}
    8585
    86 UIGuestControlFileModel::UIGuestControlFileModel(QObject *parent)
     86UIFileManagerModel::UIFileManagerModel(QObject *parent)
    8787    : QAbstractItemModel(parent)
    88     , m_pParent(qobject_cast<UIGuestControlFileTable*>(parent))
    89 {
    90 }
    91 
    92 UIFileTableItem* UIGuestControlFileModel::rootItem() const
     88    , m_pParent(qobject_cast<UIFileManagerTable*>(parent))
     89{
     90}
     91
     92UIFileTableItem* UIFileManagerModel::rootItem() const
    9393{
    9494    if (!m_pParent)
    … …  
    9797}
    9898
    99 UIGuestControlFileModel::~UIGuestControlFileModel()
     99UIFileManagerModel::~UIFileManagerModel()
    100100{}
    101101
    102 int UIGuestControlFileModel::columnCount(const QModelIndex &parent) const
     102int UIFileManagerModel::columnCount(const QModelIndex &parent) const
    103103{
    104104    if (parent.isValid())
    … …  
    113113}
    114114
    115 bool UIGuestControlFileModel::setData(const QModelIndex &index, const QVariant &value, int role)
     115bool UIFileManagerModel::setData(const QModelIndex &index, const QVariant &value, int role)
    116116{
    117117    if (index.isValid() && role == Qt::EditRole)
    … …  
    138138}
    139139
    140 QVariant UIGuestControlFileModel::data(const QModelIndex &index, int role) const
     140QVariant UIFileManagerModel::data(const QModelIndex &index, int role) const
    141141{
    142142    if (!index.isValid())
    … …  
    149149    {
    150150        /* dont show anything but the name for up directories: */
    151         if (item->isUpDirectory() && index.column() != UIGuestControlFileModelColumn_Name)
     151        if (item->isUpDirectory() && index.column() != UIFileManagerModelColumn_Name)
    152152            return QVariant();
    153153        /* Format date/time column: */
    … …  
    159159        }
    160160        /* Decide whether to show human-readable file object sizes: */
    161         if (index.column() == UIGuestControlFileModelColumn_Size)
    162         {
    163             UIGuestControlFileManagerOptions* pOptions =
    164                 UIGuestControlFileManagerOptions::instance();
     161        if (index.column() == UIFileManagerModelColumn_Size)
     162        {
     163            UIFileManagerOptions* pOptions =
     164                UIFileManagerOptions::instance();
    165165            if (pOptions && pOptions->bShowHumanReadableSizes)
    166166            {
    167167                qulonglong size = item->data(index.column()).toULongLong();
    168                 return UIGuestControlFileTable::humanReadableSize(size);
     168                return UIFileManagerTable::humanReadableSize(size);
    169169            }
    170170            else
    … …  
    199199}
    200200
    201 Qt::ItemFlags UIGuestControlFileModel::flags(const QModelIndex &index) const
     201Qt::ItemFlags UIFileManagerModel::flags(const QModelIndex &index) const
    202202{
    203203    if (!index.isValid())
    … …  
    212212}
    213213
    214 QVariant UIGuestControlFileModel::headerData(int section, Qt::Orientation orientation,
     214QVariant UIFileManagerModel::headerData(int section, Qt::Orientation orientation,
    215215                               int role) const
    216216{
    … …  
    225225}
    226226
    227 QModelIndex UIGuestControlFileModel::index(UIFileTableItem* item)
     227QModelIndex UIFileManagerModel::index(UIFileTableItem* item)
    228228{
    229229    if (!item)
    … …  
    232232}
    233233
    234 QModelIndex UIGuestControlFileModel::index(int row, int column, const QModelIndex &parent)
     234QModelIndex UIFileManagerModel::index(int row, int column, const QModelIndex &parent)
    235235            const
    236236{
    … …  
    255255
    256256
    257 QModelIndex UIGuestControlFileModel::parent(const QModelIndex &index) const
     257QModelIndex UIFileManagerModel::parent(const QModelIndex &index) const
    258258{
    259259    if (!index.isValid())
    … …  
    269269}
    270270
    271 int UIGuestControlFileModel::rowCount(const QModelIndex &parent) const
     271int UIFileManagerModel::rowCount(const QModelIndex &parent) const
    272272{
    273273    if (parent.column() > 0)
    … …  
    283283}
    284284
    285 void UIGuestControlFileModel::signalUpdate()
     285void UIFileManagerModel::signalUpdate()
    286286{
    287287    emit layoutChanged();
    288288}
    289289
    290 QModelIndex UIGuestControlFileModel::rootIndex() const
     290QModelIndex UIFileManagerModel::rootIndex() const
    291291{
    292292    if (!rootItem())
    … …  
    296296}
    297297
    298 void UIGuestControlFileModel::beginReset()
     298void UIFileManagerModel::beginReset()
    299299{
    300300    beginResetModel();
    301301}
    302302
    303 void UIGuestControlFileModel::endReset()
     303void UIFileManagerModel::endReset()
    304304{
    305305    endResetModel();

  • trunk/src/VBox/Frontends/VirtualBox/src/guestctrl/UIFileManagerModel.h

    r76176 r76177  
    11/* $Id$ */
    22/** @file
    3  * VBox Qt GUI - UIGuestControlFileModel class declaration.
     3 * VBox Qt GUI - UIFileManagerModel class declaration.
    44 */
    55
    … …  
    1616 */
    1717
    18 #ifndef ___UIGuestControlFileModel_h___
    19 #define ___UIGuestControlFileModel_h___
     18#ifndef ___UIFileManagerModel_h___
     19#define ___UIFileManagerModel_h___
    2020
    2121/* Qt includes: */
    … …  
    2828/* Forward declarations: */
    2929class UIFileTableItem;
    30 class UIGuestControlFileTable;
     30class UIFileManagerTable;
    3131
    32 enum UIGuestControlFileModelColumn
     32enum UIFileManagerModelColumn
    3333{
    34     UIGuestControlFileModelColumn_Name = 0,
    35     UIGuestControlFileModelColumn_Size,
    36     UIGuestControlFileModelColumn_ChangeTime,
    37     UIGuestControlFileModelColumn_Owner,
    38     UIGuestControlFileModelColumn_Permissions,
    39     UIGuestControlFileModelColumn_Max
     34    UIFileManagerModelColumn_Name = 0,
     35    UIFileManagerModelColumn_Size,
     36    UIFileManagerModelColumn_ChangeTime,
     37    UIFileManagerModelColumn_Owner,
     38    UIFileManagerModelColumn_Permissions,
     39    UIFileManagerModelColumn_Max
    4040};
    4141
    … …  
    5656};
    5757
    58 /** UIGuestControlFileModel serves as the model for a file structure.
     58/** UIFileManagerModel serves as the model for a file structure.
    5959 *  it supports a tree level hierarchy which can be displayed with
    6060 *  QTableView and/or QTreeView. Note the file structure data is not
    6161 *  kept by the model but rather by the containing widget which also servers
    6262 *  as the interface to functionality that this model provides.*/
    63 class UIGuestControlFileModel : public QAbstractItemModel
     63class UIFileManagerModel : public QAbstractItemModel
    6464{
    6565
    … …  
    6868public:
    6969
    70     explicit UIGuestControlFileModel(QObject *parent = 0);
    71     ~UIGuestControlFileModel();
     70    explicit UIFileManagerModel(QObject *parent = 0);
     71    ~UIFileManagerModel();
    7272
    7373    QVariant       data(const QModelIndex &index, int role) const /* override */;
    … …  
    9393    UIFileTableItem* rootItem() const;
    9494    void setupModelData(const QStringList &lines, UIFileTableItem *parent);
    95     UIGuestControlFileTable* m_pParent;
    96     UIFileTableItem *m_pRootItem;
     95    UIFileManagerTable *m_pParent;
     96    UIFileTableItem    *m_pRootItem;
    9797};
    9898
    9999
    100 #endif /* !___UIGuestControlFileModel_h___ */
     100#endif /* !___UIFileManagerModel_h___ */

  • trunk/src/VBox/Frontends/VirtualBox/src/guestctrl/UIFileManagerOperationsPanel.cpp

    r76176 r76177  
    3636# include "UIErrorString.h"
    3737# include "UIIconPool.h"
    38 # include "UIGuestControlFileManager.h"
    39 # include "UIGuestControlFileManagerOperationsPanel.h"
     38# include "UIFileManager.h"
     39# include "UIFileManagerOperationsPanel.h"
    4040# include "UIProgressEventHandler.h"
    4141
    … …  
    153153{
    154154    if (m_pCancelButton)
    155         m_pCancelButton->setToolTip(UIGuestControlFileManager::tr("Cancel"));
     155        m_pCancelButton->setToolTip(UIFileManager::tr("Cancel"));
    156156
    157157    switch (m_eStatus)
    158158    {
    159159        case OperationStatus_NotStarted:
    160             m_pStatusLabel->setText(UIGuestControlFileManager::tr("Not yet started"));
     160            m_pStatusLabel->setText(UIFileManager::tr("Not yet started"));
    161161            break;
    162162        case OperationStatus_Working:
    163             m_pStatusLabel->setText(UIGuestControlFileManager::tr("Working"));
     163            m_pStatusLabel->setText(UIFileManager::tr("Working"));
    164164            break;
    165165        case OperationStatus_Paused:
    166             m_pStatusLabel->setText(UIGuestControlFileManager::tr("Paused"));
     166            m_pStatusLabel->setText(UIFileManager::tr("Paused"));
    167167            break;
    168168        case OperationStatus_Canceled:
    169             m_pStatusLabel->setText(UIGuestControlFileManager::tr("Canceled"));
     169            m_pStatusLabel->setText(UIFileManager::tr("Canceled"));
    170170            break;
    171171        case OperationStatus_Succeded:
    172             m_pStatusLabel->setText(UIGuestControlFileManager::tr("Succeded"));
     172            m_pStatusLabel->setText(UIFileManager::tr("Succeded"));
    173173            break;
    174174        case OperationStatus_Failed:
    175             m_pStatusLabel->setText(UIGuestControlFileManager::tr("Failed"));
     175            m_pStatusLabel->setText(UIFileManager::tr("Failed"));
    176176            break;
    177177        case OperationStatus_Invalid:
    178178        case OperationStatus_Max:
    179179        default:
    180             m_pStatusLabel->setText(UIGuestControlFileManager::tr("Invalid"));
     180            m_pStatusLabel->setText(UIFileManager::tr("Invalid"));
    181181            break;
    182182    }
    … …  
    312312
    313313/*********************************************************************************************************************************
    314 *   UIGuestControlFileManagerOperationsPanel implementation.                                                                     *
     314*   UIFileManagerOperationsPanel implementation.                                                                     *
    315315*********************************************************************************************************************************/
    316316
    317 UIGuestControlFileManagerOperationsPanel::UIGuestControlFileManagerOperationsPanel(UIGuestControlFileManager *pManagerWidget,
     317UIFileManagerOperationsPanel::UIFileManagerOperationsPanel(UIFileManager *pManagerWidget,
    318318                                                                                   QWidget *pParent)
    319     : UIGuestControlFileManagerPanel(pManagerWidget, pParent)
     319    : UIFileManagerPanel(pManagerWidget, pParent)
    320320    , m_pScrollArea(0)
    321321    , m_pContainerWidget(0)
    … …  
    327327}
    328328
    329 void UIGuestControlFileManagerOperationsPanel::addNewProgress(const CProgress &comProgress)
     329void UIFileManagerOperationsPanel::addNewProgress(const CProgress &comProgress)
    330330{
    331331    if (!m_pContainerLayout)
    … …  
    339339
    340340    connect(pOperationsWidget, &UIFileOperationProgressWidget::sigProgressComplete,
    341             this, &UIGuestControlFileManagerOperationsPanel::sigFileOperationComplete);
     341            this, &UIFileManagerOperationsPanel::sigFileOperationComplete);
    342342    connect(pOperationsWidget, &UIFileOperationProgressWidget::sigProgressFail,
    343             this, &UIGuestControlFileManagerOperationsPanel::sigFileOperationFail);
     343            this, &UIFileManagerOperationsPanel::sigFileOperationFail);
    344344
    345345    connect(pOperationsWidget, &UIFileOperationProgressWidget::sigFocusIn,
    346             this, &UIGuestControlFileManagerOperationsPanel::sltHandleWidgetFocusIn);
     346            this, &UIFileManagerOperationsPanel::sltHandleWidgetFocusIn);
    347347    connect(pOperationsWidget, &UIFileOperationProgressWidget::sigFocusOut,
    348             this, &UIGuestControlFileManagerOperationsPanel::sltHandleWidgetFocusOut);
    349 }
    350 
    351 QString UIGuestControlFileManagerOperationsPanel::panelName() const
     348            this, &UIFileManagerOperationsPanel::sltHandleWidgetFocusOut);
     349}
     350
     351QString UIFileManagerOperationsPanel::panelName() const
    352352{
    353353    return "OperationsPanel";
    354354}
    355355
    356 void UIGuestControlFileManagerOperationsPanel::prepareWidgets()
     356void UIFileManagerOperationsPanel::prepareWidgets()
    357357{
    358358    if (!mainLayout())
    … …  
    368368    QScrollBar *pVerticalScrollBar = m_pScrollArea->verticalScrollBar();
    369369    if (pVerticalScrollBar)
    370         QObject::connect(pVerticalScrollBar, &QScrollBar::rangeChanged, this, &UIGuestControlFileManagerOperationsPanel::sltScrollToBottom);
     370        QObject::connect(pVerticalScrollBar, &QScrollBar::rangeChanged, this, &UIFileManagerOperationsPanel::sltScrollToBottom);
    371371
    372372    m_pScrollArea->setBackgroundRole(QPalette::Window);
    … …  
    380380}
    381381
    382 void UIGuestControlFileManagerOperationsPanel::prepareConnections()
    383 {
    384 
    385 }
    386 
    387 void UIGuestControlFileManagerOperationsPanel::retranslateUi()
    388 {
    389     UIGuestControlFileManagerPanel::retranslateUi();
    390 }
    391 
    392 void UIGuestControlFileManagerOperationsPanel::contextMenuEvent(QContextMenuEvent *pEvent)
     382void UIFileManagerOperationsPanel::prepareConnections()
     383{
     384
     385}
     386
     387void UIFileManagerOperationsPanel::retranslateUi()
     388{
     389    UIFileManagerPanel::retranslateUi();
     390}
     391
     392void UIFileManagerOperationsPanel::contextMenuEvent(QContextMenuEvent *pEvent)
    393393{
    394394    QMenu *menu = new QMenu(this);
    … …  
    396396    if (m_pWidgetInFocus)
    397397    {
    398         QAction *pRemoveSelected = menu->addAction(UIGuestControlFileManager::tr("Remove Selected"));
     398        QAction *pRemoveSelected = menu->addAction(UIFileManager::tr("Remove Selected"));
    399399        connect(pRemoveSelected, &QAction::triggered,
    400                 this, &UIGuestControlFileManagerOperationsPanel::sltRemoveSelected);
    401     }
    402 
    403     QAction *pRemoveFinished = menu->addAction(UIGuestControlFileManager::tr("Remove Finished"));
    404     QAction *pRemoveAll = menu->addAction(UIGuestControlFileManager::tr("Remove All"));
     400                this, &UIFileManagerOperationsPanel::sltRemoveSelected);
     401    }
     402
     403    QAction *pRemoveFinished = menu->addAction(UIFileManager::tr("Remove Finished"));
     404    QAction *pRemoveAll = menu->addAction(UIFileManager::tr("Remove All"));
    405405
    406406    connect(pRemoveFinished, &QAction::triggered,
    407             this, &UIGuestControlFileManagerOperationsPanel::sltRemoveFinished);
     407            this, &UIFileManagerOperationsPanel::sltRemoveFinished);
    408408    connect(pRemoveAll, &QAction::triggered,
    409             this, &UIGuestControlFileManagerOperationsPanel::sltRemoveAll);
     409            this, &UIFileManagerOperationsPanel::sltRemoveAll);
    410410
    411411    menu->exec(pEvent->globalPos());
    … …  
    413413}
    414414
    415 void UIGuestControlFileManagerOperationsPanel::sltRemoveFinished()
     415void UIFileManagerOperationsPanel::sltRemoveFinished()
    416416{
    417417    QList<UIFileOperationProgressWidget*> widgetsToRemove;
    … …  
    429429}
    430430
    431 void UIGuestControlFileManagerOperationsPanel::sltRemoveAll()
     431void UIFileManagerOperationsPanel::sltRemoveAll()
    432432{
    433433    foreach (QWidget *pWidget, m_widgetSet)
    … …  
    441441}
    442442
    443 void UIGuestControlFileManagerOperationsPanel::sltRemoveSelected()
     443void UIFileManagerOperationsPanel::sltRemoveSelected()
    444444{
    445445    if (!m_pWidgetInFocus)
    … …  
    449449}
    450450
    451 void UIGuestControlFileManagerOperationsPanel::sltHandleWidgetFocusIn(QWidget *pWidget)
     451void UIFileManagerOperationsPanel::sltHandleWidgetFocusIn(QWidget *pWidget)
    452452{
    453453    if (!pWidget)
    … …  
    456456}
    457457
    458 void UIGuestControlFileManagerOperationsPanel::sltHandleWidgetFocusOut(QWidget *pWidget)
     458void UIFileManagerOperationsPanel::sltHandleWidgetFocusOut(QWidget *pWidget)
    459459{
    460460    if (!pWidget)
    … …  
    463463}
    464464
    465 void UIGuestControlFileManagerOperationsPanel::sltScrollToBottom(int iMin, int iMax)
     465void UIFileManagerOperationsPanel::sltScrollToBottom(int iMin, int iMax)
    466466{
    467467    Q_UNUSED(iMin);
    … …  
    470470}
    471471
    472 #include "UIGuestControlFileManagerOperationsPanel.moc"
     472#include "UIFileManagerOperationsPanel.moc"

  • trunk/src/VBox/Frontends/VirtualBox/src/guestctrl/UIFileManagerOperationsPanel.h

    r76176 r76177  
    1616 */
    1717
    18 #ifndef ___UIGuestControlFileManagerOperationsPanel_h___
    19 #define ___UIGuestControlFileManagerOperationsPanel_h___
     18#ifndef ___UIFileManagerOperationsPanel_h___
     19#define ___UIFileManagerOperationsPanel_h___
    2020
    2121/* Qt includes: */
    … …  
    2424/* GUI includes: */
    2525#include "UIGuestControlDefs.h"
    26 #include "UIGuestControlFileManagerPanel.h"
     26#include "UIFileManagerPanel.h"
    2727
    2828/* Forward declarations: */
    … …  
    3434class UIFileOperationModel;
    3535class UIFileOperationProgressWidget;
    36 class UIGuestControlFileManager;
     36class UIFileManager;
    3737
    3838
    3939/** UIVMLogViewerPanel extension hosting a QListWidget which in turn has a special QWidget extension
    4040  * to manage multiple CProgress instances. This is particulary used in monitoring file operations. */
    41 class UIGuestControlFileManagerOperationsPanel : public UIGuestControlFileManagerPanel
     41class UIFileManagerOperationsPanel : public UIFileManagerPanel
    4242{
    4343    Q_OBJECT;
    … …  
    5050public:
    5151
    52     UIGuestControlFileManagerOperationsPanel(UIGuestControlFileManager *pManagerWidget, QWidget *pParent);
     52    UIFileManagerOperationsPanel(UIFileManager *pManagerWidget, QWidget *pParent);
    5353    virtual QString panelName() const /* override */;
    5454    void addNewProgress(const CProgress &comProgress);
    … …  
    9292};
    9393
    94 #endif /* !___UIGuestControlFileManagerOperationsPanel_h___ */
     94#endif /* !___UIFileManagerOperationsPanel_h___ */

  • trunk/src/VBox/Frontends/VirtualBox/src/guestctrl/UIFileManagerOptionsPanel.cpp

    r76176 r76177  
    3232# include "QIToolButton.h"
    3333# include "UIIconPool.h"
    34 # include "UIGuestControlFileManager.h"
    35 # include "UIGuestControlFileManagerOptionsPanel.h"
     34# include "UIFileManager.h"
     35# include "UIFileManagerOptionsPanel.h"
    3636
    3737#endif /* !VBOX_WITH_PRECOMPILED_HEADERS */
    3838
    39 UIGuestControlFileManagerOptionsPanel::UIGuestControlFileManagerOptionsPanel(UIGuestControlFileManager *pManagerWidget,
    40                                                                                QWidget *pParent, UIGuestControlFileManagerOptions *pFileManagerOptions)
    41     : UIGuestControlFileManagerPanel(pManagerWidget, pParent)
     39UIFileManagerOptionsPanel::UIFileManagerOptionsPanel(UIFileManager *pManagerWidget,
     40                                                                               QWidget *pParent, UIFileManagerOptions *pFileManagerOptions)
     41    : UIFileManagerPanel(pManagerWidget, pParent)
    4242    , m_pListDirectoriesOnTopCheckBox(0)
    4343    , m_pDeleteConfirmationCheckBox(0)
    … …  
    4848}
    4949
    50 QString UIGuestControlFileManagerOptionsPanel::panelName() const
     50QString UIFileManagerOptionsPanel::panelName() const
    5151{
    5252    return "OptionsPanel";
    5353}
    5454
    55 void UIGuestControlFileManagerOptionsPanel::update()
     55void UIFileManagerOptionsPanel::update()
    5656{
    5757    if (!m_pFileManagerOptions)
    … …  
    8080}
    8181
    82 void UIGuestControlFileManagerOptionsPanel::prepareWidgets()
     82void UIFileManagerOptionsPanel::prepareWidgets()
    8383{
    8484    if (!mainLayout())
    … …  
    116116}
    117117
    118 void UIGuestControlFileManagerOptionsPanel::sltListDirectoryCheckBoxToogled(bool bChecked)
     118void UIFileManagerOptionsPanel::sltListDirectoryCheckBoxToogled(bool bChecked)
    119119{
    120120    if (!m_pFileManagerOptions)
    … …  
    124124}
    125125
    126 void UIGuestControlFileManagerOptionsPanel::sltDeleteConfirmationCheckBoxToogled(bool bChecked)
     126void UIFileManagerOptionsPanel::sltDeleteConfirmationCheckBoxToogled(bool bChecked)
    127127{
    128128    if (!m_pFileManagerOptions)
    … …  
    132132}
    133133
    134 void UIGuestControlFileManagerOptionsPanel::sltHumanReabableSizesCheckBoxToogled(bool bChecked)
     134void UIFileManagerOptionsPanel::sltHumanReabableSizesCheckBoxToogled(bool bChecked)
    135135{
    136136    if (!m_pFileManagerOptions)
    … …  
    140140}
    141141
    142 void UIGuestControlFileManagerOptionsPanel::prepareConnections()
     142void UIFileManagerOptionsPanel::prepareConnections()
    143143{
    144144    if (m_pListDirectoriesOnTopCheckBox)
    145145        connect(m_pListDirectoriesOnTopCheckBox, &QCheckBox::toggled,
    146                 this, &UIGuestControlFileManagerOptionsPanel::sltListDirectoryCheckBoxToogled);
     146                this, &UIFileManagerOptionsPanel::sltListDirectoryCheckBoxToogled);
    147147    if (m_pDeleteConfirmationCheckBox)
    148148        connect(m_pDeleteConfirmationCheckBox, &QCheckBox::toggled,
    149                 this, &UIGuestControlFileManagerOptionsPanel::sltDeleteConfirmationCheckBoxToogled);
     149                this, &UIFileManagerOptionsPanel::sltDeleteConfirmationCheckBoxToogled);
    150150    if (m_pHumanReabableSizesCheckBox)
    151151        connect(m_pHumanReabableSizesCheckBox, &QCheckBox::toggled,
    152                 this, &UIGuestControlFileManagerOptionsPanel::sltHumanReabableSizesCheckBoxToogled);
     152                this, &UIFileManagerOptionsPanel::sltHumanReabableSizesCheckBoxToogled);
    153153}
    154154
    155 void UIGuestControlFileManagerOptionsPanel::retranslateUi()
     155void UIFileManagerOptionsPanel::retranslateUi()
    156156{
    157     UIGuestControlFileManagerPanel::retranslateUi();
     157    UIFileManagerPanel::retranslateUi();
    158158    if (m_pListDirectoriesOnTopCheckBox)
    159159    {
    160         m_pListDirectoriesOnTopCheckBox->setText(UIGuestControlFileManager::tr("List directories on top"));
    161         m_pListDirectoriesOnTopCheckBox->setToolTip(UIGuestControlFileManager::tr("List directories before files"));
     160        m_pListDirectoriesOnTopCheckBox->setText(UIFileManager::tr("List directories on top"));
     161        m_pListDirectoriesOnTopCheckBox->setToolTip(UIFileManager::tr("List directories before files"));
    162162    }
    163163
    164164    if (m_pDeleteConfirmationCheckBox)
    165165    {
    166         m_pDeleteConfirmationCheckBox->setText(UIGuestControlFileManager::tr("Ask before delete"));
    167         m_pDeleteConfirmationCheckBox->setToolTip(UIGuestControlFileManager::tr("Show a confirmation dialog "
     166        m_pDeleteConfirmationCheckBox->setText(UIFileManager::tr("Ask before delete"));
     167        m_pDeleteConfirmationCheckBox->setToolTip(UIFileManager::tr("Show a confirmation dialog "
    168168                                                                                "before deleting files and directories"));
    169169    }
    … …  
    171171    if (m_pHumanReabableSizesCheckBox)
    172172    {
    173         m_pHumanReabableSizesCheckBox->setText(UIGuestControlFileManager::tr("Human readable sizes"));
    174         m_pHumanReabableSizesCheckBox->setToolTip(UIGuestControlFileManager::tr("Show file/directory sizes in human "
     173        m_pHumanReabableSizesCheckBox->setText(UIFileManager::tr("Human readable sizes"));
     174        m_pHumanReabableSizesCheckBox->setToolTip(UIFileManager::tr("Show file/directory sizes in human "
    175175                                                                                "readable format rather than in bytes"));
    176176    }

  • trunk/src/VBox/Frontends/VirtualBox/src/guestctrl/UIFileManagerOptionsPanel.h

    r76176 r76177  
    1616 */
    1717
    18 #ifndef ___UIGuestControlFileManagerOptionsPanel_h___
    19 #define ___UIGuestControlFileManagerOptionsPanel_h___
     18#ifndef ___UIFileManagerOptionsPanel_h___
     19#define ___UIFileManagerOptionsPanel_h___
    2020
    2121/* GUI includes: */
    22 #include "UIGuestControlFileManagerPanel.h"
     22#include "UIFileManagerPanel.h"
    2323
    2424/* Forward declarations: */
    … …  
    2727class QLabel;
    2828class QIToolButton;
    29 class UIGuestControlFileManagerOptions;
     29class UIFileManagerOptions;
    3030
    31 /** UIGuestControlFileManagerPanel extension to change file manager options. It directly
    32  *  modifies the options through the passed UIGuestControlFileManagerOptions instance. */
    33 class UIGuestControlFileManagerOptionsPanel : public UIGuestControlFileManagerPanel
     31/** UIFileManagerPanel extension to change file manager options. It directly
     32 *  modifies the options through the passed UIFileManagerOptions instance. */
     33class UIFileManagerOptionsPanel : public UIFileManagerPanel
    3434{
    3535    Q_OBJECT;
    … …  
    3737public:
    3838
    39     UIGuestControlFileManagerOptionsPanel(UIGuestControlFileManager *pManagerWidget,
    40                                            QWidget *pParent, UIGuestControlFileManagerOptions *pFileManagerOptions);
     39    UIFileManagerOptionsPanel(UIFileManager *pManagerWidget,
     40                                           QWidget *pParent, UIFileManagerOptions *pFileManagerOptions);
    4141    virtual QString panelName() const /* override */;
    4242    /** Reads the file manager options and updates the widget accordingly. This functions is typically called
    … …  
    6767    QCheckBox  *m_pDeleteConfirmationCheckBox;
    6868    QCheckBox  *m_pHumanReabableSizesCheckBox;
    69     UIGuestControlFileManagerOptions *m_pFileManagerOptions;
     69    UIFileManagerOptions *m_pFileManagerOptions;
    7070};
    7171
    72 #endif /* !___UIGuestControlFileManagerOptionsPanel_h___ */
     72#endif /* !___UIFileManagerOptionsPanel_h___ */

  • trunk/src/VBox/Frontends/VirtualBox/src/guestctrl/UIFileManagerPanel.cpp

    r76176 r76177  
    3131# include "QIToolButton.h"
    3232# include "UIIconPool.h"
    33 # include "UIGuestControlFileManager.h"
    34 # include "UIGuestControlFileManagerPanel.h"
     33# include "UIFileManager.h"
     34# include "UIFileManagerPanel.h"
    3535# ifdef VBOX_WS_MAC
    3636#  include "VBoxUtils-darwin.h"
    … …  
    3939
    4040
    41 UIGuestControlFileManagerPanel::UIGuestControlFileManagerPanel(UIGuestControlFileManager *pManagerWidget, QWidget *pParent)
     41UIFileManagerPanel::UIFileManagerPanel(UIFileManager *pManagerWidget, QWidget *pParent)
    4242    : QIWithRetranslateUI<QWidget>(pParent)
    4343    , m_pMainLayout(0)
    … …  
    4848}
    4949
    50 void UIGuestControlFileManagerPanel::setCloseButtonShortCut(QKeySequence shortCut)
     50void UIFileManagerPanel::setCloseButtonShortCut(QKeySequence shortCut)
    5151{
    5252    if (!m_pCloseButton)
    … …  
    5555}
    5656
    57 QHBoxLayout* UIGuestControlFileManagerPanel::mainLayout()
     57QHBoxLayout* UIFileManagerPanel::mainLayout()
    5858{
    5959    return m_pMainLayout;
    6060}
    6161
    62 void UIGuestControlFileManagerPanel::prepare()
     62void UIFileManagerPanel::prepare()
    6363{
    6464    prepareWidgets();
    … …  
    6767}
    6868
    69 void UIGuestControlFileManagerPanel::prepareWidgets()
     69void UIFileManagerPanel::prepareWidgets()
    7070{
    7171    m_pMainLayout = new QHBoxLayout(this);
    … …  
    9090}
    9191
    92 void UIGuestControlFileManagerPanel::prepareConnections()
     92void UIFileManagerPanel::prepareConnections()
    9393{
    9494    if (m_pCloseButton)
    95         connect(m_pCloseButton, &QIToolButton::clicked, this, &UIGuestControlFileManagerPanel::hide);
     95        connect(m_pCloseButton, &QIToolButton::clicked, this, &UIFileManagerPanel::hide);
    9696}
    9797
    98 void UIGuestControlFileManagerPanel::retranslateUi()
     98void UIFileManagerPanel::retranslateUi()
    9999{
    100100    if (m_pCloseButton)
    101         m_pCloseButton->setToolTip(UIGuestControlFileManager::tr("Close the pane"));
     101        m_pCloseButton->setToolTip(UIFileManager::tr("Close the pane"));
    102102}
    103103
    104 bool UIGuestControlFileManagerPanel::eventFilter(QObject *pObject, QEvent *pEvent)
     104bool UIFileManagerPanel::eventFilter(QObject *pObject, QEvent *pEvent)
    105105{
    106106    Q_UNUSED(pObject);
    … …  
    110110}
    111111
    112 void UIGuestControlFileManagerPanel::showEvent(QShowEvent *pEvent)
     112void UIFileManagerPanel::showEvent(QShowEvent *pEvent)
    113113{
    114114    QWidget::showEvent(pEvent);
    115115}
    116116
    117 void UIGuestControlFileManagerPanel::hideEvent(QHideEvent *pEvent)
     117void UIFileManagerPanel::hideEvent(QHideEvent *pEvent)
    118118{
    119119    /* Get focused widget: */

  • trunk/src/VBox/Frontends/VirtualBox/src/guestctrl/UIFileManagerPanel.h

    r76176 r76177  
    1616 */
    1717
    18 #ifndef ___UIGuestControlFileManagerPanel_h___
    19 #define ___UIGuestControlFileManagerPanel_h___
     18#ifndef ___UIFileManagerPanel_h___
     19#define ___UIFileManagerPanel_h___
    2020
    2121/* Qt includes: */
    … …  
    3030class QTextDocument;
    3131class QIToolButton;
    32 class UIGuestControlFileManager;
     32class UIFileManager;
    3333
    3434/** QWidget extension acting as the base class for UIVMLogViewerXXXPanel widgets. */
    35 class UIGuestControlFileManagerPanel : public QIWithRetranslateUI<QWidget>
     35class UIFileManagerPanel : public QIWithRetranslateUI<QWidget>
    3636{
    3737    Q_OBJECT;
    … …  
    3939public:
    4040
    41     UIGuestControlFileManagerPanel(UIGuestControlFileManager *pManagerWidget, QWidget *pParent);
     41    UIFileManagerPanel(UIFileManager *pManagerWidget, QWidget *pParent);
    4242    void setCloseButtonShortCut(QKeySequence shortCut);
    4343    virtual QString panelName() const = 0;
    … …  
    6868
    6969    /** Holds the reference to VM Log-Viewer this panel belongs to. */
    70     QHBoxLayout         *m_pMainLayout;
    71     QIToolButton        *m_pCloseButton;
    72     UIGuestControlFileManager *m_pFileManager;
     70    QHBoxLayout   *m_pMainLayout;
     71    QIToolButton  *m_pCloseButton;
     72    UIFileManager *m_pFileManager;
    7373};
    7474
    75 #endif /* !___UIGuestControlFileManagerPanel!_h___ */
     75#endif /* !___UIFileManagerPanel!_h___ */

  • trunk/src/VBox/Frontends/VirtualBox/src/guestctrl/UIFileManagerSessionPanel.cpp

    r76176 r76177  
    3232# include "QIToolButton.h"
    3333# include "UIIconPool.h"
    34 # include "UIGuestControlFileManager.h"
    35 # include "UIGuestControlFileManagerSessionPanel.h"
     34# include "UIFileManager.h"
     35# include "UIFileManagerSessionPanel.h"
    3636
    3737#endif /* !VBOX_WITH_PRECOMPILED_HEADERS */
    … …  
    115115    {
    116116        m_pMainLayout->addWidget(m_pPasswordEdit, 2);
    117         m_pPasswordEdit->setPlaceholderText(UIGuestControlFileManager::tr("Password"));
     117        m_pPasswordEdit->setPlaceholderText(UIFileManager::tr("Password"));
    118118        m_pPasswordEdit->setEchoMode(QLineEdit::Password);
    119119    }
    … …  
    122122    if (m_pShowPasswordCheckBox)
    123123    {
    124         m_pShowPasswordCheckBox->setText(UIGuestControlFileManager::tr("Show Password"));
     124        m_pShowPasswordCheckBox->setText(UIFileManager::tr("Show Password"));
    125125        m_pMainLayout->addWidget(m_pShowPasswordCheckBox);
    126126        connect(m_pShowPasswordCheckBox, &QCheckBox::toggled,
    … …  
    165165    if (m_pUserNameEdit)
    166166    {
    167         m_pUserNameEdit->setToolTip(UIGuestControlFileManager::tr("User name to authenticate session creation"));
    168         m_pUserNameEdit->setPlaceholderText(UIGuestControlFileManager::tr("User Name"));
    169 
    170     }
    171     if (m_pPasswordEdit)
    172     {
    173         m_pPasswordEdit->setToolTip(UIGuestControlFileManager::tr("Password to authenticate session creation"));
    174         m_pPasswordEdit->setPlaceholderText(UIGuestControlFileManager::tr("Password"));
    175     }
    176 
    177     if (m_pCreateButton)
    178         m_pCreateButton->setText(UIGuestControlFileManager::tr("Create Session"));
    179     if (m_pCloseButton)
    180         m_pCloseButton->setText(UIGuestControlFileManager::tr("Close Session"));
     167        m_pUserNameEdit->setToolTip(UIFileManager::tr("User name to authenticate session creation"));
     168        m_pUserNameEdit->setPlaceholderText(UIFileManager::tr("User Name"));
     169
     170    }
     171    if (m_pPasswordEdit)
     172    {
     173        m_pPasswordEdit->setToolTip(UIFileManager::tr("Password to authenticate session creation"));
     174        m_pPasswordEdit->setPlaceholderText(UIFileManager::tr("Password"));
     175    }
     176
     177    if (m_pCreateButton)
     178        m_pCreateButton->setText(UIFileManager::tr("Create Session"));
     179    if (m_pCloseButton)
     180        m_pCloseButton->setText(UIFileManager::tr("Close Session"));
    181181}
    182182
    … …  
    219219
    220220/*********************************************************************************************************************************
    221 *   UIGuestControlFileManagerSessionPanel implementation.                                                                        *
     221*   UIFileManagerSessionPanel implementation.                                                                        *
    222222*********************************************************************************************************************************/
    223223
    224 UIGuestControlFileManagerSessionPanel::UIGuestControlFileManagerSessionPanel(UIGuestControlFileManager *pManagerWidget, QWidget *pParent)
    225     : UIGuestControlFileManagerPanel(pManagerWidget, pParent)
     224UIFileManagerSessionPanel::UIFileManagerSessionPanel(UIFileManager *pManagerWidget, QWidget *pParent)
     225    : UIFileManagerPanel(pManagerWidget, pParent)
    226226    , m_pSessionCreateWidget(0)
    227227{
    … …  
    229229}
    230230
    231 void UIGuestControlFileManagerSessionPanel::switchSessionCloseMode()
     231void UIFileManagerSessionPanel::switchSessionCloseMode()
    232232{
    233233    if (m_pSessionCreateWidget)
    … …  
    235235}
    236236
    237 void UIGuestControlFileManagerSessionPanel::switchSessionCreateMode()
     237void UIFileManagerSessionPanel::switchSessionCreateMode()
    238238{
    239239    if (m_pSessionCreateWidget)
    … …  
    241241}
    242242
    243 QString UIGuestControlFileManagerSessionPanel::panelName() const
     243QString UIFileManagerSessionPanel::panelName() const
    244244{
    245245    return "SessionPanel";
    246246}
    247247
    248 void UIGuestControlFileManagerSessionPanel::prepareWidgets()
     248void UIFileManagerSessionPanel::prepareWidgets()
    249249{
    250250    if (!mainLayout())
    … …  
    255255}
    256256
    257 void UIGuestControlFileManagerSessionPanel::prepareConnections()
     257void UIFileManagerSessionPanel::prepareConnections()
    258258{
    259259    if (m_pSessionCreateWidget)
    260260    {
    261261        connect(m_pSessionCreateWidget, &UIGuestSessionCreateWidget::sigCreateSession,
    262                 this, &UIGuestControlFileManagerSessionPanel::sigCreateSession);
     262                this, &UIFileManagerSessionPanel::sigCreateSession);
    263263        connect(m_pSessionCreateWidget, &UIGuestSessionCreateWidget::sigCloseSession,
    264                 this, &UIGuestControlFileManagerSessionPanel::sigCloseSession);
    265     }
    266 }
    267 
    268 void UIGuestControlFileManagerSessionPanel::retranslateUi()
    269 {
    270     UIGuestControlFileManagerPanel::retranslateUi();
    271 
    272 }
    273 
    274 #include "UIGuestControlFileManagerSessionPanel.moc"
     264                this, &UIFileManagerSessionPanel::sigCloseSession);
     265    }
     266}
     267
     268void UIFileManagerSessionPanel::retranslateUi()
     269{
     270    UIFileManagerPanel::retranslateUi();
     271
     272}
     273
     274#include "UIFileManagerSessionPanel.moc"

  • trunk/src/VBox/Frontends/VirtualBox/src/guestctrl/UIFileManagerSessionPanel.h

    r76176 r76177  
    1616 */
    1717
    18 #ifndef ___UIGuestControlFileManagerSessionPanel_h___
    19 #define ___UIGuestControlFileManagerSessionPanel_h___
     18#ifndef ___UIFileManagerSessionPanel_h___
     19#define ___UIFileManagerSessionPanel_h___
    2020
    2121/* GUI includes: */
    22 #include "UIGuestControlFileManagerPanel.h"
     22#include "UIFileManagerPanel.h"
    2323
    2424/* Forward declarations: */
    2525class QTextEdit;
    26 class UIGuestControlFileManager;
     26class UIFileManager;
    2727class UIGuestSessionCreateWidget;
    2828
    29 /** UIGuestControlFileManagerPanel extension providing GUI for creating/stopping a guest session. */
    30 class UIGuestControlFileManagerSessionPanel : public UIGuestControlFileManagerPanel
     29/** UIFileManagerPanel extension providing GUI for creating/stopping a guest session. */
     30class UIFileManagerSessionPanel : public UIFileManagerPanel
    3131{
    3232    Q_OBJECT;
    … …  
    3434public:
    3535
    36     UIGuestControlFileManagerSessionPanel(UIGuestControlFileManager *pManagerWidget, QWidget *pParent);
     36    UIFileManagerSessionPanel(UIFileManager *pManagerWidget, QWidget *pParent);
    3737    /** @name Enable/disable member widget wrt. guest session status.
    3838      * @{ */
    … …  
    5858};
    5959
    60 #endif /* !___UIGuestControlFileManagerSessionPanel_h___ */
     60#endif /* !___UIFileManagerSessionPanel_h___ */

  • trunk/src/VBox/Frontends/VirtualBox/src/guestctrl/UIFileManagerTable.cpp

    r76176 r76177  
    11/* $Id$ */
    22/** @file
    3  * VBox Qt GUI - UIGuestControlFileTable class implementation.
     3 * VBox Qt GUI - UIFileManagerTable class implementation.
    44 */
    55
    … …  
    4343# include "UIActionPool.h"
    4444# include "UIErrorString.h"
    45 # include "UIGuestFileTable.h"
     45# include "UIFileManagerGuestTable.h"
    4646# include "UIIconPool.h"
    47 # include "UIGuestControlFileTable.h"
    48 # include "UIGuestControlFileManager.h"
    49 # include "UIGuestControlFileModel.h"
     47# include "UIFileManagerTable.h"
     48# include "UIFileManager.h"
     49# include "UIFileManagerModel.h"
    5050# include "UIToolBar.h"
    5151
    … …  
    420420    // QString propertyString = m_pInfoEdit->toHtml();
    421421    // propertyString += "<b>Total Size:</b> " + QString::number(directoryStatistics.m_totalSize) + QString(" bytes");
    422     // if (directoryStatistics.m_totalSize >= UIGuestControlFileTable::m_iKiloByte)
    423     //     propertyString += " (" + UIGuestControlFileTable::humanReadableSize(directoryStatistics.m_totalSize) + ")";
     422    // if (directoryStatistics.m_totalSize >= UIFileManagerTable::m_iKiloByte)
     423    //     propertyString += " (" + UIFileManagerTable::humanReadableSize(directoryStatistics.m_totalSize) + ")";
    424424    // propertyString += "<br/>";
    425425    // propertyString += "<b>File Count:</b> " + QString::number(directoryStatistics.m_uFileCount);
    … …  
    429429    QString detailsString(m_strProperty);
    430430    detailsString += "<br/>";
    431     detailsString += "<b>" + UIGuestControlFileManager::tr("Total Size") + "</b> " +
    432         QString::number(directoryStatistics.m_totalSize) + UIGuestControlFileManager::tr(" bytes");
    433     if (directoryStatistics.m_totalSize >= UIGuestControlFileTable::m_iKiloByte)
    434         detailsString += " (" + UIGuestControlFileTable::humanReadableSize(directoryStatistics.m_totalSize) + ")";
     431    detailsString += "<b>" + UIFileManager::tr("Total Size") + "</b> " +
     432        QString::number(directoryStatistics.m_totalSize) + UIFileManager::tr(" bytes");
     433    if (directoryStatistics.m_totalSize >= UIFileManagerTable::m_iKiloByte)
     434        detailsString += " (" + UIFileManagerTable::humanReadableSize(directoryStatistics.m_totalSize) + ")";
    435435    detailsString += "<br/>";
    436436
    437     detailsString += "<b>" + UIGuestControlFileManager::tr("File Count") + ":</b> " +
     437    detailsString += "<b>" + UIFileManager::tr("File Count") + ":</b> " +
    438438        QString::number(directoryStatistics.m_uFileCount);
    439439
    … …  
    586586    if (!isDirectory())
    587587        return false;
    588     if (data(0) == UIGuestControlFileModel::strUpDirectoryString)
     588    if (data(0) == UIFileManagerModel::strUpDirectoryString)
    589589        return true;
    590590    return false;
    … …  
    646646    {
    647647        pLayout->addWidget(m_pQuestionLabel);
    648         m_pQuestionLabel->setText(UIGuestControlFileManager::tr("Delete the selected file(s) and/or folder(s)"));
     648        m_pQuestionLabel->setText(UIFileManager::tr("Delete the selected file(s) and/or folder(s)"));
    649649    }
    650650
    … …  
    662662    if (m_pAskNextTimeCheckBox)
    663663    {
    664         UIGuestControlFileManagerOptions *pFileManagerOptions = UIGuestControlFileManagerOptions::instance();
     664        UIFileManagerOptions *pFileManagerOptions = UIFileManagerOptions::instance();
    665665        if (pFileManagerOptions)
    666666            m_pAskNextTimeCheckBox->setChecked(pFileManagerOptions->bAskDeleteConfirmation);
    667667
    668668        pLayout->addWidget(m_pAskNextTimeCheckBox);
    669         m_pAskNextTimeCheckBox->setText(UIGuestControlFileManager::tr("Ask for this confirmation next time"));
    670         m_pAskNextTimeCheckBox->setToolTip(UIGuestControlFileManager::tr("Delete confirmation can be "
     669        m_pAskNextTimeCheckBox->setText(UIFileManager::tr("Ask for this confirmation next time"));
     670        m_pAskNextTimeCheckBox->setToolTip(UIFileManager::tr("Delete confirmation can be "
    671671                                                                         "disabled/enabled also from the Options panel."));
    672672    }
    … …  
    682682
    683683/*********************************************************************************************************************************
    684 *   UIGuestControlFileTable implementation.                                                                                      *
     684*   UIFileManagerTable implementation.                                                                                      *
    685685*********************************************************************************************************************************/
    686 const unsigned UIGuestControlFileTable::m_iKiloByte = 1024; /**< Our kilo bytes are a power of two! (bird) */
    687 UIGuestControlFileTable::UIGuestControlFileTable(UIActionPool *pActionPool, QWidget *pParent /* = 0 */)
     686const unsigned UIFileManagerTable::m_iKiloByte = 1024; /**< Our kilo bytes are a power of two! (bird) */
     687UIFileManagerTable::UIFileManagerTable(UIActionPool *pActionPool, QWidget *pParent /* = 0 */)
    688688    :QIWithRetranslateUI<QWidget>(pParent)
    689689    , m_eFileOperationType(FileOperationType_None)
    … …  
    703703}
    704704
    705 UIGuestControlFileTable::~UIGuestControlFileTable()
     705UIFileManagerTable::~UIFileManagerTable()
    706706{
    707707    delete m_pRootItem;
    708708}
    709709
    710 void UIGuestControlFileTable::reset()
     710void UIFileManagerTable::reset()
    711711{
    712712    if (m_pModel)
    … …  
    719719    {
    720720        disconnect(m_pLocationComboBox, static_cast<void(QComboBox::*)(const QString&)>(&QComboBox::currentIndexChanged),
    721                    this, &UIGuestControlFileTable::sltLocationComboCurrentChange);
     721                   this, &UIFileManagerTable::sltLocationComboCurrentChange);
    722722        m_pLocationComboBox->clear();
    723723        connect(m_pLocationComboBox, static_cast<void(QComboBox::*)(const QString&)>(&QComboBox::currentIndexChanged),
    724                 this, &UIGuestControlFileTable::sltLocationComboCurrentChange);
    725     }
    726 }
    727 
    728 void UIGuestControlFileTable::emitLogOutput(const QString& strOutput, FileManagerLogType eLogType)
     724                this, &UIFileManagerTable::sltLocationComboCurrentChange);
     725    }
     726}
     727
     728void UIFileManagerTable::emitLogOutput(const QString& strOutput, FileManagerLogType eLogType)
    729729{
    730730    emit sigLogOutput(strOutput, eLogType);
    731731}
    732732
    733 void UIGuestControlFileTable::prepareObjects()
     733void UIFileManagerTable::prepareObjects()
    734734{
    735735    m_pMainLayout = new QGridLayout();
    … …  
    758758        m_pLocationComboBox->setEditable(false);
    759759        connect(m_pLocationComboBox, static_cast<void(QComboBox::*)(const QString&)>(&QComboBox::currentIndexChanged),
    760                 this, &UIGuestControlFileTable::sltLocationComboCurrentChange);
    761     }
    762 
    763 
    764     m_pModel = new UIGuestControlFileModel(this);
     760                this, &UIFileManagerTable::sltLocationComboCurrentChange);
     761    }
     762
     763
     764    m_pModel = new UIFileManagerModel(this);
    765765    if (!m_pModel)
    766766        return;
    … …  
    786786
    787787        connect(m_pView, &UIGuestControlFileView::doubleClicked,
    788                 this, &UIGuestControlFileTable::sltItemDoubleClicked);
     788                this, &UIFileManagerTable::sltItemDoubleClicked);
    789789        connect(m_pView, &UIGuestControlFileView::clicked,
    790                 this, &UIGuestControlFileTable::sltItemClicked);
     790                this, &UIFileManagerTable::sltItemClicked);
    791791        connect(m_pView, &UIGuestControlFileView::sigSelectionChanged,
    792                 this, &UIGuestControlFileTable::sltSelectionChanged);
     792                this, &UIFileManagerTable::sltSelectionChanged);
    793793        connect(m_pView, &UIGuestControlFileView::customContextMenuRequested,
    794                 this, &UIGuestControlFileTable::sltCreateFileViewContextMenu);
     794                this, &UIFileManagerTable::sltCreateFileViewContextMenu);
    795795
    796796    }
    … …  
    820820        m_pSearchLineEdit->setClearButtonEnabled(true);
    821821        connect(m_pSearchLineEdit, &QLineEdit::textChanged,
    822                 this, &UIGuestControlFileTable::sltSearchTextChanged);
    823     }
    824 }
    825 
    826 void UIGuestControlFileTable::updateCurrentLocationEdit(const QString& strLocation)
     822                this, &UIFileManagerTable::sltSearchTextChanged);
     823    }
     824}
     825
     826void UIFileManagerTable::updateCurrentLocationEdit(const QString& strLocation)
    827827{
    828828    if (!m_pLocationComboBox)
    … …  
    838838}
    839839
    840 void UIGuestControlFileTable::changeLocation(const QModelIndex &index)
     840void UIFileManagerTable::changeLocation(const QModelIndex &index)
    841841{
    842842    if (!index.isValid() || !m_pView)
    … …  
    854854}
    855855
    856 void UIGuestControlFileTable::initializeFileTree()
     856void UIFileManagerTable::initializeFileTree()
    857857{
    858858    if (m_pRootItem)
    … …  
    862862    const QString startPath("/");
    863863    QVector<QVariant> headData;
    864     headData.resize(UIGuestControlFileModelColumn_Max);
     864    headData.resize(UIFileManagerModelColumn_Max);
    865865    m_pRootItem = new UIFileTableItem(headData, 0, FileObjectType_Directory);
    866866    UIFileTableItem* startItem = new UIFileTableItem(createTreeItemData(startPath, 4096, QDateTime(),
    … …  
    877877}
    878878
    879 void UIGuestControlFileTable::populateStartDirectory(UIFileTableItem *startItem)
     879void UIFileManagerTable::populateStartDirectory(UIFileTableItem *startItem)
    880880{
    881881    determineDriveLetters();
    … …  
    901901}
    902902
    903 void UIGuestControlFileTable::insertItemsToTree(QMap<QString,UIFileTableItem*> &map,
     903void UIFileManagerTable::insertItemsToTree(QMap<QString,UIFileTableItem*> &map,
    904904                                                UIFileTableItem *parent, bool isDirectoryMap, bool isStartDir)
    905905{
    … …  
    909909    if (isDirectoryMap)
    910910    {
    911         if (!map.contains(UIGuestControlFileModel::strUpDirectoryString)  && !isStartDir)
     911        if (!map.contains(UIFileManagerModel::strUpDirectoryString)  && !isStartDir)
    912912        {
    913913            QVector<QVariant> data;
    914             UIFileTableItem *item = new UIFileTableItem(createTreeItemData(UIGuestControlFileModel::strUpDirectoryString, 4096,
     914            UIFileTableItem *item = new UIFileTableItem(createTreeItemData(UIFileManagerModel::strUpDirectoryString, 4096,
    915915                                                                           QDateTime(), QString(), QString())
    916916                                                        , parent, FileObjectType_Directory);
    917917            item->setIsOpened(false);
    918             map.insert(UIGuestControlFileModel::strUpDirectoryString, item);
     918            map.insert(UIFileManagerModel::strUpDirectoryString, item);
    919919        }
    920         else if (map.contains(UIGuestControlFileModel::strUpDirectoryString)  && isStartDir)
     920        else if (map.contains(UIFileManagerModel::strUpDirectoryString)  && isStartDir)
    921921        {
    922             map.remove(UIGuestControlFileModel::strUpDirectoryString);
     922            map.remove(UIFileManagerModel::strUpDirectoryString);
    923923        }
    924924    }
    … …  
    932932}
    933933
    934 void UIGuestControlFileTable::sltItemDoubleClicked(const QModelIndex &index)
     934void UIFileManagerTable::sltItemDoubleClicked(const QModelIndex &index)
    935935{
    936936    if (!index.isValid() ||  !m_pModel || !m_pView)
    … …  
    940940}
    941941
    942 void UIGuestControlFileTable::sltItemClicked(const QModelIndex &index)
     942void UIFileManagerTable::sltItemClicked(const QModelIndex &index)
    943943{
    944944    Q_UNUSED(index);
    … …  
    946946}
    947947
    948 void UIGuestControlFileTable::sltGoUp()
     948void UIFileManagerTable::sltGoUp()
    949949{
    950950    if (!m_pView || !m_pModel)
    … …  
    965965}
    966966
    967 void UIGuestControlFileTable::sltGoHome()
     967void UIFileManagerTable::sltGoHome()
    968968{
    969969    goToHomeDirectory();
    970970}
    971971
    972 void UIGuestControlFileTable::sltRefresh()
     972void UIFileManagerTable::sltRefresh()
    973973{
    974974    refresh();
    975975}
    976976
    977 void UIGuestControlFileTable::goIntoDirectory(const QModelIndex &itemIndex)
     977void UIFileManagerTable::goIntoDirectory(const QModelIndex &itemIndex)
    978978{
    979979    if (!m_pModel)
    … …  
    10061006}
    10071007
    1008 void UIGuestControlFileTable::goIntoDirectory(const QStringList &pathTrail)
     1008void UIFileManagerTable::goIntoDirectory(const QStringList &pathTrail)
    10091009{
    10101010    UIFileTableItem *parent = getStartDirectoryItem();
    … …  
    10301030}
    10311031
    1032 void UIGuestControlFileTable::goIntoDirectory(UIFileTableItem *item)
     1032void UIFileManagerTable::goIntoDirectory(UIFileTableItem *item)
    10331033{
    10341034    if (!item || !m_pModel)
    … …  
    10371037}
    10381038
    1039 UIFileTableItem* UIGuestControlFileTable::indexData(const QModelIndex &index) const
     1039UIFileTableItem* UIFileManagerTable::indexData(const QModelIndex &index) const
    10401040{
    10411041    if (!index.isValid())
    … …  
    10441044}
    10451045
    1046 void UIGuestControlFileTable::refresh()
     1046void UIFileManagerTable::refresh()
    10471047{
    10481048    if (!m_pView || !m_pModel)
    … …  
    10661066}
    10671067
    1068 void UIGuestControlFileTable::relist()
     1068void UIFileManagerTable::relist()
    10691069{
    10701070    if (!m_pProxyModel)
    … …  
    10731073}
    10741074
    1075 void UIGuestControlFileTable::sltDelete()
     1075void UIFileManagerTable::sltDelete()
    10761076{
    10771077    if (!checkIfDeleteOK())
    … …  
    10981098}
    10991099
    1100 void UIGuestControlFileTable::sltRename()
     1100void UIFileManagerTable::sltRename()
    11011101{
    11021102    if (!m_pView)
    … …  
    11171117}
    11181118
    1119 void UIGuestControlFileTable::sltCreateNewDirectory()
     1119void UIFileManagerTable::sltCreateNewDirectory()
    11201120{
    11211121    if (!m_pModel || !m_pView)
    … …  
    11401140}
    11411141
    1142 void UIGuestControlFileTable::sltCopy()
     1142void UIFileManagerTable::sltCopy()
    11431143{
    11441144    m_copyCutBuffer = selectedItemPathList();
    … …  
    11471147}
    11481148
    1149 void UIGuestControlFileTable::sltCut()
     1149void UIFileManagerTable::sltCut()
    11501150{
    11511151    m_copyCutBuffer = selectedItemPathList();
    … …  
    11541154}
    11551155
    1156 void UIGuestControlFileTable::sltPaste()
     1156void UIFileManagerTable::sltPaste()
    11571157{
    11581158    m_copyCutBuffer.clear();
    … …  
    11621162}
    11631163
    1164 void UIGuestControlFileTable::sltShowProperties()
     1164void UIFileManagerTable::sltShowProperties()
    11651165{
    11661166    showProperties();
    11671167}
    11681168
    1169 void UIGuestControlFileTable::sltSelectionChanged(const QItemSelection & selected, const QItemSelection & deselected)
     1169void UIFileManagerTable::sltSelectionChanged(const QItemSelection & selected, const QItemSelection & deselected)
    11701170{
    11711171    Q_UNUSED(selected);
    … …  
    11741174}
    11751175
    1176 void UIGuestControlFileTable::sltLocationComboCurrentChange(const QString &strLocation)
     1176void UIFileManagerTable::sltLocationComboCurrentChange(const QString &strLocation)
    11771177{
    11781178    QString comboLocation(UIPathOperations::sanitize(strLocation));
    … …  
    11821182}
    11831183
    1184 void UIGuestControlFileTable::sltSelectAll()
     1184void UIFileManagerTable::sltSelectAll()
    11851185{
    11861186    if (!m_pModel || !m_pView)
    … …  
    11901190}
    11911191
    1192 void UIGuestControlFileTable::sltInvertSelection()
     1192void UIFileManagerTable::sltInvertSelection()
    11931193{
    11941194    setSelectionForAll(QItemSelectionModel::Toggle | QItemSelectionModel::Rows);
    … …  
    11961196}
    11971197
    1198 void UIGuestControlFileTable::sltSearchTextChanged(const QString &strText)
     1198void UIFileManagerTable::sltSearchTextChanged(const QString &strText)
    11991199{
    12001200    performSelectionSearch(strText);
    12011201}
    12021202
    1203 void UIGuestControlFileTable::sltCreateFileViewContextMenu(const QPoint &point)
     1203void UIFileManagerTable::sltCreateFileViewContextMenu(const QPoint &point)
    12041204{
    12051205    QWidget *pSender = qobject_cast<QWidget*>(sender());
    … …  
    12091209}
    12101210
    1211 void UIGuestControlFileTable::deSelectUpDirectoryItem()
     1211void UIFileManagerTable::deSelectUpDirectoryItem()
    12121212{
    12131213    if (!m_pView)
    … …  
    12361236}
    12371237
    1238 void UIGuestControlFileTable::setSelectionForAll(QItemSelectionModel::SelectionFlags flags)
     1238void UIFileManagerTable::setSelectionForAll(QItemSelectionModel::SelectionFlags flags)
    12391239{
    12401240    if (!m_pView)
    … …  
    12571257}
    12581258
    1259 void UIGuestControlFileTable::setSelection(const QModelIndex &indexInProxyModel)
     1259void UIFileManagerTable::setSelection(const QModelIndex &indexInProxyModel)
    12601260{
    12611261    if (!m_pView)
    … …  
    12681268}
    12691269
    1270 void UIGuestControlFileTable::deleteByIndex(const QModelIndex &itemIndex)
     1270void UIFileManagerTable::deleteByIndex(const QModelIndex &itemIndex)
    12711271{
    12721272    UIFileTableItem *treeItem = indexData(itemIndex);
    … …  
    12761276}
    12771277
    1278 void UIGuestControlFileTable::retranslateUi()
     1278void UIFileManagerTable::retranslateUi()
    12791279{
    12801280    if (m_pRootItem)
    12811281    {
    1282         m_pRootItem->setData(UIGuestControlFileManager::tr("Name"), UIGuestControlFileModelColumn_Name);
    1283         m_pRootItem->setData(UIGuestControlFileManager::tr("Size"), UIGuestControlFileModelColumn_Size);
    1284         m_pRootItem->setData(UIGuestControlFileManager::tr("Change Time"), UIGuestControlFileModelColumn_ChangeTime);
    1285         m_pRootItem->setData(UIGuestControlFileManager::tr("Owner"), UIGuestControlFileModelColumn_Owner);
    1286         m_pRootItem->setData(UIGuestControlFileManager::tr("Permissions"), UIGuestControlFileModelColumn_Permissions);
     1282        m_pRootItem->setData(UIFileManager::tr("Name"), UIFileManagerModelColumn_Name);
     1283        m_pRootItem->setData(UIFileManager::tr("Size"), UIFileManagerModelColumn_Size);
     1284        m_pRootItem->setData(UIFileManager::tr("Change Time"), UIFileManagerModelColumn_ChangeTime);
     1285        m_pRootItem->setData(UIFileManager::tr("Owner"), UIFileManagerModelColumn_Owner);
     1286        m_pRootItem->setData(UIFileManager::tr("Permissions"), UIFileManagerModelColumn_Permissions);
    12871287    }
    12881288    if (m_pWarningLabel)
    1289         m_pWarningLabel->setText(UIGuestControlFileManager::tr("No Guest Session"));
    1290 }
    1291 
    1292 bool UIGuestControlFileTable::eventFilter(QObject *pObject, QEvent *pEvent) /* override */
     1289        m_pWarningLabel->setText(UIFileManager::tr("No Guest Session"));
     1290}
     1291
     1292bool UIFileManagerTable::eventFilter(QObject *pObject, QEvent *pEvent) /* override */
    12931293{
    12941294    Q_UNUSED(pObject);
    … …  
    13491349}
    13501350
    1351 UIFileTableItem *UIGuestControlFileTable::getStartDirectoryItem()
     1351UIFileTableItem *UIFileManagerTable::getStartDirectoryItem()
    13521352{
    13531353    if (!m_pRootItem)
    … …  
    13591359
    13601360
    1361 QString UIGuestControlFileTable::getNewDirectoryName()
     1361QString UIFileManagerTable::getNewDirectoryName()
    13621362{
    13631363    UIStringInputDialog *dialog = new UIStringInputDialog();
    … …  
    13721372}
    13731373
    1374 QString UIGuestControlFileTable::currentDirectoryPath() const
     1374QString UIFileManagerTable::currentDirectoryPath() const
    13751375{
    13761376    if (!m_pView)
    … …  
    13881388}
    13891389
    1390 QStringList UIGuestControlFileTable::selectedItemPathList()
     1390QStringList UIFileManagerTable::selectedItemPathList()
    13911391{
    13921392    QItemSelectionModel *selectionModel =  m_pView->selectionModel();
    … …  
    14081408}
    14091409
    1410 CGuestFsObjInfo UIGuestControlFileTable::guestFsObjectInfo(const QString& path, CGuestSession &comGuestSession) const
     1410CGuestFsObjInfo UIFileManagerTable::guestFsObjectInfo(const QString& path, CGuestSession &comGuestSession) const
    14111411{
    14121412    if (comGuestSession.isNull())
    … …  
    14181418}
    14191419
    1420 void UIGuestControlFileTable::setSelectionDependentActionsEnabled(bool fIsEnabled)
     1420void UIFileManagerTable::setSelectionDependentActionsEnabled(bool fIsEnabled)
    14211421{
    14221422    foreach (QAction *pAction, m_selectionDependentActions)
    … …  
    14271427
    14281428
    1429 QVector<QVariant> UIGuestControlFileTable::createTreeItemData(const QString &strName, ULONG64 size, const QDateTime &changeTime,
     1429QVector<QVariant> UIFileManagerTable::createTreeItemData(const QString &strName, ULONG64 size, const QDateTime &changeTime,
    14301430                                                            const QString &strOwner, const QString &strPermissions)
    14311431{
    14321432    QVector<QVariant> data;
    1433     data.resize(UIGuestControlFileModelColumn_Max);
    1434     data[UIGuestControlFileModelColumn_Name]        = strName;
    1435     data[UIGuestControlFileModelColumn_Size]        = (qulonglong)size;
    1436     data[UIGuestControlFileModelColumn_ChangeTime]  = changeTime;
    1437     data[UIGuestControlFileModelColumn_Owner]       = strOwner;
    1438     data[UIGuestControlFileModelColumn_Permissions] = strPermissions;
     1433    data.resize(UIFileManagerModelColumn_Max);
     1434    data[UIFileManagerModelColumn_Name]        = strName;
     1435    data[UIFileManagerModelColumn_Size]        = (qulonglong)size;
     1436    data[UIFileManagerModelColumn_ChangeTime]  = changeTime;
     1437    data[UIFileManagerModelColumn_Owner]       = strOwner;
     1438    data[UIFileManagerModelColumn_Permissions] = strPermissions;
    14391439    return data;
    14401440}
    14411441
    1442 bool UIGuestControlFileTable::event(QEvent *pEvent)
     1442bool UIFileManagerTable::event(QEvent *pEvent)
    14431443{
    14441444    if (pEvent->type() == QEvent::EnabledChange)
    … …  
    14511451}
    14521452
    1453 QString UIGuestControlFileTable::fileTypeString(FileObjectType type)
    1454 {
    1455     QString strType = UIGuestControlFileManager::tr("Unknown");
     1453QString UIFileManagerTable::fileTypeString(FileObjectType type)
     1454{
     1455    QString strType = UIFileManager::tr("Unknown");
    14561456    switch (type)
    14571457    {
    14581458        case FileObjectType_File:
    1459             strType = UIGuestControlFileManager::tr("File");
     1459            strType = UIFileManager::tr("File");
    14601460            break;
    14611461        case FileObjectType_Directory:
    1462             strType = UIGuestControlFileManager::tr("Directory");
     1462            strType = UIFileManager::tr("Directory");
    14631463            break;
    14641464        case FileObjectType_SymLink:
    1465             strType = UIGuestControlFileManager::tr("Symbolic Link");
     1465            strType = UIFileManager::tr("Symbolic Link");
    14661466            break;
    14671467        case FileObjectType_Other:
    1468             strType = UIGuestControlFileManager::tr("Other");
     1468            strType = UIFileManager::tr("Other");
    14691469            break;
    14701470
    … …  
    14761476}
    14771477
    1478 /* static */ QString UIGuestControlFileTable::humanReadableSize(ULONG64 size)
     1478/* static */ QString UIFileManagerTable::humanReadableSize(ULONG64 size)
    14791479{
    14801480    return vboxGlobal().formatSize(size);
    14811481}
    14821482
    1483 void UIGuestControlFileTable::sltReceiveDirectoryStatistics(UIDirectoryStatistics statistics)
     1483void UIFileManagerTable::sltReceiveDirectoryStatistics(UIDirectoryStatistics statistics)
    14841484{
    14851485    if (!m_pPropertiesDialog)
    … …  
    14881488}
    14891489
    1490 QModelIndex UIGuestControlFileTable::currentRootIndex() const
     1490QModelIndex UIFileManagerTable::currentRootIndex() const
    14911491{
    14921492    if (!m_pView)
    … …  
    14971497}
    14981498
    1499 void UIGuestControlFileTable::performSelectionSearch(const QString &strSearchText)
     1499void UIFileManagerTable::performSelectionSearch(const QString &strSearchText)
    15001500{
    15011501    if (!m_pProxyModel | !m_pView || strSearchText.isEmpty())
    … …  
    15251525}
    15261526
    1527 void UIGuestControlFileTable::disableSelectionSearch()
     1527void UIFileManagerTable::disableSelectionSearch()
    15281528{
    15291529    if (!m_pSearchLineEdit)
    … …  
    15351535}
    15361536
    1537 bool UIGuestControlFileTable::checkIfDeleteOK()
    1538 {
    1539     UIGuestControlFileManagerOptions *pFileManagerOptions = UIGuestControlFileManagerOptions::instance();
     1537bool UIFileManagerTable::checkIfDeleteOK()
     1538{
     1539    UIFileManagerOptions *pFileManagerOptions = UIFileManagerOptions::instance();
    15401540    if (!pFileManagerOptions)
    15411541        return true;
    … …  
    15621562}
    15631563
    1564 #include "UIGuestControlFileTable.moc"
     1564#include "UIFileManagerTable.moc"

  • trunk/src/VBox/Frontends/VirtualBox/src/guestctrl/UIFileManagerTable.h

    r76176 r76177  
    11/* $Id$ */
    22/** @file
    3  * VBox Qt GUI - UIGuestControlFileTable class declaration.
     3 * VBox Qt GUI - UIFileManagerTable class declaration.
    44 */
    55
    … …  
    1616 */
    1717
    18 #ifndef ___UIGuestControlFileTable_h___
    19 #define ___UIGuestControlFileTable_h___
     18#ifndef ___UIFileManagerTable_h___
     19#define ___UIFileManagerTable_h___
    2020
    2121/* Qt includes: */
    … …  
    4747class UIActionPool;
    4848class UIFileTableItem;
    49 class UIGuestControlFileModel;
     49class UIFileManagerModel;
    5050class UIGuestControlFileProxyModel;
    5151class UIGuestControlFileView;
    … …  
    161161
    162162/** A UIFileTableItem instance is a tree node representing a file object (file, directory, etc). The tree contructed
    163     by these instances is the data source for the UIGuestControlFileModel. */
     163    by these instances is the data source for the UIFileManagerModel. */
    164164class UIFileTableItem
    165165{
    … …  
    240240/** This class serves a base class for file table. Currently a guest version
    241241 *  and a host version are derived from this base. Each of these children
    242  *  populates the UIGuestControlFileModel by scanning the file system
     242 *  populates the UIFileManagerModel by scanning the file system
    243243 *  differently. The file structre kept in this class as a tree. */
    244 class UIGuestControlFileTable : public QIWithRetranslateUI<QWidget>
     244class UIFileManagerTable : public QIWithRetranslateUI<QWidget>
    245245{
    246246    Q_OBJECT;
    … …  
    253253public:
    254254
    255     UIGuestControlFileTable(UIActionPool *pActionPool, QWidget *pParent = 0);
    256     virtual ~UIGuestControlFileTable();
     255    UIFileManagerTable(UIActionPool *pActionPool, QWidget *pParent = 0);
     256    virtual ~UIFileManagerTable();
    257257    /** Deletes all the tree nodes */
    258258    void        reset();
    … …  
    341341    CGuestFsObjInfo  guestFsObjectInfo(const QString& path, CGuestSession &comGuestSession) const;
    342342    void             setSelectionDependentActionsEnabled(bool fIsEnabled);
    343     /** Creates a QList out of the parameters wrt. UIGuestControlFileModelColumn enum */
     343    /** Creates a QList out of the parameters wrt. UIFileManagerModelColumn enum */
    344344    QVector<QVariant>  createTreeItemData(const QString &strName, ULONG64 size, const QDateTime &changeTime,
    345345                                        const QString &strOwner, const QString &strPermissions);
    … …  
    393393    bool            checkIfDeleteOK();
    394394
    395     UIGuestControlFileModel      *m_pModel;
     395    UIFileManagerModel      *m_pModel;
    396396    UIGuestControlFileView       *m_pView;
    397397    UIGuestControlFileProxyModel *m_pProxyModel;
    … …  
    402402    QILabel         *m_pWarningLabel;
    403403
    404     friend class     UIGuestControlFileModel;
    405 };
    406 
    407 #endif /* !___UIGuestControlFileTable_h___ */
     404    friend class     UIFileManagerModel;
     405};
     406
     407#endif /* !___UIFileManagerTable_h___ */

  • trunk/src/VBox/Frontends/VirtualBox/src/runtime/UIMachineLogic.cpp

    r75361 r76177  
    6666# include "UIAddDiskEncryptionPasswordDialog.h"
    6767# include "UIVMInformationDialog.h"
    68 # include "UIGuestControlFileManagerDialog.h"
     68# include "UIFileManagerDialog.h"
    6969# include "UIGuestProcessControlDialog.h"
    7070
    … …  
    11091109    connect(actionPool()->action(UIActionIndexRT_M_Machine_S_ShowInformation), SIGNAL(triggered()),
    11101110            this, SLOT(sltShowInformationDialog()));
    1111     connect(actionPool()->action(UIActionIndexRT_M_Machine_S_ShowGuestControlFileManager), SIGNAL(triggered()),
    1112             this, SLOT(sltShowGuestControlFileManagerDialog()));
     1111    connect(actionPool()->action(UIActionIndexRT_M_Machine_S_ShowFileManager), SIGNAL(triggered()),
     1112            this, SLOT(sltShowFileManagerDialog()));
    11131113    connect(actionPool()->action(UIActionIndexRT_M_Machine_S_ShowGuestProcessControl), SIGNAL(triggered()),
    11141114            this, SLOT(sltShowGuestProcessControlDialog()));
    … …  
    17821782}
    17831783
    1784 void UIMachineLogic::sltShowGuestControlFileManagerDialog()
     1784void UIMachineLogic::sltShowFileManagerDialog()
    17851785{
    17861786    if (machine().isNull() || !activeMachineWindow())
    … …  
    17921792
    17931793    QIManagerDialog *pFileManagerDialog;
    1794     UIGuestControlFileManagerDialogFactory dialogFactory(actionPool(), console().GetGuest(), machine().GetName());
     1794    UIFileManagerDialogFactory dialogFactory(actionPool(), console().GetGuest(), machine().GetName());
    17951795    dialogFactory.prepare(pFileManagerDialog, activeMachineWindow());
    17961796    if (pFileManagerDialog)
    … …  
    18031803        pFileManagerDialog->activateWindow();
    18041804        connect(pFileManagerDialog, &QIManagerDialog::sigClose,
    1805                 this, &UIMachineLogic::sltCloseGuestControlFileManagerDialog);
    1806     }
    1807 }
    1808 
    1809 void UIMachineLogic::sltCloseGuestControlFileManagerDialog()
     1805                this, &UIMachineLogic::sltCloseFileManagerDialog);
     1806    }
     1807}
     1808
     1809void UIMachineLogic::sltCloseFileManagerDialog()
    18101810{
    18111811    QIManagerDialog* pDialog = qobject_cast<QIManagerDialog*>(sender());
    … …  
    18161816    m_pFileManagerDialog = 0;
    18171817    pDialog->close();
    1818     UIGuestControlFileManagerDialogFactory().cleanup(pDialog);
     1818    UIFileManagerDialogFactory().cleanup(pDialog);
    18191819}
    18201820

  • trunk/src/VBox/Frontends/VirtualBox/src/runtime/UIMachineLogic.h

    r75291 r76177  
    274274    void sltTakeSnapshot();
    275275    void sltShowInformationDialog();
    276     void sltShowGuestControlFileManagerDialog();
    277     void sltCloseGuestControlFileManagerDialog();
     276    void sltShowFileManagerDialog();
     277    void sltCloseFileManagerDialog();
    278278    void sltShowGuestProcessControlDialog();
    279279    void sltCloseGuestProcessControlDialog();
Note: See TracChangeset for help on using the changeset viewer.

© 2024 Oracle Support Privacy / Do Not Sell My Info Terms of Use Trademark Policy Automated Access Etiquette