weld cluster of change tracking dialogs

Change-Id: I42ca7acb41699df91b91a9f59fc68cd30972a397
Reviewed-on: https://gerrit.libreoffice.org/70988
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>

3 files changed, 287 insertions, 109 deletions

diff --git a/svx/uiconfig/ui/acceptrejectchangesdialog.ui b/svx/uiconfig/ui/acceptrejectchangesdialog.ui
index 7e9817689a99..a9db619b328f 100644
--- a/svx/uiconfig/ui/acceptrejectchangesdialog.ui
+++ b/svx/uiconfig/ui/acceptrejectchangesdialog.ui
@@ -1,12 +1,17 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- Generated with glade 3.20.0 -->
+<!-- Generated with glade 3.22.1 -->
 <interface domain="svx">
   <requires lib="gtk+" version="3.18"/>
   <object class="GtkDialog" id="AcceptRejectChangesDialog">
     <property name="can_focus">False</property>
     <property name="border_width">6</property>
     <property name="title" translatable="yes" context="acceptrejectchangesdialog|AcceptRejectChangesDialog">Manage Changes</property>
+    <property name="default_width">0</property>
+    <property name="default_height">0</property>
     <property name="type_hint">dialog</property>
+    <child>
+      <placeholder/>
+    </child>
     <child internal-child="vbox">
       <object class="GtkBox" id="dialog-vbox1">
         <property name="can_focus">False</property>
@@ -121,11 +126,11 @@
       </object>
     </child>
     <action-widgets>
-      <action-widget response="0">accept</action-widget>
-      <action-widget response="0">reject</action-widget>
-      <action-widget response="0">acceptall</action-widget>
-      <action-widget response="0">rejectall</action-widget>
-      <action-widget response="0">undo</action-widget>
+      <action-widget response="105">accept</action-widget>
+      <action-widget response="104">reject</action-widget>
+      <action-widget response="103">acceptall</action-widget>
+      <action-widget response="102">rejectall</action-widget>
+      <action-widget response="101">undo</action-widget>
       <action-widget response="-7">close</action-widget>
     </action-widgets>
   </object>
@@ -150,7 +155,7 @@
             <property name="visible">True</property>
             <property name="can_focus">False</property>
             <child>
-              <object class="GtkRadioMenuItem" id="calcaction">
+              <object class="GtkRadioMenuItem" id="calcsort0">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
                 <property name="label" translatable="yes" context="acceptrejectchangesdialog|calcaction">Action</property>
@@ -158,35 +163,39 @@
               </object>
             </child>
             <child>
-              <object class="GtkRadioMenuItem" id="calcposition">
+              <object class="GtkRadioMenuItem" id="calcsort1">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
                 <property name="label" translatable="yes" context="acceptrejectchangesdialog|calcposition">Position</property>
                 <property name="use_underline">True</property>
+                <property name="group">calcsort0</property>
               </object>
             </child>
             <child>
-              <object class="GtkRadioMenuItem" id="calcauthor">
+              <object class="GtkRadioMenuItem" id="calcsort2">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
                 <property name="label" translatable="yes" context="acceptrejectchangesdialog|calcauthor">Author</property>
                 <property name="use_underline">True</property>
+                <property name="group">calcsort0</property>
               </object>
             </child>
             <child>
-              <object class="GtkRadioMenuItem" id="calcdate">
+              <object class="GtkRadioMenuItem" id="calcsort3">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
                 <property name="label" translatable="yes" context="acceptrejectchangesdialog|calcdate">Date</property>
                 <property name="use_underline">True</property>
+                <property name="group">calcsort0</property>
               </object>
             </child>
             <child>
-              <object class="GtkRadioMenuItem" id="calcdesc">
+              <object class="GtkRadioMenuItem" id="calcsort4">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
                 <property name="label" translatable="yes" context="acceptrejectchangesdialog|calcdesc">Description</property>
                 <property name="use_underline">True</property>
+                <property name="group">calcsort0</property>
               </object>
             </child>
           </object>
