Changeset 79206 in vbox

Timestamp:

Jun 18, 2019 10:18:26 AM (6 years ago)

Author:

vboxsync

Message:

FE/Qt: bugref:6143. Adding layout copy thingy

Location:

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

Files:

• UISoftKeyboard.cpp (modified) (29 diffs)
• UISoftKeyboard.h (modified) (3 diffs)

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

@@ -141 +141 @@
     void sltKeyShiftCaptionChange();
     void sltKeyAltGrCaptionChange();
-    void sltHandlePhysicalLayoutChanged();
+    void sltPhysicalLayoutChanged();
 
 private:
@@ -156 +156 @@
 
     QComboBox *m_pPhysicalLayoutCombo;
+    QLabel *m_pTitleLabel;
     QLabel *m_pPhysicalLayoutLabel;
     QLabel *m_pLayoutNameLabel;
@@ -187 +188 @@
 signals:
 
+    void sigSaveLayout();
+    void sigCopyLayout();
     void sigLayoutSelectionChanged(const QString &strSelectedLayoutName);
     void sigShowLayoutEditor();
@@ -211 +214 @@
     QToolButton *m_pApplyLayoutButton;
     QToolButton *m_pEditLayoutButton;
+    QToolButton *m_pCopyLayoutButton;
+    QToolButton *m_pSaveLayoutButton;
     QLabel      *m_pTitleLabel;
     QToolButton *m_pCloseButton;
@@ -426 +431 @@
       * corresponding UISoftKeyboardLayout */
     void updateKeyCaptionsInLayout(UISoftKeyboardKey *pKey);
+    void addLayout(const UISoftKeyboardLayout &newLayout);
 
 protected:
@@ -437 +443 @@
 private slots:
 
-    void sltHandleContextMenuRequest(const QPoint &point);
-    void sltHandleSaveLayout();
+    void sltContextMenuRequest(const QPoint &point);
+    void sltSaveLayout();
     void sltPhysicalLayoutForLayoutChanged(int iIndex);
 
@@ -583 +589 @@
     , m_pCaptionEditGroupBox(0)
     , m_pPhysicalLayoutCombo(0)
+    , m_pTitleLabel(0)
     , m_pPhysicalLayoutLabel(0)
     , m_pLayoutNameLabel(0)
@@ -656 +663 @@
 void UILayoutEditor::retranslateUi()
 {
+    if (m_pTitleLabel)
+        m_pTitleLabel->setText(UISoftKeyboard::tr("Layout Editor"));
     if (m_pGoBackButton)
         m_pGoBackButton->setToolTip(UISoftKeyboard::tr("Return Back to Layout List"));
@@ -702 +711 @@
 }
 
-void UILayoutEditor::sltHandlePhysicalLayoutChanged()
+void UILayoutEditor::sltPhysicalLayoutChanged()
 {
     if (!m_pPhysicalLayoutCombo || !m_pLayout)
@@ -719 +728 @@
     setLayout(m_pEditorLayout);
 
+    QHBoxLayout *pTitleLayout = new QHBoxLayout;
     m_pGoBackButton = new QToolButton;
     m_pGoBackButton->setIcon(UIIconPool::defaultIcon(UIIconPool::UIDefaultIconType_ArrowBack));
@@ -724 +734 @@
     m_pEditorLayout->addWidget(m_pGoBackButton, 0, 0, 1, 1);
     connect(m_pGoBackButton, &QToolButton::pressed, this, &UILayoutEditor::sigGoBackButton);
+    pTitleLayout->addWidget(m_pGoBackButton);
+    pTitleLayout->addStretch(2);
+    m_pTitleLabel = new QLabel;
+    pTitleLayout->addWidget(m_pTitleLabel);
+    m_pEditorLayout->addLayout(pTitleLayout, 0, 0, 1, 2);
+
 
     m_pLayoutNameLabel = new QLabel;
     m_pLayoutNameEdit = new QLineEdit;
     m_pLayoutNameLabel->setBuddy(m_pLayoutNameEdit);
-    m_pEditorLayout->addWidget(m_pLayoutNameLabel, 1, 0, 1, 1);
-    m_pEditorLayout->addWidget(m_pLayoutNameEdit, 1, 1, 1, 1);
+    m_pEditorLayout->addWidget(m_pLayoutNameLabel, 2, 0, 1, 1);
+    m_pEditorLayout->addWidget(m_pLayoutNameEdit, 2, 1, 1, 1);
     connect(m_pLayoutNameEdit, &QLineEdit::editingFinished, this, &UILayoutEditor::sigLayoutEdited);
 
@@ -736 +752 @@
     m_pPhysicalLayoutCombo = new QComboBox;
     m_pPhysicalLayoutLabel->setBuddy(m_pPhysicalLayoutCombo);
-    m_pEditorLayout->addWidget(m_pPhysicalLayoutLabel, 2, 0, 1, 1);
-    m_pEditorLayout->addWidget(m_pPhysicalLayoutCombo, 2, 1, 1, 1);
+    m_pEditorLayout->addWidget(m_pPhysicalLayoutLabel, 3, 0, 1, 1);
+    m_pEditorLayout->addWidget(m_pPhysicalLayoutCombo, 3, 1, 1, 1);
     connect(m_pPhysicalLayoutCombo, static_cast<void(QComboBox::*)(int)>(&QComboBox::currentIndexChanged),
-            this, &UILayoutEditor::sltHandlePhysicalLayoutChanged);
+            this, &UILayoutEditor::sltPhysicalLayoutChanged);
 
     m_pSelectedKeyGroupBox = new QGroupBox;
     m_pSelectedKeyGroupBox->setEnabled(false);
 
