From f2077d3cfec223747f379073b918fa57b2411602 Mon Sep 17 00:00:00 2001
From: Heliguy <heliguy4599@hotmail.com>
Date: Sun, 1 Sep 2024 23:29:22 -0400
Subject: [PATCH] Make the add remote dialog HIG compliant

---
 src/remotes_page/add_remote_dialog.blp | 27 +++++++++++++-------------
 src/remotes_page/add_remote_dialog.py  |  6 +++---
 2 files changed, 16 insertions(+), 17 deletions(-)

diff --git a/src/remotes_page/add_remote_dialog.blp b/src/remotes_page/add_remote_dialog.blp
index 7e7942b..72f1d9f 100644
--- a/src/remotes_page/add_remote_dialog.blp
+++ b/src/remotes_page/add_remote_dialog.blp
@@ -3,24 +3,23 @@ using Adw 1;
 
 template $AddRemoteDialog : Adw.Dialog {
     title: _("Add a Remote");
-    content-width: 500;
-    content-height: 375;
+    // content-width: 500;
+    // content-height: 375;
+    width-request: 400;
+    follows-content-size: true;
     Adw.ToolbarView {
         [top]
         Adw.HeaderBar {
-        }
-        [bottom]
-        ActionBar action_bar {
-            [center]
+            show-start-title-buttons: false;
+            show-end-title-buttons: false;
+            [start]
+            Button cancel_button {
+                label: _("Cancel");
+            }
+            [end]
             Button apply_button {
-                margin-top: 3;
-                margin-bottom: 3;
-                sensitive: false;
-                styles ["pill", "suggested-action"]
-                Adw.ButtonContent {
-                    icon-name: "plus-large-symbolic";
-                    label: _("Add Remote");
-                }
+                styles ["suggested-action"]
+                label: _("Add");
             }
         }
         Adw.ToastOverlay toast_overlay {
diff --git a/src/remotes_page/add_remote_dialog.py b/src/remotes_page/add_remote_dialog.py
index 643fd44..cc74a2b 100644
--- a/src/remotes_page/add_remote_dialog.py
+++ b/src/remotes_page/add_remote_dialog.py
@@ -9,9 +9,9 @@ class AddRemoteDialog(Adw.Dialog):
     __gtype_name__ = "AddRemoteDialog"
     gtc = Gtk.Template.Child
 
-    action_bar = gtc()
     toast_overlay = gtc()
     stack = gtc()
+    cancel_button = gtc()
     apply_button = gtc()
     content_page = gtc()
     title_row = gtc()
@@ -22,7 +22,6 @@ class AddRemoteDialog(Adw.Dialog):
     def on_apply(self, *args):
         self.stack.set_visible_child(self.loading_page)
         self.apply_button.set_sensitive(False)
-        self.action_bar.set_revealed(False)
         error = [None]
         def thread(*args):
             cmd = [
@@ -48,7 +47,6 @@ class AddRemoteDialog(Adw.Dialog):
         def callback(*args):
             if error[0]:
                 self.stack.set_visible_child(self.content_page)
-                self.action_bar.set_revealed(True)
                 self.apply_button.set_sensitive(True)
                 self.toast_overlay.add_toast(ErrorToast(_("Could not add remote"), str(error[0])).toast)
             else:
@@ -104,6 +102,7 @@ class AddRemoteDialog(Adw.Dialog):
                 self.check_entries(self.title_row)
                 self.check_entries(self.name_row)
                 self.check_entries(self.url_row)
+                self.url_row.set_editable(False)
             else:
                 self.title_row.set_editable(False)
                 self.name_row.set_editable(False)
@@ -111,6 +110,7 @@ class AddRemoteDialog(Adw.Dialog):
                 self.apply_button.set_sensitive(True)
 
         # Connections
+        self.cancel_button.connect("clicked", lambda *_: self.close())
         self.apply_button.connect("clicked", self.on_apply)
         self.title_row.connect("changed", self.check_entries)
         self.name_row.connect("changed", self.check_entries)