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

Timestamp:

Oct 22, 2019 11:33:14 AM (6 years ago)

Author:

vboxsync

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

134165

Message:

FE/Qt: bugref:6699 Listing the names of unsaved layouts in the warning dialog.

Location:

trunk/src/VBox/Frontends/VirtualBox/src

Files:

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

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

@@ -2408 +2408 @@
 }
 
-bool UIMessageCenter::confirmSoftKeyboardClose() const
-{
+bool UIMessageCenter::confirmSoftKeyboardClose(const QStringList &strNameList) const
+{
+    QString strJoinedString = strNameList.join("<br/>");
     return questionBinary(0, MessageType_Warning,
-                          tr("There are not saved layouts? Closing this dialog will cause loosing the changed. Proceed?"),
+                          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");
-
-
-
-    // bool questionBinary(QWidget *pParent, MessageType enmType,
-    //                     const QString &strMessage,
-    //                     const char *pcszAutoConfirmId = 0,
-    //                     const QString &strOkButtonText = QString(),
-    //                     const QString &strCancelButtonText = QString(),
-    //                     bool fDefaultFocusForOk = true) 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;
+    bool confirmSoftKeyboardClose(const QStringList &strNameList) const;
 
 #ifdef VBOX_GUI_WITH_NETWORK_MANAGER

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

@@ -654 +654 @@
     void parentDialogDeactivated();
     bool isColorThemeEditable() const;
-    bool unsavedLayoutsExist() const;
+
+    QStringList unsavedLayoutsNameList() const;
 
 protected:
@@ -2571 +2572 @@
 }
 
-bool UISoftKeyboardWidget::unsavedLayoutsExist() const
-{
+QStringList UISoftKeyboardWidget::unsavedLayoutsNameList() const
+{
+    QStringList nameList;
     foreach (const UISoftKeyboardLayout &layout, m_layouts)
     {
         if (layout.editedButNotSaved())
-            return true;
-    }
-    return false;
-}
+            nameList << layout.nameString();
+    }
+    return nameList;
+}
+
 
 void UISoftKeyboardWidget::deleteCurrentLayout()
@@ -3797 +3800 @@
 void UISoftKeyboard::closeEvent(QCloseEvent *event)
 {
+    QStringList strNameList = m_pKeyboardWidget->unsavedLayoutsNameList();
     /* Show a warning dialog when there are not saved layouts: */
-    if (m_pKeyboardWidget && m_pKeyboardWidget->unsavedLayoutsExist())
-    {
-        if (msgCenter().confirmSoftKeyboardClose())
+    if (m_pKeyboardWidget && !strNameList.empty())
+    {
+        if (msgCenter().confirmSoftKeyboardClose(strNameList))
             QMainWindowWithRestorableGeometryAndRetranslateUi::closeEvent(event);
         else