Clones.bjs

Clones.vala

diff --git a/Clones.bjs b/Clones.bjs
index d09beab..fdd617d 100644 (file)
--- a/Clones.bjs
+++ b/Clones.bjs
@@ -13,8 +13,8 @@
     "response" : "(self, response_id) =>  { \n \n        this.el.hide();\n  \n}"
    },
    "default_width" : 600,
-   "$ deletable" : true,
    "| void show" : "()    {\n\n    \n    this.el.set_deletable(false);\n    this.el.show_all();\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",
+   "$ deletable" : true,
    "title" : "Manage Clones",
    "xtype" : "Dialog",
    "default_height" : 500,
@@ -23,10 +23,10 @@
    "border_width" : 3,
    "items" : [
     {
-     "$ orientation" : "Gtk.Orientation.VERTICAL",
-     "$ pack" : "get_content_area().add ",
      "xtype" : "Box",
+     "$ pack" : "get_content_area().add ",
      "$ xns" : "Gtk",
+     "Gtk.Orientation orientation" : "Gtk.Orientation.VERTICAL",
      "items" : [
       {
        "* pack" : "pack_start,false,false,0",
@@ -39,8 +39,8 @@
           "clicked" : "() => {\n\n/*    var rv = this.get('/reposView');\n    var rs = this.get('/reposStore');\n    if (rv.el.get_selection().count_selected_rows() != 1) {\n        //nothing?\n        // error condition.\n        return;\n    }\n    var Remotes =     imports.Remotes.Remotes;\n    \n \n    var ret = {};       \n    var s = rv.el.get_selection();\n    var path = '';\n    s.selected_foreach(function(model,p,iter) {\n                                                    \n       path = model.get_value(iter, 6).value.get_string();\n     \n    }); \n\n    var repo = false;\n    rs.repos.forEach(function(r) {\n        if (r.repopath == path) {\n            repo = r;\n        \n        }\n    \n    });\n    Remotes.repo = repo;\n    Remotes.el.set_transient_for(Clones.el);\n    Clones.el.set_title(\"Manage Clones - \" + repo.repopath);\n    Remotes.show();\n    Clones.el.set_title(\"Manage Clones\");\n\n  */   \n    \n     \n\n       \n    \n    \n}"
          },
          "label" : "Remotes / Clones",
-         "xtype" : "Button",
          "* pack" : "add",
+         "xtype" : "Button",
          "$ xns" : "Gtk"
         },
         {
@@ -48,8 +48,8 @@
           "clicked" : "() => {\n/*\n    var rv = this.get('/reposView');\n    var rs = this.get('/reposStore');\n    if (rv.el.get_selection().count_selected_rows() != 1) {\n        //nothing?\n        // error condition.\n        return;\n    }\n    var Branches =     imports.Branches.Branches;\n    \n \n    var ret = {};       \n    var s = rv.el.get_selection();\n    var path = '';\n    s.selected_foreach(function(model,p,iter) {\n                                                    \n       path = model.get_value(iter, 6).value.get_string();\n     \n    }); \n\n    var repo = false;\n    rs.repos.forEach(function(r) {\n        if (r.repopath == path) {\n            repo = r;\n        \n        }\n    \n    });\n    Branches.repo = repo;\n    Branches.el.set_transient_for(Clones.el);\n    Clones.el.set_title(\"Manage Clones - \" + repo.repopath);\n    Branches.show();\n    Clones.el.set_title(\"Manage Clones\");\n\n     \n    \n    \n    \n\n       \n */   \n    \n}"
          },
          "label" : "Branches",
-         "xtype" : "Button",
          "* pack" : "add",
+         "xtype" : "Button",
          "$ xns" : "Gtk"
         },
         {
@@ -57,8 +57,8 @@
           "clicked" : "() =>  {\n/*\n    var rv = this.get('/reposView');\n    var rs = this.get('/reposStore');\n    if (rv.el.get_selection().count_selected_rows() != 1) {\n        //nothing?\n        // error condition.\n        return;\n    }\n    var Merger =     imports.Merger.Merger;\n    \n \n    var ret = {};       \n    var s = rv.el.get_selection();\n    var path = '';\n    s.selected_foreach(function(model,p,iter) {\n                                                    \n       path = model.get_value(iter, 6).value.get_string();\n     \n    }); \n\n    var repo = false;\n    rs.repos.forEach(function(r) {\n        if (r.repopath == path) {\n            repo = r;\n        \n        }\n    \n    });\n    Merger.repo = repo;\n    Merger.el.set_transient_for(Clones.el);\n    Clones.el.set_title(\"Manage Clones - \" + repo.repopath);\n    Merger.show();\n    Clones.el.set_title(\"Manage Clones\");\n\n    \n    \n\n     \n    \n\n */      \n    \n    \n}"
          },
          "label" : "Merge",
-         "xtype" : "Button",
          "* pack" : "add",
+         "xtype" : "Button",
          "$ xns" : "Gtk"
         },
         {
@@ -66,8 +66,8 @@
           "clicked" : "() => {\n    \n    \n \n       \n    \n    \n}"
          },
          "label" : "Switch Branch",
