diff options
author | andreas kainz <kainz.a@gmail.com> | 2020-01-24 00:27:31 +0100 |
---|---|---|
committer | andreas_kainz <kainz.a@gmail.com> | 2020-01-24 22:19:33 +0100 |
commit | 0042b77de2f94f5b8af60abff2ec8e352d4fbd66 (patch) | |
tree | b6a48c0f360dfec27f37f08153179de0e9996e04 /svx/uiconfig/ui/sidebararea.ui | |
parent | 4ff12ba6f4639c73587f2bb58afcc3ca6fb30105 (diff) |
Area Sidebar same grid and better spacing
Change-Id: I9d891f6d3c59ce047c7ec001c5facbbec4804a38
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/87313
Tested-by: Jenkins
Reviewed-by: andreas_kainz <kainz.a@gmail.com>
Diffstat (limited to 'svx/uiconfig/ui/sidebararea.ui')
-rw-r--r-- | svx/uiconfig/ui/sidebararea.ui | 497 |
1 files changed, 232 insertions, 265 deletions
diff --git a/svx/uiconfig/ui/sidebararea.ui b/svx/uiconfig/ui/sidebararea.ui index da83892c0a27..80223abb4518 100644 --- a/svx/uiconfig/ui/sidebararea.ui +++ b/svx/uiconfig/ui/sidebararea.ui @@ -32,347 +32,331 @@ <object class="GtkGrid" id="AreaPropertyPanel"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="row_homogeneous">True</property> - <property name="column_homogeneous">True</property> <child> - <object class="GtkBox" id="box1"> + <object class="GtkGrid" id="grid1"> <property name="visible">True</property> <property name="can_focus">False</property> + <property name="hexpand">True</property> <property name="border_width">6</property> - <property name="orientation">vertical</property> - <property name="spacing">12</property> + <property name="row_spacing">3</property> + <property name="column_spacing">6</property> <child> - <object class="GtkGrid" id="grid2"> + <object class="GtkBox" id="box1"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="hexpand">True</property> - <property name="row_spacing">6</property> - <property name="column_spacing">6</property> + <property name="spacing">6</property> <child> - <object class="GtkLabel" id="filllabel"> + <object class="GtkScale" id="transparencyslider"> <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="tooltip_text" translatable="yes" context="sidebararea|filllabel|tooltip_text">Fill:</property> - <property name="label" translatable="yes" context="sidebararea|filllabel">_Fill:</property> - <property name="use_underline">True</property> - <property name="mnemonic_widget">fillstyle</property> - <property name="xalign">0</property> + <property name="can_focus">True</property> + <property name="tooltip_text" translatable="yes" context="sidebararea|transparencyslider|tooltip_text">Specify 0% for fully opaque through 100% for fully transparent.</property> + <property name="hexpand">True</property> + <property name="adjustment">adjustment4</property> + <property name="round_digits">1</property> + <property name="draw_value">False</property> </object> <packing> - <property name="left_attach">0</property> - <property name="top_attach">0</property> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">0</property> </packing> </child> <child> - <object class="GtkBox" id="box8"> + <object class="GtkSpinButton" id="settransparency"> <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="hexpand">True</property> - <child> - <object class="GtkToolbar" id="selectcolor"> - <property name="can_focus">True</property> - <property name="halign">start</property> - <property name="toolbar_style">icons</property> - <property name="show_arrow">False</property> - <property name="icon_size">2</property> - <child> - <object class="GtkMenuToolButton" id=".uno:FillColor"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="tooltip_text" translatable="yes" context="sidebararea|color|tooltip_text">Select the color to apply.</property> - <property name="use_underline">True</property> - </object> - <packing> - <property name="expand">False</property> - <property name="homogeneous">False</property> - </packing> - </child> - </object> - <packing> - <property name="expand">True</property> - <property name="fill">True</property> - <property name="position">0</property> - </packing> - </child> - <child> - <object class="GtkComboBox" id="fillattr"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="tooltip_text" translatable="yes" context="sidebararea|fillattr|tooltip_text">Select the effect to apply.</property> - <property name="hexpand">True</property> - <property name="model">liststore4</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> - <child internal-child="accessible"> - <object class="AtkObject" id="fillattr-atkobject"> - <property name="AtkObject::accessible-name" translatable="yes" context="sidebararea|fillattr-atkobject">Hatching/Bitmap</property> - </object> - </child> - </object> - <packing> - <property name="expand">True</property> - <property name="fill">True</property> - <property name="position">1</property> - </packing> - </child> - <child> - <object class="GtkMenuButton" id="fillgrad1"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">False</property> - <property name="tooltip_text" translatable="yes" context="sidebararea|fillgrad1|tooltip_text">Fill gradient from.</property> - <property name="valign">center</property> - <property name="hexpand">True</property> - <property name="draw_indicator">True</property> - <property name="label" translatable="no"></property> - <child> - <placeholder/> - </child> + <property name="can_focus">True</property> + <property name="tooltip_text" translatable="yes" context="sidebararea|settransparency|tooltip_text">Specify 0% for fully opaque through 100% for fully transparent.</property> + <property name="adjustment">adjustment1</property> + <child internal-child="accessible"> + <object class="AtkObject" id="settransparency-atkobject"> + <property name="AtkObject::accessible-name" translatable="yes" context="sidebararea|settransparency-atkobject">Transparency</property> </object> - <packing> - <property name="expand">True</property> - <property name="fill">True</property> - <property name="position">2</property> - </packing> </child> </object> <packing> - <property name="left_attach">1</property> - <property name="top_attach">1</property> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">1</property> </packing> </child> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">5</property> + <property name="width">2</property> + </packing> + </child> + <child> + <object class="GtkLabel" id="filllabel"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="tooltip_text" translatable="yes" context="sidebararea|filllabel|tooltip_text">Fill:</property> + <property name="label" translatable="yes" context="sidebararea|filllabel">_Fill:</property> + <property name="use_underline">True</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="GtkComboBoxText" id="fillstyle"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="tooltip_text" translatable="yes" context="sidebararea|fillstyle|tooltip_text">Select the fill type to apply.</property> + <child internal-child="accessible"> + <object class="AtkObject" id="fillstyle-atkobject"> + <property name="AtkObject::accessible-name" translatable="yes" context="sidebararea|fillstyle-atkobject">Fill Type</property> + </object> + </child> + </object> + <packing> + <property name="left_attach">1</property> + <property name="top_attach">0</property> + </packing> + </child> + <child> + <object class="GtkBox" id="box2"> + <property name="visible">True</property> + <property name="can_focus">False</property> <child> - <object class="GtkComboBoxText" id="fillstyle"> + <object class="GtkComboBoxText" id="gradientstyle"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="tooltip_text" translatable="yes" context="sidebararea|fillstyle|tooltip_text">Select the fill type to apply.</property> + <property name="tooltip_text" translatable="yes" context="sidebararea|gradientstyle|tooltip_text">Select the gradient style.</property> + <property name="hexpand">True</property> + <items> + <item translatable="yes" context="sidebararea|gradientstyle">Linear</item> + <item translatable="yes" context="sidebararea|gradientstyle">Axial</item> + <item translatable="yes" context="sidebararea|gradientstyle">Radial</item> + <item translatable="yes" context="sidebararea|gradientstyle">Ellipsoid</item> + <item translatable="yes" context="sidebararea|gradientstyle">Quadratic</item> + <item translatable="yes" context="sidebararea|gradientstyle">Square</item> + </items> <child internal-child="accessible"> - <object class="AtkObject" id="fillstyle-atkobject"> - <property name="AtkObject::accessible-name" translatable="yes" context="sidebararea|fillstyle-atkobject">Fill Type</property> + <object class="AtkObject" id="gradientstyle-atkobject"> + <property name="AtkObject::accessible-name" translatable="yes" context="sidebararea|gradientstyle-atkobject">Gradient Type</property> </object> </child> </object> <packing> - <property name="left_attach">1</property> - <property name="top_attach">0</property> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">0</property> </packing> </child> <child> - <object class="GtkMenuButton" id="fillgrad2"> - <property name="visible">True</property> + <object class="GtkButton" id="bmpimport"> + <property name="label" translatable="yes" context="sidebararea|bmpimport">_Import</property> <property name="can_focus">True</property> - <property name="receives_default">False</property> - <property name="tooltip_text" translatable="yes" context="sidebararea|fillgrad2|tooltip_text">Fill gradient to.</property> - <property name="valign">center</property> + <property name="receives_default">True</property> <property name="hexpand">True</property> - <property name="draw_indicator">True</property> - <property name="label" translatable="no"></property> - <child> - <placeholder/> - </child> + <property name="use_underline">True</property> </object> <packing> - <property name="left_attach">1</property> - <property name="top_attach">2</property> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">1</property> </packing> </child> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">1</property> + </packing> + </child> + <child> + <object class="GtkBox" id="box8"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="hexpand">True</property> <child> - <object class="GtkBox" id="box2"> - <property name="visible">True</property> - <property name="can_focus">False</property> + <object class="GtkToolbar" id="selectcolor"> + <property name="can_focus">True</property> + <property name="halign">start</property> + <property name="toolbar_style">icons</property> + <property name="show_arrow">False</property> + <property name="icon_size">2</property> <child> - <object class="GtkComboBoxText" id="gradientstyle"> + <object class="GtkMenuToolButton" id=".uno:FillColor"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="tooltip_text" translatable="yes" context="sidebararea|gradientstyle|tooltip_text">Select the gradient style.</property> - <items> - <item translatable="yes" context="sidebararea|gradientstyle">Linear</item> - <item translatable="yes" context="sidebararea|gradientstyle">Axial</item> - <item translatable="yes" context="sidebararea|gradientstyle">Radial</item> - <item translatable="yes" context="sidebararea|gradientstyle">Ellipsoid</item> - <item translatable="yes" context="sidebararea|gradientstyle">Quadratic</item> - <item translatable="yes" context="sidebararea|gradientstyle">Square</item> - </items> - <child internal-child="accessible"> - <object class="AtkObject" id="gradientstyle-atkobject"> - <property name="AtkObject::accessible-name" translatable="yes" context="sidebararea|gradientstyle-atkobject">Gradient Type</property> - </object> - </child> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">0</property> - </packing> - </child> - <child> - <object class="GtkButton" id="bmpimport"> - <property name="label" translatable="yes" context="sidebararea|bmpimport">_Import</property> - <property name="can_focus">True</property> - <property name="receives_default">True</property> + <property name="tooltip_text" translatable="yes" context="sidebararea|color|tooltip_text">Select the color to apply.</property> <property name="use_underline">True</property> </object> <packing> <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">1</property> + <property name="homogeneous">False</property> </packing> </child> </object> <packing> - <property name="left_attach">0</property> - <property name="top_attach">1</property> + <property name="expand">True</property> + <property name="fill">True</property> + <property name="position">0</property> </packing> </child> <child> - <object class="GtkSpinButton" id="gradangle"> - <property name="can_focus">True</property> - <property name="tooltip_text" translatable="yes" context="sidebararea|gradangle|tooltip_text">Select the gradient angle.</property> - <property name="adjustment">adjustment2</property> - <child internal-child="accessible"> - <object class="AtkObject" id="gradangle-atkobject"> - <property name="AtkObject::accessible-name" translatable="yes" context="sidebararea|gradangle-atkobject">Gradient angle</property> - </object> - </child> - </object> - <packing> - <property name="left_attach">0</property> - <property name="top_attach">2</property> - </packing> - </child> - <child> - <object class="GtkLabel" id="transparencylabel"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="tooltip_text" translatable="yes" context="sidebararea|transparencylabel|tooltip_text">Transparency</property> - <property name="label" translatable="yes" context="sidebararea|transparencylabel">_Transparency:</property> - <property name="use_underline">True</property> - <property name="xalign">0</property> - </object> - <packing> - <property name="left_attach">0</property> - <property name="top_attach">3</property> - </packing> - </child> - <child> - <object class="GtkComboBoxText" id="transtype"> + <object class="GtkComboBox" id="fillattr"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="tooltip_text" translatable="yes" context="sidebararea|transtype|tooltip_text">Select the type of transparency to apply.</property> - <items> - <item translatable="yes" context="sidebararea|transtype">None</item> - <item translatable="yes" context="sidebararea|transtype">Solid</item> - <item translatable="yes" context="sidebararea|transtype">Linear</item> - <item translatable="yes" context="sidebararea|transtype">Axial</item> - <item translatable="yes" context="sidebararea|transtype">Radial</item> - <item translatable="yes" context="sidebararea|transtype">Ellipsoid</item> - <item translatable="yes" context="sidebararea|transtype">Quadratic</item> - <item translatable="yes" context="sidebararea|transtype">Square</item> - </items> + <property name="tooltip_text" translatable="yes" context="sidebararea|fillattr|tooltip_text">Select the effect to apply.</property> + <property name="hexpand">True</property> + <property name="model">liststore4</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"/> + </child> <child internal-child="accessible"> - <object class="AtkObject" id="transtype-atkobject"> - <property name="AtkObject::accessible-name" translatable="yes" context="sidebararea|transtype-atkobject">Transparency Type</property> + <object class="AtkObject" id="fillattr-atkobject"> + <property name="AtkObject::accessible-name" translatable="yes" context="sidebararea|fillattr-atkobject">Hatching/Bitmap</property> </object> </child> </object> <packing> - <property name="left_attach">1</property> - <property name="top_attach">3</property> + <property name="expand">True</property> + <property name="fill">True</property> + <property name="position">1</property> </packing> </child> <child> - <object class="GtkToolbar" id="selectgradient"> + <object class="GtkMenuButton" id="fillgrad1"> <property name="visible">True</property> <property name="can_focus">True</property> - <property name="halign">start</property> - <property name="toolbar_style">icons</property> - <property name="show_arrow">False</property> - <property name="icon_size">2</property> + <property name="receives_default">False</property> + <property name="tooltip_text" translatable="yes" context="sidebararea|fillgrad1|tooltip_text">Fill gradient from.</property> + <property name="valign">center</property> + <property name="hexpand">True</property> + <property name="draw_indicator">True</property> + <property name="label" translatable="no"></property> <child> - <object class="GtkMenuToolButton" id="sidebargradient"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="tooltip_text" translatable="yes" context="sidebararea|gradient|tooltip_text">Specify the variation of gradient transparency.</property> - <property name="use_underline">True</property> - </object> - <packing> - <property name="expand">False</property> - <property name="homogeneous">False</property> - </packing> + <placeholder/> </child> </object> <packing> - <property name="left_attach">1</property> - <property name="top_attach">4</property> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">2</property> </packing> </child> + </object> + <packing> + <property name="left_attach">1</property> + <property name="top_attach">1</property> + </packing> + </child> + <child> + <object class="GtkSpinButton" id="gradangle"> + <property name="can_focus">True</property> + <property name="tooltip_text" translatable="yes" context="sidebararea|gradangle|tooltip_text">Select the gradient angle.</property> + <property name="hexpand">True</property> + <property name="adjustment">adjustment2</property> + <child internal-child="accessible"> + <object class="AtkObject" id="gradangle-atkobject"> + <property name="AtkObject::accessible-name" translatable="yes" context="sidebararea|gradangle-atkobject">Gradient angle</property> + </object> + </child> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">2</property> + </packing> + </child> + <child> + <object class="GtkMenuButton" id="fillgrad2"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">False</property> + <property name="tooltip_text" translatable="yes" context="sidebararea|fillgrad2|tooltip_text">Fill gradient to.</property> + <property name="valign">center</property> + <property name="draw_indicator">True</property> + <property name="label" translatable="no"></property> <child> <placeholder/> </child> </object> <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">0</property> + <property name="left_attach">1</property> + <property name="top_attach">2</property> </packing> </child> <child> - <object class="GtkGrid" id="grid1"> + <object class="GtkLabel" id="transparencylabel"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="column_spacing">6</property> - <child> - <object class="GtkScale" id="transparencyslider"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="tooltip_text" translatable="yes" context="sidebararea|transparencyslider|tooltip_text">Specify 0% for fully opaque through 100% for fully transparent.</property> - <property name="hexpand">True</property> - <property name="adjustment">adjustment4</property> - <property name="round_digits">1</property> - <property name="draw_value">False</property> + <property name="tooltip_text" translatable="yes" context="sidebararea|transparencylabel|tooltip_text">Transparency</property> + <property name="label" translatable="yes" context="sidebararea|transparencylabel">_Transparency:</property> + <property name="use_underline">True</property> + <property name="xalign">0</property> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">3</property> + </packing> + </child> + <child> + <object class="GtkComboBoxText" id="transtype"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="tooltip_text" translatable="yes" context="sidebararea|transtype|tooltip_text">Select the type of transparency to apply.</property> + <items> + <item translatable="yes" context="sidebararea|transtype">None</item> + <item translatable="yes" context="sidebararea|transtype">Solid</item> + <item translatable="yes" context="sidebararea|transtype">Linear</item> + <item translatable="yes" context="sidebararea|transtype">Axial</item> + <item translatable="yes" context="sidebararea|transtype">Radial</item> + <item translatable="yes" context="sidebararea|transtype">Ellipsoid</item> + <item translatable="yes" context="sidebararea|transtype">Quadratic</item> + <item translatable="yes" context="sidebararea|transtype">Square</item> + </items> + <child internal-child="accessible"> + <object class="AtkObject" id="transtype-atkobject"> + <property name="AtkObject::accessible-name" translatable="yes" context="sidebararea|transtype-atkobject">Transparency Type</property> </object> - <packing> - <property name="left_attach">0</property> - <property name="top_attach">0</property> - <property name="width">3</property> - </packing> </child> + </object> + <packing> + <property name="left_attach">1</property> + <property name="top_attach">3</property> + </packing> + </child> + <child> + <object class="GtkToolbar" id="selectgradient"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="halign">start</property> + <property name="toolbar_style">icons</property> + <property name="show_arrow">False</property> + <property name="icon_size">2</property> <child> - <object class="GtkSpinButton" id="settransparency"> + <object class="GtkMenuToolButton" id="sidebargradient"> <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="tooltip_text" translatable="yes" context="sidebararea|settransparency|tooltip_text">Specify 0% for fully opaque through 100% for fully transparent.</property> - <property name="adjustment">adjustment1</property> - <child internal-child="accessible"> - <object class="AtkObject" id="settransparency-atkobject"> - <property name="AtkObject::accessible-name" translatable="yes" context="sidebararea|settransparency-atkobject">Transparency</property> - </object> - </child> + <property name="can_focus">False</property> + <property name="tooltip_text" translatable="yes" context="sidebararea|gradient|tooltip_text">Specify the variation of gradient transparency.</property> + <property name="use_underline">True</property> </object> <packing> - <property name="left_attach">3</property> - <property name="top_attach">0</property> + <property name="expand">False</property> + <property name="homogeneous">False</property> </packing> </child> </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">4</property> </packing> </child> + <child> + <placeholder/> + </child> </object> <packing> <property name="left_attach">0</property> @@ -380,21 +364,4 @@ </packing> </child> </object> - <object class="GtkSizeGroup" id="sizegroup1"> - <property name="mode">both</property> - <widgets> - <widget name="selectcolor"/> - <widget name="fillattr"/> - </widgets> - </object> - <object class="GtkSizeGroup" id="sizegroup2"> - <property name="ignore_hidden">True</property> - <widgets> - <widget name="filllabel"/> - <widget name="gradientstyle"/> - <widget name="bmpimport"/> - <widget name="gradangle"/> - <widget name="transparencylabel"/> - </widgets> - </object> </interface> |