Changeset 5140 in vbox

Timestamp:

Oct 2, 2007 11:38:28 AM (18 years ago)

Author:

vboxsync

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

25010

Message:

FE/Qt: Added Help->Contents to the VM console window.

Location:

trunk/src/VBox/Frontends/VirtualBox

Files:

• include/VBoxConsoleWnd.h (modified) (1 diff)
• include/VBoxSelectorWnd.h (modified) (1 diff)
• src/VBoxConsoleWnd.cpp (modified) (4 diffs)
• src/VBoxSelectorWnd.cpp (modified) (6 diffs)

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

@@ -226 +226 @@
 
     // Help actions
+    QAction *helpContentsAction;
     QAction *helpWebAction;
     QAction *helpRegisterAction;

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

@@ -75 +75 @@
                                           bool aDescription);
 
-    void showHelpContents();
-
 protected:
 

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

@@ -261 +261 @@
     /* Help menu actions */
 
+    helpContentsAction = new QAction (this, "helpContentsAction");
+    helpContentsAction->setIconSet (VBoxGlobal::iconSet ("help_16px.png"));
     helpWebAction = new QAction (this, "helpWebAction");
     helpWebAction->setIconSet (VBoxGlobal::iconSet ("site_16px.png"));
@@ -371 +373 @@
     QPopupMenu *helpMenu = new QPopupMenu( this, "helpMenu" );
 
+    helpContentsAction->addTo (helpMenu);
     helpWebAction->addTo( helpMenu );
     helpMenu->insertSeparator();
-    helpRegisterAction->addTo( helpMenu );
+#ifdef VBOX_WITH_REGISTRATION
+    helpRegisterAction->addTo (helpMenu);
+#endif
     helpAboutAction->addTo( helpMenu );
     helpMenu->insertSeparator();
@@ -520 +525 @@
              this, SLOT (clearStatusBar()));
 
+    connect (helpContentsAction, SIGNAL (activated()),
+             &vboxProblem(), SLOT (showHelpHelpDialog()));
     connect (helpWebAction, SIGNAL (activated()),
              &vboxProblem(), SLOT (showHelpWebDialog()));
@@ -1504 +1511 @@
     /* Help actions */
 
+    helpContentsAction->setMenuText (tr ("&Contents..."));
+    helpContentsAction->setAccel (tr ("F1"));
+    helpContentsAction->setStatusTip (tr ("Show the online help contents"));
+
     helpWebAction->setMenuText (tr ("&VirtualBox Web Site..."));
     helpWebAction->setStatusTip (

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

@@ -525 +525 @@
 
     QPopupMenu *helpMenu = new QPopupMenu( this, "helpMenu" );
-    helpContentsAction->addTo ( helpMenu );
-    helpWebAction->addTo( helpMenu );
+    helpContentsAction->addTo (helpMenu);
+    helpWebAction->addTo (helpMenu);
     helpMenu->insertSeparator();
-    helpRegisterAction->addTo( helpMenu );
-    helpAboutAction->addTo( helpMenu );
+#ifdef VBOX_WITH_REGISTRATION
+    helpRegisterAction->addTo (helpMenu);
+#endif
+    helpAboutAction->addTo (helpMenu);
     helpMenu->insertSeparator();
     helpResetMessagesAction->addTo (helpMenu);
@@ -584 +586 @@
     connect (vmShowLogsAction, SIGNAL (activated()), this, SLOT (vmShowLogs()));
 
-    connect (helpContentsAction, SIGNAL (activated()), this, SLOT(showHelpContents()));
+    connect (helpContentsAction, SIGNAL (activated()),
+             &vboxProblem(), SLOT (showHelpHelpDialog()));
     connect (helpWebAction, SIGNAL (activated()),
              &vboxProblem(), SLOT (showHelpWebDialog()));
@@ -968 +971 @@
 }
 
-void VBoxSelectorWnd::showHelpContents()
-{
-    vboxProblem().showHelpHelpDialog();
-}
-
 // Protected members
 /////////////////////////////////////////////////////////////////////////////
@@ -1077 +1075 @@
     vmDeleteAction->setMenuText (tr ("&Delete"));
     vmDeleteAction->setText (tr ("Delete"));
-    vmDeleteAction->setAccel (QString::null);
     vmDeleteAction->setStatusTip (tr ("Delete the selected virtual machine"));
 
@@ -1084 +1081 @@
     vmDiscardAction->setMenuText (tr ("D&iscard"));
     vmDiscardAction->setText (tr ("Discard"));
-    vmDiscardAction->setAccel (QString::null);
     vmDiscardAction->setStatusTip (
         tr ("Discard the saved state of the selected virtual machine"));
@@ -1105 +1101 @@
 
     helpWebAction->setMenuText (tr ("&VirtualBox Web Site..."));
-    helpWebAction->setAccel( QString::null );
     helpWebAction->setStatusTip (
         tr ("Open the browser and go to the VirtualBox product web site"));
 
     helpRegisterAction->setMenuText (tr ("R&egister VirtualBox..."));
-    helpRegisterAction->setAccel( QString::null );
     helpRegisterAction->setStatusTip (
         tr ("Open VirtualBox registration form"));
 
     helpAboutAction->setMenuText (tr ("&About VirtualBox..."));
-    helpAboutAction->setAccel( QString::null );
     helpAboutAction->setStatusTip (tr ("Show a dialog with product information"));
 
     helpResetMessagesAction->setMenuText (tr ("&Reset All Warnings"));
-    helpResetMessagesAction->setAccel (QString::null);
     helpResetMessagesAction->setStatusTip (
         tr ("Cause all suppressed warnings and messages to be shown again"));