mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

convert namespace dialog to .ui

Browse Source 
Change-Id: I9d45cdf16d81bfda21fb38bef87e91131683ad06
This commit is contained in:
Caolán McNamara
2014-02-01 13:52:11 +00:00
parent 0780f8a04b
commit ae7880ea49
8 changed files with 309 additions and 158 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
include/svx/fmresids.hrc
View File

@@ -61,7 +61,6 @@
// Dialog-Id's -----------------------------------------------------------
#define RID_SVX_FMEXPLORER (RID_FORMS_START + 6)
#define RID_SVXDLG_NAMESPACE_ITEM (RID_FORMS_START + 14)
#define RID_SVXWIN_DATANAVIGATOR (RID_FORMS_START + 19)
#define RID_SVX_XFORMS_TABPAGES (RID_FORMS_START + 20)

1
svx/UIConfig_svx.mk
View File

@@ -27,6 +27,7 @@ $(eval $(call gb_UIConfig_add_uifiles,svx,\
svx/uiconfig/ui/fontworkspacingdialog \
svx/uiconfig/ui/headfootformatpage \
svx/uiconfig/ui/linkwarndialog \
svx/uiconfig/ui/namespacedialog \
svx/uiconfig/ui/optgridpage \
svx/uiconfig/ui/passwd \
svx/uiconfig/ui/querydeletecontourdialog \

2
svx/inc/fmhelp.hrc
View File

@@ -53,8 +53,6 @@
#define UID_FORMPROPBROWSER_FRAME "SVX_UID_FORMPROPBROWSER_FRAME"
#define UID_ABSOLUTE_RECORD_WINDOW "SVX_UID_ABSOLUTE_RECORD_WINDOW"
#define HID_DATA_NAVIGATOR_WIN "SVX_HID_DATA_NAVIGATOR_WIN"
#define HID_XFORMS_NAMESPACEITEM_DLG "SVX_HID_XFORMS_NAMESPACEITEM_DLG"
#define HID_XFORMS_NAMESPACEITEM_LIST "SVX_HID_XFORMS_NAMESPACEITEM_LIST"
#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"

102
svx/source/form/datanavi.cxx
View File

@@ -2893,57 +2893,57 @@ namespace svxform
//========================================================================
NamespaceItemDialog::NamespaceItemDialog(
AddConditionDialog* _pCondDlg, Reference< XNameContainer >& _rContainer ) :
ModalDialog( _pCondDlg, SVX_RES( RID_SVXDLG_NAMESPACE_ITEM ) ),
m_aNamespacesFT ( this, SVX_RES( FT_NAMESPACES ) ),
m_aNamespacesListContainer ( this, SVX_RES( LB_NAMESPACES ) ),
m_aNamespacesList ( m_aNamespacesListContainer ),
m_aAddNamespaceBtn ( this, SVX_RES( PB_ADD_NAMESPACE ) ),
m_aEditNamespaceBtn ( this, SVX_RES( PB_EDIT_NAMESPACE ) ),
m_aDeleteNamespaceBtn ( this, SVX_RES( PB_DELETE_NAMESPACE ) ),
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 ),
m_rNamespaces ( _rContainer )
AddConditionDialog* _pCondDlg,
Reference< XNameContainer >& _rContainer )
: ModalDialog( _pCondDlg, "NamespaceDialog",
"svx/ui/namespacedialog.ui" )
, m_pConditionDlg(_pCondDlg)
, m_rNamespaces(_rContainer)
{
get(m_pAddNamespaceBtn, "add");
get(m_pEditNamespaceBtn, "edit");
get(m_pDeleteNamespaceBtn, "delete");
get(m_pOKBtn, "ok");
SvSimpleTableContainer* pNamespacesListContainer =
get<SvSimpleTableContainer>("namespaces");
Size aControlSize(175, 72);
aControlSize = LogicToPixel(aControlSize, MAP_APPFONT);
pNamespacesListContainer->set_width_request(aControlSize.Width());
pNamespacesListContainer->set_height_request(aControlSize.Height());
m_pNamespacesList = new SvSimpleTable(*pNamespacesListContainer, 0);
static long aStaticTabs[]= { 3, 0, 35, 200 };
m_aNamespacesList.SvSimpleTable::SetTabs( aStaticTabs );
OUString sHeader = SVX_RESSTR( STR_HEADER_PREFIX );
m_pNamespacesList->SvSimpleTable::SetTabs( aStaticTabs );
OUString sHeader = get<FixedText>("prefix")->GetText();
sHeader += "\t";
sHeader += SVX_RESSTR(STR_HEADER_URL);
m_aNamespacesList.InsertHeaderEntry(
sHeader += get<FixedText>("url")->GetText();
m_pNamespacesList->InsertHeaderEntry(
sHeader, HEADERBAR_APPEND, HIB_LEFT /*| HIB_FIXEDPOS | HIB_FIXED*/ );
FreeResource();
m_aNamespacesList.SetSelectHdl( LINK( this, NamespaceItemDialog, SelectHdl ) );
m_pNamespacesList->SetSelectHdl( LINK( this, NamespaceItemDialog, SelectHdl ) );
Link aLink = LINK( this, NamespaceItemDialog, ClickHdl );
m_aAddNamespaceBtn.SetClickHdl( aLink );
m_aEditNamespaceBtn.SetClickHdl( aLink );
m_aDeleteNamespaceBtn.SetClickHdl( aLink );
m_aOKBtn.SetClickHdl( LINK( this, NamespaceItemDialog, OKHdl ) );
m_pAddNamespaceBtn->SetClickHdl( aLink );
m_pEditNamespaceBtn->SetClickHdl( aLink );
m_pDeleteNamespaceBtn->SetClickHdl( aLink );
m_pOKBtn->SetClickHdl( LINK( this, NamespaceItemDialog, OKHdl ) );
LoadNamespaces();
SelectHdl( &m_aNamespacesList );
SelectHdl( m_pNamespacesList );
}
//------------------------------------------------------------------------
NamespaceItemDialog::~NamespaceItemDialog()
{
delete m_pNamespacesList;
}
//------------------------------------------------------------------------
IMPL_LINK( NamespaceItemDialog, SelectHdl, SvSimpleTable *, EMPTYARG )
{
sal_Bool bEnable = ( m_aNamespacesList.FirstSelected() != NULL );
m_aEditNamespaceBtn.Enable( bEnable );
m_aDeleteNamespaceBtn.Enable( bEnable );
sal_Bool bEnable = ( m_pNamespacesList->FirstSelected() != NULL );
m_pEditNamespaceBtn->Enable( bEnable );
m_pDeleteNamespaceBtn->Enable( bEnable );
return 0;
}
@@ -2951,7 +2951,7 @@ namespace svxform
//------------------------------------------------------------------------
IMPL_LINK( NamespaceItemDialog, ClickHdl, PushButton *, pBtn )
{
if ( &m_aAddNamespaceBtn == pBtn )
if ( m_pAddNamespaceBtn == pBtn )
{
ManageNamespaceDialog aDlg( this, m_pConditionDlg, false );
if ( aDlg.Execute() == RET_OK )
@@ -2959,42 +2959,42 @@ namespace svxform
OUString sEntry = aDlg.GetPrefix();
sEntry += "\t";
sEntry += aDlg.GetURL();
m_aNamespacesList.InsertEntry( sEntry );
m_pNamespacesList->InsertEntry( sEntry );
}
}
else if ( &m_aEditNamespaceBtn == pBtn )
else if ( m_pEditNamespaceBtn == pBtn )
{
ManageNamespaceDialog aDlg( this, m_pConditionDlg, true );
SvTreeListEntry* pEntry = m_aNamespacesList.FirstSelected();
SvTreeListEntry* pEntry = m_pNamespacesList->FirstSelected();
DBG_ASSERT( pEntry, "NamespaceItemDialog::ClickHdl(): no entry" );
OUString sPrefix( m_aNamespacesList.GetEntryText( pEntry, 0 ) );
OUString sPrefix( m_pNamespacesList->GetEntryText( pEntry, 0 ) );
aDlg.SetNamespace(
sPrefix,
m_aNamespacesList.GetEntryText( pEntry, 1 ) );
m_pNamespacesList->GetEntryText( pEntry, 1 ) );
if ( aDlg.Execute() == RET_OK )
{
// if a prefix was changed, mark the old prefix as 'removed'
if( sPrefix != aDlg.GetPrefix() )
m_aRemovedList.push_back( sPrefix );
m_aNamespacesList.SetEntryText( aDlg.GetPrefix(), pEntry, 0 );
m_aNamespacesList.SetEntryText( aDlg.GetURL(), pEntry, 1 );
m_pNamespacesList->SetEntryText( aDlg.GetPrefix(), pEntry, 0 );
m_pNamespacesList->SetEntryText( aDlg.GetURL(), pEntry, 1 );
}
}
else if ( &m_aDeleteNamespaceBtn == pBtn )
else if ( m_pDeleteNamespaceBtn == pBtn )
{
SvTreeListEntry* pEntry = m_aNamespacesList.FirstSelected();
SvTreeListEntry* pEntry = m_pNamespacesList->FirstSelected();
DBG_ASSERT( pEntry, "NamespaceItemDialog::ClickHdl(): no entry" );
OUString sPrefix( m_aNamespacesList.GetEntryText( pEntry, 0 ) );
OUString sPrefix( m_pNamespacesList->GetEntryText( pEntry, 0 ) );
m_aRemovedList.push_back( sPrefix );
m_aNamespacesList.GetModel()->Remove( pEntry );
m_pNamespacesList->GetModel()->Remove( pEntry );
}
else
{
SAL_WARN( "svx.form", "NamespaceItemDialog::ClickHdl(): invalid button" );
}
SelectHdl( &m_aNamespacesList );
SelectHdl( m_pNamespacesList );
return 0;
}
@@ -3008,12 +3008,12 @@ namespace svxform
for( i = 0; i < nRemovedCount; ++i )
m_rNamespaces->removeByName( m_aRemovedList[i] );
sal_Int32 nEntryCount = m_aNamespacesList.GetEntryCount();
sal_Int32 nEntryCount = m_pNamespacesList->GetEntryCount();
for( i = 0; i < nEntryCount; ++i )
{
SvTreeListEntry* pEntry = m_aNamespacesList.GetEntry(i);
OUString sPrefix( m_aNamespacesList.GetEntryText( pEntry, 0 ) );
OUString sURL( m_aNamespacesList.GetEntryText( pEntry, 1 ) );
SvTreeListEntry* pEntry = m_pNamespacesList->GetEntry(i);
OUString sPrefix( m_pNamespacesList->GetEntryText( pEntry, 0 ) );
OUString sURL( m_pNamespacesList->GetEntryText( pEntry, 1 ) );
if ( m_rNamespaces->hasByName( sPrefix ) )
m_rNamespaces->replaceByName( sPrefix, makeAny( sURL ) );
@@ -3051,7 +3051,7 @@ namespace svxform
sEntry += "\t";
sEntry += sURL;
m_aNamespacesList.InsertEntry( sEntry );
m_pNamespacesList->InsertEntry( sEntry );
}
}
}

