[Libreoffice-commits] core.git: svx/uiconfig
Rishabh Kumar
kris.kr296 at gmail.com
Tue Jun 16 07:38:08 PDT 2015
svx/uiconfig/ui/sidebarline.ui | 204 ++++++++++++++++-------------------------
1 file changed, 81 insertions(+), 123 deletions(-)
New commits:
commit 4fb65441709d02946f4b24da7839dba7ecffff1e
Author: Rishabh Kumar <kris.kr296 at gmail.com>
Date: Sun Jun 14 16:28:42 2015 +0530
Line Section reorganisation
Arrow Style, Corner Style and Cap Style are hidden
Change-Id: I0bfab4b23219d01ebfdb3a9ff0dc36777a412ec5
Reviewed-on: https://gerrit.libreoffice.org/16264
Tested-by: Jenkins <ci at libreoffice.org>
Reviewed-by: Caolán McNamara <caolanm at redhat.com>
Tested-by: Caolán McNamara <caolanm at redhat.com>
diff --git a/svx/uiconfig/ui/sidebarline.ui b/svx/uiconfig/ui/sidebarline.ui
index 5aa8431..6309198 100644
--- a/svx/uiconfig/ui/sidebarline.ui
+++ b/svx/uiconfig/ui/sidebarline.ui
@@ -1,6 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
+<!-- Generated with glade 3.18.3 -->
<interface>
- <!-- interface-requires gtk+ 3.0 -->
+ <requires lib="gtk+" version="3.0"/>
<object class="GtkAdjustment" id="adjustment1">
<property name="upper">100</property>
<property name="step_increment">5</property>
@@ -31,47 +32,33 @@
<property name="row_spacing">6</property>
<property name="column_spacing">6</property>
<child>
- <object class="GtkLabel" id="widthlabel">
+ <object class="GtkLabel" id="translabel">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="xalign">0</property>
- <property name="label" translatable="yes">_Width:</property>
+ <property name="label" translatable="yes">_Transparency:</property>
<property name="use_underline">True</property>
</object>
<packing>
<property name="left_attach">0</property>
- <property name="top_attach">0</property>
- <property name="width">1</property>
- <property name="height">1</property>
+ <property name="top_attach">3</property>
</packing>
</child>
<child>
- <object class="GtkToolbar" id="width">
- <property name="width_request">120</property>
+ <object class="GtkSpinButton" id="linetransparency:0%">
<property name="visible">True</property>
- <property name="can_focus">False</property>
+ <property name="can_focus">True</property>
<property name="has_tooltip">True</property>
- <property name="tooltip_markup" translatable="yes">Select the width of the line.</property>
- <property name="tooltip_text" translatable="yes">Select the width of the line.</property>
- <child>
- <object class="GtkMenuToolButton" id="setwidth">
- <property name="width_request">105</property>
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="action_name">.uno:SelectWidth</property>
- <property name="use_underline">True</property>
- </object>
- <packing>
- <property name="expand">True</property>
- <property name="homogeneous">True</property>
- </packing>
- </child>
+ <property name="tooltip_markup" translatable="yes">Specify the transparency of the line.</property>
+ <property name="tooltip_text" translatable="yes">Specify the transparency of the line.</property>
+ <property name="hexpand">True</property>
+ <property name="invisible_char">•</property>
+ <property name="adjustment">adjustment1</property>
+ <property name="climb_rate">5</property>
</object>
<packing>
<property name="left_attach">1</property>
- <property name="top_attach">0</property>
- <property name="width">1</property>
- <property name="height">1</property>
+ <property name="top_attach">3</property>
</packing>
</child>
<child>
@@ -81,33 +68,10 @@
<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>
- <property name="top_attach">1</property>
- <property name="width">1</property>
- <property name="height">1</property>
- </packing>
- </child>
- <child>
- <object class="GtkSpinButton" id="linetransparency:0%">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="has_tooltip">True</property>
- <property name="tooltip_markup" translatable="yes">Specify the transparency of the line.</property>
- <property name="tooltip_text" translatable="yes">Specify the transparency of the line.</property>
- <property name="hexpand">True</property>
- <property name="invisible_char">•</property>
- <property name="invisible_char_set">True</property>
- <property name="adjustment">adjustment1</property>
- <property name="climb_rate">5</property>
- </object>
- <packing>
- <property name="left_attach">1</property>
<property name="top_attach">2</property>
- <property name="width">1</property>
- <property name="height">1</property>
</packing>
</child>
<child>
@@ -137,25 +101,73 @@
</object>
<packing>
<property name="left_attach">1</property>
+ <property name="top_attach">2</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkToolbar" id="width">
+ <property name="width_request">120</property>
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="has_tooltip">True</property>
+ <property name="tooltip_markup" translatable="yes">Select the width of the line.</property>
+ <property name="tooltip_text" translatable="yes">Select the width of the line.</property>
+ <child>
+ <object class="GtkMenuToolButton" id="setwidth">
+ <property name="width_request">105</property>
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="action_name">.uno:SelectWidth</property>
+ <property name="use_underline">True</property>
+ </object>
+ <packing>
+ <property name="expand">True</property>
+ <property name="homogeneous">True</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="left_attach">1</property>
<property name="top_attach">1</property>
- <property name="width">1</property>
- <property name="height">1</property>
</packing>
</child>
<child>
- <object class="GtkLabel" id="translabel">
+ <object class="GtkLabel" id="widthlabel">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="xalign">0</property>
- <property name="label" translatable="yes">_Transparency:</property>
+ <property name="label" translatable="yes">_Width:</property>
<property name="use_underline">True</property>
- <property name="mnemonic_widget">linetransparency:0%</property>
</object>
<packing>
<property name="left_attach">0</property>
- <property name="top_attach">2</property>
- <property name="width">1</property>
- <property name="height">1</property>
+ <property name="top_attach">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="stylelabel">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="xalign">0</property>
+ <property name="label" translatable="yes">_Style:</property>
+ <property name="use_underline">True</property>
+ </object>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="top_attach">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkComboBoxText" id="linestyle">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="has_tooltip">True</property>
+ <property name="tooltip_markup" translatable="yes">Select the style of the line.</property>
+ <property name="tooltip_text" translatable="yes">Select the style of the line.</property>
+ </object>
+ <packing>
+ <property name="left_attach">1</property>
+ <property name="top_attach">0</property>
</packing>
</child>
</object>
@@ -166,38 +178,7 @@
</packing>
</child>
<child>
- <object class="GtkLabel" id="stylelabel">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="xalign">0</property>
- <property name="label" translatable="yes">_Style:</property>
- <property name="use_underline">True</property>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="position">1</property>
- </packing>
- </child>
- <child>
- <object class="GtkComboBoxText" id="linestyle">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="has_tooltip">True</property>
- <property name="tooltip_markup" translatable="yes">Select the style of the line.</property>
- <property name="tooltip_text" translatable="yes">Select the style of the line.</property>
- <property name="entry_text_column">0</property>
- <property name="id_column">1</property>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="position">2</property>
- </packing>
- </child>
- <child>
<object class="GtkLabel" id="arrowlabel">
- <property name="visible">True</property>
<property name="can_focus">False</property>
<property name="xalign">0</property>
<property name="label" translatable="yes">_Arrow:</property>
@@ -212,14 +193,11 @@
</child>
<child>
<object class="GtkComboBoxText" id="beginarrowstyle">
- <property name="visible">True</property>
<property name="can_focus">False</property>
<property name="has_tooltip">True</property>
<property name="tooltip_markup" translatable="yes">Select the style of the beginning arrowhead.</property>
<property name="tooltip_text" translatable="yes">Select the style of the beginning arrowhead.</property>
<property name="hexpand">True</property>
- <property name="entry_text_column">0</property>
- <property name="id_column">1</property>
</object>
<packing>
<property name="expand">False</property>
@@ -229,14 +207,11 @@
</child>
<child>
<object class="GtkComboBoxText" id="endarrowstyle">
- <property name="visible">True</property>
<property name="can_focus">False</property>
<property name="has_tooltip">True</property>
<property name="tooltip_markup" translatable="yes">Select the style of the ending arrowhead.</property>
<property name="tooltip_text" translatable="yes">Select the style of the ending arrowhead.</property>
<property name="hexpand">True</property>
- <property name="entry_text_column">0</property>
- <property name="id_column">1</property>
</object>
<packing>
<property name="expand">False</property>
@@ -246,7 +221,6 @@
</child>
<child>
<object class="GtkGrid" id="grid5">
- <property name="visible">True</property>
<property name="can_focus">False</property>
<property name="row_spacing">6</property>
<property name="column_spacing">6</property>
@@ -263,8 +237,6 @@
<packing>
<property name="left_attach">0</property>
<property name="top_attach">0</property>
- <property name="width">1</property>
- <property name="height">1</property>
</packing>
</child>
<child>
@@ -274,26 +246,22 @@
<property name="has_tooltip">True</property>
<property name="tooltip_markup" translatable="yes">Select the style of the edge connections.</property>
<property name="tooltip_text" translatable="yes">Select the style of the edge connections.</property>
- <property name="entry_text_column">0</property>
- <property name="id_column">1</property>
- <style>
- <class name="Rounded"/>
- <class name="- none -"/>
- <class name="Mitered"/>
- <class name="Beveled"/>
- </style>
<items>
<item translatable="yes">Rounded</item>
<item translatable="yes">- none -</item>
<item translatable="yes">Mitered</item>
<item translatable="yes">Beveled</item>
</items>
+ <style>
+ <class name="Rounded"/>
+ <class name="- none -"/>
+ <class name="Mitered"/>
+ <class name="Beveled"/>
+ </style>
</object>
<packing>
<property name="left_attach">0</property>
<property name="top_attach">1</property>
- <property name="width">1</property>
- <property name="height">1</property>
</packing>
</child>
<child>
@@ -308,8 +276,6 @@
<packing>
<property name="left_attach">1</property>
<property name="top_attach">0</property>
- <property name="width">1</property>
- <property name="height">1</property>
</packing>
</child>
<child>
@@ -319,24 +285,20 @@
<property name="has_tooltip">True</property>
<property name="tooltip_markup" translatable="yes">Select the style of the line caps.</property>
<property name="tooltip_text" translatable="yes">Select the style of the line caps.</property>
- <property name="entry_text_column">0</property>
- <property name="id_column">1</property>
- <style>
- <class name="Flat"/>
- <class name="Round"/>
- <class name="Square"/>
- </style>
<items>
<item translatable="yes">Flat</item>
<item translatable="yes">Round</item>
<item translatable="yes">Square</item>
</items>
+ <style>
+ <class name="Flat"/>
+ <class name="Round"/>
+ <class name="Square"/>
+ </style>
</object>
<packing>
<property name="left_attach">1</property>
<property name="top_attach">1</property>
- <property name="width">1</property>
- <property name="height">1</property>
</packing>
</child>
</object>
@@ -350,16 +312,12 @@
<packing>
<property name="left_attach">0</property>
<property name="top_attach">0</property>
- <property name="width">1</property>
- <property name="height">1</property>
</packing>
</child>
</object>
<packing>
<property name="left_attach">0</property>
<property name="top_attach">0</property>
- <property name="width">1</property>
- <property name="height">1</property>
</packing>
</child>
</object>
More information about the Libreoffice-commits
mailing list