From 4c05804b2ee2e98c1f2652f88283815a43e9d75e Mon Sep 17 00:00:00 2001 From: Caolán McNamara Date: Fri, 25 Jan 2013 12:16:06 +0000 Subject: split up into one dialog per .ui Change-Id: I5473ef07abb1f96aed4cfd96d4fa436ec2f13e64 --- cui/UI_cui.mk | 3 + cui/source/dialogs/dlgname.cxx | 8 +- cui/uiconfig/ui/messbox.ui | 108 +++++++++ cui/uiconfig/ui/namedialog.ui | 393 ------------------------------- cui/uiconfig/ui/objectnamedialog.ui | 121 ++++++++++ cui/uiconfig/ui/objecttitledescdialog.ui | 164 +++++++++++++ 6 files changed, 400 insertions(+), 397 deletions(-) create mode 100644 cui/uiconfig/ui/messbox.ui create mode 100644 cui/uiconfig/ui/objectnamedialog.ui create mode 100644 cui/uiconfig/ui/objecttitledescdialog.ui (limited to 'cui') diff --git a/cui/UI_cui.mk b/cui/UI_cui.mk index c260e11a3ffe..d2d7d8b4ceaa 100644 --- a/cui/UI_cui.mk +++ b/cui/UI_cui.mk @@ -20,10 +20,13 @@ $(eval $(call gb_UI_add_uifiles,cui,\ cui/uiconfig/ui/insertplugin \ cui/uiconfig/ui/insertrowcolumn \ cui/uiconfig/ui/macroselectordialog \ + cui/uiconfig/ui/messbox \ cui/uiconfig/ui/namedialog \ cui/uiconfig/ui/numberingformatpage \ cui/uiconfig/ui/numberingoptionspage \ cui/uiconfig/ui/numberingpositionpage \ + cui/uiconfig/ui/objectnamedialog \ + cui/uiconfig/ui/objecttitledescdialog \ cui/uiconfig/ui/personalization_tab \ cui/uiconfig/ui/pickbulletpage \ cui/uiconfig/ui/pickgraphicpage \ diff --git a/cui/source/dialogs/dlgname.cxx b/cui/source/dialogs/dlgname.cxx index e6541bd11239..2b824f2ac8bc 100644 --- a/cui/source/dialogs/dlgname.cxx +++ b/cui/source/dialogs/dlgname.cxx @@ -77,9 +77,9 @@ IMPL_LINK_NOARG(SvxNameDialog, ModifyHdl) SvxObjectNameDialog::SvxObjectNameDialog( Window* pWindow, const String& rName) : - ModalDialog ( pWindow, "ObjectNameDialog", "cui/ui/namedialog.ui" ) + ModalDialog ( pWindow, "ObjectNameDialog", "cui/ui/objectnamedialog.ui" ) { - get(pBtnOK, "object_name_ok"); + get(pBtnOK, "ok"); get(pEdtName, "object_name_entry"); // set name pEdtName->SetText(rName); @@ -108,7 +108,7 @@ SvxObjectTitleDescDialog::SvxObjectTitleDescDialog( Window* pWindow, const String& rTitle, const String& rDescription) : - ModalDialog ( pWindow, "ObjectTitleDescDialog", "cui/ui/namedialog.ui" ) + ModalDialog ( pWindow, "ObjectTitleDescDialog", "cui/ui/objecttitledescdialog.ui" ) { get(pEdtTitle, "object_title_entry"); get(pEdtDescription, "desc_entry"); @@ -131,7 +131,7 @@ SvxObjectTitleDescDialog::SvxObjectTitleDescDialog( \************************************************************************/ SvxMessDialog::SvxMessDialog( Window* pWindow, const String& rText, const String& rDesc, Image* pImg ) : - ModalDialog ( pWindow, "MessBox", "cui/ui/namedialog.ui" ) + ModalDialog ( pWindow, "MessBox", "cui/ui/messbox.ui" ) { get(pBtn1, "mess_box_btn1"); get(pBtn2, "mess_box_btn2"); diff --git a/cui/uiconfig/ui/messbox.ui b/cui/uiconfig/ui/messbox.ui new file mode 100644 index 000000000000..c40db71a1c81 --- /dev/null +++ b/cui/uiconfig/ui/messbox.ui @@ -0,0 +1,108 @@ + + + + + False + 5 + dialog + + + False + vertical + 2 + + + False + end + + + True + True + True + + + False + True + 0 + + + + + True + True + True + + + False + True + 1 + + + + + gtk-cancel + True + True + True + True + + + False + True + 2 + + + + + False + True + end + 0 + + + + + True + False + 6 + 6 + + + False + center + gtk-missing-image + + + False + True + 0 + + + + + True + False + 0 + + + True + True + 1 + + + + + True + True + 1 + + + + + + mess_box_btn1 + mess_box_btn2 + cancel + + + diff --git a/cui/uiconfig/ui/namedialog.ui b/cui/uiconfig/ui/namedialog.ui index 85cbc48b4661..5837621b8ceb 100644 --- a/cui/uiconfig/ui/namedialog.ui +++ b/cui/uiconfig/ui/namedialog.ui @@ -1,110 +1,6 @@ - - False - 5 - dialog - - - False - vertical - 2 - - - False - end - - - True - True - True - - - False - True - 0 - - - - - True - True - True - - - False - True - 1 - - - - - gtk-cancel - True - True - True - True - - - False - True - 2 - - - - - False - True - end - 0 - - - - - True - False - 6 - 6 - - - False - center - gtk-missing-image - - - False - True - 0 - - - - - True - False - 0 - - - True - True - 1 - - - - - True - True - 1 - - - - - - mess_box_btn1 - mess_box_btn2 - mess_box_cancel - - False 5 @@ -223,293 +119,4 @@ help - - False - 5 - Name - dialog - - - False - vertical - 2 - - - False - end - - - gtk-help - True - True - True - True - - - False - True - 0 - True - - - - - gtk-ok - True - True - True - True - True - True - - - False - True - 1 - - - - - gtk-cancel - True - True - True - True - - - False - True - 2 - - - - - False - True - end - 0 - - - - - True - False - 5 - vertical - 6 - - - True - False - 0 - _Name - True - name_entry - - - False - True - 0 - - - - - True - True - • - 55 - True - - - False - True - 1 - - - - - False - True - 1 - - - - - - object_name_help - object_name_ok - object_name_cancel - - - - 100 - 1 - 10 - - - False - 5 - Description - dialog - - - False - vertical - 2 - - - False - end - - - gtk-help - True - True - True - True - - - False - True - 0 - True - - - - - gtk-ok - True - True - True - True - True - True - - - False - True - 1 - - - - - gtk-cancel - True - True - True - True - - - False - True - 2 - - - - - False - True - end - 0 - - - - - True - False - 5 - vertical - 6 - - - True - False - 0 - _Title - True - object_title_entry - - - False - True - 0 - - - - - True - True - • - 55 - True - - - False - True - 1 - - - - - True - False - 0 - _Description - True - - - False - True - 2 - - - - - True - True - always - in - - - True - True - adjustment1 - word - textbuffer1 - - - - - True - True - 3 - - - - - True - True - 1 - - - - - - object_title_desc_help - object_title_desc_ok - object_title_desc_cancel - - - - 100 - 1 - 10 - - - - - - - - diff --git a/cui/uiconfig/ui/objectnamedialog.ui b/cui/uiconfig/ui/objectnamedialog.ui new file mode 100644 index 000000000000..319514746ad9 --- /dev/null +++ b/cui/uiconfig/ui/objectnamedialog.ui @@ -0,0 +1,121 @@ + + + + + False + 5 + Name + dialog + + + False + vertical + 2 + + + False + end + + + gtk-help + True + True + True + True + + + False + True + 0 + True + + + + + gtk-ok + True + True + True + True + True + True + + + False + True + 1 + + + + + gtk-cancel + True + True + True + True + + + False + True + 2 + + + + + False + True + end + 0 + + + + + True + False + 5 + vertical + 6 + + + True + False + 0 + _Name + True + + + False + True + 0 + + + + + True + True + • + 55 + True + + + False + True + 1 + + + + + False + True + 1 + + + + + + help + ok + cancel + + + diff --git a/cui/uiconfig/ui/objecttitledescdialog.ui b/cui/uiconfig/ui/objecttitledescdialog.ui new file mode 100644 index 000000000000..7ee72231220d --- /dev/null +++ b/cui/uiconfig/ui/objecttitledescdialog.ui @@ -0,0 +1,164 @@ + + + + + False + 5 + Description + dialog + + + False + vertical + 2 + + + False + end + + + gtk-help + True + True + True + True + + + False + True + 0 + True + + + + + gtk-ok + True + True + True + True + True + True + + + False + True + 1 + + + + + gtk-cancel + True + True + True + True + + + False + True + 2 + + + + + False + True + end + 0 + + + + + True + False + 5 + vertical + 6 + + + True + False + 0 + _Title + True + object_title_entry + + + False + True + 0 + + + + + True + True + • + 55 + True + + + False + True + 1 + + + + + True + False + 0 + _Description + True + + + False + True + 2 + + + + + True + True + always + in + + + True + True + word + textbuffer1 + + + + + True + True + 3 + + + + + True + True + 1 + + + + + + help + ok + cancel + + + + + + + + + + -- cgit v1.2.3