Ticket.bjs

[gitlive] / MergeBranch.vala

diff --git a/MergeBranch.vala b/MergeBranch.vala
index 5641695..464c85a 100644 (file)
--- a/MergeBranch.vala
+++ b/MergeBranch.vala
@@ -21,6 +21,7 @@ public class MergeBranch : Object
     public Xcls_name name;
     public Xcls_scrolled_window scrolled_window;
     public Xcls_view view;
+    public Xcls_spinner spinner;
 
         // my vars (def)
     public GitRepo repo;
@@ -46,10 +47,10 @@ public class MergeBranch : Object
         var child_0 = new Xcls_Box2( _this );
         child_0.ref();
         this.el.get_content_area().add (  child_0.el  );
-        var child_1 = new Xcls_Button16( _this );
+        var child_1 = new Xcls_Button17( _this );
         child_1.ref();
         this.el.add_action_widget (  child_1.el , 0 );
-        var child_2 = new Xcls_Button17( _this );
+        var child_2 = new Xcls_Button18( _this );
         child_2.ref();
         this.el.add_action_widget (  child_2.el , 1 );
 
@@ -162,6 +163,9 @@ public class MergeBranch : Object
             var child_1 = new Xcls_scrolled_window( _this );
             child_1.ref();
             this.el.add (  child_1.el  );
+            var child_2 = new Xcls_spinner( _this );
+            child_2.ref();
+            this.el.add (  child_2.el  );
         }
 
         // user defined functions
@@ -705,8 +709,33 @@ public class MergeBranch : Object
     }
 
 
+    public class Xcls_spinner : Object
+    {
+        public Gtk.Spinner el;
+        private MergeBranch  _this;
+
+
+            // my vars (def)
+
+        // ctor
+        public Xcls_spinner(MergeBranch _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_Button16 : Object
+    public class Xcls_Button17 : Object
     {
         public Gtk.Button el;
         private MergeBranch  _this;
@@ -715,7 +744,7 @@ public class MergeBranch : Object
             // my vars (def)
 
         // ctor
-        public Xcls_Button16(MergeBranch _owner )
+        public Xcls_Button17(MergeBranch _owner )
         {
             _this = _owner;
             this.el = new Gtk.Button();
@@ -730,7 +759,7 @@ public class MergeBranch : Object
         // user defined functions
     }
 
-    public class Xcls_Button17 : Object
+    public class Xcls_Button18 : Object
     {
         public Gtk.Button el;
         private MergeBranch  _this;
@@ -739,7 +768,7 @@ public class MergeBranch : Object
             // my vars (def)
 
         // ctor
-        public Xcls_Button17(MergeBranch _owner )
+        public Xcls_Button18(MergeBranch _owner )
         {
             _this = _owner;
             this.el = new Gtk.Button();