Ref: TDF#157930 Refine conditionaleasydialog.ui

+ Add Help button
+ Add extended tips
+ reword labels

Change-Id: Ic1b24aedc3eb4c43fc1cf19f6bbcb8b3b72c94e5
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/171210
Tested-by: Jenkins
Reviewed-by: Olivier Hallot <olivier.hallot@libreoffice.org>

1 files changed, 45 insertions, 6 deletions

diff --git a/sc/uiconfig/scalc/ui/conditionaleasydialog.ui b/sc/uiconfig/scalc/ui/conditionaleasydialog.ui
index 98066c86ef44..e9bf10716207 100644
--- a/sc/uiconfig/scalc/ui/conditionaleasydialog.ui
+++ b/sc/uiconfig/scalc/ui/conditionaleasydialog.ui
@@ -17,6 +17,22 @@
             <property name="can-focus">False</property>
             <property name="layout-style">end</property>
             <child>
+              <object class="GtkButton" id="help">
+                <property name="label" translatable="yes" context="stock">_Help</property>
+                <property name="visible">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">True</property>
+                <property name="fill">True</property>
+                <property name="pack-type">end</property>
+                <property name="position">0</property>
+                <property name="secondary">True</property>
+              </packing>
+            </child>
+            <child>
               <object class="GtkButton" id="ok">
                 <property name="label" translatable="yes" context="stock">_OK</property>
                 <property name="visible">True</property>
@@ -34,7 +50,7 @@
               <packing>
                 <property name="expand">True</property>
                 <property name="fill">True</property>
-                <property name="position">0</property>
+                <property name="position">1</property>
               </packing>
             </child>
             <child>
@@ -53,7 +69,7 @@
               <packing>
                 <property name="expand">True</property>
                 <property name="fill">True</property>
-                <property name="position">1</property>
+                <property name="position">2</property>
               </packing>
             </child>
           </object>
@@ -97,6 +113,11 @@
                             <accessibility>
                               <relation type="labelled-by" target="description"/>
                             </accessibility>
+                            <child internal-child="accessible">
+                              <object class="AtkObject" id="entryNumber-atkobject">
+                                <property name="AtkObject::accessible-description" translatable="yes" context="conditioneasydialog|extended_tip|entryNumber">Enter the first value of the range or text for comparison and formatting.</property>
+                              </object>
+                            </child>
                           </object>
                           <packing>
                             <property name="expand">False</property>
@@ -112,6 +133,11 @@
                             <accessibility>
                               <relation type="labelled-by" target="description"/>
                             </accessibility>
+                            <child internal-child="accessible">
+                              <object class="AtkObject" id="entryNumber2-atkobject">
+                                <property name="AtkObject::accessible-description" translatable="yes" context="conditionaleasydialog|extended_tip|entryNumber2">Enter the second value of the range for comparison and formatting.</property>
+                              </object>
+                            </child>
                           </object>
                           <packing>
                             <property name="expand">False</property>
@@ -123,7 +149,7 @@
                           <object class="GtkLabel" id="with">
                             <property name="visible">True</property>
                             <property name="can-focus">False</property>
-                            <property name="label" translatable="yes" context="conditionaleasydialog|label">with</property>
+                            <property name="label" translatable="yes" context="conditionaleasydialog|label">Apply cell style</property>
                             <accessibility>
                               <relation type="label-for" target="themeCombo"/>
                             </accessibility>
@@ -153,6 +179,11 @@
                             <accessibility>
                               <relation type="labelled-by" target="with"/>
                             </accessibility>
+                            <child internal-child="accessible">
+                              <object class="AtkObject" id="themeCombo-atkobject">
+                                <property name="AtkObject::accessible-description" translatable="yes" context="conditioneasydialog|extended_tip|themeCombo">Cell style to apply when conditions are met.</property>
+                              </object>
+                            </child>
                           </object>
                           <packing>
                             <property name="expand">False</property>
@@ -173,7 +204,7 @@
                   <object class="GtkLabel" id="description">
                     <property name="visible">True</property>
                     <property name="can-focus">False</property>
-                    <property name="label" translatable="yes" context="conditionaleasydialog|label">Apply conditional formatting to cells: %1</property>
+                    <property name="label" translatable="yes" context="conditionaleasydialog|label">Conditional formatting rule: %1</property>
                     <accessibility>
                       <relation type="label-for" target="entryNumber"/>
                       <relation type="label-for" target="entryNumber2"/>
@@ -210,6 +241,11 @@
                         <accessibility>
                           <relation type="labelled-by" target="range"/>
                         </accessibility>
+                        <child internal-child="accessible">
+                          <object class="AtkObject" id="entryRange-atkobject">
+                            <property name="AtkObject::accessible-description" translatable="yes" context="conditioneasydialog|extended_tip|entryRange">Range of cells for conditional formatting.</property>
+                          </object>
+                        </child>
                       </object>
                       <packing>
                         <property name="expand">True</property>
@@ -220,8 +256,8 @@
                     <child>
                       <object class="GtkButton" id="rbassign">
                         <property name="visible">True</property>
-                        <property name="can_focus">True</property>
-                        <property name="receives_default">True</property>
+                        <property name="can-focus">True</property>
+                        <property name="receives-default">True</property>
                         <property name="valign">center</property>
                         <child internal-child="accessible">
                           <object class="AtkObject" id="rbassign-atkobject">
@@ -263,5 +299,8 @@
         </child>
       </object>
     </child>
+    <action-widgets>
+      <action-widget response="-11">help</action-widget>
+    </action-widgets>
   </object>
 </interface>