sfx2/uiconfig/ui/templatepanel.ui | 150 ++++++++++++++++++++------------------ 1 file changed, 80 insertions(+), 70 deletions(-)
New commits: commit a6917e60975868d7926faa695336d437b7148660 Author: Banobe Pascal <[email protected]> AuthorDate: Fri Mar 14 00:25:44 2025 +0300 Commit: Szymon Kłos <[email protected]> CommitDate: Mon Mar 17 14:51:43 2025 +0100 tdf#165736 jsdialog: reorganize style list sidebar panel information hierarchy The style list sidebar panel components were poorly organized, leading to confusion about the relationship between controls and their effects. This commit implements a standardized visual hierarchy: New hierarchy: - Toolbar (top-level actions) - Settings (show previews and spotlight) - Filter controls (filter list) - TreeView/FlatView (filtered content) Previous hierarchy: - Toolbar - TreeView/FlatView - Filter controls - Settings This is a manual port of commit 1804adba875a from co-24.04, recreated for co-25.04 because the original patch does not apply cleanly to the target branch due to code divergence between the versions. Signed-off-by: Banobe Pascal <[email protected]> Change-Id: I2b5661624dcc2fdd24a48a0652d030977bf703b7 (cherry picked from commit 0bb99a8a5279bf12b650a44504b94cbfca3d8adc) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/182900 Tested-by: Jenkins Reviewed-by: Szymon Kłos <[email protected]> diff --git a/sfx2/uiconfig/ui/templatepanel.ui b/sfx2/uiconfig/ui/templatepanel.ui index c479ac584d0f..41c908c805cd 100644 --- a/sfx2/uiconfig/ui/templatepanel.ui +++ b/sfx2/uiconfig/ui/templatepanel.ui @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!-- Generated with glade 3.40.0 --> +<!-- Generated with glade 3.38.2 --> <interface domain="sfx"> <requires lib="gtk+" version="3.20"/> <object class="GtkTreeStore" id="liststore1"> @@ -22,14 +22,13 @@ <column type="gchararray"/> </columns> </object> - <!-- n-columns=1 n-rows=1 --> <object class="GtkBox" id="TemplatePanel"> <property name="visible">True</property> <property name="can-focus">False</property> <property name="hexpand">True</property> <property name="vexpand">True</property> - <property name="orientation">vertical</property> <property name="border-width">6</property> + <property name="orientation">vertical</property> <property name="spacing">3</property> <child> <object class="GtkBox"> @@ -44,6 +43,7 @@ <property name="icon_size">2</property> <child> <object class="GtkToggleToolButton" id="2"> + <property name="can-focus">False</property> <property name="use-underline">True</property> </object> <packing> @@ -53,6 +53,7 @@ </child> <child> <object class="GtkToggleToolButton" id="1"> + <property name="can-focus">False</property> <property name="use-underline">True</property> </object> <packing> @@ -62,6 +63,7 @@ </child> <child> <object class="GtkToggleToolButton" id="3"> + <property name="can-focus">False</property> <property name="use-underline">True</property> </object> <packing> @@ -71,6 +73,7 @@ </child> <child> <object class="GtkToggleToolButton" id="4"> + <property name="can-focus">False</property> <property name="use-underline">True</property> </object> <packing> @@ -80,6 +83,7 @@ </child> <child> <object class="GtkToggleToolButton" id="5"> + <property name="can-focus">False</property> <property name="use-underline">True</property> </object> <packing> @@ -89,6 +93,7 @@ </child> <child> <object class="GtkToggleToolButton" id="6"> + <property name="can-focus">False</property> <property name="use-underline">True</property> </object> <packing> @@ -98,6 +103,7 @@ </child> <child> <object class="GtkToggleToolButton" id="65535"> + <property name="can-focus">False</property> <property name="use-underline">True</property> </object> <packing> @@ -122,6 +128,7 @@ <child> <object class="GtkToggleToolButton" id="watercan"> <property name="visible">True</property> + <property name="can-focus">False</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> @@ -140,6 +147,7 @@ <child> <object class="GtkToolButton" id="new"> <property name="visible">True</property> + <property name="can-focus">False</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> @@ -156,6 +164,7 @@ </child> <child> <object class="GtkMenuToolButton" id="newmenu"> + <property name="can-focus">False</property> <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> @@ -174,6 +183,7 @@ <child> <object class="GtkToolButton" id="update"> <property name="visible">True</property> + <property name="can-focus">False</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> @@ -203,6 +213,72 @@ <property name="position">0</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> + <child internal-child="accessible"> + <object class="AtkObject" id="showpreview-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="templatepanel|extended_tip|showpreview">Display the style names as examples of their formatting. </property> + </object> + </child> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">0</property> + </packing> + </child> + <child> + <object class="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> + <child internal-child="accessible"> + <object class="AtkObject" id="highlightstyles-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="templatepanel|extended_tip|highlightstyles">Displays a color and a unique number code for each applied paragraph or character style in the document. </property> + </object> + </child> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">1</property> + </packing> + </child> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">1</property> + </packing> + </child> + <child> + <object class="GtkComboBoxText" id="filter"> + <property name="visible">True</property> + <property name="can-focus">False</property> + <child internal-child="accessible"> + <object class="AtkObject" id="filter-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="templatepanel|extended_tip|filter">Select a filter for the list of styles.</property> + </object> + </child> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">2</property> + </packing> + </child> <child> <object class="GtkScrolledWindow"> <property name="can-focus">True</property> @@ -253,7 +329,7 @@ <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">1</property> + <property name="position">3</property> </packing> </child> <child> @@ -304,72 +380,6 @@ </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> - <child internal-child="accessible"> - <object class="AtkObject" id="showpreview-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="templatepanel|extended_tip|showpreview">Display the style names as examples of their formatting. </property> - </object> - </child> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">0</property> - </packing> - </child> - <child> - <object class="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> - <child internal-child="accessible"> - <object class="AtkObject" id="highlightstyles-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="templatepanel|extended_tip|highlightstyles">Displays a color and a unique number code for each applied paragraph or character style in the document. </property> - </object> - </child> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">1</property> - </packing> - </child> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">5</property> - </packing> - </child> - <child> - <object class="GtkComboBoxText" id="filter"> - <property name="visible">True</property> - <property name="can-focus">False</property> - <child internal-child="accessible"> - <object class="AtkObject" id="filter-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="templatepanel|extended_tip|filter">Select a filter for the list of styles.</property> - </object> - </child> - </object> <packing> <property name="expand">False</property> <property name="fill">True</property>
