sc/uiconfig/scalc/ui/sortoptionspage.ui | 232 +++++++++++++++-----------------
1 file changed, 115 insertions(+), 117 deletions(-)
New commits:
commit 084fae866b108938e58e1d2d279ac17263c8794b
Author: Heiko Tietze <tietze.he...@gmail.com>
AuthorDate: Thu Feb 23 10:49:59 2023 +0100
Commit: Heiko Tietze <heiko.tie...@documentfoundation.org>
CommitDate: Mon Feb 27 11:38:28 2023 +0000
Resolves tdf#153580 - Calc's sort dialog too large
Rearranged the content so the size is now defined
by the longest strins only
Change-Id: I2fd6f8bd0838c13f2e7f7c370ac7aa547b7e6a7d
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/147505
Tested-by: Jenkins
Reviewed-by: Heiko Tietze <heiko.tie...@documentfoundation.org>
diff --git a/sc/uiconfig/scalc/ui/sortoptionspage.ui
b/sc/uiconfig/scalc/ui/sortoptionspage.ui
index 9f3f427f780a..89e0be9500cc 100644
--- a/sc/uiconfig/scalc/ui/sortoptionspage.ui
+++ b/sc/uiconfig/scalc/ui/sortoptionspage.ui
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!-- Generated with glade 3.38.2 -->
+<!-- Generated with glade 3.40.0 -->
<interface domain="sc">
<requires lib="gtk+" version="3.20"/>
<object class="GtkBox" id="SortOptionsPage">
@@ -15,7 +15,7 @@
<property name="label-xalign">0</property>
<property name="shadow-type">none</property>
<child>
- <!-- n-columns=2 n-rows=11 -->
+ <!-- n-columns=1 n-rows=10 -->
<object class="GtkGrid" id="grid2">
<property name="visible">True</property>
<property name="can-focus">False</property>
@@ -132,68 +132,77 @@
</packing>
</child>
<child>
- <object class="GtkComboBoxText" id="outarealb">
+ <object class="GtkCheckButton" id="sortuser">
+ <property name="label" translatable="yes"
context="sortoptionspage|sortuser">Custom sort order</property>
<property name="visible">True</property>
- <property name="can-focus">False</property>
- <property name="margin-start">12</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>
<accessibility>
- <relation type="labelled-by" target="copyresult"/>
- <relation type="label-for" target="outareaed"/>
+ <relation type="label-for" target="sortuserlb"/>
</accessibility>
<child internal-child="accessible">
- <object class="AtkObject" id="outarealb-atkobject">
- <property name="AtkObject::accessible-name"
translatable="yes" context="sortoptionspage|outarealb-atkobject">Copy sort
results to:</property>
- <property name="AtkObject::accessible-description"
translatable="yes" context="sortoptionspage|extended_tip|outarealb">Select a
named cell range where you want to display the sorted list, or enter a cell
range in the input box.</property>
+ <object class="AtkObject" id="sortuser-atkobject">
+ <property name="AtkObject::accessible-description"
translatable="yes" context="sortoptionspage|extended_tip|sortuser">Click here
and then select the custom sort order that you want.</property>
</object>
</child>
</object>
<packing>
<property name="left-attach">0</property>
- <property name="top-attach">6</property>
+ <property name="top-attach">7</property>
</packing>
</child>
<child>
- <object class="GtkEntry" id="outareaed">
+ <object class="GtkBox">
<property name="visible">True</property>
- <property name="can-focus">True</property>
- <property name="hexpand">True</property>
- <property name="activates-default">True</property>
- <property name="truncate-multiline">True</property>
- <accessibility>
- <relation type="labelled-by" target="outarealb"/>
- </accessibility>
- <child internal-child="accessible">
- <object class="AtkObject" id="outareaed-atkobject">
- <property name="AtkObject::accessible-name"
translatable="yes" context="sortoptionspage|outareaed-atkobject">Copy sort
results to:</property>
- <property name="AtkObject::accessible-description"
translatable="yes" context="sortoptionspage|extended_tip|outareaed">Enter the
cell range where you want to display the sorted list, or select a named range
from the list.</property>
+ <property name="can-focus">False</property>
+ <property name="spacing">3</property>
+ <child>
+ <object class="GtkComboBoxText" id="outarealb">
+ <property name="visible">True</property>
+ <property name="can-focus">False</property>
+ <property name="margin-start">12</property>
+ <accessibility>
+ <relation type="labelled-by" target="copyresult"/>
+ </accessibility>
+ <child internal-child="accessible">
+ <object class="AtkObject" id="outarealb-atkobject">
+ <property name="AtkObject::accessible-name"
translatable="yes" context="sortoptionspage|outarealb-atkobject">Copy sort
results to:</property>
+ <property name="AtkObject::accessible-description"
translatable="yes" context="sortoptionspage|extended_tip|outarealb">Select a
named cell range where you want to display the sorted list, or enter a cell
range in the input box.</property>
+ </object>
+ </child>
</object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">0</property>
+ </packing>
</child>
- </object>
- <packing>
- <property name="left-attach">1</property>
- <property name="top-attach">6</property>
- </packing>
- </child>
- <child>
- <object class="GtkCheckButton" id="sortuser">
- <property name="label" translatable="yes"
context="sortoptionspage|sortuser">Custom sort order</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>
- <accessibility>
- <relation type="label-for" target="sortuserlb"/>
- </accessibility>
- <child internal-child="accessible">
- <object class="AtkObject" id="sortuser-atkobject">
- <property name="AtkObject::accessible-description"
translatable="yes" context="sortoptionspage|extended_tip|sortuser">Click here
and then select the custom sort order that you want.</property>
+ <child>
+ <object class="GtkEntry" id="outareaed">
+ <property name="visible">True</property>
+ <property name="can-focus">True</property>
+ <property name="hexpand">True</property>
+ <property name="activates-default">True</property>
+ <property name="truncate-multiline">True</property>
+ <child internal-child="accessible">
+ <object class="AtkObject" id="outareaed-atkobject">
+ <property name="AtkObject::accessible-name"
translatable="yes" context="sortoptionspage|outareaed-atkobject">Copy sort
results to:</property>
+ <property name="AtkObject::accessible-description"
translatable="yes" context="sortoptionspage|extended_tip|outareaed">Enter the
cell range where you want to display the sorted list, or select a named range
from the list.</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="left-attach">0</property>
- <property name="top-attach">7</property>
+ <property name="top-attach">6</property>
</packing>
</child>
<child>
@@ -213,95 +222,84 @@
<packing>
<property name="left-attach">0</property>
<property name="top-attach">8</property>
- <property name="width">2</property>
- </packing>
- </child>
- <child>
- <object class="GtkLabel" id="label6">
- <property name="visible">True</property>
- <property name="can-focus">False</property>
- <property name="halign">start</property>
- <property name="label" translatable="yes"
context="sortoptionspage|label6">Language</property>
- <property name="use-underline">True</property>
- <property name="mnemonic-widget">language</property>
- </object>
- <packing>
- <property name="left-attach">0</property>
- <property name="top-attach">9</property>
- </packing>
- </child>
- <child>
- <object class="GtkLabel" id="algorithmft">
- <property name="visible">True</property>
- <property name="can-focus">False</property>
- <property name="halign">start</property>
- <property name="label" translatable="yes"
context="sortoptionspage|algorithmft">Options</property>
- <property name="use-underline">True</property>
- <property name="mnemonic-widget">algorithmlb</property>
- </object>
- <packing>
- <property name="left-attach">1</property>
- <property name="top-attach">9</property>
</packing>
</child>
<child>
- <object class="GtkComboBoxText" id="algorithmlb">
+ <!-- n-columns=2 n-rows=2 -->
+ <object class="GtkGrid">
<property name="visible">True</property>
<property name="can-focus">False</property>
- <child internal-child="accessible">
- <object class="AtkObject" id="algorithmlb-atkobject">
- <property name="AtkObject::accessible-description"
translatable="yes" context="sortoptionspage|extended_tip|algorithmlb">Select a
sorting option for the language.</property>
+ <property name="row-spacing">3</property>
+ <property name="column-spacing">3</property>
+ <child>
+ <object class="GtkLabel" id="label6">
+ <property name="visible">True</property>
+ <property name="can-focus">False</property>
+ <property name="halign">start</property>
+ <property name="label" translatable="yes"
context="sortoptionspage|label6">Language</property>
+ <property name="use-underline">True</property>
</object>
+ <packing>
+ <property name="left-attach">0</property>
+ <property name="top-attach">0</property>
+ </packing>
</child>
- </object>
- <packing>
- <property name="left-attach">1</property>
- <property name="top-attach">10</property>
- </packing>
- </child>
- <child>
- <object class="GtkComboBoxText" id="language">
- <property name="visible">True</property>
- <property name="can-focus">False</property>
- <property name="has-entry">True</property>
- <child internal-child="entry">
- <object class="GtkEntry">
- <property name="can-focus">True</property>
- <property name="truncate-multiline">True</property>
+ <child>
+ <object class="GtkLabel" id="algorithmft">
+ <property name="visible">True</property>
+ <property name="can-focus">False</property>
+ <property name="halign">start</property>
+ <property name="label" translatable="yes"
context="sortoptionspage|algorithmft">Options</property>
+ <property name="use-underline">True</property>
</object>
+ <packing>
+ <property name="left-attach">1</property>
+ <property name="top-attach">0</property>
+ </packing>
</child>
- <child internal-child="accessible">
- <object class="AtkObject" id="language-atkobject">
- <property name="AtkObject::accessible-description"
translatable="yes" context="sortoptionspage|extended_tip|language">Select the
language for the sorting rules.</property>
+ <child>
+ <object class="GtkComboBoxText" id="language">
+ <property name="visible">True</property>
+ <property name="can-focus">False</property>
+ <property name="has-entry">True</property>
+ <child internal-child="entry">
+ <object class="GtkEntry">
+ <property name="can-focus">False</property>
+ </object>
+ </child>
+ <child internal-child="accessible">
+ <object class="AtkObject" id="language-atkobject">
+ <property name="AtkObject::accessible-description"
translatable="yes" context="sortoptionspage|extended_tip|language">Select the
language for the sorting rules.</property>
+ </object>
+ </child>
</object>
+ <packing>
+ <property name="left-attach">0</property>
+ <property name="top-attach">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkComboBoxText" id="algorithmlb">
+ <property name="visible">True</property>
+ <property name="can-focus">False</property>
+ <property name="hexpand">True</property>
+ <child internal-child="accessible">
+ <object class="AtkObject" id="algorithmlb-atkobject">
+ <property name="AtkObject::accessible-description"
translatable="yes" context="sortoptionspage|extended_tip|algorithmlb">Select a
sorting option for the language.</property>
+ </object>
+ </child>
+ </object>
+ <packing>
+ <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">10</property>
+ <property name="top-attach">9</property>
</packing>
</child>
- <child>
- <placeholder/>
- </child>
- <child>
- <placeholder/>
- </child>
- <child>
- <placeholder/>
- </child>
- <child>
- <placeholder/>
- </child>
- <child>
- <placeholder/>
- </child>
- <child>
- <placeholder/>
- </child>
- <child>
- <placeholder/>
- </child>
</object>
</child>
<child type="label">
