Changeset 79921 in vbox for trunk/src/VBox/Frontends

Timestamp:

Jul 22, 2019 11:54:28 AM (6 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

132330

Message:

FE/Qt: bugref:6143. Saving/loading options to/from extra data

Location:

trunk/src/VBox/Frontends/VirtualBox/src

Files:

• extradata/UIExtraDataDefs.cpp (modified) (1 diff)
• extradata/UIExtraDataDefs.h (modified) (1 diff)
• extradata/UIExtraDataManager.cpp (modified) (1 diff)
• extradata/UIExtraDataManager.h (modified) (1 diff)
• softkeyboard/UISoftKeyboard.cpp (modified) (18 diffs)

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

@@ -208 +208 @@
 const char *UIExtraDataDefs::GUI_SoftKeyboard_ColorTheme  = "GUI/SoftKeyboardColorTheme";
 const char *UIExtraDataDefs::GUI_SoftKeyboard_SelectedLayout  = "GUI/SoftKeyboardSelectedLayout";
+const char *UIExtraDataDefs::GUI_SoftKeyboard_Options  = "GUI/SoftKeyboardOptions";
+const char *UIExtraDataDefs::GUI_SoftKeyboard_HideNumPad = "GUI/SoftKeyboardHideNumPad";
+const char *UIExtraDataDefs::GUI_SoftKeyboard_HideOSMenuKeys = "GUI/SoftKeyboardHideOSMenuKeys";
 
 /* File Manager options: */

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

@@ -387 +387 @@
         extern const char *GUI_SoftKeyboard_ColorTheme;
         extern const char *GUI_SoftKeyboard_SelectedLayout;
+        extern const char *GUI_SoftKeyboard_Options;
+        extern const char *GUI_SoftKeyboard_HideNumPad;
+        extern const char *GUI_SoftKeyboard_HideOSMenuKeys;
     /** @} */
 

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

@@ -4308 +4308 @@
 }
 
+void UIExtraDataManager::setSoftKeyboardOptions(bool fHideNumPad, bool fHideOSMenuKeys)
+{
+    QStringList data;
+
+    if (fHideNumPad)
+        data << GUI_SoftKeyboard_HideNumPad;
+    if (fHideOSMenuKeys)
+        data << GUI_SoftKeyboard_HideOSMenuKeys;
+
+    setExtraDataStringList(GUI_SoftKeyboard_Options, data);
+}
+
+void UIExtraDataManager::softKeyboardOptions(bool &fOutHideNumPad, bool &fOutHideOSMenuKeys)
+{
+    fOutHideNumPad = false;
+    fOutHideOSMenuKeys = false;
+    const QStringList data = extraDataStringList(GUI_SoftKeyboard_Options);
+    for (int i = 0; i < data.size(); ++i)
+    {
+        if (data[i] == GUI_SoftKeyboard_HideNumPad)
+            fOutHideNumPad = true;
+        if (data[i] == GUI_SoftKeyboard_HideOSMenuKeys)
+            fOutHideOSMenuKeys = true;
+    }
+}
+
 void UIExtraDataManager::setSoftKeyboardColorTheme(const QStringList &colorStringList)
 {

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

@@ -676 +676 @@
         void setSoftKeyboardDialogGeometry(const QRect &geometry, bool fMaximized);
         bool softKeyboardDialogShouldBeMaximized();
+        void setSoftKeyboardOptions(bool fShowNumPad, bool fHideOSMenuKeys);
+        void softKeyboardOptions(bool &fOutShowNumPad, bool &fOutHideOSMenuKeys);
         void setSoftKeyboardColorTheme(const QStringList &colorStringList);
         QStringList softKeyboardColorTheme();

trunk/src/VBox/Frontends/VirtualBox/src/softkeyboard/UISoftKeyboard.cpp

@@ -561 +561 @@
     float layoutAspectRatio();
 
-    bool showOSMenuKeys() const;
-    void setShowOSMenuKeys(bool fShow);
-
-    bool showNumPad() const;
-    void setShowNumPad(bool fShow);
+    bool hideOSMenuKeys() const;
+    void setHideOSMenuKeys(bool fHide);
+
+    bool hideNumPad() const;
+    void setHideNumPad(bool fHide);
 
     const QColor color(KeyboardColorType enmColorType) const;
@@ -641 +641 @@
     Mode     m_enmMode;
 
-    bool m_fShowOSMenuKeys;
-    bool m_fShowNumPad;
+    bool m_fHideOSMenuKeys;
+    bool m_fHideNumPad;
 };
 
