Index: /trunk/src/VBox/Frontends/VirtualBox/src/medium/UIMediumManager.cpp =================================================================== --- /trunk/src/VBox/Frontends/VirtualBox/src/medium/UIMediumManager.cpp (revision 50766) +++ /trunk/src/VBox/Frontends/VirtualBox/src/medium/UIMediumManager.cpp (revision 50767) @@ -1,11 +1,9 @@ /* $Id$ */ /** @file - * - * VBox frontends: Qt4 GUI ("VirtualBox"): - * UIMediumManager class implementation + * VBox Qt GUI - UIMediumManager class implementation. */ /* - * Copyright (C) 2006-2013 Oracle Corporation + * Copyright (C) 2006-2014 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as @@ -28,5 +26,4 @@ #include #include -#include /* GUI includes: */ @@ -43,4 +40,5 @@ /* COM includes: */ #include "COMEnums.h" +#include "CMachine.h" #include "CMediumFormat.h" #include "CStorageController.h" @@ -650,5 +648,5 @@ UIMediumManager::UIMediumManager(QWidget *pCenterWidget, bool fRefresh /* = true */) : QIWithRetranslateUI2(0, Qt::Dialog) - , m_pCenterWidget(pCenterWidget) + , m_pPseudoParentWidget(pCenterWidget) , m_fRefresh(fRefresh) , m_fPreventChangeCurrentItem(false) @@ -841,10 +839,10 @@ { /* Get current tree-widget: */ - QTreeWidget *pTree = currentTreeWidget(); + QTreeWidget *pTreeWidget = currentTreeWidget(); /* If another tree-widget was focused before, * move focus to current tree-widget: */ if (qobject_cast(focusWidget())) - pTree->setFocus(); + pTreeWidget->setFocus(); /* Re-fetch currently chosen medium-item: */ @@ -854,5 +852,5 @@ void UIMediumManager::sltHandleCurrentItemChanged() { - /* Determine tree-widget sender: */ + /* Get sender() tree-widget: */ QTreeWidget *pTreeWidget = qobject_cast(sender()); AssertMsgReturnVoid(pTreeWidget, ("This slot should be called by tree-widget only!\n")); @@ -871,5 +869,5 @@ void UIMediumManager::sltHandleContextMenuCall(const QPoint &position) { - /* Get corresponding tree-widget / item: */ + /* Get current tree-widget / item: */ QTreeWidget *pTreeWidget = currentTreeWidget(); QTreeWidgetItem *pItem = pTreeWidget->itemAt(position); @@ -883,11 +881,4 @@ /* Show item context menu: */ m_pContextMenu->exec(pTreeWidget->viewport()->mapToGlobal(position)); -} - -void UIMediumManager::sltMakeRequestForTableAdjustment() -{ - /* We have to perform tables adjustment only after all the [auto]resize - * events processed for every column of corresponding table. */ - QTimer::singleShot(0, this, SLOT(sltPerformTablesAdjustment())); } @@ -902,9 +893,9 @@ /* Calculate deduction for every header: */ QList deductions; - foreach (QITreeWidget *pTree, trees) + foreach (QTreeWidget *pTreeWidget, trees) { int iDeduction = 0; - for (int iHeaderIndex = 1; iHeaderIndex < pTree->header()->count(); ++iHeaderIndex) - iDeduction += pTree->header()->sectionSize(iHeaderIndex); + for (int iHeaderIndex = 1; iHeaderIndex < pTreeWidget->header()->count(); ++iHeaderIndex) + iDeduction += pTreeWidget->header()->sectionSize(iHeaderIndex); deductions << iDeduction; } @@ -913,8 +904,8 @@ for (int iTreeIndex = 0; iTreeIndex < trees.size(); ++iTreeIndex) { - QITreeWidget *pTree = trees[iTreeIndex]; - int iSize0 = pTree->viewport()->width() - deductions[iTreeIndex]; - if (pTree->header()->sectionSize(0) != iSize0) - pTree->header()->resizeSection(0, iSize0); + QTreeWidget *pTreeWidget = trees[iTreeIndex]; + int iSize0 = pTreeWidget->viewport()->width() - deductions[iTreeIndex]; + if (pTreeWidget->header()->sectionSize(0) != iSize0) + pTreeWidget->header()->resizeSection(0, iSize0); } } @@ -952,6 +943,6 @@ #endif /* Q_WS_MAC */ - /* Center according passed widget: */ - centerAccording(m_pCenterWidget); + /* Center according pseudo-parent widget: */ + centerAccording(m_pPseudoParentWidget); /* Initialize information-panes: */ @@ -989,8 +980,4 @@ /* Apply UI decorations: */ Ui::UIMediumManager::setupUi(this); - - /* Prepare some global stuff: */ - m_vbox = vboxGlobal().virtualBox(); - Assert(!m_vbox.isNull()); /* Configure medium-processing connections: */ @@ -1174,7 +1161,7 @@ this, SLOT(sltHandleContextMenuCall(const QPoint&))); connect(mTwHD, SIGNAL(resized(const QSize&, const QSize&)), - this, SLOT(sltMakeRequestForTableAdjustment())); + this, SLOT(sltPerformTablesAdjustment()), Qt::QueuedConnection); connect(mTwHD->header(), SIGNAL(sectionResized(int, int, int)), - this, SLOT(sltMakeRequestForTableAdjustment())); + this, SLOT(sltPerformTablesAdjustment()), Qt::QueuedConnection); } } @@ -1198,7 +1185,7 @@ this, SLOT(sltHandleContextMenuCall(const QPoint&))); connect(mTwCD, SIGNAL(resized(const QSize&, const QSize&)), - this, SLOT(sltMakeRequestForTableAdjustment())); + this, SLOT(sltPerformTablesAdjustment()), Qt::QueuedConnection); connect(mTwCD->header(), SIGNAL(sectionResized(int, int, int)), - this, SLOT(sltMakeRequestForTableAdjustment())); + this, SLOT(sltPerformTablesAdjustment()), Qt::QueuedConnection); } } @@ -1222,7 +1209,7 @@ this, SLOT(sltHandleContextMenuCall(const QPoint&))); connect(mTwFD, SIGNAL(resized(const QSize&, const QSize&)), - this, SLOT(sltMakeRequestForTableAdjustment())); + this, SLOT(sltPerformTablesAdjustment()), Qt::QueuedConnection); connect(mTwFD->header(), SIGNAL(sectionResized(int, int, int)), - this, SLOT(sltMakeRequestForTableAdjustment())); + this, SLOT(sltPerformTablesAdjustment()), Qt::QueuedConnection); } } @@ -1274,9 +1261,9 @@ /* Remember current medium-items: */ if (UIMediumItem *pMediumItem = mediumItem(UIMediumType_HardDisk)) - m_strSelectedIdHD = pMediumItem->id(); + m_strCurrentIdHD = pMediumItem->id(); if (UIMediumItem *pMediumItem = mediumItem(UIMediumType_DVD)) - m_strSelectedIdCD = pMediumItem->id(); + m_strCurrentIdCD = pMediumItem->id(); if (UIMediumItem *pMediumItem = mediumItem(UIMediumType_Floppy)) - m_strSelectedIdFD = pMediumItem->id(); + m_strCurrentIdFD = pMediumItem->id(); /* Clear tree-widgets: */ @@ -1664,10 +1651,10 @@ case UIMediumType_HardDisk: { - pMediumItem = createHardDiskItem(mTwHD, medium); + pMediumItem = createHardDiskItem(medium); AssertPtrReturn(pMediumItem, 0); - if (pMediumItem->id() == m_strSelectedIdHD) + if (pMediumItem->id() == m_strCurrentIdHD) { setCurrentItem(mTwHD, pMediumItem); - m_strSelectedIdHD = QString(); + m_strCurrentIdHD = QString(); } break; @@ -1679,8 +1666,8 @@ LogRel2(("UIMediumManager: Optical medium-item with ID={%s} created.\n", medium.id().toAscii().constData())); AssertPtrReturn(pMediumItem, 0); - if (pMediumItem->id() == m_strSelectedIdCD) + if (pMediumItem->id() == m_strCurrentIdCD) { setCurrentItem(mTwCD, pMediumItem); - m_strSelectedIdCD = QString(); + m_strCurrentIdCD = QString(); } break; @@ -1692,8 +1679,8 @@ LogRel2(("UIMediumManager: Floppy medium-item with ID={%s} created.\n", medium.id().toAscii().constData())); AssertPtrReturn(pMediumItem, 0); - if (pMediumItem->id() == m_strSelectedIdFD) + if (pMediumItem->id() == m_strCurrentIdFD) { setCurrentItem(mTwFD, pMediumItem); - m_strSelectedIdFD = QString(); + m_strCurrentIdFD = QString(); } break; @@ -1850,15 +1837,17 @@ } -UIMediumItem* UIMediumManager::searchItem(QTreeWidget *pTree, const CheckIfSuitableBy &condition, CheckIfSuitableBy *pException) const +/* static */ +UIMediumItem* UIMediumManager::searchItem(QTreeWidget *pTreeWidget, const CheckIfSuitableBy &condition, CheckIfSuitableBy *pException) { /* Make sure argument is valid: */ - if (!pTree) + if (!pTreeWidget) return 0; /* Return wrapper: */ - return searchItem(pTree->invisibleRootItem(), condition, pException); -} - -UIMediumItem* UIMediumManager::searchItem(QTreeWidgetItem *pParentItem, const CheckIfSuitableBy &condition, CheckIfSuitableBy *pException) const + return searchItem(pTreeWidget->invisibleRootItem(), condition, pException); +} + +/* static */ +UIMediumItem* UIMediumManager::searchItem(QTreeWidgetItem *pParentItem, const CheckIfSuitableBy &condition, CheckIfSuitableBy *pException) { /* Make sure argument is valid: */ @@ -1882,5 +1871,5 @@ } -UIMediumItem* UIMediumManager::createHardDiskItem(QTreeWidget *pTree, const UIMedium &medium) const +UIMediumItem* UIMediumManager::createHardDiskItem(const UIMedium &medium) { /* Make sure passed medium is valid: */ @@ -1888,5 +1877,5 @@ /* Search for existing medium-item: */ - UIMediumItem *pMediumItem = searchItem(pTree, CheckIfSuitableByID(medium.id())); + UIMediumItem *pMediumItem = searchItem(mTwHD, CheckIfSuitableByID(medium.id())); /* If medium-item do not exists: */ @@ -1897,5 +1886,5 @@ { /* Try to find parent medium-item: */ - UIMediumItem *pParentMediumItem = searchItem(pTree, CheckIfSuitableByID(medium.parentID())); + UIMediumItem *pParentMediumItem = searchItem(mTwHD, CheckIfSuitableByID(medium.parentID())); /* If parent medium-item was not found: */ if (!pParentMediumItem) @@ -1907,5 +1896,5 @@ /* Try to create parent medium-item: */ else - pParentMediumItem = createHardDiskItem(pTree, parentMedium); + pParentMediumItem = createHardDiskItem(parentMedium); } /* If parent medium-item was found: */ @@ -1919,5 +1908,5 @@ if (!pMediumItem) { - pMediumItem = new UIMediumItemHD(medium, pTree); + pMediumItem = new UIMediumItemHD(medium, mTwHD); LogRel2(("UIMediumManager: Root hard-drive medium-item with ID={%s} created.\n", medium.id().toAscii().constData())); } @@ -1928,4 +1917,5 @@ } +/* static */ bool UIMediumManager::checkMediumFor(UIMediumItem *pItem, Action action) { Index: /trunk/src/VBox/Frontends/VirtualBox/src/medium/UIMediumManager.h =================================================================== --- /trunk/src/VBox/Frontends/VirtualBox/src/medium/UIMediumManager.h (revision 50766) +++ /trunk/src/VBox/Frontends/VirtualBox/src/medium/UIMediumManager.h (revision 50767) @@ -1,10 +1,8 @@ /** @file - * - * VBox frontends: Qt4 GUI ("VirtualBox"): - * UIMediumManager class declaration + * VBox Qt GUI - UIMediumManager class declaration. */ /* - * Copyright (C) 2006-2013 Oracle Corporation + * Copyright (C) 2006-2014 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as @@ -17,6 +15,6 @@ */ -#ifndef __UIMediumManager_h__ -#define __UIMediumManager_h__ +#ifndef ___UIMediumManager_h___ +#define ___UIMediumManager_h___ /* GUI includes: */ @@ -26,14 +24,9 @@ #include "UIMediumDefs.h" -/* COM includes: */ -#include "COMEnums.h" -#include "CMachine.h" -#include "CVirtualBox.h" - /* Forward declarations: */ +class UIMedium; +class UIMediumItem; class UIToolBar; -class UIMediumItem; class UIEnumerationProgressBar; -class UIMedium; /** Functor interface allowing to check if passed UIMediumItem is suitable. */ @@ -41,5 +34,5 @@ { public: - /** Determines whether passed UIMediumItem is suitable. */ + /** Determines whether passed @a pItem is suitable. */ virtual bool isItSuitable(UIMediumItem *pItem) const = 0; }; @@ -56,19 +49,19 @@ enum Action { Action_Add, Action_Edit, Action_Copy, Action_Modify, Action_Remove, Action_Release }; - /** Constructor for Medium Manager dialog. */ + /** Constructor for UIMediumManager dialog. */ UIMediumManager(QWidget *pCenterWidget, bool fRefresh = true); - /** Destructor for Medium Manager dialog. */ + /** Destructor for UIMediumManager dialog. */ ~UIMediumManager(); public: - /** Returns Medium Manager singleton instance. */ + /** Returns UIMediumManager singleton instance. */ static UIMediumManager* instance(); - /** Shows Medium Manager singleton instance, creates new if necessary. */ + /** Shows UIMediumManager singleton instance, creates new if necessary. */ static void showModeless(QWidget *pCenterWidget, bool fRefresh = true); private slots: - /** Fully refreshes medium manager contents. */ + /** Handles UIMediumManager::m_pActionRefresh action triggering. */ void sltRefreshAll(); @@ -85,41 +78,57 @@ void sltHandleMediumEnumerationFinish(); - /** Calls for clone VD wizard to copy chosen medium. */ + /** Handles UIMediumManager::m_pActionCopy action triggering. */ void sltCopyMedium(); - /** Calls for medium-type change dialog for chosen medium. */ + /** Handles UIMediumManager::m_pActionModify action triggering. */ void sltModifyMedium(); - /** Calls for remove medium dialog for chosen medium. */ + /** Handles UIMediumManager::m_pActionRemove action triggering. */ void sltRemoveMedium(); - /** Calls for medium release dialog for chosen medium. */ + /** Handles UIMediumManager::m_pActionRelease action triggering. */ void sltReleaseMedium(); - /* Handlers: Navigation stuff: */ + /** Handles tab change case. */ void sltHandleCurrentTabChanged(); + /** Handles item change case. */ void sltHandleCurrentItemChanged(); + /** Handles item double-click case. */ void sltHandleDoubleClick(); + /** Handles item context-menu-call case. */ void sltHandleContextMenuCall(const QPoint &position); - /* Handlers: Geometry stuff: */ - void sltMakeRequestForTableAdjustment(); + /** Adjusts tree-widgets according content. */ void sltPerformTablesAdjustment(); private: - /* Helpers: Prepare stuff: */ + /** General prepare wrapper. */ void prepare(); + /** Prepare dialog. */ void prepareThis(); + /** Prepare actions. */ void prepareActions(); + /** Prepare menu-bar. */ void prepareMenuBar(); + /** Prepare tool-bar. */ void prepareToolBar(); + /** Prepare context-menu. */ void prepareContextMenu(); + /** Prepare tab-widget. */ void prepareTabWidget(); + /** Prepare tree-widgets. */ void prepareTreeWidgets(); + /** Prepare hard-drive tree-widget. */ void prepareTreeWidgetHD(); + /** Prepare optical-disk tree-widget. */ void prepareTreeWidgetCD(); + /** Prepare floppy-disk tree-widget. */ void prepareTreeWidgetFD(); + /** Prepare information-panes. */ void prepareInformationPanes(); + /** Prepare button-box. */ void prepareButtonBox(); + /** Prepare progress-bar. */ void prepareProgressBar(); #ifdef Q_WS_MAC + /** Mac OS X: Prepare Window menu. */ void prepareMacWindowMenu(); #endif /* Q_WS_MAC */ @@ -128,12 +137,12 @@ void repopulateTreeWidgets(); - /** Updates details according latest changes in current medium-item of predefined @a type. */ + /** Updates details according latest changes in current item of passed @a type. */ void refetchCurrentMediumItem(UIMediumType type); - /** Updates details according latest changes in current medium-item of chosen type. */ + /** Updates details according latest changes in current item of chosen type. */ void refetchCurrentChosenMediumItem(); - /** Updates details according latest changes in all current medium-items. */ + /** Updates details according latest changes in all current items. */ void refetchCurrentMediumItems(); - /** Update actions according currently chosen medium-item. */ + /** Update actions according currently chosen item. */ void updateActions(); /** Update tab icons according last @a action happened with @a pItem. */ @@ -148,11 +157,12 @@ void updateInformationPanesFD(); - /* Helpers: Cleanup stuff: */ #ifdef Q_WS_MAC + /** Mac OS X: Cleanup Window menu. */ void cleanupMacWindowMenu(); #endif /* Q_WS_MAC */ + /** General cleanup wrapper. */ void cleanup(); - /* Handler: Translation stuff: */ + /** Translates dialog content. */ void retranslateUi(); @@ -175,61 +185,92 @@ QTreeWidget* currentTreeWidget() const; - /** Returns medium-item for passed medium @a type. */ + /** Returns item for passed medium @a type. */ UIMediumItem* mediumItem(UIMediumType type) const; - /** Returns current medium-item. */ + /** Returns current item. */ UIMediumItem* currentMediumItem() const; - /** Defines current-item for passed @a pTreeWidget as @a pItem. */ + /** Defines current item for passed @a pTreeWidget as @a pItem. */ void setCurrentItem(QTreeWidget *pTreeWidget, QTreeWidgetItem *pItem); - UIMediumItem* searchItem(QTreeWidget *pTree, const CheckIfSuitableBy &condition, CheckIfSuitableBy *pException = 0) const; - UIMediumItem* searchItem(QTreeWidgetItem *pParentItem, const CheckIfSuitableBy &condition, CheckIfSuitableBy *pException = 0) const; - UIMediumItem* createHardDiskItem(QTreeWidget *pTree, const UIMedium &medium) const; - - /* Helper: Other stuff: */ - bool checkMediumFor(UIMediumItem *pItem, Action action); + /** Performs search for the @a pTree child which corresponds to the @a condition but not @a pException. */ + static UIMediumItem* searchItem(QTreeWidget *pTree, const CheckIfSuitableBy &condition, CheckIfSuitableBy *pException = 0); + /** Performs search for the @a pParentItem child which corresponds to the @a condition but not @a pException. */ + static UIMediumItem* searchItem(QTreeWidgetItem *pParentItem, const CheckIfSuitableBy &condition, CheckIfSuitableBy *pException = 0); + /** Creates UIMediumItemHD for corresponding @a medium. */ + UIMediumItem* createHardDiskItem(const UIMedium &medium); + + /** Checks if @a action can be used for @a pItem. */ + static bool checkMediumFor(UIMediumItem *pItem, Action action); /** Casts passed QTreeWidgetItem @a pItem to UIMediumItem if possible. */ static UIMediumItem* toMediumItem(QTreeWidgetItem *pItem); - /* Static helper: Formatting stuff: */ + /** Format information-pane content. */ static QString formatPaneText(const QString &strText, bool fCompact = true, const QString &strElipsis = "middle"); - /* Static helper: Enumeration stuff: */ + /** Determines if passed @a medium attached to hidden machines only. */ static bool isMediumAttachedToHiddenMachinesOnly(const UIMedium &medium); - /* Variable: Singleton instance: */ + /** UIMediumManager singleton instance. */ static UIMediumManager *m_spInstance; - /* Variables: General stuff: */ - CVirtualBox m_vbox; - QWidget *m_pCenterWidget; + /** @name General variables. + * @{ */ + /** Widget to center UIMediumManager according. */ + QWidget *m_pPseudoParentWidget; + /** Holds whether UIMediumManager should be refreshed on invoke. */ bool m_fRefresh; + /** Holds whether UIMediumManager should preserve current item change. */ bool m_fPreventChangeCurrentItem; - - /* Variables: Tab-widget stuff: */ + /** @} */ + + /** @name Tab-widget variables. + * @{ */ + /** Holds whether hard-drive tab-widget have inaccessible item. */ bool m_fInaccessibleHD; + /** Holds whether optical-disk tab-widget have inaccessible item. */ bool m_fInaccessibleCD; + /** Holds whether floppy-disk tab-widget have inaccessible item. */ bool m_fInaccessibleFD; + /** Holds cached hard-drive tab-widget icon. */ const QIcon m_iconHD; + /** Holds cached optical-disk tab-widget icon. */ const QIcon m_iconCD; + /** Holds cached floppy-disk tab-widget icon. */ const QIcon m_iconFD; - QString m_strSelectedIdHD; - QString m_strSelectedIdCD; - QString m_strSelectedIdFD; - - /* Variables: Menu & Toolbar stuff: */ + /** Holds current hard-drive tree-view item ID. */ + QString m_strCurrentIdHD; + /** Holds current optical-disk tree-view item ID. */ + QString m_strCurrentIdCD; + /** Holds current floppy-disk tree-view item ID. */ + QString m_strCurrentIdFD; + /** @} */ + + /** @name Tool-bar and menu variables. + * @{ */ + /** Tool-bar widget. */ UIToolBar *m_pToolBar; - QMenu *m_pContextMenu; - QMenu *m_pMenu; - QAction *m_pActionCopy; - QAction *m_pActionModify; - QAction *m_pActionRemove; - QAction *m_pActionRelease; - QAction *m_pActionRefresh; - - /* Variable: Progress-bar stuff: */ + /** Context menu object. */ + QMenu *m_pContextMenu; + /** Menu-bar menu object. */ + QMenu *m_pMenu; + /** Action to copy current item. */ + QAction *m_pActionCopy; + /** Action to modify current item. */ + QAction *m_pActionModify; + /** Action to remove current item. */ + QAction *m_pActionRemove; + /** Action to release current item. */ + QAction *m_pActionRelease; + /** Action to refresh current item. */ + QAction *m_pActionRefresh; + /** @} */ + + /** @name Progress-bar variables. + * @{ */ + /** Progress-bar widget. */ UIEnumerationProgressBar *m_pProgressBar; + /** @} */ }; -#endif /* __UIMediumManager_h__ */ +#endif /* !___UIMediumManager_h___ */