From e5d35be267c4f4c7dd745fc8864df805e6675126 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Caol=C3=A1n=20McNamara?= Date: Thu, 5 Dec 2013 16:45:46 +0000 Subject: [PATCH] convert add model dialog to .ui Change-Id: I20d10d0e9c311bcfb1386d481ae4832f463b931a --- include/svx/fmresids.hrc | 2 +- svx/UIConfig_svx.mk | 1 + svx/inc/fmhelp.hrc | 1 - svx/source/form/datanavi.cxx | 26 +---- svx/source/form/datanavi.src | 69 ------------ svx/source/inc/datanavi.hxx | 19 +--- svx/uiconfig/ui/addmodeldialog.ui | 178 ++++++++++++++++++++++++++++++ 7 files changed, 192 insertions(+), 104 deletions(-) create mode 100644 svx/uiconfig/ui/addmodeldialog.ui diff --git a/include/svx/fmresids.hrc b/include/svx/fmresids.hrc index 2b17bbd05aad..fdeed412799e 100644 --- a/include/svx/fmresids.hrc +++ b/include/svx/fmresids.hrc @@ -66,7 +66,7 @@ #define RID_SVXDLG_NAMESPACE_ITEM (RID_FORMS_START + 14) #define RID_SVXDLG_ADD_SUBMISSION (RID_FORMS_START + 16) -#define RID_SVXDLG_ADD_MODEL (RID_FORMS_START + 17) + #define RID_SVXDLG_ADD_INSTANCE (RID_FORMS_START + 18) #define RID_SVXWIN_DATANAVIGATOR (RID_FORMS_START + 19) #define RID_SVX_XFORMS_TABPAGES (RID_FORMS_START + 20) diff --git a/svx/UIConfig_svx.mk b/svx/UIConfig_svx.mk index 2cd38890986e..a031a2d5821c 100644 --- a/svx/UIConfig_svx.mk +++ b/svx/UIConfig_svx.mk @@ -11,6 +11,7 @@ $(eval $(call gb_UIConfig_UIConfig,svx)) $(eval $(call gb_UIConfig_add_uifiles,svx,\ svx/uiconfig/ui/acceptrejectchangesdialog \ + svx/uiconfig/ui/addmodeldialog \ svx/uiconfig/ui/addnamespacedialog \ svx/uiconfig/ui/asianphoneticguidedialog \ svx/uiconfig/ui/chineseconversiondialog \ diff --git a/svx/inc/fmhelp.hrc b/svx/inc/fmhelp.hrc index 4a95afb6757c..424576919e1f 100644 --- a/svx/inc/fmhelp.hrc +++ b/svx/inc/fmhelp.hrc @@ -75,7 +75,6 @@ #define HID_XFORMS_MODELS_MENUBTN "SVX_HID_XFORMS_MODELS_MENUBTN" #define HID_XFORMS_INSTANCES_MENUBTN "SVX_HID_XFORMS_INSTANCES_MENUBTN" #define HID_XFORMS_ADDSUBMISSION_DLG "SVX_HID_XFORMS_ADDSUBMISSION_DLG" -#define HID_XFORMS_ADDMODEL_DLG "SVX_HID_XFORMS_ADDMODEL_DLG" #define HID_XFORMS_ADDINSTANCE_DLG "SVX_HID_XFORMS_ADDINSTANCE_DLG" #define HID_XFORMS_MID_INSERT_CONTROL "SVX_HID_XFORMS_MID_INSERT_CONTROL" #define HID_XFORMS_TAB_CONTROL "SVX_HID_XFORMS_TAB_CONTROL" diff --git a/svx/source/form/datanavi.cxx b/svx/source/form/datanavi.cxx index bd2e530a1237..9820a0b3fba7 100644 --- a/svx/source/form/datanavi.cxx +++ b/svx/source/form/datanavi.cxx @@ -3583,28 +3583,14 @@ namespace svxform // class AddModelDialog //======================================================================== - AddModelDialog::AddModelDialog( Window* pParent, bool _bEdit ) : - - ModalDialog( pParent, SVX_RES( RID_SVXDLG_ADD_MODEL ) ), - - m_aModelFL ( this, SVX_RES( FL_MODEL ) ), - m_aNameFT ( this, SVX_RES( FT_MODEL_NAME ) ), - m_aNameED ( this, SVX_RES( ED_MODEL_NAME ) ), - m_aModifyCB ( this, SVX_RES( CB_MODIFIES_DOCUMENT ) ), - m_aButtonsFL ( this, SVX_RES( FL_DATANAV_BTN ) ), - m_aOKBtn ( this, SVX_RES( BTN_DATANAV_OK ) ), - m_aEscBtn ( this, SVX_RES( BTN_DATANAV_ESC ) ), - m_aHelpBtn ( this, SVX_RES( BTN_DATANAV_HELP ) ) - + AddModelDialog::AddModelDialog(Window* pParent, bool bIsEdit) + : ModalDialog(pParent, "AddModelDialog", "svx/ui/addmodeldialog.ui") { - if ( _bEdit ) - SetText(SVX_RESSTR(STR_EDIT_TEXT)); + get(m_pNameED, "name"); + get(m_pModifyCB, "modify"); - FreeResource(); - } - - AddModelDialog::~AddModelDialog() - { + if (bIsEdit) + SetText(get("alttitle")->GetText()); } //======================================================================== diff --git a/svx/source/form/datanavi.src b/svx/source/form/datanavi.src index 974924d07dbe..882b93a6d31a 100644 --- a/svx/source/form/datanavi.src +++ b/svx/source/form/datanavi.src @@ -868,75 +868,6 @@ ModalDialog RID_SVXDLG_ADD_SUBMISSION }; }; -ModalDialog RID_SVXDLG_ADD_MODEL -{ - HelpID = HID_XFORMS_ADDMODEL_DLG ; - OutputSize = TRUE ; - SVLook = TRUE ; - Size = MAP_APPFONT ( 180 , 82 ) ; - Text [ en-US ] = "Add Model" ; - Moveable = TRUE ; - FixedLine FL_INSTANCE - { - Pos = MAP_APPFONT ( 4 , 3 ) ; - Size = MAP_APPFONT ( 172 , 8 ) ; - Text [ en-US ] = "Model" ; - }; - FixedText FT_INST_NAME - { - Pos = MAP_APPFONT ( 6 , 14 ) ; - Size = MAP_APPFONT ( 51 , 12 ) ; - LeftLabel = TRUE ; - VCenter = TRUE; - Text [ en-US ] = "~Name" ; - }; - Edit ED_INST_NAME - { - HelpID = "svx:Edit:RID_SVXDLG_ADD_MODEL:ED_INST_NAME"; - Pos = MAP_APPFONT ( 60 , 14 ) ; - Size = MAP_APPFONT ( 114 , 12 ) ; - Border = TRUE ; - }; - CheckBox CB_MODIFIES_DOCUMENT - { - HelpID = "svx:CheckBox:RID_SVXDLG_ADD_MODEL:CB_MODIFIES_DOCUMENT"; - Pos = MAP_APPFONT( 6, 32 ); - Size = MAP_APPFONT( 168, 16 ); - Top = TRUE; - WordBreak = TRUE; - - Text [ en-US ] = "Model data updates change document's modification status"; - }; - FixedLine FL_DATANAV_BTN - { - Pos = MAP_APPFONT ( 4 , 51 ) ; - Size = MAP_APPFONT ( 172 , 8 ) ; - }; - OKButton BTN_DATANAV_OK - { - Pos = MAP_APPFONT ( 15 , 62 ) ; - Size = MAP_APPFONT ( 50 , 14 ) ; - TabStop = TRUE ; - DefButton = TRUE ; - }; - CancelButton BTN_DATANAV_ESC - { - Pos = MAP_APPFONT ( 68 , 62 ) ; - Size = MAP_APPFONT ( 50 , 14 ) ; - TabStop = TRUE ; - }; - HelpButton BTN_DATANAV_HELP - { - Pos = MAP_APPFONT ( 124 , 62 ) ; - Size = MAP_APPFONT ( 50 , 14 ) ; - TabStop = TRUE ; - }; - String STR_EDIT_TEXT - { - Text [ en-US ] = "Edit Model" ; - }; -}; - ModalDialog RID_SVXDLG_ADD_INSTANCE { HelpID = HID_XFORMS_ADDINSTANCE_DLG ; diff --git a/svx/source/inc/datanavi.hxx b/svx/source/inc/datanavi.hxx index 2015fcb73253..36132cfe9df5 100644 --- a/svx/source/inc/datanavi.hxx +++ b/svx/source/inc/datanavi.hxx @@ -509,24 +509,17 @@ namespace svxform class AddModelDialog : public ModalDialog { private: - FixedLine m_aModelFL; - FixedText m_aNameFT; - Edit m_aNameED; - CheckBox m_aModifyCB; - FixedLine m_aButtonsFL; - OKButton m_aOKBtn; - CancelButton m_aEscBtn; - HelpButton m_aHelpBtn; + Edit* m_pNameED; + CheckBox* m_pModifyCB; public: AddModelDialog( Window* pParent, bool _bEdit ); - ~AddModelDialog(); - inline OUString GetName() const { return m_aNameED.GetText(); } - inline void SetName( const OUString& _rName ) { m_aNameED.SetText( _rName );} + OUString GetName() const { return m_pNameED->GetText(); } + void SetName( const OUString& _rName ) { m_pNameED->SetText( _rName );} - inline bool GetModifyDoc() const { return bool( m_aModifyCB.IsChecked() ); } - inline void SetModifyDoc( const bool _bModify ) { m_aModifyCB.Check( _bModify ); } + bool GetModifyDoc() const { return bool( m_pModifyCB->IsChecked() ); } + void SetModifyDoc( const bool bModify ) { m_pModifyCB->Check( bModify ); } }; //======================================================================== diff --git a/svx/uiconfig/ui/addmodeldialog.ui b/svx/uiconfig/ui/addmodeldialog.ui new file mode 100644 index 000000000000..d3691aa12755 --- /dev/null +++ b/svx/uiconfig/ui/addmodeldialog.ui @@ -0,0 +1,178 @@ + + + + + False + 6 + Add Model + dialog + + + False + vertical + 12 + + + False + end + + + gtk-ok + True + True + True + True + True + True + + + False + True + 0 + + + + + gtk-cancel + True + True + True + True + + + False + True + 1 + + + + + gtk-help + True + True + True + True + + + False + True + 2 + + + + + False + True + end + 0 + + + + + True + False + 0 + none + + + True + False + 6 + 12 + + + True + False + True + 6 + 12 + + + Model data updates change document's modification status + True + True + False + True + 0 + True + + + 0 + 1 + 2 + 1 + + + + + True + True + True + • + + + 1 + 0 + 1 + 1 + + + + + True + False + 0 + _Name + True + name + + + 0 + 0 + 1 + 1 + + + + + False + True + Edit Model + + + 0 + 2 + 2 + 1 + + + + + + + + + True + False + Model + + + + + + + + False + True + 1 + + + + + + ok + cancel + help + + +