[Libreoffice-commits] core.git: 3 commits - cui/uiconfig helpcontent2 sw/inc sw/source sw/uiconfig sw/UIConfig_swriter.mk
Caolán McNamara
caolanm at redhat.com
Thu Aug 8 03:57:26 PDT 2013
cui/uiconfig/ui/twolinespage.ui | 72 +++++-----
helpcontent2 | 2
sw/UIConfig_swriter.mk | 1
sw/inc/helpid.h | 1
sw/source/ui/inc/swuicnttab.hxx | 13 -
sw/source/ui/index/cnttab.cxx | 115 ++++++++---------
sw/source/ui/index/cnttab.hrc | 4
sw/source/ui/index/cnttab.src | 76 -----------
sw/uiconfig/swriter/ui/tocstylespage.ui | 210 ++++++++++++++++++++++++++++++++
9 files changed, 308 insertions(+), 186 deletions(-)
New commits:
commit bbc6c5e79d73706e5c642d37453ab4fab029b707
Author: Caolán McNamara <caolanm at redhat.com>
Date: Thu Aug 8 11:53:38 2013 +0100
put border around two-lines-in-one lists
Change-Id: I5a23e4843efd9469c5126bfcc9b96d07ab08b7c0
diff --git a/cui/uiconfig/ui/twolinespage.ui b/cui/uiconfig/ui/twolinespage.ui
index c6e6855..c931b90 100644
--- a/cui/uiconfig/ui/twolinespage.ui
+++ b/cui/uiconfig/ui/twolinespage.ui
@@ -2,6 +2,40 @@
<interface>
<!-- interface-requires gtk+ 3.0 -->
<!-- interface-requires LibreOffice 1.0 -->
+ <object class="GtkListStore" id="liststore1">
+ <columns>
+ <!-- column-name gchararray1 -->
+ <column type="gchararray"/>
+ <!-- column-name gint1 -->
+ <column type="gint"/>
+ </columns>
+ <data>
+ <row>
+ <col id="0" translatable="yes">(None)</col>
+ <col id="1">0</col>
+ </row>
+ <row>
+ <col id="0" translatable="yes">(</col>
+ <col id="1">1</col>
+ </row>
+ <row>
+ <col id="0" translatable="yes">[</col>
+ <col id="1">2</col>
+ </row>
+ <row>
+ <col id="0" translatable="yes"><</col>
+ <col id="1">3</col>
+ </row>
+ <row>
+ <col id="0" translatable="yes">{</col>
+ <col id="1">4</col>
+ </row>
+ <row>
+ <col id="0" translatable="yes">Other Characters...</col>
+ <col id="1">5</col>
+ </row>
+ </data>
+ </object>
<object class="GtkListStore" id="liststore2">
<columns>
<!-- column-name gchararray1 -->
@@ -128,7 +162,7 @@
</packing>
</child>
<child>
- <object class="GtkTreeView" id="startbracket">
+ <object class="GtkTreeView" id="startbracket:border">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="model">liststore1</property>
@@ -145,7 +179,7 @@
</packing>
</child>
<child>
- <object class="GtkTreeView" id="endbracket">
+ <object class="GtkTreeView" id="endbracket:border">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="model">liststore2</property>
@@ -211,38 +245,4 @@
</packing>
</child>
</object>
- <object class="GtkListStore" id="liststore1">
- <columns>
- <!-- column-name gchararray1 -->
- <column type="gchararray"/>
- <!-- column-name gint1 -->
- <column type="gint"/>
- </columns>
- <data>
- <row>
- <col id="0" translatable="yes">(None)</col>
- <col id="1">0</col>
- </row>
- <row>
- <col id="0" translatable="yes">(</col>
- <col id="1">1</col>
- </row>
- <row>
- <col id="0" translatable="yes">[</col>
- <col id="1">2</col>
- </row>
- <row>
- <col id="0" translatable="yes"><</col>
- <col id="1">3</col>
- </row>
- <row>
- <col id="0" translatable="yes">{</col>
- <col id="1">4</col>
- </row>
- <row>
- <col id="0" translatable="yes">Other Characters...</col>
- <col id="1">5</col>
- </row>
- </data>
- </object>
</interface>
commit a641d049ab7aac7d9aae86b0c21d7a0ea12ff067
Author: Caolán McNamara <caolanm at redhat.com>
Date: Thu Aug 8 11:26:02 2013 +0100
convert toc style page to .ui
Change-Id: I8ed03fc3e5433d8a2fe83c3ad88fa95773fe6c53
diff --git a/sw/UIConfig_swriter.mk b/sw/UIConfig_swriter.mk
index 7e67b46..cd38209 100644
--- a/sw/UIConfig_swriter.mk
+++ b/sw/UIConfig_swriter.mk
@@ -140,6 +140,7 @@ $(eval $(call gb_UIConfig_add_uifiles,modules/swriter,\
sw/uiconfig/swriter/ui/splittable \
sw/uiconfig/swriter/ui/statisticsinfopage \
sw/uiconfig/swriter/ui/stringinput \
+ sw/uiconfig/swriter/ui/tocstylespage \
sw/uiconfig/swriter/ui/tablecolumnpage \
sw/uiconfig/swriter/ui/tableproperties \
sw/uiconfig/swriter/ui/tabletextflowpage \
diff --git a/sw/inc/helpid.h b/sw/inc/helpid.h
index 74edf70..d8d4430 100644
--- a/sw/inc/helpid.h
+++ b/sw/inc/helpid.h
@@ -167,7 +167,6 @@
#define HID_OPTCAPTION_PAGE "SW_HID_OPTCAPTION_PAGE"
#define HID_TP_TOX_SELECT "SW_HID_TP_TOX_SELECT"
#define HID_TP_TOX_ENTRY "SW_HID_TP_TOX_ENTRY"
-#define HID_TOX_STYLES_PAGE "SW_HID_TOX_STYLES_PAGE"
#define HID_TP_VISITING_CARDS "SW_HID_TP_VISITING_CARDS"
#define HID_DLG_ADD_IDX_STYLES "SW_HID_DLG_ADD_IDX_STYLES"
#define HID_ADD_STYLES_TLB "SW_HID_ADD_STYLES_TLB"
diff --git a/sw/source/ui/inc/swuicnttab.hxx b/sw/source/ui/inc/swuicnttab.hxx
index 27a5a8f..73d04b1 100644
--- a/sw/source/ui/inc/swuicnttab.hxx
+++ b/sw/source/ui/inc/swuicnttab.hxx
@@ -463,14 +463,11 @@ public:
class SwTOXStylesTabPage : public SfxTabPage
{
- FixedLine aFormatFL;
- FixedText aLevelFT2;
- ListBox aLevelLB;
- ImageButton aAssignBT;
- FixedText aTemplateFT;
- ListBox aParaLayLB;
- PushButton aStdBT;
- PushButton aEditStyleBT;
+ ListBox* m_pLevelLB;
+ PushButton* m_pAssignBT;
+ ListBox* m_pParaLayLB;
+ PushButton* m_pStdBT;
+ PushButton* m_pEditStyleBT;
SwForm* m_pCurrentForm;
diff --git a/sw/source/ui/index/cnttab.cxx b/sw/source/ui/index/cnttab.cxx
index c90851e..619e498 100644
--- a/sw/source/ui/index/cnttab.cxx
+++ b/sw/source/ui/index/cnttab.cxx
@@ -3648,33 +3648,28 @@ void SwTokenWindow::GetFocus()
}
}
-SwTOXStylesTabPage::SwTOXStylesTabPage(Window* pParent, const SfxItemSet& rAttrSet ) :
- SfxTabPage(pParent, SW_RES(TP_TOX_STYLES), rAttrSet),
- aFormatFL(this, SW_RES(FL_FORMAT )),
- aLevelFT2(this, SW_RES(FT_LEVEL )),
- aLevelLB(this, SW_RES(LB_LEVEL )),
- aAssignBT(this, SW_RES(BT_ASSIGN )),
- aTemplateFT(this, SW_RES(FT_TEMPLATE)),
- aParaLayLB(this, SW_RES(LB_PARALAY )),
- aStdBT(this, SW_RES(BT_STD )),
- aEditStyleBT(this, SW_RES(BT_EDIT_STYLE )),
- m_pCurrentForm(0)
-{
- FreeResource();
+SwTOXStylesTabPage::SwTOXStylesTabPage(Window* pParent, const SfxItemSet& rAttrSet )
+ : SfxTabPage(pParent, "TocStylesPage", "modules/swriter/ui/tocstylespage.ui", rAttrSet)
+ , m_pCurrentForm(0)
+{
+ get(m_pLevelLB, "levels");
+ get(m_pAssignBT, "assign");
+ get(m_pParaLayLB, "styles");
+ m_pParaLayLB->SetStyle(m_pParaLayLB->GetStyle() | WB_SORT);
+ get(m_pStdBT, "default");
+ get(m_pEditStyleBT, "edit");
+ long nHeight = m_pLevelLB->GetTextHeight() * 16;
+ m_pLevelLB->set_height_request(nHeight);
+ m_pParaLayLB->set_height_request(nHeight);
SetExchangeSupport( sal_True );
- aEditStyleBT.SetClickHdl (LINK( this, SwTOXStylesTabPage, EditStyleHdl));
- aAssignBT.SetClickHdl (LINK( this, SwTOXStylesTabPage, AssignHdl));
- aStdBT.SetClickHdl (LINK( this, SwTOXStylesTabPage, StdHdl));
- aParaLayLB.SetSelectHdl (LINK( this, SwTOXStylesTabPage, EnableSelectHdl));
- aLevelLB.SetSelectHdl (LINK( this, SwTOXStylesTabPage, EnableSelectHdl));
- aParaLayLB.SetDoubleClickHdl(LINK( this, SwTOXStylesTabPage, DoubleClickHdl));
-
- aStdBT.SetAccessibleRelationMemberOf(&aFormatFL);
- aAssignBT.SetAccessibleRelationMemberOf(&aFormatFL);
- aEditStyleBT.SetAccessibleRelationMemberOf(&aFormatFL);
-
+ m_pEditStyleBT->SetClickHdl (LINK( this, SwTOXStylesTabPage, EditStyleHdl));
+ m_pAssignBT->SetClickHdl (LINK( this, SwTOXStylesTabPage, AssignHdl));
+ m_pStdBT->SetClickHdl (LINK( this, SwTOXStylesTabPage, StdHdl));
+ m_pParaLayLB->SetSelectHdl (LINK( this, SwTOXStylesTabPage, EnableSelectHdl));
+ m_pLevelLB->SetSelectHdl(LINK(this, SwTOXStylesTabPage, EnableSelectHdl));
+ m_pParaLayLB->SetDoubleClickHdl(LINK( this, SwTOXStylesTabPage, DoubleClickHdl));
}
SwTOXStylesTabPage::~SwTOXStylesTabPage()
@@ -3682,21 +3677,21 @@ SwTOXStylesTabPage::~SwTOXStylesTabPage()
delete m_pCurrentForm;
}
-sal_Bool SwTOXStylesTabPage::FillItemSet( SfxItemSet& )
+sal_Bool SwTOXStylesTabPage::FillItemSet( SfxItemSet& )
{
return sal_True;
}
-void SwTOXStylesTabPage::Reset( const SfxItemSet& rSet )
+void SwTOXStylesTabPage::Reset( const SfxItemSet& rSet )
{
ActivatePage(rSet);
}
-void SwTOXStylesTabPage::ActivatePage( const SfxItemSet& )
+void SwTOXStylesTabPage::ActivatePage( const SfxItemSet& )
{
m_pCurrentForm = new SwForm(GetForm());
- aParaLayLB.Clear();
- aLevelLB.Clear();
+ m_pParaLayLB->Clear();
+ m_pLevelLB->Clear();
// not hyperlink for user directories
@@ -3713,7 +3708,7 @@ void SwTOXStylesTabPage::ActivatePage( const SfxItemSet& )
aStr += m_pCurrentForm->GetTemplate( 0 );
aStr += aDeliEnd;
}
- aLevelLB.InsertEntry(aStr);
+ m_pLevelLB->InsertEntry(aStr);
for( i=1; i < nSize; ++i )
{
@@ -3735,7 +3730,7 @@ void SwTOXStylesTabPage::ActivatePage( const SfxItemSet& )
aCpy += m_pCurrentForm->GetTemplate( i );
aCpy += aDeliEnd;
}
- aLevelLB.InsertEntry( aCpy );
+ m_pLevelLB->InsertEntry( aCpy );
}
// initialise templates
@@ -3745,18 +3740,18 @@ void SwTOXStylesTabPage::ActivatePage( const SfxItemSet& )
for( i = 0; i < nSz; ++i )
if( !(pColl = &rSh.GetTxtFmtColl( i ))->IsDefault() )
- aParaLayLB.InsertEntry( pColl->GetName() );
+ m_pParaLayLB->InsertEntry( pColl->GetName() );
// query pool collections and set them for the directory
for( i = 0; i < m_pCurrentForm->GetFormMax(); ++i )
{
aStr = m_pCurrentForm->GetTemplate( i );
if( aStr.Len() &&
- LISTBOX_ENTRY_NOTFOUND == aParaLayLB.GetEntryPos( aStr ))
- aParaLayLB.InsertEntry( aStr );
+ LISTBOX_ENTRY_NOTFOUND == m_pParaLayLB->GetEntryPos( aStr ))
+ m_pParaLayLB->InsertEntry( aStr );
}
- EnableSelectHdl(&aParaLayLB);
+ EnableSelectHdl(m_pParaLayLB);
}
int SwTOXStylesTabPage::DeactivatePage( SfxItemSet* /*pSet*/ )
@@ -3773,9 +3768,9 @@ SfxTabPage* SwTOXStylesTabPage::Create( Window* pParent,
IMPL_LINK( SwTOXStylesTabPage, EditStyleHdl, Button *, pBtn )
{
- if( LISTBOX_ENTRY_NOTFOUND != aParaLayLB.GetSelectEntryPos())
+ if( LISTBOX_ENTRY_NOTFOUND != m_pParaLayLB->GetSelectEntryPos())
{
- SfxStringItem aStyle(SID_STYLE_EDIT, aParaLayLB.GetSelectEntry());
+ SfxStringItem aStyle(SID_STYLE_EDIT, m_pParaLayLB->GetSelectEntry());
SfxUInt16Item aFamily(SID_STYLE_FAMILY, SFX_STYLE_FAMILY_PARA);
Window* pDefDlgParent = Application::GetDefDialogParent();
Application::SetDefDialogParent( pBtn );
@@ -3792,26 +3787,26 @@ IMPL_LINK( SwTOXStylesTabPage, EditStyleHdl, Button *, pBtn )
--------------------------------------------------------------------*/
IMPL_LINK_NOARG(SwTOXStylesTabPage, AssignHdl)
{
- sal_uInt16 nLevPos = aLevelLB.GetSelectEntryPos();
- sal_uInt16 nTemplPos = aParaLayLB.GetSelectEntryPos();
+ sal_uInt16 nLevPos = m_pLevelLB->GetSelectEntryPos();
+ sal_uInt16 nTemplPos = m_pParaLayLB->GetSelectEntryPos();
if(nLevPos != LISTBOX_ENTRY_NOTFOUND &&
nTemplPos != LISTBOX_ENTRY_NOTFOUND)
{
- String aStr(aLevelLB.GetEntry(nLevPos));
+ String aStr(m_pLevelLB->GetEntry(nLevPos));
sal_uInt16 nDelPos = aStr.Search(aDeliStart);
if(nDelPos != STRING_NOTFOUND)
aStr.Erase(nDelPos-1);
aStr += ' ';
aStr += aDeliStart;
- aStr += aParaLayLB.GetSelectEntry();
+ aStr += m_pParaLayLB->GetSelectEntry();
- m_pCurrentForm->SetTemplate(nLevPos, aParaLayLB.GetSelectEntry());
+ m_pCurrentForm->SetTemplate(nLevPos, m_pParaLayLB->GetSelectEntry());
aStr += aDeliEnd;
- aLevelLB.RemoveEntry(nLevPos);
- aLevelLB.InsertEntry(aStr, nLevPos);
- aLevelLB.SelectEntry(aStr);
+ m_pLevelLB->RemoveEntry(nLevPos);
+ m_pLevelLB->InsertEntry(aStr, nLevPos);
+ m_pLevelLB->SelectEntry(aStr);
Modify();
}
return 0;
@@ -3819,15 +3814,15 @@ IMPL_LINK_NOARG(SwTOXStylesTabPage, AssignHdl)
IMPL_LINK_NOARG(SwTOXStylesTabPage, StdHdl)
{
- sal_uInt16 nPos = aLevelLB.GetSelectEntryPos();
+ sal_uInt16 nPos = m_pLevelLB->GetSelectEntryPos();
if(nPos != LISTBOX_ENTRY_NOTFOUND)
- { String aStr(aLevelLB.GetEntry(nPos));
+ { String aStr(m_pLevelLB->GetEntry(nPos));
sal_uInt16 nDelPos = aStr.Search(aDeliStart);
if(nDelPos != STRING_NOTFOUND)
aStr.Erase(nDelPos-1);
- aLevelLB.RemoveEntry(nPos);
- aLevelLB.InsertEntry(aStr, nPos);
- aLevelLB.SelectEntry(aStr);
+ m_pLevelLB->RemoveEntry(nPos);
+ m_pLevelLB->InsertEntry(aStr, nPos);
+ m_pLevelLB->SelectEntry(aStr);
m_pCurrentForm->SetTemplate(nPos, aEmptyStr);
Modify();
}
@@ -3836,12 +3831,12 @@ IMPL_LINK_NOARG(SwTOXStylesTabPage, StdHdl)
IMPL_LINK_NOARG_INLINE_START(SwTOXStylesTabPage, DoubleClickHdl)
{
- String aTmpName( aParaLayLB.GetSelectEntry() );
+ String aTmpName( m_pParaLayLB->GetSelectEntry() );
SwWrtShell& rSh = ((SwMultiTOXTabDialog*)GetTabDialog())->GetWrtShell();
- if(aParaLayLB.GetSelectEntryPos() != LISTBOX_ENTRY_NOTFOUND &&
- (aLevelLB.GetSelectEntryPos() == 0 || SwMultiTOXTabDialog::IsNoNum(rSh, aTmpName)))
- AssignHdl(&aAssignBT);
+ if(m_pParaLayLB->GetSelectEntryPos() != LISTBOX_ENTRY_NOTFOUND &&
+ (m_pLevelLB->GetSelectEntryPos() == 0 || SwMultiTOXTabDialog::IsNoNum(rSh, aTmpName)))
+ AssignHdl(m_pAssignBT);
return 0;
}
IMPL_LINK_NOARG_INLINE_END(SwTOXStylesTabPage, DoubleClickHdl)
@@ -3851,14 +3846,14 @@ IMPL_LINK_NOARG_INLINE_END(SwTOXStylesTabPage, DoubleClickHdl)
--------------------------------------------------------------------*/
IMPL_LINK_NOARG(SwTOXStylesTabPage, EnableSelectHdl)
{
- aStdBT.Enable(aLevelLB.GetSelectEntryPos() != LISTBOX_ENTRY_NOTFOUND);
+ m_pStdBT->Enable(m_pLevelLB->GetSelectEntryPos() != LISTBOX_ENTRY_NOTFOUND);
SwWrtShell& rSh = ((SwMultiTOXTabDialog*)GetTabDialog())->GetWrtShell();
- String aTmpName(aParaLayLB.GetSelectEntry());
- aAssignBT.Enable(aParaLayLB.GetSelectEntryPos() != LISTBOX_ENTRY_NOTFOUND &&
- LISTBOX_ENTRY_NOTFOUND != aLevelLB.GetSelectEntryPos() &&
- (aLevelLB.GetSelectEntryPos() == 0 || SwMultiTOXTabDialog::IsNoNum(rSh, aTmpName)));
- aEditStyleBT.Enable(aParaLayLB.GetSelectEntryPos() != LISTBOX_ENTRY_NOTFOUND );
+ String aTmpName(m_pParaLayLB->GetSelectEntry());
+ m_pAssignBT->Enable(m_pParaLayLB->GetSelectEntryPos() != LISTBOX_ENTRY_NOTFOUND &&
+ LISTBOX_ENTRY_NOTFOUND != m_pLevelLB->GetSelectEntryPos() &&
+ (m_pLevelLB->GetSelectEntryPos() == 0 || SwMultiTOXTabDialog::IsNoNum(rSh, aTmpName)));
+ m_pEditStyleBT->Enable(m_pParaLayLB->GetSelectEntryPos() != LISTBOX_ENTRY_NOTFOUND );
return 0;
}
diff --git a/sw/source/ui/index/cnttab.hrc b/sw/source/ui/index/cnttab.hrc
index 3ec7532..2108c6a 100644
--- a/sw/source/ui/index/cnttab.hrc
+++ b/sw/source/ui/index/cnttab.hrc
@@ -24,12 +24,8 @@
#define LB_ENTRY 20
#define ED_ENTRY 22
-#define BT_STD 26
#define FL_ENTRY 28
#define LB_LEVEL 29
-#define FT_TEMPLATE 30
-#define LB_PARALAY 31
-#define BT_ASSIGN 32
#define FL_FORMAT 33
#define BT_EDIT_STYLE 40
#define CB_CASE 43
diff --git a/sw/source/ui/index/cnttab.src b/sw/source/ui/index/cnttab.src
index c3cecf0..c2d356c 100644
--- a/sw/source/ui/index/cnttab.src
+++ b/sw/source/ui/index/cnttab.src
@@ -1083,82 +1083,6 @@ TabPage TP_TOX_ENTRY
Text [ en-US ] = "S";
};
};
-TabPage TP_TOX_STYLES
-{
- HelpID = HID_TOX_STYLES_PAGE;
- Size = MAP_APPFONT ( TP_WIDTH , TP_HEIGHT ) ;
- Hide = TRUE ;
- FixedText FT_LEVEL
- {
- Pos = MAP_APPFONT ( 11 , 14 ) ;
- Size = MAP_APPFONT ( 102 , 8 ) ;
- Text [ en-US ] = "~Levels" ;
- Left = TRUE ;
- };
- ListBox LB_LEVEL
- {
- HelpID = "sw:ListBox:TP_TOX_STYLES:LB_LEVEL";
- Border = TRUE ;
- Pos = MAP_APPFONT ( 12 , 25 ) ;
- Size = MAP_APPFONT ( 102 , 131 ) ;
- TabStop = TRUE ;
- AutoHScroll = TRUE ;
- };
- FixedText FT_TEMPLATE
- {
- Pos = MAP_APPFONT ( 142 , 14 ) ;
- Size = MAP_APPFONT ( 102 , 8 ) ;
- Text [ en-US ] = "Paragraph ~Styles" ;
- Left = TRUE ;
- };
- ListBox LB_PARALAY
- {
- HelpID = "sw:ListBox:TP_TOX_STYLES:LB_PARALAY";
- Border = TRUE ;
- Pos = MAP_APPFONT ( 142 , 25 ) ;
- Size = MAP_APPFONT ( 101 , 131 ) ;
- TabStop = TRUE ;
- Sort = TRUE ;
- AutoHScroll = TRUE ;
- };
- PushButton BT_STD
- {
- HelpID = "sw:PushButton:TP_TOX_STYLES:BT_STD";
- Pos = MAP_APPFONT ( 64 , 162 ) ;
- Size = MAP_APPFONT ( 50 , 14 ) ;
- TabStop = TRUE ;
- Text [ en-US ] = "~Default" ;
- };
- ImageButton BT_ASSIGN
- {
- HelpID = "sw:ImageButton:TP_TOX_STYLES:BT_ASSIGN";
- Pos = MAP_APPFONT ( 118 , 28 ) ;
- Size = MAP_APPFONT ( 20 , 12 ) ;
- TabStop = TRUE ;
- ButtonImage = Image
- {
- ImageBitmap = Bitmap
- {
- File = "one_left.bmp" ;
- };
- MaskColor = IMAGE_MASK_COLOR ;
- };
- };
- PushButton BT_EDIT_STYLE
- {
- HelpID = "sw:PushButton:TP_TOX_STYLES:BT_EDIT_STYLE";
- Pos = MAP_APPFONT ( 193 , 162 ) ;
- Size = MAP_APPFONT ( 50 , 14 ) ;
- TabStop = TRUE ;
- Text [ en-US ] = "~Edit";
- };
- FixedLine FL_FORMAT
- {
- Pos = MAP_APPFONT ( 6 , 3 ) ;
- Size = MAP_APPFONT ( 248 , 8 ) ;
- Text [ en-US ] = "Assignment";
- };
-};
ModalDialog DLG_ADD_IDX_STYLES
{
HelpId = HID_DLG_ADD_IDX_STYLES;
diff --git a/sw/uiconfig/swriter/ui/tocstylespage.ui b/sw/uiconfig/swriter/ui/tocstylespage.ui
new file mode 100644
index 0000000..f957634
--- /dev/null
+++ b/sw/uiconfig/swriter/ui/tocstylespage.ui
@@ -0,0 +1,210 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<interface>
+ <!-- interface-requires gtk+ 3.0 -->
+ <object class="GtkBox" id="TocStylesPage">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="border_width">6</property>
+ <property name="orientation">vertical</property>
+ <property name="spacing">12</property>
+ <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="alignment3">
+ <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="row_spacing">6</property>
+ <property name="column_spacing">18</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">_Levels</property>
+ <property name="use_underline">True</property>
+ <property name="mnemonic_widget">levels:border</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="label2">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="xalign">0</property>
+ <property name="label" translatable="yes">Paragraph _Styles</property>
+ <property name="use_underline">True</property>
+ <property name="mnemonic_widget">styles:border</property>
+ </object>
+ <packing>
+ <property name="left_attach">2</property>
+ <property name="top_attach">0</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkScrolledWindow" id="scrolledwindow1">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="hexpand">True</property>
+ <property name="vexpand">True</property>
+ <property name="shadow_type">in</property>
+ <child>
+ <object class="GtkTreeView" id="levels:border">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="hexpand">True</property>
+ <property name="vexpand">True</property>
+ </object>
+ </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>
+ <child>
+ <object class="GtkScrolledWindow" id="scrolledwindow2">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="hexpand">True</property>
+ <property name="vexpand">True</property>
+ <property name="shadow_type">in</property>
+ <child>
+ <object class="GtkTreeView" id="styles:border">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="hexpand">True</property>
+ <property name="vexpand">True</property>
+ <child internal-child="selection">
+ <object class="GtkTreeSelection" id="treeview-selection2"/>
+ </child>
+ </object>
+ </child>
+ </object>
+ <packing>
+ <property name="left_attach">2</property>
+ <property name="top_attach">1</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkButton" id="default">
+ <property name="label" translatable="yes">_Default</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">True</property>
+ <property name="halign">end</property>
+ <property name="valign">center</property>
+ <property name="use_underline">True</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="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="halign">end</property>
+ <property name="valign">center</property>
+ <property name="use_underline">True</property>
+ </object>
+ <packing>
+ <property name="left_attach">2</property>
+ <property name="top_attach">2</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkButton" id="assign">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">True</property>
+ <property name="halign">center</property>
+ <property name="valign">start</property>
+ <property name="image">image1</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>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ </object>
+ </child>
+ </object>
+ </child>
+ <child type="label">
+ <object class="GtkLabel" id="labelGrid">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label" translatable="yes">Assignment</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>
+ </object>
+ <object class="GtkImage" id="image1">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="pixbuf">sw/res/one_left.png</property>
+ </object>
+ <object class="GtkSizeGroup" id="sizegroup1">
+ <widgets>
+ <widget name="default"/>
+ <widget name="edit"/>
+ </widgets>
+ </object>
+ <object class="GtkSizeGroup" id="sizegroup2">
+ <widgets>
+ <widget name="levels:border"/>
+ <widget name="styles:border"/>
+ </widgets>
+ </object>
+</interface>
commit 7ffab58b590c3b63196bbb74135237d29c6eb9e0
Author: Caolán McNamara <caolanm at redhat.com>
Date: Thu Aug 8 11:56:47 2013 +0100
Updated core
Project: help aaad966643ede466a50bf8901028ead903a1e329
diff --git a/helpcontent2 b/helpcontent2
index 3a0ee05..aaad966 160000
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit 3a0ee05036d90ca6ec6ec414194a1119301455fc
+Subproject commit aaad966643ede466a50bf8901028ead903a1e329
More information about the Libreoffice-commits
mailing list