@@ -734 +734 @@
 signals:
 
-    void sigShowNumPad(bool fShow);
-    void sigShowOSMenuKeys(bool fShow);
+    void sigHideNumPad(bool fHide);
+    void sigHideOSMenuKeys(bool fHide);
     void sigColorCellClicked(int iColorRow);
     void sigCloseSettingsWidget();
@@ -742 +742 @@
 
     UISoftKeyboardSettingsWidget(QWidget *pParent = 0);
-    void setShowOSMenuKeys(bool fShow);
-    void setShowNumPad(bool fShow);
+    void setHideOSMenuKeys(bool fHide);
+    void setHideNumPad(bool fHide);
     void setTableItemColor(KeyboardColorType tableRow, const QColor &color);
 
@@ -758 +758 @@
     void prepareObjects();
 
-    QCheckBox    *m_pShowNumPadCheckBox;
+    QCheckBox    *m_pHideNumPadCheckBox;
     QCheckBox    *m_pShowOsMenuButtonsCheckBox;
     QGroupBox    *m_pColorTableGroupBox;
@@ -2048 +2048 @@
     , m_iBottomMargin(10)
     , m_enmMode(Mode_Keyboard)
-    , m_fShowOSMenuKeys(true)
-    , m_fShowNumPad(true)
+    , m_fHideOSMenuKeys(false)
+    , m_fHideNumPad(false)
 {
     prepareObjects();
@@ -2072 +2072 @@
         return;
 
-    if (m_fShowNumPad)
+    if (!m_fHideNumPad)
         m_fScaleFactorX = width() / (float) m_iInitialWidth;
     else
@@ -2101 +2101 @@
         {
             UISoftKeyboardKey &key = keys[j];
-            if (!m_fShowOSMenuKeys && key.isOSMenuKey())
+            if (m_fHideOSMenuKeys && key.isOSMenuKey())
                 continue;
 
-            if (!m_fShowNumPad &&key.isNumPadKey())
+            if (m_fHideNumPad &&key.isNumPadKey())
                 continue;
 
@@ -2314 +2314 @@
 }
 
-bool UISoftKeyboardWidget::showOSMenuKeys() const
-{
-    return m_fShowOSMenuKeys;
-}
-
-void UISoftKeyboardWidget::setShowOSMenuKeys(bool fShow)
-{
-    if (m_fShowOSMenuKeys == fShow)
-        return;
-    m_fShowOSMenuKeys = fShow;
+bool UISoftKeyboardWidget::hideOSMenuKeys() const
+{
+    return m_fHideOSMenuKeys;
+}
+
+void UISoftKeyboardWidget::setHideOSMenuKeys(bool fHide)
+{
+    if (m_fHideOSMenuKeys == fHide)
+        return;
+    m_fHideOSMenuKeys = fHide;
     update();
 }
 
-bool UISoftKeyboardWidget::showNumPad() const
-{
-    return m_fShowNumPad;
-}
-
-void UISoftKeyboardWidget::setShowNumPad(bool fShow)
-{
-    if (m_fShowNumPad == fShow)
-        return;
-    m_fShowNumPad = fShow;
+bool UISoftKeyboardWidget::hideNumPad() const
+{
+    return m_fHideNumPad;
+}
+
+void UISoftKeyboardWidget::setHideNumPad(bool fHide)
+{
+    if (m_fHideNumPad == fHide)
+        return;
+    m_fHideNumPad = fHide;
     update();
 }
@@ -3332 +3332 @@
 UISoftKeyboardSettingsWidget::UISoftKeyboardSettingsWidget(QWidget *pParent /* = 0 */)
     : QIWithRetranslateUI<QWidget>(pParent)
-    , m_pShowNumPadCheckBox(0)
+    , m_pHideNumPadCheckBox(0)
     , m_pShowOsMenuButtonsCheckBox(0)
     , m_pColorTableGroupBox(0)
@@ -3343 +3343 @@
 }
 
-void UISoftKeyboardSettingsWidget::setShowOSMenuKeys(bool fShow)
+void UISoftKeyboardSettingsWidget::setHideOSMenuKeys(bool fHide)
 {
     if (m_pShowOsMenuButtonsCheckBox)
-        m_pShowOsMenuButtonsCheckBox->setChecked(fShow);
-}
-
-void UISoftKeyboardSettingsWidget::setShowNumPad(bool fShow)
-{
-    if (m_pShowNumPadCheckBox)
-        m_pShowNumPadCheckBox->setChecked(fShow);
+        m_pShowOsMenuButtonsCheckBox->setChecked(fHide);
+}
+
+void UISoftKeyboardSettingsWidget::setHideNumPad(bool fHide)
+{
+    if (m_pHideNumPadCheckBox)
+        m_pHideNumPadCheckBox->setChecked(fHide);
 }
 
@@ -3375 +3375 @@
         m_pCloseButton->setText("Close");
     }
-    if (m_pShowNumPadCheckBox)
-        m_pShowNumPadCheckBox->setText(UISoftKeyboard::tr("Show NumPad"));
+    if (m_pHideNumPadCheckBox)
+        m_pHideNumPadCheckBox->setText(UISoftKeyboard::tr("Hide NumPad"));
     if (m_pShowOsMenuButtonsCheckBox)
-        m_pShowOsMenuButtonsCheckBox->setText(UISoftKeyboard::tr("Show OS/Menu Keys"));
+        m_pShowOsMenuButtonsCheckBox->setText(UISoftKeyboard::tr("Hide OS/Menu Keys"));
     if (m_pColorTableGroupBox)
         m_pColorTableGroupBox->setTitle(UISoftKeyboard::tr("Button Colors"));
@@ -3420 +3420 @@
     pSettingsLayout->addLayout(pTitleLayout, 0, 0, 1, 2);
 
-    m_pShowNumPadCheckBox = new QCheckBox;
+    m_pHideNumPadCheckBox = new QCheckBox;
     m_pShowOsMenuButtonsCheckBox = new QCheckBox;
-    pSettingsLayout->addWidget(m_pShowNumPadCheckBox, 1, 0, 1, 1);
+    pSettingsLayout->addWidget(m_pHideNumPadCheckBox, 1, 0, 1, 1);
     pSettingsLayout->addWidget(m_pShowOsMenuButtonsCheckBox, 2, 0, 1, 1);
-    connect(m_pShowNumPadCheckBox, &QCheckBox::toggled, this, &UISoftKeyboardSettingsWidget::sigShowNumPad);
-    connect(m_pShowOsMenuButtonsCheckBox, &QCheckBox::toggled, this, &UISoftKeyboardSettingsWidget::sigShowOSMenuKeys);
+    connect(m_pHideNumPadCheckBox, &QCheckBox::toggled, this, &UISoftKeyboardSettingsWidget::sigHideNumPad);
+    connect(m_pShowOsMenuButtonsCheckBox, &QCheckBox::toggled, this, &UISoftKeyboardSettingsWidget::sigHideOSMenuKeys);
 
     /* A groupbox to host the color table widget: */
@@ -3664 +3664 @@
 }
 