@@ -215,7 +224,7 @@
             <property name="visible">True</property>
             <property name="can_focus">False</property>
             <child>
-              <object class="GtkRadioMenuItem" id="writeraction">
+              <object class="GtkRadioMenuItem" id="writersort0">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
                 <property name="label" translatable="yes" context="acceptrejectchangesdialog|writeraction">Action</property>
@@ -223,35 +232,39 @@
               </object>
             </child>
             <child>
-              <object class="GtkRadioMenuItem" id="writerauthor">
+              <object class="GtkRadioMenuItem" id="writersort1">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
                 <property name="label" translatable="yes" context="acceptrejectchangesdialog|writerauthor">Author</property>
                 <property name="use_underline">True</property>
+                <property name="group">writersort0</property>
               </object>
             </child>
             <child>
-              <object class="GtkRadioMenuItem" id="writerdate">
+              <object class="GtkRadioMenuItem" id="writersort2">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
                 <property name="label" translatable="yes" context="acceptrejectchangesdialog|writerdate">Date</property>
                 <property name="use_underline">True</property>
+                <property name="group">writersort0</property>
               </object>
             </child>
             <child>
-              <object class="GtkRadioMenuItem" id="writerdesc">
+              <object class="GtkRadioMenuItem" id="writersort3">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
                 <property name="label" translatable="yes" context="acceptrejectchangesdialog|writerdesc">Comment</property>
                 <property name="use_underline">True</property>
+                <property name="group">writersort0</property>
               </object>
             </child>
             <child>
-              <object class="GtkRadioMenuItem" id="writerposition">
+              <object class="GtkRadioMenuItem" id="writersort4">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
                 <property name="label" translatable="yes" context="acceptrejectchangesdialog|writerposition">Document Position</property>
                 <property name="use_underline">True</property>
+                <property name="group">writersort0</property>
               </object>
             </child>
           </object>
diff --git a/svx/uiconfig/ui/redlinefilterpage.ui b/svx/uiconfig/ui/redlinefilterpage.ui
index 1638cc105ff2..5dd59893a511 100644
--- a/svx/uiconfig/ui/redlinefilterpage.ui
+++ b/svx/uiconfig/ui/redlinefilterpage.ui
@@ -1,28 +1,33 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- Generated with glade 3.20.0 -->
+<!-- Generated with glade 3.22.1 -->
 <interface domain="svx">
   <requires lib="gtk+" version="3.18"/>
   <object class="GtkAdjustment" id="adjustment1">
-    <property name="lower">19851231</property>
-    <property name="upper">20501231</property>
-    <property name="value">19851231</property>
-    <property name="step_increment">1</property>
-    <property name="page_increment">10</property>
+    <property name="upper">86400000</property>
+    <property name="step_increment">1000</property>
+    <property name="page_increment">60000</property>
+  </object>
+  <object class="GtkAdjustment" id="adjustment2">
+    <property name="upper">86400000</property>
+    <property name="step_increment">1000</property>
+    <property name="page_increment">60000</property>
   </object>
   <object class="GtkImage" id="image1">
     <property name="visible">True</property>
     <property name="can_focus">False</property>
-    <property name="pixbuf">cmd/sc_timefield.png</property>
+    <property name="icon_name">cmd/sc_timefield.png</property>
   </object>
   <object class="GtkImage" id="image2">
     <property name="visible">True</property>
     <property name="can_focus">False</property>
-    <property name="pixbuf">cmd/sc_timefield.png</property>
+    <property name="icon_name">cmd/sc_timefield.png</property>
   </object>
   <object class="GtkGrid" id="RedlineFilterPage">
     <property name="visible">True</property>
     <property name="can_focus">False</property>
     <property name="valign">start</property>
+    <property name="hexpand">True</property>
+    <property name="vexpand">True</property>
     <property name="border_width">6</property>
     <property name="row_spacing">6</property>
     <property name="column_spacing">6</property>
@@ -81,6 +86,7 @@
         <property name="can_focus">True</property>
         <property name="margin_left">24</property>
         <property name="hexpand">True</property>
