sfx2/uiconfig/ui/templatepanel.ui | 506 ++++++++++++++++++--------------------
1 file changed, 246 insertions(+), 260 deletions(-)
New commits:
commit 0d18454f08476475255469d23107d8a9ee6549c4
Author: Szymon Kłos <szymon.k...@collabora.com>
AuthorDate: Wed Dec 18 08:50:59 2024 +0100
Commit: Szymon Kłos <szymon.k...@collabora.com>
CommitDate: Wed Dec 18 15:12:42 2024 +0100
jsdialog: reduce unwanted containers
we don't need additional container on top level
which makes it harder to layout widgets
Signed-off-by: Szymon Kłos <szymon.k...@collabora.com>
Change-Id: I49532c4cd0ab8790c27e84098faa86a338da3c4f
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/178705
Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoff...@gmail.com>
Reviewed-by: Pedro Silva <pedro.si...@collabora.com>
diff --git a/sfx2/uiconfig/ui/templatepanel.ui
b/sfx2/uiconfig/ui/templatepanel.ui
index 39c28653509e..1ef1ceb33ac8 100644
--- a/sfx2/uiconfig/ui/templatepanel.ui
+++ b/sfx2/uiconfig/ui/templatepanel.ui
@@ -28,335 +28,321 @@
<property name="can-focus">False</property>
<property name="hexpand">True</property>
<property name="vexpand">True</property>
+ <property name="orientation">vertical</property>
<child>
- <object class="GtkBox" id="box1">
+ <object class="GtkBox">
<property name="visible">True</property>
<property name="can-focus">False</property>
- <property name="hexpand">True</property>
- <property name="vexpand">True</property>
- <property name="border-width">6</property>
- <property name="orientation">vertical</property>
- <property name="spacing">3</property>
<child>
- <object class="GtkBox">
+ <object class="GtkToolbar" id="left">
<property name="visible">True</property>
- <property name="can-focus">False</property>
+ <property name="can-focus">True</property>
+ <property name="toolbar-style">text</property>
+ <property name="show-arrow">False</property>
+ <property name="icon_size">2</property>
<child>
- <object class="GtkToolbar" id="left">
- <property name="visible">True</property>
- <property name="can-focus">True</property>
- <property name="toolbar-style">text</property>
- <property name="show-arrow">False</property>
- <property name="icon_size">2</property>
- <child>
- <object class="GtkToggleToolButton" id="2">
- <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="1">
- <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="3">
- <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="4">
- <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="5">
- <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="6">
- <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="65535">
- <property name="use-underline">True</property>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="homogeneous">False</property>
- </packing>
- </child>
+ <object class="GtkToggleToolButton" id="2">
+ <property name="use-underline">True</property>
</object>
<packing>
<property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">1</property>
+ <property name="homogeneous">False</property>
</packing>
</child>
<child>
- <object class="GtkToolbar" id="right">
- <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="watercan">
- <property name="visible">True</property>
- <property name="tooltip-text" translatable="yes"
context="templatepanel|STR_STYLE_FILL_FORMAT_MODE">Fill Format Mode</property>
- <property name="use-underline">True</property>
- <property name="icon-name">res/sc05554.png</property>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="homogeneous">False</property>
- </packing>
- </child>
- <child>
- <object class="GtkToolButton" id="new">
- <property name="visible">True</property>
- <property name="tooltip-text" translatable="yes"
context="templatepanel|STR_STYLE_NEW_STYLE_FROM_SELECTION">New Style from
Selection</property>
- <property name="use-underline">True</property>
- <property name="icon-name">res/sc05555.png</property>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="homogeneous">False</property>
- </packing>
- </child>
- <child>
- <object class="GtkMenuToolButton" id="newmenu">
- <property name="no-show-all">True</property>
- <property name="tooltip-text" translatable="yes"
context="templatepanel|STR_STYLE_NEW_STYLE_ACTION">Styles actions</property>
- <property name="use-underline">True</property>
- <property name="icon-name">res/sc05555.png</property>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="homogeneous">False</property>
- </packing>
- </child>
- <child>
- <object class="GtkToolButton" id="update">
- <property name="visible">True</property>
- <property name="tooltip-text" translatable="yes"
context="templatepanel|STR_STYLE_UPDATE_STYLE">Update Style</property>
- <property name="use-underline">True</property>
- <property name="icon-name">res/sc05556.png</property>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="homogeneous">False</property>
- </packing>
- </child>
+ <object class="GtkToggleToolButton" id="1">
+ <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="3">
+ <property name="use-underline">True</property>
</object>
<packing>
<property name="expand">False</property>
- <property name="fill">True</property>
- <property name="pack-type">end</property>
- <property name="position">2</property>
+ <property name="homogeneous">False</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkToggleToolButton" id="4">
+ <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="5">
+ <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="6">
+ <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="65535">
+ <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="fill">False</property>
+ <property name="position">1</property>
</packing>
</child>
<child>
- <object class="GtkScrolledWindow">
+ <object class="GtkToolbar" id="right">
+ <property name="visible">True</property>
<property name="can-focus">True</property>
- <property name="hexpand">True</property>
- <property name="vexpand">True</property>
- <property name="shadow-type">in</property>
+ <property name="toolbar-style">icons</property>
+ <property name="show-arrow">False</property>
+ <property name="icon_size">2</property>
+ <child>
+ <object class="GtkToggleToolButton" id="watercan">
+ <property name="visible">True</property>
+ <property name="tooltip-text" translatable="yes"
context="templatepanel|STR_STYLE_FILL_FORMAT_MODE">Fill Format Mode</property>
+ <property name="use-underline">True</property>
+ <property name="icon-name">res/sc05554.png</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="homogeneous">False</property>
+ </packing>
+ </child>
<child>
- <object class="GtkTreeView" id="flatview">
- <property name="can-focus">True</property>
- <property name="receives-default">True</property>
+ <object class="GtkToolButton" id="new">
+ <property name="visible">True</property>
+ <property name="tooltip-text" translatable="yes"
context="templatepanel|STR_STYLE_NEW_STYLE_FROM_SELECTION">New Style from
Selection</property>
+ <property name="use-underline">True</property>
+ <property name="icon-name">res/sc05555.png</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="homogeneous">False</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkMenuToolButton" id="newmenu">
<property name="no-show-all">True</property>
- <property name="has-tooltip">True</property>
- <property name="hexpand">True</property>
- <property name="vexpand">True</property>
- <property name="model">liststore1</property>
- <property name="headers-visible">False</property>
- <property name="search-column">0</property>
- <property name="show-expanders">False</property>
- <child internal-child="selection">
- <object class="GtkTreeSelection" id="Macro Library
List-selection2"/>
- </child>
- <child>
- <object class="GtkTreeViewColumn" id="treeviewcolumn0">
- <child>
- <object class="GtkCellRendererPixbuf"
id="cellrendererpixbuf1"/>
- <attributes>
- <attribute name="surface">0</attribute>
- </attributes>
- </child>
- </object>
- </child>
- <child>
- <object class="GtkTreeViewColumn" id="treeviewcolumn1">
- <property name="resizable">True</property>
- <child>
- <object class="GtkCellRendererText"
id="cellrenderertext1"/>
- <attributes>
- <attribute name="text">1</attribute>
- </attributes>
- </child>
- </object>
- </child>
- <child internal-child="accessible">
- <object class="AtkObject" id="flatview-atkobject">
- <property name="AtkObject::accessible-name"
translatable="yes" context="templatepanel|STR_STYLE_ELEMTLIST">Style
List</property>
- </object>
- </child>
+ <property name="tooltip-text" translatable="yes"
context="templatepanel|STR_STYLE_NEW_STYLE_ACTION">Styles actions</property>
+ <property name="use-underline">True</property>
+ <property name="icon-name">res/sc05555.png</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="homogeneous">False</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkToolButton" id="update">
+ <property name="visible">True</property>
+ <property name="tooltip-text" translatable="yes"
context="templatepanel|STR_STYLE_UPDATE_STYLE">Update Style</property>
+ <property name="use-underline">True</property>
+ <property name="icon-name">res/sc05556.png</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">1</property>
+ <property name="pack-type">end</property>
+ <property name="position">2</property>
</packing>
</child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkScrolledWindow">
+ <property name="can-focus">True</property>
+ <property name="hexpand">True</property>
+ <property name="vexpand">True</property>
+ <property name="shadow-type">in</property>
<child>
- <object class="GtkScrolledWindow">
+ <object class="GtkTreeView" id="flatview">
<property name="can-focus">True</property>
+ <property name="receives-default">True</property>
+ <property name="no-show-all">True</property>
+ <property name="has-tooltip">True</property>
<property name="hexpand">True</property>
<property name="vexpand">True</property>
- <property name="shadow-type">in</property>
+ <property name="model">liststore1</property>
+ <property name="headers-visible">False</property>
+ <property name="search-column">0</property>
+ <property name="show-expanders">False</property>
+ <child internal-child="selection">
+ <object class="GtkTreeSelection" id="Macro Library
List-selection2"/>
+ </child>
<child>
- <object class="GtkTreeView" id="treeview">
- <property name="can-focus">True</property>
- <property name="receives-default">True</property>
- <property name="no-show-all">True</property>
- <property name="has-tooltip">True</property>
- <property name="hexpand">True</property>
- <property name="vexpand">True</property>
- <property name="model">liststore2</property>
- <property name="headers-visible">False</property>
- <property name="reorderable">True</property>
- <property name="search-column">1</property>
- <property name="enable-tree-lines">True</property>
- <child internal-child="selection">
- <object class="GtkTreeSelection" id="Macro Library
List-selection1"/>
- </child>
+ <object class="GtkTreeViewColumn" id="treeviewcolumn0">
<child>
- <object class="GtkTreeViewColumn" id="treeviewcolumn3">
- <child>
- <object class="GtkCellRendererPixbuf"
id="cellrendererpixbuf2"/>
- <attributes>
- <attribute name="surface">0</attribute>
- </attributes>
- </child>
- </object>
+ <object class="GtkCellRendererPixbuf"
id="cellrendererpixbuf1"/>
+ <attributes>
+ <attribute name="surface">0</attribute>
+ </attributes>
</child>
+ </object>
+ </child>
+ <child>
+ <object class="GtkTreeViewColumn" id="treeviewcolumn1">
+ <property name="resizable">True</property>
<child>
- <object class="GtkTreeViewColumn" id="treeviewcolumn2">
- <property name="resizable">True</property>
- <child>
- <object class="GtkCellRendererText"
id="cellrenderertext2"/>
- <attributes>
- <attribute name="text">1</attribute>
- </attributes>
- </child>
- </object>
- </child>
- <child internal-child="accessible">
- <object class="AtkObject" id="treeview-atkobject">
- <property name="AtkObject::accessible-name"
translatable="yes" context="templatepanel|STR_STYLE_ELEMTLIST">Style
List</property>
- </object>
+ <object class="GtkCellRendererText" id="cellrenderertext1"/>
+ <attributes>
+ <attribute name="text">1</attribute>
+ </attributes>
</child>
</object>
</child>
+ <child internal-child="accessible">
+ <object class="AtkObject" id="flatview-atkobject">
+ <property name="AtkObject::accessible-name" translatable="yes"
context="templatepanel|STR_STYLE_ELEMTLIST">Style List</property>
+ </object>
+ </child>
</object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="position">2</property>
- </packing>
</child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkScrolledWindow">
+ <property name="can-focus">True</property>
+ <property name="hexpand">True</property>
+ <property name="vexpand">True</property>
+ <property name="shadow-type">in</property>
<child>
- <object class="GtkBox" id="settings">
- <property name="visible">True</property>
- <property name="can-focus">False</property>
+ <object class="GtkTreeView" id="treeview">
+ <property name="can-focus">True</property>
+ <property name="receives-default">True</property>
+ <property name="no-show-all">True</property>
+ <property name="has-tooltip">True</property>
+ <property name="hexpand">True</property>
+ <property name="vexpand">True</property>
+ <property name="model">liststore2</property>
+ <property name="headers-visible">False</property>
+ <property name="reorderable">True</property>
+ <property name="search-column">1</property>
+ <property name="enable-tree-lines">True</property>
+ <child internal-child="selection">
+ <object class="GtkTreeSelection" id="Macro Library
List-selection1"/>
+ </child>
<child>
- <object class="GtkCheckButton" id="showpreview">
- <property name="label" translatable="yes"
context="commontemplate|STR_PREVIEW_CHECKBOX">Show previews</property>
- <property name="visible">True</property>
- <property name="can-focus">True</property>
- <property name="receives-default">False</property>
- <property name="use-underline">True</property>
- <property name="draw-indicator">True</property>
+ <object class="GtkTreeViewColumn" id="treeviewcolumn3">
+ <child>
+ <object class="GtkCellRendererPixbuf"
id="cellrendererpixbuf2"/>
+ <attributes>
+ <attribute name="surface">0</attribute>
+ </attributes>
+ </child>
</object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="position">0</property>
- </packing>
</child>
<child>
- <object class="GtkCheckButton" id="highlightstyles">
- <property name="label" translatable="yes"
context="commontemplate|STR_HIGHLIGHT_CHECKBOX">Spotlight</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>
+ <object class="GtkTreeViewColumn" id="treeviewcolumn2">
+ <property name="resizable">True</property>
+ <child>
+ <object class="GtkCellRendererText" id="cellrenderertext2"/>
+ <attributes>
+ <attribute name="text">1</attribute>
+ </attributes>
+ </child>
</object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="position">1</property>
- </packing>
</child>
+ <child internal-child="accessible">
+ <object class="AtkObject" id="treeview-atkobject">
+ <property name="AtkObject::accessible-name" translatable="yes"
context="templatepanel|STR_STYLE_ELEMTLIST">Style List</property>
+ </object>
+ </child>
+ </object>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">2</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkBox" id="settings">
+ <property name="visible">True</property>
+ <property name="can-focus">False</property>
+ <child>
+ <object class="GtkCheckButton" id="showpreview">
+ <property name="label" translatable="yes"
context="commontemplate|STR_PREVIEW_CHECKBOX">Show previews</property>
+ <property name="visible">True</property>
+ <property name="can-focus">True</property>
+ <property name="receives-default">False</property>
+ <property name="use-underline">True</property>
+ <property name="draw-indicator">True</property>
</object>
<packing>
- <property name="homogeneous">True</property>
<property name="expand">False</property>
<property name="fill">True</property>
- <property name="position">5</property>
+ <property name="position">0</property>
</packing>
</child>
<child>
- <object class="GtkComboBoxText" id="filter">
- <property name="visible">True</property>
- <property name="can-focus">False</property>
+ <object class="GtkCheckButton" id="highlightstyles">
+ <property name="label" translatable="yes"
context="commontemplate|STR_HIGHLIGHT_CHECKBOX">Spotlight</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>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
- <property name="position">4</property>
+ <property name="position">1</property>
</packing>
</child>
</object>
<packing>
- <property name="left-attach">0</property>
- <property name="top-attach">0</property>
+ <property name="homogeneous">True</property>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">5</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkComboBoxText" id="filter">
+ <property name="visible">True</property>
+ <property name="can-focus">False</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">4</property>
</packing>
</child>
</object>