-    m_pEditorLayout->addWidget(m_pSelectedKeyGroupBox, 3, 0, 1, 2);
+    m_pEditorLayout->addWidget(m_pSelectedKeyGroupBox, 4, 0, 1, 2);
     QGridLayout *pSelectedKeyLayout = new QGridLayout(m_pSelectedKeyGroupBox);
     pSelectedKeyLayout->setSpacing(0);
@@ -839 +855 @@
     , m_pApplyLayoutButton(0)
     , m_pEditLayoutButton(0)
+    , m_pCopyLayoutButton(0)
+    , m_pSaveLayoutButton(0)
     , m_pTitleLabel(0)
     , m_pCloseButton(0)
@@ -878 +896 @@
     if (m_pEditLayoutButton)
         m_pEditLayoutButton->setToolTip(UISoftKeyboard::tr("Edit the selected layout"));
+    if (m_pCopyLayoutButton)
+        m_pCopyLayoutButton->setToolTip(UISoftKeyboard::tr("Copy the selected layout"));
+    if (m_pSaveLayoutButton)
+        m_pSaveLayoutButton->setToolTip(UISoftKeyboard::tr("Save the selected layout into File"));
     if (m_pTitleLabel)
         m_pTitleLabel->setText(UISoftKeyboard::tr("Layout List"));
@@ -914 +936 @@
     pButtonsLayout->addWidget(m_pEditLayoutButton);
     connect(m_pEditLayoutButton, &QToolButton::pressed, this, &UILayoutSelector::sigShowLayoutEditor);
+
+    m_pCopyLayoutButton = new QToolButton;
+    m_pCopyLayoutButton->setIcon(UIIconPool::iconSet(":/vm_clone_16px.png"));
+    pButtonsLayout->addWidget(m_pCopyLayoutButton);
+    connect(m_pCopyLayoutButton, &QToolButton::pressed, this, &UILayoutSelector::sigCopyLayout);
+
+    m_pSaveLayoutButton = new QToolButton;
+    m_pSaveLayoutButton->setIcon(UIIconPool::iconSet(":/vm_save_state_16px.png"));
+    pButtonsLayout->addWidget(m_pSaveLayoutButton);
+    connect(m_pSaveLayoutButton, &QToolButton::pressed, this, &UILayoutSelector::sigSaveLayout);
+
 
     pButtonsLayout->addStretch(2);
@@ -1419 +1452 @@
 }
 
-void UISoftKeyboardWidget::sltHandleContextMenuRequest(const QPoint &point)
+void UISoftKeyboardWidget::sltContextMenuRequest(const QPoint &point)
 {
     showContextMenu(mapToGlobal(point));
 }
 
-// void UISoftKeyboardWidget::sltHandleLoadLayout(QAction *pSenderAction)
+// void UISoftKeyboardWidget::sltLoadLayout(QAction *pSenderAction)
 // {
 //     if (!pSenderAction)
