Changeset 81110 in vbox

Timestamp:

Oct 4, 2019 9:57:56 AM (5 years ago)

Author:

vboxsync

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

133735

Message:

FE/Qt: bugref:6143. Refactoring

Location:

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

Files:

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

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

@@ -21 +21 @@
 #include <QColorDialog>
 #include <QComboBox>
+#include <QDir>
 #include <QFile>
 #include <QGroupBox>
@@ -28 +29 @@
 #include <QLineEdit>
 #include <QListWidget>
-#include <QMenu>
 #include <QPainter>
 #include <QPicture>
-#include <QPushButton>
 #include <QSplitter>
 #include <QStatusBar>
@@ -43 +42 @@
 /* GUI includes: */
 #include "UIDesktopWidgetWatchdog.h"
-#include "QIDialogButtonBox.h"
-#include "QIFileDialog.h"
 #include "UIExtraDataManager.h"
 #include "UIIconPool.h"
@@ -51 +48 @@
 #include "UISession.h"
 #include "UISoftKeyboard.h"
-#include "QIToolButton.h"
 #include "UICommon.h"
 #ifdef VBOX_WS_MAC
 # include "VBoxUtils-darwin.h"
 #endif
-
-/* COM includes: */
-#include "CGuest.h"
-#include "CEventSource.h"
 
 /* Forward declarations: */
@@ -154 +146 @@
     QUuid    m_uId;
     QString  m_strName;
-    QVector<UISoftKeyboardRow>  m_rows;
+    QVector<UISoftKeyboardRow>    m_rows;
     QMap<int, UISoftKeyboardKey*> m_lockKeys;
 };
 
 /*********************************************************************************************************************************
-*   UILayoutEditor definition.                                                                                  *
+*   UIKeyboardLayoutEditor definition.                                                                                  *
 *********************************************************************************************************************************/
 
