Changeset 81311 in vbox for trunk/src/VBox/Frontends/VirtualBox

Timestamp:

Oct 17, 2019 12:43:36 PM (6 years ago)

Author:

vboxsync

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

134018

Message:

FE/Qt: bugref:6143. Showing a message on the status bar when the cursor hovers above a multimeda key.

Location:

trunk/src/VBox/Frontends/VirtualBox

Files:

• src/softkeyboard/UISoftKeyboard.cpp (modified) (9 diffs)
• xml/multimedia_keys.xml (modified) (3 diffs)

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

@@ -686 +686 @@
     bool               loadKeyboardLayout(const QString &strLayoutName);
     void               prepareObjects();
+    void               prepareColorThemes();
     UISoftKeyboardPhysicalLayout *findPhysicalLayout(const QUuid &uuid);
     /** Sets m_pKeyBeingEdited. */
@@ -695 +696 @@
     void               lookAtDefaultLayoutFolder(QStringList &fileList);
     UISoftKeyboardColorTheme *colorTheme(const QString &strColorThemeName);
+    void showKeyTooltip(UISoftKeyboardKey *pKey);
+
     UISoftKeyboardKey *m_pKeyUnderMouse;
     UISoftKeyboardKey *m_pKeyBeingEdited;
@@ -707 +710 @@
     QVector<UISoftKeyboardLayout>         m_layouts;
     UISoftKeyboardLayout *m_pCurrentKeyboardLayout;
+    /** Key is the key position as read from the layout and value is the message we show as mouse hovers over the key. */
+    QMap<int, QString> m_keyTooltips;
 
     QSize m_minimumSize;
@@ -2154 +2159 @@
 {
     prepareObjects();
-
-    int iIndex = 0;
-    while (predefinedColorThemes[iIndex][0])
-    {
-        m_colorThemes << UISoftKeyboardColorTheme(predefinedColorThemes[iIndex][0],
-                                                  predefinedColorThemes[iIndex][1],
-                                                  predefinedColorThemes[iIndex][2],
-                                                  predefinedColorThemes[iIndex][3],
-                                                  predefinedColorThemes[iIndex][4],
-                                                  predefinedColorThemes[iIndex][5]);
-        ++iIndex;
-    }
-
-    UISoftKeyboardColorTheme customTheme;
-    customTheme.setName("Custom");
-    m_colorThemes.append(customTheme);
-    m_currentColorTheme = &(m_colorThemes.back());
+    prepareColorThemes();
+    retranslateUi();
 }
 
@@ -2327 +2317 @@
 {
     QWidget::mouseMoveEvent(pEvent);
+    UISoftKeyboardKey *pPreviousKeyUnderMouse = m_pKeyUnderMouse;
     keyUnderMouse(pEvent);
+    if (pPreviousKeyUnderMouse != m_pKeyUnderMouse)
+        showKeyTooltip(m_pKeyUnderMouse);
 }
 
 void UISoftKeyboardWidget::retranslateUi()
 {
+    m_keyTooltips[300] = UISoftKeyboard::tr("Web browser go back");
+    m_keyTooltips[301] = UISoftKeyboard::tr("Web browser go the home page");
+    m_keyTooltips[302] = UISoftKeyboard::tr("Web browser go forward");
+    m_keyTooltips[315] = UISoftKeyboard::tr("Web browser reload the current page");
+    m_keyTooltips[314] = UISoftKeyboard::tr("Web browser stop loading the page");
+    m_keyTooltips[313] = UISoftKeyboard::tr("Web browser search");
+
+    m_keyTooltips[307] = UISoftKeyboard::tr("Jump back to previous media track");
+    m_keyTooltips[308] = UISoftKeyboard::tr("Jump to next media track");
+    m_keyTooltips[309] = UISoftKeyboard::tr("Stop playing");
+    m_keyTooltips[310] = UISoftKeyboard::tr("Play or pause playing");
+
+    m_keyTooltips[303] = UISoftKeyboard::tr("Start email application");
+    m_keyTooltips[311] = UISoftKeyboard::tr("Start calculator");
+    m_keyTooltips[312] = UISoftKeyboard::tr("Show 'My Computer'");
+    m_keyTooltips[316] = UISoftKeyboard::tr("Show Media folder");
+
+    m_keyTooltips[304] = UISoftKeyboard::tr("Mute");
+    m_keyTooltips[305] = UISoftKeyboard::tr("Volume up");
+    m_keyTooltips[306] = UISoftKeyboard::tr("Volume down");
 }
 
@@ -2559 +2572 @@
     if (!underMouse())
         m_pKeyUnderMouse = 0;
-    else
-    {
-        printf("under %d %d\n", cursor().pos().x(), cursor().pos().y());
-
-    }
     update();
 }
@@ -3046 +3054 @@
 }
 
+void UISoftKeyboardWidget::prepareColorThemes()
+{
+    int iIndex = 0;
+    while (predefinedColorThemes[iIndex][0])
+    {
+        m_colorThemes << UISoftKeyboardColorTheme(predefinedColorThemes[iIndex][0],
+                                                  predefinedColorThemes[iIndex][1],
+                                                  predefinedColorThemes[iIndex][2],
+                                                  predefinedColorThemes[iIndex][3],
+                                                  predefinedColorThemes[iIndex][4],
+                                                  predefinedColorThemes[iIndex][5]);
+        ++iIndex;
+    }
+
+    UISoftKeyboardColorTheme customTheme;
+    customTheme.setName("Custom");
+    m_colorThemes.append(customTheme);
+    m_currentColorTheme = &(m_colorThemes.back());
+}
+
 void UISoftKeyboardWidget::setKeyBeingEdited(UISoftKeyboardKey* pKey)
 {
@@ -3117 +3145 @@
     }
     return 0;
+}
+
+void UISoftKeyboardWidget::showKeyTooltip(UISoftKeyboardKey *pKey)
+{
+    if (pKey && m_keyTooltips.contains(pKey->position()))
+        sigStatusBarMessage(m_keyTooltips[pKey->position()]);
+    else
+        sigStatusBarMessage(QString());
+
 }
 
@@ -4034 +4071 @@
     connect(m_pKeyboardWidget, &UISoftKeyboardWidget::sigKeyToEdit, this, &UISoftKeyboard::sltKeyToEditChanged);
     connect(m_pKeyboardWidget, &UISoftKeyboardWidget::sigStatusBarMessage, this, &UISoftKeyboard::sltStatusBarMessage);
-    connect(m_pKeyboardWidget, &UISoftKeyboardWidget::sigStatusBarMessage, this, &UISoftKeyboard::sltStatusBarMessage);
     connect(m_pKeyboardWidget, &UISoftKeyboardWidget::sigCurrentColorThemeChanged, this, &UISoftKeyboard::sltHandleKeyboardWidgetColorThemeChange);
 

trunk/src/VBox/Frontends/VirtualBox/xml/multimedia_keys.xml

@@ -55 +55 @@
             <width>25</width>
         </space>
-        <key><!-- Previous -->
+        <key><!-- Previous Media Track-->
             <position>307</position>
             <usageid>0xB6</usageid>
@@ -63 +63 @@
             <staticcaption>⏮️</staticcaption>
         </key>
-        <key><!-- Next -->
+        <key><!-- Next Media Track-->
             <position>308</position>
             <usageid>0xB5</usageid>
@@ -116 +116 @@
         </key>
         <key><!-- Media -->
-            <position>312</position>
+            <position>316</position>
             <usageid>0x183</usageid>
             <usagepage>0x0C</usagepage>