+        <property name="activates_default">True</property>
         <child internal-child="accessible">
           <object class="AtkObject" id="commentedit-atkobject">
             <property name="AtkObject::accessible-name" translatable="yes" context="redlinefilterpage|commentedit-atkobject">Comment</property>
@@ -176,6 +182,7 @@
             <property name="sensitive">False</property>
             <property name="can_focus">True</property>
             <property name="hexpand">True</property>
+            <property name="activates_default">True</property>
             <accessibility>
               <relation type="labelled-by" target="range"/>
             </accessibility>
@@ -272,15 +279,17 @@
               </packing>
             </child>
             <child>
-              <object class="GtkSpinButton" id="startdate:yy:mm:dd">
-                <property name="width_request">120</property>
+              <object class="GtkMenuButton" id="startdate">
                 <property name="visible">True</property>
-                <property name="sensitive">False</property>
                 <property name="can_focus">True</property>
-                <property name="hexpand">True</property>
-                <property name="adjustment">adjustment1</property>
+                <property name="receives_default">False</property>
+                <property name="draw_indicator">True</property>
+                <property name="label" translatable="no"></property>
+                <child>
+                  <placeholder/>
+                </child>
                 <child internal-child="accessible">
-                  <object class="AtkObject" id="startdate:yy:mm:dd-atkobject">
+                  <object class="AtkObject" id="startdate-atkobject">
                     <property name="AtkObject::accessible-name" translatable="yes" context="redlinefilterpage|startdate-atkobject">Start Date</property>
                   </object>
                 </child>
@@ -291,14 +300,16 @@
               </packing>
             </child>
             <child>
-              <object class="GtkSpinButton" id="starttime:hh:mm">
+              <object class="GtkSpinButton" id="starttime">
                 <property name="width_request">70</property>
                 <property name="visible">True</property>
                 <property name="sensitive">False</property>
                 <property name="can_focus">True</property>
                 <property name="hexpand">True</property>
+                <property name="activates_default">True</property>
+                <property name="adjustment">adjustment1</property>
                 <child internal-child="accessible">
-                  <object class="AtkObject" id="starttime:hh:mm-atkobject">
+                  <object class="AtkObject" id="starttime-atkobject">
                     <property name="AtkObject::accessible-name" translatable="yes" context="redlinefilterpage|starttime-atkobject">Start Time</property>
                   </object>
                 </child>
@@ -324,15 +335,17 @@
               </packing>
             </child>
             <child>
-              <object class="GtkSpinButton" id="enddate:yy:mm:dd">
-                <property name="width_request">120</property>
+              <object class="GtkMenuButton" id="enddate">
                 <property name="visible">True</property>
-                <property name="sensitive">False</property>
                 <property name="can_focus">True</property>
-                <property name="hexpand">True</property>
-                <property name="adjustment">adjustment1</property>
+                <property name="receives_default">False</property>
+                <property name="draw_indicator">True</property>
+                <property name="label" translatable="no"></property>
+                <child>
+                  <placeholder/>
+                </child>
                 <child internal-child="accessible">
-                  <object class="AtkObject" id="enddate:yy:mm:dd-atkobject">
+                  <object class="AtkObject" id="enddate-atkobject">
                     <property name="AtkObject::accessible-name" translatable="yes" context="redlinefilterpage|enddate-atkobject">End Date</property>
                   </object>
                 </child>
@@ -343,14 +356,16 @@
               </packing>
             </child>
             <child>
-              <object class="GtkSpinButton" id="endtime:hh:mm">
+              <object class="GtkSpinButton" id="endtime">
                 <property name="width_request">75</property>
                 <property name="visible">True</property>
                 <property name="sensitive">False</property>
                 <property name="can_focus">True</property>
                 <property name="hexpand">True</property>
+                <property name="activates_default">True</property>
+                <property name="adjustment">adjustment2</property>
                 <child internal-child="accessible">
