From fd9fb18c5cf70445c33adab625622222801c12ac Mon Sep 17 00:00:00 2001 From: Alan Knowles Date: Thu, 1 Nov 2018 21:26:54 +0800 Subject: [PATCH] NewBranch.bjs NewBranch.vala --- NewBranch.bjs | 20 +++++++++++--------- NewBranch.vala | 32 ++++++++++++++++++++------------ 2 files changed, 31 insertions(+), 21 deletions(-) diff --git a/NewBranch.bjs b/NewBranch.bjs index 2a1a1af1..a8247426 100644 --- a/NewBranch.bjs +++ b/NewBranch.bjs @@ -10,7 +10,7 @@ { "listeners" : { "delete_event" : "(self, event) => {\n this.el.hide();\n return true; \n //test \n}\n ", - "response" : " (self, response_id) => { \n \n\tGLib.debug(\"got %d\", (int) response_id);\n\tif (response_id == 0) {\n\t _this.el.hide();\t \n\t \treturn;\n\t}\n\t// have they selected a ticket..\n\t// make that the current active ticket?\n\t// we really need to store locally what ticket is being worked on..\n\t// in theory we could be working on multiple project and not merging..\n\t// -- each repo would have their active ticket (only one per repo)\n\t// -- so we could just store that in there\n\t// -- initial load can check the contents of the ticket files on first scan.\n\tvar ticket_id = _this.ticketsel.selectedTicketId();\n\t\n if (this.repo != null) {\n \tvar bn = _this.name.el.get_text();\n \tif (ticket_id != \"\" ) {\n\t\t\tthis.repo.setActiveTicket( RooTicket.singleton().getById(ticket_id), bn);\n\t\t} else {\n\t\t\tthis.repo.createBranchNamed(bn);\n\t\t}\n }\n\n\t\n\n\t \n\t \n\t \n\n\t \n}", + "response" : " (self, response_id) => { \n \n\tGLib.debug(\"got %d\", (int) response_id);\n\tif (response_id == 0) {\n\t _this.el.hide();\t\n\t this.running = false; \n\t \treturn;\n\t}\n\t// have they selected a ticket..\n\t// make that the current active ticket?\n\t// we really need to store locally what ticket is being worked on..\n\t// in theory we could be working on multiple project and not merging..\n\t// -- each repo would have their active ticket (only one per repo)\n\t// -- so we could just store that in there\n\t// -- initial load can check the contents of the ticket files on first scan.\n\tvar ticket_id = _this.ticketsel.selectedTicketId();\n\t\n if (this.repo != null) {\n \tvar bn = _this.name.el.get_text();\n \tif (ticket_id != \"\" ) {\n\t\t\tthis.repo.setActiveTicket( RooTicket.singleton().getById(ticket_id), bn);\n\t\t} else {\n\t\t\tthis.repo.createBranchNamed(bn);\n\t\t}\n }\n\n\t\t this.running = false; \n\n\t \n\t \n\t \n\n\t \n}", "show" : "(self) => {\n \n\n //test\n}" }, "default_width" : 500, @@ -18,9 +18,10 @@ "title" : "Create a working branch ", "xtype" : "Dialog", "# GitRepo? repo" : "null", - "| void show" : "( GitRepo repo ) \n{\n // this.el.set_gravity(Gdk.Gravity.NORTH);\n \n this.repo = repo;\n \n\tthis.el.move((Gdk.Screen.width() / 2)- 250 ,0);\n \tGLib.debug(\"Loading tickets\"); \n \t_this.dbmodel.loadTickets();\n\n this.el.show_all();\n\n\n \n \n \n}", + "| void show" : "( GitRepo repo ) \n{\n // this.el.set_gravity(Gdk.Gravity.NORTH);\n if (this.running) {\n \treturn;\n\t}\n this.repo = repo;\n \n\tthis.el.move((Gdk.Screen.width() / 2)- 250 ,0);\n \tGLib.debug(\"Loading tickets\"); \n\n\n this.el.show_all();\n \t_this.dbmodel.loadTickets();\n\n}", "default_height" : 200, "$ xns" : "Gtk", + "# bool running" : true, "bool modal" : true, "items" : [ { @@ -30,8 +31,8 @@ "items" : [ { "bool homogeneous" : false, - "xtype" : "Table", "* pack" : "pack_start,false,false,0", + "xtype" : "Table", "uint column_spacing" : 2, "n_columns" : 2, "$ xns" : "Gtk", @@ -50,26 +51,27 @@ }, { "listeners" : { - "changed" : "() => {\n\n\tvar ticket_id = this.selectedTicketId();\n\t\n\tvar name = RooTicket.singleton().usernameLocal();\n\t\n\tif (ticket_id == \"\") {\n\t\n\t\tvar dt = new DateTime.now_local();\n\t\t_this.name.el.set_text(\"wip_%s_%s\".printf(name,dt.format(\"%Y_%b_%d\")));\n\t\treturn;\n\t}\n\t\n\tvar ticket = RooTicket.singleton().getById(ticket_id);\n \n\t_this.name.el.set_text(\"wip_%s_T%s_%s\".printf(name,ticket.id, ticket.summaryToBranchName()));\n\t\n\t//GLib.debug (//\"Selection: %s, %s\\n\", (string) val1, (string) val2);\n}" + "changed" : "() => {\n\tif (this.loading) {\n\t\treturn;\n\t}\n\tvar ticket_id = this.selectedTicketId();\n\t\n\tvar name = RooTicket.singleton().usernameLocal();\n\t\n\tif (ticket_id == \"\" || ticket_id == null) {\n\t\n\t\tvar dt = new DateTime.now_local();\n\t\t_this.name.el.set_text(\"wip_%s_%s\".printf(name,dt.format(\"%Y_%b_%d\")));\n\t\treturn;\n\t}\n\t\n\t\n\tvar ticket = RooTicket.singleton().getById(ticket_id);\n \n\t_this.name.el.set_text(\"wip_%s_T%s_%s\".printf(name,ticket.id, ticket.summaryToBranchName()));\n\t\n\t//GLib.debug (//\"Selection: %s, %s\\n\", (string) val1, (string) val2);\n}" }, "id" : "ticketsel", "* init" : "this.el.add_attribute(_this.dbcellrenderer.el , \"markup\", 1 );", "* pack" : "attach_defaults,1,2,0,1", "xtype" : "ComboBox", + "# bool loading" : false, "$ xns" : "Gtk", "| string selectedTicketId" : "() {\nGtk.TreeIter iter;\n\tValue val1;\n \n \n\tthis.el.get_active_iter (out iter);\n\t_this.dbmodel.el.get_value (iter, 0, out val1);\n \n\n\treturn (string) val1;\n\t\n\t\n\t\n\t\n}\n", "items" : [ { "id" : "dbcellrenderer", - "* pack" : "pack_start,true", "xtype" : "CellRendererText", + "* pack" : "pack_start,true", "$ xns" : "Gtk" }, { "id" : "dbmodel", - "* pack" : "set_model", "xtype" : "ListStore", - "| void loadTickets" : " () {\n\n RooTicket.singleton().loadTickets();\n \n \n\n this.el.clear(); \n Gtk.TreeIter iter;\n var el = this.el;\n \n el.append(out iter);\n\n \n el.set_value(iter, 0, \"\");\n el.set_value(iter, 1, \"-- select a ticket --\");\n \n _this.ticketsel.el.set_active_iter(iter);\n var tickets = RooTicket.singleton().tickets;\n foreach(var ticket in tickets) {\n \n\n el.append(out iter);\n \n el.set_value(iter, 0, ticket.id);\n el.set_value(iter, 1, \"#%s [%s] %s\".printf( ticket.id, ticket.project_id_name , ticket.summary));\n \n //if (data.get(i) == cur) {\n // _this.build_module.el.set_active_iter(iter);\n // }\n \n }\n //this.el.set_sort_column_id(0, Gtk.SortType.ASCENDING); \n \n}\n", + "* pack" : "set_model", + "| void loadTickets" : " () {\n\n RooTicket.singleton().loadTickets();\n \n _this.ticketsel.loading = true;\n\n this.el.clear(); \n Gtk.TreeIter iter;\n var el = this.el;\n \n el.append(out iter);\n\n \n el.set_value(iter, 0, \"\");\n el.set_value(iter, 1, \"-- select a ticket --\");\n \n _this.ticketsel.el.set_active_iter(iter);\n var tickets = RooTicket.singleton().tickets;\n foreach(var ticket in tickets) {\n \n el.append(out iter);\n \n el.set_value(iter, 0, ticket.id);\n el.set_value(iter, 1, \"#%s [%s] %s\".printf( ticket.id, ticket.project_id_name , ticket.summary));\n \n //if (data.get(i) == cur) {\n // _this.build_module.el.set_active_iter(iter);\n // }\n \n }\n \n _this.ticketsel.loading = false;\n //this.el.set_sort_column_id(0, Gtk.SortType.ASCENDING); \n \n}\n", "$ columns" : "typeof(string),typeof(string)", "n_columns" : 2, "$ xns" : "Gtk" @@ -98,15 +100,15 @@ }, { "label" : "Do not create Branch", - "* pack" : "add_action_widget,0", "xtype" : "Button", + "* pack" : "add_action_widget,0", "Gtk.ReliefStyle relief" : "Gtk.ReliefStyle.NONE", "$ xns" : "Gtk" }, { "label" : "Create Branch", - "* pack" : "add_action_widget,1", "xtype" : "Button", + "* pack" : "add_action_widget,1", "$ xns" : "Gtk" } ] diff --git a/NewBranch.vala b/NewBranch.vala index 836eee16..640ae38e 100644 --- a/NewBranch.vala +++ b/NewBranch.vala @@ -19,6 +19,7 @@ public class NewBranch : Object // my vars (def) public GitRepo? repo; + public bool running; // ctor public NewBranch() @@ -28,6 +29,7 @@ public class NewBranch : Object // my vars (dec) this.repo = null; + this.running = true; // set gobject values this.el.title = "Create a working branch "; @@ -55,7 +57,8 @@ public class NewBranch : Object GLib.debug("got %d", (int) response_id); if (response_id == 0) { - _this.el.hide(); + _this.el.hide(); + this.running = false; return; } // have they selected a ticket.. @@ -76,7 +79,7 @@ public class NewBranch : Object } } - + this.running = false; @@ -95,19 +98,18 @@ public class NewBranch : Object public void show ( GitRepo repo ) { // this.el.set_gravity(Gdk.Gravity.NORTH); - + if (this.running) { + return; + } this.repo = repo; this.el.move((Gdk.Screen.width() / 2)- 250 ,0); GLib.debug("Loading tickets"); - _this.dbmodel.loadTickets(); - this.el.show_all(); + this.el.show_all(); + _this.dbmodel.loadTickets(); - - - } public class Xcls_VBox2 : Object { @@ -200,6 +202,7 @@ public class NewBranch : Object // my vars (def) + public bool loading; // ctor public Xcls_ticketsel(NewBranch _owner ) @@ -209,6 +212,7 @@ public class NewBranch : Object this.el = new Gtk.ComboBox(); // my vars (dec) + this.loading = false; // set gobject values var child_0 = new Xcls_dbcellrenderer( _this ); @@ -224,18 +228,21 @@ public class NewBranch : Object //listeners this.el.changed.connect( () => { - + if (this.loading) { + return; + } var ticket_id = this.selectedTicketId(); var name = RooTicket.singleton().usernameLocal(); - if (ticket_id == "") { + if (ticket_id == "" || ticket_id == null) { var dt = new DateTime.now_local(); _this.name.el.set_text("wip_%s_%s".printf(name,dt.format("%Y_%b_%d"))); return; } + var ticket = RooTicket.singleton().getById(ticket_id); _this.name.el.set_text("wip_%s_T%s_%s".printf(name,ticket.id, ticket.summaryToBranchName())); @@ -309,7 +316,7 @@ public class NewBranch : Object RooTicket.singleton().loadTickets(); - + _this.ticketsel.loading = true; this.el.clear(); Gtk.TreeIter iter; @@ -325,7 +332,6 @@ public class NewBranch : Object var tickets = RooTicket.singleton().tickets; foreach(var ticket in tickets) { - el.append(out iter); el.set_value(iter, 0, ticket.id); @@ -336,6 +342,8 @@ public class NewBranch : Object // } } + + _this.ticketsel.loading = false; //this.el.set_sort_column_id(0, Gtk.SortType.ASCENDING); } -- 2.39.2