-class UILayoutEditor : public QIWithRetranslateUI<QWidget>
+class UIKeyboardLayoutEditor : public QIWithRetranslateUI<QWidget>
 {
     Q_OBJECT;
@@ -174 +166 @@
 public:
 
-    UILayoutEditor(QWidget *pParent = 0);
+    UIKeyboardLayoutEditor(QWidget *pParent = 0);
     void setKey(UISoftKeyboardKey *pKey);
     void setLayoutToEdit(UISoftKeyboardLayout *pLayout);
@@ -196 +188 @@
 private:
 
-    void prepareObjects();
-    void prepareConnections();
+    void     prepareObjects();
+    void     prepareConnections();
     QWidget *prepareKeyCaptionEditWidgets();
-    void resetKeyWidgets();
+    void     resetKeyWidgets();
     QGridLayout *m_pEditorLayout;
     QToolButton *m_pGoBackButton;
-    QGroupBox *m_pSelectedKeyGroupBox;
-    QGroupBox *m_pCaptionEditGroupBox;
-
-    QComboBox *m_pPhysicalLayoutCombo;
-    QLabel *m_pTitleLabel;
-    QLabel *m_pPhysicalLayoutLabel;
-    QLabel *m_pLayoutNameLabel;
-    QLabel *m_pLayoutNativeNameLabel;
-    QLabel *m_pScanCodeLabel;
-    QLabel *m_pPositionLabel;
-    QLabel *m_pBaseCaptionLabel;
-    QLabel *m_pShiftCaptionLabel;
-    QLabel *m_pAltGrCaptionLabel;
-    QLabel *m_pShiftAltGrCaptionLabel;
-
-    QLineEdit *m_pLayoutNameEdit;
-    QLineEdit *m_pLayoutNativeNameEdit;
-    QLineEdit *m_pScanCodeEdit;
-    QLineEdit *m_pPositionEdit;
-    QLineEdit *m_pBaseCaptionEdit;
-    QLineEdit *m_pShiftCaptionEdit;
-    QLineEdit *m_pAltGrCaptionEdit;
-    QLineEdit *m_pShiftAltGrCaptionEdit;
+    QGroupBox   *m_pSelectedKeyGroupBox;
+    QGroupBox   *m_pCaptionEditGroupBox;
+    QComboBox   *m_pPhysicalLayoutCombo;
+    QLabel      *m_pTitleLabel;
+    QLabel      *m_pPhysicalLayoutLabel;
+    QLabel      *m_pLayoutNameLabel;
+    QLabel      *m_pLayoutNativeNameLabel;
+    QLabel      *m_pScanCodeLabel;
+    QLabel      *m_pPositionLabel;
+    QLabel      *m_pBaseCaptionLabel;
+    QLabel      *m_pShiftCaptionLabel;
+    QLabel      *m_pAltGrCaptionLabel;
+    QLabel      *m_pShiftAltGrCaptionLabel;
+    QLineEdit   *m_pLayoutNameEdit;
+    QLineEdit   *m_pLayoutNativeNameEdit;
+    QLineEdit   *m_pScanCodeEdit;
+    QLineEdit   *m_pPositionEdit;
+    QLineEdit   *m_pBaseCaptionEdit;
+    QLineEdit   *m_pShiftCaptionEdit;
+    QLineEdit   *m_pAltGrCaptionEdit;
+    QLineEdit   *m_pShiftAltGrCaptionEdit;
 
     /** The key which is being currently edited. Might be Null. */
@@ -238 +228 @@
 class UILayoutSelector : public QIWithRetranslateUI<QWidget>
 {
+
     Q_OBJECT;
 
@@ -285 +276 @@
 class UISoftKeyboardRow
 {
+
 public:
 
@@ -382 +374 @@
     void updateState(bool fPressed);
 
-    QRect      m_keyGeometry;
+    QRect    m_keyGeometry;
     /** Stores the key polygon in local coordinates. */
-    QPolygon   m_polygon;
+    QPolygon m_polygon;
     KeyType  m_enmType;
     KeyState m_enmState;
     /** Key width as it is read from the xml file. */
-    int        m_iWidth;
+    int      m_iWidth;
     /** Key height as it is read from the xml file. */
-    int        m_iHeight;
-    int        m_iSpaceWidthAfter;
-    LONG       m_scanCode;
+    int      m_iHeight;
+    int      m_iSpaceWidthAfter;
+    LONG     m_scanCode;
     QVector<LONG> m_scanCodePrefix;
 
@@ -404 +396 @@
 
     /** Key's position in the layout. */
-    int        m_iPosition;
+    int  m_iPosition;
     UISoftKeyboardWidget  *m_pParentWidget;
-
     LONG m_iUsageId;
     LONG m_iUsagePage;
-
     bool m_fIsNumPadKey;
     bool m_fIsOSMenuKey;
@@ -476 +466 @@
 private:
 
+    QMap<int, KeyCaptions> m_keyCapMap;
+    QMap<int, QPicture>    m_pictureMap;
+
     /** The UUID of the physical layout used by this layout. */
-    QUuid m_physicalLayoutUuid;
-
-    QMap<int, KeyCaptions> m_keyCapMap;
-    QMap<int, QPicture> m_pictureMap;
-
+    QUuid   m_physicalLayoutUuid;
     /** This is the English name of the layout. */
     QString m_strName;
@@ -497 +486 @@
 class UISoftKeyboardColorTheme
 {
+
 public:
 
@@ -506 +496 @@
 
 private:
+
     QVector<QColor> m_colors;
 };
@@ -517 +508 @@
 {
     Q_OBJECT;
+
     enum Mode
     {
@@ -554 +546 @@
     void deleteCurrentLayout();
     void toggleEditMode(bool fIsEditMode);
-    /** Is called when the captions in UISoftKeyboardKey is changed and forward this changes to
-      * corresponding UISoftKeyboardLayout */
-    //void updateKeyCaptionsInLayout(UISoftKeyboardKey *pKey);
+
     void saveCurentLayoutToFile();
     void copyCurentLayout();
@@ -638 +628 @@
     int   m_iRightMargin;
     int   m_iBottomMargin;
-
-    Mode     m_enmMode;
-
-    bool m_fHideOSMenuKeys;
-    bool m_fHideNumPad;
+    Mode  m_enmMode;
+    bool  m_fHideOSMenuKeys;
+    bool  m_fHideNumPad;
 };
 
@@ -711 +699 @@
     virtual void retranslateUi() /* override */;
 
-private slots:
-
-
 private:
 
@@ -847 +832 @@
 
 /*********************************************************************************************************************************
-*   UILayoutEditor implementation.                                                                                  *
+*   UIKeyboardLayoutEditor implementation.                                                                                  *
 *********************************************************************************************************************************/
 
-UILayoutEditor::UILayoutEditor(QWidget *pParent /* = 0 */)
+UIKeyboardLayoutEditor::UIKeyboardLayoutEditor(QWidget *pParent /* = 0 */)
     :QIWithRetranslateUI<QWidget>(pParent)
     , m_pEditorLayout(0)
@@ -882 +867 @@
 }
 
-void UILayoutEditor::setKey(UISoftKeyboardKey *pKey)
+void UIKeyboardLayoutEditor::setKey(UISoftKeyboardKey *pKey)
 {
     if (m_pKey == pKey || !m_pLayout)
@@ -923 +908 @@
 }
 
-void UILayoutEditor::setLayoutToEdit(UISoftKeyboardLayout *pLayout)
+void UIKeyboardLayoutEditor::setLayoutToEdit(UISoftKeyboardLayout *pLayout)
 {
     if (m_pLayout == pLayout)
@@ -947 +932 @@
 }
 
-void UILayoutEditor::setPhysicalLayoutList(const QVector<UISoftKeyboardPhysicalLayout> &physicalLayouts)
+void UIKeyboardLayoutEditor::setPhysicalLayoutList(const QVector<UISoftKeyboardPhysicalLayout> &physicalLayouts)
 {
     if (!m_pPhysicalLayoutCombo)
@@ -956 +941 @@
 }
 
-void UILayoutEditor::retranslateUi()
+void UIKeyboardLayoutEditor::retranslateUi()
 {
     if (m_pTitleLabel)
@@ -997 +982 @@
 }
 
-void UILayoutEditor::sltKeyBaseCaptionChange(const QString &strCaption)
+void UIKeyboardLayoutEditor::sltKeyBaseCaptionChange(const QString &strCaption)
 {
     if (!m_pKey || !m_pLayout)
@@ -1007 +992 @@
 }
 
-void UILayoutEditor::sltKeyShiftCaptionChange(const QString &strCaption)
+void UIKeyboardLayoutEditor::sltKeyShiftCaptionChange(const QString &strCaption)
 {
     if (!m_pKey || !m_pLayout)
@@ -1017 +1002 @@
 }
 
-void UILayoutEditor::sltKeyAltGrCaptionChange(const QString &strCaption)
+void UIKeyboardLayoutEditor::sltKeyAltGrCaptionChange(const QString &strCaption)
 {
     if (!m_pKey || !m_pLayout)
@@ -1027 +1012 @@
 }
 
-void UILayoutEditor::sltKeyShiftAltGrCaptionChange(const QString &strCaption)
+void UIKeyboardLayoutEditor::sltKeyShiftAltGrCaptionChange(const QString &strCaption)
 {
     if (!m_pKey || !m_pLayout)
@@ -1037 +1022 @@
 }
 
-void UILayoutEditor::sltPhysicalLayoutChanged()
+void UIKeyboardLayoutEditor::sltPhysicalLayoutChanged()
 {
     if (!m_pPhysicalLayoutCombo || !m_pLayout)
@@ -1047 +1032 @@
 }
 
-void UILayoutEditor::sltLayoutNameChanged(const QString &strName)
+void UIKeyboardLayoutEditor::sltLayoutNameChanged(const QString &strName)
 {
     if (!m_pLayout || m_pLayout->name() == strName)
@@ -1055 +1040 @@
 }
 
-void UILayoutEditor::sltLayoutNativeNameChanged(const QString &strNativeName)
+void UIKeyboardLayoutEditor::sltLayoutNativeNameChanged(const QString &strNativeName)
 {
     if (!m_pLayout || m_pLayout->nativeName() == strNativeName)
@@ -1063 +1048 @@
 }
 
-void UILayoutEditor::prepareObjects()
+void UIKeyboardLayoutEditor::prepareObjects()
 {
     m_pEditorLayout = new QGridLayout;
@@ -1074 +1059 @@
     m_pGoBackButton->setToolButtonStyle(Qt::ToolButtonTextBesideIcon);
     m_pGoBackButton->setIcon(UIIconPool::defaultIcon(UIIconPool::UIDefaultIconType_ArrowBack));
-    //m_pGoBackButton->setStyleSheet("QToolButton { border: 0px none black; margin: 0px 0px 0px 0px; } QToolButton::menu-indicator {image: none;}");
     m_pGoBackButton->setAutoRaise(true);
     m_pEditorLayout->addWidget(m_pGoBackButton, 0, 0, 1, 1);
-    connect(m_pGoBackButton, &QToolButton::clicked, this, &UILayoutEditor::sigGoBackButton);
+    connect(m_pGoBackButton, &QToolButton::clicked, this, &UIKeyboardLayoutEditor::sigGoBackButton);
     m_pTitleLabel = new QLabel;
     pTitleLayout->addWidget(m_pTitleLabel);
@@ -1089 +1073 @@
     m_pEditorLayout->addWidget(m_pLayoutNativeNameLabel, 2, 0, 1, 1);
     m_pEditorLayout->addWidget(m_pLayoutNativeNameEdit, 2, 1, 1, 1);
-    connect(m_pLayoutNativeNameEdit, &QLineEdit::textChanged, this, &UILayoutEditor::sltLayoutNativeNameChanged);
+    connect(m_pLayoutNativeNameEdit, &QLineEdit::textChanged, this, &UIKeyboardLayoutEditor::sltLayoutNativeNameChanged);
 
 
@@ -1097 +1081 @@
     m_pEditorLayout->addWidget(m_pLayoutNameLabel, 3, 0, 1, 1);
     m_pEditorLayout->addWidget(m_pLayoutNameEdit, 3, 1, 1, 1);
-    connect(m_pLayoutNameEdit, &QLineEdit::textChanged, this, &UILayoutEditor::sltLayoutNameChanged);
+    connect(m_pLayoutNameEdit, &QLineEdit::textChanged, this, &UIKeyboardLayoutEditor::sltLayoutNameChanged);
 
 
@@ -1106 +1090 @@
     m_pEditorLayout->addWidget(m_pPhysicalLayoutCombo, 4, 1, 1, 1);
     connect(m_pPhysicalLayoutCombo, static_cast<void(QComboBox::*)(int)>(&QComboBox::currentIndexChanged),
-            this, &UILayoutEditor::sltPhysicalLayoutChanged);
+            this, &UIKeyboardLayoutEditor::sltPhysicalLayoutChanged);
 
     m_pSelectedKeyGroupBox = new QGroupBox;
@@ -1141 +1125 @@
 }
 
-QWidget *UILayoutEditor::prepareKeyCaptionEditWidgets()
+QWidget *UIKeyboardLayoutEditor::prepareKeyCaptionEditWidgets()
 {
     m_pCaptionEditGroupBox = new QGroupBox;
@@ -1159 +1143 @@
     pCaptionEditorLayout->addWidget(m_pBaseCaptionLabel, 0, 0);
     pCaptionEditorLayout->addWidget(m_pBaseCaptionEdit, 0, 1);
-    connect(m_pBaseCaptionEdit, &QLineEdit::textChanged, this, &UILayoutEditor::sltKeyBaseCaptionChange);
+    connect(m_pBaseCaptionEdit, &QLineEdit::textChanged, this, &UIKeyboardLayoutEditor::sltKeyBaseCaptionChange);
 
     m_pShiftCaptionLabel = new QLabel;
@@ -1166 +1150 @@
     pCaptionEditorLayout->addWidget(m_pShiftCaptionLabel, 1, 0);
     pCaptionEditorLayout->addWidget(m_pShiftCaptionEdit, 1, 1);
-    connect(m_pShiftCaptionEdit, &QLineEdit::textChanged, this, &UILayoutEditor::sltKeyShiftCaptionChange);
+    connect(m_pShiftCaptionEdit, &QLineEdit::textChanged, this, &UIKeyboardLayoutEditor::sltKeyShiftCaptionChange);
 
     m_pAltGrCaptionLabel = new QLabel;
@@ -1173 +1157 @@
     pCaptionEditorLayout->addWidget(m_pAltGrCaptionLabel, 2, 0);
     pCaptionEditorLayout->addWidget(m_pAltGrCaptionEdit, 2, 1);
-    connect(m_pAltGrCaptionEdit, &QLineEdit::textChanged, this, &UILayoutEditor::sltKeyAltGrCaptionChange);
+    connect(m_pAltGrCaptionEdit, &QLineEdit::textChanged, this, &UIKeyboardLayoutEditor::sltKeyAltGrCaptionChange);
 
     m_pShiftAltGrCaptionLabel = new QLabel;
@@ -1180 +1164 @@
     pCaptionEditorLayout->addWidget(m_pShiftAltGrCaptionLabel, 3, 0);
     pCaptionEditorLayout->addWidget(m_pShiftAltGrCaptionEdit, 3, 1);
-    connect(m_pShiftAltGrCaptionEdit, &QLineEdit::textChanged, this, &UILayoutEditor::sltKeyShiftAltGrCaptionChange);
+    connect(m_pShiftAltGrCaptionEdit, &QLineEdit::textChanged, this, &UIKeyboardLayoutEditor::sltKeyShiftAltGrCaptionChange);
 
 
@@ -1189 +1173 @@
 }
 
-void UILayoutEditor::reset()
+void UIKeyboardLayoutEditor::reset()
 {
     if (m_pLayoutNameEdit)
@@ -1196 +1180 @@
 }
 
-void UILayoutEditor::resetKeyWidgets()
+void UIKeyboardLayoutEditor::resetKeyWidgets()
 {
     if (m_pScanCodeEdit)
@@ -1321 +1305 @@
     m_pCloseButton->setToolButtonStyle(Qt::ToolButtonTextBesideIcon);
     m_pCloseButton->setIcon(UIIconPool::defaultIcon(UIIconPool::UIDefaultIconType_DialogCancel));
-    //m_pCloseButton->setStyleSheet("QToolButton { border: 0px none black; margin: 0px 0px 0px 0px; } QToolButton::menu-indicator {image: none;}");
     m_pCloseButton->setAutoRaise(true);
     connect(m_pCloseButton, &QToolButton::clicked, this, &UILayoutSelector::sigCloseLayoutList);
@@ -2123 +2106 @@
             painter.drawPolygon(key.polygon());
 
-            //m_pCurrentKeyboardLayout->drawText(key.position(), key.keyGeometry(), painter);
             m_pCurrentKeyboardLayout->drawTextInRect(key.position(), key.keyGeometry(), painter);
 
@@ -3486 +3468 @@
     , m_pCenterWidget(pCenterWidget)
     , m_pMainLayout(0)
-    , m_pKeyboardWidget(0)
     , m_strMachineName(strMachineName)
     , m_pSplitter(0)
     , m_pSidePanelWidget(0)
+    , m_pKeyboardWidget(0)
     , m_pLayoutEditor(0)
     , m_pLayoutSelector(0)
@@ -3719 +3701 @@
         m_pSidePanelWidget->addWidget(m_pLayoutSelector);
 
-    m_pLayoutEditor = new UILayoutEditor;
+    m_pLayoutEditor = new UIKeyboardLayoutEditor;
     if (m_pLayoutEditor)
         m_pSidePanelWidget->addWidget(m_pLayoutEditor);
@@ -3766 +3748 @@
     connect(m_pLayoutSelector, &UILayoutSelector::sigDeleteLayout, this, &UISoftKeyboard::sltDeleteLayout);
     connect(m_pLayoutSelector, &UILayoutSelector::sigCopyLayout, this, &UISoftKeyboard::sltCopyLayout);
-    connect(m_pLayoutEditor, &UILayoutEditor::sigGoBackButton, this, &UISoftKeyboard::sltShowLayoutSelector);
-    connect(m_pLayoutEditor, &UILayoutEditor::sigLayoutEdited, this, &UISoftKeyboard::sltLayoutEdited);
-    connect(m_pLayoutEditor, &UILayoutEditor::sigKeyCaptionsEdited, this, &UISoftKeyboard::sltKeyCaptionsEdited);
+    connect(m_pLayoutEditor, &UIKeyboardLayoutEditor::sigGoBackButton, this, &UISoftKeyboard::sltShowLayoutSelector);
+    connect(m_pLayoutEditor, &UIKeyboardLayoutEditor::sigLayoutEdited, this, &UISoftKeyboard::sltLayoutEdited);
+    connect(m_pLayoutEditor, &UIKeyboardLayoutEditor::sigKeyCaptionsEdited, this, &UISoftKeyboard::sltKeyCaptionsEdited);
 
     connect(m_pStatusBarWidget, &UISoftKeyboardStatusBarWidget::sigShowHideSidePanel, this, &UISoftKeyboard::sltShowHideSidePanel);
@@ -3812 +3794 @@
     const QRect desktopRect = gpDesktop->availableGeometry(this);
     int iDefaultWidth = desktopRect.width() / 2;
-    int iDefaultHeight = iDefaultWidth * fKeyboardAspectRatio;//desktopRect.height() * 3 / 4;
+    int iDefaultHeight = iDefaultWidth * fKeyboardAspectRatio;
     QRect defaultGeometry(0, 0, iDefaultWidth, iDefaultHeight);
 

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

@@ -23 +23 @@
 
 /* Qt includes: */
-#include <QWidget>
+#include <QMainWindow>
 
 /* COM includes: */
-#include "COMEnums.h"
-#include "CGuest.h"
-#include "CEventListener.h"
+#include "COMDefs.h"
 
 /* GUI includes: */
-#include "QIManagerDialog.h"
 #include "QIWithRetranslateUI.h"
 
 /* Forward declarations: */
+class CKeyboard;
 class QHBoxLayout;
-class QVBoxLayout;
 class QToolButton;
-class UILayoutEditor;
+class UIKeyboardLayoutEditor;
 class UILayoutSelector;
 class UISession;
 class UISoftKeyboardKey;
-class UISoftKeyboardLayout;
 class UISoftKeyboardSettingsWidget;
 class UISoftKeyboardStatusBarWidget;
@@ -107 +103 @@
     QWidget       *m_pCenterWidget;
     QHBoxLayout   *m_pMainLayout;
-    UISoftKeyboardWidget       *m_pKeyboardWidget;
-    QString           m_strMachineName;
-    QSplitter        *m_pSplitter;
-    QStackedWidget   *m_pSidePanelWidget;
-    UILayoutEditor   *m_pLayoutEditor;
-    UILayoutSelector *m_pLayoutSelector;
+    QString        m_strMachineName;
+    QSplitter      *m_pSplitter;
+    QStackedWidget *m_pSidePanelWidget;
+    UISoftKeyboardWidget   *m_pKeyboardWidget;
+    UIKeyboardLayoutEditor *m_pLayoutEditor;
+    UILayoutSelector       *m_pLayoutSelector;
 
     UISoftKeyboardSettingsWidget  *m_pSettingsWidget;
     UISoftKeyboardStatusBarWidget *m_pStatusBarWidget;
-
 };