81
svx/source/form/datanavi.src
View File

@@ -359,87 +359,6 @@ Menu RID_MENU_DATANAVIGATOR
};
};
ModalDialog RID_SVXDLG_NAMESPACE_ITEM
{
HelpID = HID_XFORMS_NAMESPACEITEM_DLG ;
OutputSize = TRUE ;
SVLook = TRUE ;
Size = MAP_APPFONT ( 240 , 120 ) ;
Text [ en-US ] = "Namespaces for Forms" ;
Moveable = TRUE ;
FixedText FT_NAMESPACES
{
Pos = MAP_APPFONT ( 6 , 3 ) ;
Size = MAP_APPFONT ( 228 , 8 ) ;
LeftLabel = TRUE ;
Text [ en-US ] = "~Namespaces" ;
};
Control LB_NAMESPACES
{
HelpId = HID_XFORMS_NAMESPACEITEM_LIST;
Pos = MAP_APPFONT ( 6 , 14 ) ;
Size = MAP_APPFONT ( 175 , 72 ) ;
Border = TRUE ;
TabStop = TRUE ;
};
PushButton PB_ADD_NAMESPACE
{
HelpID = "svx:PushButton:RID_SVXDLG_NAMESPACE_ITEM:PB_ADD_NAMESPACE";
Pos = MAP_APPFONT ( 184 , 14 ) ;
Size = MAP_APPFONT ( 50 , 14 ) ;
TabStop = TRUE ;
Text [ en-US ] = "~Add..." ;
};
PushButton PB_EDIT_NAMESPACE
{
HelpID = "svx:PushButton:RID_SVXDLG_NAMESPACE_ITEM:PB_EDIT_NAMESPACE";
Pos = MAP_APPFONT ( 184 , 31 ) ;
Size = MAP_APPFONT ( 50 , 14 ) ;
TabStop = TRUE ;
Text [ en-US ] = "~Edit..." ;
};
PushButton PB_DELETE_NAMESPACE
{
HelpID = "svx:PushButton:RID_SVXDLG_NAMESPACE_ITEM:PB_DELETE_NAMESPACE";
Pos = MAP_APPFONT ( 184 , 48 ) ;
Size = MAP_APPFONT ( 50 , 14 ) ;
TabStop = TRUE ;
Text [ en-US ] = "~Delete" ;
};
FixedLine FL_DATANAV_BTN
{
Pos = MAP_APPFONT ( 4 , 89 ) ;
Size = MAP_APPFONT ( 232 , 8 ) ;
};
OKButton BTN_DATANAV_OK
{
Pos = MAP_APPFONT ( 75 , 100 ) ;
Size = MAP_APPFONT ( 50 , 14 ) ;
TabStop = TRUE ;
DefButton = TRUE ;
};
CancelButton BTN_DATANAV_ESC
{
Pos = MAP_APPFONT ( 128 , 100 ) ;
Size = MAP_APPFONT ( 50 , 14 ) ;
TabStop = TRUE ;
};
HelpButton BTN_DATANAV_HELP
{
Pos = MAP_APPFONT ( 184 , 100 ) ;
Size = MAP_APPFONT ( 50 , 14 ) ;
TabStop = TRUE ;
};
String STR_HEADER_PREFIX
{
Text [ en-US ] = "Prefix" ;
};
String STR_HEADER_URL
{
Text [ en-US ] = "URL" ;
};
};
String RID_STR_METHOD_POST
{
Text [ en-US ] = "Post" ;

13
svx/source/inc/datanavi.hrc
View File

@@ -20,12 +20,6 @@
#ifndef _SVX_DATANAVI_HRC
#define _SVX_DATANAVI_HRC
// global
#define FL_DATANAV_BTN 100
#define BTN_DATANAV_OK 101
#define BTN_DATANAV_ESC 102
#define BTN_DATANAV_HELP 103
// class XFormsInstancePage
// Controls
#define TB_ITEMS 10
@@ -83,13 +77,6 @@
#define IID_TEXT 5
#define IID_OTHER 6
// class NamespaceItemDialog
#define FT_NAMESPACES 10
#define LB_NAMESPACES 11
#define PB_ADD_NAMESPACE 12
#define PB_EDIT_NAMESPACE 13
#define PB_DELETE_NAMESPACE 14
#define STR_HEADER_PREFIX 10
#define STR_HEADER_URL 11

15
svx/source/inc/datanavi.hxx
View File

@@ -500,16 +500,11 @@ namespace svxform
private:
typedef std::vector< OUString > PrefixList;
FixedText m_aNamespacesFT;
SvSimpleTableContainer m_aNamespacesListContainer;
SvSimpleTable m_aNamespacesList;
PushButton m_aAddNamespaceBtn;
PushButton m_aEditNamespaceBtn;
PushButton m_aDeleteNamespaceBtn;
FixedLine m_aButtonsFL;
OKButton m_aOKBtn;
CancelButton m_aEscBtn;
HelpButton m_aHelpBtn;
SvSimpleTable* m_pNamespacesList;
PushButton* m_pAddNamespaceBtn;
PushButton* m_pEditNamespaceBtn;
PushButton* m_pDeleteNamespaceBtn;
OKButton* m_pOKBtn;
AddConditionDialog* m_pConditionDlg;
PrefixList m_aRemovedList;

252
svx/uiconfig/ui/namespacedialog.ui Normal file
View File

@@ -0,0 +1,252 @@
<?xml version="1.0" encoding="UTF-8"?>
<!-- Generated with glade 3.16.1 -->
<interface>
<requires lib="gtk+" version="3.0"/>
<!-- interface-requires LibreOffice 1.0 -->
<object class="GtkDialog" id="NamespaceDialog">
<property name="can_focus">False</property>
<property name="border_width">6</property>
<property name="title" translatable="yes">Namespaces for Forms</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="GtkFrame" id="frame1">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="hexpand">True</property>
<property name="vexpand">True</property>
<property name="label_xalign">0</property>
<property name="shadow_type">none</property>
<child>
<object class="GtkAlignment" id="alignment1">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="hexpand">True</property>
<property name="vexpand">True</property>
<property name="top_padding">6</property>
<property name="left_padding">12</property>
<child>
<object class="GtkGrid" id="grid1">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="hexpand">True</property>
<property name="vexpand">True</property>
<property name="column_spacing">12</property>
<child>
<object class="GtkButtonBox" id="buttonbox1">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="orientation">vertical</property>
<property name="spacing">6</property>
<property name="layout_style">start</property>
<child>
<object class="GtkButton" id="add">
<property name="label" translatable="yes">_Add...</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
<property name="use_underline">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="edit">
<property name="label" translatable="yes">_Edit...</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
<property name="use_underline">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="delete">
<property name="label">gtk-delete</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="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="GtkGrid" id="grid2">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="hexpand">True</property>
<property name="vexpand">True</property>
<property name="row_spacing">6</property>
<child>
<object class="GtkGrid" id="grid3">
<property name="can_focus">False</property>
<property name="no_show_all">True</property>
<property name="column_homogeneous">True</property>
<child>
<object class="GtkLabel" id="prefix">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="label" translatable="yes">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="GtkLabel" id="url">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="label" translatable="yes">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>
</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="svtlo-SvSimpleTableContainer" id="namespaces">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="hexpand">True</property>
<property name="vexpand">True</property>
<child internal-child="selection">
<object class="GtkTreeSelection" id="Simple Table Container-selection1"/>
</child>
</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>
</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>
</object>
</child>
</object>
</child>
<child type="label">
<object class="GtkLabel" id="label1">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="label" translatable="yes">Namespaces</property>
<attributes>
<attribute name="weight" value="bold"/>
</attributes>
</object>
</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>