Changeset 1557 in vbox
- Timestamp:
- Mar 19, 2007 1:33:40 PM (18 years ago)
- Location:
- trunk/src/VBox/Frontends/VirtualBox
- Files:
-
- 6 edited
-
include/VMGlobalSettings.h (modified) (1 diff)
-
src/VBoxConsoleWnd.cpp (modified) (1 diff)
-
src/VBoxProblemReporter.cpp (modified) (1 diff)
-
src/VMGlobalSettings.cpp (modified) (1 diff)
-
src/main.cpp (modified) (2 diffs)
-
ui/VBoxVMSettingsDlg.ui.h (modified) (3 diffs)
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/VBox/Frontends/VirtualBox/include/VMGlobalSettings.h
r1435 r1557 84 84 mData()->guiFeatures = aFeatures; 85 85 } 86 bool isFeatureActiv ated(const char*) const;86 bool isFeatureActive (const char*) const; 87 87 88 88 // -
trunk/src/VBox/Frontends/VirtualBox/src/VBoxConsoleWnd.cpp
r1466 r1557 707 707 { 708 708 VMGlobalSettings settings = vboxGlobal().settings(); 709 /* Searching for known keys */ 710 const char *noMenuBar = "noMenuBar"; 711 const char *noStatusBar = "noStatusBar"; 712 menuBar()->setHidden (settings.isFeatureActivated (noMenuBar)); 713 statusBar()->setHidden (settings.isFeatureActivated (noStatusBar)); 709 /* Process known keys */ 710 menuBar()->setHidden (settings.isFeatureActive ("noMenuBar")); 711 statusBar()->setHidden (settings.isFeatureActive ("noStatusBar")); 714 712 } 715 713 -
trunk/src/VBox/Frontends/VirtualBox/src/VBoxProblemReporter.cpp
r1435 r1557 1364 1364 { 1365 1365 message (mainWindowShown(), Critical, 1366 tr ("<p>VirtualBox is running in forced <b>noSelector</b> " 1367 "mode.</p><p>Please run VirtualBox with -startvm parameter " 1368 "specifying required VM to start.</p>" 1366 tr ("<p>Cannot run VirtualBox in <i>VM Selector</i> " 1367 "mode due to local restrictions.</p>" 1369 1368 "<p>The application will now terminate.</p>")); 1370 1369 } -
trunk/src/VBox/Frontends/VirtualBox/src/VMGlobalSettings.cpp
r1435 r1557 109 109 } 110 110 111 bool VMGlobalSettings::isFeatureActiv ated(const char *aFeature) const111 bool VMGlobalSettings::isFeatureActive (const char *aFeature) const 112 112 { 113 113 QStringList featureList = QStringList::split (',', data()->guiFeatures); -
trunk/src/VBox/Frontends/VirtualBox/src/main.cpp
r1495 r1557 179 179 { 180 180 VMGlobalSettings settings = vboxGlobal().settings(); 181 /* Searching for known keys */ 182 const char *noSelector = "noSelector"; 183 bool forcedConsole = settings.isFeatureActivated (noSelector); 181 /* Process known keys */ 182 bool noSelector = settings.isFeatureActive ("noSelector"); 184 183 185 184 if (vboxGlobal().isVMConsoleProcess()) … … 189 188 rc = a.exec(); 190 189 } 191 else if ( forcedConsole)190 else if (noSelector) 192 191 { 193 192 vboxProblem().cannotRunInSelectorMode(); -
trunk/src/VBox/Frontends/VirtualBox/ui/VBoxVMSettingsDlg.ui.h
r1551 r1557 74 74 setResizeMode (AllColumns); 75 75 QWhatsThis::add (this, tr ("Defines the boot device order. " 76 " Click on the checkbox to select which"77 " devices will be used. Move desired boot"78 " devices up/down to define boot sequence."));76 "Use checkboxes to the left to enable or disable " 77 "individual boot devices. Move items up and down to " 78 "change the device order.")); 79 79 setSizePolicy (QSizePolicy::Expanding, QSizePolicy::Preferred); 80 80 connect (this, SIGNAL (pressed (QListViewItem*)), … … 135 135 { 136 136 /* Setup main widget layout */ 137 QHBoxLayout *mainLayout = new QHBoxLayout (this, 0, 10, "mainLayout");137 QHBoxLayout *mainLayout = new QHBoxLayout (this, 0, 6, "mainLayout"); 138 138 139 139 /* Setup settings layout */ … … 149 149 QWhatsThis::add (mBtnUp, tr ("Move the selected boot device up.")); 150 150 QWhatsThis::add (mBtnDown, tr ("Move the selected boot device down.")); 151 QToolTip::add (mBtnUp, tr ("Move Up (Ctrl-Up)")); 152 QToolTip::add (mBtnDown, tr ("Move Down (Ctrl-Down)")); 151 153 mBtnUp->setAutoRaise (true); 152 154 mBtnDown->setAutoRaise (true);
Note:
See TracChangeset
for help on using the changeset viewer.

