[Libreoffice-commits] core.git: cui/uiconfig
andreas kainz (via logerrit)
logerrit at kemper.freedesktop.org
Wed Nov 20 13:38:43 UTC 2019
cui/uiconfig/ui/linetabpage.ui | 677 +++++++++++++++++++++--------------------
1 file changed, 355 insertions(+), 322 deletions(-)
New commits:
commit 6cdc0dbfadfcbfa4f53a3c21a494ab225ba5d955
Author: andreas kainz <kainz.a at gmail.com>
AuthorDate: Tue Nov 5 01:53:23 2019 +0100
Commit: andreas_kainz <kainz.a at gmail.com>
CommitDate: Wed Nov 20 14:36:49 2019 +0100
linetab dialog page update
Change-Id: I6e152f69850d1fd3671660decd4186d8cd29465e
Reviewed-on: https://gerrit.libreoffice.org/82047
Tested-by: Jenkins
Reviewed-by: Heiko Tietze <heiko.tietze at documentfoundation.org>
Tested-by: Heiko Tietze <heiko.tietze at documentfoundation.org>
diff --git a/cui/uiconfig/ui/linetabpage.ui b/cui/uiconfig/ui/linetabpage.ui
index c6a8b4da6114..ab02246ef9b5 100644
--- a/cui/uiconfig/ui/linetabpage.ui
+++ b/cui/uiconfig/ui/linetabpage.ui
@@ -3,8 +3,8 @@
<interface domain="cui">
<requires lib="gtk+" version="3.18"/>
<object class="GtkAdjustment" id="adjustmentHEIGHT_SYMBOL">
- <property name="upper">19.989999999999998</property>
- <property name="step_increment">0.050000000000000003</property>
+ <property name="upper">20</property>
+ <property name="step_increment">0.05</property>
<property name="page_increment">1</property>
</object>
<object class="GtkAdjustment" id="adjustmentPERCENT">
@@ -14,22 +14,22 @@
</object>
<object class="GtkAdjustment" id="adjustmentWIDTH">
<property name="upper">5</property>
- <property name="step_increment">0.10000000000000001</property>
+ <property name="step_increment">0.1</property>
<property name="page_increment">1</property>
</object>
<object class="GtkAdjustment" id="adjustmentWIDTH1">
<property name="upper">5</property>
- <property name="step_increment">0.10000000000000001</property>
+ <property name="step_increment">0.1</property>
<property name="page_increment">1</property>
</object>
<object class="GtkAdjustment" id="adjustmentWIDTH2">
<property name="upper">5</property>
- <property name="step_increment">0.10000000000000001</property>
+ <property name="step_increment">0.1</property>
<property name="page_increment">1</property>
</object>
<object class="GtkAdjustment" id="adjustmentWIDTH_SYMBOL">
- <property name="upper">19.989999999999998</property>
- <property name="step_increment">0.050000000000000003</property>
+ <property name="upper">20</property>
+ <property name="step_increment">0.05</property>
<property name="page_increment">1</property>
</object>
<object class="GtkListStore" id="liststore4">
@@ -131,12 +131,13 @@
<property name="vexpand">True</property>
<property name="border_width">6</property>
<property name="orientation">vertical</property>
- <property name="spacing">6</property>
+ <property name="spacing">12</property>
<child>
- <object class="GtkBox" id="box2">
+ <object class="GtkGrid" id="grid1">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="spacing">18</property>
+ <property name="row_spacing">12</property>
+ <property name="column_spacing">24</property>
<child>
<object class="GtkFrame" id="FL_LINE">
<property name="visible">True</property>
@@ -154,12 +155,11 @@
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="orientation">vertical</property>
- <property name="spacing">6</property>
+ <property name="spacing">3</property>
<child>
<object class="GtkBox" id="box5">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="orientation">vertical</property>
<property name="spacing">6</property>
<child>
<object class="GtkLabel" id="FT_LINE_STYLE">
@@ -191,9 +191,6 @@
</child>
<child>
<object class="GtkCellRendererPixbuf" id="cellrenderertext11"/>
- <attributes>
- <attribute name="surface">3</attribute>
- </attributes>
</child>
</object>
<packing>
@@ -213,7 +210,6 @@
<object class="GtkBox" id="boxCOLOR">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="orientation">vertical</property>
<property name="spacing">6</property>
<child>
<object class="GtkLabel" id="FT_COLOR">
@@ -259,7 +255,7 @@
<object class="GtkBox" id="boxWIDTH">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="orientation">vertical</property>
+ <property name="spacing">6</property>
<child>
<object class="GtkLabel" id="FT_LINE_WIDTH">
<property name="visible">True</property>
@@ -300,7 +296,7 @@
<object class="GtkBox" id="boxTRANSPARENCY">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="orientation">vertical</property>
+ <property name="spacing">6</property>
<child>
<object class="GtkLabel" id="FT_TRANSPARENT">
<property name="visible">True</property>
@@ -352,41 +348,40 @@
</child>
</object>
<packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="position">0</property>
+ <property name="left_attach">0</property>
+ <property name="top_attach">0</property>
+ <property name="height">2</property>
</packing>
</child>
<child>
- <object class="GtkBox" id="box3">
+ <object class="GtkFrame" id="FL_LINE_ENDS">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="orientation">vertical</property>
- <property name="spacing">6</property>
+ <property name="label_xalign">0</property>
+ <property name="shadow_type">none</property>
<child>
- <object class="GtkFrame" id="FL_LINE_ENDS">
+ <object class="GtkAlignment" id="alignment2">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label_xalign">0</property>
- <property name="shadow_type">none</property>
+ <property name="top_padding">6</property>
+ <property name="left_padding">12</property>
<child>
- <object class="GtkAlignment" id="alignment2">
+ <object class="GtkBox" id="boxARROW_STYLES">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="top_padding">6</property>
- <property name="left_padding">12</property>
+ <property name="orientation">vertical</property>
+ <property name="spacing">6</property>
<child>
- <object class="GtkBox" id="boxARROW_STYLES">
+ <object class="GtkBox">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="orientation">vertical</property>
- <property name="spacing">6</property>
+ <property name="spacing">36</property>
<child>
<object class="GtkGrid" id="grid2">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="row_spacing">6</property>
- <property name="column_spacing">12</property>
+ <property name="row_spacing">3</property>
+ <property name="column_spacing">6</property>
<child>
<object class="GtkLabel" id="FT_LINE_ENDS_STYLE">
<property name="visible">True</property>
@@ -416,61 +411,35 @@
</child>
<child>
<object class="GtkCellRendererPixbuf" id="cellrenderertext2"/>
- <attributes>
- <attribute name="surface">3</attribute>
- </attributes>
</child>
</object>
<packing>
- <property name="left_attach">0</property>
- <property name="top_attach">1</property>
- </packing>
- </child>
- <child>
- <object class="GtkComboBox" id="LB_END_STYLE">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="model">liststore6</property>
- <property name="entry_text_column">0</property>
- <property name="id_column">1</property>
- <child>
- <object class="GtkCellRendererText" id="cellrenderertext3"/>
- <attributes>
- <attribute name="text">0</attribute>
- </attributes>
- </child>
- <child>
- <object class="GtkCellRendererPixbuf" id="cellrenderertext4"/>
- <attributes>
- <attribute name="surface">3</attribute>
- </attributes>
- </child>
- </object>
- <packing>
- <property name="left_attach">1</property>
- <property name="top_attach">1</property>
- </packing>
- </child>
- <child>
- <object class="GtkLabel" id="label5">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="label" translatable="yes" context="linetabpage|label5">End sty_le:</property>
- <property name="use_underline">True</property>
- <property name="mnemonic_widget">LB_END_STYLE</property>
- <property name="xalign">0</property>
- </object>
- <packing>
<property name="left_attach">1</property>
<property name="top_attach">0</property>
</packing>
</child>
<child>
- <object class="GtkBox" id="boxSTART">
+ <object class="GtkGrid" id="boxSTART">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="orientation">vertical</property>
- <property name="spacing">6</property>
+ <property name="row_spacing">3</property>
+ <property name="column_spacing">6</property>
+ <child>
+ <object class="GtkCheckButton" id="TSB_CENTER_START">
+ <property name="label" translatable="yes" context="linetabpage|TSB_CENTER_START">Ce_nter</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">False</property>
+ <property name="use_underline">True</property>
+ <property name="halign">Start</property>
+ <property name="inconsistent">True</property>
+ <property name="draw_indicator">True</property>
+ </object>
+ <packing>
+ <property name="left_attach">1</property>
+ <property name="top_attach">1</property>
+ </packing>
+ </child>
<child>
<object class="GtkLabel" id="FT_LINE_START_WIDTH">
<property name="visible">True</property>
@@ -481,9 +450,8 @@
<property name="xalign">0</property>
</object>
<packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="position">0</property>
+ <property name="left_attach">0</property>
+ <property name="top_attach">0</property>
</packing>
</child>
<child>
@@ -495,40 +463,93 @@
<property name="digits">2</property>
</object>
<packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="position">1</property>
+ <property name="left_attach">1</property>
+ <property name="top_attach">0</property>
</packing>
</child>
<child>
- <object class="GtkCheckButton" id="TSB_CENTER_START">
- <property name="label" translatable="yes" context="linetabpage|TSB_CENTER_START">Ce_nter</property>
+ <object class="GtkCheckButton" id="CBX_SYNCHRONIZE">
+ <property name="label" translatable="yes" context="linetabpage|CBX_SYNCHRONIZE">Synchroni_ze ends</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
<property name="use_underline">True</property>
- <property name="xalign">0</property>
- <property name="inconsistent">True</property>
+ <property name="halign">Start</property>
<property name="draw_indicator">True</property>
</object>
<packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="position">2</property>
+ <property name="left_attach">1</property>
+ <property name="top_attach">2</property>
</packing>
</child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ </object>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="top_attach">1</property>
+ <property name="width">2</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkGrid" id="grid3">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="row_spacing">3</property>
+ <property name="column_spacing">6</property>
+ <child>
+ <object class="GtkComboBox" id="LB_END_STYLE">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="model">liststore6</property>
+ <property name="entry_text_column">0</property>
+ <property name="id_column">1</property>
+ <child>
+ <object class="GtkCellRendererText" id="cellrenderertext5"/>
+ <attributes>
+ <attribute name="text">0</attribute>
+ </attributes>
+ </child>
+ <child>
+ <object class="GtkCellRendererPixbuf" id="cellrenderertext6"/>
+ </child>
+ </object>
+ <packing>
+ <property name="left_attach">1</property>
+ <property name="top_attach">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="label5">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label" translatable="yes" context="linetabpage|label5">End sty_le:</property>
+ <property name="use_underline">True</property>
+ <property name="mnemonic_widget">LB_END_STYLE</property>
+ <property name="xalign">0</property>
</object>
<packing>
<property name="left_attach">0</property>
- <property name="top_attach">2</property>
+ <property name="top_attach">0</property>
</packing>
</child>
<child>
- <object class="GtkBox" id="boxEND">
+ <object class="GtkGrid" id="boxEND">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="orientation">vertical</property>
- <property name="spacing">6</property>
+ <property name="row_spacing">3</property>
+ <property name="column_spacing">6</property>
<child>
<object class="GtkLabel" id="FT_LINE_END_WIDTH">
<property name="visible">True</property>
@@ -539,9 +560,8 @@
<property name="xalign">0</property>
</object>
<packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="position">0</property>
+ <property name="left_attach">0</property>
+ <property name="top_attach">0</property>
</packing>
</child>
<child>
@@ -553,9 +573,8 @@
<property name="digits">2</property>
</object>
<packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="position">1</property>
+ <property name="left_attach">1</property>
+ <property name="top_attach">0</property>
</packing>
</child>
<child>
@@ -565,91 +584,207 @@
<property name="can_focus">True</property>
<property name="receives_default">False</property>
<property name="use_underline">True</property>
- <property name="xalign">0</property>
+ <property name="halign">Start</property>
<property name="inconsistent">True</property>
<property name="draw_indicator">True</property>
</object>
<packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="position">2</property>
+ <property name="left_attach">1</property>
+ <property name="top_attach">1</property>
</packing>
</child>
+ <child>
+ <placeholder/>
+ </child>
</object>
<packing>
- <property name="left_attach">1</property>
- <property name="top_attach">2</property>
+ <property name="left_attach">0</property>
+ <property name="top_attach">1</property>
+ <property name="width">2</property>
</packing>
</child>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <object class="GtkCheckButton" id="CBX_SYNCHRONIZE">
- <property name="label" translatable="yes" context="linetabpage|CBX_SYNCHRONIZE">Synchroni_ze ends</property>
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">False</property>
- <property name="use_underline">True</property>
- <property name="xalign">0</property>
- <property name="draw_indicator">True</property>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
<property name="position">1</property>
</packing>
</child>
</object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">0</property>
+ </packing>
</child>
</object>
</child>
- <child type="label">
- <object class="GtkLabel" id="label2">
+ </object>
+ </child>
+ <child type="label">
+ <object class="GtkLabel" id="label2">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label" translatable="yes" context="linetabpage|label2">Arrow Styles</property>
+ <attributes>
+ <attribute name="weight" value="bold"/>
+ </attributes>
+ </object>
+ </child>
+ </object>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="top_attach">2</property>
+ <property name="width">2</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkFrame" id="FL_EDGE_STYLE">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label_xalign">0</property>
+ <property name="shadow_type">none</property>
+ <child>
+ <object class="GtkAlignment" id="alignment3">
+ <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="gridEDGE_CAPS">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label" translatable="yes" context="linetabpage|label2">Arrow Styles</property>
- <attributes>
- <attribute name="weight" value="bold"/>
- </attributes>
+ <property name="row_spacing">3</property>
+ <property name="column_spacing">6</property>
+ <child>
+ <object class="GtkLabel" id="FT_EDGE_STYLE">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label" translatable="yes" context="linetabpage|FT_EDGE_STYLE">_Corner style:</property>
+ <property name="use_underline">True</property>
+ <property name="mnemonic_widget">LB_EDGE_STYLE</property>
+ <property name="xalign">0</property>
+ </object>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="top_attach">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="FT_CAP_STYLE">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label" translatable="yes" context="linetabpage|FT_CAP_STYLE">Ca_p style:</property>
+ <property name="use_underline">True</property>
+ <property name="mnemonic_widget">LB_CAP_STYLE</property>
+ <property name="xalign">0</property>
+ </object>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="top_attach">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkComboBoxText" id="LB_EDGE_STYLE">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <items>
+ <item id="0" translatable="yes" context="linetabpage|liststoreEDGE_STYLE">Rounded</item>
+ <item id="1" translatable="yes" context="linetabpage|liststoreEDGE_STYLE">- none -</item>
+ <item id="2" translatable="yes" context="linetabpage|liststoreEDGE_STYLE">Mitered</item>
+ <item id="3" translatable="yes" context="linetabpage|liststoreEDGE_STYLE">Beveled</item>
+ </items>
+ </object>
+ <packing>
+ <property name="left_attach">1</property>
+ <property name="top_attach">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkComboBoxText" id="LB_CAP_STYLE">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <items>
+ <item id="0" translatable="yes" context="linetabpage|liststoreCAP_STYLE">Flat</item>
+ <item id="1" translatable="yes" context="linetabpage|liststoreCAP_STYLE">Round</item>
+ <item id="2" translatable="yes" context="linetabpage|liststoreCAP_STYLE">Square</item>
+ </items>
+ </object>
+ <packing>
+ <property name="left_attach">1</property>
+ <property name="top_attach">1</property>
+ </packing>
+ </child>
</object>
</child>
</object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="position">0</property>
- </packing>
</child>
+ <child type="label">
+ <object class="GtkLabel" id="label3">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label" translatable="yes" context="linetabpage|label3">Corner and Cap Styles</property>
+ <attributes>
+ <attribute name="weight" value="bold"/>
+ </attributes>
+ </object>
+ </child>
+ </object>
+ <packing>
+ <property name="left_attach">1</property>
+ <property name="top_attach">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkFrame" id="FL_SYMBOL_FORMAT">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label_xalign">0</property>
+ <property name="shadow_type">none</property>
<child>
- <object class="GtkFrame" id="FL_EDGE_STYLE">
+ <object class="GtkAlignment" id="alignment4">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label_xalign">0</property>
- <property name="shadow_type">none</property>
+ <property name="top_padding">6</property>
+ <property name="left_padding">12</property>
<child>
- <object class="GtkAlignment" id="alignment3">
+ <object class="GtkBox" id="box4">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="top_padding">6</property>
- <property name="left_padding">12</property>
+ <property name="orientation">vertical</property>
+ <property name="spacing">6</property>
+ <child>
+ <object class="GtkMenuButton" id="MB_SYMBOL_BITMAP">
+ <property name="label" translatable="yes" context="linetabpage|MB_SYMBOL_BITMAP">Select...</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">True</property>
+ <property name="draw_indicator">True</property>
+ <property name="popup">menuSELECT</property>
+ <property name="use_popover">False</property>
+ <child>
+ <placeholder/>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
<child>
- <object class="GtkGrid" id="gridEDGE_CAPS">
+ <object class="GtkGrid" id="gridICON_SIZE">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="row_spacing">6</property>
<property name="column_spacing">12</property>
<child>
- <object class="GtkLabel" id="FT_EDGE_STYLE">
+ <object class="GtkLabel" id="FT_SYMBOL_WIDTH">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label" translatable="yes" context="linetabpage|FT_EDGE_STYLE">_Corner style:</property>
+ <property name="label" translatable="yes" context="linetabpage|FT_SYMBOL_WIDTH">Widt_h:</property>
<property name="use_underline">True</property>
- <property name="mnemonic_widget">LB_EDGE_STYLE</property>
+ <property name="mnemonic_widget">MF_SYMBOL_WIDTH</property>
<property name="xalign">0</property>
</object>
<packing>
@@ -658,13 +793,11 @@
</packing>
</child>
<child>
- <object class="GtkLabel" id="FT_CAP_STYLE">
+ <object class="GtkSpinButton" id="MF_SYMBOL_WIDTH">
<property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="label" translatable="yes" context="linetabpage|FT_CAP_STYLE">Ca_p style:</property>
- <property name="use_underline">True</property>
- <property name="mnemonic_widget">LB_CAP_STYLE</property>
- <property name="xalign">0</property>
+ <property name="can_focus">True</property>
+ <property name="adjustment">adjustmentWIDTH_SYMBOL</property>
+ <property name="digits">2</property>
</object>
<packing>
<property name="left_attach">1</property>
@@ -672,207 +805,77 @@
</packing>
</child>
<child>
- <object class="GtkComboBoxText" id="LB_EDGE_STYLE">
+ <object class="GtkCheckButton" id="CB_SYMBOL_RATIO">
+ <property name="label" translatable="yes" context="linetabpage|CB_SYMBOL_RATIO">_Keep ratio</property>
<property name="visible">True</property>
- <property name="can_focus">False</property>
- <items>
- <item id="0" translatable="yes" context="linetabpage|liststoreEDGE_STYLE">Rounded</item>
- <item id="1" translatable="yes" context="linetabpage|liststoreEDGE_STYLE">- none -</item>
- <item id="2" translatable="yes" context="linetabpage|liststoreEDGE_STYLE">Mitered</item>
- <item id="3" translatable="yes" context="linetabpage|liststoreEDGE_STYLE">Beveled</item>
- </items>
+ <property name="can_focus">True</property>
+ <property name="receives_default">False</property>
+ <property name="use_underline">True</property>
+ <property name="halign">start</property>
+ <property name="draw_indicator">True</property>
</object>
<packing>
<property name="left_attach">0</property>
- <property name="top_attach">1</property>
+ <property name="top_attach">2</property>
+ <property name="width">2</property>
</packing>
</child>
<child>
- <object class="GtkComboBoxText" id="LB_CAP_STYLE">
+ <object class="GtkLabel" id="FT_SYMBOL_HEIGHT">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <items>
- <item id="0" translatable="yes" context="linetabpage|liststoreCAP_STYLE">Flat</item>
- <item id="1" translatable="yes" context="linetabpage|liststoreCAP_STYLE">Round</item>
- <item id="2" translatable="yes" context="linetabpage|liststoreCAP_STYLE">Square</item>
- </items>
+ <property name="label" translatable="yes" context="linetabpage|FT_SYMBOL_HEIGHT">Hei_ght:</property>
+ <property name="use_underline">True</property>
+ <property name="mnemonic_widget">MF_SYMBOL_HEIGHT</property>
+ <property name="xalign">0</property>
</object>
<packing>
- <property name="left_attach">1</property>
+ <property name="left_attach">0</property>
<property name="top_attach">1</property>
</packing>
</child>
- </object>
- </child>
- </object>
- </child>
- <child type="label">
- <object class="GtkLabel" id="label3">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="label" translatable="yes" context="linetabpage|label3">Corner and Cap Styles</property>
- <attributes>
- <attribute name="weight" value="bold"/>
- </attributes>
- </object>
- </child>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="position">1</property>
- </packing>
- </child>
- <child>
- <object class="GtkFrame" id="FL_SYMBOL_FORMAT">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="label_xalign">0</property>
- <property name="shadow_type">none</property>
- <child>
- <object class="GtkAlignment" id="alignment4">
- <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="box4">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="orientation">vertical</property>
- <property name="spacing">6</property>
<child>
- <object class="GtkMenuButton" id="MB_SYMBOL_BITMAP">
- <property name="label" translatable="yes" context="linetabpage|MB_SYMBOL_BITMAP">Select...</property>
+ <object class="GtkSpinButton" id="MF_SYMBOL_HEIGHT">
<property name="visible">True</property>
<property name="can_focus">True</property>
- <property name="receives_default">True</property>
- <property name="popup">menuSELECT</property>
- <property name="use_popover">False</property>
- <property name="draw_indicator">True</property>
- <child>
- <placeholder/>
- </child>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <object class="GtkGrid" id="gridICON_SIZE">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="row_spacing">6</property>
- <property name="column_spacing">12</property>
- <child>
- <object class="GtkLabel" id="FT_SYMBOL_WIDTH">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="label" translatable="yes" context="linetabpage|FT_SYMBOL_WIDTH">Widt_h:</property>
- <property name="use_underline">True</property>
- <property name="mnemonic_widget">MF_SYMBOL_WIDTH</property>
- <property name="xalign">0</property>
- </object>
- <packing>
- <property name="left_attach">0</property>
- <property name="top_attach">0</property>
- </packing>
- </child>
- <child>
- <object class="GtkSpinButton" id="MF_SYMBOL_WIDTH">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="adjustment">adjustmentWIDTH_SYMBOL</property>
- <property name="digits">2</property>
- </object>
- <packing>
- <property name="left_attach">1</property>
- <property name="top_attach">0</property>
- </packing>
- </child>
- <child>
- <object class="GtkCheckButton" id="CB_SYMBOL_RATIO">
- <property name="label" translatable="yes" context="linetabpage|CB_SYMBOL_RATIO">_Keep ratio</property>
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">False</property>
- <property name="use_underline">True</property>
- <property name="xalign">0</property>
- <property name="draw_indicator">True</property>
- </object>
- <packing>
- <property name="left_attach">0</property>
- <property name="top_attach">2</property>
- <property name="width">2</property>
- </packing>
- </child>
- <child>
- <object class="GtkLabel" id="FT_SYMBOL_HEIGHT">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="label" translatable="yes" context="linetabpage|FT_SYMBOL_HEIGHT">Hei_ght:</property>
- <property name="use_underline">True</property>
- <property name="mnemonic_widget">MF_SYMBOL_HEIGHT</property>
- <property name="xalign">0</property>
- </object>
- <packing>
- <property name="left_attach">0</property>
- <property name="top_attach">1</property>
- </packing>
- </child>
- <child>
- <object class="GtkSpinButton" id="MF_SYMBOL_HEIGHT">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="adjustment">adjustmentHEIGHT_SYMBOL</property>
- <property name="digits">2</property>
- </object>
- <packing>
- <property name="left_attach">1</property>
- <property name="top_attach">1</property>
- </packing>
- </child>
+ <property name="adjustment">adjustmentHEIGHT_SYMBOL</property>
+ <property name="digits">2</property>
</object>
<packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="position">1</property>
+ <property name="left_attach">1</property>
+ <property name="top_attach">1</property>
</packing>
</child>
</object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">1</property>
+ </packing>
</child>
</object>
</child>
- <child type="label">
- <object class="GtkLabel" id="label4">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="label" translatable="yes" context="linetabpage|label4">Icon</property>
- <attributes>
- <attribute name="weight" value="bold"/>
- </attributes>
- </object>
- </child>
</object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="position">2</property>
- </packing>
+ </child>
+ <child type="label">
+ <object class="GtkLabel" id="label4">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label" translatable="yes" context="linetabpage|label4">Icon</property>
+ <attributes>
+ <attribute name="weight" value="bold"/>
+ </attributes>
+ </object>
</child>
</object>
<packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="pack_type">end</property>
- <property name="position">1</property>
+ <property name="left_attach">1</property>
+ <property name="top_attach">1</property>
</packing>
</child>
</object>
<packing>
- <property name="expand">True</property>
+ <property name="expand">False</property>
<property name="fill">True</property>
<property name="position">0</property>
</packing>
@@ -883,7 +886,6 @@
<property name="can_focus">False</property>
<property name="top_padding">6</property>
<property name="left_padding">12</property>
- <property name="right_padding">12</property>
<child>
<object class="GtkScrolledWindow">
<property name="visible">True</property>
@@ -918,10 +920,41 @@
</packing>
</child>
</object>
- <object class="GtkSizeGroup" id="sizegroup1">
+ <object class="GtkSizeGroup" id="sizegroupLabel1">
+ <widgets>
+ <widget name="FT_LINE_STYLE"/>
+ <widget name="FT_COLOR"/>
+ <widget name="FT_LINE_WIDTH"/>
+ <widget name="FT_TRANSPARENT"/>
+ <widget name="FT_LINE_ENDS_STYLE"/>
+ <widget name="FT_LINE_START_WIDTH"/>
+ </widgets>
+ </object>
+ <object class="GtkSizeGroup" id="sizegroupLabel2">
+ <widgets>
+ <widget name="FT_EDGE_STYLE"/>
+ <widget name="FT_CAP_STYLE"/>
+ <widget name="FT_SYMBOL_WIDTH"/>
+ <widget name="FT_SYMBOL_HEIGHT"/>
+ <widget name="label5"/>
+ <widget name="FT_LINE_END_WIDTH"/>
+ </widgets>
+ </object>
+ <object class="GtkSizeGroup" id="sizegroupSpin">
<widgets>
<widget name="MTR_FLD_LINE_WIDTH"/>
<widget name="MTR_LINE_TRANSPARENT"/>
+ <widget name="MTR_FLD_START_WIDTH"/>
+ </widgets>
+ </object>
+ <object class="GtkSizeGroup" id="sizegroupWidget1">
+ <widgets>
+ <widget name="LB_LINE_STYLE"/>
+ <widget name="LB_COLOR"/>
+ <widget name="LB_START_STYLE"/>
+ <widget name="LB_EDGE_STYLE"/>
+ <widget name="LB_CAP_STYLE"/>
+ <widget name="LB_END_STYLE"/>
</widgets>
</object>
</interface>
More information about the Libreoffice-commits
mailing list