Changeset 1435 in vbox for trunk/src/VBox/Frontends

Timestamp:

Mar 13, 2007 9:35:26 AM (18 years ago)

Author:

vboxsync

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

19468

Message:

1827: Lock down Qt GUI implemented.

These options are now supported as “GUI/Customizations” extra data features:
noMenuBar | the menu bar is not shown.
noStatusBar | the status bar is not shown.
noSelector | prevents VirtualBox from running in the Selector mode (Problem Reporter error MessageBox about running VirtualBox in “noSelector” mode).

Location:

trunk/src/VBox/Frontends/VirtualBox

Files:

• include/VBoxConsoleWnd.h (modified) (1 diff)
• include/VBoxProblemReporter.h (modified) (1 diff)
• include/VMGlobalSettings.h (modified) (3 diffs)
• src/VBoxConsoleWnd.cpp (modified) (2 diffs)
• src/VBoxProblemReporter.cpp (modified) (1 diff)
• src/VMGlobalSettings.cpp (modified) (5 diffs)
• src/main.cpp (modified) (3 diffs)

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

@@ -109 +109 @@
     void finalizeOpenView();
 
+    void loadGuiCustomizations();
+
     void vmFullscreen (bool on);
     void vmAutoresizeGuest (bool on);

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

@@ -207 +207 @@
                                      const QString &hostKey);
 
+    void cannotRunInSelectorMode();
+
     void showRuntimeError (const CConsole &console, bool fatal,
                            const QString &errorID,

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

@@ -43 +43 @@
     int hostkey;
     bool autoCapture;
+    QString guiFeatures;
 
     friend class VMGlobalSettings;
@@ -54 +55 @@
     Q_PROPERTY (int hostKey READ hostKey WRITE setHostKey)
     Q_PROPERTY (bool autoCapture READ autoCapture WRITE setAutoCapture)
+    Q_PROPERTY (QString guiFeatures READ guiFeatures WRITE setGuiFeatures)
 
 public:
@@ -76 +78 @@
         resetError();
     }
+
+    QString guiFeatures() const { return data()->guiFeatures; }
+    void setGuiFeatures (const QString &aFeatures)
+    {
+        mData()->guiFeatures = aFeatures;
+    }
+    bool isFeatureActivated (const char*) const;
 
     //

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

@@ -562 +562 @@
                                    centralWidget(), "console");
 
+    loadGuiCustomizations();
+
     ((QBoxLayout*) centralWidget()->layout())->addWidget (
         console, 0, AlignVCenter | AlignHCenter);
@@ -700 +702 @@
     LogFlowFuncLeave();
     return true;
+}
+
+void VBoxConsoleWnd::loadGuiCustomizations()
+{
+    VMGlobalSettings settings = vboxGlobal().settings();
+    /* Searching for known keys */
+    const char *noMenuBar = "noMenuBar";
+    const char *noStatusBar = "noStatusBar";
+    menuBar()->setHidden (settings.isFeatureActivated (noMenuBar));
+    statusBar()->setHidden (settings.isFeatureActivated (noStatusBar));
 }
 

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

@@ -1361 +1361 @@
 }
 
+void VBoxProblemReporter::cannotRunInSelectorMode()
+{
+    message (mainWindowShown(), Critical,
+             tr ("<p>VirtualBox is running in forced <b>noSelector</b> "
+                 "mode.</p><p>Please run VirtualBox with -startvm parameter "
+                 "specifying required VM to start.</p>"
+                 "<p>The application will now terminate.</p>"));
+}
+
 void VBoxProblemReporter::showRuntimeError (const CConsole &aConsole, bool fatal,
                                             const QString &errorID,

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

@@ -55 +55 @@
 #endif
     autoCapture = true;
+    guiFeatures = QString::null;
 }
 
@@ -60 +61 @@
     hostkey = that.hostkey;
     autoCapture = that.autoCapture;
+    guiFeatures = that.guiFeatures;
 }
 
@@ -70 +72 @@
     return this == &that || (
         hostkey == that.hostkey &&
-        autoCapture == that.autoCapture
+        autoCapture == that.autoCapture &&
+        guiFeatures == that.guiFeatures
     );
 }
@@ -90 +93 @@
     { "GUI/Input/HostKey",      "hostKey",      "\\d*[1-9]\\d*" },
     { "GUI/Input/AutoCapture",  "autoCapture",  "true|false" },
+    { "GUI/Customizations",     "guiFeatures",  "\\S+" },
 };
 
@@ -103 +107 @@
     mData()->hostkey = key;
     resetError();
+}
+
+bool VMGlobalSettings::isFeatureActivated (const char *aFeature) const
+{
+    QStringList featureList = QStringList::split (',', data()->guiFeatures);
+    return featureList.contains (aFeature);
 }
 

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

@@ -22 +22 @@
 
 #include "VBoxGlobal.h"
+#include "VBoxProblemReporter.h"
 #include "VBoxSelectorWnd.h"
 #include "VBoxConsoleWnd.h"
@@ -215 +216 @@
     if (vboxGlobal().isValid())
     {
+        VMGlobalSettings settings = vboxGlobal().settings();
+        /* Searching for known keys */
+        const char *noSelector = "noSelector";
+        bool forcedConsole = settings.isFeatureActivated (noSelector);
+
         if (vboxGlobal().isVMConsoleProcess())
         {
@@ -220 +226 @@
             if (vboxGlobal().startMachine (vboxGlobal().managedVMUuid()))
                 rc = a.exec();
+        }
+        else if (forcedConsole)
+        {
+            vboxProblem().cannotRunInSelectorMode();
         }
         else