fdo#56456 fdo#75578 fdo#63271 fdo#75805 Improve hyperlink dialog

Changes made:

* Rename "Back" to "Reset" like in other dialogs (eg. Writer - Format - Character).
* Apply-Button, which reflects the old behavior of the dialog, and doesn't
  close it automatically.
* Added an OK-Button, which applies the changes made and automatically closes the
  dialog.

With this both use cases should be handled:

* Inserting one single URI with simple close.
* Modifying multiple URIs without closing the dialog.

Hopefully all users are happy with this ;)

Change-Id: I1881dee083945cd165fbb8f8444395c1b04a0607
Reviewed-on: https://gerrit.libreoffice.org/10946
Reviewed-by: Samuel Mehrbrodt <s.mehrbrodt@gmail.com>
Reviewed-by: Thomas Arnhold <thomas@arnhold.org>
Tested-by: Thomas Arnhold <thomas@arnhold.org>

1 files changed, 23 insertions, 11 deletions

diff --git a/cui/uiconfig/ui/hyperlinkdialog.ui b/cui/uiconfig/ui/hyperlinkdialog.ui
index 5a55417ab304..551a024a1217 100644
--- a/cui/uiconfig/ui/hyperlinkdialog.ui
+++ b/cui/uiconfig/ui/hyperlinkdialog.ui
@@ -24,12 +24,12 @@
             <child>
               <object class="GtkButton" id="ok">
                 <property name="label">gtk-ok</property>
-                <property name="use_action_appearance">False</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="can_default">True</property>
                 <property name="has_default">True</property>
                 <property name="receives_default">True</property>
+                <property name="tooltip_text" translatable="yes">Apply changes and close dialog</property>
                 <property name="use_stock">True</property>
               </object>
               <packing>
@@ -39,9 +39,22 @@
               </packing>
             </child>
             <child>
+              <object class="GtkButton" id="apply">
+                <property name="label" translatable="yes">Apply</property>
+                <property name="visible">True</property>
+                <property name="can_focus">True</property>
+                <property name="receives_default">True</property>
+                <property name="tooltip_text" translatable="yes">Apply changes</property>
+              </object>
+              <packing>
+                <property name="expand">False</property>
+                <property name="fill">True</property>
+                <property name="position">1</property>
+              </packing>
+            </child>
+            <child>
               <object class="GtkButton" id="cancel">
                 <property name="label">gtk-cancel</property>
-                <property name="use_action_appearance">False</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="receives_default">True</property>
@@ -50,13 +63,12 @@
               <packing>
                 <property name="expand">False</property>
                 <property name="fill">True</property>
-                <property name="position">1</property>
+                <property name="position">2</property>
               </packing>
             </child>
             <child>
               <object class="GtkButton" id="help">
                 <property name="label">gtk-help</property>
-                <property name="use_action_appearance">False</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="receives_default">True</property>
@@ -65,21 +77,21 @@
               <packing>
                 <property name="expand">False</property>
                 <property name="fill">True</property>
-                <property name="position">2</property>
+                <property name="position">3</property>
               </packing>
             </child>
             <child>
-              <object class="GtkButton" id="back">
-                <property name="label" translatable="yes">back</property>
-                <property name="use_action_appearance">False</property>
+              <object class="GtkButton" id="reset">
+                <property name="label" translatable="yes">Reset</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="receives_default">True</property>
+                <property name="tooltip_text" translatable="yes">Reset changes</property>
               </object>
               <packing>
                 <property name="expand">False</property>
                 <property name="fill">True</property>
-                <property name="position">3</property>
+                <property name="position">4</property>
               </packing>
             </child>
           </object>
@@ -103,7 +115,6 @@
                 <property name="height_request">400</property>
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="margin">0</property>
                 <property name="vexpand">True</property>
               </object>
               <packing>
@@ -140,9 +151,10 @@
     </child>
     <action-widgets>
       <action-widget response="0">ok</action-widget>
+      <action-widget response="0">apply</action-widget>
       <action-widget response="0">cancel</action-widget>
       <action-widget response="0">help</action-widget>
-      <action-widget response="0">back</action-widget>
+      <action-widget response="0">reset</action-widget>
     </action-widgets>
   </object>
 </interface>