sw/uiconfig/swriter/ui/indexentry.ui | 194 +++++++++++++++++++++++------------
1 file changed, 130 insertions(+), 64 deletions(-)
New commits:
commit 4ec75d22eb916e3809e9e92f77fd25e33f6b21ee
Author: Seth Chaiklin <sdc.bla...@youmail.dk>
AuthorDate: Sat Mar 11 11:09:25 2023 +0000
Commit: Seth Chaiklin <sdc.bla...@youmail.dk>
CommitDate: Fri Mar 24 18:57:58 2023 +0000
tdf#153499 Add "For Selected Entry" label
add frame to checkboxes under "For Selected Entry"
add grid for navigation buttons
add typographical quotes to extended tips
add missing colons to three "Phonetic reading" labels
Change-Id: Id630febb01165e4a0faf1a228e436457867748da
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/148695
Tested-by: Jenkins
Reviewed-by: Heiko Tietze <heiko.tie...@documentfoundation.org>
diff --git a/sw/uiconfig/swriter/ui/indexentry.ui
b/sw/uiconfig/swriter/ui/indexentry.ui
index 826f053d2fc0..aabc8cf463ab 100644
--- a/sw/uiconfig/swriter/ui/indexentry.ui
+++ b/sw/uiconfig/swriter/ui/indexentry.ui
@@ -142,8 +142,8 @@
</packing>
</child>
<child>
- <!-- n-columns=5 n-rows=9 -->
- <object class="GtkGrid" id="grid101">
+ <!-- n-columns=5 n-rows=6 -->
+ <object class="GtkGrid" id="indexentrygrid">
<property name="visible">True</property>
<property name="can-focus">False</property>
<property name="margin-start">12</property>
@@ -246,7 +246,7 @@
<property name="no-show-all">True</property>
<property name="margin-start">12</property>
<property name="margin-end">6</property>
- <property name="label" translatable="yes"
context="indexentry|phonetic0ft">Phonetic reading</property>
+ <property name="label" translatable="yes"
context="indexentry|phonetic0ft">Phonetic reading:</property>
<property name="use-underline">True</property>
<property name="mnemonic-widget">phonetic0ed</property>
<property name="xalign">0</property>
@@ -279,7 +279,7 @@
<property name="no-show-all">True</property>
<property name="margin-start">12</property>
<property name="margin-end">6</property>
- <property name="label" translatable="yes"
context="indexentry|phonetic1ft">Phonetic reading</property>
+ <property name="label" translatable="yes"
context="indexentry|phonetic1ft">Phonetic reading:</property>
<property name="use-underline">True</property>
<property name="mnemonic-widget">phonetic1ed</property>
<property name="xalign">0</property>
@@ -312,7 +312,7 @@
<property name="no-show-all">True</property>
<property name="margin-start">12</property>
<property name="margin-end">6</property>
- <property name="label" translatable="yes"
context="indexentry|phonetic2ft">Phonetic reading</property>
+ <property name="label" translatable="yes"
context="indexentry|phonetic2ft">Phonetic reading:</property>
<property name="use-underline">True</property>
<property name="mnemonic-widget">phonetic2ed</property>
<property name="xalign">0</property>
@@ -367,8 +367,8 @@
<property name="activates-default">True</property>
<property name="truncate-multiline">True</property>
<child internal-child="accessible">
- <object class="AtkObject"
id="comboboxtext-entry-atkobject">
- <property name="AtkObject::accessible-description"
translatable="yes" context="indexentry|extended_tip|comboboxtext-entry">Makes
the current selection a subentry of the word that you enter here. For example,
if you select "cold", and enter "weather" as the 1st key, the index entry is
"weather, cold".</property>
+ <object class="AtkObject" id="key1cb-atkobject">
+ <property name="AtkObject::accessible-description"
translatable="yes" context="indexentry|extended_tip|key1cb">Makes the current
selection a subentry of the word that you enter here. For example, if you
select “cold”, and enter “weather” as the 1st key, the index entry will be
“weather, cold”.</property>
</object>
</child>
</object>
@@ -408,8 +408,8 @@
<property name="activates-default">True</property>
<property name="truncate-multiline">True</property>
<child internal-child="accessible">
- <object class="AtkObject"
id="comboboxtext-entry2-atkobject">
- <property name="AtkObject::accessible-description"
translatable="yes" context="indexentry|extended_tip|comboboxtext-entry2">Makes
the current selection a sub-subentry of the 1st key. For example, if you select
"cold", and enter "weather" as the 1st key and "winter" as the 2nd key, the
index entry is "weather, winter, cold".</property>
+ <object class="AtkObject" id="key2cb-atkobject">
+ <property name="AtkObject::accessible-description"
translatable="yes" context="indexentry|extended_tip|key2cb">Makes the current
selection a sub-subentry of the 1st key. For example, if you select “cold”, and
enter “weather” as the 1st key and “winter” as the 2nd key, the index entry
will be “weather, winter, cold”.</property>
</object>
</child>
</object>
@@ -479,56 +479,128 @@
</packing>
</child>
<child>
- <object class="GtkCheckButton" id="applytoallcb">
- <property name="label" translatable="yes"
context="indexentry|applytoallcb">Apply to all other occurrences</property>
- <property name="can-focus">True</property>
- <property name="tooltip-text" translatable="yes"
context="indexentry|applytoallcb|tooltip_text">Add an index entry to any other
occurrences of the selected text specified in “Entry”.</property>
- <property name="receives-default">False</property>
- <property name="no-show-all">True</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">6</property>
- <property name="width">3</property>
- </packing>
+ <placeholder/>
</child>
<child>
- <object class="GtkCheckButton" id="searchcasesensitivecb">
- <property name="label" translatable="yes"
context="indexentry|searchcasesensitivecb">Match case</property>
- <property name="can-focus">True</property>
- <property name="receives-default">False</property>
- <property name="no-show-all">True</property>
- <property name="halign">start</property>
- <property name="margin-start">12</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">7</property>
- <property name="width">3</property>
- </packing>
+ <placeholder/>
</child>
<child>
- <object class="GtkCheckButton" id="searchcasewordonlycb">
- <property name="label" translatable="yes"
context="indexentry|searchcasewordonlycb">Whole words only</property>
- <property name="can-focus">True</property>
- <property name="receives-default">False</property>
- <property name="no-show-all">True</property>
- <property name="halign">start</property>
- <property name="margin-start">12</property>
- <property name="use-underline">True</property>
- <property name="draw-indicator">True</property>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkFrame" id="selectedentryframe">
+ <property name="visible">True</property>
+ <property name="can-focus">False</property>
+ <property name="label-xalign">0</property>
+ <property name="shadow-type">none</property>
+ <child>
+ <object class="GtkAlignment">
+ <property name="visible">True</property>
+ <property name="can-focus">False</property>
+ <property name="left-padding">12</property>
+ <child>
+ <!-- n-columns=1 n-rows=3 -->
+ <object class="GtkGrid" id="selectedentrygrid">
+ <property name="visible">True</property>
+ <property name="can-focus">False</property>
+ <property name="margin-start">12</property>
+ <property name="margin-top">6</property>
+ <property name="row-spacing">6</property>
+ <property name="column-spacing">6</property>
+ <child>
+ <object class="GtkCheckButton" id="applytoallcb">
+ <property name="label" translatable="yes"
context="indexentry|applytoallcb">Apply to all other occurrences</property>
+ <property name="can-focus">True</property>
+ <property name="receives-default">False</property>
+ <property name="no-show-all">True</property>
+ <property name="tooltip-text" translatable="yes"
context="indexentry|applytoallcb|tooltip_text">Add an index entry to any other
occurrences of the selected text specified in “Entry”.</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">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkCheckButton" id="searchcasewordonlycb">
+ <property name="label" translatable="yes"
context="indexentry|searchcasewordonlycb">Whole words only</property>
+ <property name="can-focus">True</property>
+ <property name="receives-default">False</property>
+ <property name="no-show-all">True</property>
+ <property name="halign">start</property>
+ <property name="margin-start">18</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">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkCheckButton"
id="searchcasesensitivecb">
+ <property name="label" translatable="yes"
context="indexentry|searchcasesensitivecb">Match case</property>
+ <property name="can-focus">True</property>
+ <property name="receives-default">False</property>
+ <property name="no-show-all">True</property>
+ <property name="halign">start</property>
+ <property name="margin-start">18</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">2</property>
+ </packing>
+ </child>
+ </object>
+ </child>
+ </object>
+ </child>
+ <child type="label">
+ <object class="GtkLabel" id="selectedentrytitle">
+ <property name="visible">True</property>
+ <property name="can-focus">False</property>
+ <property name="label" translatable="yes"
context="indexentry|selectedentrytitle">For Selected Entry</property>
+ <attributes>
+ <attribute name="weight" value="bold"/>
+ </attributes>
</object>
- <packing>
- <property name="left-attach">0</property>
- <property name="top-attach">8</property>
- <property name="width">3</property>
- </packing>
</child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ <child>
+ <!-- n-columns=5 n-rows=2 -->
+ <object class="GtkGrid" id="buttongrid">
+ <property name="visible">True</property>
+ <property name="can-focus">False</property>
+ <property name="margin-start">12</property>
+ <property name="margin-top">6</property>
+ <property name="row-spacing">6</property>
+ <property name="column-spacing">6</property>
<child>
<object class="GtkButton" id="last">
<property name="can-focus">True</property>
@@ -548,7 +620,7 @@
</object>
<packing>
<property name="left-attach">4</property>
- <property name="top-attach">7</property>
+ <property name="top-attach">0</property>
</packing>
</child>
<child>
@@ -570,7 +642,7 @@
</object>
<packing>
<property name="left-attach">3</property>
- <property name="top-attach">7</property>
+ <property name="top-attach">0</property>
</packing>
</child>
<child>
@@ -592,7 +664,7 @@
</object>
<packing>
<property name="left-attach">3</property>
- <property name="top-attach">8</property>
+ <property name="top-attach">1</property>
</packing>
</child>
<child>
@@ -614,7 +686,7 @@
</object>
<packing>
<property name="left-attach">4</property>
- <property name="top-attach">8</property>
+ <property name="top-attach">1</property>
</packing>
</child>
<child>
@@ -635,17 +707,11 @@
<child>
<placeholder/>
</child>
- <child>
- <placeholder/>
- </child>
- <child>
- <placeholder/>
- </child>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
- <property name="position">1</property>
+ <property name="position">2</property>
</packing>
</child>
</object>
