Changeset 10475 in vbox

Timestamp:

Jul 10, 2008 3:51:22 PM (17 years ago)

Author:

vboxsync

Message:

FE/Qt4: Cleanup & renaming.

Location:

trunk/src/VBox/Frontends/VirtualBox4

Files:

• include/VBoxSettingsSelector.h (modified) (3 diffs)
• src/VBoxSettingsDialog.cpp (modified) (1 diff)
• src/VBoxSettingsDialogSpecific.cpp (modified) (2 diffs)
• src/VBoxSettingsSelector.cpp (modified) (17 diffs)

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

@@ -70 +70 @@
 };
 
-class VBoxSettingsTreeSelector: public VBoxSettingsSelector
+class VBoxSettingsTreeViewSelector: public VBoxSettingsSelector
 {
     Q_OBJECT;
@@ -76 +76 @@
 public:
 
-    VBoxSettingsTreeSelector (QWidget *aParent = NULL);
+    VBoxSettingsTreeViewSelector (QWidget *aParent = NULL);
 
     virtual QWidget *widget() const;
@@ -138 +138 @@
 private:
 
-    int findId (int aIndex) const;
-    int findIndex (int aId) const;
-    int findLink (const QString &aLink) const;
     SelectorAction* findAction (int aId) const;
 

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

@@ -78 +78 @@
 #else
     /* Create the classical tree view selector */
-    mSelector = new VBoxSettingsTreeSelector (mAllWidget);
+    mSelector = new VBoxSettingsTreeViewSelector (this);
     mainLayout->addWidget (mSelector->widget(), 0, 0, 3, 1);
     mSelector->widget()->setFocus();

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

@@ -226 +226 @@
 
     attachPage (new VBoxVMSettingsVRDP());
+
+    /* Applying language settings */
+    retranslateUi();
 
     /* Setup Settings Dialog */
@@ -257 +260 @@
         }
     }
-    /* Applying language settings */
-    retranslateUi();
 }
 

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

@@ -39 +39 @@
 }
 
-/* VBoxSettingsTreeSelector */
+/* VBoxSettingsTreeViewSelector */
 
 /* Returns the path to the item in the form of 'grandparent > parent > item'
@@ -58 +58 @@
 }
 
-VBoxSettingsTreeSelector::VBoxSettingsTreeSelector (QWidget *aParent /* = NULL */)
+VBoxSettingsTreeViewSelector::VBoxSettingsTreeViewSelector (QWidget *aParent /* = NULL */)
     :VBoxSettingsSelector (aParent)
 {
@@ -85 +85 @@
 }
 
-QWidget *VBoxSettingsTreeSelector::widget() const
+QWidget *VBoxSettingsTreeViewSelector::widget() const
 {
     return mTwSelector;
 }
 
