Changeset 9674 in vbox for trunk/src/VBox

Timestamp:

Jun 13, 2008 8:48:50 AM (17 years ago)

Author:

vboxsync

Message:

FE/Qt4: Use QIDialogButtonBox and fixed a bug for the warning label.

Location:

trunk/src/VBox/Frontends/VirtualBox4

Files:

• include/VBoxVMSettingsDlg.h (modified) (2 diffs)
• src/VBoxVMSettingsDlg.cpp (modified) (4 diffs)
• ui/VBoxVMSettingsDlg.ui (modified) (1 diff)

trunk/src/VBox/Frontends/VirtualBox4/include/VBoxVMSettingsDlg.h

@@ -29 +29 @@
 class QIWidgetValidator;
 class VBoxMediaComboBox;
+class VBoxWarnIconLabel;
+
 class QTimer;
 class QWidgetStack;
@@ -93 +95 @@
     CMachine mMachine;
     QString  mWarnString;
+    VBoxWarnIconLabel *mWarnIconLabel;
 
     /* Flags */

trunk/src/VBox/Frontends/VirtualBox4/src/VBoxVMSettingsDlg.cpp

@@ -101 +101 @@
 
 
+class VBoxWarnIconLabel: public QWidget
+{
+public:
+    VBoxWarnIconLabel (QWidget *aParent = NULL)
+      : QWidget (aParent)
+    {
+        QHBoxLayout *layout = new QHBoxLayout (this);
+        VBoxGlobal::setLayoutMargin (layout, 0);
+        layout->addWidget (&mIcon);
+        layout->addWidget (&mLabel);
+    }
+    void setWarningPixmap (const QPixmap& aPixmap) { mIcon.setPixmap (aPixmap); }
+    void setWarningText (const QString& aText) { mLabel.setText (aText); }
+
+private:
+    QLabel mIcon;
+    QLabel mLabel;
+};
+
 VBoxVMSettingsDlg::VBoxVMSettingsDlg (QWidget *aParent,
                                       const QString &aCategory,
@@ -114 +133 @@
     Ui::VBoxVMSettingsDlg::setupUi (this);
 
+    mWarnIconLabel = new VBoxWarnIconLabel();
+    mWarnIconLabel->setWarningText (tr ("Invalid settings detected"));
+    mButtonBox->button (QDialogButtonBox::Ok)->setWhatsThis (tr ("Accepts (saves) changes and closes the dialog."));
+    mButtonBox->button (QDialogButtonBox::Cancel)->setWhatsThis (tr ("Cancels changes and closes the dialog."));
+    mButtonBox->button (QDialogButtonBox::Help)->setWhatsThis (tr ("Displays the dialog help."));
+
     /* Setup warning icon */
     QIcon icon = vboxGlobal().standardIcon (QStyle::SP_MessageBoxWarning, this);
     if (!icon.isNull())
-        mLbWarnIcon->setPixmap (icon.pixmap (16, 16));
+        mWarnIconLabel->setWarningPixmap (icon.pixmap (16, 16));
+
+    mButtonBox->addExtraWidget (mWarnIconLabel);
 
     /* Page title font is derived from the system font */
@@ -144 +171 @@
     /* Common connections */
 
-    connect (mBtnOk, SIGNAL (clicked()), this, SLOT (accept()));
-    connect (mBtnCancel, SIGNAL (clicked()), this, SLOT (reject()));
-    connect (mBtnHelp, SIGNAL (clicked()), &vboxProblem(), SLOT (showHelpHelpDialog()));
+    connect (mButtonBox, SIGNAL (accepted()), this, SLOT (accept()));
+    connect (mButtonBox, SIGNAL (rejected()), this, SLOT (reject()));
+    connect (mButtonBox, SIGNAL (helpRequested()), &vboxProblem(), SLOT (showHelpHelpDialog()));
     connect (mTwSelector, SIGNAL (currentItemChanged (QTreeWidgetItem*, QTreeWidgetItem*)),
              this, SLOT (settingsGroupChanged (QTreeWidgetItem *, QTreeWidgetItem*)));
@@ -364 +391 @@
     {
         mValid = newValid;
-        mBtnOk->setEnabled (mValid);
-        mLbWarnText->setHidden (mValid);
-        mLbWarnIcon->setHidden (mValid);
+        mButtonBox->button (QDialogButtonBox::Ok)->setEnabled (mValid);
+        mWarnIconLabel->setVisible (!mValid);
     }
 }

trunk/src/VBox/Frontends/VirtualBox4/ui/VBoxVMSettingsDlg.ui

@@ -348 +348 @@
    </item>
    <item row="3" column="0" colspan="2" >
-    <layout class="QHBoxLayout" >
-     <item>
-      <widget class="QPushButton" name="mBtnHelp" >
-       <property name="whatsThis" >
-        <string>Displays the dialog help.</string>
-       </property>
-       <property name="text" >
-        <string>Help</string>
-       </property>
-       <property name="shortcut" >
-        <string>F1</string>
-       </property>
-      </widget>
-     </item>
-     <item>
-      <spacer>
-       <property name="orientation" >
-        <enum>Qt::Horizontal</enum>
-       </property>
-       <property name="sizeHint" >
-        <size>
-         <width>40</width>
-         <height>20</height>
-        </size>
-       </property>
-      </spacer>
-     </item>
-     <item>
-      <widget class="QLabel" name="mLbWarnIcon" >
-       <property name="maximumSize" >
-        <size>
-         <width>16</width>
-         <height>16</height>
-        </size>
-       </property>
-      </widget>
-     </item>
-     <item>
-      <widget class="QLabel" name="mLbWarnText" >
-       <property name="text" >
-        <string>Invalid settings detected</string>
-       </property>
-      </widget>
-     </item>
-     <item>
-      <spacer>
-       <property name="orientation" >
-        <enum>Qt::Horizontal</enum>
-       </property>
-       <property name="sizeHint" >
-        <size>
-         <width>40</width>
-         <height>20</height>
-        </size>
-       </property>
-      </spacer>
-     </item>
-     <item>
-      <widget class="QPushButton" name="mBtnOk" >
-       <property name="whatsThis" >
-        <string>Accepts (saves) changes and closes the dialog.</string>
-       </property>
-       <property name="text" >
-        <string>&amp;Ok</string>
-       </property>
-       <property name="default" >
-        <bool>true</bool>
-       </property>
-      </widget>
-     </item>
-     <item>
-      <widget class="QPushButton" name="mBtnCancel" >
-       <property name="whatsThis" >
-        <string>Cancels changes and closes the dialog.</string>
-       </property>
-       <property name="text" >
-        <string>Cancel</string>
-       </property>
-      </widget>
-     </item>
-    </layout>
+    <widget class="QIDialogButtonBox" name="mButtonBox" >
+     <property name="standardButtons" >
+      <set>QDialogButtonBox::Cancel|QDialogButtonBox::Help|QDialogButtonBox::NoButton|QDialogButtonBox::Ok</set>
+     </property>
+    </widget>
    </item>
   </layout>
  </widget>
+ <customwidgets>
+  <customwidget>
+   <class>QIDialogButtonBox</class>
+   <extends>QDialogButtonBox</extends>
+   <header>QIDialogButtonBox.h</header>
+  </customwidget>
+ </customwidgets>
  <resources>
   <include location="../VirtualBox.qrc" />