- Timestamp:
- May 25, 2017 8:44:38 AM (7 years ago)
- Location:
- trunk/src/VBox/Frontends/VirtualBox/src
- Files:
-
- 6 edited
-
extensions/QIManagerDialog.h (modified) (1 diff)
-
hostnetwork/UIHostNetworkManager.cpp (modified) (3 diffs)
-
hostnetwork/UIHostNetworkManager.h (modified) (2 diffs)
-
medium/UIMediumManager.cpp (modified) (3 diffs)
-
medium/UIMediumManager.h (modified) (2 diffs)
-
selector/UIToolsPane.cpp (modified) (1 diff)
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/VBox/Frontends/VirtualBox/src/extensions/QIManagerDialog.h
r67017 r67075 28 28 class UIToolBar; 29 29 #endif 30 31 32 /** Widget embedding type. */ 33 enum EmbedTo 34 { 35 EmbedTo_Dialog, 36 EmbedTo_Stack 37 }; 30 38 31 39 -
trunk/src/VBox/Frontends/VirtualBox/src/hostnetwork/UIHostNetworkManager.cpp
r67047 r67075 190 190 *********************************************************************************************************************************/ 191 191 192 UIHostNetworkManagerWidget::UIHostNetworkManagerWidget( QWidget *pParent /* = 0 */)192 UIHostNetworkManagerWidget::UIHostNetworkManagerWidget(EmbedTo enmEmbedding, QWidget *pParent /* = 0 */) 193 193 : QIWithRetranslateUI<QWidget>(pParent) 194 , m_enmEmbedding(enmEmbedding) 194 195 , m_pToolBar(0) 195 196 , m_pMenu(0) … … 826 827 if (m_pActionCommit) 827 828 m_pToolBar->addAction(m_pActionCommit); 828 #ifndef VBOX_WS_MAC 829 #ifdef VBOX_WS_MAC 830 /* Check whether we are embedded into a stack: */ 831 if (m_enmEmbedding == EmbedTo_Stack) 832 { 833 /* Add into layout: */ 834 layout()->addWidget(m_pToolBar); 835 } 836 #else 829 837 /* Add into layout: */ 830 838 layout()->addWidget(m_pToolBar); … … 1040 1048 { 1041 1049 /* Create widget: */ 1042 UIHostNetworkManagerWidget *pWidget = new UIHostNetworkManagerWidget( this);1050 UIHostNetworkManagerWidget *pWidget = new UIHostNetworkManagerWidget(EmbedTo_Dialog, this); 1043 1051 AssertPtrReturnVoid(pWidget); 1044 1052 { -
trunk/src/VBox/Frontends/VirtualBox/src/hostnetwork/UIHostNetworkManager.h
r67021 r67075 46 46 47 47 /** Constructs Host Network Manager widget. */ 48 UIHostNetworkManagerWidget( QWidget *pParent = 0);48 UIHostNetworkManagerWidget(EmbedTo enmEmbedding, QWidget *pParent = 0); 49 49 50 50 /** Returns the menu. */ … … 135 135 /** @} */ 136 136 137 /** @name General variables. 138 * @{ */ 139 /** Holds the widget embedding type. */ 140 const EmbedTo m_enmEmbedding; 141 /** @} */ 142 137 143 /** @name Toolbar and menu variables. 138 144 * @{ */ -
trunk/src/VBox/Frontends/VirtualBox/src/medium/UIMediumManager.cpp
r67046 r67075 658 658 *********************************************************************************************************************************/ 659 659 660 UIMediumManagerWidget::UIMediumManagerWidget( QWidget *pParent /* = 0 */)660 UIMediumManagerWidget::UIMediumManagerWidget(EmbedTo enmEmbedding, QWidget *pParent /* = 0 */) 661 661 : QIWithRetranslateUI<QWidget>(pParent) 662 , m_enmEmbedding(enmEmbedding) 662 663 , m_fPreventChangeCurrentItem(false) 663 664 , m_pTabWidget(0) … … 1245 1246 if (m_pActionRefresh) 1246 1247 m_pToolBar->addAction(m_pActionRefresh); 1247 #ifndef VBOX_WS_MAC 1248 #ifdef VBOX_WS_MAC 1249 /* Check whether we are embedded into a stack: */ 1250 if (m_enmEmbedding == EmbedTo_Stack) 1251 { 1252 /* Add into layout: */ 1253 layout()->addWidget(m_pToolBar); 1254 } 1255 #else 1248 1256 /* Add into layout: */ 1249 1257 layout()->addWidget(m_pToolBar); … … 2297 2305 { 2298 2306 /* Create widget: */ 2299 UIMediumManagerWidget *pWidget = new UIMediumManagerWidget( this);2307 UIMediumManagerWidget *pWidget = new UIMediumManagerWidget(EmbedTo_Dialog, this); 2300 2308 AssertPtrReturnVoid(pWidget); 2301 2309 { -
trunk/src/VBox/Frontends/VirtualBox/src/medium/UIMediumManager.h
r67046 r67075 62 62 63 63 /** Constructs Virtual Medium Manager widget. */ 64 UIMediumManagerWidget( QWidget *pParent = 0);64 UIMediumManagerWidget(EmbedTo enmEmbedding, QWidget *pParent = 0); 65 65 66 66 /** Returns the menu. */ … … 251 251 /** @name General variables. 252 252 * @{ */ 253 /** Holds the widget embedding type. */ 254 const EmbedTo m_enmEmbedding; 255 253 256 /** Holds whether Virtual Medium Manager should preserve current item change. */ 254 257 bool m_fPreventChangeCurrentItem; -
trunk/src/VBox/Frontends/VirtualBox/src/selector/UIToolsPane.cpp
r67068 r67075 291 291 break; 292 292 case ToolsType_VirtualMediaManager: 293 m_pStackedWidget->addWidget(new UIMediumManagerWidget );293 m_pStackedWidget->addWidget(new UIMediumManagerWidget(EmbedTo_Stack)); 294 294 break; 295 295 case ToolsType_HostNetworkManager: 296 m_pStackedWidget->addWidget(new UIHostNetworkManagerWidget );296 m_pStackedWidget->addWidget(new UIHostNetworkManagerWidget(EmbedTo_Stack)); 297 297 break; 298 298 default:
Note:
See TracChangeset
for help on using the changeset viewer.

