Changeset 51515 in vbox for trunk/src/VBox
- Timestamp:
- Jun 3, 2014 4:00:51 PM (11 years ago)
- svn:sync-xref-src-repo-rev:
- 94136
- Location:
- trunk/src/VBox/Frontends/VirtualBox/src
- Files:
-
- 3 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/VBox/Frontends/VirtualBox/src/extradata/UIExtraDataManager.cpp
r51514 r51515 403 403 } 404 404 405 bool UIExtraDataManager::selectorWindowToolBarVisible() const 406 { 407 /* Show unless feature restricted: */ 408 return !isFeatureRestricted(GUI_Toolbar); 409 } 410 411 void UIExtraDataManager::setSelectorWindowToolBarVisible(bool fVisible) 412 { 413 /* Remember if feature restricted: */ 414 setExtraDataString(GUI_Toolbar, toFeatureRestricted(!fVisible)); 415 } 416 417 bool UIExtraDataManager::selectorWindowStatusBarVisible() const 418 { 419 /* Show unless feature restricted: */ 420 return !isFeatureRestricted(GUI_Statusbar); 421 } 422 423 void UIExtraDataManager::setSelectorWindowStatusBarVisible(bool fVisible) 424 { 425 /* Remember if feature restricted: */ 426 setExtraDataString(GUI_Statusbar, toFeatureRestricted(!fVisible)); 427 } 428 405 429 bool UIExtraDataManager::isFirstRun(const QString &strId) const 406 430 { -
trunk/src/VBox/Frontends/VirtualBox/src/extradata/UIExtraDataManager.h
r51514 r51515 142 142 /** Defines selector-window splitter @a hints. */ 143 143 void setSelectorWindowSplitterHints(const QList<int> &hints); 144 145 /** Returns whether selector-window tool-bar visible. */ 146 bool selectorWindowToolBarVisible() const; 147 /** Defines whether selector-window tool-bar @a fVisible. */ 148 void setSelectorWindowToolBarVisible(bool fVisible); 149 /** Returns whether selector-window status-bar visible. */ 150 bool selectorWindowStatusBarVisible() const; 151 /** Defines whether selector-window status-bar @a fVisible. */ 152 void setSelectorWindowStatusBarVisible(bool fVisible); 144 153 145 154 /** Returns whether this machine started for the first time. */ -
trunk/src/VBox/Frontends/VirtualBox/src/selector/UISelectorWindow.cpp
r51514 r51515 222 222 void UISelectorWindow::sltShowSelectorContextMenu(const QPoint &pos) 223 223 { 224 /* Load toolbar/statusbar availability settings: */225 CVirtualBox vbox = vboxGlobal().virtualBox();226 QString strToolbar = vbox.GetExtraData(GUI_Toolbar);227 QString strStatusbar = vbox.GetExtraData(GUI_Statusbar);228 bool fToolbar = strToolbar.isEmpty() || strToolbar == "true";229 bool fStatusbar = strStatusbar.isEmpty() || strStatusbar == "true";230 231 224 /* Populate toolbar/statusbar acctions: */ 232 225 QList<QAction*> actions; 233 226 QAction *pShowToolBar = new QAction(tr("Show Toolbar"), 0); 234 227 pShowToolBar->setCheckable(true); 235 pShowToolBar->setChecked(fToolbar); 228 #ifdef Q_WS_MAC 229 pShowToolBar->setChecked(mVMToolBar->isVisible()); 230 #else /* Q_WS_MAC */ 231 pShowToolBar->setChecked(m_pBar->isVisible()); 232 #endif /* !Q_WS_MAC */ 236 233 actions << pShowToolBar; 237 234 QAction *pShowStatusBar = new QAction(tr("Show Statusbar"), 0); 238 235 pShowStatusBar->setCheckable(true); 239 pShowStatusBar->setChecked( fStatusbar);236 pShowStatusBar->setChecked(statusBar()->isVisible()); 240 237 actions << pShowStatusBar; 241 238 … … 254 251 m_pBar->show(); 255 252 #endif /* !Q_WS_MAC */ 256 vbox.SetExtraData(GUI_Toolbar, "true");257 253 } 258 254 else … … 263 259 m_pBar->hide(); 264 260 #endif /* !Q_WS_MAC */ 265 vbox.SetExtraData(GUI_Toolbar, "false");266 261 } 267 262 } … … 269 264 { 270 265 if (pResult->isChecked()) 271 {272 266 statusBar()->show(); 273 vbox.SetExtraData(GUI_Statusbar, "true");274 }275 267 else 276 {277 268 statusBar()->hide(); 278 vbox.SetExtraData(GUI_Statusbar, "false");279 }280 269 } 281 270 } … … 1025 1014 break; 1026 1015 } 1027 case QEvent::ToolBarChange:1028 {1029 CVirtualBox vbox = vboxGlobal().virtualBox();1030 /* We have to invert the isVisible check one time, cause this event1031 * is sent *before* the real toggle is done. Really intuitive Trolls. */1032 vbox.SetExtraData(GUI_Toolbar, !::darwinIsToolbarVisible(mVMToolBar) ? "true" : "false");1033 break;1034 }1035 1016 #endif /* Q_WS_MAC */ 1036 1017 default: … … 1548 1529 /* Restore toolbar and statusbar visibility: */ 1549 1530 { 1550 QString strToolbar = vbox.GetExtraData(GUI_Toolbar); 1551 QString strStatusbar = vbox.GetExtraData(GUI_Statusbar); 1552 1553 #ifdef Q_WS_MAC 1554 mVMToolBar->setVisible(strToolbar.isEmpty() || strToolbar == "true"); 1531 #ifdef Q_WS_MAC 1532 mVMToolBar->setHidden(!gEDataManager->selectorWindowToolBarVisible()); 1555 1533 #else /* Q_WS_MAC */ 1556 m_pBar->set Visible(strToolbar.isEmpty() || strToolbar == "true");1534 m_pBar->setHidden(!gEDataManager->selectorWindowToolBarVisible()); 1557 1535 #endif /* !Q_WS_MAC */ 1558 statusBar()->set Visible(strStatusbar.isEmpty() || strStatusbar == "true");1536 statusBar()->setHidden(!gEDataManager->selectorWindowStatusBarVisible()); 1559 1537 } 1560 1538 } … … 1562 1540 void UISelectorWindow::saveSettings() 1563 1541 { 1564 /* Get VBox object: */ 1565 CVirtualBox vbox = vboxGlobal().virtualBox(); 1542 /* Save toolbar and statusbar visibility: */ 1543 { 1544 #ifdef Q_WS_MAC 1545 gEDataManager->setSelectorWindowToolBarVisible(!mVMToolBar->isHidden()); 1546 #else /* Q_WS_MAC */ 1547 gEDataManager->setSelectorWindowToolBarVisible(!m_pBar->isHidden()); 1548 #endif /* !Q_WS_MAC */ 1549 gEDataManager->setSelectorWindowStatusBarVisible(!statusBar()->isHidden()); 1550 } 1566 1551 1567 1552 /* Save splitter handle position: */
Note:
See TracChangeset
for help on using the changeset viewer.