-void VBoxSettingsTreeSelector::addItem (const QIcon &aIcon, 
+void VBoxSettingsTreeViewSelector::addItem (const QIcon &aIcon, 
                                         const QString &aText, 
                                         int aId, 
@@ -101 +101 @@
 }
 
-QString VBoxSettingsTreeSelector::itemText (int aId) const
+QString VBoxSettingsTreeViewSelector::itemText (int aId) const
 {
     return pagePath (idToString (aId));
 }
 
-int VBoxSettingsTreeSelector::currentId () const
+int VBoxSettingsTreeViewSelector::currentId () const
 {
     int id = -1;
@@ -115 +115 @@
 }
 
-int VBoxSettingsTreeSelector::idToIndex (int aId) const
+int VBoxSettingsTreeViewSelector::idToIndex (int aId) const
 {
     int index = -1;
@@ -124 +124 @@
 }
 
-int VBoxSettingsTreeSelector::indexToId (int aIndex) const
+int VBoxSettingsTreeViewSelector::indexToId (int aIndex) const
 {
     int id = -1;
@@ -133 +133 @@
 }
 
-int VBoxSettingsTreeSelector::linkToId (const QString &aLink) const
+int VBoxSettingsTreeViewSelector::linkToId (const QString &aLink) const
 {
     int id = -1;
@@ -143 +143 @@
 
 
-void VBoxSettingsTreeSelector::selectById (int aId)
+void VBoxSettingsTreeViewSelector::selectById (int aId)
 {
     QTreeWidgetItem *item = findItem (mTwSelector, idToString (aId), treeWidget_Id);
@@ -150 +150 @@
 }
 
-void VBoxSettingsTreeSelector::setVisibleById (int aId, bool aShow)
+void VBoxSettingsTreeViewSelector::setVisibleById (int aId, bool aShow)
 {
     QTreeWidgetItem *item = findItem (mTwSelector, idToString (aId), treeWidget_Category);
@@ -157 +157 @@
 }
 
-void VBoxSettingsTreeSelector::clear()
+void VBoxSettingsTreeViewSelector::clear()
 {
     mTwSelector->clear();
 }
 
-void VBoxSettingsTreeSelector::polish()
+void VBoxSettingsTreeViewSelector::polish()
 {
     mTwSelector->setFixedWidth (static_cast<QAbstractItemView*> (mTwSelector)
@@ -175 +175 @@
 }
 
-void VBoxSettingsTreeSelector::settingsGroupChanged (QTreeWidgetItem *aItem,
+void VBoxSettingsTreeViewSelector::settingsGroupChanged (QTreeWidgetItem *aItem,
                                                      QTreeWidgetItem * /* aPrevItem */)
 {
@@ -190 +190 @@
  *  details.
  */
-QString VBoxSettingsTreeSelector::pagePath (const QString &aMatch) const
+QString VBoxSettingsTreeViewSelector::pagePath (const QString &aMatch) const
 {
     QTreeWidgetItem *li =
@@ -201 +201 @@
 /* Returns first item of 'aView' matching required 'aMatch' value
  * searching the 'aColumn' column. */
-QTreeWidgetItem* VBoxSettingsTreeSelector::findItem (QTreeWidget *aView,
+QTreeWidgetItem* VBoxSettingsTreeViewSelector::findItem (QTreeWidget *aView,
                                                      const QString &aMatch,
                                                      int aColumn) const
@@ -211 +211 @@
 }
 
-QString VBoxSettingsTreeSelector::idToString (int aId) const
+QString VBoxSettingsTreeViewSelector::idToString (int aId) const
 {
     return QString ("%1").arg (aId, 2, 10, QLatin1Char ('0'));
@@ -287 +287 @@
 int VBoxSettingsToolBarSelector::idToIndex (int aId) const
 {
-    return findIndex (aId);
-}
-
-int VBoxSettingsToolBarSelector::indexToId (int aIndex) const
-{
-    return findId (aIndex);
-}
-
-int VBoxSettingsToolBarSelector::linkToId (const QString &aLink) const
-{
-    return findLink (aLink);
-}
-
-
-void VBoxSettingsToolBarSelector::selectById (int aId)
-{
-    SelectorAction *action = findAction (aId);
-
-    if (action)
-        action->trigger();
-}
-
-void VBoxSettingsToolBarSelector::setVisibleById (int aId, bool aShow)
-{
-    SelectorAction *action = findAction (aId);
-
-    if (action)
-        action->setVisible (aShow);
-}
-
-void VBoxSettingsToolBarSelector::clear()
-{
-    QList<QAction*> list = mActionGroup->actions();
-    foreach (QAction *action, list)
-       delete action; 
-}
-
-int VBoxSettingsToolBarSelector::minWidth() const
-{
-    return mTbSelector->sizeHint().width() + 2 * 10;
-}
-
-void VBoxSettingsToolBarSelector::settingsGroupChanged (QAction *aAction)
-{
-    SelectorAction *action = static_cast<SelectorAction*> (aAction);
-    if (action)
-        emit categoryChanged (action->id());
-}
-
-int VBoxSettingsToolBarSelector::findId (int aIndex) const
-{
-    int id = -1;
-    QList<QAction*> list = mActionGroup->actions();
-    if (aIndex > -1 && 
-        aIndex < list.count())
-    {
-        SelectorAction *sa = static_cast<SelectorAction*> (list.at (aIndex));
-        if (sa)
-            id = sa->id();
-    }
-    return id;
-}
-
-int VBoxSettingsToolBarSelector::findIndex (int aId) const
-{
     int index = -1;
     QList<QAction*> list = mActionGroup->actions();
@@ -367 +302 @@
 }
 
-int VBoxSettingsToolBarSelector::findLink (const QString &aLink) const
+int VBoxSettingsToolBarSelector::indexToId (int aIndex) const
+{
+    int id = -1;
+    QList<QAction*> list = mActionGroup->actions();
+    if (aIndex > -1 && 
+        aIndex < list.count())
+    {
+        SelectorAction *sa = static_cast<SelectorAction*> (list.at (aIndex));
+        if (sa)
+            id = sa->id();
+    }
+    return id;
+}
+
+int VBoxSettingsToolBarSelector::linkToId (const QString &aLink) const
 {
     int id = -1;
@@ -384 +333 @@
 }
 
+
+void VBoxSettingsToolBarSelector::selectById (int aId)
+{
+    SelectorAction *action = findAction (aId);
+
+    if (action)
+        action->trigger();
+}
+
+void VBoxSettingsToolBarSelector::setVisibleById (int aId, bool aShow)
+{
+    SelectorAction *action = findAction (aId);
+
+    if (action)
+        action->setVisible (aShow);
+}
+
+void VBoxSettingsToolBarSelector::clear()
+{
+    QList<QAction*> list = mActionGroup->actions();
+    foreach (QAction *action, list)
+       delete action; 
+}
+
+int VBoxSettingsToolBarSelector::minWidth() const
+{
+    return mTbSelector->sizeHint().width() + 2 * 10;
+}
+
+void VBoxSettingsToolBarSelector::settingsGroupChanged (QAction *aAction)
+{
+    SelectorAction *action = static_cast<SelectorAction*> (aAction);
+    if (action)
+        emit categoryChanged (action->id());
+}
+
 SelectorAction* VBoxSettingsToolBarSelector::findAction (int aId) const
 {
-    int index = findIndex (aId);
+    int index = idToIndex (aId);
     SelectorAction *sa = NULL;
     QList<QAction*> list = mActionGroup->actions();