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

Timestamp:

Jun 11, 2019 1:03:19 PM (6 years ago)

Author:

vboxsync

Message:

FE/Qt: bugref:6143. Sme prep. work for a more able key editor

Location:

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

Files:

• UISoftKeyboard.cpp (modified) (19 diffs)
• UISoftKeyboard.h (modified) (1 diff)

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

@@ -64 +64 @@
     UIKeyType_Modifier,
     UIKeyType_Max
+};
+
+/*********************************************************************************************************************************
+*   UISoftKeyEditor definition.                                                                                  *
+*********************************************************************************************************************************/
+
+class UISoftKeyEditor : public QIWithRetranslateUI<QMainWindow>
+{
+    Q_OBJECT;
+
+public:
+
+    UISoftKeyEditor(QWidget *pParent = 0);
+
+protected:
+
+    virtual void retranslateUi() /* override */;
+
+private:
+
+    void prepareObjects();
+    void prepareConnections();
+
+    QGridLayout *m_pEditorLayout;
+
+    QLabel *m_pBaseCaptionLabel;
+    QLabel *m_pShiftCaptionLabel;
+    QLabel *m_pAltGrCaptionLabel;
+
+    QLineEdit *m_pBaseCaptionEdit;
+    QLineEdit *m_pShiftCaptionEdit;
+    QLineEdit *m_pAltGrCaptionEdit;
+
+    QPushButton *m_pOkButton;
+    QPushButton *m_pCancelButton;
 };
 
@@ -196 +231 @@
 {
     Q_OBJECT;
+    enum Mode
+    {
+        Mode_KeyCapEdit,
+        Mode_Keyboard,
+        Mode_Max
+    };
 
 signals:
@@ -227 +268 @@
     void sltHandleContextMenuRequest(const QPoint &point);
     void sltHandleLoadLayout(QAction *pSenderAction);
-    void sltHandleKeyCapEdit();
     void sltHandleSaveKeyCapFile();
     void sltHandleLoadKeyCapFile();
     void sltHandleUnloadKeyCaps();
-    void sltHandleKepCApEditModeToggle(bool fToggle);
+    void sltHandleKepCapEditModeToggle(bool fToggle);
 
 private:
@@ -278 +318 @@
     QAction *m_pLoadLayoutFileAction;
     QAction *m_pLastSelectedLayout;
-    QAction *m_pChangeKeyCapAction;
+    QAction *m_pKeyCapEditModeToggleAction;
     QLineEdit *m_pKeyCapEditor;
+    Mode       m_enmMode;
 };
 
@@ -326 +367 @@
     QMap<int, QString> m_keyCapMap;
 };
+
+/*********************************************************************************************************************************
+*   UISoftKeyEditor implementation.                                                                                  *
+*********************************************************************************************************************************/
+
+UISoftKeyEditor::UISoftKeyEditor(QWidget *pParent /* = 0 */)
+    :QIWithRetranslateUI<QMainWindow>(pParent)
+    , m_pEditorLayout(0)
+    , m_pBaseCaptionLabel(0)
+    , m_pShiftCaptionLabel(0)
+    , m_pAltGrCaptionLabel(0)
+    , m_pBaseCaptionEdit(0)
+    , m_pShiftCaptionEdit(0)
+    , m_pAltGrCaptionEdit(0)
+    , m_pOkButton(0)
+    , m_pCancelButton(0)
+{
+    prepareObjects();
+}
+
+void UISoftKeyEditor::retranslateUi()
+{
+    if (m_pBaseCaptionLabel)
+        m_pBaseCaptionLabel->setText(UISoftKeyboard::tr("Base Caption"));
+
+
+    if (m_pShiftCaptionLabel)
+        m_pShiftCaptionLabel->setText(UISoftKeyboard::tr("Shift Caption"));
+
+    if (m_pAltGrCaptionLabel)
+        m_pAltGrCaptionLabel->setText(UISoftKeyboard::tr("AltGr Caption"));
+}
+
+void UISoftKeyEditor::prepareObjects()
+{
+    m_pEditorLayout = new QGridLayout;
+
+    if (!m_pEditorLayout)
+        return;
+
+    m_pBaseCaptionLabel = new QLabel;
+    m_pBaseCaptionEdit = new QLineEdit;
+    m_pBaseCaptionLabel->setBuddy(m_pBaseCaptionEdit);
+
+    m_pShiftCaptionLabel = new QLabel;
+    m_pShiftCaptionEdit = new QLineEdit;
+    m_pShiftCaptionLabel->setBuddy(m_pShiftCaptionEdit);
+
+    m_pAltGrCaptionLabel = new QLabel;
+    m_pAltGrCaptionEdit = new QLineEdit;
+    m_pAltGrCaptionLabel->setBuddy(m_pAltGrCaptionEdit);
+
+    setLayout(m_pEditorLayout);
+
+    retranslateUi();
+}
 
 /*********************************************************************************************************************************
@@ -624 +721 @@
     , m_pLoadLayoutFileAction(0)
     , m_pLastSelectedLayout(0)
-    , m_pChangeKeyCapAction(0)
+    , m_pKeyCapEditModeToggleAction(0)
+    , m_enmMode(Mode_Keyboard)
 {
 
@@ -674 +772 @@
                 painter.setBrush(QBrush(m_keyDefaultColor));
 
-            if (&key == m_pKeyBeingEdited)
+            if (m_enmMode == Mode_KeyCapEdit && &key == m_pKeyBeingEdited)
             {
                 m_pKeyCapEditor->setFont(painterFont);
@@ -680 +778 @@
                                              m_fScaleFactorX * key.keyGeometry().width(), m_fScaleFactorY * key.keyGeometry().height());
                 m_pKeyCapEditor->show();
-
+                m_pKeyCapEditor->setFocus();
             }
 
@@ -725 +823 @@
         return;
     m_pKeyPressed = keyUnderMouse(pEvent);
-    handleKeyPress(m_pKeyPressed);
+
+    if (m_enmMode == Mode_Keyboard)
+        handleKeyPress(m_pKeyPressed);
+    else if (m_enmMode == Mode_KeyCapEdit)
+    {
+        /* If the editor is shown already for another key clicking away accepts the entered text: */
+        if (m_pKeyBeingEdited && m_pKeyBeingEdited != m_pKeyUnderMouse)
+        {
+            printf("farkli %p\n", m_pKeyBeingEdited);
+        }
+        m_pKeyBeingEdited = m_pKeyUnderMouse;
+        if (m_pKeyBeingEdited && m_pKeyCapEditor)
+            m_pKeyCapEditor->setText(m_pKeyBeingEdited->keyCap());
+    }
     update();
 }
