X-Git-Url: http://git.roojs.org/?p=gitlive;a=blobdiff_plain;f=NewBranch.bjs;h=3c76d7a568494affceb8ed4cf75a2179d636aa18;hp=e2ec31983bee4d5ad425429c72e78813441de76e;hb=19166f83acbb615c64d09e94e9993ef54e69703e;hpb=730c5ff2923f1782ebf717efb8337e535b3b3ea0

diff --git a/NewBranch.bjs b/NewBranch.bjs
index e2ec3198..3c76d7a5 100644
--- a/NewBranch.bjs
+++ b/NewBranch.bjs
@@ -510,85 +510,6 @@
          "bool vexpand" : false,
          "int margin" : 2,
          "items" : [
-          {
-           "label" : "Project",
-           "$ visible" : true,
-           "Gtk.Align halign" : "Gtk.Align.START",
-           "* pack" : "attach_defaults,0,1,0,1",
-           "xtype" : "Label",
-           "$ justify" : "Gtk.Justification.RIGHT",
-           "x_options" : 4,
-           "$ xns" : "Gtk"
-          },
-          {
-           "label" : "Ticket",
-           "$ visible" : true,
-           "Gtk.Align halign" : "Gtk.Align.START",
-           "* pack" : "attach_defaults,1,2,0,1",
-           "xtype" : "Label",
-           "x_options" : 4,
-           "$ xns" : "Gtk"
-          },
-          {
-           "listeners" : {
-            "changed" : "() => {\n\tif (this.loading) {\n\t\treturn;\n\t}\n\tvar project_id = this.selectedProjectId();\n\t_this.dbmodel.loadTickets(project_id);\n\t\n\t\n\t/*if (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\t*/\n}"
-           },
-           "* ctor" : "new Gtk.ComboBox.with_entry()",
-           "id" : "projectsel",
-           "| string selectedProjectId" : "() {\n\tGtk.TreeIter iter;\n\tValue val1;\n \n \n\tthis.el.get_active_iter (out iter);\n\t_this.prmodel.el.get_value (iter, 0, out val1);\n \n\n\treturn  (string) val1;\n\t\n\t\n\t\n\t\n}\n",
-           "* init" : "this.el.set_entry_text_column(1);",
-           "* pack" : "attach_defaults,0,1,1,2",
-           "xtype" : "ComboBox",
-           "# bool loading" : false,
-           "$ xns" : "Gtk",
-           "items" : [
-            {
-             "id" : "prcellrenderer",
-             "xtype" : "CellRendererText",
-             "* pack" : "pack_start,true",
-             "$ xns" : "Gtk"
-            },
-            {
-             "| void loadProjects" : "  (string id) {\n\n\n    \n    _this.projectsel.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 project --\");\n    if (id == \"\") {\n\t    _this.projectsel.el.set_active_iter(iter);\n    }\n  \n    foreach(var project in RooProject.projects()) {\n    \n        el.append(out iter);\n        \n        el.set_value(iter, 0, project.id);\n        el.set_value(iter, 1,  project.name );\n        if (id == project.id) {\n\t \t   _this.projectsel.el.set_active_iter(iter);\n\t    }   \n        \n    }\n    \n    _this.projectsel.loading = false;\n     //this.el.set_sort_column_id(0, Gtk.SortType.ASCENDING);          \n                                     \n}\n",
-             "id" : "prmodel",
-             "* pack" : "set_model",
-             "xtype" : "ListStore",
-             "$ columns" : "typeof(string),typeof(string)",
-             "n_columns" : 2,
-             "$ xns" : "Gtk"
-            }
-           ]
-          },
-          {
-           "listeners" : {
-            "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\tthis.el.get_child().get_style_context().remove_class(\"warning\");\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\t_this.view.loadTicket(\"\");\t\t\n\t\t\n\t\tthis.el.get_child().get_style_context().add_class(\"warning\");\n\t\t_this.createbtn.updateState();\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_this.scrolled_window.el.show();\n\t \n\t_this.view.loadTicket(ticket.id);\n\t_this.createbtn.updateState();\n\t\n\t//GLib.debug (//\"Selection: %s, %s\\n\", (string) val1, (string) val2);\n}"
-           },
-           "* ctor" : "new Gtk.ComboBox.with_entry()",
-           "id" : "ticketsel",
-           "* init" : "//this.el.add_attribute(_this.dbcellrenderer.el , \"markup\", 1 );\nthis.el.set_entry_text_column(1);\nthis.el.get_child().set_sensitive(false); ",
-           "* pack" : "attach_defaults,1,5,1,2",
-           "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",
-             "$ xns" : "Gtk"
-            },
-            {
-             "id" : "dbmodel",
-             "* pack" : "set_model",
-             "xtype" : "ListStore",
-             "| void loadTickets" : "(string project_id , string tid = \"\") {\n\n\n    \n    // fixme .. get project id from selection..\n    \n     RooTicket.singleton().loadTickets(\n \t\t\tproject_id,\n \t\t\t_this.btn_not_me.el.active ? RooTicket.Who.ANYBODY :  RooTicket.Who.ME,\n \t\t\t _this.btn_closed.el.active ? RooTicket.Status.ALL :  RooTicket.Status.ACTIVE\n\t\t );\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\".printf( ticket.id, ticket.summary));\n        \n        if (ticket.id == tid) {\n\t\t    _this.ticketsel.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"
-            }
-           ]
-          },
           {
            "label" : "Use this as branch name",
            "Gtk.Align halign" : "Gtk.Align.START",