-                  <object class="AtkObject" id="endtime:hh:mm-atkobject">
+                  <object class="AtkObject" id="endtime-atkobject">
                     <property name="AtkObject::accessible-name" translatable="yes" context="redlinefilterpage|endtime-atkobject">End Time</property>
                   </object>
                 </child>
diff --git a/svx/uiconfig/ui/redlineviewpage.ui b/svx/uiconfig/ui/redlineviewpage.ui
index 19dd56ef34fc..370b8957a0c3 100644
--- a/svx/uiconfig/ui/redlineviewpage.ui
+++ b/svx/uiconfig/ui/redlineviewpage.ui
@@ -1,7 +1,42 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface domain="svx">
   <requires lib="gtk+" version="3.18"/>
-  <requires lib="LibreOffice" version="1.0"/>
+  <object class="GtkTreeStore" id="liststore1">
+    <columns>
+      <!-- column-name text -->
+      <column type="gchararray"/>
+      <!-- column-name text2 -->
+      <column type="gchararray"/>
+      <!-- column-name text3 -->
+      <column type="gchararray"/>
+      <!-- column-name text4 -->
+      <column type="gchararray"/>
+      <!-- column-name text5 -->
+      <column type="gchararray"/>
+      <!-- column-name id -->
+      <column type="gchararray"/>
+      <!-- column-name textcolor -->
+      <column type="GdkRGBA"/>
+    </columns>
+  </object>
+  <object class="GtkTreeStore" id="liststore2">
+    <columns>
+      <!-- column-name image -->
+      <column type="GdkPixbuf"/>
+      <!-- column-name text -->
+      <column type="gchararray"/>
+      <!-- column-name text2 -->
+      <column type="gchararray"/>
+      <!-- column-name text3 -->
+      <column type="gchararray"/>
+      <!-- column-name text4 -->
+      <column type="gchararray"/>
+      <!-- column-name id -->
+      <column type="gchararray"/>
+      <!-- column-name textcolor -->
+      <column type="GdkRGBA"/>
+    </columns>
+  </object>
   <object class="GtkBox" id="RedlineViewPage">
     <property name="visible">True</property>
     <property name="can_focus">False</property>
@@ -10,90 +45,205 @@
     <property name="border_width">6</property>
     <property name="orientation">vertical</property>
     <child>
-      <object class="GtkBox" id="box3">
-        <property name="can_focus">False</property>
-        <property name="no_show_all">True</property>
-        <property name="homogeneous">True</property>
-        <child>
-          <object class="GtkLabel" id="action">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
-            <property name="label" translatable="yes" context="redlineviewpage|action">Action</property>
-          </object>
-          <packing>
-            <property name="expand">False</property>
-            <property name="fill">True</property>
-            <property name="position">0</property>
-          </packing>
-        </child>
-        <child>
-          <object class="GtkLabel" id="position">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
-            <property name="label" translatable="yes" context="redlineviewpage|position">Position</property>
-          </object>
-          <packing>
-            <property name="expand">False</property>
-            <property name="fill">True</property>
-            <property name="position">1</property>
-          </packing>
-        </child>
-        <child>
-          <object class="GtkLabel" id="author">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
-            <property name="label" translatable="yes" context="redlineviewpage|author">Author</property>
-          </object>
-          <packing>
-            <property name="expand">False</property>
-            <property name="fill">True</property>
-            <property name="position">2</property>
-          </packing>
-        </child>
+      <object class="GtkScrolledWindow">
+        <property name="visible">False</property>
+        <property name="can_focus">True</property>
+        <property name="hexpand">True</property>
+        <property name="vexpand">True</property>
+        <property name="shadow_type">in</property>
         <child>