-void UISoftKeyboard::sltShowHideOSMenuKeys(bool fShow)
+void UISoftKeyboard::sltShowHideOSMenuKeys(bool fHide)
 {
     if (m_pKeyboardWidget)
-        m_pKeyboardWidget->setShowOSMenuKeys(fShow);
-}
-
-void UISoftKeyboard::sltShowHideNumPad(bool fShow)
+        m_pKeyboardWidget->setHideOSMenuKeys(fHide);
+}
+
+void UISoftKeyboard::sltShowHideNumPad(bool fHide)
 {
     if (m_pKeyboardWidget)
-        m_pKeyboardWidget->setShowNumPad(fShow);
+        m_pKeyboardWidget->setHideNumPad(fHide);
 }
 
@@ -3774 +3774 @@
     connect(m_pStatusBarWidget, &UISoftKeyboardStatusBarWidget::sigResetKeyboard, this, &UISoftKeyboard::sltResetKeyboard);
 
-    connect(m_pSettingsWidget, &UISoftKeyboardSettingsWidget::sigShowOSMenuKeys, this, &UISoftKeyboard::sltShowHideOSMenuKeys);
-    connect(m_pSettingsWidget, &UISoftKeyboardSettingsWidget::sigShowNumPad, this, &UISoftKeyboard::sltShowHideNumPad);
+    connect(m_pSettingsWidget, &UISoftKeyboardSettingsWidget::sigHideOSMenuKeys, this, &UISoftKeyboard::sltShowHideOSMenuKeys);
+    connect(m_pSettingsWidget, &UISoftKeyboardSettingsWidget::sigHideNumPad, this, &UISoftKeyboard::sltShowHideNumPad);
     connect(m_pSettingsWidget, &UISoftKeyboardSettingsWidget::sigColorCellClicked, this, &UISoftKeyboard::sltHandleColorCellClick);
     connect(m_pSettingsWidget, &UISoftKeyboardSettingsWidget::sigCloseSettingsWidget, this, &UISoftKeyboard::sltShowHideSettingsWidget);
