From 4346087adc4057aae9a84c18cdfd87db2aafdac0 Mon Sep 17 00:00:00 2001
From: Corey Berla <corey@berla.me>
Date: Mon, 2 Jan 2023 17:10:08 -0800
Subject: column-chooser: Subclass AdwWindow instead of GtkBox

We were subclassing from GtkBox and then, list-view created a
list-view-column-editor which subclassed from AdwWindow to add
the column-chooser.  It's a lot of extra code / complexity for something
that is only used in list-view.  This also allows us to directly
use column-chooser within list-view.

Also drop the list description label, in preparation for the switch to GtkListBox.
---
 src/resources/ui/nautilus-column-chooser.ui | 174 ++++++++++++++++------------
 1 file changed, 100 insertions(+), 74 deletions(-)

(limited to 'src/resources/ui/nautilus-column-chooser.ui')

diff --git a/src/resources/ui/nautilus-column-chooser.ui b/src/resources/ui/nautilus-column-chooser.ui
index 24cce3de7..512117c1c 100644
--- a/src/resources/ui/nautilus-column-chooser.ui
+++ b/src/resources/ui/nautilus-column-chooser.ui
@@ -13,93 +13,119 @@
       <column type="gboolean"/>
     </columns>
   </object>
-  <template class="NautilusColumnChooser" parent="GtkBox">
-    <property name="orientation">vertical</property>
-    <property name="spacing">12</property>
-    <child>
-      <object class="GtkScrolledWindow">
-        <property name="child">
-          <object class="GtkTreeView" id="view">
-            <property name="vexpand">True</property>
-            <property name="model">store</property>
-            <property name="headers-visible">False</property>
-            <property name="reorderable">True</property>
-            <signal name="row-activated" handler="view_row_activated_callback" swapped="no"/>
-            <child internal-child="selection">
-              <object class="GtkTreeSelection">
-                <signal name="changed" handler="selection_changed_callback" swapped="no"/>
+  <template class="NautilusColumnChooser" parent="AdwWindow">
+    <property name="modal">True</property>
+    <property name="default-width">360</property>
+    <property name="default-height">480</property>
+    <property name="destroy-with-parent">True</property>
+    <property name="content">
+      <object class="GtkBox">
+        <property name="orientation">vertical</property>
+        <child>
+          <object class="GtkHeaderBar">
+            <child type="title">
+              <object class="AdwWindowTitle" id="window_title">
+                <property name="title" translatable="true">Visible Columns</property>
               </object>
             </child>
+          </object>
+        </child>
+        <child>
+          <object class="GtkBox" id="box">
+            <property name="margin-top">18</property>
+            <property name="margin-bottom">18</property>
+            <property name="margin-start">18</property>
+            <property name="margin-end">18</property>
+            <property name="orientation">vertical</property>
+            <property name="spacing">18</property>
             <child>
-              <object class="GtkTreeViewColumn" id="visible-column">
-                <child>
-                  <object class="GtkCellRendererToggle">
-                    <signal name="toggled" handler="visible_toggled_callback" swapped="no"/>
+              <object class="GtkScrolledWindow">
+                <property name="child">
+                  <object class="GtkTreeView" id="view">
+                    <property name="vexpand">True</property>
+                    <property name="model">store</property>
+                    <property name="headers-visible">False</property>
+                    <property name="reorderable">True</property>
+                    <signal name="row-activated" handler="view_row_activated_callback" swapped="no"/>
+                    <child internal-child="selection">
+                      <object class="GtkTreeSelection">
+                        <signal name="changed" handler="selection_changed_callback" swapped="no"/>
+                      </object>
+                    </child>
+                    <child>
+                      <object class="GtkTreeViewColumn" id="visible-column">
+                        <child>
+                          <object class="GtkCellRendererToggle">
+                            <signal name="toggled" handler="visible_toggled_callback" swapped="no"/>
+                          </object>
+                          <attributes>
+                            <attribute name="sensitive">3</attribute>
+                            <attribute name="active">0</attribute>
+                          </attributes>
+                        </child>
+                      </object>
+                    </child>
+                    <child>
+                      <object class="GtkTreeViewColumn" id="label-column">
+                        <child>
+                          <object class="GtkCellRendererText"/>
+                          <attributes>
+                            <attribute name="sensitive">3</attribute>
+                            <attribute name="text">1</attribute>
+                          </attributes>
+                        </child>
+                      </object>
+                    </child>
                   </object>
