Changeset 1289 in vbox

Timestamp:

Mar 7, 2007 8:54:51 AM (18 years ago)

Author:

vboxsync

Message:

Sub page link activation for entering different VMSettings pages and sub-pages is done through string name of QWidget (not number of page).
This is used for entering “description” sub-page of “general” page of the VMSettings Dialog.

Location:

trunk/src/VBox/Frontends/VirtualBox

Files:

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

trunk/src/VBox/Frontends/VirtualBox/include/VBoxSelectorWnd.h

@@ -65 +65 @@
 
     void vmNew();
-    void vmSettings (const QString &category = QString::null, int = 0);
+    void vmSettings (const QString &aCategory = QString::null,
+                     const QString &aSubPage  = QString::null);
     void vmDelete();
     void vmStart();

trunk/src/VBox/Frontends/VirtualBox/src/VBoxSelectorWnd.cpp

@@ -274 +274 @@
 }
 
-/** 
+/**
  * The machine list @a aItem is used to access cached machine data w/o making
  * unnecessary RPC calls.
@@ -308 +308 @@
 }
 
-/** 
+/**
  * Called by the parent from machineStateChanged() and sessionStateChanged()
  * signal handlers. We cannot connect to these signals ourselves because we
@@ -332 +332 @@
 void VBoxVMDescriptionPage::goToSettings()
 {
-    mParent->vmSettings ("#general", 2);
+    mParent->vmSettings ("#general", "description");
 }
 
@@ -673 +673 @@
  *      VBoxVMSettingsDlg::setup().
  */
-void VBoxSelectorWnd::vmSettings (const QString &category, int aSubPage)
+void VBoxSelectorWnd::vmSettings (const QString &category, const QString &aSubPage)
 {
     VBoxVMListBoxItem *item = (VBoxVMListBoxItem *) vmListBox->selectedItem();

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

@@ -2716 +2716 @@
 <functions>
     <function access="private">init()</function>
-    <function>setup( const QString &amp;, int )</function>
+    <function>setup( const QString &amp;, const QString &amp; )</function>
     <function>getFromMachine( const CMachine &amp; machine )</function>
     <function returnType="COMResult">putBackToMachine()</function>

trunk/src/VBox/Frontends/VirtualBox/ui/VBoxVMSettingsDlg.ui.h

@@ -922 +922 @@
  *      sign.
  */
-void VBoxVMSettingsDlg::setup (const QString &aCategory, int aSubPage)
+void VBoxVMSettingsDlg::setup (const QString &aCategory, const QString &aSubPage)
 {
     if (!aCategory.isNull())
     {
+        /* search for first-level item */
         QListViewItem *item = listView->findItem (aCategory, listView_Link);
         if (item)
         {
             listView->setSelected (item, true);
-            QObjectList *list = widgetStack->visibleWidget()->queryList ("QTabWidget");
-            for (QObject *obj = list->first(); obj != NULL; obj = list->next())
+            /* search for second-level item */
+            if (!aSubPage.isNull())
             {
-                QTabWidget *tabStack = static_cast<QTabWidget*> (obj);
-                tabStack->setCurrentPage (aSubPage);
+                QObjectList *list = widgetStack->visibleWidget()->queryList ("QTabWidget");
+                for (QObject *obj = list->first(); obj != NULL; obj = list->next())
+                {
+                    QTabWidget *tabWidget = static_cast<QTabWidget*> (obj);
+                    for (int index = 0; index < tabWidget->count(); ++index)
+                        if (tabWidget->page (index)->name() == aSubPage)
+                            tabWidget->setCurrentPage (index);
+                }
             }
         }