fix merges

[roobuilder] / src / Builder4 / DialogConfirm.vala

diff --git a/src/Builder4/DialogConfirm.vala b/src/Builder4/DialogConfirm.vala
index ff165b5..dfb48ad 100644 (file)
--- a/src/Builder4/DialogConfirm.vala
+++ b/src/Builder4/DialogConfirm.vala
@@ -1,54 +1,53 @@
-static DialogConfirm  _DialogConfirm;
+    static DialogConfirm  _DialogConfirm;
 
-public class DialogConfirm : Object
-{
-    public Gtk.MessageDialog el;
-    private DialogConfirm  _this;
-
-    public static DialogConfirm singleton()
+    public class DialogConfirm : Object
     {
-        if (_DialogConfirm == null) {
-            _DialogConfirm= new DialogConfirm();
+        public Gtk.MessageDialog el;
+        private DialogConfirm  _this;
+
+        public static DialogConfirm singleton()
+        {
+            if (_DialogConfirm == null) {
+                _DialogConfirm= new DialogConfirm();
+            }
+            return _DialogConfirm;
         }
-        return _DialogConfirm;
-    }
 
-        // my vars (def)
-
-    // ctor
-    public DialogConfirm()
-    {
-        _this = this;
-        this.el = new Gtk.MessageDialog( null, Gtk.DialogFlags.MODAL, Gtk.MessageType.QUESTION, Gtk.ButtonsType.YES_NO, "Test", null );
-
-        // my vars (dec)
-
-        // set gobject values
-        this.el.title = "Please Confirm ";
-        this.el.name = "DialogConfirm";
-        this.el.modal = true;
-        this.el.use_markup = true;
-
-        //listeners
-        this.el.delete_event.connect( (event) => {
-            this.el.response(Gtk.ResponseType.CANCEL);
-            this.el.hide();
-            return true;
-            
-        });
-    }
+            // my vars (def)
+
+        // ctor
+        public DialogConfirm()
+        {
+            _this = this;
+            this.el = new Gtk.MessageDialog( null, Gtk.DialogFlags.MODAL, Gtk.MessageType.QUESTION, Gtk.ButtonsType.YES_NO, "Test" );
+
+            // my vars (dec)
+
+            // set gobject values
+            this.el.title = "Please Confirm ";
+            this.el.name = "DialogConfirm";
+            this.el.modal = true;
+            this.el.use_markup = true;
+
+            //listeners
+            this.el.close_request.connect( (event) => {
+               this.el.response(Gtk.ResponseType.CANCEL);
+                this.el.hide();
+                return true;
+             
+            });
+        }
 
-    // user defined functions
-    public   int show (string title, string msg) {
-         //if (!this.el) { this.init(); } 
-         //this.success = success;
-         this.el.title = title;
-        this.el.text =  msg;
-        this.el.show_all();
-        var ret =   this.el.run();
-        //print("ret got %d", ret);
-        this.el.hide();
-        return ret;
-     
+        // user defined functions
+        public void showIt // caller needs to connect to the  response -  to get the result.
+          
+          (string title, string msg) {
+             //if (!this.el) { this.init(); } 
+             //this.success = success;
+             this.el.title = title;
+            this.el.text =  msg;
+            this.el.show();
+           
+           
+        }
     }
-}