[Libreoffice-commits] core.git: sc/inc sc/source sc/uiconfig sc/UIConfig_scalc.mk
Caolán McNamara
caolanm at redhat.com
Mon Apr 15 06:44:40 PDT 2013
sc/UIConfig_scalc.mk | 1
sc/inc/helpids.h | 1
sc/inc/sc.hrc | 2
sc/inc/scabstdlg.hxx | 3 -
sc/source/ui/attrdlg/scdlgfact.cxx | 26 +----------
sc/source/ui/attrdlg/scdlgfact.hxx | 3 -
sc/source/ui/dbgui/dapitype.cxx | 57 +++++++++++--------------
sc/source/ui/dbgui/dapitype.hrc | 6 --
sc/source/ui/dbgui/dapitype.src | 77 -----------------------------------
sc/source/ui/inc/dapitype.hxx | 18 +++-----
sc/source/ui/view/cellsh1.cxx | 2
sc/uiconfig/scalc/ui/selectsource.ui | 70 +++++++++++++++++--------------
12 files changed, 82 insertions(+), 184 deletions(-)
New commits:
commit 73318c3db8031127574a3371bf737eb926006d7b
Author: Caolán McNamara <caolanm at redhat.com>
Date: Mon Apr 15 14:17:16 2013 +0100
adapt code to select source .ui
Change-Id: I65d3f5acbe95985269c03b3e0c57c5cc80ca30d4
diff --git a/sc/UIConfig_scalc.mk b/sc/UIConfig_scalc.mk
index 12f0025..07cb7be 100644
--- a/sc/UIConfig_scalc.mk
+++ b/sc/UIConfig_scalc.mk
@@ -73,6 +73,7 @@ $(eval $(call gb_UIConfig_add_uifiles,modules/scalc,\
sc/uiconfig/scalc/ui/printeroptions \
sc/uiconfig/scalc/ui/sheetprintpage \
sc/uiconfig/scalc/ui/selectrange \
+ sc/uiconfig/scalc/ui/selectsource \
sc/uiconfig/scalc/ui/sortcriteriapage \
sc/uiconfig/scalc/ui/sortkey \
sc/uiconfig/scalc/ui/sortoptionspage \
diff --git a/sc/inc/helpids.h b/sc/inc/helpids.h
index fa4323c..ef6e849 100644
--- a/sc/inc/helpids.h
+++ b/sc/inc/helpids.h
@@ -191,7 +191,6 @@
#define HID_PASSWD_TABLE "SC_HID_PASSWD_TABLE"
#define HID_PASSWD_DOC "SC_HID_PASSWD_DOC"
-#define HID_DATAPILOT_TYPE "SC_HID_DATAPILOT_TYPE"
#define HID_DATAPILOT_DATABASE "SC_HID_DATAPILOT_DATABASE"
#define HID_DATAPILOT_SERVICE "SC_HID_DATAPILOT_SERVICE"
diff --git a/sc/inc/sc.hrc b/sc/inc/sc.hrc
index 7e88881..793a746 100644
--- a/sc/inc/sc.hrc
+++ b/sc/inc/sc.hrc
@@ -1060,7 +1060,7 @@
#define WID_SIMPLE_REF (SC_DIALOGS_START + 126)
#define RID_POPUP_CHANGES (SC_DIALOGS_START + 127)
-#define RID_SCDLG_DAPITYPE (SC_DIALOGS_START + 129)
+
#define RID_SCDLG_DAPISERVICE (SC_DIALOGS_START + 130)
#define RID_SCDLG_DAPIDATA (SC_DIALOGS_START + 131)
diff --git a/sc/inc/scabstdlg.hxx b/sc/inc/scabstdlg.hxx
index c50e355..5190c9a 100644
--- a/sc/inc/scabstdlg.hxx
+++ b/sc/inc/scabstdlg.hxx
@@ -358,7 +358,8 @@ public:
virtual AbstractScDataPilotDatabaseDlg * CreateScDataPilotDatabaseDlg (Window* pParent ,int nId ) = 0; //add for ScDataPilotDatabaseDlg
- virtual AbstractScDataPilotSourceTypeDlg * CreateScDataPilotSourceTypeDlg ( Window* pParent, sal_Bool bEnableExternal, int nId ) = 0; //add for ScDataPilotSourceTypeDlg
+ virtual AbstractScDataPilotSourceTypeDlg * CreateScDataPilotSourceTypeDlg(Window* pParent,
+ bool bEnableExternal) = 0;
virtual AbstractScDataPilotServiceDlg * CreateScDataPilotServiceDlg( Window* pParent, //add for ScDataPilotServiceDlg
const com::sun::star::uno::Sequence<OUString>& rServices,
diff --git a/sc/source/ui/attrdlg/scdlgfact.cxx b/sc/source/ui/attrdlg/scdlgfact.cxx
index 0a24dd6..e9945b8 100644
--- a/sc/source/ui/attrdlg/scdlgfact.cxx
+++ b/sc/source/ui/attrdlg/scdlgfact.cxx
@@ -773,31 +773,13 @@ AbstractScDataPilotDatabaseDlg * ScAbstractDialogFactory_Impl::CreateScDataPilo
return 0;
}
-
-
-AbstractScDataPilotSourceTypeDlg* ScAbstractDialogFactory_Impl::CreateScDataPilotSourceTypeDlg( Window* pParent,
- sal_Bool bEnableExternal,
- int nId )
+AbstractScDataPilotSourceTypeDlg* ScAbstractDialogFactory_Impl::CreateScDataPilotSourceTypeDlg(
+ Window* pParent, bool bEnableExternal)
{
- ScDataPilotSourceTypeDlg * pDlg=NULL;
- switch ( nId )
- {
- case RID_SCDLG_DAPITYPE :
- pDlg = new ScDataPilotSourceTypeDlg( pParent, bEnableExternal );
- break;
- default:
- break;
- }
-
- if ( pDlg )
- return new AbstractScDataPilotSourceTypeDlg_Impl( pDlg );
- return 0;
+ ScDataPilotSourceTypeDlg* pDlg = new ScDataPilotSourceTypeDlg(pParent, bEnableExternal);
+ return new AbstractScDataPilotSourceTypeDlg_Impl(pDlg);
}
-// add for ScDataPilotSourceTypeDlg end
-
-
-
AbstractScDataPilotServiceDlg* ScAbstractDialogFactory_Impl::CreateScDataPilotServiceDlg( Window* pParent,
const com::sun::star::uno::Sequence<OUString>& rServices,
int nId )
diff --git a/sc/source/ui/attrdlg/scdlgfact.hxx b/sc/source/ui/attrdlg/scdlgfact.hxx
index a86192b..a18767c 100644
--- a/sc/source/ui/attrdlg/scdlgfact.hxx
+++ b/sc/source/ui/attrdlg/scdlgfact.hxx
@@ -426,7 +426,8 @@ public:
virtual AbstractScDataPilotDatabaseDlg * CreateScDataPilotDatabaseDlg (Window* pParent ,int nId ); //add for ScDataPilotDatabaseDlg
- virtual AbstractScDataPilotSourceTypeDlg * CreateScDataPilotSourceTypeDlg ( Window* pParent, sal_Bool bEnableExternal, int nId ) ; //add for ScDataPilotSourceTypeDlg
+ virtual AbstractScDataPilotSourceTypeDlg* CreateScDataPilotSourceTypeDlg(Window* pParent,
+ bool bEnableExternal);
virtual AbstractScDataPilotServiceDlg * CreateScDataPilotServiceDlg( Window* pParent, //add for ScDataPilotServiceDlg
const com::sun::star::uno::Sequence<OUString>& rServices,
diff --git a/sc/source/ui/dbgui/dapitype.cxx b/sc/source/ui/dbgui/dapitype.cxx
index 2ccd998..a6f33df 100644
--- a/sc/source/ui/dbgui/dapitype.cxx
+++ b/sc/source/ui/dbgui/dapitype.cxx
@@ -33,34 +33,27 @@ using namespace com::sun::star;
//-------------------------------------------------------------------------
-ScDataPilotSourceTypeDlg::ScDataPilotSourceTypeDlg( Window* pParent, sal_Bool bEnableExternal ) :
- ModalDialog ( pParent, ScResId( RID_SCDLG_DAPITYPE ) ),
- //
- aFlFrame ( this, ScResId( FL_FRAME ) ),
- aBtnSelection ( this, ScResId( BTN_SELECTION ) ),
- aBtnNamedRange ( this, ScResId( BTN_NAMED_RANGE ) ),
- aBtnDatabase ( this, ScResId( BTN_DATABASE ) ),
- aBtnExternal ( this, ScResId( BTN_EXTERNAL ) ),
- aLbNamedRange ( this, ScResId( LB_NAMED_RANGE ) ),
- aBtnOk ( this, ScResId( BTN_OK ) ),
- aBtnCancel ( this, ScResId( BTN_CANCEL ) ),
- aBtnHelp ( this, ScResId( BTN_HELP ) )
+ScDataPilotSourceTypeDlg::ScDataPilotSourceTypeDlg(Window* pParent, bool bEnableExternal)
+ : ModalDialog( pParent, "SelectSourceDialog", "modules/scalc/ui/selectsource.ui" )
{
- aBtnSelection.SetClickHdl( LINK(this, ScDataPilotSourceTypeDlg, RadioClickHdl) );
- aBtnNamedRange.SetClickHdl( LINK(this, ScDataPilotSourceTypeDlg, RadioClickHdl) );
- aBtnDatabase.SetClickHdl( LINK(this, ScDataPilotSourceTypeDlg, RadioClickHdl) );
- aBtnExternal.SetClickHdl( LINK(this, ScDataPilotSourceTypeDlg, RadioClickHdl) );
+ get(m_pBtnSelection, "selection");
+ get(m_pBtnNamedRange, "namedrange");
+ get(m_pBtnDatabase, "database");
+ get(m_pBtnExternal, "external");
+ get(m_pLbNamedRange, "rangelb");
+ m_pBtnSelection->SetClickHdl( LINK(this, ScDataPilotSourceTypeDlg, RadioClickHdl) );
+ m_pBtnNamedRange->SetClickHdl( LINK(this, ScDataPilotSourceTypeDlg, RadioClickHdl) );
+ m_pBtnDatabase->SetClickHdl( LINK(this, ScDataPilotSourceTypeDlg, RadioClickHdl) );
+ m_pBtnExternal->SetClickHdl( LINK(this, ScDataPilotSourceTypeDlg, RadioClickHdl) );
if (!bEnableExternal)
- aBtnExternal.Disable();
+ m_pBtnExternal->Disable();
- aBtnSelection.Check();
+ m_pBtnSelection->Check();
// Disabled unless at least one named range exists.
- aLbNamedRange.Disable();
- aBtnNamedRange.Disable();
-
- FreeResource();
+ m_pLbNamedRange->Disable();
+ m_pBtnNamedRange->Disable();
}
ScDataPilotSourceTypeDlg::~ScDataPilotSourceTypeDlg()
@@ -69,39 +62,39 @@ ScDataPilotSourceTypeDlg::~ScDataPilotSourceTypeDlg()
bool ScDataPilotSourceTypeDlg::IsDatabase() const
{
- return aBtnDatabase.IsChecked();
+ return m_pBtnDatabase->IsChecked();
}
bool ScDataPilotSourceTypeDlg::IsExternal() const
{
- return aBtnExternal.IsChecked();
+ return m_pBtnExternal->IsChecked();
}
bool ScDataPilotSourceTypeDlg::IsNamedRange() const
{
- return aBtnNamedRange.IsChecked();
+ return m_pBtnNamedRange->IsChecked();
}
OUString ScDataPilotSourceTypeDlg::GetSelectedNamedRange() const
{
- sal_uInt16 nPos = aLbNamedRange.GetSelectEntryPos();
- return aLbNamedRange.GetEntry(nPos);
+ sal_uInt16 nPos = m_pLbNamedRange->GetSelectEntryPos();
+ return m_pLbNamedRange->GetEntry(nPos);
}
void ScDataPilotSourceTypeDlg::AppendNamedRange(const OUString& rName)
{
- aLbNamedRange.InsertEntry(rName);
- if (aLbNamedRange.GetEntryCount() == 1)
+ m_pLbNamedRange->InsertEntry(rName);
+ if (m_pLbNamedRange->GetEntryCount() == 1)
{
// Select position 0 only for the first time.
- aLbNamedRange.SelectEntryPos(0);
- aBtnNamedRange.Enable();
+ m_pLbNamedRange->SelectEntryPos(0);
+ m_pBtnNamedRange->Enable();
}
}
IMPL_LINK( ScDataPilotSourceTypeDlg, RadioClickHdl, RadioButton*, pBtn )
{
- aLbNamedRange.Enable(pBtn == &aBtnNamedRange);
+ m_pLbNamedRange->Enable(pBtn == m_pBtnNamedRange);
return 0;
}
diff --git a/sc/source/ui/dbgui/dapitype.hrc b/sc/source/ui/dbgui/dapitype.hrc
index 203677b..0ed7e85 100644
--- a/sc/source/ui/dbgui/dapitype.hrc
+++ b/sc/source/ui/dbgui/dapitype.hrc
@@ -20,10 +20,6 @@
#define BTN_OK 1
#define BTN_CANCEL 2
#define BTN_HELP 3
-#define BTN_SELECTION 4
-#define BTN_NAMED_RANGE 5
-#define BTN_DATABASE 6
-#define BTN_EXTERNAL 7
#define FL_FRAME 8
#define FT_SERVICE 9
@@ -43,6 +39,4 @@
#define FT_OBJTYPE 23
#define LB_OBJTYPE 24
-#define LB_NAMED_RANGE 25
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sc/source/ui/dbgui/dapitype.src b/sc/source/ui/dbgui/dapitype.src
index 961bf58..39f34a8 100644
--- a/sc/source/ui/dbgui/dapitype.src
+++ b/sc/source/ui/dbgui/dapitype.src
@@ -20,83 +20,6 @@
#include "sc.hrc"
#include "dapitype.hrc"
-
-ModalDialog RID_SCDLG_DAPITYPE
-{
- Text [ en-US ] = "Select Source";
- OutputSize = TRUE ;
- HelpId = HID_DATAPILOT_TYPE ;
- SVLook = TRUE ;
- Size = MAP_APPFONT ( 241 , 76 ) ;
- Moveable = TRUE ;
- Closeable = FALSE ;
-
- FixedLine FL_FRAME
- {
- Pos = MAP_APPFONT ( 6 , 6 ) ;
- Size = MAP_APPFONT ( 173 , 8 ) ;
- Text [ en-US ] = "Selection";
- };
- OKButton BTN_OK
- {
- Pos = MAP_APPFONT ( 185 , 6 ) ;
- Size = MAP_APPFONT ( 50 , 14 ) ;
- TabStop = TRUE ;
- DefButton = TRUE ;
- };
- CancelButton BTN_CANCEL
- {
- Pos = MAP_APPFONT ( 185 , 23 ) ;
- Size = MAP_APPFONT ( 50 , 14 ) ;
- TabStop = TRUE ;
- };
- HelpButton BTN_HELP
- {
- Pos = MAP_APPFONT ( 185 , 43 ) ;
- Size = MAP_APPFONT ( 50 , 14 ) ;
- TabStop = TRUE ;
- };
- RadioButton BTN_SELECTION
- {
- Pos = MAP_APPFONT ( 12 , 18 ) ;
- Size = MAP_APPFONT ( 164 , 10 ) ;
- TabStop = TRUE ;
- Text [ en-US ] = "~Current selection";
- };
- RadioButton BTN_NAMED_RANGE
- {
- Pos = MAP_APPFONT ( 12 , 32 ) ;
- Size = MAP_APPFONT ( 80 , 10 ) ;
- TabStop = TRUE ;
- Text [ en-US ] = "~Named range";
- };
- ListBox LB_NAMED_RANGE
- {
- Pos = MAP_APPFONT ( 100 , 31 ) ;
- Size = MAP_APPFONT ( 70 , 10 ) ;
- TabStop = TRUE ;
- DropDown = TRUE ;
- };
- RadioButton BTN_DATABASE
- {
- Pos = MAP_APPFONT ( 12 , 46 ) ;
- Size = MAP_APPFONT ( 164 , 10 ) ;
- TabStop = TRUE ;
- Text [ en-US ] = "~Data source registered in %PRODUCTNAME";
- };
- RadioButton BTN_EXTERNAL
- {
- Pos = MAP_APPFONT ( 12 , 60 ) ;
- Size = MAP_APPFONT ( 164 , 10 ) ;
- TabStop = TRUE ;
- Text [ en-US ] = "~External source/interface";
- };
-};
-
-
-//------------------------------------------------------------------------
-
-
ModalDialog RID_SCDLG_DAPISERVICE
{
OutputSize = TRUE ;
diff --git a/sc/source/ui/inc/dapitype.hxx b/sc/source/ui/inc/dapitype.hxx
index c74ae8a..9cdbccb 100644
--- a/sc/source/ui/inc/dapitype.hxx
+++ b/sc/source/ui/inc/dapitype.hxx
@@ -32,19 +32,15 @@
class ScDataPilotSourceTypeDlg : public ModalDialog
{
private:
- FixedLine aFlFrame;
- RadioButton aBtnSelection;
- RadioButton aBtnNamedRange;
- RadioButton aBtnDatabase;
- RadioButton aBtnExternal;
- ListBox aLbNamedRange;
- OKButton aBtnOk;
- CancelButton aBtnCancel;
- HelpButton aBtnHelp;
+ RadioButton* m_pBtnSelection;
+ RadioButton* m_pBtnNamedRange;
+ RadioButton* m_pBtnDatabase;
+ RadioButton* m_pBtnExternal;
+ ListBox* m_pLbNamedRange;
public:
- ScDataPilotSourceTypeDlg( Window* pParent, sal_Bool bEnableExternal );
- ~ScDataPilotSourceTypeDlg();
+ ScDataPilotSourceTypeDlg(Window* pParent, bool bEnableExternal);
+ ~ScDataPilotSourceTypeDlg();
bool IsDatabase() const;
bool IsExternal() const;
diff --git a/sc/source/ui/view/cellsh1.cxx b/sc/source/ui/view/cellsh1.cxx
index ccb39b0..528191b 100644
--- a/sc/source/ui/view/cellsh1.cxx
+++ b/sc/source/ui/view/cellsh1.cxx
@@ -2479,7 +2479,7 @@ void ScCellShell::ExecuteDataPilotDialog()
::boost::scoped_ptr<AbstractScDataPilotSourceTypeDlg> pTypeDlg(
pFact->CreateScDataPilotSourceTypeDlg(
- pTabViewShell->GetDialogParent(), bEnableExt, RID_SCDLG_DAPITYPE));
+ pTabViewShell->GetDialogParent(), bEnableExt));
// Populate named ranges (if any).
ScRangeName* pRangeName = pDoc->GetRangeName();
diff --git a/sc/uiconfig/scalc/ui/selectsource.ui b/sc/uiconfig/scalc/ui/selectsource.ui
index 2c2bccd..fcea459 100644
--- a/sc/uiconfig/scalc/ui/selectsource.ui
+++ b/sc/uiconfig/scalc/ui/selectsource.ui
@@ -1,28 +1,28 @@
<?xml version="1.0" encoding="UTF-8"?>
<interface>
<!-- interface-requires gtk+ 3.0 -->
- <object class="GtkDialog" id="selectsource">
+ <object class="GtkDialog" id="SelectSourceDialog">
<property name="can_focus">False</property>
- <property name="border_width">5</property>
+ <property name="border_width">6</property>
<property name="title" translatable="yes">Select Source</property>
<property name="type_hint">dialog</property>
<child internal-child="vbox">
<object class="GtkBox" id="dialog-vbox3">
<property name="can_focus">False</property>
- <property name="spacing">2</property>
+ <property name="orientation">vertical</property>
+ <property name="spacing">12</property>
<child internal-child="action_area">
<object class="GtkButtonBox" id="dialog-action_area3">
<property name="can_focus">False</property>
- <property name="orientation">vertical</property>
- <property name="layout_style">start</property>
+ <property name="layout_style">end</property>
<child>
- <object class="GtkButton" id="ok1">
+ <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_action_appearance">False</property>
<property name="use_stock">True</property>
</object>
<packing>
@@ -32,12 +32,11 @@
</packing>
</child>
<child>
- <object class="GtkButton" id="cancel1">
+ <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_action_appearance">False</property>
<property name="use_stock">True</property>
</object>
<packing>
@@ -47,12 +46,11 @@
</packing>
</child>
<child>
- <object class="GtkButton" id="help1">
+ <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_action_appearance">False</property>
<property name="use_stock">True</property>
<property name="image_position">top</property>
</object>
@@ -80,23 +78,25 @@
<object class="GtkAlignment" id="alignment3">
<property name="visible">True</property>
<property name="can_focus">False</property>
+ <property name="top_padding">6</property>
<property name="left_padding">12</property>
<child>
<object class="GtkBox" id="box1">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="orientation">vertical</property>
+ <property name="spacing">6</property>
<child>
- <object class="GtkRadioButton" id="radiobutton1">
+ <object class="GtkRadioButton" id="selection">
<property name="label" translatable="yes">_Current selection</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
- <property name="use_action_appearance">False</property>
<property name="use_underline">True</property>
<property name="xalign">0</property>
<property name="active">True</property>
<property name="draw_indicator">True</property>
+ <property name="group">namedrange</property>
</object>
<packing>
<property name="expand">False</property>
@@ -108,16 +108,20 @@
<object class="GtkBox" id="box2">
<property name="visible">True</property>
<property name="can_focus">False</property>
+ <property name="spacing">12</property>
<child>
- <object class="GtkRadioButton" id="radiobutton2">
+ <object class="GtkRadioButton" id="namedrange">
<property name="label" translatable="yes">_Named range</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
- <property name="use_action_appearance">False</property>
<property name="use_underline">True</property>
<property name="xalign">0</property>
<property name="draw_indicator">True</property>
+ <property name="group">database</property>
+ <accessibility>
+ <relation type="label-for" target="rangelb"/>
+ </accessibility>
</object>
<packing>
<property name="expand">False</property>
@@ -126,10 +130,14 @@
</packing>
</child>
<child>
- <object class="GtkSpinButton" id="spinbutton1">
+ <object class="GtkComboBoxText" id="rangelb">
<property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="invisible_char">â—</property>
+ <property name="can_focus">False</property>
+ <property name="entry_text_column">0</property>
+ <property name="id_column">1</property>
+ <accessibility>
+ <relation type="label-for" target="namedrange"/>
+ </accessibility>
</object>
<packing>
<property name="expand">False</property>
@@ -145,16 +153,15 @@
</packing>
</child>
<child>
- <object class="GtkRadioButton" id="radiobutton3">
- <property name="label" translatable="yes">_Data source registered LibreOffice</property>
+ <object class="GtkRadioButton" id="database">
+ <property name="label" translatable="yes">_Data source registered in %PRODUCTNAME</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
- <property name="use_action_appearance">False</property>
<property name="use_underline">True</property>
<property name="xalign">0</property>
- <property name="active">True</property>
<property name="draw_indicator">True</property>
+ <property name="group">external</property>
</object>
<packing>
<property name="expand">False</property>
@@ -163,16 +170,15 @@
</packing>
</child>
<child>
- <object class="GtkRadioButton" id="radiobutton4">
+ <object class="GtkRadioButton" id="external">
<property name="label" translatable="yes">_External source/interface</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
- <property name="use_action_appearance">False</property>
<property name="use_underline">True</property>
<property name="xalign">0</property>
- <property name="active">True</property>
<property name="draw_indicator">True</property>
+ <property name="group">selection</property>
</object>
<packing>
<property name="expand">False</property>
@@ -185,11 +191,13 @@
</object>
</child>
<child type="label">
- <object class="GtkLabel" id="Selectio">
+ <object class="GtkLabel" id="label1">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label" translatable="yes"><b>Selection</b></property>
- <property name="use_markup">True</property>
+ <property name="label" translatable="yes">Selection</property>
+ <attributes>
+ <attribute name="weight" value="bold"/>
+ </attributes>
</object>
</child>
</object>
@@ -202,9 +210,9 @@
</object>
</child>
<action-widgets>
- <action-widget response="0">ok1</action-widget>
- <action-widget response="0">cancel1</action-widget>
- <action-widget response="0">help1</action-widget>
+ <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