Changeset 38410 in vbox
- Timestamp:
- Aug 11, 2011 9:34:18 AM (13 years ago)
- Location:
- trunk/src/VBox/Frontends/VirtualBox
- Files:
-
- 4 edited
- 2 moved
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/VBox/Frontends/VirtualBox/Makefile.kmk
r38384 r38410 345 345 src/widgets/UISpecialControls.h \ 346 346 src/widgets/UIApplianceEditorWidget.h \ 347 src/widgets/ VBoxExportApplianceWgt.h \347 src/widgets/UIApplianceExportEditorWidget.h \ 348 348 src/widgets/VBoxFilePathSelectorWidget.h \ 349 349 src/widgets/VBoxImportApplianceWgt.h \ … … 516 516 src/widgets/UIToolBar.cpp \ 517 517 src/widgets/UIApplianceEditorWidget.cpp \ 518 src/widgets/ VBoxExportApplianceWgt.cpp \518 src/widgets/UIApplianceExportEditorWidget.cpp \ 519 519 src/widgets/VBoxFilePathSelectorWidget.cpp \ 520 520 src/widgets/VBoxGuestRAMSlider.cpp \ -
trunk/src/VBox/Frontends/VirtualBox/src/precomp.h
r38384 r38410 201 201 #include "VBoxDefs.h" 202 202 #include "VBoxDownloaderWgt.h" 203 #include " VBoxExportApplianceWgt.h"203 #include "UIApplianceExportEditorWidget.h" 204 204 #include "VBoxExportApplianceWzd.h" 205 205 #include "VBoxFBOverlay.h" -
trunk/src/VBox/Frontends/VirtualBox/src/widgets/UIApplianceExportEditorWidget.cpp
r38384 r38410 3 3 * 4 4 * VBox frontends: Qt4 GUI ("VirtualBox"): 5 * VBoxExportApplianceWgt class implementation5 * UIApplianceExportEditorWidget class implementation 6 6 */ 7 7 8 8 /* 9 * Copyright (C) 2009 Oracle Corporation9 * Copyright (C) 2009-2011 Oracle Corporation 10 10 * 11 11 * This file is part of VirtualBox Open Source Edition (OSE), as … … 19 19 20 20 /* VBox includes */ 21 #include " VBoxExportApplianceWgt.h"21 #include "UIApplianceExportEditorWidget.h" 22 22 #include "VBoxGlobal.h" 23 23 #include "UIMessageCenter.h" … … 29 29 { 30 30 public: 31 ExportSortProxyModel (QObject *aParent = NULL)32 : VirtualSystemSortProxyModel (aParent)31 ExportSortProxyModel(QObject *pParent = NULL) 32 : VirtualSystemSortProxyModel(pParent) 33 33 { 34 34 m_filterList … … 49 49 50 50 //////////////////////////////////////////////////////////////////////////////// 51 // VBoxExportApplianceWgt51 // UIApplianceExportEditorWidget 52 52 53 VBoxExportApplianceWgt::VBoxExportApplianceWgt (QWidget *aParent /* = NULL */)54 : UIApplianceEditorWidget (aParent)53 UIApplianceExportEditorWidget::UIApplianceExportEditorWidget(QWidget *pParent /* = NULL */) 54 : UIApplianceEditorWidget(pParent) 55 55 { 56 56 } 57 57 58 CAppliance* VBoxExportApplianceWgt::init()58 CAppliance* UIApplianceExportEditorWidget::init() 59 59 { 60 60 if (m_pAppliance) … … 67 67 } 68 68 69 void VBoxExportApplianceWgt::populate()69 void UIApplianceExportEditorWidget::populate() 70 70 { 71 71 if (m_pModel) … … 74 74 QVector<CVirtualSystemDescription> vsds = m_pAppliance->GetVirtualSystemDescriptions(); 75 75 76 m_pModel = new VirtualSystemModel 76 m_pModel = new VirtualSystemModel(vsds, this); 77 77 78 ExportSortProxyModel *p roxy = new ExportSortProxyModel(this);79 p roxy->setSourceModel(m_pModel);80 p roxy->sort(DescriptionSection, Qt::DescendingOrder);78 ExportSortProxyModel *pProxy = new ExportSortProxyModel(this); 79 pProxy->setSourceModel(m_pModel); 80 pProxy->sort(DescriptionSection, Qt::DescendingOrder); 81 81 82 VirtualSystemDelegate * delegate = new VirtualSystemDelegate (proxy, this);82 VirtualSystemDelegate *pDelegate = new VirtualSystemDelegate(pProxy, this); 83 83 84 84 /* Set our own model */ 85 m_pTvSettings->setModel (proxy);85 m_pTvSettings->setModel(pProxy); 86 86 /* Set our own delegate */ 87 m_pTvSettings->setItemDelegate (delegate);87 m_pTvSettings->setItemDelegate(pDelegate); 88 88 /* For now we hide the original column. This data is displayed as tooltip 89 89 also. */ 90 m_pTvSettings->setColumnHidden 90 m_pTvSettings->setColumnHidden(OriginalValueSection, true); 91 91 m_pTvSettings->expandAll(); 92 92 … … 97 97 { 98 98 foreach (const QString& text, warnings) 99 mWarningTextEdit->append 99 mWarningTextEdit->append("- " + text); 100 100 fWarningsEnabled = true; 101 101 } 102 m_pWarningWidget->setShown 102 m_pWarningWidget->setShown(fWarningsEnabled); 103 103 } 104 104 105 void VBoxExportApplianceWgt::prepareExport()105 void UIApplianceExportEditorWidget::prepareExport() 106 106 { 107 107 if (m_pAppliance) -
trunk/src/VBox/Frontends/VirtualBox/src/widgets/UIApplianceExportEditorWidget.h
r38384 r38410 2 2 * 3 3 * VBox frontends: Qt4 GUI ("VirtualBox"): 4 * VBoxExportApplianceWgt class declaration4 * UIApplianceExportEditorWidget class declaration 5 5 */ 6 6 7 7 /* 8 * Copyright (C) 2009 Oracle Corporation8 * Copyright (C) 2009-2011 Oracle Corporation 9 9 * 10 10 * This file is part of VirtualBox Open Source Edition (OSE), as … … 17 17 */ 18 18 19 #ifndef __ VBoxExportApplianceWgt_h__20 #define __ VBoxExportApplianceWgt_h__19 #ifndef __UIApplianceExportEditorWidget_h__ 20 #define __UIApplianceExportEditorWidget_h__ 21 21 22 22 #include "UIApplianceEditorWidget.h" 23 23 24 class VBoxExportApplianceWgt: public UIApplianceEditorWidget24 class UIApplianceExportEditorWidget: public UIApplianceEditorWidget 25 25 { 26 26 Q_OBJECT; 27 27 28 28 public: 29 VBoxExportApplianceWgt (QWidget *aParent = NULL);29 UIApplianceExportEditorWidget(QWidget *pParent = NULL); 30 30 31 CAppliance *init();31 CAppliance *init(); 32 32 33 33 void populate(); … … 35 35 }; 36 36 37 #endif /* __ VBoxExportApplianceWgt_h__ */37 #endif /* __UIApplianceExportEditorWidget_h__ */ 38 38 -
trunk/src/VBox/Frontends/VirtualBox/src/wizards/exportappliance/UIExportApplianceWzd.h
r38343 r38410 38 38 Q_DECLARE_METATYPE(StorageType); 39 39 40 typedef QPointer< VBoxExportApplianceWgt> ExportAppliancePointer;40 typedef QPointer<UIApplianceExportEditorWidget> ExportAppliancePointer; 41 41 Q_DECLARE_METATYPE(ExportAppliancePointer); 42 42 -
trunk/src/VBox/Frontends/VirtualBox/src/wizards/exportappliance/UIExportApplianceWzdPage4.ui
r38343 r38410 45 45 </item> 46 46 <item> 47 <widget class=" VBoxExportApplianceWgt" name="m_pApplianceWidget" native="true">47 <widget class="UIApplianceExportEditorWidget" name="m_pApplianceWidget" native="true"> 48 48 <property name="sizePolicy"> 49 49 <sizepolicy hsizetype="Preferred" vsizetype="MinimumExpanding"> … … 63 63 </customwidget> 64 64 <customwidget> 65 <class> VBoxExportApplianceWgt</class>65 <class>UIApplianceExportEditorWidget</class> 66 66 <extends>QWidget</extends> 67 <header> VBoxExportApplianceWgt.h</header>67 <header>UIApplianceExportEditorWidget.h</header> 68 68 <container>1</container> 69 69 </customwidget>
Note:
See TracChangeset
for help on using the changeset viewer.