diff options
| author | Palenik Mihály <palenik.mihaly@gmail.com> | 2014-07-14 11:37:33 +0200 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2014-07-14 15:37:16 +0000 |
| commit | 415ae835224d7af6eea5b31d43322e00e205a5cd (patch) | |
| tree | 0fe5acc751ae0ed4da7c410c23cf0533a8b0ae88 /svtools | |
| parent | 38d0bde62bd5fe8022ac45c5657226761fcdaa30 (diff) | |
Convert 3 dialogs to .ui
I converted RID_DLG_LISTCOMBOWIZARD, RID_DLG_GROUPBOXWIZARD and
RID_DLG_GRIDWIZARD to .ui
Change-Id: I221f22edbe4c638bfa80065d7775f78af24590cc
Reviewed-on: https://gerrit.libreoffice.org/10277
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'svtools')
| -rw-r--r-- | svtools/UIConfig_svt.mk | 3 | ||||
| -rw-r--r-- | svtools/source/dialogs/wizardmachine.cxx | 13 | ||||
| -rw-r--r-- | svtools/source/dialogs/wizdlg.cxx | 8 | ||||
| -rw-r--r-- | svtools/uiconfig/ui/wizarddialog.ui | 12 |
4 files changed, 35 insertions, 1 deletions
diff --git a/svtools/UIConfig_svt.mk b/svtools/UIConfig_svt.mk index 5a6b0ca2a5f2..0c482cdc8815 100644 --- a/svtools/UIConfig_svt.mk +++ b/svtools/UIConfig_svt.mk @@ -12,11 +12,12 @@ $(eval $(call gb_UIConfig_UIConfig,svt)) $(eval $(call gb_UIConfig_add_uifiles,svt,\ svtools/uiconfig/ui/addresstemplatedialog \ svtools/uiconfig/ui/graphicexport \ + svtools/uiconfig/ui/GraphicExportOptionsDialog \ svtools/uiconfig/ui/placeedit \ svtools/uiconfig/ui/printersetupdialog \ svtools/uiconfig/ui/querydeletedialog \ svtools/uiconfig/ui/restartdialog \ - svtools/uiconfig/ui/GraphicExportOptionsDialog \ + svtools/uiconfig/ui/wizarddialog \ )) # vim: set noet sw=4 ts=4: diff --git a/svtools/source/dialogs/wizardmachine.cxx b/svtools/source/dialogs/wizardmachine.cxx index 0c92cb6750d8..f7bd865e8fbe 100644 --- a/svtools/source/dialogs/wizardmachine.cxx +++ b/svtools/source/dialogs/wizardmachine.cxx @@ -148,6 +148,19 @@ namespace svt } + OWizardMachine::OWizardMachine(Window* _pParent, sal_uInt32 _nButtonFlags ) + :WizardDialog( _pParent, "WizardDialog", "svt/ui/wizarddialog.ui" ) + ,m_pFinish(NULL) + ,m_pCancel(NULL) + ,m_pNextPage(NULL) + ,m_pPrevPage(NULL) + ,m_pHelp(NULL) + ,m_pImpl( new WizardMachineImplData ) + { + implConstruct( _nButtonFlags ); + } + + void OWizardMachine::implConstruct( const sal_uInt32 _nButtonFlags ) { m_pImpl->sTitleBase = GetText(); diff --git a/svtools/source/dialogs/wizdlg.cxx b/svtools/source/dialogs/wizdlg.cxx index 7ef7a7a342fa..50af1980f764 100644 --- a/svtools/source/dialogs/wizdlg.cxx +++ b/svtools/source/dialogs/wizdlg.cxx @@ -377,6 +377,14 @@ WizardDialog::WizardDialog( Window* pParent, const ResId& rResId ) : +WizardDialog::WizardDialog( Window* pParent, const OString& rID, const OUString& rUIXMLDescription ) : + ModalDialog( pParent, rID, rUIXMLDescription ) +{ + ImplInitData(); +} + + + WizardDialog::~WizardDialog() { maWizardLayoutTimer.Stop(); diff --git a/svtools/uiconfig/ui/wizarddialog.ui b/svtools/uiconfig/ui/wizarddialog.ui new file mode 100644 index 000000000000..a38a515f356b --- /dev/null +++ b/svtools/uiconfig/ui/wizarddialog.ui @@ -0,0 +1,12 @@ +<?xml version="1.0" encoding="UTF-8"?> +<interface> + <!-- interface-requires gtk+ 3.0 --> + <object class="GtkWindow" id="WizardDialog"> + <property name="can_focus">False</property> + <property name="default_width">600</property> + <property name="default_height">400</property> + <child> + <placeholder/> + </child> + </object> +</interface> |