-         "xtype" : "Button",
          "* pack" : "add",
+         "xtype" : "Button",
          "$ xns" : "Gtk"
         },
         {
@@ -75,16 +75,16 @@
           "clicked" : "() => {\n    \n    \n \n       \n    \n    \n}"
          },
          "label" : "Pull",
-         "xtype" : "Button",
          "* pack" : "add",
+         "xtype" : "Button",
          "$ xns" : "Gtk"
         }
        ]
       },
       {
        "* init" : "  {\n  \n   this.el.set_policy (Gtk.PolicyType.AUTOMATIC, Gtk.PolicyType.AUTOMATIC);\n}\n",
-       "* pack" : "pack_end,true,true,0",
        "xtype" : "ScrolledWindow",
+       "* pack" : "pack_end,true,true,0",
        "Gtk.ShadowType shadow_type" : "Gtk.ShadowType.IN",
        "$ xns" : "Gtk",
        "items" : [
@@ -121,8 +121,8 @@
               "toggled" : "  (self, path)  => {\n/*    var ret ={} ;\n    var store = this.get('/reposStore');\n    store.el.get_iter_from_string(ret, path);\n                                                                 \n    var value =   store.el.get_value(ret.iter,4).value.get_boolean();\n                                                                 \n    //print(JSON.stringify(value));\n    store.el.set_value(ret.iter,4, !value);\n    \n     var path =  store.el.get_value(ret.iter, 6).value.get_string();\n     var repo = imports.Scm.Repo.Repo.get(path);\n     repo.autocommit(!value);\n  */   \n    \n    \n}"
              },
              "id" : "cr_autocommit",
-             "xtype" : "CellRendererToggle",
              "* pack" : "pack_start,false",
+             "xtype" : "CellRendererToggle",
              "$ xns" : "Gtk",
              "$ mode" : "Gtk.CellRendererMode.ACTIVATABLE"
             }
@@ -142,8 +142,8 @@
               "toggled" : "  (self, path)  => {\n/*    var ret ={} ;\n    var store = this.get('/reposStore');\n    store.el.get_iter_from_string(ret, path);\n                                                                 \n    var value =   store.el.get_value(ret.iter,5).value.get_boolean();\n                                                                 \n    //print(JSON.stringify(value));\n    store.el.set_value(ret.iter,5, !value);\n      var path =  store.el.get_value(ret.iter, 6).value.get_string();\n     var repo = imports.Scm.Repo.Repo.get(path);\n     repo.autopush(!value);\n    */\n}"
              },
              "id" : "cr_autopush",
-             "xtype" : "CellRendererToggle",
              "* pack" : "pack_start,false",
+             "xtype" : "CellRendererToggle",
              "$ xns" : "Gtk",
              "$ mode" : "Gtk.CellRendererMode.ACTIVATABLE"
             }
@@ -161,8 +161,8 @@
            "items" : [
             {
              "id" : "cr_repo",
-             "xtype" : "CellRendererText",
              "* pack" : "pack_start,false",
+             "xtype" : "CellRendererText",
              "$ xns" : "Gtk"
             }
            ]
@@ -178,8 +178,8 @@
            "items" : [
             {
              "id" : "cr_current_branch",
-             "xtype" : "CellRendererText",
              "* pack" : "pack_start,false",
+             "xtype" : "CellRendererText",
              "$ xns" : "Gtk"
             }
            ]
