[Libreoffice-commits] core.git: 4 commits - extras/source sw/uiconfig vcl/source
Caolán McNamara
caolanm at redhat.com
Mon Mar 11 00:53:46 PDT 2013
extras/source/glade/libreoffice-catalog.xml | 3
sw/uiconfig/swriter/ui/converttexttable.ui | 23 +++---
sw/uiconfig/swriter/ui/indexentry.ui | 103 +++++++++++++---------------
sw/uiconfig/swriter/ui/insertfootnote.ui | 9 +-
sw/uiconfig/swriter/ui/tableproperties.ui | 4 -
vcl/source/control/combobox.cxx | 2
vcl/source/control/field2.cxx | 4 -
7 files changed, 77 insertions(+), 71 deletions(-)
New commits:
commit ab8f432b3382967f87967495b0b0e4c17f082da5
Author: Caolán McNamara <caolanm at redhat.com>
Date: Sat Mar 9 23:31:46 2013 +0000
use approximate_char_width instead of GetTextWidth('X')
Change-Id: I4c25b07c1c5d80b70b801fd61b711a00d5194c04
diff --git a/vcl/source/control/combobox.cxx b/vcl/source/control/combobox.cxx
index e561768..1c99ac2 100644
--- a/vcl/source/control/combobox.cxx
+++ b/vcl/source/control/combobox.cxx
@@ -1131,7 +1131,7 @@ Size ComboBox::CalcSize( sal_uInt16 nColumns, sal_uInt16 nLines ) const
// width
if ( nColumns )
- aSz.Width() = nColumns * GetTextWidth(rtl::OUString(static_cast<sal_Unicode>('X')));
+ aSz.Width() = nColumns * approximate_char_width();
else
aSz.Width() = aMinSz.Width();
commit 6f780d35330ac59cfd8fac5a48a3eeaa60e03a0a
Author: Caolán McNamara <caolanm at redhat.com>
Date: Sat Mar 9 23:14:58 2013 +0000
various efforts to consistently apply HIG rules
Change-Id: I780c83e28a6a2318ae5892e603aa8e5126deb926
diff --git a/sw/uiconfig/swriter/ui/converttexttable.ui b/sw/uiconfig/swriter/ui/converttexttable.ui
index 8426f7c..f4bca7d 100644
--- a/sw/uiconfig/swriter/ui/converttexttable.ui
+++ b/sw/uiconfig/swriter/ui/converttexttable.ui
@@ -10,13 +10,13 @@
</object>
<object class="GtkDialog" id="ConvertTextTableDialog">
<property name="can_focus">False</property>
- <property name="border_width">5</property>
+ <property name="border_width">6</property>
<property name="title" translatable="yes">Convert Table to Text</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>
+ <property name="spacing">12</property>
<child internal-child="action_area">
<object class="GtkButtonBox" id="dialog-action_area1">
<property name="can_focus">False</property>
@@ -78,6 +78,7 @@
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="orientation">vertical</property>
+ <property name="spacing">12</property>
<child>
<object class="GtkFrame" id="frame1">
<property name="visible">True</property>
@@ -90,6 +91,7 @@
<property name="can_focus">False</property>
<property name="halign">start</property>
<property name="valign">start</property>
+ <property name="top_padding">6</property>
<property name="left_padding">12</property>
<child>
<object class="GtkGrid" id="grid1">
@@ -97,9 +99,8 @@
<property name="can_focus">False</property>
<property name="halign">start</property>
<property name="valign">start</property>
- <property name="margin_bottom">10</property>
- <property name="row_spacing">18</property>
- <property name="column_spacing">10</property>
+ <property name="row_spacing">12</property>
+ <property name="column_spacing">12</property>
<child>
<object class="GtkEntry" id="othered">
<property name="visible">True</property>
@@ -249,13 +250,14 @@
<object class="GtkAlignment" id="alignment2">
<property name="visible">True</property>
<property name="can_focus">False</property>
+ <property name="top_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">5</property>
- <property name="column_spacing">5</property>
+ <property name="row_spacing">6</property>
+ <property name="column_spacing">12</property>
<child>
<object class="GtkCheckButton" id="headingcb">
<property name="label" translatable="yes">Heading</property>
@@ -278,7 +280,7 @@
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
- <property name="margin_left">25</property>
+ <property name="margin_left">12</property>
<property name="xalign">0</property>
<property name="active">True</property>
<property name="draw_indicator">True</property>
@@ -328,7 +330,8 @@
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="halign">start</property>
- <property name="margin_left">50</property>
+ <property name="margin_left">24</property>
+ <property name="column_spacing">12</property>
<child>
<object class="GtkLabel" id="label3">
<property name="visible">True</property>
@@ -401,7 +404,7 @@
</object>
</child>
<child type="label">
- <object class="GtkLabel" id="2">
+ <object class="GtkLabel" id="label2">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="label" translatable="yes">Options</property>
diff --git a/sw/uiconfig/swriter/ui/indexentry.ui b/sw/uiconfig/swriter/ui/indexentry.ui
index 69a91e2..37e4e0b 100644
--- a/sw/uiconfig/swriter/ui/indexentry.ui
+++ b/sw/uiconfig/swriter/ui/indexentry.ui
@@ -8,22 +8,6 @@
<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>
- <property name="halign">start</property>
- <property name="stock">gtk-index</property>
- </object>
- <object class="GtkImage" id="image2">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="stock">gtk-go-back</property>
- </object>
- <object class="GtkImage" id="image3">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="stock">gtk-go-forward</property>
- </object>
<object class="GtkImage" id="image4">
<property name="visible">True</property>
<property name="can_focus">False</property>
@@ -36,13 +20,13 @@
</object>
<object class="GtkDialog" id="IndexEntryDialog">
<property name="can_focus">False</property>
- <property name="border_width">5</property>
+ <property name="border_width">6</property>
<property name="title" translatable="yes">Insert Index Entry</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>
+ <property name="spacing">12</property>
<child internal-child="action_area">
<object class="GtkButtonBox" id="dialog-action_area1">
<property name="can_focus">False</property>
@@ -51,13 +35,11 @@
<child>
<object class="GtkButton" id="insert">
<property name="label" translatable="yes">Insert</property>
- <property name="use_action_appearance">False</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="no_show_all">True</property>
- <property name="use_action_appearance">False</property>
</object>
<packing>
<property name="expand">False</property>
@@ -68,13 +50,11 @@
<child>
<object class="GtkButton" id="ok">
<property name="label">gtk-ok</property>
- <property name="use_action_appearance">False</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="no_show_all">True</property>
- <property name="use_action_appearance">False</property>
<property name="use_stock">True</property>
</object>
<packing>
@@ -86,11 +66,9 @@
<child>
<object class="GtkButton" id="close">
<property name="label">gtk-close</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>
@@ -102,11 +80,9 @@
<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>
@@ -118,11 +94,9 @@
<child>
<object class="GtkButton" id="delete">
<property name="label">gtk-delete</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>
@@ -142,13 +116,11 @@
<property name="column_homogeneous">True</property>
<child>
<object class="GtkButton" id="previous">
- <property name="use_action_appearance">False</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
<property name="no_show_all">True</property>
<property name="halign">center</property>
<property name="valign">center</property>
- <property name="use_action_appearance">False</property>
<property name="image">image2</property>
</object>
<packing>
@@ -160,13 +132,11 @@
</child>
<child>
<object class="GtkButton" id="next">
- <property name="use_action_appearance">False</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
<property name="no_show_all">True</property>
<property name="halign">center</property>
<property name="valign">center</property>
- <property name="use_action_appearance">False</property>
<property name="image">image3</property>
</object>
<packing>
@@ -178,13 +148,11 @@
</child>
<child>
<object class="GtkButton" id="first">
- <property name="use_action_appearance">False</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
<property name="no_show_all">True</property>
<property name="halign">center</property>
<property name="valign">center</property>
- <property name="use_action_appearance">False</property>
<property name="image">image4</property>
</object>
<packing>
@@ -196,13 +164,11 @@
</child>
<child>
<object class="GtkButton" id="last">
- <property name="use_action_appearance">False</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
<property name="no_show_all">True</property>
<property name="halign">center</property>
<property name="valign">center</property>
- <property name="use_action_appearance">False</property>
<property name="image">image5</property>
</object>
<packing>
@@ -238,6 +204,7 @@
<object class="GtkAlignment" id="alignment1">
<property name="visible">True</property>
<property name="can_focus">False</property>
+ <property name="top_padding">6</property>
<property name="left_padding">12</property>
<child>
<object class="GtkGrid" id="grid1">
@@ -250,9 +217,11 @@
<object class="GtkLabel" id="typeft">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="margin_right">12</property>
+ <property name="margin_right">6</property>
<property name="xalign">0</property>
<property name="label" translatable="yes">Index</property>
+ <property name="use_underline">True</property>
+ <property name="mnemonic_widget">typecb</property>
</object>
<packing>
<property name="left_attach">0</property>
@@ -276,12 +245,10 @@
</child>
<child>
<object class="GtkButton" id="new">
- <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="tooltip_text" translatable="yes">New User-defined Index</property>
- <property name="use_action_appearance">False</property>
<property name="image">image1</property>
</object>
<packing>
@@ -295,9 +262,11 @@
<object class="GtkLabel" id="label3">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="margin_right">12</property>
+ <property name="margin_right">6</property>
<property name="xalign">0</property>
<property name="label" translatable="yes">Entry</property>
+ <property name="use_underline">True</property>
+ <property name="mnemonic_widget">entryed</property>
</object>
<packing>
<property name="left_attach">0</property>
@@ -324,9 +293,11 @@
<property name="visible">True</property>
<property name="sensitive">False</property>
<property name="can_focus">False</property>
- <property name="margin_right">12</property>
+ <property name="margin_right">6</property>
<property name="xalign">0</property>
<property name="label" translatable="yes">1st key</property>
+ <property name="use_underline">True</property>
+ <property name="mnemonic_widget">key1cb</property>
</object>
<packing>
<property name="left_attach">0</property>
@@ -340,9 +311,11 @@
<property name="visible">True</property>
<property name="sensitive">False</property>
<property name="can_focus">False</property>
- <property name="margin_right">12</property>
+ <property name="margin_right">6</property>
<property name="xalign">0</property>
<property name="label" translatable="yes">2nd key</property>
+ <property name="use_underline">True</property>
+ <property name="mnemonic_widget">key2cb</property>
</object>
<packing>
<property name="left_attach">0</property>
@@ -355,9 +328,11 @@
<object class="GtkLabel" id="levelft">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="margin_right">12</property>
+ <property name="margin_right">6</property>
<property name="xalign">0</property>
<property name="label" translatable="yes">Level</property>
+ <property name="use_underline">True</property>
+ <property name="mnemonic_widget">levelnf</property>
</object>
<packing>
<property name="left_attach">0</property>
@@ -384,11 +359,9 @@
<child>
<object class="GtkCheckButton" id="mainentrycb">
<property name="label" translatable="yes">Main entry</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="use_action_appearance">False</property>
<property name="xalign">0</property>
<property name="draw_indicator">True</property>
</object>
@@ -402,11 +375,9 @@
<child>
<object class="GtkCheckButton" id="applytoallcb">
<property name="label" translatable="yes">Apply to all similar texts</property>
- <property name="use_action_appearance">False</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
<property name="no_show_all">True</property>
- <property name="use_action_appearance">False</property>
<property name="xalign">0</property>
<property name="draw_indicator">True</property>
</object>
@@ -420,12 +391,10 @@
<child>
<object class="GtkCheckButton" id="searchcasesensitivecb">
<property name="label" translatable="yes">Match case</property>
- <property name="use_action_appearance">False</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
<property name="no_show_all">True</property>
<property name="margin_left">12</property>
- <property name="use_action_appearance">False</property>
<property name="xalign">0</property>
<property name="draw_indicator">True</property>
</object>
@@ -439,12 +408,10 @@
<child>
<object class="GtkCheckButton" id="searchcasewordonlycb">
<property name="label" translatable="yes">Whole words only</property>
- <property name="use_action_appearance">False</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
<property name="no_show_all">True</property>
<property name="margin_left">12</property>
- <property name="use_action_appearance">False</property>
<property name="xalign">0</property>
<property name="draw_indicator">True</property>
</object>
@@ -459,8 +426,12 @@
<object class="GtkLabel" id="phonetic0ft">
<property name="can_focus">False</property>
<property name="no_show_all">True</property>
- <property name="margin_right">12</property>
+ <property name="margin_left">12</property>
+ <property name="margin_right">6</property>
+ <property name="xalign">0</property>
<property name="label" translatable="yes">Phonetic reading</property>
+ <property name="use_underline">True</property>
+ <property name="mnemonic_widget">phonetic0ed</property>
</object>
<packing>
<property name="left_attach">3</property>
@@ -473,8 +444,12 @@
<object class="GtkLabel" id="phonetic1ft">
<property name="can_focus">False</property>
<property name="no_show_all">True</property>
- <property name="margin_right">12</property>
+ <property name="margin_left">12</property>
+ <property name="margin_right">6</property>
+ <property name="xalign">0</property>
<property name="label" translatable="yes">Phonetic reading</property>
+ <property name="use_underline">True</property>
+ <property name="mnemonic_widget">phonetic1ed</property>
</object>
<packing>
<property name="left_attach">3</property>
@@ -487,8 +462,12 @@
<object class="GtkLabel" id="phonetic2ft">
<property name="can_focus">False</property>
<property name="no_show_all">True</property>
- <property name="margin_right">12</property>
+ <property name="margin_left">12</property>
+ <property name="margin_right">6</property>
+ <property name="xalign">0</property>
<property name="label" translatable="yes">Phonetic reading</property>
+ <property name="use_underline">True</property>
+ <property name="mnemonic_widget">phonetic2ed</property>
</object>
<packing>
<property name="left_attach">3</property>
@@ -648,4 +627,20 @@
<action-widget response="0">delete</action-widget>
</action-widgets>
</object>
+ <object class="GtkImage" id="image1">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="halign">start</property>
+ <property name="stock">gtk-index</property>
+ </object>
+ <object class="GtkImage" id="image2">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="stock">gtk-go-back</property>
+ </object>
+ <object class="GtkImage" id="image3">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="stock">gtk-go-forward</property>
+ </object>
</interface>
diff --git a/sw/uiconfig/swriter/ui/insertfootnote.ui b/sw/uiconfig/swriter/ui/insertfootnote.ui
index 64a787f..e23e9af 100644
--- a/sw/uiconfig/swriter/ui/insertfootnote.ui
+++ b/sw/uiconfig/swriter/ui/insertfootnote.ui
@@ -3,13 +3,13 @@
<!-- interface-requires gtk+ 3.0 -->
<object class="GtkDialog" id="InsertFootnoteDialog">
<property name="can_focus">False</property>
- <property name="border_width">5</property>
+ <property name="border_width">6</property>
<property name="title" translatable="yes">Insert Footnote/Endnote</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>
+ <property name="spacing">12</property>
<child internal-child="action_area">
<object class="GtkButtonBox" id="dialog-action_area1">
<property name="can_focus">False</property>
@@ -112,6 +112,7 @@
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="orientation">vertical</property>
+ <property name="spacing">12</property>
<child>
<object class="GtkFrame" id="numberingframe">
<property name="visible">True</property>
@@ -122,12 +123,14 @@
<object class="GtkAlignment" id="alignment1">
<property name="visible">True</property>
<property name="can_focus">False</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="halign">start</property>
+ <property name="row_spacing">6</property>
<property name="column_spacing">12</property>
<child>
<object class="GtkRadioButton" id="automatic">
@@ -244,12 +247,14 @@
<object class="GtkAlignment" id="alignment2">
<property name="visible">True</property>
<property name="can_focus">False</property>
+ <property name="top_padding">6</property>
<property name="left_padding">12</property>
<child>
<object class="GtkBox" id="box2">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="orientation">vertical</property>
+ <property name="spacing">6</property>
<child>
<object class="GtkRadioButton" id="footnote">
<property name="label" translatable="yes">Footnote</property>
diff --git a/sw/uiconfig/swriter/ui/tableproperties.ui b/sw/uiconfig/swriter/ui/tableproperties.ui
index 236bfcc..7349208 100644
--- a/sw/uiconfig/swriter/ui/tableproperties.ui
+++ b/sw/uiconfig/swriter/ui/tableproperties.ui
@@ -3,14 +3,14 @@
<!-- interface-requires gtk+ 3.0 -->
<object class="GtkDialog" id="TablePropertiesDialog">
<property name="can_focus">False</property>
- <property name="border_width">5</property>
+ <property name="border_width">6</property>
<property name="title" translatable="yes">Table Format</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="orientation">vertical</property>
- <property name="spacing">2</property>
+ <property name="spacing">12</property>
<child internal-child="action_area">
<object class="GtkButtonBox" id="dialog-action_area1">
<property name="can_focus">False</property>
commit a5e44461f335458b05d92ef7c8a4adec0632bb55
Author: Caolán McNamara <caolanm at redhat.com>
Date: Sat Mar 9 22:59:44 2013 +0000
add glade placeholder for swuilo-BookmarkCombo
Change-Id: I0a43f444ff131acfcf923fe4f62fef3a3e6a2c98
diff --git a/extras/source/glade/libreoffice-catalog.xml b/extras/source/glade/libreoffice-catalog.xml
index ab011a7..435449c 100644
--- a/extras/source/glade/libreoffice-catalog.xml
+++ b/extras/source/glade/libreoffice-catalog.xml
@@ -84,6 +84,9 @@
<glade-widget-class title="Text Direction ListBox" name="svxlo-FrameDirectionListBox"
generic-name="FrameDirectionListBox" parent="GtkComboBox"
icon-name="widget-gtk-combobox"/>
+ <glade-widget-class title="Bookmark Combo" name="swuilo-BookmarkCombo"
+ generic-name="BookmarkComboBox" parent="GtkTreeView"
+ icon-name="widget-gtk-combobox"/>
<glade-widget-class title="Category Edit" name="swuilo-FEdit"
generic-name="CategoryEdit" parent="GtkEntry"
icon-name="widget-gtk-textentry"/>
commit 876f257249c5f61344d48cb9b0f82e41bca56143
Author: Caolán McNamara <caolanm at redhat.com>
Date: Sat Mar 9 22:54:40 2013 +0000
XubString->OUString
Change-Id: I5821a57bcdaa5984a1f5c824db21759d15faec60
diff --git a/vcl/source/control/field2.cxx b/vcl/source/control/field2.cxx
index c86ef11..49ad88e 100644
--- a/vcl/source/control/field2.cxx
+++ b/vcl/source/control/field2.cxx
@@ -335,7 +335,7 @@ static OUString ImplPatternReformat( const OUString& rStr,
// -----------------------------------------------------------------------
-static void ImplPatternMaxPos( const OUString rStr, const OString& rEditMask,
+static void ImplPatternMaxPos( const OUString& rStr, const OString& rEditMask,
sal_uInt16 nFormatFlags, sal_Bool bSameMask,
sal_uInt16 nCursorPos, sal_Int32& rPos )
{
@@ -448,7 +448,7 @@ static xub_StrLen ImplPatternLeftPos(const rtl::OString& rEditMask, xub_StrLen n
// -----------------------------------------------------------------------
-static xub_StrLen ImplPatternRightPos( const XubString& rStr, const rtl::OString& rEditMask,
+static xub_StrLen ImplPatternRightPos( const OUString& rStr, const rtl::OString& rEditMask,
sal_uInt16 nFormatFlags, sal_Bool bSameMask,
sal_Int32 nCursorPos )
{
More information about the Libreoffice-commits
mailing list