SourceDialog: make a dialog (#840)

Author: danirabbit

src/SourceDialog/SourceDialog.vala

@@ -19,7 +19,7 @@
  *              Corentin Noël <corentin@elementaryos.org>
  */
 
-public class Maya.View.SourceDialog : Gtk.Grid {
+public class Maya.View.SourceDialog : Granite.Dialog {
     public EventType event_type { get; private set; default=EventType.EDIT;}
 
     private Gtk.Entry name_entry;
@@ -51,18 +51,13 @@ public class Maya.View.SourceDialog : Gtk.Grid {
     construct {
         widgets_checked = new Gee.HashMap<string, bool> (null, null);
 
-        var cancel_button = new Gtk.Button.with_label (_("Cancel"));
-        create_button = new Gtk.Button.with_label (_("Create"));
+        var cancel_button = (Gtk.Button) add_button (_("Cancel"), Gtk.ResponseType.CANCEL);
+
+        create_button = (Gtk.Button) add_button (_("Create") , Gtk.ResponseType.ACCEPT);
 
         create_button.clicked.connect (save);
         cancel_button.clicked.connect (() => go_back ());
 
-        var buttonbox = new Gtk.ButtonBox (Gtk.Orientation.HORIZONTAL);
-        buttonbox.layout_style = Gtk.ButtonBoxStyle.END;
-        buttonbox.spacing = 6;
-        buttonbox.pack_end (cancel_button);
-        buttonbox.pack_end (create_button);
-
         var name_label = new Gtk.Label (_("Name:"));
         name_label.xalign = 1;
 
@@ -229,24 +224,25 @@ public class Maya.View.SourceDialog : Gtk.Grid {
             hex_color = "#667885";
         });
 
-        main_grid = new Gtk.Grid ();
-        main_grid.row_spacing = 6;
-        main_grid.column_spacing = 12;
+        main_grid = new Gtk.Grid () {
+            margin_top = 12,
+            margin_end = 12,
+            margin_start = 12,
+            margin_bottom = 24,
+            column_spacing = 12,
+            row_spacing = 6,
+            vexpand = true
+        };
         main_grid.attach (type_label, 0, 0);
         main_grid.attach (type_combobox, 1, 0);
         main_grid.attach (name_label, 0, 1);
         main_grid.attach (name_entry, 1, 1);
         main_grid.attach (color_label, 0, 2);
         main_grid.attach (color_grid, 1, 2);
         main_grid.attach (is_default_check, 1, 3);
+        main_grid.show_all ();
 
-        margin = 12;
-        margin_bottom = 8;
-        row_spacing = 24;
-        attach (main_grid, 0, 0);
-        attach (buttonbox, 0, 1);
-
-        show_all ();
+        get_content_area ().add (main_grid);
     }
 
     public void set_source (E.Source? source = null) {

src/Widgets/SourcePopover.vala

@@ -20,7 +20,6 @@
 public class Calendar.Widgets.SourcePopover : Gtk.Popover {
     private GLib.HashTable<string, SourceRow?> src_map;
 
-    private Gtk.Stack stack;
     private Maya.View.SourceDialog src_dialog = null;
 
     private Gtk.Grid main_grid;
@@ -68,6 +67,7 @@ public class Calendar.Widgets.SourcePopover : Gtk.Popover {
         };
 
         main_grid = new Gtk.Grid () {
+            margin_bottom = 3,
             orientation = Gtk.Orientation.VERTICAL
         };
 
@@ -76,18 +76,13 @@ public class Calendar.Widgets.SourcePopover : Gtk.Popover {
         main_grid.add (add_calendar_button);
         main_grid.add (import_calendar_button);
         main_grid.add (accounts_button);
+        main_grid.show_all ();
 
-        stack = new Gtk.Stack () {
-            margin_bottom = 3
-        };
-        stack.add_named (main_grid, "main");
-
-        add (stack);
+        add (main_grid);
         populate.begin ();
-        stack.show_all ();
 
         add_calendar_button.button_release_event.connect (() => {
-            create_source ();
+            edit_source ();
             return Gdk.EVENT_STOP;
         });
 
@@ -181,17 +176,6 @@ public class Calendar.Widgets.SourcePopover : Gtk.Popover {
         source_item.source_has_changed ();
     }
 
-    private void create_source () {
-        if (src_dialog == null) {
-            src_dialog = new Maya.View.SourceDialog ();
-            src_dialog.go_back.connect (() => {switch_to_main ();});
-            stack.add_named (src_dialog, "source");
-        }
-
-        src_dialog.set_source (null);
-        switch_to_source ();
-    }
-
     private void add_source_to_view (E.Source source) {
         if (source.enabled == false)
             return;
@@ -234,30 +218,20 @@ public class Calendar.Widgets.SourcePopover : Gtk.Popover {
         source_item.show_calendar_removed ();
     }
 
-    private void edit_source (E.Source source) {
+    private void edit_source (E.Source? source = null) {
         if (src_dialog == null) {
-            src_dialog = new Maya.View.SourceDialog ();
-            src_dialog.go_back.connect (() => {switch_to_main ();});
-            stack.add_named (src_dialog, "source");
+            src_dialog = new Maya.View.SourceDialog () {
+                modal = true,
+                transient_for = ((Gtk.Application) GLib.Application.get_default ()).active_window
+            };
+
+            src_dialog.go_back.connect (() => {
+                src_dialog.hide ();
+            });
         }
 
+        popdown ();
         src_dialog.set_source (source);
-        switch_to_source ();
-    }
-
-    private void switch_to_main () {
-        main_grid.no_show_all = false;
-        main_grid.show ();
-        stack.set_visible_child_full ("main", Gtk.StackTransitionType.SLIDE_RIGHT);
-        src_dialog.hide ();
-        src_dialog.no_show_all = true;
-    }
-
-    private void switch_to_source () {
-        src_dialog.no_show_all = false;
-        src_dialog.show ();
-        stack.set_visible_child_full ("source", Gtk.StackTransitionType.SLIDE_LEFT);
-        main_grid.hide ();
-        main_grid.no_show_all = true;
+        src_dialog.present ();
     }
 }