Changeset 81442 in vbox for trunk/src/VBox/Frontends

Timestamp:

Oct 22, 2019 8:39:20 AM (6 years ago)

Author:

vboxsync

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

134160

Message:

FE/Qt: bugref:6699 Warning the user about not-yet-saved layout (if exists) during soft keyboard close.

Location:

trunk/src/VBox/Frontends/VirtualBox/src

Files:

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

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

@@ -2408 +2408 @@
 }
 
+bool UIMessageCenter::confirmSoftKeyboardClose() const
+{
+    return questionBinary(0, MessageType_Warning,
+                          tr("There are not saved layouts? Closing this dialog will cause loosing the changed. Proceed?"),
+                          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;
+
+}
+
 #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;
 
 #ifdef VBOX_GUI_WITH_NETWORK_MANAGER

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

@@ -512 +512 @@
     UIKeyCaptions keyCaptions(int iKeyPosition) const;
 
-    bool operator==(const UISoftKeyboardLayout &otherLayout);
+    bool operator==(const UISoftKeyboardLayout &otherLayout) const;
 
     QString baseCaption(int iKeyPosition) const;
@@ -518 +518 @@
     QString altGrCaption(int iKeyPosition) const;
     QString shiftAltGrCaption(int iKeyPosition) const;
+
+    void setEditedBuNotSaved(bool fEditedButNotsaved);
+    bool editedButNotSaved() const;
 
     void setUid(const QUuid &uid);
@@ -537 +540 @@
     bool    m_fEditable;
     bool    m_fIsFromResources;
+    bool    m_fEditedButNotSaved;
     QUuid   m_uid;
 };
@@ -650 +654 @@
     void parentDialogDeactivated();
     bool isColorThemeEditable() const;
+    bool unsavedLayoutsExist() const;
 
 protected:
@@ -1249 +1254 @@
     connect(m_pShiftAltGrCaptionEdit, &QLineEdit::textChanged, this, &UIKeyboardLayoutEditor::sltCaptionsUpdate);
 
-
     QSpacerItem *pSpacer = new QSpacerItem(0, 0, QSizePolicy::Expanding, QSizePolicy::Expanding);
     if (pSpacer)
@@ -1314 +1318 @@
         if (pItem->data(Qt::UserRole).toUuid() == layoutUid)
             pFoundItem = pItem;
-
     }
     if (!pFoundItem)
@@ -1765 +1768 @@
     : m_fEditable(true)
     , m_fIsFromResources(false)
+    , m_fEditedButNotSaved(false)
     , m_uid(QUuid::createUuid())
 {
@@ -1784 +1788 @@
 {
     m_strSourceFilePath = strSourceFilePath;
+    setEditedBuNotSaved(true);
 }
 
@@ -1794 +1799 @@
 {
     m_fIsFromResources = fIsFromResources;
+    setEditedBuNotSaved(true);
 }
 
@@ -1804 +1810 @@
 {
     m_strName = strName;
+    setEditedBuNotSaved(true);
 }
 
@@ -1814 +1821 @@
 {
     m_strNativeName = strNativeName;
+    setEditedBuNotSaved(true);
 }
 
@@ -1824 +1832 @@
 {
     m_fEditable = fEditable;
+    setEditedBuNotSaved(true);
 }
 
@@ -1834 +1843 @@
 {
     m_physicalLayoutUuid = uuid;
+    setEditedBuNotSaved(true);
 }
 
@@ -1848 +1858 @@
     /* Updating the captions invalidates the cached font size. We set it to 0, thereby forcing its recomputaion: */
     m_keyCaptionsFontSizeMap[iKeyPosition] = 0;
+    setEditedBuNotSaved(true);
 }
 
@@ -1855 +1866 @@
 }
 
-bool UISoftKeyboardLayout::operator==(const UISoftKeyboardLayout &otherLayout)
+bool UISoftKeyboardLayout::operator==(const UISoftKeyboardLayout &otherLayout) const
 {
     if (m_strName != otherLayout.m_strName)
@@ -1898 +1909 @@
 }
 
+void UISoftKeyboardLayout::setEditedBuNotSaved(bool fEditedButNotsaved)
+{
+    m_fEditedButNotSaved = fEditedButNotsaved;
+}
+
+bool UISoftKeyboardLayout::editedButNotSaved() const
+{
+    return m_fEditedButNotSaved;
+}
+
 void UISoftKeyboardLayout::setUid(const QUuid &uid)
 {
     m_uid = uid;
+    setEditedBuNotSaved(true);
 }
 
@@ -2396 +2418 @@
    xmlFile.close();
    m_pCurrentKeyboardLayout->setSourceFilePath(strFileName);
+   m_pCurrentKeyboardLayout->setEditedBuNotSaved(false);
    sigStatusBarMessage(QString("%1 %2").arg(strFileName).arg(UISoftKeyboard::tr(" is saved")));
 }
@@ -2409 +2432 @@
         strNewNativeName= QString("%1-%2").arg(newLayout.nativeName()).arg(UISoftKeyboard::tr("Copy"));
     newLayout.setName(strNewName);
+    newLayout.setEditedBuNotSaved(true);
     newLayout.setNativeName(strNewNativeName);
     newLayout.setEditable(true);
@@ -2545 +2569 @@
         return false;
     return m_currentColorTheme->isEditable();
+}
+
+bool UISoftKeyboardWidget::unsavedLayoutsExist() const
+{
+    foreach (const UISoftKeyboardLayout &layout, m_layouts)
+    {
+        if (layout.editedButNotSaved())
+            return true;
+    }
+    return false;
 }
 
@@ -3005 +3039 @@
     if (m_layouts.isEmpty())
         return;
+    for (int i = 0; i < m_layouts.size(); ++i)
+        m_layouts[i].setEditedBuNotSaved(false);
     setCurrentLayout(&(m_layouts[0]));
 }
@@ -3759 +3795 @@
 }
 
+void UISoftKeyboard::closeEvent(QCloseEvent *event)
+{
+    /* Show a warning dialog when there are not saved layouts: */
+    if (m_pKeyboardWidget && m_pKeyboardWidget->unsavedLayoutsExist())
+    {
+        if (msgCenter().confirmSoftKeyboardClose())
+            QMainWindowWithRestorableGeometryAndRetranslateUi::closeEvent(event);
+        else
+            event->ignore();
+        return;
+    }
+    QMainWindowWithRestorableGeometryAndRetranslateUi::closeEvent(event);
+}
+
 bool UISoftKeyboard::event(QEvent *pEvent)
 {

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

@@ -64 +64 @@
     virtual void retranslateUi() /* override */;
     virtual bool shouldBeMaximized() const /* override */;
+    virtual void closeEvent(QCloseEvent *event) /* override */;
     bool event(QEvent *pEvent) /* override */;