X-Git-Url: http://git.roojs.org/?a=blobdiff_plain;f=NewBranch.vala;h=a91ee4281e5f2c3e808bcd5f80c6f8629caf22b9;hb=556661ee18a4b114d63e652935773a54362a4af1;hp=dcbbb9b780df7bda4d0eb76d37eb08335e4324c0;hpb=2c0826819c471bb0f6b1adee970d192e84028bcb;p=gitlive

diff --git a/NewBranch.vala b/NewBranch.vala
index dcbbb9b7..a91ee428 100644
--- a/NewBranch.vala
+++ b/NewBranch.vala
@@ -12,6 +12,7 @@ public class NewBranch : Object
         }
         return _NewBranch;
     }
+    public Xcls_notebook notebook;
     public Xcls_label_select_ticket label_select_ticket;
     public Xcls_label_create_ticket label_create_ticket;
     public Xcls_label_quick_commit label_quick_commit;
@@ -73,7 +74,7 @@ public class NewBranch : Object
         this.el.default_width = 500;
         this.el.deletable = true;
         this.el.modal = true;
-        var child_0 = new Xcls_Notebook2( _this );
+        var child_0 = new Xcls_notebook( _this );
         child_0.ref();
         this.el.get_content_area().add (  child_0.el  );
 
@@ -172,7 +173,7 @@ public class NewBranch : Object
      	this.el.run();
     
     }
-    public class Xcls_Notebook2 : Object
+    public class Xcls_notebook : Object
     {
         public Gtk.Notebook el;
         private NewBranch  _this;
@@ -181,9 +182,10 @@ public class NewBranch : Object
             // my vars (def)
 
         // ctor
-        public Xcls_Notebook2(NewBranch _owner )
+        public Xcls_notebook(NewBranch _owner )
         {
             _this = _owner;
+            _this.notebook = this;
             this.el = new Gtk.Notebook();
 
             // my vars (dec)
@@ -1125,7 +1127,9 @@ public class NewBranch : Object
         // user defined functions
         public void load_data () {
          
-         	 
+         	 _this.table.el.hide();
+        	_this.spinner.el.show();
+        	_this.spinner.el.start();	
         	
             Timeout.add_seconds(1, () => {
         		 
@@ -1133,7 +1137,7 @@ public class NewBranch : Object
         		if (_this.repo != null) {
         			curproj = RooProject.getProjectByRepo(_this.repo);
         		}
-        		_this.prmodel.loadProjects(curproj == null ? "" : curproj.id);
+        		_this.tprmodel.loadProjects(curproj == null ? "" : curproj.id);
         		if (curproj != null) {
         	 
         			
@@ -1149,8 +1153,8 @@ public class NewBranch : Object
         		}
         		_this.summary.el.set_text("");
         		_this.description.el.buffer.text = ""; 
-        		//_this.spinner.el.stop();
-        		//_this.spinner.el.hide();	
+        		_this.spinner.el.stop();
+        		_this.spinner.el.hide();	
         
         		_this.table.el.show();
         	    //_this.summary.el.grab_focus();
@@ -2306,7 +2310,7 @@ public class NewBranch : Object
         public Xcls_Table53(NewBranch _owner )
         {
             _this = _owner;
-            this.el = new Gtk.Table( 2, 5, true );
+            this.el = new Gtk.Table( 3, 5, true );
 
             // my vars (dec)
 
@@ -2408,30 +2412,13 @@ public class NewBranch : Object
             
             	GLib.debug("fire response = 1");
             	
-            	var ticket_id = _this.ticketsel.selectedTicketId();
-            	
-            	if (ticket_id == "") {
-            		_this.ticketsel.el.get_child().get_style_context().add_class("warning");
-            		return;
-            	}
             	 
-            	_this.el.response(1);
+            	 
+            	_this.el.response(3);
             });
         }
 
         // user defined functions
-        public void updateState () {
-        
-        	var ticket_id = _this.ticketsel.selectedTicketId();
-        	
-        	if (ticket_id == "") {
-        		this.el.set_sensitive(false);
-        		return;
-        	}
-         
-        	this.el.set_sensitive(true);
-         
-        }
     }