X-Git-Url: http://git.roojs.org/?p=gitlive;a=blobdiff_plain;f=Clones.vala;h=123d5ae1a32d202e83a0055ac5bb5c0c91c3bbe3;hp=65976e966626c29e1f65ee8375426adc679e6a4d;hb=62bcbeee7e77f9f8774f13569dc9fb5cc25666d6;hpb=72a4edfbda67d0bf3eb93a91c28c4084945ddae5

diff --git a/Clones.vala b/Clones.vala
index 65976e96..123d5ae1 100644
--- a/Clones.vala
+++ b/Clones.vala
@@ -12,6 +12,9 @@ public class Clones : Object
         }
         return _Clones;
     }
+    public Xcls_spinner spinner;
+    public Xcls_toolbar toolbar;
+    public Xcls_scrolled scrolled;
     public Xcls_reposView reposView;
     public Xcls_reposStore reposStore;
     public Xcls_tv_autocommit tv_autocommit;
@@ -66,22 +69,50 @@ public class Clones : Object
     }
 
     // user defined functions
-    public void show ()    {
-    
-        GLib.debug("show clones?");
-        this.el.set_deletable(true);
+    public void loadAndShow () {
+    	this.el.set_deletable(true);
         this.el.set_gravity(Gdk.Gravity.NORTH);
-        this.el.move((Gdk.Screen.width() / 2 ) -400 ,0);
-        
+        this.el.move((Gdk.Screen.width() / 2 ) - (int.min(1280,Gdk.Screen.width()) / 2) ,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)
+    			int.min(1280,Gdk.Screen.width()),
+    			int.max(500,Gdk.Screen.height() - 200)
     	);
+    	this.el.show_all();
+    	
+    	this.toolbar.el.hide();
+    	this.scrolled.el.hide();
+    	this.spinner.el.show();
+    	this.spinner.el.start();	
+    	
+    	GitRepo.updateAll("show_clones");
+    	
          
+     
+    	
+    	
+    }
+    public void show ()    {
+    this.el.set_deletable(true);
+        this.el.set_gravity(Gdk.Gravity.NORTH);
+        this.el.move((Gdk.Screen.width() / 2 ) - (int.max(1280,Gdk.Screen.width()) / 2) ,0);
+         this.el.set_keep_above(true);
+       this.el.set_default_size(
+    			int.max(1280,Gdk.Screen.width()),
+    			int.max(500,Gdk.Screen.height() - 100)
+    	);
         this.el.show_all();
-        _this.reposStore.load();
-        this.el.set_keep_above(true);
-            GLib.debug("show clones = run?");
+    	this.spinner.el.stop();
+    	this.spinner.el.hide();	
+    	this.toolbar.el.show();
+    	this.scrolled.el.show();	
+     
+        
+         
+    
+        this.reposStore.load();
+       
+        GLib.debug("show clones = run?");
         this.el.run();
         // load clones..
     //     this.get('/reposStore').load();
@@ -116,17 +147,45 @@ public class Clones : Object
             // my vars (dec)
 
             // set gobject values
-            var child_0 = new Xcls_Box3( _this );
+            var child_0 = new Xcls_spinner( _this );
             child_0.ref();
-            this.el.pack_start (  child_0.el , false,false,0 );
-            var child_1 = new Xcls_ScrolledWindow5( _this );
+            this.el.add (  child_0.el  );
+            var child_1 = new Xcls_toolbar( _this );
             child_1.ref();
-            this.el.pack_end (  child_1.el , true,true,0 );
+            this.el.pack_start (  child_1.el , false,false,0 );
+            var child_2 = new Xcls_scrolled( _this );
+            child_2.ref();
+            this.el.pack_end (  child_2.el , true,true,0 );
         }
 
         // user defined functions
     }
-    public class Xcls_Box3 : Object
+    public class Xcls_spinner : Object
+    {
+        public Gtk.Spinner el;
+        private Clones  _this;
+
+
+            // my vars (def)
+
+        // ctor
+        public Xcls_spinner(Clones _owner )
+        {
+            _this = _owner;
+            _this.spinner = this;
+            this.el = new Gtk.Spinner();
+
+            // my vars (dec)
+
+            // set gobject values
+            this.el.hexpand = true;
+            this.el.vexpand = true;
+        }
+
+        // user defined functions
+    }
+
+    public class Xcls_toolbar : Object
     {
         public Gtk.Box el;
         private Clones  _this;
@@ -135,23 +194,24 @@ public class Clones : Object
             // my vars (def)
 
         // ctor
-        public Xcls_Box3(Clones _owner )
+        public Xcls_toolbar(Clones _owner )
         {
             _this = _owner;
+            _this.toolbar = this;
             this.el = new Gtk.Box( Gtk.Orientation.HORIZONTAL, 0 );
 
             // my vars (dec)
 
             // set gobject values
             this.el.homogeneous = true;
-            var child_0 = new Xcls_Button4( _this );
+            var child_0 = new Xcls_Button5( _this );
             child_0.ref();
             this.el.add (  child_0.el  );
         }
 
         // user defined functions
     }
-    public class Xcls_Button4 : Object
+    public class Xcls_Button5 : Object
     {
         public Gtk.Button el;
         private Clones  _this;
@@ -160,7 +220,7 @@ public class Clones : Object
             // my vars (def)
 
         // ctor
-        public Xcls_Button4(Clones _owner )
+        public Xcls_Button5(Clones _owner )
         {
             _this = _owner;
             this.el = new Gtk.Button();
@@ -189,7 +249,7 @@ public class Clones : Object
     }
 
 
-    public class Xcls_ScrolledWindow5 : Object
+    public class Xcls_scrolled : Object
     {
         public Gtk.ScrolledWindow el;
         private Clones  _this;
@@ -198,9 +258,10 @@ public class Clones : Object
             // my vars (def)
 
         // ctor
-        public Xcls_ScrolledWindow5(Clones _owner )
+        public Xcls_scrolled(Clones _owner )
         {
             _this = _owner;
+            _this.scrolled = this;
             this.el = new Gtk.ScrolledWindow( null, null );
 
             // my vars (dec)
@@ -288,7 +349,7 @@ public class Clones : Object
             //listeners
             this.el.row_activated.connect( (path, col)  =>  {
             
-            	if (col.title != "Current Branch") {
+            	if (col.title == "Auto Commit" || col.title == "Auto Push" || col.title == "Auto Branch") {
             		return;
             	}