cui/uiconfig/ui/shadowtabpage.ui | 298 +++++++++++++++++++--------------------
1 file changed, 149 insertions(+), 149 deletions(-)
New commits:
commit 0cbcb4b7eb87d947cb99fbb11d132dfad2e47060
Author: andreas kainz <kain...@gmail.com>
AuthorDate: Tue Nov 19 21:01:26 2019 +0100
Commit: andreas_kainz <kain...@gmail.com>
CommitDate: Wed Nov 20 09:09:58 2019 +0100
Line Shadow Dialog update
Change-Id: I59294e8de213059cb0bdc28b5006ee202019210a
Reviewed-on: https://gerrit.libreoffice.org/83234
Tested-by: Jenkins
Reviewed-by: Heiko Tietze <heiko.tie...@documentfoundation.org>
diff --git a/cui/uiconfig/ui/shadowtabpage.ui b/cui/uiconfig/ui/shadowtabpage.ui
index 9fa6372f7b19..f5e674d99c72 100644
--- a/cui/uiconfig/ui/shadowtabpage.ui
+++ b/cui/uiconfig/ui/shadowtabpage.ui
@@ -12,36 +12,29 @@
<property name="step_increment">5</property>
<property name="page_increment">10</property>
</object>
- <object class="GtkFrame" id="ShadowTabPage">
+ <object class="GtkBox" id="ShadowTabPage">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="valign">start</property>
- <property name="hexpand">True</property>
- <property name="vexpand">True</property>
<property name="border_width">6</property>
- <property name="label_xalign">0</property>
- <property name="shadow_type">none</property>
+ <property name="spacing">24</property>
<child>
- <object class="GtkAlignment" id="alignment1">
+ <object class="GtkFrame" id="property">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="margin_left">12</property>
- <property name="margin_top">6</property>
- <property name="hexpand">True</property>
+ <property name="label_xalign">0</property>
+ <property name="shadow_type">none</property>
<child>
- <object class="GtkBox" id="box1">
+ <object class="GtkAlignment" id="alignment1">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="hexpand">True</property>
- <property name="spacing">12</property>
- <property name="homogeneous">True</property>
+ <property name="top_padding">6</property>
+ <property name="left_padding">12</property>
<child>
<object class="GtkBox" id="maingrid">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="vexpand">True</property>
<property name="orientation">vertical</property>
- <property name="spacing">6</property>
+ <property name="spacing">3</property>
<child>
<object class="GtkCheckButton" id="TSB_SHOW_SHADOW">
<property name="label" translatable="yes"
context="shadowtabpage|TSB_SHOW_SHADOW">_Use shadow</property>
@@ -60,86 +53,85 @@
</packing>
</child>
<child>
- <object class="GtkGrid" id="gridSHADOW">
+ <object class="GtkAlignment">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="vexpand">True</property>
- <property name="row_spacing">6</property>
- <property name="column_spacing">12</property>
+ <property name="left_padding">18</property>
<child>
- <object class="GtkSpinButton"
id="MTR_SHADOW_TRANSPARENT">
+ <object class="GtkGrid" id="gridSHADOW">
<property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="activates_default">True</property>
- <property
name="adjustment">adjustmentPercent</property>
- </object>
- <packing>
- <property name="left_attach">1</property>
- <property name="top_attach">3</property>
- </packing>
- </child>
- <child>
- <object class="GtkSpinButton" id="MTR_FLD_DISTANCE">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="activates_default">True</property>
- <property
name="adjustment">adjustmentDistance</property>
- </object>
- <packing>
- <property name="left_attach">1</property>
- <property name="top_attach">1</property>
- </packing>
- </child>
- <child>
- <object class="GtkScrolledWindow">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="halign">start</property>
- <property name="valign">center</property>
- <property name="hscrollbar_policy">never</property>
- <property name="vscrollbar_policy">never</property>
- <property name="shadow_type">in</property>
+ <property name="can_focus">False</property>
+ <property name="row_spacing">3</property>
+ <property name="column_spacing">6</property>
<child>
- <object class="GtkViewport">
+ <object class="GtkSpinButton"
id="MTR_SHADOW_TRANSPARENT">
<property name="visible">True</property>
- <property name="can_focus">False</property>
+ <property name="can_focus">True</property>
+ <property name="halign">start</property>
+ <property name="activates_default">True</property>
+ <property
name="adjustment">adjustmentPercent</property>
+ </object>
+ <packing>
+ <property name="left_attach">1</property>
+ <property name="top_attach">3</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkSpinButton" id="MTR_FLD_DISTANCE">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="halign">start</property>
+ <property name="activates_default">True</property>
+ <property
name="adjustment">adjustmentDistance</property>
+ </object>
+ <packing>
+ <property name="left_attach">1</property>
+ <property name="top_attach">2</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkScrolledWindow">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="hscrollbar_policy">never</property>
+ <property name="vscrollbar_policy">never</property>
+ <property name="shadow_type">in</property>
<child>
- <object class="GtkDrawingArea" id="CTL_POSITION">
+ <object class="GtkViewport">
<property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="events">GDK_BUTTON_PRESS_MASK
| GDK_BUTTON_RELEASE_MASK | GDK_KEY_PRESS_MASK | GDK_KEY_RELEASE_MASK |
GDK_STRUCTURE_MASK</property>
+ <property name="can_focus">False</property>
+ <child>
+ <object class="GtkDrawingArea"
id="CTL_POSITION">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property
name="events">GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK |
GDK_KEY_PRESS_MASK | GDK_KEY_RELEASE_MASK | GDK_STRUCTURE_MASK</property>
+ </object>
+ </child>
</object>
</child>
</object>
+ <packing>
+ <property name="left_attach">1</property>
+ <property name="top_attach">0</property>
+ </packing>
</child>
- </object>
- <packing>
- <property name="left_attach">1</property>
- <property name="top_attach">0</property>
- </packing>
- </child>
- <child>
- <object class="GtkMenuButton" id="LB_SHADOW_COLOR">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">False</property>
- <property name="xalign">0</property>
- <property name="draw_indicator">True</property>
- <property name="label" translatable="no"></property>
<child>
- <placeholder/>
+ <object class="GtkMenuButton" id="LB_SHADOW_COLOR">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">False</property>
+ <property name="xalign">0</property>
+ <property name="draw_indicator">True</property>
+ <property name="label"
translatable="no"></property>
+ <child>
+ <placeholder/>
+ </child>
+ </object>
+ <packing>
+ <property name="left_attach">1</property>
+ <property name="top_attach">1</property>
+ </packing>
</child>
- </object>
- <packing>
- <property name="left_attach">1</property>
- <property name="top_attach">2</property>
- </packing>
- </child>
- <child>
- <object class="GtkAlignment" id="alignment2">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="left_padding">12</property>
<child>
<object class="GtkLabel" id="FT_DISTANCE">
<property name="visible">True</property>
@@ -147,59 +139,45 @@
<property name="label" translatable="yes"
context="shadowtabpage|FT_DISTANCE">_Distance:</property>
<property name="use_underline">True</property>
<property
name="mnemonic_widget">MTR_FLD_DISTANCE</property>
- <property name="xalign">1</property>
+ <property name="xalign">0</property>
</object>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="top_attach">2</property>
+ </packing>
</child>
- </object>
- <packing>
- <property name="left_attach">0</property>
- <property name="top_attach">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">12</property>
<child>
- <object class="GtkLabel" id="FT_TRANSPARENT">
+ <object class="GtkLabel" id="FT_SHADOW_COLOR">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label" translatable="yes"
context="shadowtabpage|FT_TRANSPARENT">_Transparency:</property>
+ <property name="label" translatable="yes"
context="shadowtabpage|FT_SHADOW_COLOR">_Color:</property>
<property name="use_underline">True</property>
- <property
name="mnemonic_widget">MTR_SHADOW_TRANSPARENT</property>
- <property name="xalign">1</property>
+ <property
name="mnemonic_widget">LB_SHADOW_COLOR</property>
+ <property name="xalign">0</property>
</object>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="top_attach">1</property>
+ </packing>
</child>
- </object>
- <packing>
- <property name="left_attach">0</property>
- <property name="top_attach">3</property>
- </packing>
- </child>
- <child>
- <object class="GtkAlignment" id="alignment4">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="left_padding">12</property>
<child>
- <object class="GtkLabel" id="FT_SHADOW_COLOR">
+ <object class="GtkLabel" id="FT_TRANSPARENT">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label" translatable="yes"
context="shadowtabpage|FT_SHADOW_COLOR">_Color:</property>
+ <property name="label" translatable="yes"
context="shadowtabpage|FT_TRANSPARENT">_Transparency:</property>
<property name="use_underline">True</property>
- <property
name="mnemonic_widget">LB_SHADOW_COLOR</property>
- <property name="xalign">1</property>
+ <property
name="mnemonic_widget">MTR_SHADOW_TRANSPARENT</property>
+ <property name="xalign">0</property>
</object>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="top_attach">3</property>
+ </packing>
+ </child>
+ <child>
+ <placeholder/>
</child>
</object>
- <packing>
- <property name="left_attach">0</property>
- <property name="top_attach">2</property>
- </packing>
- </child>
- <child>
- <placeholder/>
</child>
</object>
<packing>
@@ -209,27 +187,49 @@
</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="label">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label" translatable="yes"
context="shadowtabpage|label">Properties</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">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkFrame" id="preview">
+ <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="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="box3">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="valign">start</property>
- <property name="margin_right">12</property>
<property name="hexpand">True</property>
- <property name="vexpand">True</property>
<property name="orientation">vertical</property>
- <property name="spacing">6</property>
<property name="homogeneous">True</property>
<child>
<object class="GtkScrolledWindow">
<property name="visible">True</property>
- <property name="can_focus">False</property>
+ <property name="can_focus">True</property>
<property name="hscrollbar_policy">never</property>
<property name="vscrollbar_policy">never</property>
<property name="shadow_type">in</property>
@@ -243,7 +243,7 @@
<property name="can_focus">False</property>
<child internal-child="accessible">
<object class="AtkObject"
id="CTL_COLOR_PREVIEW-atkobject">
- <property name="AtkObject::accessible-name"
translatable="yes"
context="shadowtabpage|CTL_COLOR_PREVIEW-atkobject">Example</property>
+ <property name="AtkObject::accessible-name"
translatable="yes"
context="shadowtabpage|CTL_COLOR_PREVIEW-atkobject">Example</property>
</object>
</child>
</object>
@@ -258,25 +258,25 @@
</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="label1">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label" translatable="yes"
context="shadowtabpage|label">Preview</property>
+ <attributes>
+ <attribute name="weight" value="bold"/>
+ </attributes>
+ </object>
+ </child>
</object>
- </child>
- <child type="label">
- <object class="GtkLabel" id="label">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="label" translatable="yes"
context="shadowtabpage|label">Properties</property>
- <attributes>
- <attribute name="weight" value="bold"/>
- </attributes>
- </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">1</property>
+ </packing>
</child>
</object>
<object class="GtkSizeGroup" id="sizegroup1">
@@ -287,10 +287,10 @@
</widgets>
</object>
<object class="GtkSizeGroup" id="sizegroup2">
- <property name="mode">both</property>
+ <property name="mode">vertical</property>
<widgets>
- <widget name="gridSHADOW"/>
- <widget name="box3"/>
+ <widget name="alignment1"/>
+ <widget name="alignment2"/>
</widgets>
</object>
</interface>
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
