sw/inc/helpid.h | 1 -
sw/source/ui/config/optpage.cxx | 5 +++++
sw/uiconfig/swriter/ui/optfonttabpage.ui | 21 +++++++++++++++------
3 files changed, 20 insertions(+), 7 deletions(-)
New commits:
commit 06292e619370f9e54e859f051a743b6bacb2a2cd
Author: Caolán McNamara <caol...@redhat.com>
Date: Tue Jul 9 10:04:28 2013 +0100
set font boxes to be sorted
Change-Id: Iebd6ce2c210ccc56a72d6a59171015b9729e9b73
diff --git a/sw/inc/helpid.h b/sw/inc/helpid.h
index b503b96..ad7704f 100644
--- a/sw/inc/helpid.h
+++ b/sw/inc/helpid.h
@@ -152,7 +152,6 @@
#define HID_ENV_ENV
"SW_HID_ENV_ENV"
#define HID_ENV_FMT
"SW_HID_ENV_FMT"
#define HID_FRM_URL
"SW_HID_FRM_URL"
-#define HID_STD_FONT
"SW_HID_STD_FONT"
#define HID_COND_COLL
"SW_HID_COND_COLL"
#define HID_FRM_ADD
"SW_HID_FRM_ADD"
diff --git a/sw/source/ui/config/optpage.cxx b/sw/source/ui/config/optpage.cxx
index 7ae6cf3..c1782d4 100644
--- a/sw/source/ui/config/optpage.cxx
+++ b/sw/source/ui/config/optpage.cxx
@@ -536,14 +536,19 @@ SwStdFontTabPage::SwStdFontTabPage( Window* pParent,
{
get(pLabelFT,"label1");
get(pStandardBox,"standardbox");
+ pStandardBox->SetStyle(pStandardBox->GetStyle() | WB_SORT);
get(pStandardHeightLB,"standardheight");
get(pTitleBox,"titlebox");
+ pTitleBox->SetStyle(pTitleBox->GetStyle() | WB_SORT);
get(pTitleHeightLB,"titleheight");
get(pListBox,"listbox");
+ pListBox->SetStyle(pListBox->GetStyle() | WB_SORT);
get(pListHeightLB,"listheight");
get(pLabelBox,"labelbox");
+ pLabelBox->SetStyle(pLabelBox->GetStyle() | WB_SORT);
get(pLabelHeightLB,"labelheight");
get(pIdxBox,"idxbox");
+ pIdxBox->SetStyle(pIdxBox->GetStyle() | WB_SORT);
get(pIndexHeightLB,"indexheight");
get(pDocOnlyCB,"doconly");
diff --git a/sw/uiconfig/swriter/ui/optfonttabpage.ui
b/sw/uiconfig/swriter/ui/optfonttabpage.ui
index 6155efc..bd9e4cb 100644
--- a/sw/uiconfig/swriter/ui/optfonttabpage.ui
+++ b/sw/uiconfig/swriter/ui/optfonttabpage.ui
@@ -1,9 +1,13 @@
<?xml version="1.0" encoding="UTF-8"?>
<interface>
<!-- interface-requires gtk+ 3.0 -->
+ <!-- interface-requires LibreOffice 1.0 -->
<object class="GtkBox" id="OptFontTabPage">
<property name="visible">True</property>
<property name="can_focus">False</property>
+ <property name="hexpand">True</property>
+ <property name="vexpand">True</property>
+ <property name="border_width">6</property>
<property name="orientation">vertical</property>
<property name="spacing">12</property>
<child>
@@ -93,6 +97,7 @@
<object class="GtkLabel" id="font_label">
<property name="visible">True</property>
<property name="can_focus">False</property>
+ <property name="hexpand">True</property>
<property name="xalign">0</property>
<property name="label" translatable="yes">Font</property>
</object>
@@ -206,7 +211,6 @@
<property name="can_focus">True</property>
<property name="receives_default">False</property>
<property name="margin_left">12</property>
- <property name="hexpand">True</property>
<property name="use_underline">True</property>
<property name="xalign">0</property>
<property name="draw_indicator">True</property>
@@ -222,13 +226,14 @@
<object class="GtkComboBoxText" id="standardbox">
<property name="visible">True</property>
<property name="can_focus">False</property>
+ <property name="hexpand">True</property>
<property name="has_entry">True</property>
<property name="entry_text_column">0</property>
<property name="id_column">1</property>
<child internal-child="entry">
<object class="GtkEntry" id="standardbox-entry">
<property name="can_focus">False</property>
- <property name="invisible_char">���</property>
+ <property name="invisible_char">�</property>
</object>
</child>
</object>
@@ -243,13 +248,14 @@
<object class="GtkComboBoxText" id="titlebox">
<property name="visible">True</property>
<property name="can_focus">False</property>
+ <property name="hexpand">True</property>
<property name="has_entry">True</property>
<property name="entry_text_column">0</property>
<property name="id_column">1</property>
<child internal-child="entry">
<object class="GtkEntry" id="titlebox-entry">
<property name="can_focus">False</property>
- <property name="invisible_char">���</property>
+ <property name="invisible_char">�</property>
</object>
</child>
</object>
@@ -264,13 +270,14 @@
<object class="GtkComboBoxText" id="listbox">
<property name="visible">True</property>
<property name="can_focus">False</property>
+ <property name="hexpand">True</property>
<property name="has_entry">True</property>
<property name="entry_text_column">0</property>
<property name="id_column">1</property>
<child internal-child="entry">
<object class="GtkEntry" id="listbox-entry">
<property name="can_focus">False</property>
- <property name="invisible_char">���</property>
+ <property name="invisible_char">�</property>
</object>
</child>
</object>
@@ -285,13 +292,14 @@
<object class="GtkComboBoxText" id="labelbox">
<property name="visible">True</property>
<property name="can_focus">False</property>
+ <property name="hexpand">True</property>
<property name="has_entry">True</property>
<property name="entry_text_column">0</property>
<property name="id_column">1</property>
<child internal-child="entry">
<object class="GtkEntry" id="labelbox-entry">
<property name="can_focus">False</property>
- <property name="invisible_char">���</property>
+ <property name="invisible_char">�</property>
</object>
</child>
</object>
@@ -306,13 +314,14 @@
<object class="GtkComboBoxText" id="idxbox">
<property name="visible">True</property>
<property name="can_focus">False</property>
+ <property name="hexpand">True</property>
<property name="has_entry">True</property>
<property name="entry_text_column">0</property>
<property name="id_column">1</property>
<child internal-child="entry">
<object class="GtkEntry" id="idxbox-entry">
<property name="can_focus">False</property>
- <property name="invisible_char">���</property>
+ <property name="invisible_char">�</property>
</object>
</child>
</object>
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
