Changeset 81507 in vbox for trunk

Timestamp:

Oct 24, 2019 6:07:39 AM (5 years ago)

Author:

vboxsync

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

134235

Message:

FE/Qt: bugref:6699. Small fixes.

Location:

trunk/src/VBox/Frontends/VirtualBox/src

Files:

• globals/UIMessageCenter.cpp (modified) (1 diff)
• globals/UIMessageCenter.h (modified) (1 diff)
• softkeyboard/UISoftKeyboard.cpp (modified) (4 diffs)

trunk/src/VBox/Frontends/VirtualBox/src/globals/UIMessageCenter.cpp

@@ -2408 +2408 @@
 }
 
-bool UIMessageCenter::confirmSoftKeyboardClose(const QStringList &strNameList) const
-{
-    QString strJoinedString = strNameList.join("<br/>");
-    return questionBinary(0, MessageType_Warning,
-                          tr("<p>Following layouts are edited/copied but not saved:</p>%1"
-                             "<p>Closing this dialog will cause loosing the changes. Proceed?</p>").arg(strJoinedString),
-                          0 /* auto-confirm id */,
-                          "Ok", "Cancel");
-}
-
 #ifdef VBOX_GUI_WITH_NETWORK_MANAGER
 bool UIMessageCenter::confirmCancelingAllNetworkRequests() const

trunk/src/VBox/Frontends/VirtualBox/src/globals/UIMessageCenter.h

@@ -446 +446 @@
     void cannotSwitchScreenInSeamless(quint64 uMinVRAM) const;
     void cannotAddDiskEncryptionPassword(const CConsole &console);
-    bool confirmSoftKeyboardClose(const QStringList &strNameList) const;
 
 #ifdef VBOX_GUI_WITH_NETWORK_MANAGER

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

@@ -2604 +2604 @@
         return;
 
-    m_layouts.remove(m_uCurrentLayoutId);
-    setCurrentLayout(m_layouts.firstKey());
-
     QDir fileToDelete;
     QString strFilePath(layout.sourceFilePath());
@@ -2629 +2626 @@
             sigStatusBarMessage(QString("%1 %2 %3").arg(UISoftKeyboard::tr("Deleting the file ")).arg(strFilePath).arg(UISoftKeyboard::tr(" has failed")));
     }
+
+    m_layouts.remove(m_uCurrentLayoutId);
+    setCurrentLayout(m_layouts.firstKey());
 }
 
@@ -3773 +3773 @@
     if (m_pKeyboardWidget && !strNameList.empty())
     {
-        if (msgCenter().confirmSoftKeyboardClose(strNameList))
+        QString strJoinedString = strNameList.join("<br/>");
+        if (msgCenter().questionBinary(this, MessageType_Warning,
+                                       tr("<p>Following layouts are edited/copied but not saved:</p>%1"
+                                          "<p>Closing this dialog will cause loosing the changes. Proceed?</p>").arg(strJoinedString),
+                                       0 /* auto-confirm id */,
+                                       "Ok", "Cancel"))
             QMainWindowWithRestorableGeometryAndRetranslateUi::closeEvent(event);
         else
@@ -3943 +3948 @@
     updateLayoutSelectorList();
     if (m_pKeyboardWidget && m_pKeyboardWidget->currentLayout() && m_pLayoutSelector)
+    {
         m_pLayoutSelector->setCurrentLayout(m_pKeyboardWidget->currentLayout()->uid());
+        m_pLayoutSelector->setCurrentLayoutIsEditable(m_pKeyboardWidget->currentLayout()->editable());
+    }
 }