-          <object class="GtkLabel" id="date">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
-            <property name="label" translatable="yes" context="redlineviewpage|date">Date</property>
+          <object class="GtkTreeView" id="calcchanges">
+            <property name="visible">False</property>
+            <property name="can_focus">True</property>
+            <property name="receives_default">True</property>
+            <property name="hexpand">True</property>
+            <property name="vexpand">True</property>
+            <property name="model">liststore1</property>
+            <property name="search_column">0</property>
+            <property name="show_expanders">True</property>
+            <child internal-child="selection">
+              <object class="GtkTreeSelection" id="Macro Library List-selection1"/>
+            </child>
+            <child>
+              <object class="GtkTreeViewColumn" id="treeviewcolumn0">
+                <property name="resizable">True</property>
+                <property name="spacing">6</property>
+                <property name="title" translatable="yes" context="redlineviewpage|action">Action</property>
+                <property name="clickable">True</property>
+                <child>
+                  <object class="GtkCellRendererText" id="cellrenderer0"/>
+                  <attributes>
+                    <attribute name="text">0</attribute>
+                    <attribute name="foreground-rgba">6</attribute>
+                  </attributes>
+                </child>
+              </object>
+            </child>
+            <child>
+              <object class="GtkTreeViewColumn" id="treeviewcolumn1">
+                <property name="resizable">True</property>
+                <property name="spacing">6</property>
+                <property name="title" translatable="yes" context="redlineviewpage|position">Position</property>
+                <property name="clickable">True</property>
+                <child>
+                  <object class="GtkCellRendererText" id="cellrenderer1"/>
+                  <attributes>
+                    <attribute name="text">1</attribute>
+                    <attribute name="foreground-rgba">6</attribute>
+                  </attributes>
+                </child>
+              </object>
+            </child>
+            <child>
+              <object class="GtkTreeViewColumn" id="treeviewcolumn2">
+                <property name="resizable">True</property>
+                <property name="spacing">6</property>
+                <property name="title" translatable="yes" context="redlineviewpage|author">Author</property>
+                <property name="clickable">True</property>
+                <child>
+                  <object class="GtkCellRendererText" id="cellrenderer2"/>
+                  <attributes>
+                    <attribute name="text">2</attribute>
+                    <attribute name="foreground-rgba">6</attribute>
+                  </attributes>
+                </child>
+              </object>
+            </child>
+            <child>
+              <object class="GtkTreeViewColumn" id="treeviewcolumn3">
+                <property name="resizable">True</property>
+                <property name="spacing">6</property>
+                <property name="title" translatable="yes" context="redlineviewpage|date">Date</property>
+                <property name="clickable">True</property>
+                <child>
+                  <object class="GtkCellRendererText" id="cellrenderer3"/>
+                  <attributes>
+                    <attribute name="text">3</attribute>
+                    <attribute name="foreground-rgba">6</attribute>
+                  </attributes>
+                </child>
+              </object>
+            </child>
+            <child>
+              <object class="GtkTreeViewColumn" id="treeviewcolumn4">
+                <property name="resizable">True</property>
+                <property name="spacing">6</property>
+                <property name="title" translatable="yes" context="redlineviewpage|comment">Comment</property>
+                <property name="clickable">True</property>
+                <child>
+                  <object class="GtkCellRendererText" id="cellrenderer4"/>
+                  <attributes>
+                    <attribute name="text">4</attribute>
+                    <attribute name="foreground-rgba">6</attribute>
+                  </attributes>
+                </child>
+              </object>
+            </child>
           </object>
-          <packing>
-            <property name="expand">False</property>
-            <property name="fill">True</property>
-            <property name="position">3</property>
-          </packing>
         </child>
-        <child>
-          <object class="GtkLabel" id="comment">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
-            <property name="label" translatable="yes" context="redlineviewpage|comment">Comment</property>
+        <child internal-child="accessible">
+          <object class="AtkObject" id="calcchanges-atkobject">
+            <property name="AtkObject::accessible-name" translatable="yes" context="redlineviewpage|calcchanges-atkobject">Changes</property>
           </object>
-          <packing>
-            <property name="expand">False</property>
-            <property name="fill">True</property>
-            <property name="position">4</property>
-          </packing>
         </child>
       </object>
       <packing>
-        <property name="expand">False</property>
+        <property name="expand">True</property>
         <property name="fill">True</property>
-        <property name="position">0</property>
+        <property name="position">1</property>
       </packing>
     </child>
     <child>
