- Timestamp:
- Mar 23, 2017 12:52:03 PM (8 years ago)
- Location:
- trunk/src/VBox/Frontends/VirtualBox/src/settings/global
- Files:
-
- 11 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/VBox/Frontends/VirtualBox/src/settings/global/UIGlobalSettingsDisplay.cpp
r66223 r66225 192 192 Ui::UIGlobalSettingsDisplay::retranslateUi(this); 193 193 194 /* Populatecombo-box: */194 /* Reload combo-box: */ 195 195 reloadMaximumGuestScreenSizePolicyComboBox(); 196 196 } -
trunk/src/VBox/Frontends/VirtualBox/src/settings/global/UIGlobalSettingsDisplay.h
r66223 r66225 62 62 private slots: 63 63 64 /* Handler: Resolution-combo stuff:*/64 /** Handles maximum guest-screen size policy change. */ 65 65 void sltHandleMaximumGuestScreenSizePolicyChange(); 66 66 67 67 private: 68 68 69 /* Helper: Resolution-combo stuff:*/69 /** Reloads maximum guest-screen size policy combo-box. */ 70 70 void reloadMaximumGuestScreenSizePolicyComboBox(); 71 71 -
trunk/src/VBox/Frontends/VirtualBox/src/settings/global/UIGlobalSettingsExtension.cpp
r66223 r66225 224 224 QWidget *pParent, QString *pstrExtPackName) 225 225 { 226 /* 227 * Open the extpack tarball via IExtPackManager. 228 */ 226 /* Open the extpack tarball via IExtPackManager: */ 229 227 CExtPackManager manager = vboxGlobal().virtualBox().GetExtensionPackManager(); 230 228 CExtPackFile extPackFile; … … 252 250 const QString strPackVersion = QString("%1r%2%3").arg(extPackFile.GetVersion()).arg(extPackFile.GetRevision()).arg(extPackFile.GetEdition()); 253 251 254 /* 255 * Check if there is a version of the extension pack already 256 * installed on the system and let the user decide what to do about 257 * it. 258 */ 252 /* Check if there is a version of the extension pack already 253 * installed on the system and let the user decide what to do about it. */ 259 254 CExtPack extPackCur = manager.Find(strPackName); 260 255 bool fReplaceIt = extPackCur.isOk(); … … 265 260 return; 266 261 } 267 /* 268 * If it's a new package just ask for general confirmation. 269 */ 262 /* If it's a new package just ask for general confirmation. */ 270 263 else 271 264 { … … 274 267 } 275 268 276 /* 277 * Display the license dialog if required by the extension pack. 278 */ 269 /* Display the license dialog if required by the extension pack. */ 279 270 if (extPackFile.GetShowLicense()) 280 271 { … … 285 276 } 286 277 287 /* 288 * Install the selected package. 289 * 290 * Set the package name return value before doing this as the caller should 291 * do a refresh even on failure. 292 */ 278 /* Install the selected package. 279 * Set the package name return value before doing 280 * this as the caller should do a refresh even on failure. */ 293 281 QString displayInfo; 294 282 #ifdef VBOX_WS_WIN 295 283 if (pParent) 296 284 displayInfo.sprintf("hwnd=%#llx", (uint64_t)(uintptr_t)pParent->winId()); 297 #endif /* VBOX_WS_WIN */285 #endif 298 286 /* Prepare installation progress: */ 299 287 CProgress progress = extPackFile.Install(fReplaceIt, displayInfo); … … 395 383 { 396 384 /* Check action's availability: */ 397 //m_pActionAdd->setEnabled(true);398 385 m_pActionRemove->setEnabled(pCurrentItem); 399 386 } … … 416 403 void UIGlobalSettingsExtension::sltAddPackage() 417 404 { 418 /* 419 * Open file-open window to let user to choose package file. 420 * 405 /* Open file-open window to let user to choose package file. 421 406 * The default location is the user's Download or Downloads directory with 422 * the user's home directory as a fallback. ExtPacks are downloaded. 423 */ 407 * the user's home directory as a fallback. ExtPacks are downloaded. */ 424 408 QString strBaseFolder = QDir::homePath() + "/Downloads"; 425 409 if (!QDir(strBaseFolder).exists()) … … 441 425 strFilePath = fileNames.at(0); 442 426 443 /* 444 * Install the chosen package. 445 */ 427 /* Install the chosen package: */ 446 428 if (!strFilePath.isEmpty()) 447 429 { … … 449 431 doInstallation(strFilePath, QString(), this, &strExtPackName); 450 432 451 /* 452 * Since we might be reinstalling an existing package, we have to 453 * do a little refreshing regardless of what the user chose. 454 */ 433 /* Since we might be reinstalling an existing package, we have to 434 * do a little refreshing regardless of what the user chose. */ 455 435 if (!strExtPackName.isNull()) 456 436 { 457 /* Remove it from the cache .*/437 /* Remove it from the cache: */ 458 438 for (int i = 0; i < m_pCache->data().m_items.size(); ++i) 459 439 { … … 465 445 } 466 446 467 /* Remove it from the tree .*/447 /* Remove it from the tree: */ 468 448 const int cItems = m_pPackagesTree->topLevelItemCount(); 469 449 for (int i = 0; i < cItems; i++) … … 477 457 } 478 458 479 /* Reinsert it into the cache and tree .*/459 /* Reinsert it into the cache and tree: */ 480 460 CExtPackManager manager = vboxGlobal().virtualBox().GetExtensionPackManager(); 481 461 const CExtPack &package = manager.Find(strExtPackName); … … 509 489 if (msgCenter().confirmRemoveExtensionPack(strSelectedPackageName, this)) 510 490 { 511 /* 512 * Uninstall the package. 513 */ 491 /* Uninstall the package: */ 514 492 CExtPackManager manager = vboxGlobal().virtualBox().GetExtensionPackManager(); 515 493 /** @todo Refuse this if any VMs are running. */ -
trunk/src/VBox/Frontends/VirtualBox/src/settings/global/UIGlobalSettingsExtension.h
r66223 r66225 42 42 ~UIGlobalSettingsExtension(); 43 43 44 /** Initiates the extension pack installation process. 45 * @param strFilePath Brings the extension pack file path. 46 * @param strDigest Brings the extension pack file digest. 47 * @param pParent Brings the parent dialog reference. 48 * @param pstrExtPackName Brings the extension pack name. */ 44 49 static void doInstallation(QString const &strFilePath, QString const &strDigest, QWidget *pParent, QString *pstrExtPackName); 45 50 … … 65 70 private slots: 66 71 67 /* Handlers: Tree-widget stuff:*/72 /** Handles @a pCurrentItem change. */ 68 73 void sltHandleCurrentItemChange(QTreeWidgetItem *pCurrentItem); 74 /** Handles context menu request for @a position. */ 69 75 void sltHandleContextMenuRequest(const QPoint &position); 70 76 71 /* Handlers: Package stuff:*/77 /** Handles command to add extension pack. */ 72 78 void sltAddPackage(); 79 /** Handles command to remove extension pack. */ 73 80 void sltRemovePackage(); 74 81 75 82 private: 76 83 77 /* Prepare UIDataSettingsGlobalExtensionItem basing on CExtPack:*/84 /** Uploads @a package data into passed @a item. */ 78 85 void loadData(const CExtPack &package, UIDataSettingsGlobalExtensionItem &item) const; 79 86 80 /* Variables: Actions:*/87 /** Holds the Add action instance. */ 81 88 QAction *m_pActionAdd; 89 /** Holds the Remove action instance. */ 82 90 QAction *m_pActionRemove; 83 91 -
trunk/src/VBox/Frontends/VirtualBox/src/settings/global/UIGlobalSettingsInput.cpp
r66219 r66225 39 39 #endif /* !VBOX_WITH_PRECOMPILED_HEADERS */ 40 40 41 /* Qt includes: */ 41 42 #include <QShortcut> 42 43 … … 863 864 *********************************************************************************************************************************/ 864 865 865 /* Input page constructor: */866 866 UIGlobalSettingsInput::UIGlobalSettingsInput() 867 867 : m_pTabWidget(0) … … 888 888 QVBoxLayout *pSelectorLayout = new QVBoxLayout(pSelectorTab); 889 889 #ifndef VBOX_WS_WIN 890 /* On Windows host that looks ugly, but 891 * On Mac OS X and X11 that deserves it's place. */ 890 /* On Mac OS X and X11 we can do a bit of smoothness. */ 892 891 pSelectorLayout->setContentsMargins(0, 0, 0, 0); 893 #endif /* !VBOX_WS_WIN */892 #endif 894 893 pSelectorLayout->setSpacing(1); 895 894 pSelectorLayout->addWidget(m_pSelectorFilterEditor); … … 908 907 QVBoxLayout *pMachineLayout = new QVBoxLayout(pMachineTab); 909 908 #ifndef VBOX_WS_WIN 910 /* On Windows host that looks ugly, but 911 * On Mac OS X and X11 that deserves it's place. */ 909 /* On Mac OS X and X11 we can do a bit of smoothness. */ 912 910 pMachineLayout->setContentsMargins(0, 0, 0, 0); 913 #endif /* !VBOX_WS_WIN */911 #endif 914 912 pMachineLayout->setSpacing(1); 915 913 pMachineLayout->addWidget(m_pMachineFilterEditor); -
trunk/src/VBox/Frontends/VirtualBox/src/settings/global/UIGlobalSettingsInput.h
r66223 r66225 38 38 Q_OBJECT; 39 39 40 /* Hot-key table indexes:*/40 /** Hot-key table indexes. */ 41 41 enum { UIHotKeyTableIndex_Selector, UIHotKeyTableIndex_Machine }; 42 42 … … 67 67 virtual bool validate(QList<UIValidationMessage> &messages) /* override */; 68 68 69 /** Defines TAB order . */69 /** Defines TAB order for passed @a pWidget. */ 70 70 virtual void setOrderAfter(QWidget *pWidget) /* override */; 71 71 … … 75 75 private: 76 76 77 /** Holds the tab-widget instance. */ 77 78 QTabWidget *m_pTabWidget; 79 /** Holds the Selector UI shortcuts filter instance. */ 78 80 QLineEdit *m_pSelectorFilterEditor; 81 /** Holds the Selector UI shortcuts model instance. */ 79 82 UIHotKeyTableModel *m_pSelectorModel; 83 /** Holds the Selector UI shortcuts table instance. */ 80 84 UIHotKeyTable *m_pSelectorTable; 85 /** Holds the Runtime UI shortcuts filter instance. */ 81 86 QLineEdit *m_pMachineFilterEditor; 87 /** Holds the Runtime UI shortcuts model instance. */ 82 88 UIHotKeyTableModel *m_pMachineModel; 89 /** Holds the Runtime UI shortcuts table instance. */ 83 90 UIHotKeyTable *m_pMachineTable; 84 91 -
trunk/src/VBox/Frontends/VirtualBox/src/settings/global/UIGlobalSettingsLanguage.cpp
r66223 r66225 38 38 #endif /* !VBOX_WITH_PRECOMPILED_HEADERS */ 39 39 40 /* Other VBox includes: */ 40 41 #include <iprt/err.h> 41 42 … … 204 205 205 206 206 /* Language page constructor: */207 207 UIGlobalSettingsLanguage::UIGlobalSettingsLanguage() 208 208 : m_fPolished(false) … … 323 323 } 324 324 325 void UIGlobalSettingsLanguage::polishEvent(QShowEvent *)325 void UIGlobalSettingsLanguage::polishEvent(QShowEvent * /* pEvent */) 326 326 { 327 327 /* Remember current info-label width: */ -
trunk/src/VBox/Frontends/VirtualBox/src/settings/global/UIGlobalSettingsLanguage.h
r66223 r66225 67 67 private slots: 68 68 69 /* Handler: List-painting stuff:*/69 /** Handles @a pItem painting with passed @a pPainter. */ 70 70 void sltHandleItemPainting(QTreeWidgetItem *pItem, QPainter *pPainter); 71 71 72 /* Handler: Current-changed stuff:*/72 /** Handles @a pCurrentItem change. */ 73 73 void sltHandleCurrentItemChange(QTreeWidgetItem *pCurrentItem); 74 74 75 75 private: 76 76 77 /* Helper: List-loading stuff:*/77 /** Reloads language list, choosing item with @a strLanguageId as current. */ 78 78 void reloadLanguageTree(const QString &strLanguageId); 79 79 80 /* Variables:*/80 /** Holds whether the page is polished. */ 81 81 bool m_fPolished; 82 82 -
trunk/src/VBox/Frontends/VirtualBox/src/settings/global/UIGlobalSettingsNetwork.h
r66223 r66225 64 64 virtual bool validate(QList<UIValidationMessage> &messages) /* override */; 65 65 66 /** Defines TAB order . */66 /** Defines TAB order for passed @a pWidget. */ 67 67 virtual void setOrderAfter(QWidget *pWidget) /* override */; 68 68 … … 72 72 private slots: 73 73 74 /* Handlers: NAT network stuff:*/74 /** Handles command to add NAT network. */ 75 75 void sltAddNetworkNAT(); 76 /** Handles command to edit NAT network. */ 76 77 void sltEditNetworkNAT(); 78 /** Handles command to remove NAT network. */ 77 79 void sltRemoveNetworkNAT(); 80 /** Handles @a pChangedItem change for NAT network tree. */ 78 81 void sltHandleItemChangeNetworkNAT(QTreeWidgetItem *pChangedItem); 82 /** Handles NAT network tree current item change. */ 79 83 void sltHandleCurrentItemChangeNetworkNAT(); 84 /** Handles context menu request for @a position of NAT network tree. */ 80 85 void sltHandleContextMenuRequestNetworkNAT(const QPoint &position); 81 86 82 /* Handlers: Host network stuff:*/87 /** Handles command to add host network. */ 83 88 void sltAddNetworkHost(); 89 /** Handles command to edit host network. */ 84 90 void sltEditNetworkHost(); 91 /** Handles command to remove host network. */ 85 92 void sltRemoveNetworkHost(); 93 /** Handles host network tree current item change. */ 86 94 void sltHandleCurrentItemChangeNetworkHost(); 95 /** Handles context menu request for @a position of host network tree. */ 87 96 void sltHandleContextMenuRequestNetworkHost(const QPoint &position); 88 97 89 98 private: 90 99 91 /* Helpers: NAT network cache stuff:*/100 /** Uploads NAT @a network data into passed @a data storage unit. */ 92 101 void loadDataNetworkNAT(const CNATNetwork &network, UIDataSettingsGlobalNetworkNAT &data); 102 /** Saves @a data to corresponding NAT network. */ 93 103 void saveDataNetworkNAT(const UIDataSettingsGlobalNetworkNAT &data); 94 95 /* Helpers: NAT network tree stuff: */ 104 /** Creates a new item in the NAT network tree on the basis of passed @a data, @a fChooseItem if requested. */ 96 105 void createTreeItemNetworkNAT(const UIDataSettingsGlobalNetworkNAT &data, bool fChooseItem = false); 106 /** Removes existing @a pItem from the NAT network tree. */ 97 107 void removeTreeItemNetworkNAT(UIItemNetworkNAT *pItem); 98 108 99 /* Helpers: Host network cache stuff:*/109 /** Uploads host @a network data into passed @a data storage unit. */ 100 110 void loadDataNetworkHost(const CHostNetworkInterface &iface, UIDataSettingsGlobalNetworkHost &data); 111 /** Saves @a data to corresponding host network. */ 101 112 void saveDataNetworkHost(const UIDataSettingsGlobalNetworkHost &data); 102 103 /* Helpers: Host network tree stuff: */ 113 /** Creates a new item in the host network tree on the basis of passed @a data, @a fChooseItem if requested. */ 104 114 void createTreeItemNetworkHost(const UIDataSettingsGlobalNetworkHost &data, bool fChooseItem = false); 115 /** Removes existing @a pItem from the host network tree. */ 105 116 void removeTreeItemNetworkHost(UIItemNetworkHost *pItem); 106 117 107 /* Variables: NAT network actions:*/118 /** Holds the Add NAT network action instance. */ 108 119 QAction *m_pActionAddNetworkNAT; 120 /** Holds the Edit NAT network action instance. */ 109 121 QAction *m_pActionEditNetworkNAT; 122 /** Holds the Remove NAT network action instance. */ 110 123 QAction *m_pActionRemoveNetworkNAT; 111 124 112 /* Variables: Host network actions:*/125 /** Holds the Add host network action instance. */ 113 126 QAction *m_pActionAddNetworkHost; 127 /** Holds the Edit host network action instance. */ 114 128 QAction *m_pActionEditNetworkHost; 129 /** Holds the Remove host network action instance. */ 115 130 QAction *m_pActionRemoveNetworkHost; 116 131 -
trunk/src/VBox/Frontends/VirtualBox/src/settings/global/UIGlobalSettingsProxy.h
r66223 r66225 66 66 private slots: 67 67 68 /* Handler: Proxy-checkbox stuff:*/68 /** Handles proxy toggling. */ 69 69 void sltHandleProxyToggle(); 70 70 -
trunk/src/VBox/Frontends/VirtualBox/src/settings/global/UIGlobalSettingsUpdate.h
r66223 r66225 58 58 virtual void saveFromCacheTo(QVariant &data) /* overrride */; 59 59 60 /** Defines TAB order . */60 /** Defines TAB order for passed @a pWidget. */ 61 61 virtual void setOrderAfter(QWidget *pWidget) /* override */; 62 62 … … 66 66 private slots: 67 67 68 /* Handlers:*/68 /** Handles whether update is @a fEnabled. */ 69 69 void sltHandleUpdateToggle(bool fEnabled); 70 /** Handles update period change. */ 70 71 void sltHandleUpdatePeriodChange(); 71 72 72 73 private: 73 74 74 /* Helpers:*/75 /** Returns period type. */ 75 76 VBoxUpdateData::PeriodType periodType() const; 77 /** Returns branch type. */ 76 78 VBoxUpdateData::BranchType branchType() const; 77 79 78 /* Variables:*/80 /** Holds the last checked button reference. */ 79 81 QRadioButton *m_pLastChosenRadio; 80 82
Note:
See TracChangeset
for help on using the changeset viewer.