[Libreoffice-commits] core.git: include/svx svx/inc svx/source svx/uiconfig svx/UIConfig_svx.mk
Caolán McNamara
caolanm at redhat.com
Thu Dec 5 08:06:23 PST 2013
include/svx/fmresids.hrc | 2
svx/UIConfig_svx.mk | 1
svx/inc/fmhelp.hrc | 1
svx/source/form/datanavi.cxx | 36 ++-----
svx/source/form/datanavi.src | 66 -------------
svx/source/inc/datanavi.hrc | 6 -
svx/source/inc/datanavi.hxx | 32 ++----
svx/uiconfig/ui/addnamespacedialog.ui | 167 ++++++++++++++++++++++++++++++++++
8 files changed, 191 insertions(+), 120 deletions(-)
New commits:
commit 2b04cfa242436b2227600224450eb6fd75a2db1a
Author: Caolán McNamara <caolanm at redhat.com>
Date: Thu Dec 5 14:47:17 2013 +0000
convert add namespace dialog to .ui
Change-Id: I3636da91d39b2759dca72f30cc7b086b6f9cbb16
diff --git a/include/svx/fmresids.hrc b/include/svx/fmresids.hrc
index f6281e1..2b17bbd 100644
--- a/include/svx/fmresids.hrc
+++ b/include/svx/fmresids.hrc
@@ -64,7 +64,7 @@
#define RID_SVXDLG_ADD_DATAITEM (RID_FORMS_START + 12)
#define RID_SVXDLG_ADD_CONDITION (RID_FORMS_START + 13)
#define RID_SVXDLG_NAMESPACE_ITEM (RID_FORMS_START + 14)
-#define RID_SVXDLG_MANAGE_NAMESPACE (RID_FORMS_START + 15)
+
#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)
diff --git a/svx/UIConfig_svx.mk b/svx/UIConfig_svx.mk
index 7662784..2cd3889 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/addnamespacedialog \
svx/uiconfig/ui/asianphoneticguidedialog \
svx/uiconfig/ui/chineseconversiondialog \
svx/uiconfig/ui/compressgraphicdialog \
diff --git a/svx/inc/fmhelp.hrc b/svx/inc/fmhelp.hrc
index 17f663a..4a95afb 100644
--- a/svx/inc/fmhelp.hrc
+++ b/svx/inc/fmhelp.hrc
@@ -57,7 +57,6 @@
#define HID_XFORMS_ADDCONDITION_DLG "SVX_HID_XFORMS_ADDCONDITION_DLG"
#define HID_XFORMS_NAMESPACEITEM_DLG "SVX_HID_XFORMS_NAMESPACEITEM_DLG"
#define HID_XFORMS_NAMESPACEITEM_LIST "SVX_HID_XFORMS_NAMESPACEITEM_LIST"
-#define HID_XFORMS_MANAGENAMESPACE_DLG "SVX_HID_XFORMS_MANAGENAMESPACE_DLG"
#define HID_MN_XFORMS_MODELS_ADD "SVX_HID_MN_XFORMS_MODELS_ADD"
#define HID_MN_XFORMS_MODELS_EDIT "SVX_HID_MN_XFORMS_MODELS_EDIT"
#define HID_MN_XFORMS_MODELS_REMOVE "SVX_HID_MN_XFORMS_MODELS_REMOVE"
diff --git a/svx/source/form/datanavi.cxx b/svx/source/form/datanavi.cxx
index 58f74cbb..bd2e530 100644
--- a/svx/source/form/datanavi.cxx
+++ b/svx/source/form/datanavi.cxx
@@ -3300,40 +3300,24 @@ namespace svxform
// class ManageNamespaceDialog
//========================================================================
- ManageNamespaceDialog::ManageNamespaceDialog(
- Window* pParent, AddConditionDialog* _pCondDlg, bool _bIsEdit ) :
-
- ModalDialog( pParent, SVX_RES( RID_SVXDLG_MANAGE_NAMESPACE ) ),
-
- m_aPrefixFT ( this, SVX_RES( FT_PREFIX ) ),
- m_aPrefixED ( this, SVX_RES( ED_PREFIX ) ),
- m_aUrlFT ( this, SVX_RES( FT_URL ) ),
- m_aUrlED ( this, SVX_RES( ED_URL ) ),
- 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 ) ),
-
- m_pConditionDlg ( _pCondDlg )
-
+ ManageNamespaceDialog::ManageNamespaceDialog(Window* pParent, AddConditionDialog* _pCondDlg, bool bIsEdit)
+ : ModalDialog(pParent, "AddNamespaceDialog", "svx/ui/addnamespacedialog.ui")
+ , m_pConditionDlg ( _pCondDlg )
{
- if ( _bIsEdit )
- SetText(SVX_RESSTR(STR_EDIT_TEXT));
+ get(m_pOKBtn, "ok");
+ get(m_pPrefixED, "prefix");
+ get(m_pUrlED, "url");
- FreeResource();
+ if (bIsEdit)
+ SetText(get<FixedText>("alttitle")->GetText());
- m_aOKBtn.SetClickHdl( LINK( this, ManageNamespaceDialog, OKHdl ) );
- }
-
- //------------------------------------------------------------------------
- ManageNamespaceDialog::~ManageNamespaceDialog()
- {
+ m_pOKBtn->SetClickHdl( LINK( this, ManageNamespaceDialog, OKHdl ) );
}
//------------------------------------------------------------------------
IMPL_LINK_NOARG(ManageNamespaceDialog, OKHdl)
{
- OUString sPrefix = m_aPrefixED.GetText();
+ OUString sPrefix = m_pPrefixED->GetText();
try
{
diff --git a/svx/source/form/datanavi.src b/svx/source/form/datanavi.src
index 7e16407..974924d 100644
--- a/svx/source/form/datanavi.src
+++ b/svx/source/form/datanavi.src
@@ -708,72 +708,6 @@ ModalDialog RID_SVXDLG_NAMESPACE_ITEM
};
};
-ModalDialog RID_SVXDLG_MANAGE_NAMESPACE
-{
- HelpID = HID_XFORMS_MANAGENAMESPACE_DLG ;
- OutputSize = TRUE ;
- SVLook = TRUE ;
- Size = MAP_APPFONT ( 210 , 60 ) ;
- Text [ en-US ] = "Add Namespace" ;
- Moveable = TRUE ;
- FixedText FT_PREFIX
- {
- Pos = MAP_APPFONT ( 6 , 3 ) ;
- Size = MAP_APPFONT ( 45 , 8 ) ;
- LeftLabel = TRUE ;
- Text [ en-US ] = "~Prefix" ;
- };
- Edit ED_PREFIX
- {
- HelpID = "svx:Edit:RID_SVXDLG_MANAGE_NAMESPACE:ED_PREFIX";
- Pos = MAP_APPFONT ( 6 , 14 ) ;
- Size = MAP_APPFONT ( 45 , 12 ) ;
- Border = TRUE;
- };
- FixedText FT_URL
- {
- Pos = MAP_APPFONT ( 54 , 3 ) ;
- Size = MAP_APPFONT ( 150 , 8 ) ;
- LeftLabel = TRUE ;
- Text [ en-US ] = "~URL" ;
- };
- Edit ED_URL
- {
- HelpID = "svx:Edit:RID_SVXDLG_MANAGE_NAMESPACE:ED_URL";
- Pos = MAP_APPFONT ( 54 , 14 ) ;
- Size = MAP_APPFONT ( 150 , 12 ) ;
- Border = TRUE;
- };
- FixedLine FL_DATANAV_BTN
- {
- Pos = MAP_APPFONT ( 4 , 29 ) ;
- Size = MAP_APPFONT ( 202 , 8 ) ;
- };
- OKButton BTN_DATANAV_OK
- {
- Pos = MAP_APPFONT ( 45 , 40 ) ;
- Size = MAP_APPFONT ( 50 , 14 ) ;
- TabStop = TRUE ;
- DefButton = TRUE ;
- };
- CancelButton BTN_DATANAV_ESC
- {
- Pos = MAP_APPFONT ( 98 , 40 ) ;
- Size = MAP_APPFONT ( 50 , 14 ) ;
- TabStop = TRUE ;
- };
- HelpButton BTN_DATANAV_HELP
- {
- Pos = MAP_APPFONT ( 154 , 40 ) ;
- Size = MAP_APPFONT ( 50 , 14 ) ;
- TabStop = TRUE ;
- };
- String STR_EDIT_TEXT
- {
- Text [ en-US ] = "Edit Namespace" ;
- };
-};
-
ModalDialog RID_SVXDLG_ADD_SUBMISSION
{
HelpID = HID_XFORMS_ADDSUBMISSION_DLG ;
diff --git a/svx/source/inc/datanavi.hrc b/svx/source/inc/datanavi.hrc
index ba814e2..ac19bde 100644
--- a/svx/source/inc/datanavi.hrc
+++ b/svx/source/inc/datanavi.hrc
@@ -126,12 +126,6 @@
#define STR_HEADER_PREFIX 10
#define STR_HEADER_URL 11
-// class ManageNamespaceDialog
-#define FT_PREFIX 10
-#define ED_PREFIX 11
-#define FT_URL 12
-#define ED_URL 13
-
#define STR_EDIT_TEXT 10
// class AddSubmissionDialog
diff --git a/svx/source/inc/datanavi.hxx b/svx/source/inc/datanavi.hxx
index 962d936..2015fcb 100644
--- a/svx/source/inc/datanavi.hxx
+++ b/svx/source/inc/datanavi.hxx
@@ -440,34 +440,26 @@ namespace svxform
class ManageNamespaceDialog : public ModalDialog
{
private:
- FixedText m_aPrefixFT;
- Edit m_aPrefixED;
- FixedText m_aUrlFT;
- Edit m_aUrlED;
- FixedLine m_aButtonsFL;
- OKButton m_aOKBtn;
- CancelButton m_aEscBtn;
- HelpButton m_aHelpBtn;
+ Edit* m_pPrefixED;
+ Edit* m_pUrlED;
+ OKButton* m_pOKBtn;
AddConditionDialog* m_pConditionDlg;
DECL_LINK(OKHdl, void *);
public:
- ManageNamespaceDialog( Window* pParent, AddConditionDialog* _pCondDlg, bool _bIsEdit );
- ~ManageNamespaceDialog();
-
- inline void SetNamespace( const OUString& _rPrefix, const OUString& _rURL );
- inline OUString GetPrefix() const { return m_aPrefixED.GetText(); }
- inline OUString GetURL() const { return m_aUrlED.GetText(); }
+ ManageNamespaceDialog(Window* pParent, AddConditionDialog* _pCondDlg, bool bIsEdit);
+
+ void SetNamespace(const OUString& _rPrefix, const OUString& _rURL)
+ {
+ m_pPrefixED->SetText( _rPrefix );
+ m_pUrlED->SetText( _rURL );
+ }
+ OUString GetPrefix() const { return m_pPrefixED->GetText(); }
+ OUString GetURL() const { return m_pUrlED->GetText(); }
};
- void ManageNamespaceDialog::SetNamespace( const OUString& _rPrefix, const OUString& _rURL )
- {
- m_aPrefixED.SetText( _rPrefix );
- m_aUrlED.SetText( _rURL );
- }
-
//========================================================================
class AddSubmissionDialog : public ModalDialog
{
diff --git a/svx/uiconfig/ui/addnamespacedialog.ui b/svx/uiconfig/ui/addnamespacedialog.ui
new file mode 100644
index 0000000..5057e42
--- /dev/null
+++ b/svx/uiconfig/ui/addnamespacedialog.ui
@@ -0,0 +1,167 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<interface>
+ <!-- interface-requires gtk+ 3.0 -->
+ <object class="GtkDialog" id="AddNamespaceDialog">
+ <property name="can_focus">False</property>
+ <property name="border_width">6</property>
+ <property name="title" translatable="yes">Add Namespace</property>
+ <property name="type_hint">dialog</property>
+ <child internal-child="vbox">
+ <object class="GtkBox" id="dialog-vbox1">
+ <property name="can_focus">False</property>
+ <property name="orientation">vertical</property>
+ <property name="spacing">12</property>
+ <child internal-child="action_area">
+ <object class="GtkButtonBox" id="dialog-action_area1">
+ <property name="can_focus">False</property>
+ <property name="layout_style">end</property>
+ <child>
+ <object class="GtkButton" id="ok">
+ <property name="label">gtk-ok</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="can_default">True</property>
+ <property name="has_default">True</property>
+ <property name="receives_default">True</property>
+ <property name="use_stock">True</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkButton" id="cancel">
+ <property name="label">gtk-cancel</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">True</property>
+ <property name="use_stock">True</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkButton" id="help">
+ <property name="label">gtk-help</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">True</property>
+ <property name="use_stock">True</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">2</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="pack_type">end</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkGrid" id="grid3">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="hexpand">True</property>
+ <property name="row_spacing">6</property>
+ <property name="column_spacing">12</property>
+ <child>
+ <object class="GtkLabel" id="label1">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="xalign">0</property>
+ <property name="label" translatable="yes">_Prefix</property>
+ <property name="use_underline">True</property>
+ <property name="mnemonic_widget">prefix</property>
+ </object>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="top_attach">0</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkEntry" id="prefix">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="hexpand">True</property>
+ <property name="invisible_char">•</property>
+ <property name="width_chars">12</property>
+ </object>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="top_attach">1</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkEntry" id="url">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="hexpand">True</property>
+ <property name="invisible_char">•</property>
+ <property name="width_chars">34</property>
+ </object>
+ <packing>
+ <property name="left_attach">1</property>
+ <property name="top_attach">1</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="label2">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="xalign">0</property>
+ <property name="label" translatable="yes">_URL</property>
+ <property name="use_underline">True</property>
+ <property name="mnemonic_widget">url</property>
+ </object>
+ <packing>
+ <property name="left_attach">1</property>
+ <property name="top_attach">0</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="alttitle">
+ <property name="can_focus">False</property>
+ <property name="no_show_all">True</property>
+ <property name="label" translatable="yes">Edit Namespace</property>
+ </object>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="top_attach">2</property>
+ <property name="width">2</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ </object>
+ </child>
+ <action-widgets>
+ <action-widget response="0">ok</action-widget>
+ <action-widget response="0">cancel</action-widget>
+ <action-widget response="0">help</action-widget>
+ </action-widgets>
+ </object>
+</interface>
More information about the Libreoffice-commits
mailing list