@@ -736 +847 @@
     if (!m_pKeyPressed)
         return;
-    handleKeyRelease(m_pKeyPressed);
+
+    if (m_enmMode == Mode_Keyboard)
+        handleKeyRelease(m_pKeyPressed);
+
+    update();
     m_pKeyPressed = 0;
-    update();
 }
 
@@ -826 +940 @@
 }
 
-void UISoftKeyboardWidget::sltHandleKeyCapEdit()
-{
-    m_pKeyBeingEdited = m_pKeyUnderMouse;
-    if (m_pKeyBeingEdited && m_pKeyCapEditor)
-        m_pKeyCapEditor->setText(m_pKeyBeingEdited->keyCap());
-}
-
 void UISoftKeyboardWidget::sltHandleSaveKeyCapFile()
 {
@@ -909 +1016 @@
 }
 
-void UISoftKeyboardWidget::sltHandleKepCApEditModeToggle(bool fToggle)
-{
-    Q_UNUSED(fToggle);
+void UISoftKeyboardWidget::sltHandleKepCapEditModeToggle(bool fToggle)
+{
+    if (fToggle)
+        m_enmMode = Mode_KeyCapEdit;
+    else
+        m_enmMode = Mode_Keyboard;
 }
 
@@ -1019 +1129 @@
 void UISoftKeyboardWidget::showContextMenu(const QPoint &globalPoint)
 {
-    m_pChangeKeyCapAction->setEnabled(m_pKeyUnderMouse && !m_pShowPositionsAction->isChecked());
     m_pContextMenu->exec(globalPoint);
     update();
@@ -1125 +1234 @@
     m_pContextMenu = new QMenu(this);
     /* Layout menu: */
-    QMenu *pLayoutMenu = m_pContextMenu->addMenu(UISoftKeyboard::tr("Load Layout"));
     m_pLayoutActionGroup = new QActionGroup(this);
     m_pLayoutActionGroup->setExclusive(true);
@@ -1139 +1247 @@
     m_pLoadLayoutFileAction = m_pLayoutActionGroup->addAction(UISoftKeyboard::tr("Load Layout File..."));
     m_pLoadLayoutFileAction->setCheckable(true);
-    pLayoutMenu->addActions(m_pLayoutActionGroup->actions());
+    m_pContextMenu->addActions(m_pLayoutActionGroup->actions());
 
     /* Keycaps menu: */
-    QMenu *pKeycapsMenu = m_pContextMenu->addMenu(UISoftKeyboard::tr("Keycaps"));
-    QAction *pKeyCapEditModeToggleAction = pKeycapsMenu->addAction(UISoftKeyboard::tr("Key captions editing mode"));
-    connect(pKeyCapEditModeToggleAction, &QAction::toggled, this, &UISoftKeyboardWidget::sltHandleKepCApEditModeToggle);
-    pKeyCapEditModeToggleAction->setCheckable(true);
-    pKeyCapEditModeToggleAction->setChecked(false);
-
-    m_pShowPositionsAction = pKeycapsMenu->addAction(UISoftKeyboard::tr("Show key positions instead of key caps"));
+    m_pKeyCapEditModeToggleAction = m_pContextMenu->addAction(UISoftKeyboard::tr("Key captions editing mode"));
+    connect(m_pKeyCapEditModeToggleAction, &QAction::toggled, this, &UISoftKeyboardWidget::sltHandleKepCapEditModeToggle);
+    m_pKeyCapEditModeToggleAction->setCheckable(true);
+    m_pKeyCapEditModeToggleAction->setChecked(false);
+
+#ifdef DEBUG
+    m_pShowPositionsAction = m_pContextMenu->addAction(UISoftKeyboard::tr("Show key positions instead of key caps"));
     m_pShowPositionsAction->setCheckable(true);
     m_pShowPositionsAction->setChecked(false);
-
-    m_pChangeKeyCapAction = pKeycapsMenu->addAction(UISoftKeyboard::tr("Add/change key cap"));
-    connect(m_pChangeKeyCapAction, &QAction::triggered, this, &UISoftKeyboardWidget::sltHandleKeyCapEdit);
-    QAction *pSaveKeyCapFile = pKeycapsMenu->addAction(UISoftKeyboard::tr("Save key caps to file..."));
+#endif
+
+    QAction *pSaveKeyCapFile = m_pContextMenu->addAction(UISoftKeyboard::tr("Save key caps to file..."));
     connect(pSaveKeyCapFile, &QAction::triggered, this, &UISoftKeyboardWidget::sltHandleSaveKeyCapFile);
-    QAction *pLoadKeyCapFile = pKeycapsMenu->addAction(UISoftKeyboard::tr("Load key caps from file..."));
+    QAction *pLoadKeyCapFile = m_pContextMenu->addAction(UISoftKeyboard::tr("Load key caps from file..."));
     connect(pLoadKeyCapFile, &QAction::triggered, this, &UISoftKeyboardWidget::sltHandleLoadKeyCapFile);
-    QAction *pUnloadKeyCaps = pKeycapsMenu->addAction(UISoftKeyboard::tr("Unload key caps"));
+    QAction *pUnloadKeyCaps = m_pContextMenu->addAction(UISoftKeyboard::tr("Unload key caps"));
     connect(pUnloadKeyCaps, &QAction::triggered, this, &UISoftKeyboardWidget::sltHandleUnloadKeyCaps);
 }
@@ -1166 +1273 @@
     if (m_fInKeyCapEditMode == fEnable)
         return;
-
+    m_enmMode = Mode_KeyCapEdit;
 }
 
