Changeset 79781 in vbox

Timestamp:

Jul 15, 2019 9:11:57 AM (6 years ago)

Author:

vboxsync

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

132148

Message:

FE/Qt: bugref:6143. Adding a reset button the reset the keyboard state

Location:

trunk/src/VBox/Frontends/VirtualBox/src/softkeyboard

Files:

• UISoftKeyboard.cpp (modified) (8 diffs)
• UISoftKeyboard.h (modified) (2 diffs)

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

@@ -700 +700 @@
     void sigShowHideSidePanel();
     void sigShowSettingWidget();
+    void sigResetKeyboard();
 
 public:
@@ -718 +719 @@
     QToolButton  *m_pLayoutListButton;
     QToolButton  *m_pSettingsButton;
+    QToolButton  *m_pResetButton;
     QLabel       *m_pMessageLabel;
 };
@@ -3250 +3252 @@
     , m_pLayoutListButton(0)
     , m_pSettingsButton(0)
+    , m_pResetButton(0)
     , m_pMessageLabel(0)
 {
@@ -3261 +3264 @@
     if (m_pSettingsButton)
         m_pSettingsButton->setToolTip(UISoftKeyboard::tr("Settings"));
+    if (m_pResetButton)
+        m_pResetButton->setToolTip(UISoftKeyboard::tr("Reset the keyboard and release all keys"));
 }
 
@@ -3296 +3301 @@
         connect(m_pSettingsButton, &QToolButton::clicked, this, &UISoftKeyboardStatusBarWidget::sigShowSettingWidget);
         pLayout->addWidget(m_pSettingsButton);
+    }
+
+    m_pResetButton = new QToolButton;
+    if (m_pResetButton)
+    {
+        m_pResetButton->setIcon(UIIconPool::iconSet(":/hd_release_16px.png"));
+        m_pResetButton->setSizePolicy(QSizePolicy::Fixed, QSizePolicy::Fixed);
+        const int iIconMetric = QApplication::style()->pixelMetric(QStyle::PM_SmallIconSize);
+        m_pResetButton->resize(QSize(iIconMetric, iIconMetric));
+        m_pResetButton->setStyleSheet("QToolButton { border: 0px none black; margin: 0px 0px 0px 0px; } QToolButton::menu-indicator {image: none;}");
+        connect(m_pResetButton, &QToolButton::clicked, this, &UISoftKeyboardStatusBarWidget::sigResetKeyboard);
+        pLayout->addWidget(m_pResetButton);
     }
 
@@ -3675 +3692 @@
 }
 
+void UISoftKeyboard::sltResetKeyboard()
+{
+    if (m_pKeyboardWidget)
+        m_pKeyboardWidget->reset();
+    if (m_pLayoutEditor)
+        m_pLayoutEditor->reset();
+    keyboard().ReleaseKeys();
+    update();
+}
+
 void UISoftKeyboard::prepareObjects()
 {
@@ -3745 +3772 @@
     connect(m_pStatusBarWidget, &UISoftKeyboardStatusBarWidget::sigShowHideSidePanel, this, &UISoftKeyboard::sltShowHideSidePanel);
     connect(m_pStatusBarWidget, &UISoftKeyboardStatusBarWidget::sigShowSettingWidget, this, &UISoftKeyboard::sltShowHideSettingsWidget);
+    connect(m_pStatusBarWidget, &UISoftKeyboardStatusBarWidget::sigResetKeyboard, this, &UISoftKeyboard::sltResetKeyboard);
 
     connect(m_pSettingsWidget, &UISoftKeyboardSettingsWidget::sigShowOSMenuKeys, this, &UISoftKeyboard::sltShowHideOSMenuKeys);
@@ -3866 +3894 @@
 }
 
-void UISoftKeyboard::reset()
-{
-    if (m_pKeyboardWidget)
-        m_pKeyboardWidget->reset();
-    if (m_pLayoutEditor)
-        m_pLayoutEditor->reset();
-    keyboard().ReleaseKeys();
-}
-
 #include "UISoftKeyboard.moc"

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

@@ -90 +90 @@
     void sltShowHideNumPad(bool fShow);
     void sltHandleColorCellClick(int iColorRow);
+    void sltResetKeyboard();
 
 private:
@@ -101 +102 @@
     void updateLayoutSelectorList();
     void setDialogGeometry(const QRect &geometry);
-    void reset();
     CKeyboard& keyboard() const;