MergeBranch.bjs

[gitlive] / MergeBranch.vala

diff --git a/MergeBranch.vala b/MergeBranch.vala
index cda8453..ed1618b 100644 (file)
--- a/MergeBranch.vala
+++ b/MergeBranch.vala
@@ -181,12 +181,9 @@ public class MergeBranch : Object
             var child_1 = new Xcls_Notebook14( _this );
             child_1.ref();
             this.el.add (  child_1.el  );
-            var child_2 = new Xcls_scrolled_window( _this );
+            var child_2 = new Xcls_spinner( _this );
             child_2.ref();
             this.el.add (  child_2.el  );
-            var child_3 = new Xcls_spinner( _this );
-            child_3.ref();
-            this.el.add (  child_3.el  );
         }
 
         // user defined functions
@@ -677,9 +674,9 @@ public class MergeBranch : Object
             var child_2 = new Xcls_Box17( _this );
             child_2.ref();
             this.el.append_page (  child_2.el , _this.label_diff.el );
-            var child_3 = new Xcls_Box18( _this );
+            var child_3 = new Xcls_Box20( _this );
             child_3.ref();
-            this.el.append_page (  child_3.el , _this.label_status.el );
+            this.el.append_page (  child_3.el , _this.label_ticket.el );
         }
 
         // user defined functions
@@ -748,35 +745,13 @@ public class MergeBranch : Object
 
             // set gobject values
             this.el.homogeneous = false;
+            var child_0 = new Xcls_scrolled_window( _this );
+            child_0.ref();
+            this.el.add (  child_0.el  );
         }
 
         // user defined functions
     }
-
-    public class Xcls_Box18 : Object
-    {
-        public Gtk.Box el;
-        private MergeBranch  _this;
-
-
-            // my vars (def)
-
-        // ctor
-        public Xcls_Box18(MergeBranch _owner )
-        {
-            _this = _owner;
-            this.el = new Gtk.Box( Gtk.Orientation.VERTICAL, 0 );
-
-            // my vars (dec)
-
-            // set gobject values
-            this.el.homogeneous = false;
-        }
-
-        // user defined functions
-    }
-
-
     public class Xcls_scrolled_window : Object
     {
         public Gtk.ScrolledWindow el;
@@ -854,6 +829,31 @@ public class MergeBranch : Object
     }
 
 
+
+    public class Xcls_Box20 : Object
+    {
+        public Gtk.Box el;
+        private MergeBranch  _this;
+
+
+            // my vars (def)
+
+        // ctor
+        public Xcls_Box20(MergeBranch _owner )
+        {
+            _this = _owner;
+            this.el = new Gtk.Box( Gtk.Orientation.VERTICAL, 0 );
+
+            // my vars (dec)
+
+            // set gobject values
+            this.el.homogeneous = false;
+        }
+
+        // user defined functions
+    }
+
+
     public class Xcls_spinner : Object
     {
         public Gtk.Spinner el;