[Libreoffice-commits] .: sw/AllLangResTarget_sw.mk sw/inc sw/source sw/uiconfig sw/UI_swriter.mk
Libreoffice Gerrit user
logerrit at kemper.freedesktop.org
Thu Dec 13 05:39:14 PST 2012
sw/AllLangResTarget_sw.mk | 1
sw/UI_swriter.mk | 1
sw/inc/globals.hrc | 2
sw/inc/helpid.h | 1
sw/source/ui/app/app.src | 2
sw/source/ui/frmdlg/cption.cxx | 83 ++-----
sw/source/ui/frmdlg/cption.hrc | 48 ----
sw/source/ui/frmdlg/cption.src | 152 -------------
sw/uiconfig/swriter/ui/captionoptions.ui | 360 +++++++++++++++++++++++++++++++
9 files changed, 395 insertions(+), 255 deletions(-)
New commits:
commit f82b7a2aea7bcbc6dca13fc251b11685d62b8380
Author: Jack Leigh <leighman at gmx.se>
Date: Wed Dec 12 21:58:17 2012 +0000
migrate 'Caption options' dialog to .ui file
Change-Id: I58dbb70faf22c5958b65e5192664b7d12d62f04c
Reviewed-on: https://gerrit.libreoffice.org/1312
Reviewed-by: Caolán McNamara <caolanm at redhat.com>
Tested-by: Caolán McNamara <caolanm at redhat.com>
diff --git a/sw/AllLangResTarget_sw.mk b/sw/AllLangResTarget_sw.mk
index ea1196b..d80bfbc 100644
--- a/sw/AllLangResTarget_sw.mk
+++ b/sw/AllLangResTarget_sw.mk
@@ -131,7 +131,6 @@ $(eval $(call gb_SrsTarget_add_files,sw/res,\
sw/source/ui/fldui/inpdlg.src \
sw/source/ui/fmtui/tmpdlg.src \
sw/source/ui/frmdlg/column.src \
- sw/source/ui/frmdlg/cption.src \
sw/source/ui/frmdlg/frmpage.src \
sw/source/ui/frmdlg/frmui.src \
sw/source/ui/frmdlg/wrap.src \
diff --git a/sw/UI_swriter.mk b/sw/UI_swriter.mk
index f39bb2f..9da10bf 100644
--- a/sw/UI_swriter.mk
+++ b/sw/UI_swriter.mk
@@ -12,6 +12,7 @@ $(eval $(call gb_UI_UI,modules/swriter))
$(eval $(call gb_UI_add_uifiles,modules/swriter,\
sw/uiconfig/swriter/ui/autoformattable \
sw/uiconfig/swriter/ui/bibliographyentry \
+ sw/uiconfig/swriter/ui/captionoptions \
sw/uiconfig/swriter/ui/charurlpage \
sw/uiconfig/swriter/ui/columnwidth \
sw/uiconfig/swriter/ui/converttexttable \
diff --git a/sw/inc/globals.hrc b/sw/inc/globals.hrc
index 5362aee..1b79466 100644
--- a/sw/inc/globals.hrc
+++ b/sw/inc/globals.hrc
@@ -73,7 +73,7 @@
#define STR_CAPTION_END (RC_GLOBALS_BEGIN + 43)
#define STR_CAPTION_ABOVE (RC_GLOBALS_BEGIN + 44)
#define STR_CAPTION_BELOW (RC_GLOBALS_BEGIN + 45)
-#define STR_CAPTION_CATEGORY_NONE (RC_GLOBALS_BEGIN + 46)
+#define STR_CAPTION_NONE (RC_GLOBALS_BEGIN + 46)
// DIALOGS -----------------------------------------------------------
diff --git a/sw/inc/helpid.h b/sw/inc/helpid.h
index 917d9de..d443b6d 100644
--- a/sw/inc/helpid.h
+++ b/sw/inc/helpid.h
@@ -132,7 +132,6 @@
#define HID_SW_SORT_POSITION "SW_HID_SW_SORT_POSITION"
#define HID_SYNC_BTN "SW_HID_SYNC_BTN"
#define HID_EDIT_COMMENT "SW_HID_EDIT_COMMENT"
-#define HID_DLG_SEQUENCE_OPTION "SW_HID_DLG_SEQUENCE_OPTION"
#define HID_DLG_FLDEDT_NEXT "SW_HID_DLG_FLDEDT_NEXT"
#define HID_DLG_FLDEDT_PREV "SW_HID_DLG_FLDEDT_PREV"
#define HID_DLG_FLDEDT_ADDRESS "SW_HID_DLG_FLDEDT_ADDRESS"
diff --git a/sw/source/ui/app/app.src b/sw/source/ui/app/app.src
index 9111d94..0239ddf 100644
--- a/sw/source/ui/app/app.src
+++ b/sw/source/ui/app/app.src
@@ -256,7 +256,7 @@ String STR_CAPTION_BELOW
{
Text [ en-US ] = "Below" ;
};
-String STR_CAPTION_CATEGORY_NONE
+String STR_CAPTION_NONE
{
Text [ en-US ] = "<None>" ;
};
diff --git a/sw/source/ui/frmdlg/cption.cxx b/sw/source/ui/frmdlg/cption.cxx
index 404b36d..3585ded 100644
--- a/sw/source/ui/frmdlg/cption.cxx
+++ b/sw/source/ui/frmdlg/cption.cxx
@@ -44,7 +44,6 @@
#include <comphelper/string.hxx>
#include <frmui.hrc>
#include <globals.hrc>
-#include <cption.hrc>
#include <SwStyleNameMapper.hxx>
using namespace ::com::sun::star;
@@ -56,25 +55,14 @@ extern String* GetOldDrwCat();
class SwSequenceOptionDialog : public SvxStandardDialog
{
- FixedLine aFlHeader;
- FixedText aFtLevel;
- ListBox aLbLevel;
- FixedText aFtDelim;
- Edit aEdDelim;
+ ListBox* m_pLbLevel;
+ Edit* m_pEdDelim;
- FixedLine aFlCatAndFrame;
- FixedText aFtCharStyle;
- ListBox aLbCharStyle;
- CheckBox aApplyBorderAndShadowCB;
+ ListBox* m_pLbCharStyle;
+ CheckBox* m_pApplyBorderAndShadowCB;
//#i61007# order of captions
- FixedLine aFlCaptionOrder;
- FixedText aFtCaptionOrder;
- ListBox aLbCaptionOrder;
-
- OKButton aOKButton;
- CancelButton aCancelButton;
- HelpButton aHelpButton;
+ ListBox* m_pLbCaptionOrder;
SwView& rView;
String aFldTypeName;
@@ -85,12 +73,12 @@ public:
virtual ~SwSequenceOptionDialog();
virtual void Apply();
- bool IsApplyBorderAndShadow( void ) { return aApplyBorderAndShadowCB.IsChecked(); }
- void SetApplyBorderAndShadow( bool bSet ) { aApplyBorderAndShadowCB.Check(bSet); }
+ bool IsApplyBorderAndShadow( void ) { return m_pApplyBorderAndShadowCB->IsChecked(); }
+ void SetApplyBorderAndShadow( bool bSet ) { m_pApplyBorderAndShadowCB->Check(bSet); }
//#i61007# order of captions
- bool IsOrderNumberingFirst() const {return aLbCaptionOrder.GetSelectEntryPos() == 1;}
- void SetOrderNumberingFirst(bool bSet) { aLbCaptionOrder.SelectEntryPos( bSet ? 1 : 0 ); }
+ bool IsOrderNumberingFirst() const {return m_pLbCaptionOrder->GetSelectEntryPos() == 1;}
+ void SetOrderNumberingFirst(bool bSet) { m_pLbCaptionOrder->SelectEntryPos( bSet ? 1 : 0 ); }
void SetCharacterStyle(const String& rStyle);
String GetCharacterStyle() const;
@@ -100,7 +88,7 @@ String SwCaptionDialog::our_aSepTextSave = rtl::OUString(": "); // Caption separ
SwCaptionDialog::SwCaptionDialog( Window *pParent, SwView &rV ) :
SvxStandardDialog( pParent, "InsertCaptionDialog", "modules/swriter/ui/insertcaption.ui" ),
- sNone( SW_RES( STR_CAPTION_CATEGORY_NONE )),
+ sNone( SW_RES( STR_CAPTION_NONE )),
rView( rV ),
pMgr( new SwFldMgr(rView.GetWrtShellPtr()) ),
bCopyAttributes( sal_False ),
@@ -428,31 +416,23 @@ SwCaptionDialog::~SwCaptionDialog()
SwSequenceOptionDialog::SwSequenceOptionDialog( Window *pParent, SwView &rV,
const String& rSeqFldType )
- : SvxStandardDialog( pParent, SW_RES(DLG_SEQUENCE_OPTION) ),
- aFlHeader (this, SW_RES(FL_HEADER )),
- aFtLevel (this, SW_RES(FT_LEVEL )),
- aLbLevel (this, SW_RES(LB_LEVEL )),
- aFtDelim (this, SW_RES(FT_SEPARATOR )),
- aEdDelim (this, SW_RES(ED_SEPARATOR )),
- aFlCatAndFrame (this, SW_RES(FL_CATANDFRAME)),
- aFtCharStyle (this, SW_RES(FT_CHARSTYLE )),
- aLbCharStyle (this, SW_RES(LB_CHARSTYLE )),
- aApplyBorderAndShadowCB(this, SW_RES(CB_APPLYBAS)),
- aFlCaptionOrder(this, SW_RES( FL_ORDER )), //#i61007# order of captions
- aFtCaptionOrder(this, SW_RES( FT_ORDER )),
- aLbCaptionOrder(this, SW_RES( LB_ORDER )),
- aOKButton (this, SW_RES(BTN_OK )),
- aCancelButton (this, SW_RES(BTN_CANCEL )),
- aHelpButton (this, SW_RES(BTN_HELP )),
-
+ : SvxStandardDialog( pParent, "CaptionOptionsDialog", "modules/swriter/ui/captionoptions.ui" ),
rView( rV ),
aFldTypeName( rSeqFldType )
{
- FreeResource();
+ get(m_pLbLevel, "level");
+ get(m_pEdDelim, "separator");
+ get(m_pLbCharStyle, "style");
+ get(m_pApplyBorderAndShadowCB, "border_and_shadow");
+ get(m_pLbCaptionOrder, "caption_order");
+
SwWrtShell &rSh = rView.GetWrtShell();
+ String sNone(SW_RES(STR_CAPTION_NONE));
+
+ m_pLbLevel->InsertEntry(sNone);
for( sal_uInt16 n = 0; n < MAXLEVEL; ++n )
- aLbLevel.InsertEntry( String::CreateFromInt32(n+1) );
+ m_pLbLevel->InsertEntry( String::CreateFromInt32(n+1) );
SwSetExpFieldType* pFldType = (SwSetExpFieldType*)rSh.GetFldType(
RES_SETEXPFLD, aFldTypeName );
@@ -465,11 +445,12 @@ SwSequenceOptionDialog::SwSequenceOptionDialog( Window *pParent, SwView &rV,
nLvl = pFldType->GetOutlineLvl();
}
- aLbLevel.SelectEntryPos( nLvl < MAXLEVEL ? nLvl + 1 : 0 );
- aEdDelim.SetText(sDelim);
+ m_pLbLevel->SelectEntryPos( nLvl < MAXLEVEL ? nLvl + 1 : 0 );
+ m_pEdDelim->SetText(sDelim);
- ::FillCharStyleListBox( aLbCharStyle, rView.GetDocShell(), sal_True, sal_True );
- aLbCharStyle.SelectEntryPos( 0 );
+ m_pLbCharStyle->InsertEntry(sNone);
+ ::FillCharStyleListBox( *m_pLbCharStyle, rView.GetDocShell(), sal_True, sal_True );
+ m_pLbCharStyle->SelectEntryPos( 0 );
}
SwSequenceOptionDialog::~SwSequenceOptionDialog()
@@ -482,8 +463,8 @@ void SwSequenceOptionDialog::Apply()
SwSetExpFieldType* pFldType = (SwSetExpFieldType*)rSh.GetFldType(
RES_SETEXPFLD, aFldTypeName );
- sal_Int8 nLvl = (sal_Int8)( aLbLevel.GetSelectEntryPos() - 1);
- sal_Unicode cDelim = aEdDelim.GetText().GetChar(0);
+ sal_Int8 nLvl = (sal_Int8)( m_pLbLevel->GetSelectEntryPos() - 1);
+ sal_Unicode cDelim = m_pEdDelim->GetText().GetChar(0);
sal_Bool bUpdate = sal_True;
if( pFldType )
@@ -509,15 +490,15 @@ void SwSequenceOptionDialog::Apply()
String SwSequenceOptionDialog::GetCharacterStyle() const
{
String sRet;
- if(aLbCharStyle.GetSelectEntryPos())
- sRet = aLbCharStyle.GetSelectEntry();
+ if(m_pLbCharStyle->GetSelectEntryPos())
+ sRet = m_pLbCharStyle->GetSelectEntry();
return sRet;
}
void SwSequenceOptionDialog::SetCharacterStyle(const String& rStyle)
{
- aLbCharStyle.SelectEntryPos(0);
- aLbCharStyle.SelectEntry(rStyle);
+ m_pLbCharStyle->SelectEntryPos(0);
+ m_pLbCharStyle->SelectEntry(rStyle);
}
long CategoryBox::PreNotify( NotifyEvent& rNEvt )
diff --git a/sw/source/ui/frmdlg/cption.hrc b/sw/source/ui/frmdlg/cption.hrc
deleted file mode 100644
index 242599c..0000000
--- a/sw/source/ui/frmdlg/cption.hrc
+++ /dev/null
@@ -1,48 +0,0 @@
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed
- * with this work for additional information regarding copyright
- * ownership. The ASF licenses this file to you under the Apache
- * License, Version 2.0 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.apache.org/licenses/LICENSE-2.0 .
- */
-
-#ifndef _CPTION_HRC
-#define _CPTION_HRC
-
-#define BTN_OK 1
-#define BTN_CANCEL 2
-#define BTN_HELP 13
-#define FL_HEADER 15
-#define FT_LEVEL 16
-#define LB_LEVEL 17
-#define FT_SEPARATOR 18
-#define ED_SEPARATOR 19
-
-#define FL_CATANDFRAME 27
-#define FT_CHARSTYLE 28
-#define LB_CHARSTYLE 29
-#define CB_APPLYBAS 30
-#define FL_ORDER 31
-#define FT_ORDER 32
-#define LB_ORDER 33
-
-#define STR_BEGINNING 1
-#define STR_END 2
-#define STR_ABOVE 3
-#define STR_CP_BELOW 4
-#define STR_CATEGORY_NONE 5
-
-#endif
-
-// ********************************************************************** EOF
-
diff --git a/sw/source/ui/frmdlg/cption.src b/sw/source/ui/frmdlg/cption.src
deleted file mode 100644
index 2587ba8..0000000
--- a/sw/source/ui/frmdlg/cption.src
+++ /dev/null
@@ -1,152 +0,0 @@
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed
- * with this work for additional information regarding copyright
- * ownership. The ASF licenses this file to you under the Apache
- * License, Version 2.0 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.apache.org/licenses/LICENSE-2.0 .
- */
-
-#include "helpid.h"
-#include "frmui.hrc"
-#include "cption.hrc"
-#include "cmdid.h"
-
-ModalDialog DLG_SEQUENCE_OPTION
-{
- HelpID = HID_DLG_SEQUENCE_OPTION ;
- OutputSize = TRUE ;
- SVLook = TRUE ;
- Size = MAP_APPFONT ( 200 , 132 ) ;
- Moveable = TRUE ;
- Text [ en-US ] = "Options" ;
- OKButton BTN_OK
- {
- DefButton = TRUE ;
- Pos = MAP_APPFONT ( 145 , 6 ) ;
- Size = MAP_APPFONT ( 50 , 14 ) ;
- TabStop = TRUE ;
- };
- CancelButton BTN_CANCEL
- {
- Pos = MAP_APPFONT ( 145 , 23 ) ;
- Size = MAP_APPFONT ( 50 , 14 ) ;
- TabStop = TRUE ;
- };
- HelpButton BTN_HELP
- {
- Pos = MAP_APPFONT ( 145 , 43 ) ;
- Size = MAP_APPFONT ( 50 , 14 ) ;
- TabStop = TRUE ;
- };
- FixedLine FL_HEADER
- {
- Pos = MAP_APPFONT ( 6 , 3 ) ;
- Size = MAP_APPFONT ( 132 , 8 ) ;
- Text [ en-US ] = "Numbering captions by chapter" ;
- };
- FixedText FT_LEVEL
- {
- Pos = MAP_APPFONT ( 12 , 21 ) ;
- Size = MAP_APPFONT ( 50 , 8 ) ;
- Text [ en-US ] = "~Level" ;
- };
- ListBox LB_LEVEL
- {
- HelpID = "sw:ListBox:DLG_SEQUENCE_OPTION:LB_LEVEL";
- Border = TRUE ;
- Pos = MAP_APPFONT ( 65 , 18 ) ;
- Size = MAP_APPFONT ( 72 , 60 ) ;
- TabStop = TRUE ;
- DropDown = TRUE ;
- StringList [ en-US ] =
- {
- < "<None>" ; > ;
- };
- };
- FixedText FT_SEPARATOR
- {
- Pos = MAP_APPFONT ( 12 , 33 ) ;
- Size = MAP_APPFONT ( 50 , 8 ) ;
- Text [ en-US ] = "~Separator" ;
- };
- Edit ED_SEPARATOR
- {
- HelpID = "sw:Edit:DLG_SEQUENCE_OPTION:ED_SEPARATOR";
- Pos = MAP_APPFONT ( 65 , 34 ) ;
- Size = MAP_APPFONT ( 72 , 12 ) ;
- Border = TRUE ;
- MaxTextLength = 1 ;
- TEXT = "." ;
- };
- FixedLine FL_CATANDFRAME
- {
- Pos = MAP_APPFONT ( 6 , 53 ) ;
- Size = MAP_APPFONT ( 132 , 8 ) ;
- Text [ en-US ] = "Category and frame format" ;
- };
- FixedText FT_CHARSTYLE
- {
- Pos = MAP_APPFONT ( 12 , 71 ) ;
- Size = MAP_APPFONT ( 50 , 8 ) ;
- Text [ en-US ] = "Character style" ;
- };
- ListBox LB_CHARSTYLE
- {
- HelpID = "sw:ListBox:DLG_SEQUENCE_OPTION:LB_CHARSTYLE";
- Border = TRUE ;
- Pos = MAP_APPFONT ( 65 , 68 ) ;
- Size = MAP_APPFONT ( 72 , 60 ) ;
- TabStop = TRUE ;
- DropDown = TRUE ;
- StringList [ en-US ] =
- {
- < "<None>" ; > ;
- };
- };
- CheckBox CB_APPLYBAS
- {
- HelpID = "sw:CheckBox:DLG_SEQUENCE_OPTION:CB_APPLYBAS";
- Pos = MAP_APPFONT ( 12 , 84 ) ;
- Size = MAP_APPFONT ( 136 , 10 ) ;
- TabStop = TRUE ;
- Text [ en-US ] = "~Apply border and shadow";
- };
- FixedLine FL_ORDER
- {
- Pos = MAP_APPFONT ( 6 , 97 ) ;
- Size = MAP_APPFONT ( 132 , 8 ) ;
- Text [ en-US ] = "Caption" ;
- };
- FixedText FT_ORDER
- {
- Pos = MAP_APPFONT ( 12 , 115 ) ;
- Size = MAP_APPFONT ( 50 , 8 ) ;
- Text [ en-US ] = "Caption order" ;
- };
- ListBox LB_ORDER
- {
- HelpID = "sw:ListBox:DLG_SEQUENCE_OPTION:LB_ORDER";
- Border = TRUE ;
- Pos = MAP_APPFONT ( 65 , 114 ) ;
- Size = MAP_APPFONT ( 72 , 60 ) ;
- TabStop = TRUE ;
- DropDown = TRUE ;
- StringList [ en-US ] =
- {
- < "Category first" ; > ;
- < "Numbering first" ; > ;
- };
- };
-};
- // ********************************************************************** EOF
-
diff --git a/sw/uiconfig/swriter/ui/captionoptions.ui b/sw/uiconfig/swriter/ui/captionoptions.ui
new file mode 100644
index 0000000..25d3295
--- /dev/null
+++ b/sw/uiconfig/swriter/ui/captionoptions.ui
@@ -0,0 +1,360 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<interface>
+ <!-- interface-requires gtk+ 3.0 -->
+ <object class="GtkDialog" id="CaptionOptionsDialog">
+ <property name="can_focus">False</property>
+ <property name="border_width">5</property>
+ <property name="title" translatable="yes">Caption options</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="spacing">2</property>
+ <child>
+ <object class="GtkBox" id="box1">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="orientation">vertical</property>
+ <child>
+ <object class="GtkFrame" id="frame1">
+ <property name="visible">True</property>
+ <property name="can_focus">False</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="top_padding">6</property>
+ <property name="bottom_padding">6</property>
+ <property name="left_padding">12</property>
+ <child>
+ <object class="GtkGrid" id="grid2">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="row_spacing">6</property>
+ <property name="column_spacing">6</property>
+ <property name="column_homogeneous">True</property>
+ <child>
+ <object class="GtkComboBox" id="level">
+ <property name="visible">True</property>
+ <property name="can_focus">False</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="GtkEntry" id="separator">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="invisible_char">•</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="label5">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="halign">start</property>
+ <property name="label" translatable="yes">Level</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="label6">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="halign">start</property>
+ <property name="label" translatable="yes">Separator</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>
+ </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">Numbering captions by chapter</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">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkFrame" id="frame2">
+ <property name="visible">True</property>
+ <property name="can_focus">False</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="top_padding">6</property>
+ <property name="bottom_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">6</property>
+ <property name="column_homogeneous">True</property>
+ <child>
+ <object class="GtkLabel" id="label4">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="halign">start</property>
+ <property name="margin_right">12</property>
+ <property name="label" translatable="yes">Character style</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="GtkComboBox" id="style">
+ <property name="visible">True</property>
+ <property name="can_focus">False</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="GtkCheckButton" id="border_and_shadow">
+ <property name="label" translatable="yes">Apply border and shadow</property>
+ <property name="use_action_appearance">False</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">False</property>
+ <property name="halign">start</property>
+ <property name="use_action_appearance">False</property>
+ <property name="xalign">0</property>
+ <property name="draw_indicator">True</property>
+ </object>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="top_attach">1</property>
+ <property name="width">2</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">Category and frame format</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>
+ <child>
+ <object class="GtkFrame" id="frame3">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label_xalign">0</property>
+ <property name="shadow_type">none</property>
+ <child>
+ <object class="GtkAlignment" id="alignment3">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="top_padding">6</property>
+ <property name="bottom_padding">6</property>
+ <property name="left_padding">12</property>
+ <child>
+ <object class="GtkGrid" id="grid3">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="row_spacing">6</property>
+ <property name="column_spacing">6</property>
+ <property name="column_homogeneous">True</property>
+ <child>
+ <object class="GtkLabel" id="label7">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="halign">start</property>
+ <property name="margin_right">12</property>
+ <property name="label" translatable="yes">Caption order</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="GtkComboBox" id="caption_order">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="model">liststore1</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>
+ </child>
+ </object>
+ </child>
+ <child type="label">
+ <object class="GtkLabel" id="label3">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label" translatable="yes">Caption</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">2</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child internal-child="action_area">
+ <object class="GtkButtonBox" id="dialog-action_area1">
+ <property name="can_focus">False</property>
+ <property name="orientation">vertical</property>
+ <property name="layout_style">start</property>
+ <child>
+ <object class="GtkButton" id="ok">
+ <property name="label">gtk-ok</property>
+ <property name="use_action_appearance">False</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>
+ <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="use_action_appearance">False</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>
+ <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="use_action_appearance">False</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>
+ <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">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>
+ <object class="GtkListStore" id="liststore1">
+ <columns>
+ <!-- column-name gchararray1 -->
+ <column type="gchararray"/>
+ </columns>
+ <data>
+ <row>
+ <col id="0" translatable="yes">Category first</col>
+ </row>
+ <row>
+ <col id="0" translatable="yes">Numbering first</col>
+ </row>
+ </data>
+ </object>
+</interface>
More information about the Libreoffice-commits
mailing list