X-Git-Url: http://git.roojs.org/?p=gitlive;a=blobdiff_plain;f=Clones.bjs;h=a1630a75249f88764d9a1c59d861a9e2cddb2434;hp=d595f914a22771ebb167abd824174535e09450ef;hb=0b86050bdbbbd2985f7078ca9036be0196455398;hpb=cdd3569dcbc802bacf60d0bdc7a7f1cdfd0b3185 diff --git a/Clones.bjs b/Clones.bjs index d595f914..a1630a75 100644 --- a/Clones.bjs +++ b/Clones.bjs @@ -12,9 +12,9 @@ "delete_event" : "(self, event) => {\n this.el.hide();\n return true; \n //test \n}\n ", "response" : "(self, response_id) => { \n \n this.el.hide();\n \n}" }, - "default_width" : 600, - "| 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", + "default_width" : 800, "$ deletable" : true, + "| void show" : "() {\n\n \n this.el.set_deletable(false);\n this.el.set_gravity(Gdk.Gravity.NORTH);\n this.el.move((Gdk.Screen.width() / 2 ) -400 ,0);\n this.el.show_all();\n _this.reposStore.load();\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", "title" : "Manage Clones", "xtype" : "Dialog", "default_height" : 500, @@ -23,11 +23,10 @@ "border_width" : 3, "items" : [ { - "id" : "Clones", "xtype" : "Box", "$ pack" : "get_content_area().add ", "$ xns" : "Gtk", - "Gtk.Orientation orientation" : "Gtk.Orientation.HORIZONTAL", + "Gtk.Orientation orientation" : "Gtk.Orientation.VERTICAL", "items" : [ { "* pack" : "pack_start,false,false,0", @@ -40,17 +39,17 @@ "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", - "* pack" : "add", "xtype" : "Button", + "* pack" : "add", "$ xns" : "Gtk" }, { "listeners" : { - "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}" + "clicked" : "() => {\n// \n\n\t//NewBranch.singleton().show();\n\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", - "* pack" : "add", "xtype" : "Button", + "* pack" : "add", "$ xns" : "Gtk" }, { @@ -58,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", - "* pack" : "add", "xtype" : "Button", + "* pack" : "add", "$ xns" : "Gtk" }, { @@ -67,8 +66,8 @@ "clicked" : "() => {\n \n \n \n \n \n \n}" }, "label" : "Switch Branch", - "* pack" : "add", "xtype" : "Button", + "* pack" : "add", "$ xns" : "Gtk" }, { @@ -76,14 +75,16 @@ "clicked" : "() => {\n \n \n \n \n \n \n}" }, "label" : "Pull", - "* pack" : "add", "xtype" : "Button", + "* pack" : "add", "$ xns" : "Gtk" } ] }, { "* init" : " {\n \n this.el.set_policy (Gtk.PolicyType.AUTOMATIC, Gtk.PolicyType.AUTOMATIC);\n}\n", + "bool expand" : true, + "bool hexpand" : true, "xtype" : "ScrolledWindow", "* pack" : "pack_end,true,true,0", "Gtk.ShadowType shadow_type" : "Gtk.ShadowType.IN", @@ -94,23 +95,24 @@ "cursor_changed" : "() => {\n // SEE SELECTION.CHANGED\n /*\n \n return;\n \n if (this.el.get_selection().count_selected_rows() < 1) {\n //nothing? - clea it?\n return;\n }\n var ret = {}; \n var model = this.get('/changedFilesStore');\n\n var s = this.el.get_selection();\n var files = [];\n s.selected_foreach(function(model,p,iter) {\n \n files.push( model.get_value(iter, 0).value.get_string());\n \n });\n this.get('/patchview').showDiff(files); \n //var value = ''+ ret.model.get_value(ret.iter, 1).value.get_string();\n //print(\"OUT?\" + value);// id..\n // load the list in the right grid..\n \n return true;\n*/\n}" }, "id" : "reposView", - "* init" : " \n{\n var selection = this.el.get_selection();\n selection.set_mode( Gtk.SelectionMode.SINGLE);\n\n\n var description = new Pango.FontDescription();\n description.set_size(10000);\n this.el.override_font(description);\n}\n", + "* init" : " \n{\n var selection = this.el.get_selection();\n selection.set_mode( Gtk.SelectionMode.SINGLE);\n\n\n var description = new Pango.FontDescription();\n description.set_size(10000);\n this.el.override_font(description);\n \n}\n", "xtype" : "TreeView", "* pack" : "add", "$ xns" : "Gtk", "items" : [ { + "int n_columns" : 8, "id" : "reposStore", - "columns" : " typeof(string), // 0 repo\n typeof(string), // 1 current branch\n typeof(string), // 2 all branch\n typeof(string), // 3 updated\n typeof(bool), // 4 auto commit\n typeof(bool), // 5 auto push\n typeof(string) // 7 repopath\n typeof(string) // 8 color highlighting?", + "columns" : " typeof(string), // 0 repo\n typeof(string), // 1 current branch\n typeof(string), // 2 all branch\n typeof(string), // 3 updated\n typeof(bool), // 4 auto commit\n typeof(bool), // 5 auto push\n typeof(string), // 7 repopath\n typeof(string) // 8 color highlighting?\n ", "$ pathToRepo" : "function(path) {\n\n var tr= this.repos;\n\n \n for(var i =0 ; i < tr.length; i++) {\n if (tr[i].repopath == path) {\n return tr[i];\n }\n } \n return false; \n}\n", "xtype" : "ListStore", "* pack" : "set_model", - "$ xns" : "Gtk", - "$ load" : "function()\n{\n //this.insert(citer,iter,0);\n print(\"getting list\");\n this.repos = imports.Scm.Repo.Repo.list();\n var tr= this.repos;\n this.el.clear();\n \n for(var i =0 ; i < tr.length; i++) {\n var ret = { };\n \n this.el.append(ret);\n \n //print(JSON.stringify(ret,null,4));\n tr[i].getBranches();\n tr[i].getStatus();\n var hi;\n try {\n //tr[i].debug=1;\n hi = tr[i].history('/', 1, 'branch', tr[i].currentBranch.name );\n// print(JSON.stringify(hi,null,4));\n } catch(e) { print(e);}\n \n this.el.set_value(ret.iter, 0, '' + tr[i].repopath.split('/').pop() );\n this.el.set_value(ret.iter, 1, '' + tr[i].currentBranch.name );\n this.el.set_value(ret.iter, 2, '' + tr[i].branches.map(\n function(e) { return e.name; \n }).join(', ') \n );\n this.el.set_value(ret.iter, 3, '' + (!hi ? '??' : hi[0].changed_raw)); \n this.el.set_value(ret.iter, 4, tr[i].autocommit() ); \n this.el.set_value(ret.iter, 5, tr[i].autopush() ); \n this.el.set_value(ret.iter, 6, tr[i].repopath ); \n // highlight color.\n var cb = tr[i].currentBranch;\n //print(JSON.stringify(cb,null,4));\n var col = '#ffffff';\n if (cb.lastrev != cb.remoterev) {\n col = '#ff0000';\n }\n if (tr[i].hasLocalChanges) {\n col = '#0000ff';\n }\n if ((cb.lastrev != cb.remoterev) && (tr[i].hasLocalChanges)) {\n col = '#ff00ff';\n }\n \n this.el.set_value(ret.iter, 7, col ); \n \n } \n}" + "| void load" : "()\n{\n //this.insert(citer,iter,0);\n print(\"getting list\");\n var tr = GitRepo.list();\n \n this.el.clear();\n \n // fixme .. sort by last updated ...\n \n \n for(var i =0 ; i < tr.length; i++) {\n\t var repo = tr.index(i);\n\t repo.loadBranches();\n\t \n\t Gtk.TreeIter iter;\n\t this.el.append(out iter);\n \n \n //print(JSON.stringify(ret,null,4));\n //tr[i].getBranches();\n //tr[i].getStatus();\n //var hi;\n //try {\n //tr[i].debug=1;\n // hi = tr[i].history('/', 1, 'branch', tr[i].currentBranch.name );\n// print(JSON.stringify(hi,null,4));\n // } catch(e) { print(e);}\n \n this.el.set_value(iter, 0, repo.name );\n this.el.set_value( iter, 1, repo.currentBranch.name );\n this.el.set_value( iter, 2, repo.branchesToString() );\n// this.el.set_value(ret.iter, 2, '' + repo.branches.map(\n// function(e) { return e.name; \n// }).join(', ') \n // );\n// this.el.set_value(iter, 3, '' + (!hi ? '??' : hi[0].changed_raw)); \n this.el.set_value(iter, 4, repo.is_autocommit() ); \n this.el.set_value(iter, 5, repo.is_autopush() ); \n this.el.set_value(iter, 6, repo.gitdir ); \n // highlight color.\n var cb = repo.currentBranch;\n //print(JSON.stringify(cb,null,4));\n var col = \"#ffffff\";\n /*\n if (cb.lastrev != cb.remoterev) {\n col = '#ff0000';\n }\n if (tr[i].hasLocalChanges) {\n col = '#0000ff';\n }\n if ((cb.lastrev != cb.remoterev) && (tr[i].hasLocalChanges)) {\n col = '#ff00ff';\n }\n */\n this.el.set_value(iter, 7, col ); \n \n } \n this.el.set_sort_column_id (0, Gtk.SortType.ASCENDING);\n} ", + "$ xns" : "Gtk" }, { "id" : "tv_autocommit", - "* init" : "\n// this.items[0].el.set_activatable(true);\n this.el.add_attribute(_this.keyrender.el , \"active\", 4 );\n\n", + "* init" : "\n// this.items[0].el.set_activatable(true);\n this.el.add_attribute(_this.cr_autocommit.el , \"active\", 4 );\n\n", "* pack" : "append_column", "title" : "Auto Commit", "xtype" : "TreeViewColumn", @@ -121,8 +123,9 @@ "listeners" : { "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}" }, - "* pack" : "pack_start,false", + "id" : "cr_autocommit", "xtype" : "CellRendererToggle", + "* pack" : "pack_start,false", "$ xns" : "Gtk", "$ mode" : "Gtk.CellRendererMode.ACTIVATABLE" } @@ -130,7 +133,7 @@ }, { "id" : "tv_autopush", - "* init" : " \n this.el.add_attribute(this.items[0].el , 'active', 5 );\n// this.items[0].el.set_activatable(true);\n\n", + "* init" : " \n this.el.add_attribute(_this.cr_autopush.el , \"active\", 5 );\n// this.items[0].el.set_activatable(true);\n\n", "* pack" : "append_column", "title" : "Auto Push", "xtype" : "TreeViewColumn", @@ -139,33 +142,39 @@ "items" : [ { "listeners" : { - "toggled" : "function (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}" + "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}" }, - "* pack" : "pack_start", + "id" : "cr_autopush", "xtype" : "CellRendererToggle", + "* pack" : "pack_start,false", "$ xns" : "Gtk", "$ mode" : "Gtk.CellRendererMode.ACTIVATABLE" } ] }, { - "* init" : "function() {\n XObject.prototype.init.call(this);\n this.el.add_attribute(this.items[0].el , 'markup', 0 );\n\n}\n", + "id" : "tv_repo", + "Gtk.SortType sort_order" : "Gtk.SortType.ASCENDING", + "* init" : "\n this.el.add_attribute(_this.cr_repo.el , \"markup\", 0 );\n", "title" : "Repo", "* pack" : "append_column", "xtype" : "TreeViewColumn", + "int sort_column_id" : 0, "min_width" : 200, "$ xns" : "Gtk", "resizable" : true, "items" : [ { - "* pack" : "pack_start", + "id" : "cr_repo", "xtype" : "CellRendererText", + "* pack" : "pack_start,false", "$ xns" : "Gtk" } ] }, { - "* init" : "function() {\n XObject.prototype.init.call(this);\n this.el.add_attribute(this.items[0].el , 'markup', 1 );\n this.el.add_attribute(this.items[0].el , 'cell-background', 7 );\n\n}\n", + "id" : "tv_current_branch", + "* init" : " \n this.el.add_attribute(_this.cr_current_branch.el , \"markup\", 1 );\n this.el.add_attribute(_this.cr_current_branch.el, \"cell-background\", 7 );\n \n", "* pack" : "append_column", "title" : "Current Branch", "xtype" : "TreeViewColumn", @@ -173,14 +182,16 @@ "$ xns" : "Gtk", "items" : [ { - "* pack" : "pack_start", + "id" : "cr_current_branch", "xtype" : "CellRendererText", + "* pack" : "pack_start,false", "$ xns" : "Gtk" } ] }, { - "* init" : "function() {\n XObject.prototype.init.call(this);\n this.el.add_attribute(this.items[0].el , 'markup', 3 );\n\n}\n", + "id" : "tv_last_updated", + "* init" : "\n this.el.add_attribute(_this.cr_last_updated.el , \"markup\", 3 );\n", "* pack" : "append_column", "title" : "Last updated", "xtype" : "TreeViewColumn", @@ -188,14 +199,16 @@ "$ xns" : "Gtk", "items" : [ { - "* pack" : "pack_start", + "id" : "cr_last_updated", "xtype" : "CellRendererText", + "* pack" : "pack_start,false", "$ xns" : "Gtk" } ] }, { - "* init" : "function() {\n XObject.prototype.init.call(this);\n this.el.add_attribute(this.items[0].el , 'markup', 2 );\n\n}\n", + "id" : "tv_all_branches", + "* init" : " this.el.add_attribute(_this.cr_all_branches.el , \"markup\", 2 );\n\n", "title" : "All Branches", "* pack" : "append_column", "xtype" : "TreeViewColumn", @@ -204,25 +217,14 @@ "resizable" : false, "items" : [ { - "* pack" : "pack_start", + "id" : "cr_all_branches", "xtype" : "CellRendererText", + "* pack" : "pack_start,false", "$ xns" : "Gtk" } ] } ] - }, - { - "* pack" : false, - "xtype" : "TreeView", - "$ xns" : "Gtk", - "items" : [ - { - "* pack" : false, - "xtype" : "ListStore", - "$ xns" : "Gtk" - } - ] } ] } @@ -231,6 +233,7 @@ { "label" : "Close", "id" : "ok_button", + "bool expand" : false, "* pack" : "add_action_widget,1 ", "xtype" : "Button", "$ xns" : "Gtk"