From 2a4f260605df6eeadaf0c9471d7721fccca74598 Mon Sep 17 00:00:00 2001
From: Alan Knowles <alan@roojs.com>
Date: Mon, 24 Dec 2018 15:38:19 +0800
Subject: [PATCH] Clones.bjs Clones.vala

---
 Clones.bjs  |  4 ++--
 Clones.vala | 18 +++++++++++++-----
 2 files changed, 15 insertions(+), 7 deletions(-)

diff --git a/Clones.bjs b/Clones.bjs
index 47bd908a..4c2fb9a7 100644
--- a/Clones.bjs
+++ b/Clones.bjs
@@ -13,9 +13,9 @@
     "response" : "(self, response_id) =>  { \n \n        this.el.hide();\n  \n}"
    },
    "boolean deletable" : true,
-   "| void loadAndShow" : "() {\n\t\n\t_this.el.show_all();\n\t\n\t_this.toolbar.el.hide();\n\t_this.scrolled.el.hide();\n\t_this.spinner.el.show();\n\t_this.spinner.el.start();\t\n\t\n\tGitRepo.updateAll(\"show_clones\");\n\t\n\t\n\t\n}\n\n",
+   "| void loadAndShow" : "() {\n\t\n\t_this.el.show_all();\n\t\n\t_this.toolbar.el.hide();\n\t_this.scrolled.el.hide();\n\t_this.spinner.el.show();\n\t_this.spinner.el.start();\t\n\t\n\tGitRepo.updateAll(\"show_clones\");\n\tthis.el.set_deletable(true);\n    this.el.set_gravity(Gdk.Gravity.NORTH);\n    this.el.move((Gdk.Screen.width() / 2 ) -400 ,0);\n     this.el.set_keep_above(true);\n    this.el.set_default_size(\n\t\t\tint.min(1024,Gdk.Screen.width()),\n\t\t\tint.max(500,Gdk.Screen.height() - 300)\n\t);\n     \n    this.el.show_all();\n\t\n\t\n}\n\n",
    "default_width" : 1024,
-   "| void show" : "()    {\n\n\n\t_this.spinner.el.stop();\n\t_this.spinner.el.hide();\t\n\t_this.toolbar.el.show();\n\t_this.scrolled.el.show();\t\n\n    GLib.debug(\"show clones?\");\n    this.el.set_deletable(true);\n    this.el.set_gravity(Gdk.Gravity.NORTH);\n    this.el.move((Gdk.Screen.width() / 2 ) -400 ,0);\n    \n    this.el.set_default_size(\n\t\t\tint.min(1024,Gdk.Screen.width()),\n\t\t\tint.max(500,Gdk.Screen.height() - 300)\n\t);\n     \n    this.el.show_all();\n    _this.reposStore.load();\n    this.el.set_keep_above(true);\n        GLib.debug(\"show clones = run?\");\n    this.el.run();\n    // load clones..\n//     this.get('/reposStore').load();\n    \n    //this.get('/ok_button').el.set_sensitive(false);\n    \n    // block until we return.\n//    var run_ret = this.el.run();\n//    if (run_ret < 1 ) {\n//        return  \"DONE\";\n//    }\n//    print(\"RUN RETURN : \" + run_ret);\n//    return \"DONE\";\n    //print(JSON.stringify(this.get('bug').getValue()));\n   // return this.get('bug').getValue();\n    //this.success = c.success;\n}\n",
+   "| void show" : "()    {\n\n\n\t_this.spinner.el.stop();\n\t_this.spinner.el.hide();\t\n\t_this.toolbar.el.show();\n\t_this.scrolled.el.show();\t\n \n    this.el.set_deletable(true);\n    this.el.set_gravity(Gdk.Gravity.NORTH);\n    this.el.move((Gdk.Screen.width() / 2 ) -400 ,0);\n     this.el.set_keep_above(true);\n    this.el.set_default_size(\n\t\t\tint.min(1024,Gdk.Screen.width()),\n\t\t\tint.max(500,Gdk.Screen.height() - 300)\n\t);\n     \n    this.el.show_all();\n    _this.reposStore.load();\n   \n        GLib.debug(\"show clones = run?\");\n    this.el.run();\n    // load clones..\n//     this.get('/reposStore').load();\n    \n    //this.get('/ok_button').el.set_sensitive(false);\n    \n    // block until we return.\n//    var run_ret = this.el.run();\n//    if (run_ret < 1 ) {\n//        return  \"DONE\";\n//    }\n//    print(\"RUN RETURN : \" + run_ret);\n//    return \"DONE\";\n    //print(JSON.stringify(this.get('bug').getValue()));\n   // return this.get('bug').getValue();\n    //this.success = c.success;\n}\n",
    "title" : "Manage Clones",
    "xtype" : "Dialog",
    "default_height" : 500,
diff --git a/Clones.vala b/Clones.vala
index 0c0f9b25..f118335b 100644
--- a/Clones.vala
+++ b/Clones.vala
@@ -79,7 +79,16 @@ public class Clones : Object
     	_this.spinner.el.start();	
     	
     	GitRepo.updateAll("show_clones");
-    	
+    	this.el.set_deletable(true);
+        this.el.set_gravity(Gdk.Gravity.NORTH);
+        this.el.move((Gdk.Screen.width() / 2 ) -400 ,0);
+         this.el.set_keep_above(true);
+        this.el.set_default_size(
+    			int.min(1024,Gdk.Screen.width()),
+    			int.max(500,Gdk.Screen.height() - 300)
+    	);
+         
+        this.el.show_all();
     	
     	
     }
@@ -90,12 +99,11 @@ public class Clones : Object
     	_this.spinner.el.hide();	
     	_this.toolbar.el.show();
     	_this.scrolled.el.show();	
-    
-        GLib.debug("show clones?");
+     
         this.el.set_deletable(true);
         this.el.set_gravity(Gdk.Gravity.NORTH);
         this.el.move((Gdk.Screen.width() / 2 ) -400 ,0);
-        
+         this.el.set_keep_above(true);
         this.el.set_default_size(
     			int.min(1024,Gdk.Screen.width()),
     			int.max(500,Gdk.Screen.height() - 300)
@@ -103,7 +111,7 @@ public class Clones : Object
          
         this.el.show_all();
         _this.reposStore.load();
-        this.el.set_keep_above(true);
+       
             GLib.debug("show clones = run?");
         this.el.run();
         // load clones..
-- 
2.39.2