@@ -195,8 +195,8 @@
            "items" : [
             {
              "id" : "cr_last_updated",
-             "xtype" : "CellRendererText",
              "* pack" : "pack_start,false",
+             "xtype" : "CellRendererText",
              "$ xns" : "Gtk"
             }
            ]
@@ -213,8 +213,8 @@
            "items" : [
             {
              "id" : "cr_all_branches",
-             "xtype" : "CellRendererText",
              "* pack" : "pack_start,false",
+             "xtype" : "CellRendererText",
              "$ xns" : "Gtk"
             }
            ]

diff --git a/Clones.vala b/Clones.vala
index 12b5325..adac9f4 100644 (file)
--- a/Clones.vala
+++ b/Clones.vala
@@ -37,6 +37,14 @@ public class Clones : Object
         this.el = new Gtk.Dialog();
 
         // my vars (dec)
+
+        // set gobject values
+        this.el.title = "Manage Clones";
+        this.el.border_width = 3;
+        this.el.default_height = 500;
+        this.el.default_width = 600;
+        this.el.deletable = true;
+        this.el.modal = true;
         var child_0 = new Xcls_Box2( _this );
         child_0.ref();
         this.el.get_content_area().add (  child_0.el  );
@@ -91,9 +99,11 @@ public class Clones : Object
         public Xcls_Box2(Clones _owner )
         {
             _this = _owner;
-            this.el = new Gtk.Box();
+            this.el = new Gtk.Box( Gtk.Orientation.VERTICAL, 0 );
 
             // my vars (dec)
+
+            // set gobject values
             var child_0 = new Xcls_Box3( _this );
             child_0.ref();
             this.el.pack_start (  child_0.el , false,false,0 );
@@ -116,9 +126,11 @@ public class Clones : Object
         public Xcls_Box3(Clones _owner )
         {
             _this = _owner;
-            this.el = new Gtk.Box();
+            this.el = new Gtk.Box( Gtk.Orientation.HORIZONTAL, 0 );
 
             // my vars (dec)
+
+            // set gobject values
             var child_0 = new Xcls_Button4( _this );
             child_0.ref();
             this.el.add (  child_0.el  );
@@ -154,6 +166,9 @@ public class Clones : Object
 
             // my vars (dec)
 
+            // set gobject values
+            this.el.label = "Remotes / Clones";
+
             //listeners
             this.el.clicked.connect( () => {
             
@@ -219,6 +234,9 @@ public class Clones : Object
 
             // my vars (dec)
 
+            // set gobject values
+            this.el.label = "Branches";
+
             //listeners
             this.el.clicked.connect( () => {
             /*
@@ -285,6 +303,9 @@ public class Clones : Object
 
             // my vars (dec)
 
+            // set gobject values
+            this.el.label = "Merge";
+
             //listeners
             this.el.clicked.connect( () =>  {
             /*
@@ -352,6 +373,9 @@ public class Clones : Object
 
             // my vars (dec)
 
+            // set gobject values
+            this.el.label = "Switch Branch";
+
             //listeners
             this.el.clicked.connect( () => {
                 
@@ -382,6 +406,9 @@ public class Clones : Object
 
             // my vars (dec)
 
+            // set gobject values
+            this.el.label = "Pull";
+
             //listeners
             this.el.clicked.connect( () => {
                 
@@ -409,9 +436,12 @@ public class Clones : Object
         public Xcls_ScrolledWindow9(Clones _owner )
         {
             _this = _owner;
-            this.el = new Gtk.ScrolledWindow();
+            this.el = new Gtk.ScrolledWindow( null, null );
 
             // my vars (dec)
+
+            // set gobject values
+            this.el.shadow_type = Gtk.ShadowType.IN;
             var child_0 = new Xcls_reposView( _this );
             child_0.ref();
             this.el.add (  child_0.el  );
@@ -442,6 +472,8 @@ public class Clones : Object
             this.el = new Gtk.TreeView();
 
             // my vars (dec)
+
+            // set gobject values
             var child_0 = new Xcls_reposStore( _this );
             child_0.ref();
             this.el.set_model (  child_0.el  );
@@ -522,9 +554,19 @@ public class Clones : Object
         {
             _this = _owner;
             _this.reposStore = this;
-            this.el = new Gtk.ListStore();
+            this.el = new Gtk.ListStore( 0,      typeof(string),  // 0 repo
+     typeof(string),  // 1 current branch
+     typeof(string),  // 2 all branch
+     typeof(string),  // 3 updated
+     typeof(bool),   // 4 auto commit
+     typeof(bool),   // 5 auto push
+     typeof(string),   // 7 repopath
+      typeof(string)   // 8 color highlighting?
+       );
 
             // my vars (dec)
+
+            // set gobject values
         }
 
         // user defined functions
@@ -546,6 +588,10 @@ public class Clones : Object
             this.el = new Gtk.TreeViewColumn();
 
             // my vars (dec)
+
+            // set gobject values
+            this.el.title = "Auto Commit";
+            this.el.min_width = 50;
             var child_0 = new Xcls_cr_autocommit( _this );
             child_0.ref();
             this.el.pack_start (  child_0.el , false );
@@ -575,6 +621,9 @@ public class Clones : Object
 
             // my vars (dec)
 
+            // set gobject values
+            this.el.mode = Gtk.CellRendererMode.ACTIVATABLE;
+
             //listeners
             this.el.toggled.connect( (self, path)  => {
             /*    var ret ={} ;
@@ -615,6 +664,10 @@ public class Clones : Object
             this.el = new Gtk.TreeViewColumn();
 
             // my vars (dec)
+
+            // set gobject values
+            this.el.title = "Auto Push";
+            this.el.min_width = 50;
             var child_0 = new Xcls_cr_autopush( _this );
             child_0.ref();
             this.el.pack_start (  child_0.el , false );
@@ -644,6 +697,9 @@ public class Clones : Object
 
             // my vars (dec)
 
+            // set gobject values
+            this.el.mode = Gtk.CellRendererMode.ACTIVATABLE;
+
             //listeners
             this.el.toggled.connect( (self, path)  => {
             /*    var ret ={} ;
@@ -681,6 +737,11 @@ public class Clones : Object
             this.el = new Gtk.TreeViewColumn();
 
             // my vars (dec)
+
+            // set gobject values
+            this.el.title = "Repo";
+            this.el.min_width = 200;
+            this.el.resizable = true;
             var child_0 = new Xcls_cr_repo( _this );
             child_0.ref();
             this.el.pack_start (  child_0.el , false );
@@ -708,6 +769,8 @@ public class Clones : Object
             this.el = new Gtk.CellRendererText();
 
             // my vars (dec)
+
+            // set gobject values
         }
 
         // user defined functions
@@ -730,6 +793,10 @@ public class Clones : Object
             this.el = new Gtk.TreeViewColumn();
 
             // my vars (dec)
+
+            // set gobject values
+            this.el.title = "Current Branch";
+            this.el.min_width = 50;
             var child_0 = new Xcls_cr_current_branch( _this );
             child_0.ref();
             this.el.pack_start (  child_0.el , false );
@@ -758,6 +825,8 @@ public class Clones : Object
             this.el = new Gtk.CellRendererText();
 
             // my vars (dec)
+
+            // set gobject values
         }
 
         // user defined functions
@@ -780,6 +849,10 @@ public class Clones : Object
             this.el = new Gtk.TreeViewColumn();
 
             // my vars (dec)
+
+            // set gobject values
+            this.el.title = "Last updated";
+            this.el.min_width = 50;
             var child_0 = new Xcls_cr_last_updated( _this );
             child_0.ref();
             this.el.pack_start (  child_0.el , false );
@@ -807,6 +880,8 @@ public class Clones : Object
             this.el = new Gtk.CellRendererText();
 
             // my vars (dec)
+
+            // set gobject values
         }
 
         // user defined functions
@@ -829,6 +904,11 @@ public class Clones : Object
             this.el = new Gtk.TreeViewColumn();
 
             // my vars (dec)
+
+            // set gobject values
+            this.el.title = "All Branches";
+            this.el.min_width = 50;
+            this.el.resizable = false;
             var child_0 = new Xcls_cr_all_branches( _this );
             child_0.ref();
             this.el.pack_start (  child_0.el , false );
@@ -856,6 +936,8 @@ public class Clones : Object
             this.el = new Gtk.CellRendererText();
 
             // my vars (dec)
+
+            // set gobject values
         }
 
         // user defined functions
@@ -881,6 +963,9 @@ public class Clones : Object
             this.el = new Gtk.Button();
 
             // my vars (dec)
+
+            // set gobject values
+            this.el.label = "Close";
         }
 
         // user defined functions