[Libreoffice-commits] core.git: 4 commits - cui/source cui/uiconfig svtools/source
Caolán McNamara
caolanm at redhat.com
Fri Mar 8 08:30:04 PST 2013
cui/source/tabpages/numfmt.cxx | 3 +++
cui/uiconfig/ui/numberingformatpage.ui | 15 ++++++++++-----
svtools/source/contnr/treelistbox.cxx | 3 ++-
svtools/source/misc/langtab.src | 4 ++--
4 files changed, 17 insertions(+), 8 deletions(-)
New commits:
commit 278e30ccd45dab36d65c08fbaaf28aa69a23cf28
Author: Caolán McNamara <caolanm at redhat.com>
Date: Fri Mar 8 16:26:57 2013 +0000
don't broadcast pref size changed if we've a size req set
Change-Id: I29cfc42c000457c5016ae7fda19347c6f60742f9
diff --git a/svtools/source/contnr/treelistbox.cxx b/svtools/source/contnr/treelistbox.cxx
index feb68e2..c390518 100644
--- a/svtools/source/contnr/treelistbox.cxx
+++ b/svtools/source/contnr/treelistbox.cxx
@@ -3679,7 +3679,8 @@ void SvTreeListBox::ModelNotification( sal_uInt16 nActionId, SvTreeListEntry* pE
nContextBmpWidthMax = nMaxWidth;
SetTabs();
}
- queue_resize();
+ if (get_width_request() == -1)
+ queue_resize();
}
break;
commit cec5fc7c57de1f6e5e25378d644e5dd6e139fbeb
Author: Caolán McNamara <caolanm at redhat.com>
Date: Fri Mar 8 16:25:49 2013 +0000
give the numbering format listbox a fixed width
Change-Id: I038cb5650adf9173c971e358aa6b20c782fb0ae7
diff --git a/cui/source/tabpages/numfmt.cxx b/cui/source/tabpages/numfmt.cxx
index a2f375a..67dce81 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 078f18d..4633547 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>
commit 3ff753615d7925ee2b9ef933dafef9cc884528a9
Author: Caolán McNamara <caolanm at redhat.com>
Date: Fri Mar 8 15:36:35 2013 +0000
It's either Ireland(en) or Éire(ga) not Eire
Change-Id: Ieecb3ca40c8eeb616e04ef69eae8a2f86d39c0bf
diff --git a/svtools/source/misc/langtab.src b/svtools/source/misc/langtab.src
index 202119f..2140562 100644
--- a/svtools/source/misc/langtab.src
+++ b/svtools/source/misc/langtab.src
@@ -86,7 +86,7 @@ StringArray STR_ARR_SVT_LANGUAGE_TABLE
< "English (Australia)" ; LANGUAGE_ENGLISH_AUS ; > ;
< "English (Canada)" ; LANGUAGE_ENGLISH_CAN ; > ;
< "English (New Zealand)" ; LANGUAGE_ENGLISH_NZ ; > ;
- < "English (Eire)" ; LANGUAGE_ENGLISH_EIRE ; > ;
+ < "English (Ireland)" ; LANGUAGE_ENGLISH_EIRE ; > ;
< "English (South Africa)" ; LANGUAGE_ENGLISH_SAFRICA ; > ;
< "English (Jamaica)" ; LANGUAGE_ENGLISH_JAMAICA ; > ;
< "English (Caribbean)" ; LANGUAGE_ENGLISH_CARRIBEAN ; > ;
commit 494262a9b00254b85c56e896dff58b235672a2ed
Author: Caolán McNamara <caolanm at redhat.com>
Date: Fri Mar 8 15:33:51 2013 +0000
we hardly need to distinguish New Zealand Maori from some other kind of Maori
Change-Id: I86c58fed2c83513eb7b82263806303ad77bed811
diff --git a/svtools/source/misc/langtab.src b/svtools/source/misc/langtab.src
index 23cb311..202119f 100644
--- a/svtools/source/misc/langtab.src
+++ b/svtools/source/misc/langtab.src
@@ -205,7 +205,7 @@ StringArray STR_ARR_SVT_LANGUAGE_TABLE
< "Latin" ; LANGUAGE_LATIN ; > ;
< "Esperanto" ; LANGUAGE_USER_ESPERANTO ; > ;
< "Kinyarwanda (Rwanda)" ; LANGUAGE_USER_KINYARWANDA ; > ;
- < "Maori (New Zealand)" ; LANGUAGE_MAORI_NEW_ZEALAND ; > ;
+ < "Maori" ; LANGUAGE_MAORI_NEW_ZEALAND ; > ;
< "Galician" ; LANGUAGE_GALICIAN ; > ;
< "Dhivehi" ; LANGUAGE_DHIVEHI ; > ;
< "Northern Sotho" ; LANGUAGE_SEPEDI ; > ;
More information about the Libreoffice-commits
mailing list