@@ -3796 +3796 @@
     {
         gEDataManager->setSoftKeyboardColorTheme(m_pKeyboardWidget->colorsToStringList());
+
+        gEDataManager->setSoftKeyboardOptions(m_pKeyboardWidget->hideNumPad(),
+                                              m_pKeyboardWidget->hideOSMenuKeys());
         if (m_pKeyboardWidget->currentLayout())
             gEDataManager->setSoftKeyboardSelectedLayout(m_pKeyboardWidget->currentLayout()->uid());
@@ -3826 +3829 @@
         m_pKeyboardWidget->colorsFromStringList(gEDataManager->softKeyboardColorTheme());
         m_pKeyboardWidget->setCurrentLayout(gEDataManager->softKeyboardSelectedLayout());
+        /* Load other options from exra data: */
+        bool fHideNumPad = false;
+        bool fHideOSMenuKeys = false;
+        gEDataManager->softKeyboardOptions(fHideNumPad, fHideOSMenuKeys);
+        m_pKeyboardWidget->setHideNumPad(fHideNumPad);
+        m_pKeyboardWidget->setHideOSMenuKeys(fHideOSMenuKeys);
     }
 }
@@ -3834 +3843 @@
     if (m_pKeyboardWidget && m_pSettingsWidget)
     {
-        m_pSettingsWidget->setShowOSMenuKeys(m_pKeyboardWidget->showOSMenuKeys());
-        m_pSettingsWidget->setShowNumPad(m_pKeyboardWidget->showNumPad());
+        m_pSettingsWidget->setHideOSMenuKeys(m_pKeyboardWidget->hideOSMenuKeys());
+        m_pSettingsWidget->setHideNumPad(m_pKeyboardWidget->hideNumPad());
 
         for (int i = (int)KeyboardColorType_Background;