Merge lp:~kjtehprogrammer/maya/fix-1300571 into lp:~elementary-apps/maya/trunk

[KJ Lawrence]

Switch to Gtk.Dialog

[Corentin Noël (tintou)]

I have a branch waiting for review that also replace the LightWindow.
It does replace this branch.

review: Disapprove

[KJ Lawrence (kjtehprogrammer)]

> I have a branch waiting for review that also replace the LightWindow.
> It does replace this branch.

Cool, at least someone is doing it!

Unmerged revisions

541. By KJ Lawrence on 2014-04-03

Forgot a 'print'...

540. By KJ Lawrence on 2014-04-03

Change from Gtk.Window/Granite.Widgets.LightWindow to Gtk.Dialog

=== modified file 'src/Application.vala'
--- src/Application.vala	2014-03-24 22:15:29 +0000
+++ src/Application.vala	2014-04-03 03:09:20 +0000
@@ -297,7 +297,7 @@
 
         //--- SIGNAL HANDLERS ---//
 
-        void on_event_dialog_response (View.EventDialog dialog, bool response_id, bool add_event)  {
+        void on_event_dialog_response (View.EventDialog dialog, int response_id, bool add_event)  {
 
             E.CalComponent event = dialog.ecal;
             E.Source source = dialog.source;
@@ -306,7 +306,7 @@
 
             dialog.dispose ();
 
-            if (response_id != true)
+            if (response_id != 1)
                 return;
 
             if (add_event)

=== modified file 'src/View/EventDialog.vala'
--- src/View/EventDialog.vala	2014-03-21 06:16:35 +0000
+++ src/View/EventDialog.vala	2014-04-03 03:09:20 +0000
@@ -22,11 +22,7 @@
     EDIT
 }
 
-#if USE_GRANITE_DECORATED_WINDOW
-public class EventDialog : Granite.Widgets.LightWindow {
-#else
-public class EventDialog : Gtk.Window {
-#endif
+public class EventDialog : Gtk.Dialog {
 
         /**
          * The different widgets in the dialog.
@@ -47,8 +43,6 @@
          */
         private bool can_edit = true;
 
-        public signal void response (bool response);
-
         private Gtk.Grid content_grid { get; private set; }
 
         private Gee.ArrayList<E.Source> sources;
@@ -98,10 +92,11 @@
 
             // Dialog properties
             //modal = true;
+            set_parent_window(window.get_parent_window ());
             window_position = Gtk.WindowPosition.CENTER_ON_PARENT;
-            //set_flags(Gtk.DialogFlags.DESTROY_WITH_PARENT);
             type_hint = Gdk.WindowTypeHint.DIALOG;
-            transient_for = window;
+            resizable = false;
+            delete_event.connect(() => { response(0); return true; });
 
             // Build dialog
             build_dialog (date_time != null);
@@ -196,7 +191,7 @@
                     break;
                 }
             }
-            response (true);
+            response (1);
         }
 
         //--- Helpers ---//
@@ -400,7 +395,7 @@
             var buttonbox = new Gtk.ButtonBox (Gtk.Orientation.HORIZONTAL);
             buttonbox.set_layout (Gtk.ButtonBoxStyle.END);
 
-            var cancel_button = new Gtk.Button.from_stock (Gtk.Stock.CANCEL);
+            var cancel_button = new Gtk.Button.with_label (_("Cancel"));
             if (add_event) {
                 create_button = new Gtk.Button.with_label (_("Create Event"));
             }
@@ -409,7 +404,7 @@
             }
 
             create_button.clicked.connect (save);
-            cancel_button.clicked.connect (() => {response (false);this.destroy();});
+            cancel_button.clicked.connect (() => { response (0); this.destroy(); });
 
             buttonbox.pack_end (cancel_button);
             buttonbox.pack_end (create_button);
@@ -419,7 +414,8 @@
             content_grid.attach (subgrid, 0, 0, 1, 1);
             content_grid.attach (buttonbox, 0, 1, 1, 1);
 
-            this.add (content_grid);
+            Gtk.Box container = get_content_area () as Gtk.Box;
+            container.add(content_grid);
 
             show_all();
         }
@@ -558,4 +554,4 @@
     }
 
 
-}
+}
\ No newline at end of file