VirtualBox

Changeset 75762 in vbox


Ignore:
Timestamp:
Nov 27, 2018 10:10:23 AM (6 years ago)
Author:
vboxsync
Message:

FE/Qt: bugref:6699. Renaming file manager 'settings' panel to 'options' panel. We have done this for the logviewer so file manager widget follows the suit

Location:
trunk/src/VBox/Frontends/VirtualBox
Files:
10 edited
10 moved

Legend:

Unmodified
Added
Removed

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

    r75743 r75762  
    848848        src/guestctrl/UIGuestControlFileManagerLogPanel.h \
    849849        src/guestctrl/UIGuestControlFileManagerOperationsPanel.h \
    850         src/guestctrl/UIGuestControlFileManagerSettingsPanel.h \
     850        src/guestctrl/UIGuestControlFileManagerOptionsPanel.h \
    851851        src/guestctrl/UIGuestControlFileModel.h \
    852852        src/guestctrl/UIGuestControlFileTable.h \
    … …  
    10041004        src/guestctrl/UIGuestControlFileManagerLogPanel.h \
    10051005        src/guestctrl/UIGuestControlFileManagerOperationsPanel.h \
    1006         src/guestctrl/UIGuestControlFileManagerSettingsPanel.h \
     1006        src/guestctrl/UIGuestControlFileManagerOptionsPanel.h \
    10071007        src/guestctrl/UIGuestControlFileModel.h \
    10081008        src/guestctrl/UIGuestControlFileTable.h \
    … …  
    15661566        src/guestctrl/UIGuestControlFileManagerLogPanel.cpp \
    15671567        src/guestctrl/UIGuestControlFileManagerOperationsPanel.cpp \
    1568         src/guestctrl/UIGuestControlFileManagerSettingsPanel.cpp \
     1568        src/guestctrl/UIGuestControlFileManagerOptionsPanel.cpp \
    15691569        src/guestctrl/UIGuestControlFileModel.cpp \
    15701570        src/guestctrl/UIGuestControlFileTable.cpp \
    … …  
    17451745        src/guestctrl/UIGuestControlFileManagerLogPanel.cpp \
    17461746        src/guestctrl/UIGuestControlFileManagerOperationsPanel.cpp \
    1747         src/guestctrl/UIGuestControlFileManagerSettingsPanel.cpp \
     1747        src/guestctrl/UIGuestControlFileManagerOptionsPanel.cpp \
    17481748        src/guestctrl/UIGuestControlFileModel.cpp \
    17491749        src/guestctrl/UIGuestControlFileTable.cpp \

  • trunk/src/VBox/Frontends/VirtualBox/VirtualBox1.qrc

    r75424 r75762  
    222222        <file alias="file_manager_operations_disabled_16px.png">images/file_manager_operations_disabled_16px.png</file>
    223223        <file alias="file_manager_operations_disabled_32px.png">images/file_manager_operations_disabled_32px.png</file>
     224        <file alias="file_manager_options_16px.png">images/file_manager_options_16px.png</file>
     225        <file alias="file_manager_options_32px.png">images/file_manager_options_32px.png</file>
     226        <file alias="file_manager_options_disabled_16px.png">images/file_manager_options_disabled_16px.png</file>
     227        <file alias="file_manager_options_disabled_32px.png">images/file_manager_options_disabled_32px.png</file>
    224228        <file alias="file_manager_paste_16px.png">images/file_manager_paste_16px.png</file>
    225229        <file alias="file_manager_paste_24px.png">images/file_manager_paste_24px.png</file>
    … …  
    244248        <file alias="file_manager_session_16px.png">images/file_manager_session_16px.png</file>
    245249        <file alias="file_manager_session_32px.png">images/file_manager_session_32px.png</file>
     250        <file alias="file_manager_session_disabled_16px.png">images/file_manager_session_disabled_16px.png</file>
    246251        <file alias="file_manager_session_disabled_32px.png">images/file_manager_session_disabled_32px.png</file>
    247         <file alias="file_manager_session_disabled_16px.png">images/file_manager_session_disabled_16px.png</file>
    248         <file alias="file_manager_settings_16px.png">images/file_manager_settings_16px.png</file>
    249         <file alias="file_manager_settings_32px.png">images/file_manager_settings_32px.png</file>
    250         <file alias="file_manager_settings_disabled_16px.png">images/file_manager_settings_disabled_16px.png</file>
    251         <file alias="file_manager_settings_disabled_32px.png">images/file_manager_settings_disabled_32px.png</file>
    252252        <file alias="floppy_16px.png">images/floppy_16px.png</file>
    253253        <file alias="floppy_add_16px.png">images/floppy_add_16px.png</file>
    … …  
    365365        <file alias="log_viewer_goto_previous_bookmark_16px.png">images/log_viewer_goto_previous_bookmark_16px.png</file>
    366366        <file alias="log_viewer_goto_selected_bookmark_16px.png">images/log_viewer_goto_selected_bookmark_16px.png</file>
     367        <file alias="log_viewer_options_32px.png">images/log_viewer_options_32px.png</file>
     368        <file alias="log_viewer_options_disabled_32px.png">images/log_viewer_options_disabled_32px.png</file>
    367369        <file alias="log_viewer_refresh_32px.png">images/log_viewer_refresh_32px.png</file>
    368370        <file alias="log_viewer_refresh_disabled_32px.png">images/log_viewer_refresh_disabled_32px.png</file>
    … …  
    372374        <file alias="log_viewer_search_backward_16px.png">images/log_viewer_search_backward_16px.png</file>
    373375        <file alias="log_viewer_search_forward_16px.png">images/log_viewer_search_forward_16px.png</file>
    374         <file alias="log_viewer_options_32px.png">images/log_viewer_options_32px.png</file>
    375         <file alias="log_viewer_options_disabled_32px.png">images/log_viewer_options_disabled_32px.png</file>
    376376        <file alias="machine_16px.png">images/machine_16px.png</file>
    377377        <file alias="machine_24px.png">images/machine_24px.png</file>

  • trunk/src/VBox/Frontends/VirtualBox/VirtualBox1_x2.qrc

    r75424 r75762  
    222222        <file alias="file_manager_operations_disabled_16px_x2.png">images/x2/file_manager_operations_disabled_16px_x2.png</file>
    223223        <file alias="file_manager_operations_disabled_32px_x2.png">images/x2/file_manager_operations_disabled_32px_x2.png</file>
     224        <file alias="file_manager_options_16px_x2.png">images/x2/file_manager_options_16px_x2.png</file>
     225        <file alias="file_manager_options_32px_x2.png">images/x2/file_manager_options_32px_x2.png</file>
     226        <file alias="file_manager_options_disabled_16px_x2.png">images/x2/file_manager_options_disabled_16px_x2.png</file>
     227        <file alias="file_manager_options_disabled_32px_x2.png">images/x2/file_manager_options_disabled_32px_x2.png</file>
    224228        <file alias="file_manager_paste_16px_x2.png">images/x2/file_manager_paste_16px_x2.png</file>
    225229        <file alias="file_manager_paste_24px_x2.png">images/x2/file_manager_paste_24px_x2.png</file>
    … …  
    246250        <file alias="file_manager_session_disabled_16px_x2.png">images/x2/file_manager_session_disabled_16px_x2.png</file>
    247251        <file alias="file_manager_session_disabled_32px_x2.png">images/x2/file_manager_session_disabled_32px_x2.png</file>
    248         <file alias="file_manager_settings_16px_x2.png">images/x2/file_manager_settings_16px_x2.png</file>
    249         <file alias="file_manager_settings_32px_x2.png">images/x2/file_manager_settings_32px_x2.png</file>
    250         <file alias="file_manager_settings_disabled_16px_x2.png">images/x2/file_manager_settings_disabled_16px_x2.png</file>
    251         <file alias="file_manager_settings_disabled_32px_x2.png">images/x2/file_manager_settings_disabled_32px_x2.png</file>
    252252        <file alias="floppy_16px_x2.png">images/x2/floppy_16px_x2.png</file>
    253253        <file alias="floppy_add_16px_x2.png">images/x2/floppy_add_16px_x2.png</file>
    … …  
    361361        <file alias="log_viewer_goto_previous_bookmark_16px_x2.png">images/x2/log_viewer_goto_previous_bookmark_16px_x2.png</file>
    362362        <file alias="log_viewer_goto_selected_bookmark_16px_x2.png">images/x2/log_viewer_goto_selected_bookmark_16px_x2.png</file>
     363        <file alias="log_viewer_options_32px_x2.png">images/x2/log_viewer_options_32px_x2.png</file>
     364        <file alias="log_viewer_options_disabled_32px_x2.png">images/x2/log_viewer_options_disabled_32px_x2.png</file>
    363365        <file alias="log_viewer_refresh_32px_x2.png">images/x2/log_viewer_refresh_32px_x2.png</file>
    364366        <file alias="log_viewer_refresh_disabled_32px_x2.png">images/x2/log_viewer_refresh_disabled_32px_x2.png</file>
    … …  
    368370        <file alias="log_viewer_search_backward_16px_x2.png">images/x2/log_viewer_search_backward_16px_x2.png</file>
    369371        <file alias="log_viewer_search_forward_16px_x2.png">images/x2/log_viewer_search_forward_16px_x2.png</file>
    370         <file alias="log_viewer_options_32px_x2.png">images/x2/log_viewer_options_32px_x2.png</file>
    371         <file alias="log_viewer_options_disabled_32px_x2.png">images/x2/log_viewer_options_disabled_32px_x2.png</file>
    372372        <file alias="machine_16px_x2.png">images/x2/machine_16px_x2.png</file>
    373373        <file alias="machine_24px_x2.png">images/x2/machine_24px_x2.png</file>

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

    r75424 r75762  
    16811681};
    16821682
    1683 /** Toggle action extension, used to toggle 'File Manager Settings' panel in guest control file manager. */
    1684 class UIActionMenuGuestControlFileManagerSettings : public UIActionToggle
    1685 {
    1686     Q_OBJECT;
    1687 
    1688 public:
    1689 
    1690     /** Constructs action passing @a pParent to the base-class. */
    1691     UIActionMenuGuestControlFileManagerSettings(UIActionPool *pParent)
     1683/** Toggle action extension, used to toggle 'File Manager Options' panel in guest control file manager. */
     1684class UIActionMenuGuestControlFileManagerOptions : public UIActionToggle
     1685{
     1686    Q_OBJECT;
     1687
     1688public:
     1689
     1690    /** Constructs action passing @a pParent to the base-class. */
     1691    UIActionMenuGuestControlFileManagerOptions(UIActionPool *pParent)
    16921692        : UIActionToggle(pParent)
    16931693    {
    16941694        setShortcutContext(Qt::WidgetWithChildrenShortcut);
    1695         setIcon(UIIconPool::iconSetFull(":/file_manager_settings_32px.png",          ":/file_manager_settings_16px.png",
    1696                                         ":/file_manager_settings_disabled_32px.png", ":/file_manager_settings_disabled_16px.png"));
    1697     }
    1698 
    1699 protected:
    1700 
    1701     /** Returns shortcut extra-data ID. */
    1702     virtual QString shortcutExtraDataID() const /* override */
    1703     {
    1704         return QString("ToggleFileManagerSettingsPanel");
     1695        setIcon(UIIconPool::iconSetFull(":/file_manager_options_32px.png",          ":/file_manager_options_16px.png",
     1696                                        ":/file_manager_options_disabled_32px.png", ":/file_manager_options_disabled_16px.png"));
     1697    }
     1698
     1699protected:
     1700
     1701    /** Returns shortcut extra-data ID. */
     1702    virtual QString shortcutExtraDataID() const /* override */
     1703    {
     1704        return QString("ToggleFileManagerOptionsPanel");
    17051705    }
    17061706
    … …  
    17141714    virtual void retranslateUi() /* override */
    17151715    {
    1716         setName(QApplication::translate("UIActionPool", "Settings"));
     1716        setName(QApplication::translate("UIActionPool", "Options"));
    17171717        setShortcutScope(QApplication::translate("UIActionPool", "File Manager"));
    1718         setStatusTip(QApplication::translate("UIActionPool", "Open panel with file manager settings"));
    1719         setToolTip(QApplication::translate("UIActionPool", "Open Panel With File Manager Settings"));
     1718        setStatusTip(QApplication::translate("UIActionPool", "Open panel with file manager options"));
     1719        setToolTip(QApplication::translate("UIActionPool", "Open Panel With File Manager Options"));
    17201720    }
    17211721};
    … …  
    25132513    m_pool[UIActionIndex_M_GuestControlFileManager_S_MoveToHost] = new  UIActionMenuGuestControlFileManagerMoveToHost(this);
    25142514
    2515     m_pool[UIActionIndex_M_GuestControlFileManager_T_Settings] = new UIActionMenuGuestControlFileManagerSettings(this);
     2515    m_pool[UIActionIndex_M_GuestControlFileManager_T_Options] = new UIActionMenuGuestControlFileManagerOptions(this);
    25162516    m_pool[UIActionIndex_M_GuestControlFileManager_T_Log] = new UIActionMenuGuestControlFileManagerLog(this);
    25172517    m_pool[UIActionIndex_M_GuestControlFileManager_T_FileOperations] = new UIActionMenuGuestControlFileManagerFileOperations(this);
    … …  
    28612861void UIActionPool::updateMenuGuestControlFileManagerWrapper(UIMenu *pMenu)
    28622862{
    2863     addAction(pMenu, action(UIActionIndex_M_GuestControlFileManager_T_Settings));
     2863    addAction(pMenu, action(UIActionIndex_M_GuestControlFileManager_T_Options));
    28642864    addAction(pMenu, action(UIActionIndex_M_GuestControlFileManager_T_Log));
    28652865    addAction(pMenu, action(UIActionIndex_M_GuestControlFileManager_T_FileOperations));

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

    r75424 r75762  
    106106    UIActionIndex_M_GuestControlFileManager_S_MoveToGuest,
    107107    UIActionIndex_M_GuestControlFileManager_S_MoveToHost,
    108     UIActionIndex_M_GuestControlFileManager_T_Settings,
     108    UIActionIndex_M_GuestControlFileManager_T_Options,
    109109    UIActionIndex_M_GuestControlFileManager_T_Log,
    110110    UIActionIndex_M_GuestControlFileManager_T_FileOperations,

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

    r75732 r75762  
    4343# include "UIGuestControlFileManager.h"
    4444# include "UIGuestControlFileManagerSessionPanel.h"
    45 # include "UIGuestControlFileManagerSettingsPanel.h"
     45# include "UIGuestControlFileManagerOptionsPanel.h"
    4646# include "UIGuestControlFileManagerLogPanel.h"
    4747# include "UIGuestControlFileManagerOperationsPanel.h"
    … …  
    8080
    8181/*********************************************************************************************************************************
    82 *   UIGuestControlFileManagerSettings implementation.                                                                            *
     82*   UIGuestControlFileManagerOptions implementation.                                                                            *
    8383*********************************************************************************************************************************/
    8484
    85 UIGuestControlFileManagerSettings *UIGuestControlFileManagerSettings::m_pInstance = 0;
    86 
    87 UIGuestControlFileManagerSettings* UIGuestControlFileManagerSettings::instance()
     85UIGuestControlFileManagerOptions *UIGuestControlFileManagerOptions::m_pInstance = 0;
     86
     87UIGuestControlFileManagerOptions* UIGuestControlFileManagerOptions::instance()
    8888{
    8989    if (!m_pInstance)
    90     m_pInstance = new UIGuestControlFileManagerSettings;
     90    m_pInstance = new UIGuestControlFileManagerOptions;
    9191    return m_pInstance;
    9292}
    9393
    94 void UIGuestControlFileManagerSettings::create()
     94void UIGuestControlFileManagerOptions::create()
    9595{
    9696    if (m_pInstance)
    9797        return;
    98     m_pInstance = new UIGuestControlFileManagerSettings;
    99 }
    100 
    101 void UIGuestControlFileManagerSettings::destroy()
     98    m_pInstance = new UIGuestControlFileManagerOptions;
     99}
     100
     101void UIGuestControlFileManagerOptions::destroy()
    102102{
    103103    delete m_pInstance;
    … …  
    105105}
    106106
    107  UIGuestControlFileManagerSettings::~UIGuestControlFileManagerSettings()
    108 {
    109 
    110 }
    111 
    112 UIGuestControlFileManagerSettings::UIGuestControlFileManagerSettings()
     107 UIGuestControlFileManagerOptions::~UIGuestControlFileManagerOptions()
     108{
     109
     110}
     111
     112UIGuestControlFileManagerOptions::UIGuestControlFileManagerOptions()
    113113    : bListDirectoriesOnTop(true)
    114114    , bAskDeleteConfirmation(false)
    … …  
    142142    , m_pActionPool(pActionPool)
    143143    , m_fShowToolbar(fShowToolbar)
    144     , m_pSettingsPanel(0)
     144    , m_pOptionsPanel(0)
    145145    , m_pLogPanel(0)
    146146    , m_pSessionPanel(0)
    … …  
    152152    prepareConnections();
    153153    retranslateUi();
    154     loadSettings();
    155     UIGuestControlFileManagerSettings::create();
     154    restorePanelVisibility();
     155    UIGuestControlFileManagerOptions::create();
    156156}
    157157
    … …  
    162162    if (m_comGuestSession.isOk() && m_pQtSessionListener && m_comSessionListener.isOk())
    163163        cleanupListener(m_pQtSessionListener, m_comSessionListener, m_comGuestSession.GetEventSource());
    164     saveSettings();
    165     UIGuestControlFileManagerSettings::destroy();
     164    saveOptions();
     165    UIGuestControlFileManagerOptions::destroy();
    166166}
    167167
    … …  
    271271    }
    272272
    273     m_pSettingsPanel =
    274         new UIGuestControlFileManagerSettingsPanel(this /* manager dialog */,
    275                                                    0 /*parent */, UIGuestControlFileManagerSettings::instance());
    276     if (m_pSettingsPanel)
    277     {
    278         m_pSettingsPanel->hide();
    279         m_panelActionMap.insert(m_pSettingsPanel, m_pActionPool->action(UIActionIndex_M_GuestControlFileManager_T_Settings));
    280         connect(m_pSettingsPanel, &UIGuestControlFileManagerSettingsPanel::sigSettingsChanged,
     273    m_pOptionsPanel =
     274        new UIGuestControlFileManagerOptionsPanel(this /* manager dialog */,
     275                                                   0 /*parent */, UIGuestControlFileManagerOptions::instance());
     276    if (m_pOptionsPanel)
     277    {
     278        m_pOptionsPanel->hide();
     279        m_panelActionMap.insert(m_pOptionsPanel, m_pActionPool->action(UIActionIndex_M_GuestControlFileManager_T_Options));
     280        connect(m_pOptionsPanel, &UIGuestControlFileManagerOptionsPanel::sigOptionsChanged,
    281281                this, &UIGuestControlFileManager::sltListDirectoriesBeforeChanged);
    282         pTopLayout->addWidget(m_pSettingsPanel);
     282        pTopLayout->addWidget(m_pOptionsPanel);
    283283    }
    284284
    … …  
    380380
    381381        m_pToolBar->addAction(m_pActionPool->action(UIActionIndex_M_GuestControlFileManager_T_Session));
    382         m_pToolBar->addAction(m_pActionPool->action(UIActionIndex_M_GuestControlFileManager_T_Settings));
     382        m_pToolBar->addAction(m_pActionPool->action(UIActionIndex_M_GuestControlFileManager_T_Options));
    383383        m_pToolBar->addAction(m_pActionPool->action(UIActionIndex_M_GuestControlFileManager_T_Log));
    384384        m_pToolBar->addAction(m_pActionPool->action(UIActionIndex_M_GuestControlFileManager_T_FileOperations));
    385385
    386         connect(m_pActionPool->action(UIActionIndex_M_GuestControlFileManager_T_Settings), &QAction::toggled,
     386        connect(m_pActionPool->action(UIActionIndex_M_GuestControlFileManager_T_Options), &QAction::toggled,
    387387                this, &UIGuestControlFileManager::sltPanelActionToggled);
    388388        connect(m_pActionPool->action(UIActionIndex_M_GuestControlFileManager_T_Log), &QAction::toggled,
    … …  
    555555void UIGuestControlFileManager::sltHandleOptionsUpdated()
    556556{
    557     if (m_pSettingsPanel)
    558     {
    559         m_pSettingsPanel->update();
     557    if (m_pOptionsPanel)
     558    {
     559        m_pOptionsPanel->update();
    560560    }
    561561}
    … …  
    704704    if (!fsObjectInfo.isOk())
    705705        return objectInfo;
    706 
    707706    objectInfo << fsObjectInfo.GetName();
    708 
    709707    return objectInfo;
    710708}
    711709
    712 void UIGuestControlFileManager::saveSettings()
     710void UIGuestControlFileManager::saveOptions()
    713711{
    714712    /* Save a list of currently visible panels: */
    … …  
    717715        strNameList.append(pPanel->panelName());
    718716    gEDataManager->setGuestControlFileManagerVisiblePanels(strNameList);
    719 
    720717    /* Save the options: */
    721     UIGuestControlFileManagerSettings *pSettings = UIGuestControlFileManagerSettings::instance();
    722     if (pSettings)
    723     {
    724         gEDataManager->setGuestControlFileManagerOptions(pSettings->bListDirectoriesOnTop,
    725                                                          pSettings->bAskDeleteConfirmation,
    726                                                          pSettings->bShowHumanReadableSizes);
    727     }
    728 }
    729 
    730 void UIGuestControlFileManager::loadSettings()
     718    UIGuestControlFileManagerOptions *pOptions = UIGuestControlFileManagerOptions::instance();
     719    if (pOptions)
     720    {
     721        gEDataManager->setGuestControlFileManagerOptions(pOptions->bListDirectoriesOnTop,
     722                                                         pOptions->bAskDeleteConfirmation,
     723                                                         pOptions->bShowHumanReadableSizes);
     724    }
     725}
     726
     727void UIGuestControlFileManager::restorePanelVisibility()
    731728{
    732729    /* Load the visible panel list and show them: */
    … …  
    748745{
    749746    /* Load options: */
    750     UIGuestControlFileManagerSettings *pSettings = UIGuestControlFileManagerSettings::instance();
    751     if (pSettings)
    752     {
    753         pSettings->bListDirectoriesOnTop = gEDataManager->guestControlFileManagerListDirectoriesFirst();
    754         pSettings->bAskDeleteConfirmation = gEDataManager->guestControlFileManagerShowDeleteConfirmation();
    755         pSettings->bShowHumanReadableSizes = gEDataManager->guestControlFileManagerShowHumanReadableSizes();
     747    UIGuestControlFileManagerOptions *pOptions = UIGuestControlFileManagerOptions::instance();
     748    if (pOptions)
     749    {
     750        pOptions->bListDirectoriesOnTop = gEDataManager->guestControlFileManagerListDirectoriesFirst();
     751        pOptions->bAskDeleteConfirmation = gEDataManager->guestControlFileManagerShowDeleteConfirmation();
     752        pOptions->bShowHumanReadableSizes = gEDataManager->guestControlFileManagerShowHumanReadableSizes();
    756753    }
    757754}

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

    r75643 r75762  
    5151class UIGuestControlFileManagerOperationsPanel;
    5252class UIGuestControlFileManagerSessionPanel;
    53 class UIGuestControlFileManagerSettingsPanel;
     53class UIGuestControlFileManagerOptionsPanel;
    5454class UIGuestFileTable;
    5555class UIHostFileTable;
    … …  
    5757class UIToolBar;
    5858
    59 /** A Utility class to manage file  manager settings. */
    60 class UIGuestControlFileManagerSettings
     59/** A Utility class to manage file  manager options. */
     60class UIGuestControlFileManagerOptions
    6161{
    6262
    6363public:
    6464
    65     static UIGuestControlFileManagerSettings* instance();
     65    static UIGuestControlFileManagerOptions* instance();
    6666    static void create();
    6767    static void destroy();
    … …  
    7373private:
    7474
    75     UIGuestControlFileManagerSettings();
    76     ~UIGuestControlFileManagerSettings();
     75    UIGuestControlFileManagerOptions();
     76    ~UIGuestControlFileManagerOptions();
    7777
    78     static UIGuestControlFileManagerSettings *m_pInstance;
     78    static UIGuestControlFileManagerOptions *m_pInstance;
    7979};
    8080
    … …  
    146146
    147147    /** Saves list of panels and file manager options to the extra data. */
    148     void saveSettings();
    149     /** Loads settings from exra data except the file manager options. */
    150     void loadSettings();
     148    void saveOptions();
     149    /** Show the panels that have been visible the last time file manager is closed. */
     150    void restorePanelVisibility();
    151151    /** Loads file manager options. This should be done before widget creation
    152152     *  since some widgets are initilized with these options */
    … …  
    186186    QMap<UIGuestControlFileManagerPanel*, QAction*> m_panelActionMap;
    187187    QList<UIGuestControlFileManagerPanel*>          m_visiblePanelsList;
    188     UIGuestControlFileManagerSettingsPanel         *m_pSettingsPanel;
     188    UIGuestControlFileManagerOptionsPanel          *m_pOptionsPanel;
    189189    UIGuestControlFileManagerLogPanel              *m_pLogPanel;
    190190    UIGuestControlFileManagerSessionPanel          *m_pSessionPanel;
    191191    UIGuestControlFileManagerOperationsPanel       *m_pOperationsPanel;
    192     friend class UIGuestControlFileManagerSettingsPanel;
     192    friend class UIGuestControlFileManagerOptionsPanel;
    193193    friend class UIGuestControlFileManagerPanel;
    194194    friend class UIGuestControlFileManagerDialog;

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

    r75425 r75762  
    2727class UIGuestControlFileManager;
    2828
    29 /** UIVMLogViewerPanel extension providing GUI to manage logviewer settings. */
     29/** UIGuestControlFileManagerPanel extension to display file manager logs. */
    3030class UIGuestControlFileManagerLogPanel : public UIGuestControlFileManagerPanel
    3131{

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

    r75761 r75762  
    3333# include "UIIconPool.h"
    3434# include "UIGuestControlFileManager.h"
    35 # include "UIGuestControlFileManagerSettingsPanel.h"
     35# include "UIGuestControlFileManagerOptionsPanel.h"
    3636
    3737#endif /* !VBOX_WITH_PRECOMPILED_HEADERS */
    3838
    39 UIGuestControlFileManagerSettingsPanel::UIGuestControlFileManagerSettingsPanel(UIGuestControlFileManager *pManagerWidget,
    40                                                                                QWidget *pParent, UIGuestControlFileManagerSettings *pFileManagerSettings)
     39UIGuestControlFileManagerOptionsPanel::UIGuestControlFileManagerOptionsPanel(UIGuestControlFileManager *pManagerWidget,
     40                                                                               QWidget *pParent, UIGuestControlFileManagerOptions *pFileManagerOptions)
    4141    : UIGuestControlFileManagerPanel(pManagerWidget, pParent)
    4242    , m_pListDirectoriesOnTopCheckBox(0)
    4343    , m_pDeleteConfirmationCheckBox(0)
    4444    , m_pHumanReabableSizesCheckBox(0)
    45     , m_pFileManagerSettings(pFileManagerSettings)
     45    , m_pFileManagerOptions(pFileManagerOptions)
    4646{
    4747    prepare();
    4848}
    4949
    50 QString UIGuestControlFileManagerSettingsPanel::panelName() const
     50QString UIGuestControlFileManagerOptionsPanel::panelName() const
    5151{
    52     return "SettingsPanel";
     52    return "OptionsPanel";
    5353}
    5454
    55 void UIGuestControlFileManagerSettingsPanel::update()
     55void UIGuestControlFileManagerOptionsPanel::update()
    5656{
    57     if (!m_pFileManagerSettings)
     57    if (!m_pFileManagerOptions)
    5858        return;
    5959
    … …  
    6161    {
    6262        m_pListDirectoriesOnTopCheckBox->blockSignals(true);
    63         m_pListDirectoriesOnTopCheckBox->setChecked(m_pFileManagerSettings->bListDirectoriesOnTop);
     63        m_pListDirectoriesOnTopCheckBox->setChecked(m_pFileManagerOptions->bListDirectoriesOnTop);
    6464        m_pListDirectoriesOnTopCheckBox->blockSignals(false);
    6565    }
    … …  
    6868    {
    6969        m_pDeleteConfirmationCheckBox->blockSignals(true);
    70         m_pDeleteConfirmationCheckBox->setChecked(m_pFileManagerSettings->bAskDeleteConfirmation);
     70        m_pDeleteConfirmationCheckBox->setChecked(m_pFileManagerOptions->bAskDeleteConfirmation);
    7171        m_pDeleteConfirmationCheckBox->blockSignals(false);
    7272    }
    … …  
    7575    {
    7676        m_pHumanReabableSizesCheckBox->blockSignals(true);
    77         m_pHumanReabableSizesCheckBox->setChecked(m_pFileManagerSettings->bShowHumanReadableSizes);
     77        m_pHumanReabableSizesCheckBox->setChecked(m_pFileManagerOptions->bShowHumanReadableSizes);
    7878        m_pHumanReabableSizesCheckBox->blockSignals(false);
    7979    }
    8080}
    8181
    82 void UIGuestControlFileManagerSettingsPanel::prepareWidgets()
     82void UIGuestControlFileManagerOptionsPanel::prepareWidgets()
    8383{
    8484    if (!mainLayout())
    … …  
    102102        mainLayout()->addWidget(m_pHumanReabableSizesCheckBox, 0, Qt::AlignLeft);
    103103    }
    104     /* Set initial checkbox status wrt. settings: */
    105     if (m_pFileManagerSettings)
     104    /* Set initial checkbox status wrt. options: */
     105    if (m_pFileManagerOptions)
    106106    {
    107107        if (m_pListDirectoriesOnTopCheckBox)
    108             m_pListDirectoriesOnTopCheckBox->setChecked(m_pFileManagerSettings->bListDirectoriesOnTop);
     108            m_pListDirectoriesOnTopCheckBox->setChecked(m_pFileManagerOptions->bListDirectoriesOnTop);
    109109        if (m_pDeleteConfirmationCheckBox)
    110             m_pDeleteConfirmationCheckBox->setChecked(m_pFileManagerSettings->bAskDeleteConfirmation);
     110            m_pDeleteConfirmationCheckBox->setChecked(m_pFileManagerOptions->bAskDeleteConfirmation);
    111111        if (m_pHumanReabableSizesCheckBox)
    112             m_pHumanReabableSizesCheckBox->setChecked(m_pFileManagerSettings->bShowHumanReadableSizes);
     112            m_pHumanReabableSizesCheckBox->setChecked(m_pFileManagerOptions->bShowHumanReadableSizes);
    113113    }
    114114    retranslateUi();
    … …  
    116116}
    117117
    118 void UIGuestControlFileManagerSettingsPanel::sltListDirectoryCheckBoxToogled(bool bChecked)
     118void UIGuestControlFileManagerOptionsPanel::sltListDirectoryCheckBoxToogled(bool bChecked)
    119119{
    120     if (!m_pFileManagerSettings)
     120    if (!m_pFileManagerOptions)
    121121        return;
    122     m_pFileManagerSettings->bListDirectoriesOnTop = bChecked;
    123     emit sigSettingsChanged();
     122    m_pFileManagerOptions->bListDirectoriesOnTop = bChecked;
     123    emit sigOptionsChanged();
    124124}
    125125
    126 void UIGuestControlFileManagerSettingsPanel::sltDeleteConfirmationCheckBoxToogled(bool bChecked)
     126void UIGuestControlFileManagerOptionsPanel::sltDeleteConfirmationCheckBoxToogled(bool bChecked)
    127127{
    128     if (!m_pFileManagerSettings)
     128    if (!m_pFileManagerOptions)
    129129        return;
    130     m_pFileManagerSettings->bAskDeleteConfirmation = bChecked;
    131     emit sigSettingsChanged();
     130    m_pFileManagerOptions->bAskDeleteConfirmation = bChecked;
     131    emit sigOptionsChanged();
    132132}
    133133
    134 void UIGuestControlFileManagerSettingsPanel::sltHumanReabableSizesCheckBoxToogled(bool bChecked)
     134void UIGuestControlFileManagerOptionsPanel::sltHumanReabableSizesCheckBoxToogled(bool bChecked)
    135135{
    136     if (!m_pFileManagerSettings)
     136    if (!m_pFileManagerOptions)
    137137        return;
    138     m_pFileManagerSettings->bShowHumanReadableSizes = bChecked;
    139     emit sigSettingsChanged();
     138    m_pFileManagerOptions->bShowHumanReadableSizes = bChecked;
     139    emit sigOptionsChanged();
    140140}
    141141
    142 void UIGuestControlFileManagerSettingsPanel::prepareConnections()
     142void UIGuestControlFileManagerOptionsPanel::prepareConnections()
    143143{
    144144    if (m_pListDirectoriesOnTopCheckBox)
    145145        connect(m_pListDirectoriesOnTopCheckBox, &QCheckBox::toggled,
    146                 this, &UIGuestControlFileManagerSettingsPanel::sltListDirectoryCheckBoxToogled);
     146                this, &UIGuestControlFileManagerOptionsPanel::sltListDirectoryCheckBoxToogled);
    147147    if (m_pDeleteConfirmationCheckBox)
    148148        connect(m_pDeleteConfirmationCheckBox, &QCheckBox::toggled,
    149                 this, &UIGuestControlFileManagerSettingsPanel::sltDeleteConfirmationCheckBoxToogled);
     149                this, &UIGuestControlFileManagerOptionsPanel::sltDeleteConfirmationCheckBoxToogled);
    150150    if (m_pHumanReabableSizesCheckBox)
    151151        connect(m_pHumanReabableSizesCheckBox, &QCheckBox::toggled,
    152                 this, &UIGuestControlFileManagerSettingsPanel::sltHumanReabableSizesCheckBoxToogled);
     152                this, &UIGuestControlFileManagerOptionsPanel::sltHumanReabableSizesCheckBoxToogled);
    153153}
    154154
    155 void UIGuestControlFileManagerSettingsPanel::retranslateUi()
     155void UIGuestControlFileManagerOptionsPanel::retranslateUi()
    156156{
    157157    UIGuestControlFileManagerPanel::retranslateUi();

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

    r75761 r75762  
    1616 */
    1717
    18 #ifndef ___UIGuestControlFileManagerSettingsPanel_h___
    19 #define ___UIGuestControlFileManagerSettingsPanel_h___
     18#ifndef ___UIGuestControlFileManagerOptionsPanel_h___
     19#define ___UIGuestControlFileManagerOptionsPanel_h___
    2020
    2121/* GUI includes: */
    … …  
    2727class QLabel;
    2828class QIToolButton;
    29 class UIGuestControlFileManagerSettings;
     29class UIGuestControlFileManagerOptions;
    3030
    3131/** UIGuestControlFileManagerPanel extension to change file manager options. It directly
    3232 *  modifies the options through the passed UIGuestControlFileManagerOptions instance. */
    33 class UIGuestControlFileManagerSettingsPanel : public UIGuestControlFileManagerPanel
     33class UIGuestControlFileManagerOptionsPanel : public UIGuestControlFileManagerPanel
    3434{
    3535    Q_OBJECT;
    … …  
    3737public:
    3838
    39     UIGuestControlFileManagerSettingsPanel(UIGuestControlFileManager *pManagerWidget,
    40                                            QWidget *pParent, UIGuestControlFileManagerSettings *pFileManagerSettings);
     39    UIGuestControlFileManagerOptionsPanel(UIGuestControlFileManager *pManagerWidget,
     40                                           QWidget *pParent, UIGuestControlFileManagerOptions *pFileManagerOptions);
    4141    virtual QString panelName() const /* override */;
    4242    /** Reads the file manager options and updates the widget accordingly. This functions is typically called
    … …  
    4646signals:
    4747
    48     void sigSettingsChanged();
     48    void sigOptionsChanged();
    4949
    5050protected:
    … …  
    6767    QCheckBox  *m_pDeleteConfirmationCheckBox;
    6868    QCheckBox  *m_pHumanReabableSizesCheckBox;
    69     UIGuestControlFileManagerSettings *m_pFileManagerSettings;
     69    UIGuestControlFileManagerOptions *m_pFileManagerOptions;
    7070};
    7171
    72 #endif /* !___UIGuestControlFileManagerSettingsPanel_h___ */
     72#endif /* !___UIGuestControlFileManagerOptionsPanel_h___ */

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

    r75628 r75762  
    4545    UIFileTableItem *pRightItem = static_cast<UIFileTableItem*>(right.internalPointer());
    4646
    47     UIGuestControlFileManagerSettings *settings = UIGuestControlFileManagerSettings::instance();
     47    UIGuestControlFileManagerOptions *pOptions = UIGuestControlFileManagerOptions::instance();
    4848
    4949    if (pLeftItem && pRightItem)
    5050    {
    51         /* List the directories before the files if settings say so: */
    52         if (settings && settings->bListDirectoriesOnTop)
     51        /* List the directories before the files if options say so: */
     52        if (pOptions && pOptions->bListDirectoriesOnTop)
    5353        {
    5454            if (pLeftItem->isDirectory() && !pRightItem->isDirectory())
    … …  
    161161        if (index.column() == UIGuestControlFileModelColumn_Size)
    162162        {
    163             UIGuestControlFileManagerSettings* pSettings =
    164                 UIGuestControlFileManagerSettings::instance();
    165             if (pSettings && pSettings->bShowHumanReadableSizes)
     163            UIGuestControlFileManagerOptions* pOptions =
     164                UIGuestControlFileManagerOptions::instance();
     165            if (pOptions && pOptions->bShowHumanReadableSizes)
    166166            {
    167167                qulonglong size = item->data(index.column()).toULongLong();

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

    r75760 r75762  
    656656    if (m_pAskNextTimeCheckBox)
    657657    {
    658         UIGuestControlFileManagerSettings *pFileManagerSettings = UIGuestControlFileManagerSettings::instance();
    659         if (pFileManagerSettings)
    660             m_pAskNextTimeCheckBox->setChecked(pFileManagerSettings->bAskDeleteConfirmation);
     658        UIGuestControlFileManagerOptions *pFileManagerOptions = UIGuestControlFileManagerOptions::instance();
     659        if (pFileManagerOptions)
     660            m_pAskNextTimeCheckBox->setChecked(pFileManagerOptions->bAskDeleteConfirmation);
    661661
    662662        pLayout->addWidget(m_pAskNextTimeCheckBox);
    … …  
    15331533bool UIGuestControlFileTable::checkIfDeleteOK()
    15341534{
    1535     UIGuestControlFileManagerSettings *pFileManagerSettings = UIGuestControlFileManagerSettings::instance();
    1536     if (!pFileManagerSettings)
     1535    UIGuestControlFileManagerOptions *pFileManagerOptions = UIGuestControlFileManagerOptions::instance();
     1536    if (!pFileManagerOptions)
    15371537        return true;
    1538     if (!pFileManagerSettings->bAskDeleteConfirmation)
     1538    if (!pFileManagerOptions->bAskDeleteConfirmation)
    15391539        return true;
    15401540    UIFileDeleteConfirmationDialog *pDialog =
    15411541        new UIFileDeleteConfirmationDialog(this);
    15421542
    1543 
    15441543    bool fContinueWithDelete = (pDialog->execute() == QDialog::Accepted);
    1545 
    15461544    bool bAskNextTime = pDialog->askDeleteConfirmationNextTime();
    15471545
    1548     /* Update the file manager settings only if it is necessary: */
    1549     if (pFileManagerSettings->bAskDeleteConfirmation != bAskNextTime)
    1550     {
    1551         pFileManagerSettings->bAskDeleteConfirmation = bAskNextTime;
    1552         /* Notify file manager settings panel so that the check box there is updated: */
     1546    /* Update the file manager options only if it is necessary: */
     1547    if (pFileManagerOptions->bAskDeleteConfirmation != bAskNextTime)
     1548    {
     1549        pFileManagerOptions->bAskDeleteConfirmation = bAskNextTime;
     1550        /* Notify file manager options panel so that the check box there is updated: */
    15531551        emit sigDeleteConfirmationOptionChanged();
    15541552    }
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