Changeset 79798 in vbox for trunk/src/VBox

Timestamp:

Jul 15, 2019 6:56:56 PM (5 years ago)

Author:

vboxsync

Message:

FE/Qt: bugref:9495: Reworking QIStyledItemDelegate to connect signals only if they present; we had to use property system for that; this was done specially for Form Editor widget but others only since they were affected.

Location:

trunk/src/VBox/Frontends/VirtualBox/src

Files:

• extensions/QIStyledItemDelegate.cpp (modified) (1 diff)
• widgets/UIAddDiskEncryptionPasswordDialog.cpp (modified) (1 diff)
• widgets/UIFormEditorWidget.cpp (modified) (3 diffs)
• widgets/UIHostComboEditor.cpp (modified) (1 diff)
• widgets/UIHotKeyEditor.cpp (modified) (1 diff)

trunk/src/VBox/Frontends/VirtualBox/src/extensions/QIStyledItemDelegate.cpp

@@ -45 +45 @@
 
     /* Watch for editor data commits, redirect to listeners: */
-    if (m_fWatchForEditorDataCommits)
+    if (   m_fWatchForEditorDataCommits
+        && pEditor->property("has_sigCommitData").toBool())
         connect(pEditor, SIGNAL(sigCommitData(QWidget *)), this, SIGNAL(commitData(QWidget *)));
 
     /* Watch for editor Enter key triggering, redirect to listeners: */
-    if (m_fWatchForEditorEnterKeyTriggering)
+    if (   m_fWatchForEditorEnterKeyTriggering
+        && pEditor->property("has_sigEnterKeyTriggered").toBool())
         connect(pEditor, SIGNAL(sigEnterKeyTriggered()), this, SIGNAL(sigEditorEnterKeyTriggered()));
 

trunk/src/VBox/Frontends/VirtualBox/src/widgets/UIAddDiskEncryptionPasswordDialog.cpp

@@ -215 +215 @@
 void UIPasswordEditor::prepare()
 {
+    /* Make sure QIStyledDelegate aware of us: */
+    setProperty("has_sigCommitData", true);
+    setProperty("has_sigEnterKeyTriggered", true);
     /* Set echo mode: */
     setEchoMode(QLineEdit::Password);

trunk/src/VBox/Frontends/VirtualBox/src/widgets/UIFormEditorWidget.cpp

@@ -202 +202 @@
     Q_PROPERTY(TextData text READ text WRITE setText USER true);
 
-signals:
-
-    /** Notifies listener about data should be committed. */
-    void sigCommitData(QWidget *pThis);
-
 public:
 
@@ -276 +271 @@
     Q_OBJECT;
     Q_PROPERTY(RangedIntegerData rangedInteger READ rangedInteger WRITE setRangedInteger USER true);
-
-signals:
-
-    /** Notifies listener about data should be committed. */
-    void sigCommitData(QWidget *pThis);
 
 public:
@@ -604 +594 @@
     : QComboBox(pParent)
 {
+    /* Make sure QIStyledDelegate aware of us: */
+    setProperty("has_sigCommitData", true);
+    /* Configure connections: */
     connect(this, static_cast<void(ChoiceEditor::*)(int)>(&ChoiceEditor::currentIndexChanged),
             this, &ChoiceEditor::sltCurrentIndexChanged);

trunk/src/VBox/Frontends/VirtualBox/src/widgets/UIHostComboEditor.cpp

@@ -473 +473 @@
 void UIHostComboEditor::prepare()
 {
+    /* Make sure QIStyledDelegate aware of us: */
+    setProperty("has_sigCommitData", true);
     /* Configure self: */
     setAutoFillBackground(true);

trunk/src/VBox/Frontends/VirtualBox/src/widgets/UIHotKeyEditor.cpp

@@ -127 +127 @@
     , m_fSequenceTaken(false)
 {
+    /* Make sure QIStyledDelegate aware of us: */
+    setProperty("has_sigCommitData", true);
     /* Configure self: */
     setAutoFillBackground(true);