Changeset 1371 in vbox

Timestamp:

Mar 9, 2007 1:19:31 PM (18 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

19362

Message:

FE/Qt:

• Added new Welcome picture (shown when no VMs are defined);
• VBoxVMSettingsDlg::setup() now accepts a control name to bring the focus to;
• Pressing the Edit button on the Description tab in the Selector window opens the settings dialog and sets the keyboard focus direcrlty to the description editor.

Location:

trunk/src/VBox/Frontends/VirtualBox

Files:

• VBoxUI.pro (modified) (1 diff)
• images/welcome.png (added)
• include/VBoxSelectorWnd.h (modified) (1 diff)
• src/VBoxSelectorWnd.cpp (modified) (9 diffs)
• ui/VBoxVMSettingsDlg.ui.h (modified) (1 diff)

trunk/src/VBox/Frontends/VirtualBox/VBoxUI.pro

@@ -232 +232 @@
         images/vdm_remove_22px.png \
         images/vdm_remove_disabled_22px.png \
+        images/welcome.png \
         images/about_600px.png

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

@@ -66 +66 @@
     void vmNew();
     void vmSettings (const QString &aCategory = QString::null,
-                     const QString &aSubPage  = QString::null);
+                     const QString &aControl = QString::null);
     void vmDelete();
     void vmStart();

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

@@ -64 +64 @@
 class VBoxVMDetailsView : public QWidgetStack
 {
+    Q_OBJECT
+
 public:
 
@@ -90 +92 @@
     }
 
-    bool connectDetailsText (const char *aSignal, const QObject *aReceiver,
-                             const char *aMember)
-    {
-        return connect (mDetailsText, aSignal, aReceiver, aMember);
+signals:
+
+    void linkClicked (const QString &aURL);
+
+private slots:
+
+    void gotLinkClicked (const QString &aURL)
+    {
+        QString text = mDetailsText->text();
+        emit linkClicked (aURL);
+        /* QTextBrowser will try to get the URL from the mime source factory
+         * and show an empty "page" after a failure. Reset the text to avoid
+         * this. */
+        mDetailsText->setText (text);
     }
 
@@ -126 +138 @@
     mDetailsText->setFrameShape (QFrame::NoFrame);
     mDetailsText->setPaper (backgroundBrush());
+
+    connect (mDetailsText, SIGNAL (linkClicked (const QString &)),
+            this, SLOT (gotLinkClicked (const QString &)));
 
     addWidget (mDetailsText, 0);
@@ -332 +347 @@
 void VBoxVMDescriptionPage::goToSettings()
 {
-    mParent->vmSettings ("#general", "description");
+    mParent->vmSettings ("#general", "teDescription");
 }
 
@@ -562 +577 @@
              this, SLOT (vmStart()));
 
-    vmDetailsView->connectDetailsText (
-        SIGNAL (linkClicked (const QString &)),
-        this, SLOT (vmSettings (const QString &)));
+    connect (vmDetailsView, SIGNAL (linkClicked (const QString &)),
+            this, SLOT (vmSettings (const QString &)));
 
     /* listen to "media enumeration finished" signals */
@@ -669 +683 @@
  *  Opens the VM settings dialog.
  *
- *  @param  category
- *      Category to select in the settings dialog. See
- *      VBoxVMSettingsDlg::setup().
+ *  @param  aCategory   Category to select in the settings dialog. See
+ *                      VBoxVMSettingsDlg::setup().
+ *  @param  aControl    Widget name to select in the settings dialog. See
+ *                      VBoxVMSettingsDlg::setup().
  */