@@ -1478 +1585 @@
 void UISoftKeyboard::retranslateUi()
 {
+    if (m_pSettingsButton)
+        m_pSettingsButton->setToolTip(tr("Settings Menu"));
 }
 
@@ -1547 +1656 @@
             this, &UISoftKeyboard::sltHandleStatusBarContextMenuRequest);
 
+    statusBar()->setStyleSheet( "QStatusBar::item { border: 0px}" );
+    // QWidget *pStatusBarWidget = new QWidget;
+    // QHBoxLayout *pStatusBarLayout = new QHBoxLayout(pStatusBarWidget);
+    // pStatusBarLayout->setSpacing(0);
+    // pStatusBarLayout->setContentsMargins(0, 0, 0, 0);
+
     m_pSettingsButton = new QToolButton;
-    m_pSettingsButton->setIcon(UIIconPool::iconSet(":/vm_settings_16px.png"));
+    m_pSettingsButton->setIcon(UIIconPool::iconSet(":/keyboard_settings_16px.png"));
     m_pSettingsButton->setSizePolicy(QSizePolicy::Fixed, QSizePolicy::Fixed);
     const int iIconMetric = QApplication::style()->pixelMetric(QStyle::PM_SmallIconSize);
@@ -1555 +1670 @@
     statusBar()->addPermanentWidget(m_pSettingsButton);
 
+    QToolButton *pButton = new QToolButton;
+    pButton->setIcon(UIIconPool::iconSet(":/hd_modify_16px.png"));
+    pButton->setStyleSheet("QToolButton { border: 0px none black; margin: 0px 0px 0px 0px; } QToolButton::menu-indicator {image: none;}");
+    statusBar()->addPermanentWidget(pButton);
+
+
+
+    retranslateUi();
 }
 

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

@@ -64 +64 @@
     void sltHandleKeyCapFileChange(const QString &strKeyCapFileName);
     void sltHandleStatusBarContextMenuRequest(const QPoint &point);
+
 private: