[Libreoffice-commits] .: 2 commits - cui/uiconfig helpcontent2
Libreoffice Gerrit user
logerrit at kemper.freedesktop.org
Fri Jan 25 06:32:10 PST 2013
cui/uiconfig/ui/numberingoptionspage.ui | 233 +++++++++++++++++---------------
helpcontent2 | 2
2 files changed, 130 insertions(+), 105 deletions(-)
New commits:
commit 09b72749f45f519da5cf26275db6745a491c4265
Author: Caolán McNamara <caolanm at redhat.com>
Date: Fri Jan 25 14:22:13 2013 +0000
add mnemonic widgets in numbering options page
Change-Id: I84c1fa8f24504a06563145e224d01abaa5714cf9
diff --git a/cui/uiconfig/ui/numberingoptionspage.ui b/cui/uiconfig/ui/numberingoptionspage.ui
index aecf877..3353bf8 100644
--- a/cui/uiconfig/ui/numberingoptionspage.ui
+++ b/cui/uiconfig/ui/numberingoptionspage.ui
@@ -26,6 +26,26 @@
<property name="step_increment">1</property>
<property name="page_increment">10</property>
</object>
+ <object class="GtkMenu" id="bitmapmenu">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <child>
+ <object class="GtkMenuItem" id="fromfile">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label" translatable="yes">From file...</property>
+ <property name="use_underline">True</property>
+ </object>
+ </child>
+ <child>
+ <object class="GtkMenuItem" id="gallery">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label" translatable="yes">Gallery</property>
+ <property name="use_underline">True</property>
+ </object>
+ </child>
+ </object>
<object class="GtkBox" id="NumberingOptionsPage">
<property name="visible">True</property>
<property name="can_focus">False</property>
@@ -105,6 +125,8 @@
<property name="can_focus">False</property>
<property name="xalign">0</property>
<property name="label" translatable="yes">Number</property>
+ <property name="use_underline">True</property>
+ <property name="mnemonic_widget">numfmtlb</property>
</object>
<packing>
<property name="left_attach">0</property>
@@ -119,6 +141,8 @@
<property name="can_focus">False</property>
<property name="xalign">0</property>
<property name="label" translatable="yes">Character Style</property>
+ <property name="use_underline">True</property>
+ <property name="mnemonic_widget">charstyle</property>
</object>
<packing>
<property name="left_attach">0</property>
@@ -133,6 +157,8 @@
<property name="can_focus">False</property>
<property name="xalign">0</property>
<property name="label" translatable="yes">Show sublevels</property>
+ <property name="use_underline">True</property>
+ <property name="mnemonic_widget">sublevels</property>
</object>
<packing>
<property name="left_attach">0</property>
@@ -142,20 +168,6 @@
</packing>
</child>
<child>
- <object class="GtkLabel" id="separator">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="xalign">0</property>
- <property name="label" translatable="yes">Separator</property>
- </object>
- <packing>
- <property name="left_attach">0</property>
- <property name="top_attach">7</property>
- <property name="width">2</property>
- <property name="height">1</property>
- </packing>
- </child>
- <child>
<object class="GtkComboBox" id="charstyle">
<property name="visible">True</property>
<property name="can_focus">False</property>
@@ -184,34 +196,6 @@
</packing>
</child>
<child>
- <object class="GtkEntry" id="prefix">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="invisible_char">â—</property>
- <property name="invisible_char_set">True</property>
- </object>
- <packing>
- <property name="left_attach">1</property>
- <property name="top_attach">8</property>
- <property name="width">1</property>
- <property name="height">1</property>
- </packing>
- </child>
- <child>
- <object class="GtkEntry" id="suffix">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="invisible_char">â—</property>
- <property name="invisible_char_set">True</property>
- </object>
- <packing>
- <property name="left_attach">1</property>
- <property name="top_attach">9</property>
- <property name="width">1</property>
- <property name="height">1</property>
- </packing>
- </child>
- <child>
<object class="GtkSpinButton" id="startat">
<property name="visible">True</property>
<property name="can_focus">True</property>
@@ -227,53 +211,13 @@
</packing>
</child>
<child>
- <object class="GtkAlignment" id="alignment3">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="left_padding">20</property>
- <child>
- <object class="GtkLabel" id="prefixft">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="xalign">0</property>
- <property name="label" translatable="yes">Before</property>
- </object>
- </child>
- </object>
- <packing>
- <property name="left_attach">0</property>
- <property name="top_attach">8</property>
- <property name="width">1</property>
- <property name="height">1</property>
- </packing>
- </child>
- <child>
- <object class="GtkAlignment" id="alignment4">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="left_padding">20</property>
- <child>
- <object class="GtkLabel" id="suffixft">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="xalign">0</property>
- <property name="label" translatable="yes">After</property>
- </object>
- </child>
- </object>
- <packing>
- <property name="left_attach">0</property>
- <property name="top_attach">9</property>
- <property name="width">1</property>
- <property name="height">1</property>
- </packing>
- </child>
- <child>
<object class="GtkLabel" id="startatft">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="xalign">0</property>
<property name="label" translatable="yes">Start at</property>
+ <property name="use_underline">True</property>
+ <property name="mnemonic_widget">startat</property>
</object>
<packing>
<property name="left_attach">0</property>
@@ -301,6 +245,8 @@
<property name="can_focus">False</property>
<property name="xalign">0</property>
<property name="label" translatable="yes">Graphics</property>
+ <property name="use_underline">True</property>
+ <property name="mnemonic_widget">bitmap:bitmapmenu</property>
</object>
<packing>
<property name="left_attach">0</property>
@@ -315,6 +261,8 @@
<property name="can_focus">False</property>
<property name="xalign">0</property>
<property name="label" translatable="yes">Width</property>
+ <property name="use_underline">True</property>
+ <property name="mnemonic_widget">widthmf:0.00cm</property>
</object>
<packing>
<property name="left_attach">0</property>
@@ -345,6 +293,8 @@
<property name="can_focus">False</property>
<property name="xalign">0</property>
<property name="label" translatable="yes">Height</property>
+ <property name="use_underline">True</property>
+ <property name="mnemonic_widget">heightmf:0.00cm</property>
</object>
<packing>
<property name="left_attach">0</property>
@@ -391,6 +341,8 @@
<property name="can_focus">False</property>
<property name="xalign">0</property>
<property name="label" translatable="yes">Alignment </property>
+ <property name="use_underline">True</property>
+ <property name="mnemonic_widget">orientlb</property>
</object>
<packing>
<property name="left_attach">0</property>
@@ -444,6 +396,8 @@
<property name="can_focus">False</property>
<property name="xalign">0</property>
<property name="label" translatable="yes">Color</property>
+ <property name="use_underline">True</property>
+ <property name="mnemonic_widget">color</property>
</object>
<packing>
<property name="left_attach">0</property>
@@ -471,6 +425,7 @@
<property name="xalign">0</property>
<property name="label" translatable="yes">_Relative size</property>
<property name="use_underline">True</property>
+ <property name="mnemonic_widget">relsize:0%</property>
</object>
<packing>
<property name="left_attach">0</property>
@@ -500,6 +455,7 @@
<property name="xalign">0</property>
<property name="label" translatable="yes">_Alignment</property>
<property name="use_underline">True</property>
+ <property name="mnemonic_widget">numalign</property>
</object>
<packing>
<property name="left_attach">0</property>
@@ -534,6 +490,7 @@
<property name="xalign">0</property>
<property name="label" translatable="yes">Character</property>
<property name="use_underline">True</property>
+ <property name="mnemonic_widget">bullet</property>
</object>
<packing>
<property name="left_attach">0</property>
@@ -557,6 +514,94 @@
<property name="height">1</property>
</packing>
</child>
+ <child>
+ <object class="GtkAlignment" id="alignment4">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="left_padding">20</property>
+ <child>
+ <object class="GtkLabel" id="suffixft">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="xalign">0</property>
+ <property name="label" translatable="yes">After</property>
+ <property name="use_underline">True</property>
+ <property name="mnemonic_widget">suffix</property>
+ </object>
+ </child>
+ </object>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="top_attach">9</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkAlignment" id="alignment3">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="left_padding">20</property>
+ <child>
+ <object class="GtkLabel" id="prefixft">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="xalign">0</property>
+ <property name="label" translatable="yes">Before</property>
+ <property name="use_underline">True</property>
+ <property name="mnemonic_widget">prefix</property>
+ </object>
+ </child>
+ </object>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="top_attach">8</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="separator">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="xalign">0</property>
+ <property name="label" translatable="yes">Separator</property>
+ </object>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="top_attach">7</property>
+ <property name="width">2</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkEntry" id="suffix">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="invisible_char">â—</property>
+ <property name="invisible_char_set">True</property>
+ </object>
+ <packing>
+ <property name="left_attach">1</property>
+ <property name="top_attach">9</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkEntry" id="prefix">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="invisible_char">â—</property>
+ <property name="invisible_char_set">True</property>
+ </object>
+ <packing>
+ <property name="left_attach">1</property>
+ <property name="top_attach">8</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
</object>
<packing>
<property name="expand">False</property>
@@ -648,26 +693,6 @@
</packing>
</child>
</object>
- <object class="GtkMenu" id="bitmapmenu">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <child>
- <object class="GtkMenuItem" id="fromfile">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="label" translatable="yes">From file...</property>
- <property name="use_underline">True</property>
- </object>
- </child>
- <child>
- <object class="GtkMenuItem" id="gallery">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="label" translatable="yes">Gallery</property>
- <property name="use_underline">True</property>
- </object>
- </child>
- </object>
<object class="GtkListStore" id="liststore1">
<columns>
<!-- column-name gchararray1 -->
commit 7b195f146bb23d48fb9b204e299bfdd53df9f5a7
Author: Caolán McNamara <caolanm at redhat.com>
Date: Fri Jan 25 14:31:36 2013 +0000
Updated core
Project: help 745c3e5b1fdaa4882b4609d303cace6763e063e8
diff --git a/helpcontent2 b/helpcontent2
index 6ca6ab5..745c3e5 160000
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit 6ca6ab572bc8b1ab17b43bb277d4909fed910ed6
+Subproject commit 745c3e5b1fdaa4882b4609d303cace6763e063e8
More information about the Libreoffice-commits
mailing list