VirtualBox

Ignore:
Timestamp:
Oct 26, 2018 9:59:37 AM (6 years ago)
Author:
vboxsync
Message:

FE/Qt: bugref:6699. Move guest process control and file manager to separate dialogs

Location:
trunk/src/VBox/Frontends/VirtualBox
Files:
2 deleted
17 edited
2 copied
2 moved

Legend:

Unmodified
Added
Removed

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

    r75062 r75087  
    844844        src/runtime/information/UIVMInformationDialog.h \
    845845        src/runtime/guestctrl/UIGuestControlConsole.h \
    846         src/runtime/guestctrl/UIGuestControlDialog.h \
    847846        src/runtime/guestctrl/UIGuestControlFileManager.h \
     847        src/runtime/guestctrl/UIGuestControlFileManagerDialog.h \
    848848        src/runtime/guestctrl/UIGuestControlFileModel.h \
    849849        src/runtime/guestctrl/UIGuestControlFileTable.h \
    850850        src/runtime/guestctrl/UIGuestControlInterface.h \
    851851        src/runtime/guestctrl/UIGuestControlTreeItem.h \
    852         src/runtime/guestctrl/UIGuestControlWidget.h \
    853852        src/runtime/guestctrl/UIGuestFileTable.h \
     853        src/runtime/guestctrl/UIGuestProcessControlDialog.h \
    854854        src/runtime/guestctrl/UIGuestProcessControlWidget.h \
    855855        src/runtime/guestctrl/UIHostFileTable.h \
    … …  
    994994        src/runtime/information/UIVMInformationDialog.h \
    995995        src/runtime/guestctrl/UIGuestControlConsole.h \
    996         src/runtime/guestctrl/UIGuestControlDialog.h \
    997996        src/runtime/guestctrl/UIGuestControlFileManager.h \
     997        src/runtime/guestctrl/UIGuestControlFileManagerDialog.h \
    998998        src/runtime/guestctrl/UIGuestControlFileModel.h \
    999999        src/runtime/guestctrl/UIGuestControlFileTable.h \
    10001000        src/runtime/guestctrl/UIGuestControlInterface.h \
    10011001        src/runtime/guestctrl/UIGuestControlTreeItem.h \
    1002         src/runtime/guestctrl/UIGuestControlWidget.h \
    10031002        src/runtime/guestctrl/UIGuestFileTable.h \
     1003        src/runtime/guestctrl/UIGuestProcessControlDialog.h \
    10041004        src/runtime/guestctrl/UIGuestProcessControlWidget.h \
    10051005        src/runtime/guestctrl/UIHostFileTable.h \
    … …  
    15451545        src/runtime/information/UIVMInformationDialog.cpp \
    15461546        src/runtime/guestctrl/UIGuestControlConsole.cpp \
    1547         src/runtime/guestctrl/UIGuestControlDialog.cpp \
    15481547        src/runtime/guestctrl/UIGuestControlFileManager.cpp \
     1548        src/runtime/guestctrl/UIGuestControlFileManagerDialog.cpp \
    15491549        src/runtime/guestctrl/UIGuestControlFileModel.cpp \
    15501550        src/runtime/guestctrl/UIGuestControlFileTable.cpp \
    15511551        src/runtime/guestctrl/UIGuestControlInterface.cpp \
    15521552        src/runtime/guestctrl/UIGuestControlTreeItem.cpp \
    1553         src/runtime/guestctrl/UIGuestControlWidget.cpp \
    15541553        src/runtime/guestctrl/UIGuestFileTable.cpp \
     1554        src/runtime/guestctrl/UIGuestProcessControlDialog.cpp \
    15551555        src/runtime/guestctrl/UIGuestProcessControlWidget.cpp \
    15561556        src/runtime/guestctrl/UIHostFileTable.cpp \
    … …  
    17191719        src/runtime/information/UIVMInformationDialog.cpp \
    17201720        src/runtime/guestctrl/UIGuestControlConsole.cpp \
    1721         src/runtime/guestctrl/UIGuestControlDialog.cpp \
    17221721        src/runtime/guestctrl/UIGuestControlFileManager.cpp \
     1722        src/runtime/guestctrl/UIGuestControlFileManagerDialog.cpp \
    17231723        src/runtime/guestctrl/UIGuestControlFileModel.cpp \
    17241724        src/runtime/guestctrl/UIGuestControlFileTable.cpp \
    17251725        src/runtime/guestctrl/UIGuestControlInterface.cpp \
    17261726        src/runtime/guestctrl/UIGuestControlTreeItem.cpp \
    1727         src/runtime/guestctrl/UIGuestControlWidget.cpp \
    17281727        src/runtime/guestctrl/UIGuestFileTable.cpp \
    17291728        src/runtime/guestctrl/UIGuestProcessControlWidget.cpp \
     1729        src/runtime/guestctrl/UIGuestProcessControlDialog.cpp \
    17301730        src/runtime/guestctrl/UIHostFileTable.cpp \
    17311731        src/runtime/normal/UIKeyboardHandlerNormal.cpp \

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

    r75018 r75087  
    546546    switch (runtimeMenuMachineActionType)
    547547    {
    548         case UIExtraDataMetaDefs::RuntimeMenuMachineActionType_SettingsDialog:     strResult = "SettingsDialog"; break;
    549         case UIExtraDataMetaDefs::RuntimeMenuMachineActionType_TakeSnapshot:       strResult = "TakeSnapshot"; break;
    550         case UIExtraDataMetaDefs::RuntimeMenuMachineActionType_InformationDialog:  strResult = "InformationDialog"; break;
    551         case UIExtraDataMetaDefs::RuntimeMenuMachineActionType_GuestControlDialog: strResult = "GuestControlDialog"; break;
    552         case UIExtraDataMetaDefs::RuntimeMenuMachineActionType_Pause:              strResult = "Pause"; break;
    553         case UIExtraDataMetaDefs::RuntimeMenuMachineActionType_Reset:              strResult = "Reset"; break;
    554         case UIExtraDataMetaDefs::RuntimeMenuMachineActionType_Detach:             strResult = "Detach"; break;
    555         case UIExtraDataMetaDefs::RuntimeMenuMachineActionType_SaveState:          strResult = "SaveState"; break;
    556         case UIExtraDataMetaDefs::RuntimeMenuMachineActionType_Shutdown:           strResult = "Shutdown"; break;
    557         case UIExtraDataMetaDefs::RuntimeMenuMachineActionType_PowerOff:           strResult = "PowerOff"; break;
    558         case UIExtraDataMetaDefs::RuntimeMenuMachineActionType_Nothing:            strResult = "Nothing"; break;
    559         case UIExtraDataMetaDefs::RuntimeMenuMachineActionType_All:                strResult = "All"; break;
     548        case UIExtraDataMetaDefs::RuntimeMenuMachineActionType_SettingsDialog:                strResult = "SettingsDialog"; break;
     549        case UIExtraDataMetaDefs::RuntimeMenuMachineActionType_TakeSnapshot:                  strResult = "TakeSnapshot"; break;
     550        case UIExtraDataMetaDefs::RuntimeMenuMachineActionType_InformationDialog:             strResult = "InformationDialog"; break;
     551        case UIExtraDataMetaDefs::RuntimeMenuMachineActionType_GuestControlFileManagerDialog: strResult = "GuestControlFileManagerDialog"; break;
     552        case UIExtraDataMetaDefs::RuntimeMenuMachineActionType_GuestProcessControlDialog:     strResult = "GuestProcessControlDialog"; break;
     553        case UIExtraDataMetaDefs::RuntimeMenuMachineActionType_Pause:                         strResult = "Pause"; break;
     554        case UIExtraDataMetaDefs::RuntimeMenuMachineActionType_Reset:                         strResult = "Reset"; break;
     555        case UIExtraDataMetaDefs::RuntimeMenuMachineActionType_Detach:                        strResult = "Detach"; break;
     556        case UIExtraDataMetaDefs::RuntimeMenuMachineActionType_SaveState:                     strResult = "SaveState"; break;
     557        case UIExtraDataMetaDefs::RuntimeMenuMachineActionType_Shutdown:                      strResult = "Shutdown"; break;
     558        case UIExtraDataMetaDefs::RuntimeMenuMachineActionType_PowerOff:                      strResult = "PowerOff"; break;
     559        case UIExtraDataMetaDefs::RuntimeMenuMachineActionType_Nothing:                       strResult = "Nothing"; break;
     560        case UIExtraDataMetaDefs::RuntimeMenuMachineActionType_All:                           strResult = "All"; break;
    560561        default:
    561562        {
    … …  
    573574     * to search through the keys using 'case-insensitive' rule: */
    574575    QStringList keys;             QList<UIExtraDataMetaDefs::RuntimeMenuMachineActionType> values;
    575     keys << "SettingsDialog";     values << UIExtraDataMetaDefs::RuntimeMenuMachineActionType_SettingsDialog;
    576     keys << "TakeSnapshot";       values << UIExtraDataMetaDefs::RuntimeMenuMachineActionType_TakeSnapshot;
    577     keys << "InformationDialog";  values << UIExtraDataMetaDefs::RuntimeMenuMachineActionType_InformationDialog;
    578     keys << "GuestControlDialog"; values << UIExtraDataMetaDefs::RuntimeMenuMachineActionType_GuestControlDialog;
    579     keys << "Pause";              values << UIExtraDataMetaDefs::RuntimeMenuMachineActionType_Pause;
    580     keys << "Reset";              values << UIExtraDataMetaDefs::RuntimeMenuMachineActionType_Reset;
    581     keys << "Detach";             values << UIExtraDataMetaDefs::RuntimeMenuMachineActionType_Detach;
    582     keys << "SaveState";          values << UIExtraDataMetaDefs::RuntimeMenuMachineActionType_SaveState;
    583     keys << "Shutdown";           values << UIExtraDataMetaDefs::RuntimeMenuMachineActionType_Shutdown;
    584     keys << "PowerOff";           values << UIExtraDataMetaDefs::RuntimeMenuMachineActionType_PowerOff;
    585     keys << "Nothing";            values << UIExtraDataMetaDefs::RuntimeMenuMachineActionType_Nothing;
    586     keys << "All";                values << UIExtraDataMetaDefs::RuntimeMenuMachineActionType_All;
     576    keys << "SettingsDialog";                values << UIExtraDataMetaDefs::RuntimeMenuMachineActionType_SettingsDialog;
     577    keys << "TakeSnapshot";                  values << UIExtraDataMetaDefs::RuntimeMenuMachineActionType_TakeSnapshot;
     578    keys << "InformationDialog";             values << UIExtraDataMetaDefs::RuntimeMenuMachineActionType_InformationDialog;
     579    keys << "GuestControlFileManagerDialog"; values << UIExtraDataMetaDefs::RuntimeMenuMachineActionType_GuestControlFileManagerDialog;
     580    keys << "GuestProcessControlDialog";     values << UIExtraDataMetaDefs::RuntimeMenuMachineActionType_GuestProcessControlDialog;
     581    keys << "Pause";                         values << UIExtraDataMetaDefs::RuntimeMenuMachineActionType_Pause;
     582    keys << "Reset";                         values << UIExtraDataMetaDefs::RuntimeMenuMachineActionType_Reset;
     583    keys << "Detach";                        values << UIExtraDataMetaDefs::RuntimeMenuMachineActionType_Detach;
     584    keys << "SaveState";                     values << UIExtraDataMetaDefs::RuntimeMenuMachineActionType_SaveState;
     585    keys << "Shutdown";                      values << UIExtraDataMetaDefs::RuntimeMenuMachineActionType_Shutdown;
     586    keys << "PowerOff";                      values << UIExtraDataMetaDefs::RuntimeMenuMachineActionType_PowerOff;
     587    keys << "Nothing";                       values << UIExtraDataMetaDefs::RuntimeMenuMachineActionType_Nothing;
     588    keys << "All";                           values << UIExtraDataMetaDefs::RuntimeMenuMachineActionType_All;
    587589    /* Invalid type for unknown words: */
    588590    if (!keys.contains(strRuntimeMenuMachineActionType, Qt::CaseInsensitive))

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

    r75057 r75087  
    197197const char *UIExtraDataDefs::GUI_GuestControl_ProcessControlSplitterHints = "GUI/GuestControl/ProcessControlSplitterHints";
    198198const char *UIExtraDataDefs::GUI_GuestControl_FileManagerSplitterHints = "GUI/GuestControl/FileManagerSplitterHints";
    199 const char *UIExtraDataDefs::GUI_GuestControl_DialogGeometry = "GUI/GuestControl/DialogGeometry";
     199const char *UIExtraDataDefs::GUI_GuestControl_FileManagerDialogGeometry = "GUI/GuestControl/FileManagerDialogGeometry";
     200const char *UIExtraDataDefs::GUI_GuestControl_ProcessControlDialogGeometry = "GUI/GuestControl/ProcessControlDialogGeometry";
    200201
    201202/* Virtual Machine: Close dialog: */

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

    r75057 r75087  
    350350        extern const char *GUI_GuestControl_ProcessControlSplitterHints;
    351351        extern const char *GUI_GuestControl_FileManagerSplitterHints;
    352         extern const char *GUI_GuestControl_DialogGeometry;
     352        extern const char *GUI_GuestControl_FileManagerDialogGeometry;
     353        extern const char *GUI_GuestControl_ProcessControlDialogGeometry;
    353354    /** @} */
    354355
    … …  
    466467    enum RuntimeMenuMachineActionType
    467468    {
    468         RuntimeMenuMachineActionType_Invalid            = 0,
    469         RuntimeMenuMachineActionType_SettingsDialog     = RT_BIT(0),
    470         RuntimeMenuMachineActionType_TakeSnapshot       = RT_BIT(1),
    471         RuntimeMenuMachineActionType_InformationDialog  = RT_BIT(2),
    472         RuntimeMenuMachineActionType_GuestControlDialog = RT_BIT(3),
    473         RuntimeMenuMachineActionType_Pause              = RT_BIT(4),
    474         RuntimeMenuMachineActionType_Reset              = RT_BIT(5),
    475         RuntimeMenuMachineActionType_Detach             = RT_BIT(6),
    476         RuntimeMenuMachineActionType_SaveState          = RT_BIT(7),
    477         RuntimeMenuMachineActionType_Shutdown           = RT_BIT(8),
    478         RuntimeMenuMachineActionType_PowerOff           = RT_BIT(9),
    479         RuntimeMenuMachineActionType_Nothing            = RT_BIT(10),
    480         RuntimeMenuMachineActionType_All                = 0xFFFF
     469        RuntimeMenuMachineActionType_Invalid                       = 0,
     470        RuntimeMenuMachineActionType_SettingsDialog                = RT_BIT(0),
     471        RuntimeMenuMachineActionType_TakeSnapshot                  = RT_BIT(1),
     472        RuntimeMenuMachineActionType_InformationDialog             = RT_BIT(2),
     473        RuntimeMenuMachineActionType_GuestControlFileManagerDialog = RT_BIT(3),
     474        RuntimeMenuMachineActionType_GuestProcessControlDialog     = RT_BIT(4),
     475        RuntimeMenuMachineActionType_Pause                         = RT_BIT(5),
     476        RuntimeMenuMachineActionType_Reset                         = RT_BIT(6),
     477        RuntimeMenuMachineActionType_Detach                        = RT_BIT(7),
     478        RuntimeMenuMachineActionType_SaveState                     = RT_BIT(8),
     479        RuntimeMenuMachineActionType_Shutdown                      = RT_BIT(9),
     480        RuntimeMenuMachineActionType_PowerOff                      = RT_BIT(10),
     481        RuntimeMenuMachineActionType_Nothing                       = RT_BIT(11),
     482        RuntimeMenuMachineActionType_All                           = 0xFFFF
    481483    };
    482484

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

    r75057 r75087  
    20332033           << GUI_GuestControl_ProcessControlSplitterHints
    20342034           << GUI_GuestControl_FileManagerSplitterHints
    2035            << GUI_GuestControl_DialogGeometry
     2035           << GUI_GuestControl_FileManagerDialogGeometry
     2036           << GUI_GuestControl_ProcessControlDialogGeometry
    20362037           << GUI_DefaultCloseAction << GUI_RestrictedCloseActions
    20372038           << GUI_LastCloseAction << GUI_CloseActionHook
    … …  
    41374138}
    41384139
    4139 QRect UIExtraDataManager::guestControlDialogGeometry(QWidget *pWidget, const QRect &defaultGeometry)
     4140QRect UIExtraDataManager::guestControlFileManagerDialogGeometry(QWidget *pWidget, const QRect &defaultGeometry)
     4141{
     4142    return dialogGeometry(GUI_GuestControl_FileManagerDialogGeometry, pWidget, defaultGeometry);
     4143}
     4144
     4145bool UIExtraDataManager::guestControlFileManagerDialogShouldBeMaximized()
    41404146{
    41414147    /* Get corresponding extra-data: */
    4142     const QStringList data = extraDataStringList(GUI_GuestControl_DialogGeometry);
    4143 
    4144     /* Parse loaded data: */
    4145     int iX = 0, iY = 0, iW = 0, iH = 0;
    4146     bool fOk = data.size() >= 4;
    4147     do
    4148     {
    4149         if (!fOk) break;
    4150         iX = data[0].toInt(&fOk);
    4151         if (!fOk) break;
    4152         iY = data[1].toInt(&fOk);
    4153         if (!fOk) break;
    4154         iW = data[2].toInt(&fOk);
    4155         if (!fOk) break;
    4156         iH = data[3].toInt(&fOk);
    4157     }
    4158     while (0);
    4159 
    4160     /* Use geometry (loaded or default): */
    4161     QRect geometry = fOk ? QRect(iX, iY, iW, iH) : defaultGeometry;
    4162 
    4163     /* Take hint-widget into account: */
    4164     if (pWidget)
    4165         geometry.setSize(geometry.size().expandedTo(pWidget->minimumSizeHint()));
    4166 
    4167     /* In Windows Qt fails to reposition out of screen window properly, so doing it ourselves: */
    4168 #ifdef VBOX_WS_WIN
    4169     /* Get available-geometry [of screen with point (iX, iY) if possible]: */
    4170     const QRect availableGeometry = fOk ? gpDesktop->availableGeometry(QPoint(iX, iY)) :
    4171                                           gpDesktop->availableGeometry();
    4172 
    4173     /* Make sure resulting geometry is within current bounds: */
    4174     if (!availableGeometry.contains(geometry))
    4175         geometry = VBoxGlobal::getNormalized(geometry, QRegion(availableGeometry));
    4176 #endif /* VBOX_WS_WIN */
    4177 
    4178     /* Return result: */
    4179     return geometry;
    4180 }
    4181 
    4182 bool UIExtraDataManager::guestControlDialogShouldBeMaximized()
    4183 {
    4184     /* Get corresponding extra-data: */
    4185     const QStringList data = extraDataStringList(GUI_GuestControl_DialogGeometry);
     4148    const QStringList data = extraDataStringList(GUI_GuestControl_FileManagerDialogGeometry);
    41864149
    41874150    /* Make sure 5th item has required value: */
    … …  
    41894152}
    41904153
    4191 void UIExtraDataManager::setGuestControlDialogGeometry(const QRect &geometry, bool fMaximized)
    4192 {
    4193     /* Serialize passed values: */
    4194     QStringList data;
    4195     data << QString::number(geometry.x());
    4196     data << QString::number(geometry.y());
    4197     data << QString::number(geometry.width());
    4198     data << QString::number(geometry.height());
    4199     if (fMaximized)
    4200         data << GUI_Geometry_State_Max;
    4201 
    4202     /* Re-cache corresponding extra-data: */
    4203     setExtraDataStringList(GUI_GuestControl_DialogGeometry, data);
    4204 }
     4154void UIExtraDataManager::setGuestControlFileManagerDialogGeometry(const QRect &geometry, bool fMaximized)
     4155{
     4156    setDialogGeometry(GUI_GuestControl_FileManagerDialogGeometry, geometry, fMaximized);
     4157}
     4158
     4159QRect UIExtraDataManager::guestProcessControlDialogGeometry(QWidget *pWidget, const QRect &defaultGeometry)
     4160{
     4161    return dialogGeometry(GUI_GuestControl_ProcessControlDialogGeometry, pWidget, defaultGeometry);
     4162}
     4163
     4164bool UIExtraDataManager::guestProcessControlDialogShouldBeMaximized()
     4165{
     4166    /* Get corresponding extra-data: */
     4167    const QStringList data = extraDataStringList(GUI_GuestControl_ProcessControlDialogGeometry);
     4168
     4169    /* Make sure 5th item has required value: */
     4170    return data.size() == 5 && data[4] == GUI_Geometry_State_Max;
     4171}
     4172
     4173void UIExtraDataManager::setGuestProcessControlDialogGeometry(const QRect &geometry, bool fMaximized)
     4174{
     4175    setDialogGeometry(GUI_GuestControl_ProcessControlDialogGeometry, geometry, fMaximized);
     4176}
     4177
    42054178
    42064179QMap<InformationElementType, bool> UIExtraDataManager::informationWindowElements()
    … …  
    47844757}
    47854758
     4759QRect UIExtraDataManager::dialogGeometry(const QString &strKey, QWidget *pWidget, const QRect &defaultGeometry)
     4760{
     4761    /* Get corresponding extra-data: */
     4762    const QStringList data = extraDataStringList(strKey);
     4763
     4764    /* Parse loaded data: */
     4765    int iX = 0, iY = 0, iW = 0, iH = 0;
     4766    bool fOk = data.size() >= 4;
     4767    do
     4768    {
     4769        if (!fOk) break;
     4770        iX = data[0].toInt(&fOk);
     4771        if (!fOk) break;
     4772        iY = data[1].toInt(&fOk);
     4773        if (!fOk) break;
     4774        iW = data[2].toInt(&fOk);
     4775        if (!fOk) break;
     4776        iH = data[3].toInt(&fOk);
     4777    }
     4778    while (0);
     4779
     4780    /* Use geometry (loaded or default): */
     4781    QRect geometry = fOk ? QRect(iX, iY, iW, iH) : defaultGeometry;
     4782
     4783    /* Take hint-widget into account: */
     4784    if (pWidget)
     4785        geometry.setSize(geometry.size().expandedTo(pWidget->minimumSizeHint()));
     4786
     4787    /* In Windows Qt fails to reposition out of screen window properly, so doing it ourselves: */
     4788#ifdef VBOX_WS_WIN
     4789    /* Get available-geometry [of screen with point (iX, iY) if possible]: */
     4790    const QRect availableGeometry = fOk ? gpDesktop->availableGeometry(QPoint(iX, iY)) :
     4791                                          gpDesktop->availableGeometry();
     4792
     4793    /* Make sure resulting geometry is within current bounds: */
     4794    if (!availableGeometry.contains(geometry))
     4795        geometry = VBoxGlobal::getNormalized(geometry, QRegion(availableGeometry));
     4796#endif /* VBOX_WS_WIN */
     4797
     4798    /* Return result: */
     4799    return geometry;
     4800}
     4801
     4802void UIExtraDataManager::setDialogGeometry(const QString &strKey, const QRect &geometry, bool fMaximized)
     4803{
     4804        /* Serialize passed values: */
     4805    QStringList data;
     4806    data << QString::number(geometry.x());
     4807    data << QString::number(geometry.y());
     4808    data << QString::number(geometry.width());
     4809    data << QString::number(geometry.height());
     4810    if (fMaximized)
     4811        data << GUI_Geometry_State_Max;
     4812
     4813    /* Re-cache corresponding extra-data: */
     4814    setExtraDataStringList(strKey, data);
     4815}
     4816
    47864817#include "UIExtraDataManager.moc"

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

    r75057 r75087  
    624624    /** @} */
    625625
    626     /** @name Virtual Machine: Guest Control dialog
     626    /** @name Virtual Machine: Guest Control related dialogs
    627627      * @{ */
    628628        void setGuestControlProcessControlSplitterHints(const QList<int> &hints);
    … …  
    630630        QList<int> guestControlProcessControlSplitterHints();
    631631        QList<int> guestControlFileManagerSplitterHints();
    632         QRect guestControlDialogGeometry(QWidget *pWidget, const QRect &defaultGeometry);
    633         bool guestControlDialogShouldBeMaximized();
    634         void setGuestControlDialogGeometry(const QRect &geometry, bool fMaximized);
     632        QRect guestControlFileManagerDialogGeometry(QWidget *pWidget, const QRect &defaultGeometry);
     633        bool guestControlFileManagerDialogShouldBeMaximized();
     634        void setGuestControlFileManagerDialogGeometry(const QRect &geometry, bool fMaximized);
     635        QRect guestProcessControlDialogGeometry(QWidget *pWidget, const QRect &defaultGeometry);
     636        bool guestProcessControlDialogShouldBeMaximized();
     637        void setGuestProcessControlDialogGeometry(const QRect &geometry, bool fMaximized);
    635638    /** @} */
    636639
    … …  
    755758    QString toFeatureRestricted(bool fRestricted);
    756759
     760    QRect dialogGeometry(const QString &strKey, QWidget *pWidget, const QRect &defaultGeometry);
     761    void setDialogGeometry(const QString &strKey, const QRect &geometry, bool fMaximized);
     762
    757763    /** Returns string consisting of @a strBase appended with @a uScreenIndex for the *non-primary* screen-index.
    758764      * If @a fSameRuleForPrimary is 'true' same rule will be used for *primary* screen-index. Used for storing per-screen extra-data. */

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

    r75062 r75087  
    230230};
    231231
    232 /** Simple action extension, used as 'Show Guest Control Dialog' action class. */
    233 class UIActionSimpleRuntimeShowGuestControlDialog : public UIActionSimple
    234 {
    235     Q_OBJECT;
    236 
    237 public:
    238 
    239     /** Constructs action passing @a pParent to the base-class. */
    240     UIActionSimpleRuntimeShowGuestControlDialog(UIActionPool *pParent)
     232/** Simple action extension, used as 'Show Guest Control File Manager Dialog' action class. */
     233class UIActionSimpleRuntimeShowGuestControlFileManagerDialog : public UIActionSimple
     234{
     235    Q_OBJECT;
     236
     237public:
     238
     239    /** Constructs action passing @a pParent to the base-class. */
     240    UIActionSimpleRuntimeShowGuestControlFileManagerDialog(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_GuestControlDialog;
    250     }
    251     /** Returns action extra-data key. */
    252     virtual QString extraDataKey() const /* override */
    253     {
    254         return gpConverter->toInternalString(UIExtraDataMetaDefs::RuntimeMenuMachineActionType_GuestControlDialog);
    255     }
    256     /** Returns whether action is allowed. */
    257     virtual bool isAllowed() const /* override */
    258     {
    259         return actionPool()->toRuntime()->isAllowedInMenuMachine(UIExtraDataMetaDefs::RuntimeMenuMachineActionType_GuestControlDialog);
    260     }
    261 
    262     /** Returns shortcut extra-data ID. */
    263     virtual QString shortcutExtraDataID() const /* override */
    264     {
    265         return QString("GuestControlDialog");
     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");
    266266    }
    267267
    … …  
    275275    virtual void retranslateUi() /* override */
    276276    {
    277         setName(QApplication::translate("UIActionPool", "Guest Control..."));
    278         setStatusTip(QApplication::translate("UIActionPool", "Display the virtual machine guest control window"));
    279     }
    280 };
     277        setName(QApplication::translate("UIActionPool", "File Manager..."));
     278        setStatusTip(QApplication::translate("UIActionPool", "Display the virtual machine guest control file manager window"));
     279    }
     280};
     281
     282/** Simple action extension, used as 'Show Guest Process Control Dialog' action class. */
     283class UIActionSimpleRuntimeShowGuestProcessControlDialog : public UIActionSimple
     284{
     285    Q_OBJECT;
     286
     287public:
     288
     289    /** Constructs action passing @a pParent to the base-class. */
     290    UIActionSimpleRuntimeShowGuestProcessControlDialog(UIActionPool *pParent)
     291        : UIActionSimple(pParent, ":/session_info_16px.png", ":/session_info_disabled_16px.png", true)
     292    {}
     293
     294protected:
     295
     296    /** Returns action extra-data ID. */
     297    virtual int extraDataID() const /* override */
     298    {
     299        return UIExtraDataMetaDefs::RuntimeMenuMachineActionType_GuestProcessControlDialog;
     300    }
     301    /** Returns action extra-data key. */
     302    virtual QString extraDataKey() const /* override */
     303    {
     304        return gpConverter->toInternalString(UIExtraDataMetaDefs::RuntimeMenuMachineActionType_GuestProcessControlDialog);
     305    }
     306    /** Returns whether action is allowed. */
     307    virtual bool isAllowed() const /* override */
     308    {
     309        return actionPool()->toRuntime()->isAllowedInMenuMachine(UIExtraDataMetaDefs::RuntimeMenuMachineActionType_GuestProcessControlDialog);
     310    }
     311
     312    /** Returns shortcut extra-data ID. */
     313    virtual QString shortcutExtraDataID() const /* override */
     314    {
     315        return QString("GuestProcessControlDialog");
     316    }
     317
     318    /** Returns default shortcut. */
     319    virtual QKeySequence defaultShortcut(UIActionPoolType) const /* override */
     320    {
     321        return QKeySequence();
     322    }
     323
     324    /** Handles translation event. */
     325    virtual void retranslateUi() /* override */
     326    {
     327        setName(QApplication::translate("UIActionPool", "Guest Process Control..."));
     328        setStatusTip(QApplication::translate("UIActionPool", "Display the virtual machine guest process control window"));
     329    }
     330};
     331
    281332
    282333/** Toggle action extension, used as 'Pause' action class. */
    … …  
    32343285    m_pool[UIActionIndexRT_M_Machine_S_TakeSnapshot] = new UIActionSimpleRuntimePerformTakeSnapshot(this);
    32353286    m_pool[UIActionIndexRT_M_Machine_S_ShowInformation] = new UIActionSimpleRuntimeShowInformationDialog(this);
    3236     m_pool[UIActionIndexRT_M_Machine_S_ShowGuestControl] = new UIActionSimpleRuntimeShowGuestControlDialog(this);
     3287    m_pool[UIActionIndexRT_M_Machine_S_ShowGuestControlFileManager] = new UIActionSimpleRuntimeShowGuestControlFileManagerDialog(this);
     3288    m_pool[UIActionIndexRT_M_Machine_S_ShowGuestProcessControl] = new UIActionSimpleRuntimeShowGuestProcessControlDialog(this);
    32373289    m_pool[UIActionIndexRT_M_Machine_T_Pause] = new UIActionToggleRuntimePause(this);
    32383290    m_pool[UIActionIndexRT_M_Machine_S_Reset] = new UIActionSimpleRuntimePerformReset(this);
    … …  
    35373589    fSeparator = addAction(pMenu, action(UIActionIndexRT_M_Machine_S_ShowInformation)) || fSeparator;
    35383590#ifdef VBOX_GUI_WITH_GUEST_CONTROL_UI
    3539     fSeparator = addAction(pMenu, action(UIActionIndexRT_M_Machine_S_ShowGuestControl)) || fSeparator;
     3591    fSeparator = addAction(pMenu, action(UIActionIndexRT_M_Machine_S_ShowGuestControlFileManager)) || fSeparator;
     3592    fSeparator = addAction(pMenu, action(UIActionIndexRT_M_Machine_S_ShowGuestProcessControl)) || fSeparator;
    35403593#endif
    35413594    /* Separator: */

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

    r75062 r75087  
    4646    UIActionIndexRT_M_Machine_S_TakeSnapshot,
    4747    UIActionIndexRT_M_Machine_S_ShowInformation,
    48     UIActionIndexRT_M_Machine_S_ShowGuestControl,
     48    UIActionIndexRT_M_Machine_S_ShowGuestControlFileManager,
     49    UIActionIndexRT_M_Machine_S_ShowGuestProcessControl,
    4950    UIActionIndexRT_M_Machine_T_Pause,
    5051    UIActionIndexRT_M_Machine_S_Reset,

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

    r75062 r75087  
    6666# include "UIAddDiskEncryptionPasswordDialog.h"
    6767# include "UIVMInformationDialog.h"
    68 # include "UIGuestControlDialog.h"
     68# include "UIGuestControlFileManagerDialog.h"
     69# include "UIGuestProcessControlDialog.h"
    6970
    7071
    … …  
    11121113    connect(actionPool()->action(UIActionIndexRT_M_Machine_S_ShowInformation), SIGNAL(triggered()),
    11131114            this, SLOT(sltShowInformationDialog()));
    1114     connect(actionPool()->action(UIActionIndexRT_M_Machine_S_ShowGuestControl), SIGNAL(triggered()),
    1115             this, SLOT(sltShowGuestControlDialog()));
     1115    connect(actionPool()->action(UIActionIndexRT_M_Machine_S_ShowGuestControlFileManager), SIGNAL(triggered()),
     1116            this, SLOT(sltShowGuestControlFileManagerDialog()));
     1117    connect(actionPool()->action(UIActionIndexRT_M_Machine_S_ShowGuestProcessControl), SIGNAL(triggered()),
     1118            this, SLOT(sltShowGuestProcessControlDialog()));
    11161119    connect(actionPool()->action(UIActionIndexRT_M_Machine_T_Pause), SIGNAL(toggled(bool)),
    11171120            this, SLOT(sltPause(bool)));
    … …  
    17831786}
    17841787
    1785 void UIMachineLogic::sltShowGuestControlDialog()
     1788void UIMachineLogic::sltShowGuestControlFileManagerDialog()
    17861789{
    17871790    if (machine().isNull() || !activeMachineWindow())
    … …  
    17931796
    17941797    QIManagerDialog *pGuestControlDialog;
    1795     UIGuestControlDialogFactory dialogFactory(actionPool(), console().GetGuest(), machine().GetName());
     1798    UIGuestControlFileManagerDialogFactory dialogFactory(actionPool(), console().GetGuest(), machine().GetName());
    17961799    dialogFactory.prepare(pGuestControlDialog, activeMachineWindow());
    17971800    if (pGuestControlDialog)
    … …  
    18041807        pGuestControlDialog->activateWindow();
    18051808        connect(pGuestControlDialog, &QIManagerDialog::sigClose,
    1806                 this, &UIMachineLogic::sltCloseGuestControlWindow);
    1807     }
    1808 }
    1809 
    1810 void UIMachineLogic::sltCloseGuestControlWindow()
     1809                this, &UIMachineLogic::sltCloseGuestControlFileManagerDialog);
     1810    }
     1811}
     1812
     1813void UIMachineLogic::sltCloseGuestControlFileManagerDialog()
    18111814{
    18121815    QIManagerDialog* pDialog = qobject_cast<QIManagerDialog*>(sender());
    … …  
    18171820    m_pGuestControlDialog = 0;
    18181821    pDialog->close();
    1819     UIGuestControlDialogFactory().cleanup(pDialog);
     1822    UIGuestControlFileManagerDialogFactory().cleanup(pDialog);
     1823}
     1824
     1825void UIMachineLogic::sltShowGuestProcessControlDialog()
     1826{
     1827    if (machine().isNull() || !activeMachineWindow())
     1828        return;
     1829
     1830    /* Create a logviewer only if we don't have one already */
     1831    if (m_pGuestControlDialog)
     1832        return;
     1833
     1834    QIManagerDialog *pGuestControlDialog;
     1835    UIGuestProcessControlDialogFactory dialogFactory(actionPool(), console().GetGuest(), machine().GetName());
     1836    dialogFactory.prepare(pGuestControlDialog, activeMachineWindow());
     1837    if (pGuestControlDialog)
     1838    {
     1839        m_pGuestControlDialog = pGuestControlDialog;
     1840
     1841        /* Show instance: */
     1842        pGuestControlDialog->show();
     1843        pGuestControlDialog->setWindowState(pGuestControlDialog->windowState() & ~Qt::WindowMinimized);
     1844        pGuestControlDialog->activateWindow();
     1845        connect(pGuestControlDialog, &QIManagerDialog::sigClose,
     1846                this, &UIMachineLogic::sltCloseGuestProcessControlDialog);
     1847    }
     1848}
     1849
     1850void UIMachineLogic::sltCloseGuestProcessControlDialog()
     1851{
     1852    QIManagerDialog* pDialog = qobject_cast<QIManagerDialog*>(sender());
     1853    if (m_pGuestControlDialog != pDialog || !pDialog)
     1854        return;
     1855
     1856    /* Set the m_pLogViewerDialog to NULL before closing the dialog. or we will have redundant deletes*/
     1857    m_pGuestControlDialog = 0;
     1858    pDialog->close();
     1859    UIGuestProcessControlDialogFactory().cleanup(pDialog);
    18201860}
    18211861

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

    r75062 r75087  
    274274    void sltTakeSnapshot();
    275275    void sltShowInformationDialog();
    276     void sltShowGuestControlDialog();
    277     void sltCloseGuestControlWindow();
     276    void sltShowGuestControlFileManagerDialog();
     277    void sltCloseGuestControlFileManagerDialog();
     278    void sltShowGuestProcessControlDialog();
     279    void sltCloseGuestProcessControlDialog();
    278280    void sltReset();
    279281    void sltPause(bool fOn);

  • trunk/src/VBox/Frontends/VirtualBox/src/runtime/guestctrl/UIGuestControlFileManager.cpp

    r75057 r75087  
    3636# include "QITreeWidget.h"
    3737# include "QIWithRetranslateUI.h"
     38# include "UIActionPool.h"
    3839# include "UIErrorString.h"
    3940# include "UIExtraDataManager.h"
    … …  
    228229    if (m_pUserNameEdit)
    229230    {
    230         m_pUserNameEdit->setToolTip(QApplication::translate("UIGuestControlWidget", "User name to authenticate session creation"));
    231         m_pUserNameEdit->setPlaceholderText(QApplication::translate("UIGuestControlWidget", "User Name"));
     231        m_pUserNameEdit->setToolTip(QApplication::translate("UIGuestProcessControlWidget", "User name to authenticate session creation"));
     232        m_pUserNameEdit->setPlaceholderText(QApplication::translate("UIGuestProcessControlWidget", "User Name"));
    232233
    233234    }
    234235    if (m_pPasswordEdit)
    235236    {
    236         m_pPasswordEdit->setToolTip(QApplication::translate("UIGuestControlWidget", "Password to authenticate session creation"));
    237         m_pPasswordEdit->setPlaceholderText(QApplication::translate("UIGuestControlWidget", "Password"));
     237        m_pPasswordEdit->setToolTip(QApplication::translate("UIGuestProcessControlWidget", "Password to authenticate session creation"));
     238        m_pPasswordEdit->setPlaceholderText(QApplication::translate("UIGuestProcessControlWidget", "Password"));
    238239    }
    239240
    240241    if (m_pCreateButton)
    241         m_pCreateButton->setText(QApplication::translate("UIGuestControlWidget", "Create Session"));
     242        m_pCreateButton->setText(QApplication::translate("UIGuestProcessControlWidget", "Create Session"));
    242243    if (m_pCloseButton)
    243         m_pCloseButton->setText(QApplication::translate("UIGuestControlWidget", "Close Session"));
     244        m_pCloseButton->setText(QApplication::translate("UIGuestProcessControlWidget", "Close Session"));
    244245}
    245246
    … …  
    285286*********************************************************************************************************************************/
    286287
    287 UIGuestControlFileManager::UIGuestControlFileManager(QWidget *pParent, const CGuest &comGuest)
     288UIGuestControlFileManager::UIGuestControlFileManager(EmbedTo enmEmbedding, UIActionPool *pActionPool,
     289                                                     const CGuest &comGuest, QWidget *pParent)
    288290    : QIWithRetranslateUI<QWidget>(pParent)
    289291    , m_iMaxRecursionDepth(1)
    … …  
    302304    , m_pGuestFileTable(0)
    303305    , m_pHostFileTable(0)
     306    , m_enmEmbedding(enmEmbedding)
     307    , m_pActionPool(pActionPool)
    304308{
    305309    prepareGuestListener();
    … …  
    325329    if (m_pCopyGuestToHost)
    326330    {
    327         m_pCopyGuestToHost->setText(QApplication::translate("UIGuestControlWidget", "Copy the selected object(s) from guest to host"));
    328         m_pCopyGuestToHost->setToolTip(QApplication::translate("UIGuestControlWidget", "Copy the selected object(s) from guest to host"));
    329         m_pCopyGuestToHost->setStatusTip(QApplication::translate("UIGuestControlWidget", "Copy the selected object(s) from guest to host"));
     331        m_pCopyGuestToHost->setText(QApplication::translate("UIGuestProcessControlWidget", "Copy the selected object(s) from guest to host"));
     332        m_pCopyGuestToHost->setToolTip(QApplication::translate("UIGuestProcessControlWidget", "Copy the selected object(s) from guest to host"));
     333        m_pCopyGuestToHost->setStatusTip(QApplication::translate("UIGuestProcessControlWidget", "Copy the selected object(s) from guest to host"));
    330334    }
    331335
    332336    if (m_pCopyHostToGuest)
    333337    {
    334         m_pCopyHostToGuest->setText(QApplication::translate("UIGuestControlWidget", "Copy the selected object(s) from host to guest"));
    335         m_pCopyHostToGuest->setToolTip(QApplication::translate("UIGuestControlWidget", "Copy the selected object(s) from host to guest"));
    336         m_pCopyHostToGuest->setStatusTip(QApplication::translate("UIGuestControlWidget", "Copy the selected object(s) from host to guest"));
    337     }
    338 
    339 
    340     m_pTabWidget->setTabText(0, QApplication::translate("UIGuestControlWidget", "Log"));
    341     m_pTabWidget->setTabText(1, QApplication::translate("UIGuestControlWidget", "File Operations"));
    342     m_pTabWidget->setTabText(2, QApplication::translate("UIGuestControlWidget", "Terminal"));
     338        m_pCopyHostToGuest->setText(QApplication::translate("UIGuestProcessControlWidget", "Copy the selected object(s) from host to guest"));
     339        m_pCopyHostToGuest->setToolTip(QApplication::translate("UIGuestProcessControlWidget", "Copy the selected object(s) from host to guest"));
     340        m_pCopyHostToGuest->setStatusTip(QApplication::translate("UIGuestProcessControlWidget", "Copy the selected object(s) from host to guest"));
     341    }
     342
     343
     344    m_pTabWidget->setTabText(0, QApplication::translate("UIGuestProcessControlWidget", "Log"));
     345    m_pTabWidget->setTabText(1, QApplication::translate("UIGuestProcessControlWidget", "File Operations"));
     346    m_pTabWidget->setTabText(2, QApplication::translate("UIGuestProcessControlWidget", "Terminal"));
    343347
    344348}

  • trunk/src/VBox/Frontends/VirtualBox/src/runtime/guestctrl/UIGuestControlFileManager.h

    r75000 r75087  
    3030
    3131/* GUI includes: */
     32#include "QIManagerDialog.h"
    3233#include "QIWithRetranslateUI.h"
    3334#include "UIMainEventListener.h"
    … …  
    4041class QITabWidget;
    4142class CGuestSessionStateChangedEvent;
     43class UIActionPool;
    4244class UIFileOperationsList;
    4345class UIGuestControlConsole;
    … …  
    7375public:
    7476
    75     UIGuestControlFileManager(QWidget *pParent, const CGuest &comGuest);
     77    UIGuestControlFileManager(EmbedTo enmEmbedding, UIActionPool *pActionPool,
     78                              const CGuest &comGuest, QWidget *pParent);
    7679    ~UIGuestControlFileManager();
    7780    //const UIGuestControlFileManagerSettings& settings() const;
    … …  
    143146    CEventListener m_comSessionListener;
    144147    CEventListener m_comGuestListener;
     148    const EmbedTo  m_enmEmbedding;
     149    UIActionPool  *m_pActionPool;
     150
    145151    //UIGuestControlFileManagerSettings m_settings;
    146152};

  • trunk/src/VBox/Frontends/VirtualBox/src/runtime/guestctrl/UIGuestControlFileManagerDialog.cpp

    r75086 r75087  
    11/* $Id$ */
    22/** @file
    3  * VBox Qt GUI - UIGuestControlDialog class implementation.
     3 * VBox Qt GUI - UIGuestControlFileManagerDialog class implementation.
    44 */
    55
    … …  
    2828# include "UIExtraDataManager.h"
    2929# include "UIIconPool.h"
    30 # include "UIGuestControlDialog.h"
    31 # include "UIGuestControlWidget.h"
     30# include "UIGuestControlFileManager.h"
     31# include "UIGuestControlFileManagerDialog.h"
    3232# include "VBoxGlobal.h"
    3333# ifdef VBOX_WS_MAC
    … …  
    3939
    4040/*********************************************************************************************************************************
    41 *   Class UIGuestControlDialogFactory implementation.                                                                            *
     41*   Class UIGuestControlFileManagerDialogFactory implementation.                                                                 *
    4242*********************************************************************************************************************************/
    4343
    44 UIGuestControlDialogFactory::UIGuestControlDialogFactory(UIActionPool *pActionPool /* = 0 */,
     44UIGuestControlFileManagerDialogFactory::UIGuestControlFileManagerDialogFactory(UIActionPool *pActionPool /* = 0 */,
    4545                                                         const CGuest &comGuest /* = CGuest() */,
    4646                                                         const QString &strMachineName /* = QString() */)
    … …  
    5151}
    5252
    53 void UIGuestControlDialogFactory::create(QIManagerDialog *&pDialog, QWidget *pCenterWidget)
     53void UIGuestControlFileManagerDialogFactory::create(QIManagerDialog *&pDialog, QWidget *pCenterWidget)
    5454{
    55     pDialog = new UIGuestControlDialog(pCenterWidget, m_pActionPool, m_comGuest, m_strMachineName);
     55    pDialog = new UIGuestControlFileManagerDialog(pCenterWidget, m_pActionPool, m_comGuest, m_strMachineName);
    5656}
    5757
    5858
    5959/*********************************************************************************************************************************
    60 *   Class UIGuestControlDialog implementation.                                                                                   *
     60*   Class UIGuestControlFileManagerDialog implementation.                                                                        *
    6161*********************************************************************************************************************************/
    6262
    63 UIGuestControlDialog::UIGuestControlDialog(QWidget *pCenterWidget,
     63UIGuestControlFileManagerDialog::UIGuestControlFileManagerDialog(QWidget *pCenterWidget,
    6464                                           UIActionPool *pActionPool,
    6565                                           const CGuest &comGuest,
    … …  
    7272}
    7373
    74 void UIGuestControlDialog::retranslateUi()
     74void UIGuestControlFileManagerDialog::retranslateUi()
    7575{
    7676    /* Translate window title: */
    7777    setWindowTitle(tr("%1 - Guest Control").arg(m_strMachineName));
    7878    /* Translate buttons: */
    79     button(ButtonType_Close)->setText(UIGuestControlWidget::tr("Close"));
     79    button(ButtonType_Close)->setText(UIGuestControlFileManager::tr("Close"));
    8080}
    8181
    82 void UIGuestControlDialog::configure()
     82void UIGuestControlFileManagerDialog::configure()
    8383{
    8484    /* Apply window icons: */
    85     setWindowIcon(UIIconPool::iconSetFull(":/vm_show_logs_32px.png", ":/vm_show_logs_16px.png"));
     85    //setWindowIcon(UIIconPool::iconSetFull(":/vm_show_logs_32px.png", ":/vm_show_logs_16px.png"));
    8686}
    8787
    88 void UIGuestControlDialog::configureCentralWidget()
     88void UIGuestControlFileManagerDialog::configureCentralWidget()
    8989{
    9090    /* Create widget: */
    91     UIGuestControlWidget *pWidget = new UIGuestControlWidget(EmbedTo_Dialog, m_pActionPool, m_comGuest, true /* show toolbar */,  this);
     91    UIGuestControlFileManager *pWidget = new UIGuestControlFileManager(EmbedTo_Dialog, m_pActionPool,
     92                                                                       m_comGuest, this);
    9293
    9394    if (pWidget)
    … …  
    107108}
    108109
    109 void UIGuestControlDialog::finalize()
     110void UIGuestControlFileManagerDialog::finalize()
    110111{
    111112    /* Apply language settings: */
    … …  
    113114}
    114115
    115 void UIGuestControlDialog::loadSettings()
     116void UIGuestControlFileManagerDialog::loadSettings()
    116117{
    117118    const QRect desktopRect = gpDesktop->availableGeometry(this);
    … …  
    124125
    125126    /* Load geometry from extradata: */
    126     QRect geometry = gEDataManager->guestControlDialogGeometry(this, defaultGeometry);
     127    QRect geometry = gEDataManager->guestControlFileManagerDialogGeometry(this, defaultGeometry);
    127128
    128129    /* Restore geometry: */
    129     LogRel2(("GUI: UIGuestControlDialog: Restoring geometry to: Origin=%dx%d, Size=%dx%d\n",
     130    LogRel2(("GUI: UIGuestControlFileManagerDialog: Restoring geometry to: Origin=%dx%d, Size=%dx%d\n",
    130131             geometry.x(), geometry.y(), geometry.width(), geometry.height()));
    131132    setDialogGeometry(geometry);
    132133}
    133134
    134 void UIGuestControlDialog::saveSettings() const
     135void UIGuestControlFileManagerDialog::saveSettings() const
    135136{
    136137    /* Save window geometry to extradata: */
    … …  
    139140    /* darwinIsWindowMaximized expects a non-const QWidget*. thus const_cast: */
    140141    QWidget *pw = const_cast<QWidget*>(qobject_cast<const QWidget*>(this));
    141     gEDataManager->setGuestControlDialogGeometry(saveGeometry, ::darwinIsWindowMaximized(pw));
     142    gEDataManager->setGuestControlDialogFileManagerDialogGeometry(saveGeometry, ::darwinIsWindowMaximized(pw));
    142143#else /* !VBOX_WS_MAC */
    143     gEDataManager->setGuestControlDialogGeometry(saveGeometry, isMaximized());
     144    gEDataManager->setGuestControlFileManagerDialogGeometry(saveGeometry, isMaximized());
    144145#endif /* !VBOX_WS_MAC */
    145     LogRel2(("GUI: Guest Control Dialog: Geometry saved as: Origin=%dx%d, Size=%dx%d\n",
     146    LogRel2(("GUI: Guest Control File Manager Dialog: Geometry saved as: Origin=%dx%d, Size=%dx%d\n",
    146147             saveGeometry.x(), saveGeometry.y(), saveGeometry.width(), saveGeometry.height()));
    147148}
    148149
    149 bool UIGuestControlDialog::shouldBeMaximized() const
     150bool UIGuestControlFileManagerDialog::shouldBeMaximized() const
    150151{
    151     return gEDataManager->guestControlDialogShouldBeMaximized();
     152    return gEDataManager->guestControlFileManagerDialogShouldBeMaximized();
    152153}
    153154
    154 void UIGuestControlDialog::sltSetCloseButtonShortCut(QKeySequence shortcut)
     155void UIGuestControlFileManagerDialog::sltSetCloseButtonShortCut(QKeySequence shortcut)
    155156{
    156157    if (button(ButtonType_Close))

  • trunk/src/VBox/Frontends/VirtualBox/src/runtime/guestctrl/UIGuestControlFileManagerDialog.h

    r75086 r75087  
    11/* $Id$ */
    22/** @file
    3  * VBox Qt GUI - UIGuestControlDialog class declaration.
     3 * VBox Qt GUI - UIGuestControlFileManagerDialog class declaration.
    44 */
    55
    … …  
    1616 */
    1717
    18 #ifndef ___UIGuestControlDialog_h___
    19 #define ___UIGuestControlDialog_h___
     18#ifndef ___UIGuestControlFileManagerDialog_h___
     19#define ___UIGuestControlFileManagerDialog_h___
    2020
    2121/* Qt includes: */
    … …  
    3434class QVBoxLayout;
    3535class UIActionPool;
    36 class UIGuestControlDialog;
     36class UIGuestControlFileManagerDialog;
    3737class CGuest;
    3838
    3939
    4040/** QIManagerDialogFactory extension used as a factory for the Guest Control dialog. */
    41 class UIGuestControlDialogFactory : public QIManagerDialogFactory
     41class UIGuestControlFileManagerDialogFactory : public QIManagerDialogFactory
    4242{
    4343public:
    4444
    45     UIGuestControlDialogFactory(UIActionPool *pActionPool = 0, const CGuest &comGuest = CGuest(), const QString &strMachineName = QString());
     45    UIGuestControlFileManagerDialogFactory(UIActionPool *pActionPool = 0, const CGuest &comGuest = CGuest(), const QString &strMachineName = QString());
    4646
    4747protected:
    … …  
    5858
    5959/** QIManagerDialog extension providing GUI with the dialog displaying guest control releated logs. */
    60 class UIGuestControlDialog : public QIWithRetranslateUI<QIManagerDialog>
     60class UIGuestControlFileManagerDialog : public QIWithRetranslateUI<QIManagerDialog>
    6161{
    6262    Q_OBJECT;
    … …  
    6868      * @param  pActionPool    Passes the action-pool reference.
    6969      * @param  comGuest       Passes the com-guest reference. */
    70     UIGuestControlDialog(QWidget *pCenterWidget, UIActionPool *pActionPool, const CGuest &comGuest, const QString &strMachineName = QString());
     70    UIGuestControlFileManagerDialog(QWidget *pCenterWidget, UIActionPool *pActionPool, const CGuest &comGuest, const QString &strMachineName = QString());
    7171
    7272protected:
    … …  
    111111
    112112
    113 #endif /* !___UIGuestControlDialog_h___ */
     113#endif /* !___UIGuestControlFileManagerDialog_h___ */

  • trunk/src/VBox/Frontends/VirtualBox/src/runtime/guestctrl/UIGuestControlFileTable.cpp

    r75057 r75087  
    329329    if (!menu)
    330330        return;
    331     /* I know this is ugly: */
    332     bool isGuestFileTable = qobject_cast<UIGuestFileTable*>(parent());
    333     //setText(QApplication::translate("UIGuestControlWidget", "Host System"));
    334     QAction *pActionGoUp = menu->addAction(QApplication::translate("UIGuestControlWidget","Go up"));
     331
     332    QAction *pActionGoUp = menu->addAction(QApplication::translate("UIGuestControlFileManager","Go up"));
    335333    if (pActionGoUp)
    336334    {
    … …  
    338336        connect(pActionGoUp, &QAction::triggered, this, &UIGuestControlFileView::sigGoUp);
    339337    }
    340     QAction *pActionGoHome = menu->addAction(QApplication::translate("UIGuestControlWidget", "Go home"));
     338    QAction *pActionGoHome = menu->addAction(QApplication::translate("UIGuestControlFileManager", "Go home"));
    341339    if (pActionGoHome)
    342340    {
    … …  
    345343    }
    346344
    347     QAction *pActionRefresh = menu->addAction(QApplication::translate("UIGuestControlWidget", "Refresh"));
     345    QAction *pActionRefresh = menu->addAction(QApplication::translate("UIGuestControlFileManager", "Refresh"));
    348346    if (pActionRefresh)
    349347    {
    … …  
    353351
    354352    menu->addSeparator();
    355     QAction *pActionDelete = menu->addAction(QApplication::translate("UIGuestControlWidget", "Delete"));
     353    QAction *pActionDelete = menu->addAction(QApplication::translate("UIGuestControlFileManager", "Delete"));
    356354    if (pActionDelete)
    357355    {
    … …  
    361359    }
    362360
    363     QAction *pActionRename = menu->addAction(QApplication::translate("UIGuestControlWidget", "Rename"));
     361    QAction *pActionRename = menu->addAction(QApplication::translate("UIGuestControlFileManager", "Rename"));
    364362    if (pActionRename)
    365363    {
    … …  
    370368    }
    371369
    372     QAction *pActionCreateNewDirectory = menu->addAction(QApplication::translate("UIGuestControlWidget", "Create New Directory"));
     370    QAction *pActionCreateNewDirectory = menu->addAction(QApplication::translate("UIGuestControlFileManager", "Create New Directory"));
    373371    if (pActionCreateNewDirectory)
    374372    {
    … …  
    381379    QAction *pActionPaste = 0;
    382380
     381    bool isGuestFileTable = qobject_cast<UIGuestFileTable*>(parent());
     382
    383383    if (isGuestFileTable)
    384384    {
    385         pActionCopy = menu->addAction(QApplication::translate("UIGuestControlWidget", "Copy"));
     385        pActionCopy = menu->addAction(QApplication::translate("UIGuestControlFileManager", "Copy"));
    386386        if (pActionCopy)
    387387        {
    … …  
    391391        }
    392392
    393         pActionCut = menu->addAction(QApplication::translate("UIGuestControlWidget", "Cut"));
     393        pActionCut = menu->addAction(QApplication::translate("UIGuestControlFileManager", "Cut"));
    394394        if (pActionCut)
    395395        {
    … …  
    399399        }
    400400
    401         pActionPaste = menu->addAction(QApplication::translate("UIGuestControlWidget", "Paste"));
     401        pActionPaste = menu->addAction(QApplication::translate("UIGuestControlFileManager", "Paste"));
    402402        if (pActionPaste)
    403403        {
    … …  
    408408
    409409    menu->addSeparator();
    410     QAction *pActionShowProperties = menu->addAction(QApplication::translate("UIGuestControlWidget", "Properties"));
     410    QAction *pActionShowProperties = menu->addAction(QApplication::translate("UIGuestControlFileManager", "Properties"));
    411411    if (pActionShowProperties)
    412412    {
    … …  
    14351435    if (m_pGoUp)
    14361436    {
    1437         m_pGoUp->setText(QApplication::translate("UIGuestControlWidget", "Move one level up"));
    1438         m_pGoUp->setToolTip(QApplication::translate("UIGuestControlWidget", "Move one level up"));
    1439         m_pGoUp->setStatusTip(QApplication::translate("UIGuestControlWidget", "Move one level up"));
     1437        m_pGoUp->setText(QApplication::translate("UIGuestControlFileManager", "Move one level up"));
     1438        m_pGoUp->setToolTip(QApplication::translate("UIGuestControlFileManager", "Move one level up"));
     1439        m_pGoUp->setStatusTip(QApplication::translate("UIGuestControlFileManager", "Move one level up"));
    14401440    }
    14411441
    14421442    if (m_pGoHome)
    14431443    {
    1444         m_pGoHome->setText(QApplication::translate("UIGuestControlWidget", "Go to home directory"));
    1445         m_pGoHome->setToolTip(QApplication::translate("UIGuestControlWidget", "Go to home directory"));
    1446         m_pGoHome->setStatusTip(QApplication::translate("UIGuestControlWidget", "Go to home directory"));
     1444        m_pGoHome->setText(QApplication::translate("UIGuestControlFileManager", "Go to home directory"));
     1445        m_pGoHome->setToolTip(QApplication::translate("UIGuestControlFileManager", "Go to home directory"));
     1446        m_pGoHome->setStatusTip(QApplication::translate("UIGuestControlFileManager", "Go to home directory"));
    14471447    }
    14481448
    14491449    if (m_pRename)
    14501450    {
    1451         m_pRename->setText(QApplication::translate("UIGuestControlWidget", "Rename the selected item"));
    1452         m_pRename->setToolTip(QApplication::translate("UIGuestControlWidget", "Rename the selected item"));
    1453         m_pRename->setStatusTip(QApplication::translate("UIGuestControlWidget", "Rename the selected item"));
     1451        m_pRename->setText(QApplication::translate("UIGuestControlFileManager", "Rename the selected item"));
     1452        m_pRename->setToolTip(QApplication::translate("UIGuestControlFileManager", "Rename the selected item"));
     1453        m_pRename->setStatusTip(QApplication::translate("UIGuestControlFileManager", "Rename the selected item"));
    14541454    }
    14551455
    14561456    if (m_pRefresh)
    14571457    {
    1458         m_pRefresh->setText(QApplication::translate("UIGuestControlWidget", "Refresh"));
    1459         m_pRefresh->setToolTip(QApplication::translate("UIGuestControlWidget", "Refresh the current directory"));
    1460         m_pRefresh->setStatusTip(QApplication::translate("UIGuestControlWidget", "Refresh the current directory"));
     1458        m_pRefresh->setText(QApplication::translate("UIGuestControlFileManager", "Refresh"));
     1459        m_pRefresh->setToolTip(QApplication::translate("UIGuestControlFileManager", "Refresh the current directory"));
     1460        m_pRefresh->setStatusTip(QApplication::translate("UIGuestControlFileManager", "Refresh the current directory"));
    14611461    }
    14621462    if (m_pDelete)
    14631463    {
    1464         m_pDelete->setText(QApplication::translate("UIGuestControlWidget", "Delete"));
    1465         m_pDelete->setToolTip(QApplication::translate("UIGuestControlWidget", "Delete the selected item(s)"));
    1466         m_pDelete->setStatusTip(QApplication::translate("UIGuestControlWidget", "Delete the selected item(s)"));
     1464        m_pDelete->setText(QApplication::translate("UIGuestControlFileManager", "Delete"));
     1465        m_pDelete->setToolTip(QApplication::translate("UIGuestControlFileManager", "Delete the selected item(s)"));
     1466        m_pDelete->setStatusTip(QApplication::translate("UIGuestControlFileManager", "Delete the selected item(s)"));
    14671467    }
    14681468
    14691469    if (m_pCreateNewDirectory)
    14701470    {
    1471         m_pCreateNewDirectory->setText(QApplication::translate("UIGuestControlWidget", "Create new directory"));
    1472         m_pCreateNewDirectory->setToolTip(QApplication::translate("UIGuestControlWidget", "Create new directory"));
    1473         m_pCreateNewDirectory->setStatusTip(QApplication::translate("UIGuestControlWidget", "Create new directory"));
     1471        m_pCreateNewDirectory->setText(QApplication::translate("UIGuestControlFileManager", "Create new directory"));
     1472        m_pCreateNewDirectory->setToolTip(QApplication::translate("UIGuestControlFileManager", "Create new directory"));
     1473        m_pCreateNewDirectory->setStatusTip(QApplication::translate("UIGuestControlFileManager", "Create new directory"));
    14741474    }
    14751475
    14761476    if (m_pCopy)
    14771477    {
    1478         m_pCopy->setText(QApplication::translate("UIGuestControlWidget", "Copy the selected item"));
    1479         m_pCopy->setToolTip(QApplication::translate("UIGuestControlWidget", "Copy the selected item(s)"));
    1480         m_pCopy->setStatusTip(QApplication::translate("UIGuestControlWidget", "Copy the selected item(s)"));
     1478        m_pCopy->setText(QApplication::translate("UIGuestControlFileManager", "Copy the selected item"));
     1479        m_pCopy->setToolTip(QApplication::translate("UIGuestControlFileManager", "Copy the selected item(s)"));
     1480        m_pCopy->setStatusTip(QApplication::translate("UIGuestControlFileManager", "Copy the selected item(s)"));
    14811481
    14821482    }
    … …  
    14841484    if (m_pCut)
    14851485    {
    1486         m_pCut->setText(QApplication::translate("UIGuestControlWidget", "Cut the selected item(s)"));
    1487         m_pCut->setToolTip(QApplication::translate("UIGuestControlWidget", "Cut the selected item(s)"));
    1488         m_pCut->setStatusTip(QApplication::translate("UIGuestControlWidget", "Cut the selected item(s)"));
     1486        m_pCut->setText(QApplication::translate("UIGuestControlFileManager", "Cut the selected item(s)"));
     1487        m_pCut->setToolTip(QApplication::translate("UIGuestControlFileManager", "Cut the selected item(s)"));
     1488        m_pCut->setStatusTip(QApplication::translate("UIGuestControlFileManager", "Cut the selected item(s)"));
    14891489
    14901490    }
    … …  
    14921492    if ( m_pPaste)
    14931493    {
    1494         m_pPaste->setText(QApplication::translate("UIGuestControlWidget", "Paste the copied item(s)"));
    1495         m_pPaste->setToolTip(QApplication::translate("UIGuestControlWidget", "Paste the copied item(s)"));
    1496         m_pPaste->setStatusTip(QApplication::translate("UIGuestControlWidget", "Paste the copied item(s)"));
     1494        m_pPaste->setText(QApplication::translate("UIGuestControlFileManager", "Paste the copied item(s)"));
     1495        m_pPaste->setToolTip(QApplication::translate("UIGuestControlFileManager", "Paste the copied item(s)"));
     1496        m_pPaste->setStatusTip(QApplication::translate("UIGuestControlFileManager", "Paste the copied item(s)"));
    14971497    }
    14981498
    14991499    if (m_pShowProperties)
    15001500    {
    1501         m_pShowProperties->setText(QApplication::translate("UIGuestControlWidget", "Show the properties of the selected item(s)"));
    1502         m_pShowProperties->setToolTip(QApplication::translate("UIGuestControlWidget", "Show the properties of the selected item(s)"));
    1503         m_pShowProperties->setStatusTip(QApplication::translate("UIGuestControlWidget", "Show the properties of the selected item(s)"));
     1501        m_pShowProperties->setText(QApplication::translate("UIGuestControlFileManager", "Show the properties of the selected item(s)"));
     1502        m_pShowProperties->setToolTip(QApplication::translate("UIGuestControlFileManager", "Show the properties of the selected item(s)"));
     1503        m_pShowProperties->setStatusTip(QApplication::translate("UIGuestControlFileManager", "Show the properties of the selected item(s)"));
    15041504    }
    15051505
    15061506    if (m_pSelectAll)
    15071507    {
    1508         m_pSelectAll->setText(QApplication::translate("UIGuestControlWidget", "Select All"));
    1509         m_pSelectAll->setToolTip(QApplication::translate("UIGuestControlWidget", "Select All"));
    1510         m_pSelectAll->setStatusTip(QApplication::translate("UIGuestControlWidget", "Select All"));
     1508        m_pSelectAll->setText(QApplication::translate("UIGuestControlFileManager", "Select All"));
     1509        m_pSelectAll->setToolTip(QApplication::translate("UIGuestControlFileManager", "Select All"));
     1510        m_pSelectAll->setStatusTip(QApplication::translate("UIGuestControlFileManager", "Select All"));
    15111511    }
    15121512
    15131513    if (m_pInvertSelection)
    15141514    {
    1515         m_pInvertSelection->setText(QApplication::translate("UIGuestControlWidget", "Invert Selection"));
    1516         m_pInvertSelection->setToolTip(QApplication::translate("UIGuestControlWidget", "Invert Selection"));
    1517         m_pInvertSelection->setStatusTip(QApplication::translate("UIGuestControlWidget", "Invert Selection"));
     1515        m_pInvertSelection->setText(QApplication::translate("UIGuestControlFileManager", "Invert Selection"));
     1516        m_pInvertSelection->setToolTip(QApplication::translate("UIGuestControlFileManager", "Invert Selection"));
     1517        m_pInvertSelection->setStatusTip(QApplication::translate("UIGuestControlFileManager", "Invert Selection"));
    15181518    }
    15191519}

  • trunk/src/VBox/Frontends/VirtualBox/src/runtime/guestctrl/UIGuestFileTable.cpp

    r75057 r75087  
    162162{
    163163    if (m_pLocationLabel)
    164         m_pLocationLabel->setText(QApplication::translate("UIGuestControlWidget", "Guest System"));
     164        m_pLocationLabel->setText(QApplication::translate("UIGuestControlFileManager", "Guest System"));
    165165    UIGuestControlFileTable::retranslateUi();
    166166}

  • trunk/src/VBox/Frontends/VirtualBox/src/runtime/guestctrl/UIGuestProcessControlDialog.cpp

    r75078 r75087  
    11/* $Id$ */
    22/** @file
    3  * VBox Qt GUI - UIGuestControlDialog class implementation.
     3 * VBox Qt GUI - UIGuestProcessControlDialog class implementation.
    44 */
    55
    … …  
    2828# include "UIExtraDataManager.h"
    2929# include "UIIconPool.h"
    30 # include "UIGuestControlDialog.h"
    31 # include "UIGuestControlWidget.h"
     30# include "UIGuestProcessControlDialog.h"
     31# include "UIGuestProcessControlWidget.h"
    3232# include "VBoxGlobal.h"
    3333# ifdef VBOX_WS_MAC
    … …  
    3939
    4040/*********************************************************************************************************************************
    41 *   Class UIGuestControlDialogFactory implementation.                                                                            *
     41*   Class UIGuestProcessControlDialogFactory implementation.                                                                     *
    4242*********************************************************************************************************************************/
    4343
    44 UIGuestControlDialogFactory::UIGuestControlDialogFactory(UIActionPool *pActionPool /* = 0 */,
     44UIGuestProcessControlDialogFactory::UIGuestProcessControlDialogFactory(UIActionPool *pActionPool /* = 0 */,
    4545                                                         const CGuest &comGuest /* = CGuest() */,
    4646                                                         const QString &strMachineName /* = QString() */)
    … …  
    5151}
    5252
    53 void UIGuestControlDialogFactory::create(QIManagerDialog *&pDialog, QWidget *pCenterWidget)
     53void UIGuestProcessControlDialogFactory::create(QIManagerDialog *&pDialog, QWidget *pCenterWidget)
    5454{
    55     pDialog = new UIGuestControlDialog(pCenterWidget, m_pActionPool, m_comGuest, m_strMachineName);
     55    pDialog = new UIGuestProcessControlDialog(pCenterWidget, m_pActionPool, m_comGuest, m_strMachineName);
    5656}
    5757
    5858
    5959/*********************************************************************************************************************************
    60 *   Class UIGuestControlDialog implementation.                                                                                   *
     60*   Class UIGuestProcessControlDialog implementation.                                                                            *
    6161*********************************************************************************************************************************/
    6262
    63 UIGuestControlDialog::UIGuestControlDialog(QWidget *pCenterWidget,
     63UIGuestProcessControlDialog::UIGuestProcessControlDialog(QWidget *pCenterWidget,
    6464                                           UIActionPool *pActionPool,
    6565                                           const CGuest &comGuest,
    … …  
    7272}
    7373
    74 void UIGuestControlDialog::retranslateUi()
     74void UIGuestProcessControlDialog::retranslateUi()
    7575{
    7676    /* Translate window title: */
    7777    setWindowTitle(tr("%1 - Guest Control").arg(m_strMachineName));
    7878    /* Translate buttons: */
    79     button(ButtonType_Close)->setText(UIGuestControlWidget::tr("Close"));
     79    button(ButtonType_Close)->setText(UIGuestProcessControlWidget::tr("Close"));
    8080}
    8181
    82 void UIGuestControlDialog::configure()
     82void UIGuestProcessControlDialog::configure()
    8383{
    8484    /* Apply window icons: */
    … …  
    8686}
    8787
    88 void UIGuestControlDialog::configureCentralWidget()
     88void UIGuestProcessControlDialog::configureCentralWidget()
    8989{
    9090    /* Create widget: */
    91     UIGuestControlWidget *pWidget = new UIGuestControlWidget(EmbedTo_Dialog, m_pActionPool, m_comGuest, true /* show toolbar */, this);
     91    UIGuestProcessControlWidget *pWidget = new UIGuestProcessControlWidget(EmbedTo_Dialog, m_pActionPool, m_comGuest, this);
    9292
    9393    if (pWidget)
    … …  
    107107}
    108108
    109 void UIGuestControlDialog::finalize()
     109void UIGuestProcessControlDialog::finalize()
    110110{
    111111    /* Apply language settings: */
    … …  
    113113}
    114114
    115 void UIGuestControlDialog::loadSettings()
     115void UIGuestProcessControlDialog::loadSettings()
    116116{
    117117    const QRect desktopRect = gpDesktop->availableGeometry(this);
    … …  
    124124
    125125    /* Load geometry from extradata: */
    126     QRect geometry = gEDataManager->guestControlDialogGeometry(this, defaultGeometry);
     126    QRect geometry = gEDataManager->guestProcessControlDialogGeometry(this, defaultGeometry);
    127127
    128128    /* Restore geometry: */
    129     LogRel2(("GUI: UIGuestControlDialog: Restoring geometry to: Origin=%dx%d, Size=%dx%d\n",
     129    LogRel2(("GUI: UIGuestProcessControlDialog: Restoring geometry to: Origin=%dx%d, Size=%dx%d\n",
    130130             geometry.x(), geometry.y(), geometry.width(), geometry.height()));
    131131    setDialogGeometry(geometry);
    132132}
    133133
    134 void UIGuestControlDialog::saveSettings() const
     134void UIGuestProcessControlDialog::saveSettings() const
    135135{
    136136    /* Save window geometry to extradata: */
    … …  
    139139    /* darwinIsWindowMaximized expects a non-const QWidget*. thus const_cast: */
    140140    QWidget *pw = const_cast<QWidget*>(qobject_cast<const QWidget*>(this));
    141     gEDataManager->setGuestControlDialogGeometry(saveGeometry, ::darwinIsWindowMaximized(pw));
     141    gEDataManager->setGuestProcessControlDialogGeometry(saveGeometry, ::darwinIsWindowMaximized(pw));
    142142#else /* !VBOX_WS_MAC */
    143     gEDataManager->setGuestControlDialogGeometry(saveGeometry, isMaximized());
     143    gEDataManager->setGuestProcessControlDialogGeometry(saveGeometry, isMaximized());
    144144#endif /* !VBOX_WS_MAC */
    145     LogRel2(("GUI: Guest Control Dialog: Geometry saved as: Origin=%dx%d, Size=%dx%d\n",
     145    LogRel2(("GUI: Guest Process Control Dialog: Geometry saved as: Origin=%dx%d, Size=%dx%d\n",
    146146             saveGeometry.x(), saveGeometry.y(), saveGeometry.width(), saveGeometry.height()));
    147147}
    148148
    149 bool UIGuestControlDialog::shouldBeMaximized() const
     149bool UIGuestProcessControlDialog::shouldBeMaximized() const
    150150{
    151     return gEDataManager->guestControlDialogShouldBeMaximized();
     151    return gEDataManager->guestProcessControlDialogShouldBeMaximized();
    152152}
    153153
    154 void UIGuestControlDialog::sltSetCloseButtonShortCut(QKeySequence shortcut)
     154void UIGuestProcessControlDialog::sltSetCloseButtonShortCut(QKeySequence shortcut)
    155155{
    156156    if (button(ButtonType_Close))

  • trunk/src/VBox/Frontends/VirtualBox/src/runtime/guestctrl/UIGuestProcessControlDialog.h

    r75078 r75087  
    11/* $Id$ */
    22/** @file
    3  * VBox Qt GUI - UIGuestControlDialog class declaration.
     3 * VBox Qt GUI - UIGuestProcessControlDialog class declaration.
    44 */
    55
    … …  
    1616 */
    1717
    18 #ifndef ___UIGuestControlDialog_h___
    19 #define ___UIGuestControlDialog_h___
     18#ifndef ___UIGuestProcessControlDialog_h___
     19#define ___UIGuestProcessControlDialog_h___
    2020
    2121/* Qt includes: */
    … …  
    3434class QVBoxLayout;
    3535class UIActionPool;
    36 class UIGuestControlDialog;
     36class UIGuestProcessControlDialog;
    3737class CGuest;
    3838
    3939
    4040/** QIManagerDialogFactory extension used as a factory for the Guest Control dialog. */
    41 class UIGuestControlDialogFactory : public QIManagerDialogFactory
     41class UIGuestProcessControlDialogFactory : public QIManagerDialogFactory
    4242{
    4343public:
    4444
    45     UIGuestControlDialogFactory(UIActionPool *pActionPool = 0, const CGuest &comGuest = CGuest(), const QString &strMachineName = QString());
     45    UIGuestProcessControlDialogFactory(UIActionPool *pActionPool = 0, const CGuest &comGuest = CGuest(), const QString &strMachineName = QString());
    4646
    4747protected:
    … …  
    5858
    5959/** QIManagerDialog extension providing GUI with the dialog displaying guest control releated logs. */
    60 class UIGuestControlDialog : public QIWithRetranslateUI<QIManagerDialog>
     60class UIGuestProcessControlDialog : public QIWithRetranslateUI<QIManagerDialog>
    6161{
    6262    Q_OBJECT;
    … …  
    6868      * @param  pActionPool    Passes the action-pool reference.
    6969      * @param  comGuest       Passes the com-guest reference. */
    70     UIGuestControlDialog(QWidget *pCenterWidget, UIActionPool *pActionPool, const CGuest &comGuest, const QString &strMachineName = QString());
     70    UIGuestProcessControlDialog(QWidget *pCenterWidget, UIActionPool *pActionPool, const CGuest &comGuest, const QString &strMachineName = QString());
    7171
    7272protected:
    … …  
    111111
    112112
    113 #endif /* !___UIGuestControlDialog_h___ */
     113#endif /* !___UIGuestProcessControlDialog_h___ */

  • trunk/src/VBox/Frontends/VirtualBox/src/runtime/guestctrl/UIGuestProcessControlWidget.cpp

    r75057 r75087  
    165165};
    166166
    167 UIGuestProcessControlWidget::UIGuestProcessControlWidget(QWidget *pParent, const CGuest &comGuest)
    168     : QWidget(pParent)
     167UIGuestProcessControlWidget::UIGuestProcessControlWidget(EmbedTo enmEmbedding, UIActionPool *pActionPool,
     168                                                         const CGuest &comGuest, QWidget *pParent)
     169    :QIWithRetranslateUI<QWidget>(pParent)
    169170    , m_comGuest(comGuest)
    170171    , m_pMainLayout(0)
    … …  
    173174    , m_pConsole(0)
    174175    , m_pControlInterface(0)
     176    , m_enmEmbedding(enmEmbedding)
     177    , m_pActionPool(pActionPool)
    175178    , m_pQtListener(0)
    176179{
    … …  
    186189    saveSettings();
    187190}
     191
     192void UIGuestProcessControlWidget::retranslateUi()
     193{
     194}
     195
    188196
    189197void UIGuestProcessControlWidget::prepareObjects()

  • trunk/src/VBox/Frontends/VirtualBox/src/runtime/guestctrl/UIGuestProcessControlWidget.h

    r75057 r75087  
    2828
    2929/* GUI includes: */
     30#include "QIManagerDialog.h"
     31#include "QIWithRetranslateUI.h"
    3032#include "UIMainEventListener.h"
    3133
    … …  
    3436class QVBoxLayout;
    3537class QSplitter;
     38class UIActionPool;
    3639class UIGuestControlConsole;
    3740class UIGuestControlInterface;
    … …  
    4245/** QWidget extension
    4346  * providing GUI with guest session information and control tab in session-information window. */
    44 class UIGuestProcessControlWidget : public QWidget
     47class UIGuestProcessControlWidget : public QIWithRetranslateUI<QWidget>
    4548{
    4649    Q_OBJECT;
    … …  
    4851public:
    4952
    50     UIGuestProcessControlWidget(QWidget *pParent, const CGuest &comGuest);
     53    UIGuestProcessControlWidget(EmbedTo enmEmbedding, UIActionPool *pActionPool,
     54                                const CGuest &comGuest, QWidget *pParent);
    5155    ~UIGuestProcessControlWidget();
     56
     57protected:
     58
     59    void retranslateUi();
    5260
    5361private slots:
    … …  
    8290    UIGuestControlConsole    *m_pConsole;
    8391    UIGuestControlInterface  *m_pControlInterface;
     92    const EmbedTo             m_enmEmbedding;
     93    UIActionPool             *m_pActionPool;
    8494
    8595    /** Holds the Qt event listener instance. */

  • trunk/src/VBox/Frontends/VirtualBox/src/runtime/guestctrl/UIHostFileTable.cpp

    r75057 r75087  
    134134{
    135135    if (m_pLocationLabel)
    136         m_pLocationLabel->setText(QApplication::translate("UIGuestControlWidget", "Host System"));
     136        m_pLocationLabel->setText(QApplication::translate("UIGuestControlFileManager", "Host System"));
    137137    UIGuestControlFileTable::retranslateUi();
    138138}
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