Index: /trunk/src/VBox/Frontends/VirtualBox/src/extradata/UIExtraDataDefs.cpp
===================================================================
--- /trunk/src/VBox/Frontends/VirtualBox/src/extradata/UIExtraDataDefs.cpp (revision 81262)
+++ /trunk/src/VBox/Frontends/VirtualBox/src/extradata/UIExtraDataDefs.cpp (revision 81263)
@@ -209,4 +209,5 @@
const char *UIExtraDataDefs::GUI_SoftKeyboard_HideNumPad = "GUI/SoftKeyboardHideNumPad";
const char *UIExtraDataDefs::GUI_SoftKeyboard_HideOSMenuKeys = "GUI/SoftKeyboardHideOSMenuKeys";
+const char *UIExtraDataDefs::GUI_SoftKeyboard_HideMultimediaKeys = "GUI/SoftKeyboardHideMultimediaKeys";
/* File Manager options: */
Index: /trunk/src/VBox/Frontends/VirtualBox/src/extradata/UIExtraDataDefs.h
===================================================================
--- /trunk/src/VBox/Frontends/VirtualBox/src/extradata/UIExtraDataDefs.h (revision 81262)
+++ /trunk/src/VBox/Frontends/VirtualBox/src/extradata/UIExtraDataDefs.h (revision 81263)
@@ -386,4 +386,5 @@
extern const char *GUI_SoftKeyboard_HideNumPad;
extern const char *GUI_SoftKeyboard_HideOSMenuKeys;
+ extern const char *GUI_SoftKeyboard_HideMultimediaKeys;
/** @} */
Index: /trunk/src/VBox/Frontends/VirtualBox/src/extradata/UIExtraDataManager.cpp
===================================================================
--- /trunk/src/VBox/Frontends/VirtualBox/src/extradata/UIExtraDataManager.cpp (revision 81262)
+++ /trunk/src/VBox/Frontends/VirtualBox/src/extradata/UIExtraDataManager.cpp (revision 81263)
@@ -4236,5 +4236,5 @@
}
-void UIExtraDataManager::setSoftKeyboardOptions(bool fHideNumPad, bool fHideOSMenuKeys)
+void UIExtraDataManager::setSoftKeyboardOptions(bool fHideNumPad, bool fHideOSMenuKeys, bool fMultimediaKeys)
{
QStringList data;
@@ -4244,9 +4244,11 @@
if (fHideOSMenuKeys)
data << GUI_SoftKeyboard_HideOSMenuKeys;
+ if (fMultimediaKeys)
+ data << GUI_SoftKeyboard_HideMultimediaKeys;
setExtraDataStringList(GUI_SoftKeyboard_Options, data);
}
-void UIExtraDataManager::softKeyboardOptions(bool &fOutHideNumPad, bool &fOutHideOSMenuKeys)
+void UIExtraDataManager::softKeyboardOptions(bool &fOutHideNumPad, bool &fOutHideOSMenuKeys, bool &fOutHideMultimediaKeys)
{
fOutHideNumPad = false;
@@ -4259,4 +4261,6 @@
if (data[i] == GUI_SoftKeyboard_HideOSMenuKeys)
fOutHideOSMenuKeys = true;
+ if (data[i] == GUI_SoftKeyboard_HideMultimediaKeys)
+ fOutHideMultimediaKeys = true;
}
}
Index: /trunk/src/VBox/Frontends/VirtualBox/src/extradata/UIExtraDataManager.h
===================================================================
--- /trunk/src/VBox/Frontends/VirtualBox/src/extradata/UIExtraDataManager.h (revision 81262)
+++ /trunk/src/VBox/Frontends/VirtualBox/src/extradata/UIExtraDataManager.h (revision 81263)
@@ -665,6 +665,6 @@
void setSoftKeyboardDialogGeometry(const QRect &geometry, bool fMaximized);
bool softKeyboardDialogShouldBeMaximized();
- void setSoftKeyboardOptions(bool fShowNumPad, bool fHideOSMenuKeys);
- void softKeyboardOptions(bool &fOutShowNumPad, bool &fOutHideOSMenuKeys);
+ void setSoftKeyboardOptions(bool fShowNumPad, bool fHideOSMenuKeys, bool fMultimediaKeys);
+ void softKeyboardOptions(bool &fOutShowNumPad, bool &fOutHideOSMenuKeys, bool &fOutHideMultimediaKeys);
void setSoftKeyboardColorTheme(const QStringList &colorStringList);
QStringList softKeyboardColorTheme();
Index: /trunk/src/VBox/Frontends/VirtualBox/src/softkeyboard/UISoftKeyboard.cpp
===================================================================
--- /trunk/src/VBox/Frontends/VirtualBox/src/softkeyboard/UISoftKeyboard.cpp (revision 81262)
+++ /trunk/src/VBox/Frontends/VirtualBox/src/softkeyboard/UISoftKeyboard.cpp (revision 81263)
@@ -599,4 +599,7 @@
void setHideNumPad(bool fHide);
+ bool hideMultimediaKeys() const;
+ void setHideMultimediaKeys(bool fHide);
+
const QColor color(KeyboardColorType enmColorType) const;
void setColor(KeyboardColorType ennmColorType, const QColor &color);
@@ -766,4 +769,5 @@
void sigHideNumPad(bool fHide);
void sigHideOSMenuKeys(bool fHide);
+ void sigHideMultimediaKeys(bool fHide);
void sigColorCellClicked(int iColorRow);
void sigCloseSettingsWidget();
@@ -774,4 +778,5 @@
void setHideOSMenuKeys(bool fHide);
void setHideNumPad(bool fHide);
+ void setHideMultimediaKeys(bool fHide);
void setTableItemColor(KeyboardColorType tableRow, const QColor &color);
@@ -790,4 +795,5 @@
QCheckBox *m_pHideNumPadCheckBox;
QCheckBox *m_pShowOsMenuButtonsCheckBox;
+ QCheckBox *m_pHideMultimediaKeysCheckBox;
QGroupBox *m_pColorTableGroupBox;
QTableWidget *m_pColorSelectionTable;
@@ -2316,4 +2322,17 @@
return;
m_fHideNumPad = fHide;
+ update();
+}
+
+bool UISoftKeyboardWidget::hideMultimediaKeys() const
+{
+ return m_fHideMultimediaKeys;
+}
+
+void UISoftKeyboardWidget::setHideMultimediaKeys(bool fHide)
+{
+ if (m_fHideMultimediaKeys == fHide)
+ return;
+ m_fHideMultimediaKeys = fHide;
update();
}
@@ -3326,4 +3345,5 @@
, m_pHideNumPadCheckBox(0)
, m_pShowOsMenuButtonsCheckBox(0)
+ , m_pHideMultimediaKeysCheckBox(0)
, m_pColorTableGroupBox(0)
, m_pColorSelectionTable(0)
@@ -3347,4 +3367,10 @@
}
+void UISoftKeyboardSettingsWidget::setHideMultimediaKeys(bool fHide)
+{
+ if (m_pHideMultimediaKeysCheckBox)
+ m_pHideMultimediaKeysCheckBox->setChecked(fHide);
+}
+
void UISoftKeyboardSettingsWidget::setTableItemColor(KeyboardColorType tableRow, const QColor &color)
{
@@ -3371,4 +3397,6 @@
if (m_pShowOsMenuButtonsCheckBox)
m_pShowOsMenuButtonsCheckBox->setText(UISoftKeyboard::tr("Hide OS/Menu Keys"));
+ if (m_pHideMultimediaKeysCheckBox)
+ m_pHideMultimediaKeysCheckBox->setText(UISoftKeyboard::tr("Hide Multimedia Keys"));
if (m_pColorTableGroupBox)
m_pColorTableGroupBox->setTitle(UISoftKeyboard::tr("Button Colors"));
@@ -3414,13 +3442,16 @@
m_pHideNumPadCheckBox = new QCheckBox;
m_pShowOsMenuButtonsCheckBox = new QCheckBox;
+ m_pHideMultimediaKeysCheckBox = new QCheckBox;
pSettingsLayout->addWidget(m_pHideNumPadCheckBox, 1, 0, 1, 1);
pSettingsLayout->addWidget(m_pShowOsMenuButtonsCheckBox, 2, 0, 1, 1);
+ pSettingsLayout->addWidget(m_pHideMultimediaKeysCheckBox, 3, 0, 1, 1);
connect(m_pHideNumPadCheckBox, &QCheckBox::toggled, this, &UISoftKeyboardSettingsWidget::sigHideNumPad);
connect(m_pShowOsMenuButtonsCheckBox, &QCheckBox::toggled, this, &UISoftKeyboardSettingsWidget::sigHideOSMenuKeys);
+ connect(m_pHideMultimediaKeysCheckBox, &QCheckBox::toggled, this, &UISoftKeyboardSettingsWidget::sigHideMultimediaKeys);
/* A groupbox to host the color table widget: */
m_pColorTableGroupBox = new QGroupBox;
QVBoxLayout *pTableGroupBoxLayout = new QVBoxLayout(m_pColorTableGroupBox);
- pSettingsLayout->addWidget(m_pColorTableGroupBox, 3, 0, 2, 1);
+ pSettingsLayout->addWidget(m_pColorTableGroupBox, 4, 0, 2, 1);
/* Creating and configuring the color table widget: */
@@ -3668,4 +3699,10 @@
}
+void UISoftKeyboard::sltShowHideMultimediaKeys(bool fHide)
+{
+ if (m_pKeyboardWidget)
+ m_pKeyboardWidget->setHideMultimediaKeys(fHide);
+}
+
void UISoftKeyboard::sltHandleColorCellClick(int iColorRow)
{
@@ -3768,4 +3805,5 @@
connect(m_pSettingsWidget, &UISoftKeyboardSettingsWidget::sigHideOSMenuKeys, this, &UISoftKeyboard::sltShowHideOSMenuKeys);
connect(m_pSettingsWidget, &UISoftKeyboardSettingsWidget::sigHideNumPad, this, &UISoftKeyboard::sltShowHideNumPad);
+ connect(m_pSettingsWidget, &UISoftKeyboardSettingsWidget::sigHideMultimediaKeys, this, &UISoftKeyboard::sltShowHideMultimediaKeys);
connect(m_pSettingsWidget, &UISoftKeyboardSettingsWidget::sigColorCellClicked, this, &UISoftKeyboard::sltHandleColorCellClick);
connect(m_pSettingsWidget, &UISoftKeyboardSettingsWidget::sigCloseSettingsWidget, this, &UISoftKeyboard::sltShowHideSettingsWidget);
@@ -3790,5 +3828,6 @@
gEDataManager->setSoftKeyboardOptions(m_pKeyboardWidget->hideNumPad(),
- m_pKeyboardWidget->hideOSMenuKeys());
+ m_pKeyboardWidget->hideOSMenuKeys(),
+ m_pKeyboardWidget->hideMultimediaKeys());
if (m_pKeyboardWidget->currentLayout())
gEDataManager->setSoftKeyboardSelectedLayout(m_pKeyboardWidget->currentLayout()->uid());
@@ -3824,5 +3863,6 @@
bool fHideNumPad = false;
bool fHideOSMenuKeys = false;
- gEDataManager->softKeyboardOptions(fHideNumPad, fHideOSMenuKeys);
+ bool fHideMultimediaKeys = false;
+ gEDataManager->softKeyboardOptions(fHideNumPad, fHideOSMenuKeys, fHideMultimediaKeys);
m_pKeyboardWidget->setHideNumPad(fHideNumPad);
m_pKeyboardWidget->setHideOSMenuKeys(fHideOSMenuKeys);
@@ -3837,4 +3877,5 @@
m_pSettingsWidget->setHideOSMenuKeys(m_pKeyboardWidget->hideOSMenuKeys());
m_pSettingsWidget->setHideNumPad(m_pKeyboardWidget->hideNumPad());
+ m_pSettingsWidget->setHideMultimediaKeys(m_pKeyboardWidget->hideMultimediaKeys());
for (int i = (int)KeyboardColorType_Background;
Index: /trunk/src/VBox/Frontends/VirtualBox/src/softkeyboard/UISoftKeyboard.h
===================================================================
--- /trunk/src/VBox/Frontends/VirtualBox/src/softkeyboard/UISoftKeyboard.h (revision 81262)
+++ /trunk/src/VBox/Frontends/VirtualBox/src/softkeyboard/UISoftKeyboard.h (revision 81263)
@@ -85,4 +85,5 @@
void sltShowHideOSMenuKeys(bool fShow);
void sltShowHideNumPad(bool fShow);
+ void sltShowHideMultimediaKeys(bool fHide);
void sltHandleColorCellClick(int iColorRow);
void sltResetKeyboard();
Index: /trunk/src/VBox/Frontends/VirtualBox/xml/multimedia_keys.xml
===================================================================
--- /trunk/src/VBox/Frontends/VirtualBox/xml/multimedia_keys.xml (revision 81262)
+++ /trunk/src/VBox/Frontends/VirtualBox/xml/multimedia_keys.xml (revision 81263)
@@ -28,48 +28,28 @@
🡆
-
- 313
- 0x022A
+
+ 315
+ 0x0227
0x0C
0xE0
- 0x66
- 🔖
+ 0x67
+ 🗘
-
- 303
- 0x018A
+
+ 314
+ 0x0226
0x0C
0xE0
- 0x6C
- ✉
+ 0x68
+ 🗙
-
- 25
-
-
- 304
- 0xE2
+
+ 313
+ 0x0221
0x0C
0xE0
- 0x20
- 🔇
+ 0x65
+ 🔍
-
- 305
- 0xEA
- 0x0C
- 0xE0
- 0x2E
- 🔉
-
-
- 306
- 0xE9
- 0x0C
- 0xE0
- 0x30
- 🔊
-
-
25
@@ -111,4 +91,12 @@
25
+
+ 303
+ 0x018A
+ 0x0C
+ 0xE0
+ 0x6C
+ ✉
+
311
@@ -135,5 +123,31 @@
♬
-
+
+ 25
+
+
+ 304
+ 0xE2
+ 0x0C
+ 0xE0
+ 0x20
+ 🔇
+
+
+ 305
+ 0xEA
+ 0x0C
+ 0xE0
+ 0x2E
+ 🔉
+
+
+ 306
+ 0xE9
+ 0x0C
+ 0xE0
+ 0x30
+ 🔊
+