[Libreoffice-commits] core.git: 2 commits - cui/source sfx2/source sfx2/uiconfig sfx2/UIConfig_sfx.mk
Caolán McNamara
caolanm at redhat.com
Sat Jan 4 01:58:53 PST 2014
cui/source/tabpages/labdlg.src | 3
sfx2/UIConfig_sfx.mk | 1
sfx2/source/dialog/dialog.hrc | 1
sfx2/source/dialog/dinfdlg.cxx | 105 +++-------
sfx2/source/dialog/dinfdlg.src | 185 ------------------
sfx2/source/inc/helpid.hrc | 1
sfx2/uiconfig/ui/editdurationdialog.ui | 335 +++++++++++++++++++++++++++++++++
7 files changed, 376 insertions(+), 255 deletions(-)
New commits:
commit d88bf2aa5648caa01edaf2252166d0724fad0a49
Author: Caolán McNamara <caolanm at redhat.com>
Date: Sat Jan 4 09:56:27 2014 +0000
convert edit duration to .ui
Change-Id: Ifb1ae6b96a42642c05f294cccfe0c4bd4e65dd8c
diff --git a/sfx2/UIConfig_sfx.mk b/sfx2/UIConfig_sfx.mk
index 35b0825..20734b4 100644
--- a/sfx2/UIConfig_sfx.mk
+++ b/sfx2/UIConfig_sfx.mk
@@ -18,6 +18,7 @@ $(eval $(call gb_UIConfig_add_uifiles,sfx,\
sfx2/uiconfig/ui/documentfontspage \
sfx2/uiconfig/ui/documentinfopage \
sfx2/uiconfig/ui/documentpropertiesdialog \
+ sfx2/uiconfig/ui/editdurationdialog \
sfx2/uiconfig/ui/errorfindemaildialog \
sfx2/uiconfig/ui/inputdialog \
sfx2/uiconfig/ui/licensedialog \
diff --git a/sfx2/source/dialog/dialog.hrc b/sfx2/source/dialog/dialog.hrc
index 5759a4e..233cd59 100644
--- a/sfx2/source/dialog/dialog.hrc
+++ b/sfx2/source/dialog/dialog.hrc
@@ -60,7 +60,6 @@
#define STR_PDF_EXPORT_SEND ( RC_DIALOG_BEGIN + 120 )
#define IMG_INFO ( RC_DIALOG_BEGIN + 122 )
-#define RID_EDIT_DURATIONS ( RC_DIALOG_BEGIN + 123 )
#define SFX_PB_EDIT ( RC_DIALOG_BEGIN + 124 )
#define STR_STYLE_ELEMTLIST ( RC_DIALOG_BEGIN + 125 )
diff --git a/sfx2/source/dialog/dinfdlg.cxx b/sfx2/source/dialog/dinfdlg.cxx
index c603adc..45030f3 100644
--- a/sfx2/source/dialog/dinfdlg.cxx
+++ b/sfx2/source/dialog/dinfdlg.cxx
@@ -1199,87 +1199,60 @@ CustomPropertiesYesNoButton::CustomPropertiesYesNoButton( Window* pParent, const
m_aYesButton.SetBackground( aWall );
m_aNoButton.SetBackground( aWall );
}
+
class DurationDialog_Impl : public ModalDialog
{
- FixedLine aDurationFL;
-
- OKButton aOKPB;
- CancelButton aCancelPB;
- HelpButton aHelpPB;
-
- CheckBox aNegativeCB;
- FixedText aYearFT;
- NumericField aYearNF;
- FixedText aMonthFT;
- NumericField aMonthNF;
- FixedText aDayFT;
- NumericField aDayNF;
- FixedText aHourFT;
- NumericField aHourNF;
- FixedText aMinuteFT;
- NumericField aMinuteNF;
- FixedText aSecondFT;
- NumericField aSecondNF;
- FixedText aMSecondFT;
- NumericField aMSecondNF;
+ CheckBox* m_pNegativeCB;
+ NumericField* m_pYearNF;
+ NumericField* m_pMonthNF;
+ NumericField* m_pDayNF;
+ NumericField* m_pHourNF;
+ NumericField* m_pMinuteNF;
+ NumericField* m_pSecondNF;
+ NumericField* m_pMSecondNF;
public:
DurationDialog_Impl( Window* pParent, const util::Duration& rDuration );
- ~DurationDialog_Impl();
util::Duration GetDuration() const;
};
-DurationDialog_Impl::DurationDialog_Impl(
- Window* pParent, const util::Duration& rDuration)
- : ModalDialog( pParent, SfxResId( RID_EDIT_DURATIONS ) ),
- aDurationFL(this, SfxResId( FL_DURATION )),
- aOKPB( this, SfxResId( PB_OK )),
- aCancelPB( this, SfxResId( PB_CANCEL )),
- aHelpPB( this, SfxResId( PB_HELP )),
- aNegativeCB(this, SfxResId( CB_NEGATIVE )),
- aYearFT( this, SfxResId( FT_YEAR )),
- aYearNF( this, SfxResId( ED_YEAR )),
- aMonthFT( this, SfxResId( FT_MONTH )),
- aMonthNF( this, SfxResId( ED_MONTH )),
- aDayFT( this, SfxResId( FT_DAY )),
- aDayNF( this, SfxResId( ED_DAY )),
- aHourFT( this, SfxResId( FT_HOUR )),
- aHourNF( this, SfxResId( ED_HOUR )),
- aMinuteFT( this, SfxResId( FT_MINUTE )),
- aMinuteNF( this, SfxResId( ED_MINUTE )),
- aSecondFT( this, SfxResId( FT_SECOND )),
- aSecondNF( this, SfxResId( ED_SECOND )),
- aMSecondFT( this, SfxResId( FT_MSECOND )),
- aMSecondNF( this, SfxResId( ED_MSECOND ))
-{
- FreeResource();
- aNegativeCB.Check(rDuration.Negative);
- aYearNF.SetValue(rDuration.Years);
- aMonthNF.SetValue(rDuration.Months );
- aDayNF.SetValue(rDuration.Days );
- aHourNF.SetValue(rDuration.Hours );
- aMinuteNF.SetValue(rDuration.Minutes);
- aSecondNF.SetValue(rDuration.Seconds);
- aMSecondNF.SetValue(rDuration.NanoSeconds);
-}
-
-DurationDialog_Impl::~DurationDialog_Impl()
-{
+DurationDialog_Impl::DurationDialog_Impl(Window* pParent,
+ const util::Duration& rDuration)
+ : ModalDialog(pParent, "EditDurationDialog",
+ "sfx/ui/editdurationdialog.ui")
+{
+ get(m_pNegativeCB, "negative");
+ get(m_pYearNF, "years");
+ get(m_pMonthNF, "months");
+ get(m_pDayNF, "days");
+ get(m_pHourNF, "hours");
+ get(m_pMinuteNF, "minutes");
+ get(m_pSecondNF, "seconds");
+ get(m_pMSecondNF, "milliseconds");
+
+ m_pNegativeCB->Check(rDuration.Negative);
+ m_pYearNF->SetValue(rDuration.Years);
+ m_pMonthNF->SetValue(rDuration.Months);
+ m_pDayNF->SetValue(rDuration.Days);
+ m_pHourNF->SetValue(rDuration.Hours);
+ m_pMinuteNF->SetValue(rDuration.Minutes);
+ m_pSecondNF->SetValue(rDuration.Seconds);
+ m_pMSecondNF->SetValue(rDuration.NanoSeconds);
}
util::Duration DurationDialog_Impl::GetDuration() const
{
util::Duration aRet;
- aRet.Negative = aNegativeCB.IsChecked();
- aRet.Years = aYearNF.GetValue();
- aRet.Months = aMonthNF.GetValue( );
- aRet.Days = aDayNF.GetValue( );
- aRet.Hours = aHourNF.GetValue( );
- aRet.Minutes = aMinuteNF.GetValue();
- aRet.Seconds = aSecondNF.GetValue();
- aRet.NanoSeconds = aMSecondNF.GetValue();
+ aRet.Negative = m_pNegativeCB->IsChecked();
+ aRet.Years = m_pYearNF->GetValue();
+ aRet.Months = m_pMonthNF->GetValue( );
+ aRet.Days = m_pDayNF->GetValue( );
+ aRet.Hours = m_pHourNF->GetValue( );
+ aRet.Minutes = m_pMinuteNF->GetValue();
+ aRet.Seconds = m_pSecondNF->GetValue();
+ aRet.NanoSeconds = m_pMSecondNF->GetValue();
return aRet;
}
diff --git a/sfx2/source/dialog/dinfdlg.src b/sfx2/source/dialog/dinfdlg.src
index 31e5a85..91de9bc 100644
--- a/sfx2/source/dialog/dinfdlg.src
+++ b/sfx2/source/dialog/dinfdlg.src
@@ -180,189 +180,4 @@ QueryBox SFX_QB_WRONG_TYPE
Message [ en-US ] = "The value entered does not match the specified type.\nThe value will be stored as text." ;
};
-ModalDialog RID_EDIT_DURATIONS
-{
- HelpId = HID_DLG_CUSTOMPROPS_DURATION;
- OutputSize = TRUE ;
- Size = MAP_APPFONT ( 176 , 140 ) ;
- Text [ en-US ] = "Edit Duration" ;
- Moveable = TRUE ;
- OKButton PB_OK
- {
- Pos = MAP_APPFONT ( 120 , 7 ) ;
- Size = MAP_APPFONT ( 50 , 14 ) ;
- DefButton = TRUE;
- };
- CancelButton PB_CANCEL
- {
- Pos = MAP_APPFONT ( 120 , 24 ) ;
- Size = MAP_APPFONT ( 50 , 14 ) ;
- };
- HelpButton PB_HELP
- {
- Pos = MAP_APPFONT ( 120 , 48 ) ;
- Size = MAP_APPFONT ( 50 , 14 ) ;
- };
- FixedLine FL_DURATION
- {
- Pos = MAP_APPFONT ( 6 , 8 ) ;
- Size = MAP_APPFONT ( 108 , 8 ) ;
- Text [ en-US ] = "Duration" ;
- };
- CheckBox CB_NEGATIVE
- {
- HelpID = "sfx2:CheckBox:RID_EDIT_DURATIONS:CB_NEGATIVE";
- Pos = MAP_APPFONT ( 6 , 21 ) ;
- Size = MAP_APPFONT ( 60 , RSC_CD_FIXEDTEXT_HEIGHT ) ;
- Text [ en-US ] = "~Negative" ;
- };
- FixedText FT_YEAR
- {
- Pos = MAP_APPFONT ( 6 , 38 ) ;
- Size = MAP_APPFONT ( 60 , RSC_CD_FIXEDTEXT_HEIGHT ) ;
- Left = TRUE ;
- Text [ en-US ] = "~Years" ;
- };
- NumericField ED_YEAR
- {
- HelpID = "sfx2:NumericField:RID_EDIT_DURATIONS:ED_YEAR";
- Border = TRUE ;
- Pos = MAP_APPFONT ( 70 , 36 ) ;
- Size = MAP_APPFONT ( 40, RSC_CD_TEXTBOX_HEIGHT ) ;
- Repeat = TRUE ;
- Spin = TRUE ;
- Minimum = 0 ;
- First = 1 ;
- Last = 100 ;
- SpinSize = 1 ;
- Value = 0 ;
- };
- FixedText FT_MONTH
- {
- Pos = MAP_APPFONT ( 6 , 52 ) ;
- Size = MAP_APPFONT ( 60 , RSC_CD_FIXEDTEXT_HEIGHT ) ;
- Left = TRUE ;
- Text [ en-US ] = "~Months" ;
- };
- NumericField ED_MONTH
- {
- HelpID = "sfx2:NumericField:RID_EDIT_DURATIONS:ED_MONTH";
- Border = TRUE ;
- Pos = MAP_APPFONT ( 70 , 50 ) ;
- Size = MAP_APPFONT ( 40, RSC_CD_TEXTBOX_HEIGHT ) ;
- Repeat = TRUE ;
- Spin = TRUE ;
- Minimum = 0 ;
- First = 1 ;
- Last = 100 ;
- SpinSize = 1 ;
- Value = 0 ;
- };
- FixedText FT_DAY
- {
- Pos = MAP_APPFONT ( 6 , 66 ) ;
- Size = MAP_APPFONT ( 60 , RSC_CD_FIXEDTEXT_HEIGHT ) ;
- Left = TRUE ;
- Text [ en-US ] = "~Days" ;
- };
- NumericField ED_DAY
- {
- HelpID = "sfx2:NumericField:RID_EDIT_DURATIONS:ED_DAY";
- Border = TRUE ;
- Pos = MAP_APPFONT ( 70 , 64 ) ;
- Size = MAP_APPFONT ( 40, RSC_CD_TEXTBOX_HEIGHT ) ;
- Repeat = TRUE ;
- Spin = TRUE ;
- Minimum = 0 ;
- First = 1 ;
- Last = 100 ;
- SpinSize = 1 ;
- Value = 0 ;
- };
- FixedText FT_HOUR
- {
- Pos = MAP_APPFONT ( 6 , 80 ) ;
- Size = MAP_APPFONT ( 60 , RSC_CD_FIXEDTEXT_HEIGHT ) ;
- Left = TRUE ;
- Text [ en-US ] = "H~ours" ;
- };
- NumericField ED_HOUR
- {
- HelpID = "sfx2:NumericField:RID_EDIT_DURATIONS:ED_HOUR";
- Border = TRUE ;
- Pos = MAP_APPFONT ( 70 , 78 ) ;
- Size = MAP_APPFONT ( 40, RSC_CD_TEXTBOX_HEIGHT ) ;
- Repeat = TRUE ;
- Spin = TRUE ;
- Minimum = 0 ;
- First = 1 ;
- Last = 100 ;
- SpinSize = 1 ;
- Value = 0 ;
- };
- FixedText FT_MINUTE
- {
- Pos = MAP_APPFONT ( 6 , 94 ) ;
- Size = MAP_APPFONT ( 60 , RSC_CD_FIXEDTEXT_HEIGHT ) ;
- Left = TRUE ;
- Text [ en-US ] = "Min~utes" ;
- };
- NumericField ED_MINUTE
- {
- HelpID = "sfx2:NumericField:RID_EDIT_DURATIONS:ED_MINUTE";
- Border = TRUE ;
- Pos = MAP_APPFONT ( 70, 92) ;
- Size = MAP_APPFONT ( 40, RSC_CD_TEXTBOX_HEIGHT ) ;
- Repeat = TRUE ;
- Spin = TRUE ;
- Minimum = 0 ;
- First = 1 ;
- Last = 100 ;
- SpinSize = 1 ;
- Value = 0 ;
- };
- FixedText FT_SECOND
- {
- Pos = MAP_APPFONT ( 6, 108 ) ;
- Size = MAP_APPFONT ( 60 , RSC_CD_FIXEDTEXT_HEIGHT ) ;
- Left = TRUE ;
- Text [ en-US ] = "~Seconds" ;
- };
- NumericField ED_SECOND
- {
- HelpID = "sfx2:NumericField:RID_EDIT_DURATIONS:ED_SECOND";
- Border = TRUE ;
- Pos = MAP_APPFONT ( 70 , 106 ) ;
- Size = MAP_APPFONT ( 40, RSC_CD_TEXTBOX_HEIGHT ) ;
- Repeat = TRUE ;
- Spin = TRUE ;
- Minimum = 0 ;
- First = 1 ;
- Last = 100 ;
- SpinSize = 1 ;
- Value = 0 ;
- };
- FixedText FT_MSECOND
- {
- Pos = MAP_APPFONT ( 6 , 122 ) ;
- Size = MAP_APPFONT ( 60 , RSC_CD_FIXEDTEXT_HEIGHT ) ;
- Left = TRUE ;
- Text [ en-US ] = "Millise~conds" ;
- };
- NumericField ED_MSECOND
- {
- HelpID = "sfx2:NumericField:RID_EDIT_DURATIONS:ED_MSECOND";
- Border = TRUE ;
- Pos = MAP_APPFONT ( 70 , 120 ) ;
- Size = MAP_APPFONT ( 40, RSC_CD_TEXTBOX_HEIGHT ) ;
- Repeat = TRUE ;
- Spin = TRUE ;
- Minimum = 0 ;
- First = 1 ;
- Last = 1000 ;
- SpinSize = 1 ;
- Value = 0 ;
- };
-};
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sfx2/source/inc/helpid.hrc b/sfx2/source/inc/helpid.hrc
index e80939b..24fdd84 100644
--- a/sfx2/source/inc/helpid.hrc
+++ b/sfx2/source/inc/helpid.hrc
@@ -129,7 +129,6 @@
#define HID_HELP_ONSTARTUP_BOX "SFX2_HID_HELP_ONSTARTUP_BOX"
#define HID_DLG_CHECKFORONLINEUPDATE "SFX2_HID_DLG_CHECKFORONLINEUPDATE"
#define HID_CTRL_CUSTOMPROPS_YES_NO "SFX2_HID_CTRL_CUSTOMPROPS_YES_NO"
-#define HID_DLG_CUSTOMPROPS_DURATION "SFX2_HID_DLG_CUSTOMPROPS_DURATION"
#define HID_HELP_ONHELP "SFX2_HID_HELP_ONHELP"
diff --git a/sfx2/uiconfig/ui/editdurationdialog.ui b/sfx2/uiconfig/ui/editdurationdialog.ui
new file mode 100644
index 0000000..b3af55a
--- /dev/null
+++ b/sfx2/uiconfig/ui/editdurationdialog.ui
@@ -0,0 +1,335 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- Generated with glade 3.16.0 on Sat Jan 4 09:05:22 2014 -->
+<interface>
+ <!-- interface-requires gtk+ 3.0 -->
+ <object class="GtkDialog" id="EditDurationDialog">
+ <property name="can_focus">False</property>
+ <property name="border_width">6</property>
+ <property name="title" translatable="yes">Edit Duration</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="storageframe">
+ <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="alignment2">
+ <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="row_spacing">6</property>
+ <property name="column_spacing">12</property>
+ <child>
+ <object class="GtkCheckButton" id="negative">
+ <property name="label" translatable="yes">_Negative</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">False</property>
+ <property name="use_underline">True</property>
+ <property name="xalign">0</property>
+ <property name="draw_indicator">True</property>
+ </object>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="top_attach">0</property>
+ <property name="width">2</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ <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">_Years</property>
+ <property name="use_underline">True</property>
+ <property name="mnemonic_widget">years</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="GtkLabel" id="label">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="xalign">0</property>
+ <property name="label" translatable="yes">_Months</property>
+ <property name="use_underline">True</property>
+ <property name="mnemonic_widget">months</property>
+ </object>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="top_attach">2</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="label3">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="xalign">0</property>
+ <property name="label" translatable="yes">_Days</property>
+ <property name="use_underline">True</property>
+ <property name="mnemonic_widget">days</property>
+ </object>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="top_attach">3</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="label4">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="xalign">0</property>
+ <property name="label" translatable="yes">H_ours</property>
+ <property name="use_underline">True</property>
+ <property name="mnemonic_widget">hours</property>
+ </object>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="top_attach">4</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="label5">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="xalign">0</property>
+ <property name="label" translatable="yes">Min_utes</property>
+ <property name="use_underline">True</property>
+ <property name="mnemonic_widget">minutes</property>
+ </object>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="top_attach">5</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="label6">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="xalign">0</property>
+ <property name="label" translatable="yes">_Seconds</property>
+ <property name="use_underline">True</property>
+ <property name="mnemonic_widget">seconds</property>
+ </object>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="top_attach">6</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="label7">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="xalign">0</property>
+ <property name="label" translatable="yes">Millise_conds</property>
+ <property name="use_underline">True</property>
+ <property name="mnemonic_widget">milliseconds</property>
+ </object>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="top_attach">7</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkSpinButton" id="years">
+ <property name="visible">True</property>
+ <property name="can_focus">True</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="GtkSpinButton" id="months">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ </object>
+ <packing>
+ <property name="left_attach">1</property>
+ <property name="top_attach">2</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkSpinButton" id="days">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ </object>
+ <packing>
+ <property name="left_attach">1</property>
+ <property name="top_attach">3</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkSpinButton" id="hours">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ </object>
+ <packing>
+ <property name="left_attach">1</property>
+ <property name="top_attach">4</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkSpinButton" id="minutes">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ </object>
+ <packing>
+ <property name="left_attach">1</property>
+ <property name="top_attach">5</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkSpinButton" id="seconds">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ </object>
+ <packing>
+ <property name="left_attach">1</property>
+ <property name="top_attach">6</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkSpinButton" id="milliseconds">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ </object>
+ <packing>
+ <property name="left_attach">1</property>
+ <property name="top_attach">7</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ </object>
+ </child>
+ </object>
+ </child>
+ <child type="label">
+ <object class="GtkLabel" id="label2">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label" translatable="yes">Duration</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>
commit d197a079cb2423c6519466766be505d5c31dbd61
Author: Caolán McNamara <caolanm at redhat.com>
Date: Fri Jan 3 23:12:50 2014 +0000
unhelpful stray backslash
Change-Id: Ic72892978ea7e8edb409b9260a2d37cd3d3212bd
diff --git a/cui/source/tabpages/labdlg.src b/cui/source/tabpages/labdlg.src
index 1222b10..24374dd 100644
--- a/cui/source/tabpages/labdlg.src
+++ b/cui/source/tabpages/labdlg.src
@@ -212,12 +212,11 @@ TabPage RID_SVXPAGE_CAPTION
File = "legtyp4.bmp" ;
};
};
- // RID_SVXDLG_CAPTION ----------------------------------------------------
#define _POS_SIZE_TEXT \
Text [ en-US ] = "Position and Size" ; \
-TabDialog RID_SVXDLG_CAPTION\
+TabDialog RID_SVXDLG_CAPTION
{
OutputSize = TRUE ;
SVLook = TRUE ;
More information about the Libreoffice-commits
mailing list