summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2013-03-08 16:25:49 +0000
committerCaolán McNamara <caolanm@redhat.com>2013-03-08 16:29:44 +0000
commitcec5fc7c57de1f6e5e25378d644e5dd6e139fbeb (patch)
tree5ff78e79ce6f90133c86bce6dd8cd90623e1c658
parent3ff753615d7925ee2b9ef933dafef9cc884528a9 (diff)
give the numbering format listbox a fixed width
Change-Id: I038cb5650adf9173c971e358aa6b20c782fb0ae7
-rw-r--r--cui/source/tabpages/numfmt.cxx3
-rw-r--r--cui/uiconfig/ui/numberingformatpage.ui15
2 files changed, 13 insertions, 5 deletions
diff --git a/cui/source/tabpages/numfmt.cxx b/cui/source/tabpages/numfmt.cxx
index a2f375a97244..67dce8106e7e 100644
--- a/cui/source/tabpages/numfmt.cxx
+++ b/cui/source/tabpages/numfmt.cxx
@@ -235,6 +235,9 @@ SvxNumberFormatTabPage::SvxNumberFormatTabPage(Window* pParent,
get(m_pFtFormat, "formatft");
get(m_pLbCurrency, "currencylb");
get(m_pLbFormat, "formatlb");
+ long nWidth = approximate_char_width() * 26;
+ m_pLbFormat->set_width_request(nWidth);
+ m_pLbCurrency->set_width_request(nWidth);
get(m_pFtLanguage, "languageft");
get(m_pLbLanguage, "languagelb");
get(m_pCbSourceFormat, "sourceformat");
diff --git a/cui/uiconfig/ui/numberingformatpage.ui b/cui/uiconfig/ui/numberingformatpage.ui
index 078f18d27345..4633547865ed 100644
--- a/cui/uiconfig/ui/numberingformatpage.ui
+++ b/cui/uiconfig/ui/numberingformatpage.ui
@@ -1,11 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<interface>
<!-- interface-requires gtk+ 3.0 -->
- <object class="GtkAdjustment" id="adjustment1">
- <property name="upper">20</property>
- <property name="step_increment">1</property>
- <property name="page_increment">10</property>
- </object>
+ <!-- interface-requires LibreOffice 1.0 -->
<object class="GtkGrid" id="NumberingFormatPage">
<property name="visible">True</property>
<property name="can_focus">False</property>
@@ -310,6 +306,7 @@
<object class="GtkScrolledWindow" id="scrolledwindow1">
<property name="visible">True</property>
<property name="can_focus">True</property>
+ <property name="vscrollbar_policy">always</property>
<property name="shadow_type">in</property>
<child>
<object class="GtkTreeView" id="categorylb">
@@ -359,12 +356,14 @@
<object class="GtkAlignment" id="alignment4">
<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>
<child>
<object class="GtkGrid" id="grid2">
<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>
<child>
@@ -386,6 +385,7 @@
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="valign">start</property>
+ <property name="hexpand">True</property>
<property name="model">liststore2</property>
</object>
<packing>
@@ -517,6 +517,11 @@
</packing>
</child>
</object>
+ <object class="GtkAdjustment" id="adjustment1">
+ <property name="upper">20</property>
+ <property name="step_increment">1</property>
+ <property name="page_increment">10</property>
+ </object>
<object class="GtkImage" id="image1">
<property name="visible">True</property>
<property name="can_focus">False</property>