extensions/source/dbpilots/controlwizard.cxx | 4 +--
extensions/source/dbpilots/controlwizard.hxx | 1
extensions/source/dbpilots/dbpilots.src | 28 +------------------------
extensions/source/dbpilots/dbpresid.hrc | 10 ++------
extensions/source/dbpilots/gridwizard.cxx | 3 +-
extensions/source/dbpilots/groupboxwiz.cxx | 3 +-
extensions/source/dbpilots/listcombowizard.cxx | 2 -
include/svtools/wizardmachine.hxx | 1
include/svtools/wizdlg.hxx | 1
svtools/UIConfig_svt.mk | 3 +-
svtools/source/dialogs/wizardmachine.cxx | 13 +++++++++++
svtools/source/dialogs/wizdlg.cxx | 8 +++++++
svtools/uiconfig/ui/wizarddialog.ui | 12 ++++++++++
13 files changed, 49 insertions(+), 40 deletions(-)
New commits:
commit 415ae835224d7af6eea5b31d43322e00e205a5cd
Author: Palenik Mihály <palenik.mih...@gmail.com>
Date: Mon Jul 14 11:37:33 2014 +0200
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 <caol...@redhat.com>
Tested-by: Caolán McNamara <caol...@redhat.com>
diff --git a/extensions/source/dbpilots/controlwizard.cxx
b/extensions/source/dbpilots/controlwizard.cxx
index 53179e6..6efb35a 100644
--- a/extensions/source/dbpilots/controlwizard.cxx
+++ b/extensions/source/dbpilots/controlwizard.cxx
@@ -275,9 +275,9 @@ namespace dbp
//= OControlWizard
- OControlWizard::OControlWizard( Window* _pParent, const ResId& _rId,
+ OControlWizard::OControlWizard( Window* _pParent,
const Reference< XPropertySet >& _rxObjectModel, const Reference<
XComponentContext >& _rxContext )
- :OWizardMachine(_pParent, _rId, WZB_CANCEL | WZB_PREVIOUS | WZB_NEXT |
WZB_FINISH)
+ :OWizardMachine(_pParent, WZB_CANCEL | WZB_PREVIOUS | WZB_NEXT |
WZB_FINISH)
,m_xContext(_rxContext)
{
m_aContext.xObjectModel = _rxObjectModel;
diff --git a/extensions/source/dbpilots/controlwizard.hxx
b/extensions/source/dbpilots/controlwizard.hxx
index 971f2cc..52efe99 100644
--- a/extensions/source/dbpilots/controlwizard.hxx
+++ b/extensions/source/dbpilots/controlwizard.hxx
@@ -112,7 +112,6 @@ namespace dbp
public:
OControlWizard(
Window* _pParent,
- const ResId& _rId,
const ::com::sun::star::uno::Reference<
::com::sun::star::beans::XPropertySet >& _rxObjectModel,
const ::com::sun::star::uno::Reference<
::com::sun::star::uno::XComponentContext >& _rxContext
);
diff --git a/extensions/source/dbpilots/dbpilots.src
b/extensions/source/dbpilots/dbpilots.src
index 9a7970b..aeca267 100644
--- a/extensions/source/dbpilots/dbpilots.src
+++ b/extensions/source/dbpilots/dbpilots.src
@@ -19,37 +19,13 @@
#include "dbpresid.hrc"
-ModalDialog RID_DLG_GROUPBOXWIZARD
+String RID_STR_GROUPWIZARD_TITLE
{
- HelpID = "extensions:ModalDialog:RID_DLG_GROUPBOXWIZARD";
Text [ en-US ] = "Group Element Wizard";
-
- OutputSize = TRUE ;
- SVLook = TRUE ;
- Moveable = TRUE ;
- Closeable = TRUE ;
- Hide = TRUE;
};
-ModalDialog RID_DLG_LISTCOMBOWIZARD
+String RID_STR_GRIDWIZARD_TITLE
{
- HelpID = "extensions:ModalDialog:RID_DLG_LISTCOMBOWIZARD";
- OutputSize = TRUE ;
- SVLook = TRUE ;
- Moveable = TRUE ;
- Closeable = TRUE ;
- Hide = TRUE;
-};
-
-ModalDialog RID_DLG_GRIDWIZARD
-{
- HelpID = "extensions:ModalDialog:RID_DLG_GRIDWIZARD";
- OutputSize = TRUE ;
- SVLook = TRUE ;
- Moveable = TRUE ;
- Closeable = TRUE ;
- Hide = TRUE;
-
Text [ en-US ] = "Table Element Wizard";
};
diff --git a/extensions/source/dbpilots/dbpresid.hrc
b/extensions/source/dbpilots/dbpresid.hrc
index 521f9a5..6c76237 100644
--- a/extensions/source/dbpilots/dbpresid.hrc
+++ b/extensions/source/dbpilots/dbpresid.hrc
@@ -44,18 +44,14 @@
#define RID_STR_TYPE_COMMAND (RID_STRING_START + 10 )
#define RID_STR_FIELDINFO_LISTBOX (RID_STRING_START + 11 )
#define RID_STR_FIELDINFO_COMBOBOX (RID_STRING_START + 12 )
+#define RID_STR_GRIDWIZARD_TITLE (RID_STRING_START + 13 )
+#define RID_STR_GROUPWIZARD_TITLE (RID_STRING_START + 14 )
// please adjust RID_STRING_END (below) when adding new strings
#define RID_STRING_END RID_STR_TIMEPOSTFIX
-// dialogs
-
-#define RID_DLG_GROUPBOXWIZARD ( RID_DIALOG_START + 1 )
-#define RID_DLG_LISTCOMBOWIZARD ( RID_DIALOG_START + 2 )
-#define RID_DLG_GRIDWIZARD ( RID_DIALOG_START + 3 )
-
// please adjust RID_DIALOG_END (below) when adding new dialogs
-#define RID_DIALOG_END RID_DLG_GRIDWIZARD
+#define RID_DIALOG_END ( RID_DIALOG_START + 3 )
// tab pages
diff --git a/extensions/source/dbpilots/gridwizard.cxx
b/extensions/source/dbpilots/gridwizard.cxx
index 9f599cc..2b982ad 100644
--- a/extensions/source/dbpilots/gridwizard.cxx
+++ b/extensions/source/dbpilots/gridwizard.cxx
@@ -54,7 +54,7 @@ namespace dbp
OGridWizard::OGridWizard( Window* _pParent,
const Reference< XPropertySet >& _rxObjectModel, const Reference<
XComponentContext >& _rxContext )
- :OControlWizard(_pParent, ModuleRes(RID_DLG_GRIDWIZARD),
_rxObjectModel, _rxContext)
+ :OControlWizard(_pParent, _rxObjectModel, _rxContext)
,m_bHadDataSelection(true)
{
initControlSettings(&m_aSettings);
@@ -63,6 +63,7 @@ namespace dbp
m_pNextPage->SetHelpId(HID_GRIDWIZARD_NEXT);
m_pCancel->SetHelpId(HID_GRIDWIZARD_CANCEL);
m_pFinish->SetHelpId(HID_GRIDWIZARD_FINISH);
+ setTitleBase(ModuleRes(RID_STR_GRIDWIZARD_TITLE).toString());
// if we do not need the data source selection page ...
if (!needDatasourceSelection())
diff --git a/extensions/source/dbpilots/groupboxwiz.cxx
b/extensions/source/dbpilots/groupboxwiz.cxx
index ee59d00..3816e32 100644
--- a/extensions/source/dbpilots/groupboxwiz.cxx
+++ b/extensions/source/dbpilots/groupboxwiz.cxx
@@ -49,7 +49,7 @@ namespace dbp
OGroupBoxWizard::OGroupBoxWizard( Window* _pParent,
const Reference< XPropertySet >& _rxObjectModel, const Reference<
XComponentContext >& _rxContext )
- :OControlWizard(_pParent, ModuleRes(RID_DLG_GROUPBOXWIZARD),
_rxObjectModel, _rxContext)
+ :OControlWizard(_pParent, _rxObjectModel, _rxContext)
,m_bVisitedDefault(false)
,m_bVisitedDB(false)
{
@@ -59,6 +59,7 @@ namespace dbp
m_pNextPage->SetHelpId(HID_GROUPWIZARD_NEXT);
m_pCancel->SetHelpId(HID_GROUPWIZARD_CANCEL);
m_pFinish->SetHelpId(HID_GROUPWIZARD_FINISH);
+ setTitleBase(ModuleRes(RID_STR_GROUPWIZARD_TITLE).toString());
}
diff --git a/extensions/source/dbpilots/listcombowizard.cxx
b/extensions/source/dbpilots/listcombowizard.cxx
index b191e98..83bcfec 100644
--- a/extensions/source/dbpilots/listcombowizard.cxx
+++ b/extensions/source/dbpilots/listcombowizard.cxx
@@ -51,7 +51,7 @@ namespace dbp
OListComboWizard::OListComboWizard( Window* _pParent,
const Reference< XPropertySet >& _rxObjectModel, const Reference<
XComponentContext >& _rxContext )
- :OControlWizard(_pParent, ModuleRes(RID_DLG_LISTCOMBOWIZARD),
_rxObjectModel, _rxContext)
+ :OControlWizard(_pParent, _rxObjectModel, _rxContext)
,m_bListBox(false)
,m_bHadDataSelection(true)
{
diff --git a/include/svtools/wizardmachine.hxx
b/include/svtools/wizardmachine.hxx
index 42a7305..0170b2e 100644
--- a/include/svtools/wizardmachine.hxx
+++ b/include/svtools/wizardmachine.hxx
@@ -177,6 +177,7 @@ namespace svt
*/
OWizardMachine(Window* _pParent, const ResId& _rRes, sal_uInt32
_nButtonFlags );
OWizardMachine(Window* _pParent, const WinBits i_nStyle, sal_uInt32
_nButtonFlags );
+ OWizardMachine(Window* _pParent, sal_uInt32 _nButtonFlags );
virtual ~OWizardMachine();
/// enable (or disable) buttons
diff --git a/include/svtools/wizdlg.hxx b/include/svtools/wizdlg.hxx
index 798d706..8d26dc4 100644
--- a/include/svtools/wizdlg.hxx
+++ b/include/svtools/wizdlg.hxx
@@ -254,6 +254,7 @@ private:
public:
WizardDialog( Window* pParent, WinBits nStyle = WB_STDTABDIALOG );
WizardDialog( Window* pParent, const ResId& rResId );
+ WizardDialog( Window* pParent, const OString& rID, const OUString&
rUIXMLDescription );
virtual ~WizardDialog();
virtual void Resize() SAL_OVERRIDE;
diff --git a/svtools/UIConfig_svt.mk b/svtools/UIConfig_svt.mk
index 5a6b0ca..0c482cd 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 0c92cb6..f7bd865 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 7ef7a7a..50af198 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 0000000..a38a515
--- /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>
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