-                  <attributes>
-                    <attribute name="sensitive">3</attribute>
-                    <attribute name="active">0</attribute>
-                  </attributes>
-                </child>
+                </property>
+                <style>
+                  <class name="frame"/>
+                </style>
               </object>
             </child>
             <child>
-              <object class="GtkTreeViewColumn" id="label-column">
+              <object class="GtkBox">
+                <property name="spacing">12</property>
                 <child>
-                  <object class="GtkCellRendererText"/>
-                  <attributes>
-                    <attribute name="sensitive">3</attribute>
-                    <attribute name="text">1</attribute>
-                  </attributes>
+                  <object class="GtkBox">
+                    <child>
+                      <object class="GtkButton" id="move_up_button">
+                        <property name="sensitive">False</property>
+                        <property name="icon-name">go-up-symbolic</property>
+                        <signal name="clicked" handler="move_up_clicked_callback" swapped="no"/>
+                      </object>
+                    </child>
+                    <child>
+                      <object class="GtkButton" id="move_down_button">
+                        <property name="sensitive">False</property>
+                        <property name="icon-name">go-down-symbolic</property>
+                        <signal name="clicked" handler="move_down_clicked_callback" swapped="no"/>
+                      </object>
+                    </child>
+                    <style>
+                      <class name="linked"/>
+                    </style>
+                  </object>
+                </child>
+                <child>
+                  <object class="GtkBox">
+                    <child>
+                      <object class="GtkButton" id="use_default_button">
+                        <property name="hexpand">true</property>
+                        <property name="halign">end</property>
+                        <property name="label" translatable="yes">Reset to De_fault</property>
+                        <property name="tooltip-text" translatable="yes">Replace the current List Columns settings with the default settings</property>
+                        <property name="use-underline">True</property>
+                        <signal name="clicked" handler="use_default_clicked_callback" swapped="no"/>
+                      </object>
+                    </child>
+                  </object>
                 </child>
-              </object>
-            </child>
-          </object>
-        </property>
-        <style>
-          <class name="frame"/>
-        </style>
-      </object>
-    </child>
-    <child>
-      <object class="GtkBox">
-        <property name="spacing">12</property>
-        <child>
-          <object class="GtkBox">
-            <child>
-              <object class="GtkButton" id="move_up_button">
-                <property name="sensitive">False</property>
-                <property name="icon-name">go-up-symbolic</property>
-                <signal name="clicked" handler="move_up_clicked_callback" swapped="no"/>
-              </object>
-            </child>
-            <child>
-              <object class="GtkButton" id="move_down_button">
-                <property name="sensitive">False</property>
-                <property name="icon-name">go-down-symbolic</property>
-                <signal name="clicked" handler="move_down_clicked_callback" swapped="no"/>
-              </object>
-            </child>
-            <style>
-              <class name="linked"/>
-            </style>
-          </object>
-        </child>
-        <child>
-          <object class="GtkBox">
-            <child>
-              <object class="GtkButton" id="use_default_button">
-                <property name="hexpand">true</property>
-                <property name="halign">end</property>
-                <property name="label" translatable="yes">Reset to De_fault</property>
-                <property name="tooltip-text" translatable="yes">Replace the current List Columns settings with the default settings</property>
-                <property name="use-underline">True</property>
-                <signal name="clicked" handler="use_default_clicked_callback" swapped="no"/>
               </object>
             </child>
           </object>
         </child>
       </object>
-    </child>
+    </property>
   </template>
 </interface>
-- 
cgit v1.2.1