sc/uiconfig/scalc/ui/sidebaralignment.ui | 292 +++++-------
sc/uiconfig/scalc/ui/sidebarcellappearance.ui | 95 ++--
sc/uiconfig/scalc/ui/sidebarnumberformat.ui | 355 ++++++---------
svx/uiconfig/ui/sidebararea.ui | 172 +++----
svx/uiconfig/ui/sidebareffect.ui | 357 ++++++---------
svx/uiconfig/ui/sidebarfontwork.ui | 47 +-
svx/uiconfig/ui/sidebargraphic.ui | 299 ++++++-------
svx/uiconfig/ui/sidebarline.ui | 595 ++++++++++++--------------
svx/uiconfig/ui/sidebarlists.ui | 62 +-
svx/uiconfig/ui/sidebarparagraph.ui | 145 +++---
svx/uiconfig/ui/sidebarpossize.ui | 343 +++++++-------
svx/uiconfig/ui/sidebarshadow.ui | 387 +++++++---------
svx/uiconfig/ui/sidebarstylespanel.ui | 126 ++---
svx/uiconfig/ui/sidebartextcolumnspanel.ui | 4
svx/uiconfig/ui/sidebartextpanel.ui | 338 +++++++-------
sw/uiconfig/swriter/ui/sidebarwrap.ui | 94 ++--
16 files changed, 1745 insertions(+), 1966 deletions(-)
New commits:
commit 54244efd8c07f55c08fa3781661d3d6db4daa529
Author: andreas kainz <kain...@gmail.com>
AuthorDate: Wed Oct 12 23:29:08 2022 +0200
Commit: Pedro Silva <pedro.si...@collabora.com>
CommitDate: Tue Nov 29 10:28:23 2022 +0100
tdf#148017 harmonize sidebar .ui files
Change-Id: Ia5139f7255ba0e78f7089a4313a41d583ae62961
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/141380
Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoff...@gmail.com>
Reviewed-by: Pedro Silva <pedro.si...@collabora.com>
diff --git a/sc/uiconfig/scalc/ui/sidebaralignment.ui
b/sc/uiconfig/scalc/ui/sidebaralignment.ui
index d5057bbd63c2..573b0db3617c 100644
--- a/sc/uiconfig/scalc/ui/sidebaralignment.ui
+++ b/sc/uiconfig/scalc/ui/sidebaralignment.ui
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!-- Generated with glade 3.22.1 -->
+<!-- Generated with glade 3.40.0 -->
<interface domain="sc">
<requires lib="gtk+" version="3.20"/>
<object class="GtkAdjustment" id="adjustmentIndent">
@@ -32,14 +32,14 @@
<property name="visible">True</property>
<property name="can_focus">False</property>
<child>
- <!-- n-columns=1 n-rows=1 -->
- <object class="GtkGrid">
+ <!-- n-columns=2 n-rows=7 -->
+ <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="row_spacing">3</property>
- <property name="column_spacing">6</property>
+ <property name="border-width">6</property>
+ <property name="row-spacing">3</property>
+ <property name="column-spacing">6</property>
<child>
<object class="GtkBox" id="box3">
<property name="visible">True</property>
@@ -58,6 +58,7 @@
<child>
<object class="GtkToggleToolButton" id=".uno:AlignLeft">
<property name="visible">True</property>
+ <property name="can-focus">False</property>
<property name="valign">start</property>
<property name="use_underline">True</property>
</object>
@@ -69,7 +70,8 @@
<child>
<object class="GtkToggleToolButton"
id=".uno:AlignHorizontalCenter">
<property name="visible">True</property>
- <property name="use_underline">True</property>
+ <property name="can-focus">False</property>
+ <property name="use-underline">True</property>
</object>
<packing>
<property name="expand">False</property>
@@ -79,7 +81,8 @@
<child>
<object class="GtkToggleToolButton" id=".uno:AlignRight">
<property name="visible">True</property>
- <property name="use_underline">True</property>
+ <property name="can-focus">False</property>
+ <property name="use-underline">True</property>
</object>
<packing>
<property name="expand">False</property>
@@ -89,7 +92,8 @@
<child>
<object class="GtkToggleToolButton" id=".uno:AlignBlock">
<property name="visible">True</property>
- <property name="use_underline">True</property>
+ <property name="can-focus">False</property>
+ <property name="use-underline">True</property>
</object>
<packing>
<property name="expand">False</property>
@@ -115,7 +119,8 @@
<child>
<object class="GtkToggleToolButton" id=".uno:AlignTop">
<property name="visible">True</property>
- <property name="use_underline">True</property>
+ <property name="can-focus">False</property>
+ <property name="use-underline">True</property>
</object>
<packing>
<property name="expand">False</property>
@@ -125,7 +130,8 @@
<child>
<object class="GtkToggleToolButton" id=".uno:AlignVCenter">
<property name="visible">True</property>
- <property name="use_underline">True</property>
+ <property name="can-focus">False</property>
+ <property name="use-underline">True</property>
</object>
<packing>
<property name="expand">False</property>
@@ -135,7 +141,8 @@
<child>
<object class="GtkToggleToolButton" id=".uno:AlignBottom">
<property name="visible">True</property>
- <property name="use_underline">True</property>
+ <property name="can-focus">False</property>
+ <property name="use-underline">True</property>
</object>
<packing>
<property name="expand">False</property>
@@ -160,7 +167,8 @@
<child>
<object class="GtkToggleToolButton"
id=".uno:ParaLeftToRight">
<property name="visible">True</property>
- <property name="use_underline">True</property>
+ <property name="can-focus">False</property>
+ <property name="use-underline">True</property>
</object>
<packing>
<property name="expand">False</property>
@@ -170,7 +178,8 @@
<child>
<object class="GtkToggleToolButton"
id=".uno:ParaRightToLeft">
<property name="visible">True</property>
- <property name="use_underline">True</property>
+ <property name="can-focus">False</property>
+ <property name="use-underline">True</property>
</object>
<packing>
<property name="expand">False</property>
@@ -187,62 +196,23 @@
</child>
</object>
<packing>
- <property name="left_attach">0</property>
- <property name="top_attach">0</property>
+ <property name="left-attach">0</property>
+ <property name="top-attach">0</property>
<property name="width">2</property>
</packing>
</child>
- <child>
- <object class="GtkSpinButton" id="orientationdegrees">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="tooltip_text" translatable="yes"
context="sidebaralignment|orientationdegrees|tooltip_text">Select the angle for
rotation.</property>
- <property name="halign">end</property>
- <property name="adjustment">adjustmentSpinDegrees</property>
- <property name="wrap">True</property>
- <property name="truncate-multiline">True</property>
- <child internal-child="accessible">
- <object class="AtkObject" id="orientationdegrees-atkobject">
- <property name="AtkObject::accessible-name" translatable="yes"
context="sidebaralignment|orientationdegrees-atkobject">Text
Orientation</property>
- </object>
- </child>
- </object>
- <packing>
- <property name="left_attach">1</property>
- <property name="top_attach">4</property>
- </packing>
- </child>
- <child>
- <object class="GtkSpinButton" id="leftindent">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="tooltip_text" translatable="yes"
context="sidebaralignment|leftindent|tooltip_text">Indents from the left
edge.</property>
- <property name="halign">end</property>
- <property name="valign">center</property>
- <property name="adjustment">adjustmentIndent</property>
- <property name="truncate-multiline">True</property>
- <child internal-child="accessible">
- <object class="AtkObject" id="leftindent-atkobject">
- <property name="AtkObject::accessible-name" translatable="yes"
context="sidebaralignment|leftindent-atkobject">Left Indent</property>
- </object>
- </child>
- </object>
- <packing>
- <property name="left_attach">1</property>
- <property name="top_attach">1</property>
- </packing>
- </child>
<child>
<object class="GtkToolbar" id="indentbuttons">
<property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="toolbar_style">icons</property>
- <property name="show_arrow">False</property>
+ <property name="can-focus">True</property>
+ <property name="toolbar-style">icons</property>
+ <property name="show-arrow">False</property>
<property name="icon_size">2</property>
<child>
<object class="GtkToolButton" id=".uno:IncrementIndent">
<property name="visible">True</property>
- <property name="use_underline">True</property>
+ <property name="can-focus">False</property>
+ <property name="use-underline">True</property>
</object>
<packing>
<property name="expand">False</property>
@@ -252,7 +222,8 @@
<child>
<object class="GtkToolButton" id=".uno:DecrementIndent">
<property name="visible">True</property>
- <property name="use_underline">True</property>
+ <property name="can-focus">False</property>
+ <property name="use-underline">True</property>
</object>
<packing>
<property name="expand">False</property>
@@ -261,128 +232,116 @@
</child>
</object>
<packing>
- <property name="left_attach">0</property>
- <property name="top_attach">1</property>
+ <property name="left-attach">0</property>
+ <property name="top-attach">1</property>
</packing>
</child>
<child>
- <object class="GtkSeparator" id="separator1">
+ <object class="GtkLabel" id="orientationlabel">
<property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="margin-start">3</property>
- <property name="margin-end">3</property>
+ <property name="can-focus">False</property>
+ <property name="label" translatable="yes"
context="sidebaralignment|orientationlabel">Text _orientation:</property>
+ <property name="use-underline">True</property>
+ <property name="mnemonic-widget">orientationdegrees</property>
+ <property name="xalign">0</property>
</object>
<packing>
- <property name="left_attach">0</property>
- <property name="top_attach">3</property>
- <property name="width">2</property>
+ <property name="left-attach">0</property>
+ <property name="top-attach">2</property>
</packing>
</child>
<child>
- <object class="GtkLabel" id="orientationlabel">
+ <object class="GtkSpinButton" id="orientationdegrees">
<property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="label" translatable="yes"
context="sidebaralignment|orientationlabel">Text _orientation:</property>
- <property name="use_underline">True</property>
- <property name="mnemonic_widget">orientationdegrees</property>
- <property name="xalign">0</property>
+ <property name="can-focus">True</property>
+ <property name="tooltip-text" translatable="yes"
context="sidebaralignment|orientationdegrees|tooltip_text">Select the angle for
rotation.</property>
+ <property name="hexpand">True</property>
+ <property name="truncate-multiline">True</property>
+ <property name="adjustment">adjustmentSpinDegrees</property>
+ <property name="wrap">True</property>
</object>
<packing>
- <property name="left_attach">0</property>
- <property name="top_attach">4</property>
+ <property name="left-attach">1</property>
+ <property name="top-attach">2</property>
</packing>
</child>
<child>
- <object class="GtkBox">
+ <object class="GtkCheckButton" id="stacked">
+ <property name="label" translatable="yes"
context="sidebaralignment|stacked">Vertically stacked</property>
<property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="spacing">6</property>
+ <property name="can-focus">True</property>
+ <property name="receives-default">False</property>
+ <property name="halign">start</property>
+ <property name="use-underline">True</property>
+ <property name="draw-indicator">True</property>
+ </object>
+ <packing>
+ <property name="left-attach">0</property>
+ <property name="top-attach">3</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkBox" id="textorientbox">
+ <property name="visible">True</property>
+ <property name="can-focus">False</property>
+ <property name="halign">end</property>
+ <property name="spacing">3</property>
<child>
- <object class="GtkCheckButton" id="stacked">
- <property name="label" translatable="yes"
context="sidebaralignment|stacked">Vertically stacked</property>
+ <object class="GtkToggleButton" id="bottom">
<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="draw_indicator">True</property>
+ <property name="can-focus">True</property>
+ <property name="focus-on-click">False</property>
+ <property name="receives-default">False</property>
+ <property name="tooltip-text" translatable="yes"
context="sidebaralignment|bottom|tooltip_text">Text Extension From Lower Cell
Border</property>
+ <property name="image">image3</property>
+ <property name="use-underline">True</property>
+ <property name="always-show-image">True</property>
</object>
<packing>
<property name="expand">False</property>
- <property name="fill">True</property>
+ <property name="fill">False</property>
<property name="position">0</property>
</packing>
</child>
<child>
- <object class="GtkBox" id="textorientbox">
+ <object class="GtkToggleButton" id="top">
<property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="valign">center</property>
- <property name="spacing">3</property>
- <child>
- <object class="GtkToggleButton" id="bottom">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="focus_on_click">False</property>
- <property name="receives_default">False</property>
- <property name="tooltip_text" translatable="yes"
context="sidebaralignment|bottom|tooltip_text">Text Extension From Lower Cell
Border</property>
- <property name="image">image3</property>
- <property name="use_underline">True</property>
- <property name="always_show_image">True</property>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <object class="GtkToggleButton" id="top">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="focus_on_click">False</property>
- <property name="receives_default">False</property>
- <property name="tooltip_text" translatable="yes"
context="sidebaralignment|top|tooltip_text">Text Extension From Upper Cell
Border</property>
- <property name="image">image2</property>
- <property name="use_underline">True</property>
- <property name="always_show_image">True</property>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">1</property>
- </packing>
- </child>
- <child>
- <object class="GtkToggleButton" id="standard">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="focus_on_click">False</property>
- <property name="receives_default">False</property>
- <property name="tooltip_text" translatable="yes"
context="sidebaralignment|standard|tooltip_text">Text Extension Inside
Cell</property>
- <property name="image">image1</property>
- <property name="use_underline">True</property>
- <property name="always_show_image">True</property>
- <property name="active">True</property>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">2</property>
- </packing>
- </child>
+ <property name="can-focus">True</property>
+ <property name="focus-on-click">False</property>
+ <property name="receives-default">False</property>
+ <property name="tooltip-text" translatable="yes"
context="sidebaralignment|top|tooltip_text">Text Extension From Upper Cell
Border</property>
+ <property name="image">image2</property>
+ <property name="use-underline">True</property>
+ <property name="always-show-image">True</property>
</object>
<packing>
<property name="expand">False</property>
- <property name="fill">True</property>
- <property name="pack_type">end</property>
+ <property name="fill">False</property>
<property name="position">1</property>
</packing>
</child>
+ <child>
+ <object class="GtkToggleButton" id="standard">
+ <property name="visible">True</property>
+ <property name="can-focus">True</property>
+ <property name="focus-on-click">False</property>
+ <property name="receives-default">False</property>
+ <property name="tooltip-text" translatable="yes"
context="sidebaralignment|standard|tooltip_text">Text Extension Inside
Cell</property>
+ <property name="image">image1</property>
+ <property name="use-underline">True</property>
+ <property name="always-show-image">True</property>
+ <property name="active">True</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">2</property>
+ </packing>
+ </child>
</object>
<packing>
- <property name="left_attach">0</property>
- <property name="top_attach">5</property>
- <property name="width">2</property>
+ <property name="left-attach">1</property>
+ <property name="top-attach">3</property>
</packing>
</child>
<child>
@@ -397,8 +356,9 @@
<property name="draw_indicator">True</property>
</object>
<packing>
- <property name="left_attach">1</property>
- <property name="top_attach">2</property>
+ <property name="left-attach">0</property>
+ <property name="top-attach">4</property>
+ <property name="width">2</property>
</packing>
</child>
<child>
@@ -412,8 +372,23 @@
<property name="draw_indicator">True</property>
</object>
<packing>
- <property name="left_attach">0</property>
- <property name="top_attach">2</property>
+ <property name="left-attach">0</property>
+ <property name="top-attach">5</property>
+ <property name="width">2</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkSpinButton" id="leftindent">
+ <property name="visible">True</property>
+ <property name="can-focus">True</property>
+ <property name="tooltip-text" translatable="yes"
context="sidebaralignment|leftindent|tooltip_text">Indents from the left
edge.</property>
+ <property name="hexpand">True</property>
+ <property name="truncate-multiline">True</property>
+ <property name="adjustment">adjustmentIndent</property>
+ </object>
+ <packing>
+ <property name="left-attach">1</property>
+ <property name="top-attach">1</property>
</packing>
</child>
<child>
@@ -425,8 +400,9 @@
<property name="xalign">0</property>
</object>
<packing>
- <property name="left_attach">1</property>
- <property name="top_attach">6</property>
+ <property name="left-attach">0</property>
+ <property name="top-attach">6</property>
+ <property name="width">2</property>
</packing>
</child>
<child>
@@ -439,10 +415,4 @@
</packing>
</child>
</object>
- <object class="GtkSizeGroup" id="sizegroupWidget">
- <widgets>
- <widget name="leftindent"/>
- <widget name="orientationdegrees"/>
- </widgets>
- </object>
</interface>
diff --git a/sc/uiconfig/scalc/ui/sidebarcellappearance.ui
b/sc/uiconfig/scalc/ui/sidebarcellappearance.ui
index 868c950e81f0..a2e081827d9f 100644
--- a/sc/uiconfig/scalc/ui/sidebarcellappearance.ui
+++ b/sc/uiconfig/scalc/ui/sidebarcellappearance.ui
@@ -1,50 +1,50 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!-- Generated with glade 3.22.1 -->
+<!-- Generated with glade 3.40.0 -->
<interface domain="sc">
<requires lib="gtk+" version="3.20"/>
<!-- n-columns=1 n-rows=1 -->
<object class="GtkGrid" id="CellAppearancePropertyPanel">
<property name="visible">True</property>
- <property name="can_focus">False</property>
+ <property name="can-focus">False</property>
<child>
- <!-- n-columns=1 n-rows=1 -->
- <object class="GtkGrid">
+ <!-- n-columns=2 n-rows=3 -->
+ <object class="GtkGrid" id="grid1">
<property name="visible">True</property>
- <property name="can_focus">False</property>
+ <property name="can-focus">False</property>
<property name="hexpand">True</property>
- <property name="border_width">6</property>
- <property name="row_spacing">3</property>
- <property name="column_spacing">6</property>
- <property name="column_homogeneous">True</property>
+ <property name="border-width">6</property>
+ <property name="row-spacing">3</property>
+ <property name="column-spacing">6</property>
<child>
<object class="GtkLabel" id="cellbackgroundlabel">
<property name="visible">True</property>
- <property name="can_focus">False</property>
+ <property name="can-focus">False</property>
<property name="label" translatable="yes"
context="sidebarcellappearance|cellbackgroundlabel">_Background:</property>
- <property name="use_underline">True</property>
- <property name="mnemonic_widget">cellbackgroundcolor</property>
+ <property name="use-underline">True</property>
+ <property name="mnemonic-widget">cellbackgroundcolor</property>
<property name="xalign">0</property>
</object>
<packing>
- <property name="left_attach">0</property>
- <property name="top_attach">0</property>
+ <property name="left-attach">0</property>
+ <property name="top-attach">0</property>
</packing>
</child>
<child>
<object class="GtkToolbar" id="cellbackgroundcolor">
<property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="tooltip_text" translatable="yes"
context="sidebarcellappearance|cellbackgroundcolor|tooltip_text">Select the
background color of the selected cells.</property>
+ <property name="can-focus">True</property>
+ <property name="tooltip-text" translatable="yes"
context="sidebarcellappearance|cellbackgroundcolor|tooltip_text">Select the
background color of the selected cells.</property>
<property name="halign">end</property>
<property name="hexpand">True</property>
- <property name="toolbar_style">icons</property>
- <property name="show_arrow">False</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:BackgroundColor">
<property name="visible">True</property>
- <property name="tooltip_text" translatable="yes"
context="sidebarcellappearance|cellbackground|tooltip_text">Select the
background color of the selected cells.</property>
- <property name="use_underline">True</property>
+ <property name="can-focus">False</property>
+ <property name="tooltip-text" translatable="yes"
context="sidebarcellappearance|cellbackground|tooltip_text">Select the
background color of the selected cells.</property>
+ <property name="use-underline">True</property>
</object>
<packing>
<property name="expand">False</property>
@@ -53,25 +53,26 @@
</child>
</object>
<packing>
- <property name="left_attach">1</property>
- <property name="top_attach">0</property>
+ <property name="left-attach">1</property>
+ <property name="top-attach">0</property>
</packing>
</child>
<child>
<object class="GtkToolbar" id="cellbordertype">
<property name="visible">True</property>
- <property name="can_focus">True</property>
+ <property name="can-focus">True</property>
<property name="valign">start</property>
- <property name="toolbar_style">icons</property>
- <property name="show_arrow">False</property>
+ <property name="toolbar-style">icons</property>
+ <property name="show-arrow">False</property>
<property name="icon_size">2</property>
<child>
<object class="GtkMenuToolButton" id="SetBorderStyle">
<property name="visible">True</property>
- <property name="tooltip_text" translatable="yes"
context="sidebarcellappearance|bordertype|tooltip_text">Specify the borders of
the selected cells.</property>
+ <property name="can-focus">False</property>
+ <property name="tooltip-text" translatable="yes"
context="sidebarcellappearance|bordertype|tooltip_text">Specify the borders of
the selected cells.</property>
<property name="halign">start</property>
<property name="valign">start</property>
- <property name="use_underline">True</property>
+ <property name="use-underline">True</property>
</object>
<packing>
<property name="expand">True</property>
@@ -80,26 +81,27 @@
</child>
</object>
<packing>
- <property name="left_attach">0</property>
- <property name="top_attach">1</property>
+ <property name="left-attach">0</property>
+ <property name="top-attach">1</property>
<property name="height">2</property>
</packing>
</child>
<child>
<object class="GtkToolbar" id="borderlinecolor">
<property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="tooltip_text" translatable="yes"
context="sidebarcellappearance|borderlinecolor|tooltip_text">Select the line
color of the borders.</property>
+ <property name="can-focus">True</property>
+ <property name="tooltip-text" translatable="yes"
context="sidebarcellappearance|borderlinecolor|tooltip_text">Select the line
color of the borders.</property>
<property name="halign">end</property>
<property name="hexpand">True</property>
- <property name="toolbar_style">icons</property>
- <property name="show_arrow">False</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:FrameLineColor">
<property name="visible">True</property>
- <property name="tooltip_text" translatable="yes"
context="sidebarcellappearance|linecolor|tooltip_text">Select the line color of
the borders.</property>
- <property name="use_underline">True</property>
+ <property name="can-focus">False</property>
+ <property name="tooltip-text" translatable="yes"
context="sidebarcellappearance|linecolor|tooltip_text">Select the line color of
the borders.</property>
+ <property name="use-underline">True</property>
</object>
<packing>
<property name="expand">False</property>
@@ -113,24 +115,25 @@
</child>
</object>
<packing>
- <property name="left_attach">1</property>
- <property name="top_attach">2</property>
+ <property name="left-attach">1</property>
+ <property name="top-attach">2</property>
</packing>
</child>
<child>
<object class="GtkToolbar" id="borderlinestyle">
<property name="visible">True</property>
- <property name="can_focus">True</property>
+ <property name="can-focus">True</property>
<property name="halign">end</property>
<property name="hexpand">True</property>
- <property name="toolbar_style">icons</property>
- <property name="show_arrow">False</property>
+ <property name="toolbar-style">icons</property>
+ <property name="show-arrow">False</property>
<property name="icon_size">2</property>
<child>
<object class="GtkMenuToolButton" id="LineStyle">
<property name="visible">True</property>
- <property name="tooltip_text" translatable="yes"
context="sidebarcellappearance|linestyle|tooltip_text">Select the line style of
the borders.</property>
- <property name="use_underline">True</property>
+ <property name="can-focus">False</property>
+ <property name="tooltip-text" translatable="yes"
context="sidebarcellappearance|linestyle|tooltip_text">Select the line style of
the borders.</property>
+ <property name="use-underline">True</property>
</object>
<packing>
<property name="expand">False</property>
@@ -144,14 +147,14 @@
</child>
</object>
<packing>
- <property name="left_attach">1</property>
- <property name="top_attach">1</property>
+ <property name="left-attach">1</property>
+ <property name="top-attach">1</property>
</packing>
</child>
</object>
<packing>
- <property name="left_attach">0</property>
- <property name="top_attach">0</property>
+ <property name="left-attach">0</property>
+ <property name="top-attach">0</property>
</packing>
</child>
</object>
diff --git a/sc/uiconfig/scalc/ui/sidebarnumberformat.ui
b/sc/uiconfig/scalc/ui/sidebarnumberformat.ui
index 09892aca1b9a..52d3c53bd186 100644
--- a/sc/uiconfig/scalc/ui/sidebarnumberformat.ui
+++ b/sc/uiconfig/scalc/ui/sidebarnumberformat.ui
@@ -1,147 +1,123 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!-- Generated with glade 3.22.1 -->
+<!-- Generated with glade 3.22.2 -->
<interface domain="sc">
<requires lib="gtk+" version="3.20"/>
- <!-- n-columns=1 n-rows=1 -->
+ <object class="GtkAdjustment" id="adjustment1">
+ <property name="upper">20</property>
+ <property name="step_increment">1</property>
+ <property name="page_increment">10</property>
+ </object>
+ <object class="GtkAdjustment" id="adjustment2">
+ <property name="upper">8</property>
+ <property name="step_increment">1</property>
+ <property name="page_increment">1</property>
+ </object>
+ <object class="GtkAdjustment" id="adjustment3">
+ <property name="upper">20</property>
+ <property name="step_increment">1</property>
+ <property name="page_increment">10</property>
+ </object>
<object class="GtkGrid" id="NumberFormatPropertyPanel">
<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">6</property>
+ <property name="row_spacing">3</property>
+ <property name="column_spacing">6</property>
<child>
- <object class="GtkBox">
+ <object class="GtkToolbar" id="numberformat">
<property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="spacing">6</property>
+ <property name="can_focus">True</property>
+ <property name="toolbar_style">icons</property>
+ <property name="show_arrow">False</property>
+ <property name="icon_size">2</property>
<child>
- <object class="GtkToolbar" id="numberformat">
+ <object class="GtkToggleToolButton"
id=".uno:NumberFormatDecimal">
<property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="toolbar_style">icons</property>
- <property name="show_arrow">False</property>
- <property name="icon_size">2</property>
- <child>
- <object class="GtkToggleToolButton"
id=".uno:NumberFormatDecimal">
- <property name="visible">True</property>
- <property name="use_underline">True</property>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="homogeneous">False</property>
- </packing>
- </child>
- <child>
- <object class="GtkToggleToolButton"
id=".uno:NumberFormatPercent">
- <property name="visible">True</property>
- <property name="use_underline">True</property>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="homogeneous">False</property>
- </packing>
- </child>
- <child>
- <object class="GtkMenuToolButton"
id=".uno:NumberFormatCurrency">
- <property name="visible">True</property>
- <property name="use_underline">True</property>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="homogeneous">False</property>
- </packing>
- </child>
+ <property name="can_focus">False</property>
+ <property name="use_underline">True</property>
</object>
<packing>
<property name="expand">False</property>
- <property name="fill">True</property>
- <property name="position">0</property>
+ <property name="homogeneous">False</property>
</packing>
</child>
<child>
- <object class="GtkComboBoxText" id="numberformatcombobox">
+ <object class="GtkToggleToolButton"
id=".uno:NumberFormatPercent">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="tooltip_text" translatable="yes"
context="sidebarnumberformat|numberformatcombobox|tooltip_text">Select a
category of contents.</property>
- <property name="valign">center</property>
- <property name="hexpand">True</property>
- <items>
- <item translatable="yes"
context="sidebarnumberformat|numberformatcombobox">General</item>
- <item translatable="yes"
context="sidebarnumberformat|numberformatcombobox">Number</item>
- <item translatable="yes"
context="sidebarnumberformat|numberformatcombobox">Percent</item>
- <item translatable="yes"
context="sidebarnumberformat|numberformatcombobox">Currency</item>
- <item translatable="yes"
context="sidebarnumberformat|numberformatcombobox">Date </item>
- <item translatable="yes"
context="sidebarnumberformat|numberformatcombobox">Time</item>
- <item translatable="yes"
context="sidebarnumberformat|numberformatcombobox">Scientific</item>
- <item translatable="yes"
context="sidebarnumberformat|numberformatcombobox">Fraction</item>
- <item translatable="yes"
context="sidebarnumberformat|numberformatcombobox">Boolean Value</item>
- <item translatable="yes"
context="sidebarnumberformat|numberformatcombobox">Text</item>
- </items>
- <child internal-child="accessible">
- <object class="AtkObject"
id="numberformatcombobox-atkobject">
- <property name="AtkObject::accessible-name"
translatable="yes"
context="sidebarnumberformat|numberformatcombobox-atkobject">Category</property>
- </object>
- </child>
+ <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>
+ <child>
+ <object class="GtkMenuToolButton" id=".uno:NumberFormatCurrency">
+ <property name="visible">True</property>
+ <property name="can_focus">False</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">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>
- <object class="GtkBox">
+ <object class="GtkComboBoxText" id="numberformatcombobox">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="spacing">6</property>
+ <property name="tooltip_text" translatable="yes"
context="sidebarnumberformat|numberformatcombobox|tooltip_text">Select a
category of contents.</property>
+ <property name="valign">center</property>
+ <property name="hexpand">True</property>
+ <items>
+ <item translatable="yes"
context="sidebarnumberformat|numberformatcombobox">General</item>
+ <item translatable="yes"
context="sidebarnumberformat|numberformatcombobox">Number</item>
+ <item translatable="yes"
context="sidebarnumberformat|numberformatcombobox">Percent</item>
+ <item translatable="yes"
context="sidebarnumberformat|numberformatcombobox">Currency</item>
+ <item translatable="yes"
context="sidebarnumberformat|numberformatcombobox">Date </item>
+ <item translatable="yes"
context="sidebarnumberformat|numberformatcombobox">Time</item>
+ <item translatable="yes"
context="sidebarnumberformat|numberformatcombobox">Scientific</item>
+ <item translatable="yes"
context="sidebarnumberformat|numberformatcombobox">Fraction</item>
+ <item translatable="yes"
context="sidebarnumberformat|numberformatcombobox">Boolean Value</item>
+ <item translatable="yes"
context="sidebarnumberformat|numberformatcombobox">Text</item>
+ </items>
+ <child internal-child="accessible">
+ <object class="AtkObject" id="numberformatcombobox-atkobject">
+ <property name="AtkObject::accessible-name" translatable="yes"
context="sidebarnumberformat|numberformatcombobox-atkobject">Category</property>
+ </object>
+ </child>
+ </object>
+ <packing>
+ <property name="left_attach">1</property>
+ <property name="top_attach">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkBox" id="box4">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="valign">center</property>
+ <property name="orientation">vertical</property>
<child>
- <object class="GtkBox" id="box4">
+ <object class="GtkLabel" id="decimalplaceslabel">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="valign">center</property>
- <property name="orientation">vertical</property>
- <child>
- <object class="GtkLabel" id="decimalplaceslabel">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="label" translatable="yes"
context="sidebarnumberformat|decimalplaceslabel">_Decimal places:</property>
- <property name="use_underline">True</property>
- <property name="mnemonic_widget">decimalplaces</property>
- <property name="xalign">0</property>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <object class="GtkLabel" id="denominatorplaceslabel">
- <property name="can_focus">False</property>
- <property name="label" translatable="yes"
context="sidebarnumberformat|denominatorplaceslabel">Den_ominator
places:</property>
- <property name="use_underline">True</property>
- <property
name="mnemonic_widget">denominatorplaces</property>
- <property name="xalign">0</property>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="position">0</property>
- </packing>
- </child>
+ <property name="label" translatable="yes"
context="sidebarnumberformat|decimalplaceslabel">_Decimal places:</property>
+ <property name="use_underline">True</property>
+ <property name="mnemonic_widget">decimalplaces</property>
+ <property name="xalign">0</property>
</object>
<packing>
<property name="expand">False</property>
@@ -150,94 +126,60 @@
</packing>
</child>
<child>
- <object class="GtkBox" id="box2">
- <property name="visible">True</property>
+ <object class="GtkLabel" id="denominatorplaceslabel">
<property name="can_focus">False</property>
- <property name="valign">center</property>
- <property name="hexpand">True</property>
- <property name="orientation">vertical</property>
- <child>
- <object class="GtkSpinButton" id="denominatorplaces">
- <property name="can_focus">True</property>
- <property name="tooltip_text" translatable="yes"
context="sidebarnumberformat|denominatorplaces|tooltip_text">Enter the number
of places for the denominator that you want to display.</property>
- <property name="adjustment">adjustment2</property>
- <property name="truncate-multiline">True</property>
- <child internal-child="accessible">
- <object class="AtkObject"
id="denominatorplaces-atkobject">
- <property name="AtkObject::accessible-name"
translatable="yes"
context="sidebarnumberformat|denominatorplaces-atkobject">Denominator
Places</property>
- </object>
- </child>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="position">1</property>
- </packing>
- </child>
- <child>
- <object class="GtkSpinButton" id="decimalplaces">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="tooltip_text" translatable="yes"
context="sidebarnumberformat|decimalplaces|tooltip_text">Enter the number of
decimal places that you want to display.</property>
- <property name="adjustment">adjustment3</property>
- <property name="truncate-multiline">True</property>
- <child internal-child="accessible">
- <object class="AtkObject" id="decimalplaces-atkobject">
- <property name="AtkObject::accessible-name"
translatable="yes"
context="sidebarnumberformat|decimalplaces-atkobject">Decimal Places</property>
- </object>
- </child>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="position">1</property>
- </packing>
- </child>
+ <property name="label" translatable="yes"
context="sidebarnumberformat|denominatorplaceslabel">Den_ominator
places:</property>
+ <property name="use_underline">True</property>
+ <property name="mnemonic_widget">denominatorplaces</property>
+ <property name="xalign">0</property>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
- <property name="position">1</property>
+ <property name="position">0</property>
</packing>
</child>
</object>
<packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="position">1</property>
+ <property name="left_attach">0</property>
+ <property name="top_attach">1</property>
</packing>
</child>
<child>
- <object class="GtkBox" id="box5">
+ <object class="GtkBox" id="box2">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="spacing">6</property>
+ <property name="valign">center</property>
+ <property name="hexpand">True</property>
+ <property name="orientation">vertical</property>
<child>
- <object class="GtkLabel" id="leadingzeroeslabel">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="label" translatable="yes"
context="sidebarnumberformat|leadingzeroeslabel">Leading _zeroes:</property>
- <property name="use_underline">True</property>
- <property name="mnemonic_widget">leadingzeroes</property>
- <property name="xalign">0</property>
+ <object class="GtkSpinButton" id="denominatorplaces">
+ <property name="can_focus">True</property>
+ <property name="tooltip_text" translatable="yes"
context="sidebarnumberformat|denominatorplaces|tooltip_text">Enter the number
of places for the denominator that you want to display.</property>
+ <property name="truncate_multiline">True</property>
+ <property name="adjustment">adjustment2</property>
+ <child internal-child="accessible">
+ <object class="AtkObject" id="denominatorplaces-atkobject">
+ <property name="AtkObject::accessible-name"
translatable="yes"
context="sidebarnumberformat|denominatorplaces-atkobject">Denominator
Places</property>
+ </object>
+ </child>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
- <property name="position">0</property>
+ <property name="position">1</property>
</packing>
</child>
<child>
- <object class="GtkSpinButton" id="leadingzeroes">
+ <object class="GtkSpinButton" id="decimalplaces">
<property name="visible">True</property>
<property name="can_focus">True</property>
- <property name="tooltip_text" translatable="yes"
context="sidebarnumberformat|leadingzeroes|tooltip_text">Enter the maximum
number of zeroes to display before the decimal point.</property>
- <property name="hexpand">True</property>
- <property name="adjustment">adjustment1</property>
- <property name="truncate-multiline">True</property>
+ <property name="tooltip_text" translatable="yes"
context="sidebarnumberformat|decimalplaces|tooltip_text">Enter the number of
decimal places that you want to display.</property>
+ <property name="truncate_multiline">True</property>
+ <property name="adjustment">adjustment3</property>
<child internal-child="accessible">
- <object class="AtkObject" id="leadingzeroes-atkobject">
- <property name="AtkObject::accessible-name"
translatable="yes"
context="sidebarnumberformat|leadingzeroes-atkobject">Leading Zeroes</property>
+ <object class="AtkObject" id="decimalplaces-atkobject">
+ <property name="AtkObject::accessible-name"
translatable="yes"
context="sidebarnumberformat|decimalplaces-atkobject">Decimal Places</property>
</object>
</child>
</object>
@@ -249,9 +191,40 @@
</child>
</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>
+ <object class="GtkLabel" id="leadingzeroeslabel">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label" translatable="yes"
context="sidebarnumberformat|leadingzeroeslabel">Leading _zeroes:</property>
+ <property name="use_underline">True</property>
+ <property name="xalign">0</property>
+ </object>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="top_attach">2</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkSpinButton" id="leadingzeroes">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="tooltip_text" translatable="yes"
context="sidebarnumberformat|leadingzeroes|tooltip_text">Enter the maximum
number of zeroes to display before the decimal point.</property>
+ <property name="hexpand">True</property>
+ <property name="truncate_multiline">True</property>
+ <property name="adjustment">adjustment1</property>
+ <child internal-child="accessible">
+ <object class="AtkObject" id="leadingzeroes-atkobject">
+ <property name="AtkObject::accessible-name" translatable="yes"
context="sidebarnumberformat|leadingzeroes-atkobject">Leading Zeroes</property>
+ </object>
+ </child>
+ </object>
+ <packing>
+ <property name="left_attach">1</property>
+ <property name="top_attach">2</property>
</packing>
</child>
<child>
@@ -261,13 +234,14 @@
<property name="can_focus">True</property>
<property name="receives_default">False</property>
<property name="tooltip_text" translatable="yes"
context="sidebarnumberformat|negativenumbersred|tooltip_text">Changes the font
color of negative numbers to red.</property>
+ <property name="halign">start</property>
<property name="use_underline">True</property>
<property name="draw_indicator">True</property>
</object>
<packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="position">4</property>
+ <property name="left_attach">0</property>
+ <property name="top_attach">3</property>
+ <property name="width">2</property>
</packing>
</child>
<child>
@@ -277,13 +251,14 @@
<property name="can_focus">True</property>
<property name="receives_default">False</property>
<property name="tooltip_text" translatable="yes"
context="sidebarnumberformat|thousandseparator|tooltip_text">Inserts a
separator between thousands.</property>
+ <property name="halign">start</property>
<property name="use_underline">True</property>
<property name="draw_indicator">True</property>
</object>
<packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="position">5</property>
+ <property name="left_attach">0</property>
+ <property name="top_attach">4</property>
+ <property name="width">2</property>
</packing>
</child>
<child>
@@ -292,13 +267,14 @@
<property name="can_focus">True</property>
<property name="receives_default">False</property>
<property name="tooltip_text" translatable="yes"
context="sidebarnumberformat|engineeringnotation|tooltip_text">Ensures that
exponent is a multiple of 3.</property>
+ <property name="halign">start</property>
<property name="use_underline">True</property>
<property name="draw_indicator">True</property>
</object>
<packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="position">5</property>
+ <property name="left_attach">0</property>
+ <property name="top_attach">5</property>
+ <property name="width">2</property>
</packing>
</child>
</object>
@@ -315,19 +291,4 @@
<widget name="numberformat"/>
</widgets>
</object>
- <object class="GtkAdjustment" id="adjustment1">
- <property name="upper">20</property>
- <property name="step_increment">1</property>
- <property name="page_increment">10</property>
- </object>
- <object class="GtkAdjustment" id="adjustment2">
- <property name="upper">8</property>
- <property name="step_increment">1</property>
- <property name="page_increment">1</property>
- </object>
- <object class="GtkAdjustment" id="adjustment3">
- <property name="upper">20</property>
- <property name="step_increment">1</property>
- <property name="page_increment">10</property>
- </object>
</interface>
diff --git a/svx/uiconfig/ui/sidebararea.ui b/svx/uiconfig/ui/sidebararea.ui
index ff53e9a79d91..00ecc3defe9c 100644
--- a/svx/uiconfig/ui/sidebararea.ui
+++ b/svx/uiconfig/ui/sidebararea.ui
@@ -1,21 +1,21 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!-- Generated with glade 3.36.0 -->
+<!-- Generated with glade 3.40.0 -->
<interface domain="svx">
<requires lib="gtk+" version="3.20"/>
<object class="GtkAdjustment" id="adjustment1">
<property name="upper">100</property>
- <property name="step_increment">5</property>
- <property name="page_increment">10</property>
+ <property name="step-increment">5</property>
+ <property name="page-increment">10</property>
</object>
<object class="GtkAdjustment" id="adjustment2">
<property name="upper">360</property>
- <property name="step_increment">1</property>
- <property name="page_increment">10</property>
+ <property name="step-increment">1</property>
+ <property name="page-increment">10</property>
</object>
<object class="GtkAdjustment" id="adjustment4">
<property name="upper">100</property>
- <property name="step_increment">1</property>
- <property name="page_increment">10</property>
+ <property name="step-increment">1</property>
+ <property name="page-increment">10</property>
</object>
<object class="GtkListStore" id="liststore4">
<columns>
@@ -32,31 +32,31 @@
<!-- n-columns=1 n-rows=1 -->
<object class="GtkGrid" id="AreaPropertyPanel">
<property name="visible">True</property>
- <property name="can_focus">False</property>
+ <property name="can-focus">False</property>
<property name="hexpand">True</property>
<child>
- <!-- n-columns=1 n-rows=1 -->
+ <!-- n-columns=2 n-rows=6 -->
<object class="GtkGrid" id="grid1">
<property name="visible">True</property>
- <property name="can_focus">False</property>
+ <property name="can-focus">False</property>
<property name="hexpand">True</property>
- <property name="border_width">6</property>
- <property name="row_spacing">3</property>
- <property name="column_spacing">6</property>
+ <property name="border-width">6</property>
+ <property name="row-spacing">3</property>
+ <property name="column-spacing">6</property>
<child>
<object class="GtkBox" id="box1">
<property name="visible">True</property>
- <property name="can_focus">False</property>
+ <property name="can-focus">False</property>
<property name="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="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="round-digits">1</property>
+ <property name="draw-value">False</property>
</object>
<packing>
<property name="expand">False</property>
@@ -67,10 +67,10 @@
<child>
<object class="GtkSpinButton" id="settransparency">
<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>
+ <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="truncate-multiline">True</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>
@@ -85,30 +85,30 @@
</child>
</object>
<packing>
- <property name="left_attach">0</property>
- <property name="top_attach">5</property>
+ <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="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="use-underline">True</property>
<property name="xalign">0</property>
</object>
<packing>
- <property name="left_attach">0</property>
- <property name="top_attach">0</property>
+ <property name="left-attach">0</property>
+ <property name="top-attach">0</property>
</packing>
</child>
<child>
<object class="GtkComboBoxText" id="fillstylearea">
<property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="tooltip_text" translatable="yes"
context="sidebararea|fillstylearea|tooltip_text">Select the fill type to
apply.</property>
+ <property name="can-focus">False</property>
+ <property name="tooltip-text" translatable="yes"
context="sidebararea|fillstylearea|tooltip_text">Select the fill type to
apply.</property>
<child internal-child="accessible">
<object class="AtkObject" id="fillstylearea-atkobject">
<property name="AtkObject::accessible-name" translatable="yes"
context="sidebararea|fillstylearea-atkobject">Fill Type</property>
@@ -116,21 +116,21 @@
</child>
</object>
<packing>
- <property name="left_attach">1</property>
- <property name="top_attach">0</property>
+ <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>
+ <property name="can-focus">False</property>
<property name="valign">center</property>
<property name="orientation">vertical</property>
<child>
<object class="GtkComboBoxText" id="gradientstyle">
<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>
+ <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>
@@ -154,9 +154,9 @@
<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="use_underline">True</property>
+ <property name="can-focus">True</property>
+ <property name="receives-default">True</property>
+ <property name="use-underline">True</property>
</object>
<packing>
<property name="expand">False</property>
@@ -166,28 +166,29 @@
</child>
</object>
<packing>
- <property name="left_attach">0</property>
- <property name="top_attach">1</property>
+ <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="can-focus">False</property>
<property name="valign">center</property>
<property name="hexpand">True</property>
<child>
<object class="GtkToolbar" id="selectcolor">
- <property name="can_focus">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="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="tooltip_text" translatable="yes"
context="sidebararea|color|tooltip_text">Select the color to apply.</property>
- <property name="use_underline">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>
@@ -204,12 +205,12 @@
<child>
<object class="GtkComboBox" id="fillattrhb">
<property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="tooltip_text" translatable="yes"
context="sidebararea|fillattrhb|tooltip_text">Select the effect to
apply.</property>
+ <property name="can-focus">False</property>
+ <property name="tooltip-text" translatable="yes"
context="sidebararea|fillattrhb|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>
+ <property name="entry-text-column">0</property>
+ <property name="id-column">1</property>
<child>
<object class="GtkCellRendererText" id="cellrenderertext3"/>
<attributes>
@@ -234,13 +235,13 @@
<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="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="xalign">0</property>
- <property name="draw_indicator">True</property>
+ <property name="draw-indicator">True</property>
<property name="label" translatable="no"></property>
<child>
<placeholder/>
@@ -254,17 +255,17 @@
</child>
</object>
<packing>
- <property name="left_attach">1</property>
- <property name="top_attach">1</property>
+ <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="can-focus">True</property>
+ <property name="tooltip-text" translatable="yes"
context="sidebararea|gradangle|tooltip_text">Select the gradient
angle.</property>
<property name="valign">center</property>
- <property name="adjustment">adjustment2</property>
<property name="truncate-multiline">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>
@@ -272,48 +273,48 @@
</child>
</object>
<packing>
- <property name="left_attach">0</property>
- <property name="top_attach">2</property>
+ <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="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="xalign">0</property>
- <property name="draw_indicator">True</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">2</property>
+ <property name="left-attach">1</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="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="use-underline">True</property>
<property name="xalign">0</property>
</object>
<packing>
- <property name="left_attach">0</property>
- <property name="top_attach">3</property>
+ <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>
+ <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>
@@ -331,22 +332,23 @@
</child>
</object>
<packing>
- <property name="left_attach">1</property>
- <property name="top_attach">3</property>
+ <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="toolbar_style">icons</property>
- <property name="show_arrow">False</property>
+ <property name="can-focus">True</property>
+ <property name="toolbar-style">icons</property>
+ <property name="show-arrow">False</property>
<property name="icon_size">2</property>
<child>
<object class="GtkMenuToolButton" id="sidebargradient">
<property name="visible">True</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>
+ <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">True</property>
@@ -355,8 +357,8 @@
</child>
</object>
<packing>
- <property name="left_attach">1</property>
- <property name="top_attach">4</property>
+ <property name="left-attach">1</property>
+ <property name="top-attach">4</property>
</packing>
</child>
<child>
@@ -364,8 +366,8 @@
</child>
</object>
<packing>
- <property name="left_attach">0</property>
- <property name="top_attach">0</property>
+ <property name="left-attach">0</property>
+ <property name="top-attach">0</property>
</packing>
</child>
</object>
diff --git a/svx/uiconfig/ui/sidebareffect.ui b/svx/uiconfig/ui/sidebareffect.ui
index 78dbb5233e63..24bf16b2e02a 100644
--- a/svx/uiconfig/ui/sidebareffect.ui
+++ b/svx/uiconfig/ui/sidebareffect.ui
@@ -1,240 +1,183 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!-- Generated with glade 3.22.1 -->
+<!-- Generated with glade 3.40.0 -->
<interface domain="svx">
<requires lib="gtk+" version="3.20"/>
<object class="GtkAdjustment" id="adjustment1">
<property name="upper">150</property>
- <property name="step_increment">1</property>
- <property name="page_increment">10</property>
+ <property name="step-increment">1</property>
+ <property name="page-increment">10</property>
</object>
<object class="GtkAdjustment" id="adjustment2">
<property name="upper">100</property>
- <property name="step_increment">1</property>
- <property name="page_increment">10</property>
+ <property name="step-increment">1</property>
+ <property name="page-increment">10</property>
</object>
<object class="GtkAdjustment" id="adjustment3">
<property name="upper">150</property>
- <property name="step_increment">1</property>
- <property name="page_increment">10</property>
+ <property name="step-increment">1</property>
+ <property name="page-increment">10</property>
</object>
<!-- n-columns=1 n-rows=1 -->
<object class="GtkGrid" id="EffectPropertyPanel">
<property name="visible">True</property>
- <property name="can_focus">False</property>
+ <property name="can-focus">False</property>
<child>
- <!-- n-columns=1 n-rows=1 -->
- <object class="GtkGrid" id="grid3">
+ <!-- n-columns=2 n-rows=6 -->
+ <object class="GtkGrid" id="grid1">
<property name="visible">True</property>
- <property name="can_focus">False</property>
+ <property name="can-focus">False</property>
<property name="hexpand">True</property>
- <property name="border_width">6</property>
+ <property name="border-width">6</property>
+ <property name="row-spacing">3</property>
+ <property name="column-spacing">6</property>
<child>
- <object class="GtkBox" id="box2">
+ <object class="GtkLabel">
<property name="visible">True</property>
- <property name="can_focus">False</property>
+ <property name="can-focus">False</property>
+ <property name="halign">start</property>
+ <property name="label" translatable="yes"
context="sidebarglow|glow">Glow</property>
+ <attributes>
+ <attribute name="weight" value="bold"/>
+ </attributes>
+ </object>
+ <packing>
+ <property name="left-attach">0</property>
+ <property name="top-attach">0</property>
+ <property name="width">2</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="radiusglow">
+ <property name="visible">True</property>
+ <property name="can-focus">False</property>
+ <property name="label" translatable="yes"
context="sidebarglow|radius">Radius:</property>
+ <property name="use-underline">True</property>
+ <property name="mnemonic-widget">LB_GLOW_RADIUS</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="LB_GLOW_RADIUS">
+ <property name="visible">True</property>
+ <property name="can-focus">True</property>
<property name="hexpand">True</property>
- <property name="orientation">vertical</property>
- <property name="spacing">12</property>
- <child>
- <object class="GtkFrame" id="glowframe">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="label_xalign">0</property>
- <property name="shadow_type">none</property>
- <child>
- <!-- n-columns=1 n-rows=1 -->
- <object class="GtkGrid" id="grid1">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="orientation">vertical</property>
- <property name="row_spacing">3</property>
- <property name="column_spacing">6</property>
- <property name="margin-start">12</property>
- <child>
- <object class="GtkLabel" id="radiusglow">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="label" translatable="yes"
context="sidebarglow|radius">Radius:</property>
- <property name="use_underline">True</property>
- <property
name="mnemonic_widget">LB_GLOW_RADIUS</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="LB_GLOW_RADIUS">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="hexpand">True</property>
- <property name="truncate-multiline">True</property>
- <property name="adjustment">adjustment1</property>
- </object>
- <packing>
- <property name="left_attach">1</property>
- <property name="top_attach">0</property>
- </packing>
- </child>
- <child>
- <object class="GtkLabel" id="glowcolorlabel">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="label" translatable="yes"
context="sidebarglow|color">Color:</property>
- <property name="use_underline">True</property>
- <property
name="mnemonic_widget">LB_GLOW_COLOR</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="GtkMenuButton" id="LB_GLOW_COLOR">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">False</property>
- <property name="valign">center</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>
- <child>
- <object class="GtkLabel" id="transparency">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="label" translatable="yes"
context="sidebarglow|transparency">Transparency:</property>
- <property name="use_underline">True</property>
- <property
name="mnemonic_widget">LB_GLOW_TRANSPARENCY</property>
- <property name="xalign">0</property>
- </object>
- <packing>
- <property name="left_attach">0</property>
- <property name="top_attach">2</property>
- </packing>
- </child>
- <child>
- <object class="GtkSpinButton" id="LB_GLOW_TRANSPARENCY">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="hexpand">True</property>
- <property name="truncate-multiline">True</property>
- <property name="adjustment">adjustment2</property>
- </object>
- <packing>
- <property name="left_attach">1</property>
- <property name="top_attach">2</property>
- </packing>
- </child>
- </object>
- </child>
- <child type="label">
- <object class="GtkLabel">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="label" translatable="yes"
context="sidebarglow|glow">Glow</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>
+ <property name="truncate-multiline">True</property>
+ <property name="adjustment">adjustment1</property>
+ </object>
+ <packing>
+ <property name="left-attach">1</property>
+ <property name="top-attach">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="glowcolorlabel">
+ <property name="visible">True</property>
+ <property name="can-focus">False</property>
+ <property name="label" translatable="yes"
context="sidebarglow|color">Color:</property>
+ <property name="use-underline">True</property>
+ <property name="mnemonic-widget">LB_GLOW_COLOR</property>
+ <property name="xalign">0</property>
+ </object>
+ <packing>
+ <property name="left-attach">0</property>
+ <property name="top-attach">2</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkMenuButton" id="LB_GLOW_COLOR">
+ <property name="visible">True</property>
+ <property name="can-focus">True</property>
+ <property name="receives-default">False</property>
+ <property name="valign">center</property>
+ <property name="xalign">0</property>
+ <property name="draw-indicator">True</property>
+ <property name="label" translatable="no"></property>
<child>
- <object class="GtkFrame" id="softedgeframe">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="label_xalign">0</property>
- <property name="shadow_type">none</property>
- <child>
- <!-- n-columns=1 n-rows=1 -->
- <object class="GtkGrid" id="grid2">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="orientation">vertical</property>
- <property name="row_spacing">6</property>
- <property name="column_spacing">6</property>
- <property name="margin-start">12</property>
- <child>
- <object class="GtkLabel" id="radiussoftedge">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="label" translatable="yes"
context="sidebarsoftedge|radius">Radius:</property>
- <property name="use_underline">True</property>
- <property
name="mnemonic_widget">SB_SOFTEDGE_RADIUS</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="SB_SOFTEDGE_RADIUS">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="hexpand">True</property>
- <property name="truncate-multiline">True</property>
- <property name="adjustment">adjustment3</property>
- </object>
- <packing>
- <property name="left_attach">1</property>
- <property name="top_attach">0</property>
- </packing>
- </child>
- </object>
- </child>
- <child type="label">
- <object class="GtkLabel">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="label" translatable="yes"
context="sidebarsoftedge|softedge">Soft Edge</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>
+ <placeholder/>
</child>
</object>
<packing>
- <property name="left_attach">0</property>
- <property name="top_attach">0</property>
+ <property name="left-attach">1</property>
+ <property name="top-attach">2</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="transparency">
+ <property name="visible">True</property>
+ <property name="can-focus">False</property>
+ <property name="label" translatable="yes"
context="sidebarglow|transparency">Transparency:</property>
+ <property name="use-underline">True</property>
+ <property name="mnemonic-widget">LB_GLOW_TRANSPARENCY</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="GtkSpinButton" id="LB_GLOW_TRANSPARENCY">
+ <property name="visible">True</property>
+ <property name="can-focus">True</property>
+ <property name="truncate-multiline">True</property>
+ <property name="adjustment">adjustment2</property>
+ </object>
+ <packing>
+ <property name="left-attach">1</property>
+ <property name="top-attach">3</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel">
+ <property name="visible">True</property>
+ <property name="can-focus">False</property>
+ <property name="halign">start</property>
+ <property name="label" translatable="yes"
context="sidebarsoftedge|softedge">Soft Edge</property>
+ <attributes>
+ <attribute name="weight" value="bold"/>
+ </attributes>
+ </object>
+ <packing>
+ <property name="left-attach">0</property>
+ <property name="top-attach">4</property>
+ <property name="width">2</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="radiussoftedge">
+ <property name="visible">True</property>
+ <property name="can-focus">False</property>
+ <property name="label" translatable="yes"
context="sidebarsoftedge|radius">Radius:</property>
+ <property name="use-underline">True</property>
+ <property name="mnemonic-widget">SB_SOFTEDGE_RADIUS</property>
+ <property name="xalign">0</property>
+ </object>
+ <packing>
+ <property name="left-attach">0</property>
+ <property name="top-attach">5</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkSpinButton" id="SB_SOFTEDGE_RADIUS">
+ <property name="visible">True</property>
+ <property name="can-focus">True</property>
+ <property name="truncate-multiline">True</property>
... etc. - the rest is truncated
