CSV Export Dialog: Move export button below preferences

- Remove AdwClamp

1 files changed, 6 insertions, 13 deletions

diff --git a/src/ui/window.rs b/src/ui/window.rs
index 9b49ed6..bf23729 100644
--- a/src/ui/window.rs
+++ b/src/ui/window.rs
@@ -911,20 +911,17 @@ impl FurtheranceWindow {
     pub fn open_csv_export_dialog(&self) {
         let builder = gtk::Builder::from_resource("/com/lakoliu/Furtherance/gtk/csv_export_dialog.ui");
         let dialog = builder.object::<adw::Dialog>("csv_export_dialog").unwrap();
-        let tasksort_row = builder
-            .object::<adw::ComboRow>("tasksort_row")
-            .unwrap();
-        let sortorder_row = builder
-            .object::<adw::ComboRow>("sortorder_row")
+        let selected_file_label = builder
+            .object::<gtk::Label>("selected_file_label")
             .unwrap();
         let filechooser_button = builder
             .object::<gtk::Button>("filechooser_button")
             .unwrap();
-        let selected_file_label = builder
-            .object::<gtk::Label>("selected_file_label")
+        let tasksort_row = builder
+            .object::<adw::ComboRow>("tasksort_row")
             .unwrap();
-        let cancel_button = builder
-            .object::<gtk::Button>("cancel_button")
+        let sortorder_row = builder
+            .object::<adw::ComboRow>("sortorder_row")
             .unwrap();
         let export_button = builder
             .object::<gtk::Button>("export_button")
@@ -965,10 +962,6 @@ impl FurtheranceWindow {
             }),
         );
 
-        cancel_button.connect_clicked(clone!(@weak dialog => move |_| {
-            dialog.close();
-        }));
-
         export_button.connect_clicked(clone!(@weak self as window, @weak dialog, @weak filechooser, @weak tasksort_row, @weak sortorder_row => move |_| {
             let sort = TaskSort::try_from(tasksort_row.selected()).unwrap_or_default();
             let order = SortOrder::try_from(sortorder_row.selected()).unwrap_or_default();