@@ -1460 +1493 @@
 // }
 
-void UISoftKeyboardWidget::sltHandleSaveLayout()
+void UISoftKeyboardWidget::sltSaveLayout()
 {
     QString strFileName = QIFileDialog::getSaveFileName(vboxGlobal().documentsPath(), UISoftKeyboard::tr("XML files (*.xml)"),
@@ -1517 +1550 @@
 }
 
-// void UISoftKeyboardWidget::sltHandleLoadKeyCapFile()
+// void UISoftKeyboardWidget::sltLoadKeyCapFile()
 // {
 //     const QString strFileName = QIFileDialog::getOpenFileName(QString(), UISoftKeyboard::tr("XML files (*.xml)"), this,
@@ -1561 +1594 @@
     newCaptions.m_strAltGr = pKey->altGrCaption();
     m_pCurrentKeyboardLayout->updateKeyCaptions(pKey->position(), newCaptions);
+}
+
+void UISoftKeyboardWidget::addLayout(const UISoftKeyboardLayout &newLayout)
+{
+    m_layouts.append(newLayout);
 }
 
@@ -1770 +1808 @@
         return false;
 
-
-    UISoftKeyboardPhysicalLayout *pPhysicalLayout = 0;
-    /* Search for the physical layout among the one stored in m_pPhysicalLayout: */
-    for (int i = 0; i < m_physicalLayouts.size(); ++i)
-    {
-        if (keyboardLayoutReader.physicalLayoutUUID() == m_physicalLayouts[i].m_uId)
-            pPhysicalLayout = &(m_physicalLayouts[i]);
-    }
-
+    UISoftKeyboardPhysicalLayout *pPhysicalLayout = findPhysicalLayout(keyboardLayoutReader.physicalLayoutUUID());
     /* If no pyhsical layout with the UUID the keyboard layout refers is found then cancel loading the keyboard layout: */
     if (!pPhysicalLayout)
@@ -1840 +1870 @@
     setContextMenuPolicy(Qt::CustomContextMenu);
     connect(this, &UISoftKeyboardWidget::customContextMenuRequested,
-            this, &UISoftKeyboardWidget::sltHandleContextMenuRequest);
+            this, &UISoftKeyboardWidget::sltContextMenuRequest);
 }
 
@@ -2271 +2301 @@
     {
         m_pKeyboardWidget->loadLayouts();
-        /* Update the selector widget: */
-        if (m_pLayoutSelector)
-        {
-            m_pLayoutSelector->setLayoutList(m_pKeyboardWidget->layoutNameList());
-                        m_pLayoutSelector->setCurrentLayout(m_pKeyboardWidget->currentLayout() ? m_pKeyboardWidget->currentLayout()->name() : QString());
-        }
+        updateLayoutSelector();
         if (m_pLayoutEditor)
             m_pLayoutEditor->setPhysicalLayoutList(m_pKeyboardWidget->physicalLayouts());
@@ -2315 +2340 @@
 }
 
-void UISoftKeyboard::sltHandleKeyboardLedsChange()
+void UISoftKeyboard::sltKeyboardLedsChange()
 {
     // bool fNumLockLed = m_pSession->isNumLock();
@@ -2322 +2347 @@
 }
 
-void UISoftKeyboard::sltHandlePutKeyboardSequence(QVector<LONG> sequence)
+void UISoftKeyboard::sltPutKeyboardSequence(QVector<LONG> sequence)
 {
     keyboard().PutScancodes(sequence);
 }
 
-void UISoftKeyboard::sltHandleStatusBarContextMenuRequest(const QPoint &point)
+void UISoftKeyboard::sltStatusBarContextMenuRequest(const QPoint &point)
 {
     if (m_pKeyboardWidget)
@@ -2380 +2405 @@
         return;
     m_pKeyboardWidget->update();
-    if (m_pLayoutSelector)
-    {
-        m_pLayoutSelector->setLayoutList(m_pKeyboardWidget->layoutNameList());
-        m_pLayoutSelector->setCurrentLayout(m_pKeyboardWidget->currentLayout() ? m_pKeyboardWidget->currentLayout()->name() : QString());
-    }
+    updateLayoutSelector();
 }
 
