From f8f8d5ec4568a10dc77144369f52b2dd165e66c5 Mon Sep 17 00:00:00 2001
From: Paris Oplopoios <paris.oplopoios@collabora.com>
Date: Fri, 27 Oct 2023 13:12:19 +0300
Subject: tdf#157930 Add button to switch to range view in condformateasydlg

Add a button that minimizes the dialog to make it easier to choose the
conditional formatting range in the condformateasydlg. Also added more
spacing.

Change-Id: Ibf90e1d44c5555af2ab7a5c7bdb0bb2fa6c11d58
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/158555
Tested-by: Jenkins
Reviewed-by: Paris Oplopoios <parisoplop@gmail.com>
---
 sc/source/ui/condformat/condformateasydlg.cxx |  2 ++
 sc/source/ui/inc/condformateasydlg.hxx        |  1 +
 sc/uiconfig/scalc/ui/conditionaleasydialog.ui | 29 ++++++++++++++++++++++++++-
 3 files changed, 31 insertions(+), 1 deletion(-)

diff --git a/sc/source/ui/condformat/condformateasydlg.cxx b/sc/source/ui/condformat/condformateasydlg.cxx
index c371861ac355..7e07b1a1dc19 100644
--- a/sc/source/ui/condformat/condformateasydlg.cxx
+++ b/sc/source/ui/condformat/condformateasydlg.cxx
@@ -67,11 +67,13 @@ ConditionalFormatEasyDialog::ConditionalFormatEasyDialog(SfxBindings* pBindings,
     , mxNumberEntry(m_xBuilder->weld_spin_button("entryNumber"))
     , mxNumberEntry2(m_xBuilder->weld_spin_button("entryNumber2"))
     , mxRangeEntry(new formula::RefEdit(m_xBuilder->weld_entry("entryRange")))
+    , mxButtonRangeEdit(new formula::RefButton(m_xBuilder->weld_button("rbassign")))
     , mxStyles(m_xBuilder->weld_combo_box("themeCombo"))
     , mxDescription(m_xBuilder->weld_label("description"))
     , mxButtonOk(m_xBuilder->weld_button("ok"))
     , mxButtonCancel(m_xBuilder->weld_button("cancel"))
 {
+    mxButtonRangeEdit->SetReferences(this, mxRangeEntry.get());
     mpTabViewShell = GetTabViewShell(pBindings);
     if (!mpTabViewShell)
         mpTabViewShell = dynamic_cast<ScTabViewShell*>(SfxViewShell::Current());
diff --git a/sc/source/ui/inc/condformateasydlg.hxx b/sc/source/ui/inc/condformateasydlg.hxx
index 469613d2f1c8..9ca15a11bda9 100644
--- a/sc/source/ui/inc/condformateasydlg.hxx
+++ b/sc/source/ui/inc/condformateasydlg.hxx
@@ -45,6 +45,7 @@ private:
     std::unique_ptr<weld::SpinButton> mxNumberEntry;
     std::unique_ptr<weld::SpinButton> mxNumberEntry2;
     std::unique_ptr<formula::RefEdit> mxRangeEntry;
+    std::unique_ptr<formula::RefButton> mxButtonRangeEdit;
     std::unique_ptr<weld::ComboBox> mxStyles;
     std::unique_ptr<weld::Label> mxDescription;
     std::unique_ptr<weld::Button> mxButtonOk;
diff --git a/sc/uiconfig/scalc/ui/conditionaleasydialog.ui b/sc/uiconfig/scalc/ui/conditionaleasydialog.ui
index 8f3da05b2ce8..2bee383956a9 100644
--- a/sc/uiconfig/scalc/ui/conditionaleasydialog.ui
+++ b/sc/uiconfig/scalc/ui/conditionaleasydialog.ui
@@ -68,7 +68,7 @@
             <property name="visible">True</property>
             <property name="can-focus">False</property>
             <property name="orientation">vertical</property>
-            <property name="spacing">12</property>
+            <property name="spacing">24</property>
             <child>
               <object class="GtkFrame">
                 <property name="visible">True</property>
@@ -79,6 +79,10 @@
                   <object class="GtkBox">
                     <property name="visible">True</property>
                     <property name="can-focus">False</property>
+                    <property name="margin-start">12</property>
+                    <property name="margin-end">12</property>
+                    <property name="margin-top">6</property>
+                    <property name="margin-bottom">6</property>
                     <property name="spacing">12</property>
                     <child>
                       <object class="GtkBox">
@@ -191,6 +195,11 @@
                   <object class="GtkBox">
                     <property name="visible">True</property>
                     <property name="can-focus">False</property>
+                    <property name="margin-start">12</property>
+                    <property name="margin-end">12</property>
+                    <property name="margin-top">6</property>
+                    <property name="margin-bottom">6</property>
+                    <property name="spacing">12</property>
                     <child>
                       <object class="GtkEntry" id="entryRange">
                         <property name="visible">True</property>
@@ -205,6 +214,24 @@
                         <property name="position">0</property>
                       </packing>
                     </child>
+                    <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="valign">center</property>
+                        <child internal-child="accessible">
+                          <object class="AtkObject" id="rbassign-atkobject">
+                            <property name="AtkObject::accessible-description" translatable="yes" context="conditionaleasydialog|extended_tip|rbassign">Click the Shrink icon to reduce the dialog to the size of the input field. It is then easier to mark the required reference in the sheet. The icons then automatically convert to the Maximize icon. Click it to restore the dialog to its original size.</property>
+                          </object>
+                        </child>
+                      </object>
+                      <packing>
+                        <property name="expand">False</property>
+                        <property name="fill">True</property>
+                        <property name="position">1</property>
+                      </packing>
+                    </child>
                   </object>
                 </child>
                 <child type="label">
-- 
cgit