-void VBoxSelectorWnd::vmSettings (const QString &category, const QString &aSubPage)
-{
+void VBoxSelectorWnd::vmSettings (const QString &aCategory, const QString &aControl)
+{
+    if (!aCategory.isEmpty() && aCategory [0] != '#')
+    {
+        /* Assume it's a href from the Details HTML */
+        vboxGlobal().openURL (aCategory);
+        return;
+    }
+
     VBoxVMListBoxItem *item = (VBoxVMListBoxItem *) vmListBox->selectedItem();
 
-    AssertMsgReturn (item, ("Item must be always selected here"), (void) 0);
+    AssertMsgReturnVoid (item, ("Item must be always selected here"));
 
     // open a direct session to modify VM settings
@@ -690 +712 @@
     VBoxVMSettingsDlg dlg (this, "VBoxVMSettingsDlg");
     dlg.getFromMachine (m);
-    dlg.setup (category, aSubPage);
+    dlg.setup (aCategory, aControl);
 
     if (dlg.exec() == QDialog::Accepted)
@@ -1152 +1174 @@
              * something really simple */
             vmDetailsView->setDetailsText
-                (tr ("<h3><img src=ico64x01.png align=right/>"
+                (tr ("<h3>"
                      "Welcome to VirtualBox!</h3>"
                      "<p>The left part of this window is intended to display "
@@ -1158 +1180 @@
                      "The list is empty now because you haven't created any virtual "
                      "machines yet."
+                     "<img src=welcome.png align=right/></p>"
                      "<p>In order to create a new virtual machine, press the "
                      "<b>New</b> button in the main tool bar located "
-                     "at the top of the window."));
+                     "at the top of the window.</p>"
+                     "<p>You can press the <b>F1</b> key to get instant help, "
+                     "or visit "
+                     "<a href=http://www.virtualbox.org>www.virtualbox.org</a> "
+                     "for the latest information and news.</p>"));
             vmRefreshAction->setEnabled (false);
         }

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

@@ -922 +922 @@
  *  Sets up this dialog.
  *
+ *  If @a aCategory is non-null, it should be one of values from the hidden
+ *  '[cat]' column of #listView (see VBoxVMSettingsDlg.ui in qdesigner)
+ *  prepended with the '#' sign. In this case, the specified category page
+ *  will be activated when the dialog is open.
+ *
+ *  If @a aWidget is non-null, it should be a name of one of widgets
+ *  from the given category page. In this case, the specified widget
+ *  will get focus when the dialog is open.
+ *  
  *  @note Calling this method after the dialog is open has no sense.
  *
- *  @param  category
- *      Category to select when the dialog is open. Must be one of
- *      values from the hidden '[cat]' column of #listView
- *      (see VBoxVMSettingsDlg.ui in qdesigner) prepended with the '#'
- *      sign.
+ *  @param  aCategory   Category to select when the dialog is open or null.
+ *  @param  aWidget     Category to select when the dialog is open or null.
  */
-void VBoxVMSettingsDlg::setup (const QString &aCategory, const QString &aSubPage)
+void VBoxVMSettingsDlg::setup (const QString &aCategory, const QString &aControl)
 {
     if (!aCategory.isNull())
     {
-        /* search for first-level item */
+        /* search for a list view item corresponding to the category */
         QListViewItem *item = listView->findItem (aCategory, listView_Link);
         if (item)
         {
             listView->setSelected (item, true);
-            /* search for second-level item */
-            if (!aSubPage.isNull())
+
+            /* search for a widget with the given name */
+            if (!aControl.isNull())
             {
-                QObjectList *list = widgetStack->visibleWidget()->queryList ("QTabWidget");
-                for (QObject *obj = list->first(); obj != NULL; obj = list->next())
+                QObject *obj = widgetStack->visibleWidget()->child (aControl);
+                if (obj && obj->isWidgetType())
                 {
-                    QTabWidget *tabWidget = static_cast<QTabWidget*> (obj);
-                    for (int index = 0; index < tabWidget->count(); ++index)
-                        if (tabWidget->page (index)->name() == aSubPage)
-                            tabWidget->setCurrentPage (index);
+                    QWidget *w = static_cast <QWidget *> (obj);
+                    QWidgetList parents;
+                    QWidget *p = w;
+                    while ((p = p->parentWidget()) != NULL)
+                    {
+                        if (!strcmp (p->className(), "QTabWidget"))
+                        {
+                            /* the tab contents widget is two steps down
+                             * (QTabWidget -> QWidgetStack -> QWidget) */
+                            QWidget *c = parents.last();
+                            if (c)
+                                c = parents.prev();
+                            if (c)
+                                static_cast <QTabWidget *> (p)->showPage (c);
+                        }
+                        parents.append (p);
+                    }
+
+                    w->setFocus();
                 }
             }