Changeset 79636 in vbox

Timestamp:

Jul 9, 2019 8:57:20 AM (6 years ago)

Author:

vboxsync

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

131938

Message:

FE/Qt: bugref:6143. Some small refactoring

File:

• trunk/src/VBox/Frontends/VirtualBox/src/softkeyboard/UISoftKeyboard.cpp (modified) (6 diffs)

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

@@ -1039 +1039 @@
     m_pEditorLayout->addWidget(m_pGoBackButton, 0, 0, 1, 1);
     connect(m_pGoBackButton, &QToolButton::clicked, this, &UILayoutEditor::sigGoBackButton);
-    pTitleLayout->addWidget(m_pGoBackButton);
-    pTitleLayout->addStretch(2);
     m_pTitleLabel = new QLabel;
     pTitleLayout->addWidget(m_pTitleLabel);
+    pTitleLayout->addStretch(2);
+    pTitleLayout->addWidget(m_pGoBackButton);
     m_pEditorLayout->addLayout(pTitleLayout, 0, 0, 1, 2);
 
@@ -1285 +1285 @@
     m_pCloseButton->setAutoRaise(true);
     connect(m_pCloseButton, &QToolButton::clicked, this, &UILayoutSelector::sigCloseLayoutList);
-    pTitleLayout->addWidget(m_pCloseButton);
-    pTitleLayout->addStretch(2);
     m_pTitleLabel = new QLabel;
     pTitleLayout->addWidget(m_pTitleLabel);
+    pTitleLayout->addStretch(2);
+    pTitleLayout->addWidget(m_pCloseButton);
     pLayout->addLayout(pTitleLayout);
 
@@ -2630 +2630 @@
     /* If no pyhsical layout with the UUID the keyboard layout refers is found then cancel loading the keyboard layout: */
     if (!pPhysicalLayout)
+    {
+        m_layouts.removeLast();
+        return false;
+    }
+    /* Make sure we have unique layout UUIDs: */
+    int iCount = 0;
+    foreach (const UISoftKeyboardLayout &layout, m_layouts)
+    {
+        if (layout.uid() == newLayout.uid())
+            ++iCount;
+    }
+    if (iCount > 1)
     {
         m_layouts.removeLast();
@@ -3118 +3130 @@
     setLayout(pLayout);
 
+    m_pMessageLabel = new QLabel;
+    pLayout->addWidget(m_pMessageLabel);
+
     m_pLayoutListButton = new QToolButton;
     if (m_pLayoutListButton)
@@ -3142 +3157 @@
     }
 
-    m_pMessageLabel = new QLabel;
-    pLayout->addWidget(m_pMessageLabel);
     retranslateUi();
 }
@@ -3243 +3256 @@
     m_pCloseButton->setAutoRaise(true);
     connect(m_pCloseButton, &QToolButton::clicked, this, &UISoftKeyboardSettingsWidget::sigCloseSettingsWidget);
-    pTitleLayout->addWidget(m_pCloseButton);
-    pTitleLayout->addStretch(2);
     m_pTitleLabel = new QLabel;
     pTitleLayout->addWidget(m_pTitleLabel);
+    pTitleLayout->addStretch(2);
+    pTitleLayout->addWidget(m_pCloseButton);
     pSettingsLayout->addLayout(pTitleLayout, 0, 0, 1, 2);