VirtualBox

Changeset 75424 in vbox


Ignore:
Timestamp:
Nov 13, 2018 4:05:13 PM (6 years ago)
Author:
vboxsync
Message:

FE/Qt: bugref:9072. Rename logviewer 'settings' action to 'options'

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

Legend:

Unmodified
Added
Removed

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

    r75369 r75424  
    809809        src/logviewer/UIVMLogViewerDialog.h \
    810810        src/logviewer/UIVMLogViewerFilterPanel.h \
     811        src/logviewer/UIVMLogViewerOptionsPanel.h \
    811812        src/logviewer/UIVMLogViewerPanel.h \
    812813        src/logviewer/UIVMLogViewerSearchPanel.h \
    813         src/logviewer/UIVMLogViewerSettingsPanel.h \
    814814        src/logviewer/UIVMLogViewerTextEdit.h \
    815815        src/logviewer/UIVMLogViewerWidget.h \
    … …  
    11001100        src/logviewer/UIVMLogViewerDialog.h \
    11011101        src/logviewer/UIVMLogViewerFilterPanel.h \
     1102        src/logviewer/UIVMLogViewerOptionsPanel.h \
    11021103        src/logviewer/UIVMLogViewerPanel.h \
    11031104        src/logviewer/UIVMLogViewerSearchPanel.h \
    1104         src/logviewer/UIVMLogViewerSettingsPanel.h \
    11051105        src/logviewer/UIVMLogViewerTextEdit.h \
    11061106        src/logviewer/UIVMLogViewerWidget.h \
    … …  
    15211521        src/logviewer/UIVMLogViewerDialog.cpp \
    15221522        src/logviewer/UIVMLogViewerFilterPanel.cpp \
     1523        src/logviewer/UIVMLogViewerOptionsPanel.cpp \
    15231524        src/logviewer/UIVMLogViewerPanel.cpp \
    15241525        src/logviewer/UIVMLogViewerSearchPanel.cpp \
    1525         src/logviewer/UIVMLogViewerSettingsPanel.cpp \
    15261526        src/logviewer/UIVMLogViewerTextEdit.cpp \
    15271527        src/logviewer/UIVMLogViewerWidget.cpp \
    … …  
    18641864        src/logviewer/UIVMLogViewerDialog.cpp \
    18651865        src/logviewer/UIVMLogViewerFilterPanel.cpp \
     1866        src/logviewer/UIVMLogViewerOptionsPanel.cpp \
    18661867        src/logviewer/UIVMLogViewerPanel.cpp \
    18671868        src/logviewer/UIVMLogViewerSearchPanel.cpp \
    1868         src/logviewer/UIVMLogViewerSettingsPanel.cpp \
    18691869        src/logviewer/UIVMLogViewerTextEdit.cpp \
    18701870        src/logviewer/UIVMLogViewerWidget.cpp \

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

    r75311 r75424  
    372372        <file alias="log_viewer_search_backward_16px.png">images/log_viewer_search_backward_16px.png</file>
    373373        <file alias="log_viewer_search_forward_16px.png">images/log_viewer_search_forward_16px.png</file>
    374         <file alias="log_viewer_settings_32px.png">images/log_viewer_settings_32px.png</file>
    375         <file alias="log_viewer_settings_disabled_32px.png">images/log_viewer_settings_disabled_32px.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

    r75310 r75424  
    368368        <file alias="log_viewer_search_backward_16px_x2.png">images/x2/log_viewer_search_backward_16px_x2.png</file>
    369369        <file alias="log_viewer_search_forward_16px_x2.png">images/x2/log_viewer_search_forward_16px_x2.png</file>
    370         <file alias="log_viewer_settings_32px_x2.png">images/x2/log_viewer_settings_32px_x2.png</file>
    371         <file alias="log_viewer_settings_disabled_32px_x2.png">images/x2/log_viewer_settings_disabled_32px_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/VirtualBox1_x3.qrc

    r74807 r75424  
    251251        <file alias="log_viewer_search_backward_16px_x3.png">images/x3/log_viewer_search_backward_16px_x3.png</file>
    252252        <file alias="log_viewer_search_forward_16px_x3.png">images/x3/log_viewer_search_forward_16px_x3.png</file>
    253         <file alias="log_viewer_settings_32px_x3.png">images/x3/log_viewer_settings_32px_x3.png</file>
    254         <file alias="log_viewer_settings_disabled_32px_x3.png">images/x3/log_viewer_settings_disabled_32px_x3.png</file>
     253        <file alias="log_viewer_options_32px_x3.png">images/x3/log_viewer_options_32px_x3.png</file>
     254        <file alias="log_viewer_options_disabled_32px_x3.png">images/x3/log_viewer_options_disabled_32px_x3.png</file>
    255255        <file alias="machine_16px_x3.png">images/x3/machine_16px_x3.png</file>
    256256        <file alias="machine_24px_x3.png">images/x3/machine_24px_x3.png</file>

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

    r74807 r75424  
    251251        <file alias="log_viewer_search_backward_16px_x4.png">images/x4/log_viewer_search_backward_16px_x4.png</file>
    252252        <file alias="log_viewer_search_forward_16px_x4.png">images/x4/log_viewer_search_forward_16px_x4.png</file>
    253         <file alias="log_viewer_settings_32px_x4.png">images/x4/log_viewer_settings_32px_x4.png</file>
    254         <file alias="log_viewer_settings_disabled_32px_x4.png">images/x4/log_viewer_settings_disabled_32px_x4.png</file>
     253        <file alias="log_viewer_options_32px_x4.png">images/x4/log_viewer_options_32px_x4.png</file>
     254        <file alias="log_viewer_options_disabled_32px_x4.png">images/x4/log_viewer_options_disabled_32px_x4.png</file>
    255255        <file alias="machine_16px_x4.png">images/x4/machine_16px_x4.png</file>
    256256        <file alias="machine_24px_x4.png">images/x4/machine_24px_x4.png</file>

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

    r75306 r75424  
    218218/* Virtual Machine: Log-viewer: */
    219219const char *UIExtraDataDefs::GUI_LogWindowGeometry = "GUI/LogWindowGeometry";
    220 const char *UIExtraDataDefs::GUI_LogViewerSettings = "GUI/LogViewerSettings";
     220const char *UIExtraDataDefs::GUI_LogViewerOptions = "GUI/LogViewerOptions";
    221221const char *UIExtraDataDefs::GUI_LogViewerWrapLinesEnabled = "WrapLines";
    222222const char *UIExtraDataDefs::GUI_LogViewerShowLineNumbersDisabled = "showLineNumbersDisabled";

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

    r75360 r75424  
    392392        SHARED_LIBRARY_STUFF extern const char *GUI_LogWindowGeometry;
    393393    /** @} */
    394     /** @name Virtual Machine: Log-viewer widget settings
    395       * @{ */
    396         SHARED_LIBRARY_STUFF extern const char *GUI_LogViewerSettings;
     394    /** @name Virtual Machine: Log-viewer widget options
     395      * @{ */
     396        SHARED_LIBRARY_STUFF extern const char *GUI_LogViewerOptions;
    397397        /** Holds log-viewer wrap line flag. */
    398398        SHARED_LIBRARY_STUFF extern const char *GUI_LogViewerWrapLinesEnabled;

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

    r75306 r75424  
    44944494}
    44954495
    4496 void UIExtraDataManager::setLogViweverSettings(const QFont &font, bool wrapLines, bool showLineNumbers)
     4496void UIExtraDataManager::setLogViweverOptions(const QFont &font, bool wrapLines, bool showLineNumbers)
    44974497{
    44984498    /* Serialize passed values: */
    … …  
    45134513
    45144514    /* Re-cache corresponding extra-data: */
    4515     setExtraDataStringList(GUI_LogViewerSettings, data);
     4515    setExtraDataStringList(GUI_LogViewerOptions, data);
    45164516}
    45174517
    45184518bool UIExtraDataManager::logViewerWrapLines()
    45194519{
    4520     const QStringList data = extraDataStringList(GUI_LogViewerSettings);
     4520    const QStringList data = extraDataStringList(GUI_LogViewerOptions);
    45214521    for (int i = 0; i < data.size(); ++i)
    45224522    {
    … …  
    45294529bool UIExtraDataManager::logViewerShowLineNumbers()
    45304530{
    4531     const QStringList data = extraDataStringList(GUI_LogViewerSettings);
     4531    const QStringList data = extraDataStringList(GUI_LogViewerOptions);
    45324532    for (int i = 0; i < data.size(); ++i)
    45334533    {
    … …  
    45404540QFont UIExtraDataManager::logViewerFont()
    45414541{
    4542     const QStringList data = extraDataStringList(GUI_LogViewerSettings);
     4542    const QStringList data = extraDataStringList(GUI_LogViewerOptions);
    45434543    if (data.size() < 3)
    45444544        return QFont();

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

    r75224 r75424  
    689689    /** @} */
    690690
    691     /** @name Virtual Machine: Log Viewer widget settings
    692       * @{ */
    693         void setLogViweverSettings(const QFont &font, bool wrapLines, bool showLineNumbers);
     691    /** @name Virtual Machine: Log Viewer widget options
     692      * @{ */
     693        void setLogViweverOptions(const QFont &font, bool wrapLines, bool showLineNumbers);
    694694        /** Returns log-viewer line wrapping flag. */
    695695        bool logViewerWrapLines();

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

    r75311 r75424  
    13321332};
    13331333
    1334 /** Simple action extension, used as 'Toggle Pane Settings' action class. */
    1335 class UIActionMenuSelectorLogTogglePaneSettings : public UIActionToggle
    1336 {
    1337     Q_OBJECT;
    1338 
    1339 public:
    1340 
    1341     /** Constructs action passing @a pParent to the base-class. */
    1342     UIActionMenuSelectorLogTogglePaneSettings(UIActionPool *pParent)
     1334/** Simple action extension, used as 'Toggle Pane Options' action class. */
     1335class UIActionMenuSelectorLogTogglePaneOptions : public UIActionToggle
     1336{
     1337    Q_OBJECT;
     1338
     1339public:
     1340
     1341    /** Constructs action passing @a pParent to the base-class. */
     1342    UIActionMenuSelectorLogTogglePaneOptions(UIActionPool *pParent)
    13431343        : UIActionToggle(pParent)
    13441344    {
    13451345        setShortcutContext(Qt::WidgetWithChildrenShortcut);
    1346         setIcon(UIIconPool::iconSetFull(":/log_viewer_settings_32px.png",          ":/log_viewer_settings_16px.png",
    1347                                         ":/log_viewer_settings_disabled_32px.png", ":/log_viewer_settings_disabled_16px.png"));
    1348     }
    1349 
    1350 protected:
    1351 
    1352     /** Returns shortcut extra-data ID. */
    1353     virtual QString shortcutExtraDataID() const /* override */
    1354     {
    1355         return QString("ToggleLogSettings");
     1346        setIcon(UIIconPool::iconSetFull(":/log_viewer_options_32px.png",          ":/log_viewer_options_16px.png",
     1347                                        ":/log_viewer_options_disabled_32px.png", ":/log_viewer_options_disabled_16px.png"));
     1348    }
     1349
     1350protected:
     1351
     1352    /** Returns shortcut extra-data ID. */
     1353    virtual QString shortcutExtraDataID() const /* override */
     1354    {
     1355        return QString("ToggleLogOptions");
    13561356    }
    13571357
    … …  
    13651365    virtual void retranslateUi() /* override */
    13661366    {
    1367         setName(QApplication::translate("UIActionPool", "&Settings"));
     1367        setName(QApplication::translate("UIActionPool", "&Options"));
    13681368        setShortcutScope(QApplication::translate("UIActionPool", "Log Viewer"));
    1369         setStatusTip(QApplication::translate("UIActionPool", "Open pane with log viewer settings"));
    1370         setToolTip(QApplication::translate("UIActionPool", "Open Settings Pane (%1)").arg(shortcut().toString()));
     1369        setStatusTip(QApplication::translate("UIActionPool", "Open pane with log viewer options"));
     1370        setToolTip(QApplication::translate("UIActionPool", "Open Options Pane (%1)").arg(shortcut().toString()));
    13711371    }
    13721372};
    … …  
    25002500    m_pool[UIActionIndex_M_Log_T_Filter] = new UIActionMenuSelectorLogTogglePaneFilter(this);
    25012501    m_pool[UIActionIndex_M_Log_T_Bookmark] = new UIActionMenuSelectorLogTogglePaneBookmark(this);
    2502     m_pool[UIActionIndex_M_Log_T_Settings] = new UIActionMenuSelectorLogTogglePaneSettings(this);
     2502    m_pool[UIActionIndex_M_Log_T_Options] = new UIActionMenuSelectorLogTogglePaneOptions(this);
    25032503    m_pool[UIActionIndex_M_Log_S_Refresh] = new UIActionMenuSelectorLogPerformRefresh(this);
    25042504    m_pool[UIActionIndex_M_Log_S_Save] = new UIActionMenuSelectorLogPerformSave(this);
    … …  
    28372837    /* 'Bookmarks' action: */
    28382838    fSeparator = addAction(pMenu, action(UIActionIndex_M_Log_T_Bookmark)) || fSeparator;
    2839     /* 'Settings' action: */
    2840     fSeparator = addAction(pMenu, action(UIActionIndex_M_Log_T_Settings)) || fSeparator;
     2839    /* 'Options' action: */
     2840    fSeparator = addAction(pMenu, action(UIActionIndex_M_Log_T_Options)) || fSeparator;
    28412841
    28422842    /* Separator? */

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

    r75309 r75424  
    9494    UIActionIndex_M_Log_T_Filter,
    9595    UIActionIndex_M_Log_T_Bookmark,
    96     UIActionIndex_M_Log_T_Settings,
     96    UIActionIndex_M_Log_T_Options,
    9797    UIActionIndex_M_Log_S_Refresh,
    9898    UIActionIndex_M_Log_S_Save,

  • trunk/src/VBox/Frontends/VirtualBox/src/logviewer/UIVMLogViewerOptionsPanel.cpp

    r75423 r75424  
    3232# include "QIToolButton.h"
    3333# include "UIIconPool.h"
    34 # include "UIVMLogViewerSettingsPanel.h"
     34# include "UIVMLogViewerOptionsPanel.h"
    3535# include "UIVMLogViewerWidget.h"
    3636
    … …  
    3838
    3939
    40 UIVMLogViewerSettingsPanel::UIVMLogViewerSettingsPanel(QWidget *pParent, UIVMLogViewerWidget *pViewer)
     40UIVMLogViewerOptionsPanel::UIVMLogViewerOptionsPanel(QWidget *pParent, UIVMLogViewerWidget *pViewer)
    4141    : UIVMLogViewerPanel(pParent, pViewer)
    4242    , m_pLineNumberCheckBox(0)
    … …  
    5151}
    5252
    53 void UIVMLogViewerSettingsPanel::setShowLineNumbers(bool bShowLineNumbers)
     53void UIVMLogViewerOptionsPanel::setShowLineNumbers(bool bShowLineNumbers)
    5454{
    5555    if (!m_pLineNumberCheckBox)
    … …  
    6060}
    6161
    62 void UIVMLogViewerSettingsPanel::setWrapLines(bool bWrapLines)
     62void UIVMLogViewerOptionsPanel::setWrapLines(bool bWrapLines)
    6363{
    6464    if (!m_pWrapLinesCheckBox)
    … …  
    6969}
    7070
    71 void UIVMLogViewerSettingsPanel::setFontSizeInPoints(int fontSizeInPoints)
     71void UIVMLogViewerOptionsPanel::setFontSizeInPoints(int fontSizeInPoints)
    7272{
    7373    if (!m_pFontSizeSpinBox)
    … …  
    7878}
    7979
    80 void UIVMLogViewerSettingsPanel::prepareWidgets()
     80void UIVMLogViewerOptionsPanel::prepareWidgets()
    8181{
    8282    if (!mainLayout())
    … …  
    145145}
    146146
    147 void UIVMLogViewerSettingsPanel::prepareConnections()
     147void UIVMLogViewerOptionsPanel::prepareConnections()
    148148{
    149149    if (m_pLineNumberCheckBox)
    150         connect(m_pLineNumberCheckBox, &QCheckBox::toggled, this, &UIVMLogViewerSettingsPanel::sigShowLineNumbers);
     150        connect(m_pLineNumberCheckBox, &QCheckBox::toggled, this, &UIVMLogViewerOptionsPanel::sigShowLineNumbers);
    151151    if (m_pWrapLinesCheckBox)
    152         connect(m_pWrapLinesCheckBox, &QCheckBox::toggled, this, &UIVMLogViewerSettingsPanel::sigWrapLines);
     152        connect(m_pWrapLinesCheckBox, &QCheckBox::toggled, this, &UIVMLogViewerOptionsPanel::sigWrapLines);
    153153    if (m_pFontSizeSpinBox)
    154154        connect(m_pFontSizeSpinBox, static_cast<void(QSpinBox::*)(int)>(&QSpinBox::valueChanged),
    155                 this, &UIVMLogViewerSettingsPanel::sigChangeFontSizeInPoints);
     155                this, &UIVMLogViewerOptionsPanel::sigChangeFontSizeInPoints);
    156156    if (m_pOpenFontDialogButton)
    157         connect(m_pOpenFontDialogButton, &QIToolButton::clicked, this, &UIVMLogViewerSettingsPanel::sltOpenFontDialog);
     157        connect(m_pOpenFontDialogButton, &QIToolButton::clicked, this, &UIVMLogViewerOptionsPanel::sltOpenFontDialog);
    158158    if (m_pResetToDefaultsButton)
    159         connect(m_pResetToDefaultsButton, &QIToolButton::clicked, this, &UIVMLogViewerSettingsPanel::sigResetToDefaults);
     159        connect(m_pResetToDefaultsButton, &QIToolButton::clicked, this, &UIVMLogViewerOptionsPanel::sigResetToDefaults);
    160160}
    161161
    162 void UIVMLogViewerSettingsPanel::retranslateUi()
     162void UIVMLogViewerOptionsPanel::retranslateUi()
    163163{
    164164    UIVMLogViewerPanel::retranslateUi();
    … …  
    174174
    175175    m_pOpenFontDialogButton->setToolTip(UIVMLogViewerWidget::tr("Open a font dialog to select font face for the logviewer"));
    176     m_pResetToDefaultsButton->setToolTip(UIVMLogViewerWidget::tr("Reset settings to application defaults"));
     176    m_pResetToDefaultsButton->setToolTip(UIVMLogViewerWidget::tr("Reset options to application defaults"));
    177177}
    178178
    179 void UIVMLogViewerSettingsPanel::sltOpenFontDialog()
     179void UIVMLogViewerOptionsPanel::sltOpenFontDialog()
    180180{
    181181    QFont currentFont;

  • trunk/src/VBox/Frontends/VirtualBox/src/logviewer/UIVMLogViewerOptionsPanel.h

    r75423 r75424  
    1616 */
    1717
    18 #ifndef ___UIVMLogViewerSettingssPanel_h___
    19 #define ___UIVMLogViewerSettingssPanel_h___
     18#ifndef ___UIVMLogViewerOptionsPanel_h___
     19#define ___UIVMLogViewerOptionsPanel_h___
    2020
    2121/* GUI includes: */
    … …  
    2929class UIVMLogViewerWidget;
    3030
    31 /** UIVMLogViewerPanel extension providing GUI to manage logviewer settings. */
    32 class UIVMLogViewerSettingsPanel : public UIVMLogViewerPanel
     31/** UIVMLogViewerPanel extension providing GUI to manage logviewer options. */
     32class UIVMLogViewerOptionsPanel : public UIVMLogViewerPanel
    3333{
    3434    Q_OBJECT;
    … …  
    4444public:
    4545
    46     UIVMLogViewerSettingsPanel(QWidget *pParent, UIVMLogViewerWidget *pViewer);
     46    UIVMLogViewerOptionsPanel(QWidget *pParent, UIVMLogViewerWidget *pViewer);
    4747
    4848    void setShowLineNumbers(bool bShowLineNumbers);
    … …  
    7979};
    8080
    81 #endif /* !___UIVMLogViewerSettingsPanel_h___ */
     81#endif /* !___UIVMLogViewerOptionsPanel_h___ */

  • trunk/src/VBox/Frontends/VirtualBox/src/logviewer/UIVMLogViewerWidget.cpp

    r75161 r75424  
    4747# include "UIVMLogViewerFilterPanel.h"
    4848# include "UIVMLogViewerSearchPanel.h"
    49 # include "UIVMLogViewerSettingsPanel.h"
     49# include "UIVMLogViewerOptionsPanel.h"
    5050# include "UIToolBar.h"
    5151
    … …  
    7373    , m_pFilterPanel(0)
    7474    , m_pBookmarksPanel(0)
    75     , m_pSettingsPanel(0)
     75    , m_pOptionsPanel(0)
    7676    , m_pMainLayout(0)
    7777    , m_pToolBar(0)
    … …  
    194194    m_pActionPool->action(UIActionIndex_M_Log_S_Save)->setEnabled(!noLogsToShow);
    195195    m_pActionPool->action(UIActionIndex_M_Log_T_Bookmark)->setEnabled(!noLogsToShow);
    196     m_pActionPool->action(UIActionIndex_M_Log_T_Settings)->setEnabled(!noLogsToShow);
     196    m_pActionPool->action(UIActionIndex_M_Log_T_Options)->setEnabled(!noLogsToShow);
    197197
    198198    m_pTabWidget->show();
    … …  
    402402}
    403403
    404 void UIVMLogViewerWidget::sltResetSettingsToDefault()
     404void UIVMLogViewerWidget::sltResetOptionsToDefault()
    405405{
    406406    sltShowLineNumbers(true);
    … …  
    408408    sltChangeFont(QFontDatabase::systemFont(QFontDatabase::FixedFont));
    409409
    410     if (m_pSettingsPanel)
    411     {
    412         m_pSettingsPanel->setShowLineNumbers(true);
    413         m_pSettingsPanel->setWrapLines(false);
    414         m_pSettingsPanel->setFontSizeInPoints(m_font.pointSize());
     410    if (m_pOptionsPanel)
     411    {
     412        m_pOptionsPanel->setShowLineNumbers(true);
     413        m_pOptionsPanel->setWrapLines(false);
     414        m_pOptionsPanel->setFontSizeInPoints(m_font.pointSize());
    415415    }
    416416}
    … …  
    422422    /* Prepare widgets: */
    423423    prepareWidgets();
    424     /* Load settings: */
    425     loadSettings();
     424    /* Load options: */
     425    loadOptions();
    426426
    427427    /* Apply language settings: */
    … …  
    440440    addAction(m_pActionPool->action(UIActionIndex_M_Log_T_Filter));
    441441    addAction(m_pActionPool->action(UIActionIndex_M_Log_T_Bookmark));
    442     addAction(m_pActionPool->action(UIActionIndex_M_Log_T_Settings));
     442    addAction(m_pActionPool->action(UIActionIndex_M_Log_T_Options));
    443443    addAction(m_pActionPool->action(UIActionIndex_M_Log_S_Refresh));
    444444    addAction(m_pActionPool->action(UIActionIndex_M_Log_S_Save));
    … …  
    451451    connect(m_pActionPool->action(UIActionIndex_M_Log_T_Bookmark), &QAction::toggled,
    452452            this, &UIVMLogViewerWidget::sltPanelActionToggled);
    453     connect(m_pActionPool->action(UIActionIndex_M_Log_T_Settings), &QAction::toggled,
     453    connect(m_pActionPool->action(UIActionIndex_M_Log_T_Options), &QAction::toggled,
    454454            this, &UIVMLogViewerWidget::sltPanelActionToggled);
    455455    connect(m_pActionPool->action(UIActionIndex_M_Log_S_Refresh), &QAction::triggered,
    … …  
    533533        }
    534534
    535         /* Create VM Log-Viewer settings-panel: */
    536         m_pSettingsPanel = new UIVMLogViewerSettingsPanel(0, this);
    537         if (m_pSettingsPanel)
     535        /* Create VM Log-Viewer options-panel: */
     536        m_pOptionsPanel = new UIVMLogViewerOptionsPanel(0, this);
     537        if (m_pOptionsPanel)
    538538        {
    539539            /* Configure panel: */
    540             m_pSettingsPanel->hide();
    541             m_pSettingsPanel->setShowLineNumbers(m_bShowLineNumbers);
    542             m_pSettingsPanel->setWrapLines(m_bWrapLines);
    543             m_pSettingsPanel->setFontSizeInPoints(m_font.pointSize());
    544             connect(m_pSettingsPanel, &UIVMLogViewerSettingsPanel::sigShowLineNumbers, this, &UIVMLogViewerWidget::sltShowLineNumbers);
    545             connect(m_pSettingsPanel, &UIVMLogViewerSettingsPanel::sigWrapLines, this, &UIVMLogViewerWidget::sltWrapLines);
    546             connect(m_pSettingsPanel, &UIVMLogViewerSettingsPanel::sigChangeFontSizeInPoints, this, &UIVMLogViewerWidget::sltFontSizeChanged);
    547             connect(m_pSettingsPanel, &UIVMLogViewerSettingsPanel::sigChangeFont, this, &UIVMLogViewerWidget::sltChangeFont);
    548             connect(m_pSettingsPanel, &UIVMLogViewerSettingsPanel::sigResetToDefaults, this, &UIVMLogViewerWidget::sltResetSettingsToDefault);
    549             m_panelActionMap.insert(m_pSettingsPanel, m_pActionPool->action(UIActionIndex_M_Log_T_Settings));
     540            m_pOptionsPanel->hide();
     541            m_pOptionsPanel->setShowLineNumbers(m_bShowLineNumbers);
     542            m_pOptionsPanel->setWrapLines(m_bWrapLines);
     543            m_pOptionsPanel->setFontSizeInPoints(m_font.pointSize());
     544            connect(m_pOptionsPanel, &UIVMLogViewerOptionsPanel::sigShowLineNumbers, this, &UIVMLogViewerWidget::sltShowLineNumbers);
     545            connect(m_pOptionsPanel, &UIVMLogViewerOptionsPanel::sigWrapLines, this, &UIVMLogViewerWidget::sltWrapLines);
     546            connect(m_pOptionsPanel, &UIVMLogViewerOptionsPanel::sigChangeFontSizeInPoints, this, &UIVMLogViewerWidget::sltFontSizeChanged);
     547            connect(m_pOptionsPanel, &UIVMLogViewerOptionsPanel::sigChangeFont, this, &UIVMLogViewerWidget::sltChangeFont);
     548            connect(m_pOptionsPanel, &UIVMLogViewerOptionsPanel::sigResetToDefaults, this, &UIVMLogViewerWidget::sltResetOptionsToDefault);
     549            m_panelActionMap.insert(m_pOptionsPanel, m_pActionPool->action(UIActionIndex_M_Log_T_Options));
    550550
    551551            /* Add into layout: */
    552             m_pMainLayout->addWidget(m_pSettingsPanel);
     552            m_pMainLayout->addWidget(m_pOptionsPanel);
    553553        }
    554554    }
    … …  
    572572        m_pToolBar->addAction(m_pActionPool->action(UIActionIndex_M_Log_T_Filter));
    573573        m_pToolBar->addAction(m_pActionPool->action(UIActionIndex_M_Log_T_Bookmark));
    574         m_pToolBar->addAction(m_pActionPool->action(UIActionIndex_M_Log_T_Settings));
     574        m_pToolBar->addAction(m_pActionPool->action(UIActionIndex_M_Log_T_Options));
    575575        m_pToolBar->addSeparator();
    576576        m_pToolBar->addAction(m_pActionPool->action(UIActionIndex_M_Log_S_Refresh));
    … …  
    590590}
    591591
    592 void UIVMLogViewerWidget::loadSettings()
     592void UIVMLogViewerWidget::loadOptions()
    593593{
    594594    m_bWrapLines = gEDataManager->logViewerWrapLines();
    … …  
    599599}
    600600
    601 void UIVMLogViewerWidget::saveSettings()
    602 {
    603     gEDataManager->setLogViweverSettings(m_font, m_bWrapLines, m_bShowLineNumbers);
     601void UIVMLogViewerWidget::saveOptions()
     602{
     603    gEDataManager->setLogViweverOptions(m_font, m_bWrapLines, m_bShowLineNumbers);
    604604}
    605605
    606606void UIVMLogViewerWidget::cleanup()
    607607{
    608     /* Save settings: */
    609     saveSettings();
     608    /* Save options: */
     609    saveOptions();
    610610}
    611611

  • trunk/src/VBox/Frontends/VirtualBox/src/logviewer/UIVMLogViewerWidget.h

    r75268 r75424  
    4444class UIVMLogViewerPanel;
    4545class UIVMLogViewerSearchPanel;
    46 class UIVMLogViewerSettingsPanel;
     46class UIVMLogViewerOptionsPanel;
    4747
    4848/** QWidget extension providing GUI for VirtualBox LogViewer. It
    … …  
    125125        void sltFontSizeChanged(int fontSize);
    126126        void sltChangeFont(QFont font);
    127         void sltResetSettingsToDefault();
     127        void sltResetOptionsToDefault();
    128128    /** @} */
    129129
    … …  
    140140        /** Prepares toolbar. */
    141141        void prepareToolBar();
    142         /** Loads settings.  */
    143         void loadSettings();
    144 
    145         /** Saves settings.  */
    146         void saveSettings();
     142        /** Loads options.  */
     143        void loadOptions();
     144
     145        /** Saves options.  */
     146        void saveOptions();
    147147        /** Cleanups VM Log-Viewer. */
    148148        void cleanup();
    … …  
    208208        UIVMLogViewerFilterPanel    *m_pFilterPanel;
    209209        UIVMLogViewerBookmarksPanel *m_pBookmarksPanel;
    210         UIVMLogViewerSettingsPanel  *m_pSettingsPanel;
     210        UIVMLogViewerOptionsPanel  *m_pOptionsPanel;
    211211        QMap<UIVMLogViewerPanel*, QAction*> m_panelActionMap;
    212212        QList<UIVMLogViewerPanel*>          m_visiblePanelsList;
    … …  
    221221    /** @name Toolbar and menu variables. Cache these to restore them after refresh.
    222222     * @{ */
    223         /** Showing/hiding line numbers and line wraping settings are set per
     223        /** Showing/hiding line numbers and line wraping options are set per
    224224            UIVMLogViewerWidget and applies to all log pages (all tabs) */
    225225        bool  m_bShowLineNumbers;
    … …  
    230230    friend class UIVMLogViewerFilterPanel;
    231231    friend class UIVMLogViewerSearchPanel;
    232     friend class UIVMLogViewerSettingsPanel;
     232    friend class UIVMLogViewerOptionsPanel;
    233233    friend class UIVMLogViewerPanel;
    234234    friend class UIVMLogViewerDialog;

  • trunk/src/VBox/Frontends/VirtualBox/src/manager/UIVirtualBoxManagerWidget.cpp

    r75209 r75424  
    682682                    m_pToolBar->addAction(actionPool()->action(UIActionIndex_M_Log_T_Filter));
    683683                    m_pToolBar->addAction(actionPool()->action(UIActionIndex_M_Log_T_Bookmark));
    684                     m_pToolBar->addAction(actionPool()->action(UIActionIndex_M_Log_T_Settings));
     684                    m_pToolBar->addAction(actionPool()->action(UIActionIndex_M_Log_T_Options));
    685685                    m_pToolBar->addAction(actionPool()->action(UIActionIndex_M_Log_S_Refresh));
    686686                    m_pToolBar->addSeparator();
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