@@ -2401 +2422 @@
         return;
     m_pSidePanelWidget->setVisible(!m_pSidePanelWidget->isVisible());
+}
+
+void UISoftKeyboard::sltCopyLayout()
+{
+    if (!m_pKeyboardWidget || !m_pKeyboardWidget->currentLayout())
+        return;
+    UISoftKeyboardLayout newLayout(*(m_pKeyboardWidget->currentLayout()));
+    QString strNewName = QString("%1-%2").arg(newLayout.name()).arg(tr("Copy"));
+    newLayout.setName(strNewName);
+    m_pKeyboardWidget->addLayout(newLayout);
+    updateLayoutSelector();
+}
+
+void UISoftKeyboard::sltSaveLayout()
+{
 }
 
@@ -2443 +2479 @@
 void UISoftKeyboard::prepareConnections()
 {
-    connect(m_pSession, &UISession::sigKeyboardLedsChange, this, &UISoftKeyboard::sltHandleKeyboardLedsChange);
-    connect(m_pKeyboardWidget, &UISoftKeyboardWidget::sigPutKeyboardSequence, this, &UISoftKeyboard::sltHandlePutKeyboardSequence);
+    connect(m_pSession, &UISession::sigKeyboardLedsChange, this, &UISoftKeyboard::sltKeyboardLedsChange);
+    connect(m_pKeyboardWidget, &UISoftKeyboardWidget::sigPutKeyboardSequence, this, &UISoftKeyboard::sltPutKeyboardSequence);
     connect(m_pKeyboardWidget, &UISoftKeyboardWidget::sigCurrentLayoutChange, this, &UISoftKeyboard::sltCurentLayoutChanged);
     connect(m_pKeyboardWidget, &UISoftKeyboardWidget::sigKeyToEdit, this, &UISoftKeyboard::sltKeyToEditChanged);
@@ -2451 +2487 @@
     connect(m_pLayoutSelector, &UILayoutSelector::sigShowLayoutEditor, this, &UISoftKeyboard::sltShowLayoutEditor);
     connect(m_pLayoutSelector, &UILayoutSelector::sigCloseLayoutList, this, &UISoftKeyboard::sltShowHideSidePanel);
+    connect(m_pLayoutSelector, &UILayoutSelector::sigSaveLayout, this, &UISoftKeyboard::sltSaveLayout);
+    connect(m_pLayoutSelector, &UILayoutSelector::sigCopyLayout, this, &UISoftKeyboard::sltCopyLayout);
     connect(m_pLayoutEditor, &UILayoutEditor::sigGoBackButton, this, &UISoftKeyboard::sltShowLayoutSelector);
     connect(m_pLayoutEditor, &UILayoutEditor::sigLayoutEdited, this, &UISoftKeyboard::sltLayoutEdited);
@@ -2480 +2518 @@
 }
 
+void UISoftKeyboard::updateLayoutSelector()
+{
+    if (!m_pKeyboardWidget || !m_pLayoutSelector)
+        return;
+    m_pLayoutSelector->setLayoutList(m_pKeyboardWidget->layoutNameList());
+    m_pLayoutSelector->setCurrentLayout(m_pKeyboardWidget->currentLayout() ? m_pKeyboardWidget->currentLayout()->name() : QString());
+}
+
 CKeyboard& UISoftKeyboard::keyboard() const
 {

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

@@ -65 +65 @@
 private slots:
 
-    void sltHandleKeyboardLedsChange();
-    void sltHandlePutKeyboardSequence(QVector<LONG> sequence);
-    void sltHandleStatusBarContextMenuRequest(const QPoint &point);
+    void sltKeyboardLedsChange();
+    void sltPutKeyboardSequence(QVector<LONG> sequence);
+    void sltStatusBarContextMenuRequest(const QPoint &point);
     /** Handles the signal we get from the layout selector widget.
       * Selection changed is forwarded to the keyboard widget. */
@@ -80 +80 @@
     void sltKeyCaptionsEdited(UISoftKeyboardKey* pKey);
     void sltShowHideSidePanel();
+    void sltCopyLayout();
+    void sltSaveLayout();
 
 private:
@@ -88 +90 @@
     void loadSettings();
     void updateStatusBarMessage(const QString &strLayoutName);
+    void updateLayoutSelector();
     CKeyboard& keyboard() const;