Changeset 9782 in vbox

Timestamp:

Jun 17, 2008 4:37:41 PM (17 years ago)

Author:

vboxsync

Message:

Fe/Qt4: Some code-spelling for VMSettings to make it similar to Global Settings, VBoxWarnIconLabel moved to VBoxVMSettingUtils (will be used in global settings too).

Location:

trunk/src/VBox/Frontends/VirtualBox4

Files:

• include/VBoxVMSettingsDlg.h (modified) (2 diffs)
• include/VBoxVMSettingsUtils.h (modified) (2 diffs)
• src/VBoxVMSettingsDlg.cpp (modified) (9 diffs)

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

@@ -34 +34 @@
 
 class QTimer;
-class QWidgetStack;
 
 class VBoxVMSettingsDlg : public QIWithRetranslateUI<QIMainDialog>,
@@ -70 +69 @@
     QString pagePath (QWidget *aPage);
     void setWarning (const QString &aWarning);
-    void updateMediaShortcuts();
 
     QString dialogTitle() const;

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

@@ -24 +24 @@
 #define __VBoxVMSettingsUtils_h__
 
-/* Qt includes */
+#include <VBoxGlobal.h>
+
 //#include <QDialog>
-//#include <QHBoxLayout>
 //#include <QLineEdit>
 //#include <QPushButton>
-//#include <QLabel>
+#include <QHBoxLayout>
+#include <QLabel>
 #include <QTreeWidget>
 #include <QHeaderView>
@@ -221 +222 @@
 };
 
+class VBoxWarnIconLabel: public QWidget
+{
+    Q_OBJECT;
+
+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;
+};
+
 #endif // __VBoxVMSettingsUtils_h__
 

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

@@ -38 +38 @@
 #include "QIWidgetValidator.h"
 
-/* Qt includes */
 #include <QTimer>
 
@@ -68 +67 @@
     return list.count() ? list [0] : 0;
 }
-
-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,
@@ -132 +112 @@
                                    mLbWhatsThis->fontMetrics().width ('m') * 40);
 
-    /*
-     *  Setup connections and set validation for pages
-     *  ----------------------------------------------------------------------
-     */
-
     /* Common connections */
-
     connect (mButtonBox, SIGNAL (accepted()), this, SLOT (accept()));
     connect (mButtonBox, SIGNAL (rejected()), this, SLOT (reject()));
@@ -151 +125 @@
     //Assert (item);
     //if (item) item->setHidden (true);
-
-    /*
-     *  Set initial values
-     *  ----------------------------------------------------------------------
-     */
-
-    /* Common settings */
 
     /* Hide unnecessary columns and header */
@@ -224 +191 @@
         }
     }
+
     /* Applying language settings */
     retranslateUi();
@@ -346 +314 @@
 
     setWindowTitle (dialogTitle());
-    
+
     /* We have to make sure that the Serial & Network subpages are retranslated
      * before they are revalidated. Cause: They do string comparing within
@@ -442 +410 @@
 }
 
-void VBoxVMSettingsDlg::updateWhatsThis (bool gotFocus /* = false */)
+void VBoxVMSettingsDlg::updateWhatsThis (bool aGotFocus /* = false */)
 {
     QString text;
 
     QWidget *widget = 0;
-    if (!gotFocus)
+    if (!aGotFocus)
     {
         if (mWhatsThisCandidate && mWhatsThisCandidate != this)
@@ -529 +497 @@
         case QEvent::FocusIn:
         {
-            updateWhatsThis (true /* gotFocus */);
+            updateWhatsThis (true /* aGotFocus */);
             break;
         }
@@ -554 +522 @@
     mPolished = true;
 
-    /* resize to the minimum possible size */
+    /* Resize to the minimum possible size */
     resize (minimumSize());