-      <object class="svtlo-SvSimpleTableContainer" id="changes">
-        <property name="visible">True</property>
+      <object class="GtkScrolledWindow">
+        <property name="visible">False</property>
         <property name="can_focus">True</property>
         <property name="hexpand">True</property>
         <property name="vexpand">True</property>
-        <child internal-child="accessible">
-          <object class="AtkObject" id="changes-atkobject">
-            <property name="AtkObject::accessible-name" translatable="yes" context="redlineviewpage|changes-atkobject">Changes</property>
+        <property name="shadow_type">in</property>
+        <child>
+          <object class="GtkTreeView" id="writerchanges">
+            <property name="visible">False</property>
+            <property name="can_focus">True</property>
+            <property name="receives_default">True</property>
+            <property name="hexpand">True</property>
+            <property name="vexpand">True</property>
+            <property name="model">liststore2</property>
+            <property name="search_column">0</property>
+            <property name="show_expanders">True</property>
+            <child internal-child="selection">
+              <object class="GtkTreeSelection" id="Macro Library List-selection2"/>
+            </child>
+            <child>
+              <object class="GtkTreeViewColumn" id="treeviewcolumn00">
+                <property name="resizable">True</property>
+                <property name="spacing">6</property>
+                <property name="title" translatable="yes" context="redlineviewpage|action">Action</property>
+                <property name="clickable">True</property>
+                <child>
+                  <object class="GtkCellRendererPixbuf" id="cellrenderertext45"/>
+                  <attributes>
+                    <attribute name="pixbuf">0</attribute>
+                  </attributes>
+                </child>
+                <child>
+                  <object class="GtkCellRendererText" id="cellrenderertext25"/>
+                  <attributes>
+                    <attribute name="text">1</attribute>
+                  </attributes>
+                </child>
+              </object>
+            </child>
+            <child>
+              <object class="GtkTreeViewColumn" id="treeviewcolumn20">
+                <property name="resizable">True</property>
+                <property name="spacing">6</property>
+                <property name="title" translatable="yes" context="redlineviewpage|author">Author</property>
+                <property name="clickable">True</property>
+                <child>
+                  <object class="GtkCellRendererText" id="cellrenderer29"/>
+                  <attributes>
+                    <attribute name="text">2</attribute>
+                    <attribute name="foreground-rgba">6</attribute>
+                  </attributes>
+                </child>
+              </object>
+            </child>
+            <child>
+              <object class="GtkTreeViewColumn" id="treeviewcolumn30">
+                <property name="resizable">True</property>
+                <property name="spacing">6</property>
+                <property name="title" translatable="yes" context="redlineviewpage|date">Date</property>
+                <property name="clickable">True</property>
+                <child>
+                  <object class="GtkCellRendererText" id="cellrenderer39"/>
+                  <attributes>
+                    <attribute name="text">3</attribute>
+                    <attribute name="foreground-rgba">6</attribute>
+                  </attributes>
+                </child>
+              </object>
+            </child>
+            <child>
+              <object class="GtkTreeViewColumn" id="treeviewcolumn40">
+                <property name="resizable">True</property>
+                <property name="spacing">6</property>
+                <property name="title" translatable="yes" context="redlineviewpage|comment">Comment</property>
+                <property name="clickable">True</property>
+                <child>
+                  <object class="GtkCellRendererText" id="cellrenderer49"/>
+                  <attributes>
+                    <attribute name="text">4</attribute>
+                    <attribute name="foreground-rgba">6</attribute>
+                  </attributes>
+                </child>
+              </object>
+            </child>
           </object>
         </child>
-        <child internal-child="selection">
-          <object class="GtkTreeSelection" id="Simple Table Container-selection"/>
+        <child internal-child="accessible">
+          <object class="AtkObject" id="writerchanges-atkobject">
+            <property name="AtkObject::accessible-name" translatable="yes" context="redlineviewpage|writerchanges-atkobject">Changes</property>
+          </object>
         </child>
       </object>
       <packing>