X-Git-Url: http://git.roojs.org/?a=blobdiff_plain;f=NewBranch.bjs;h=5a447dc6c61c24157f0e60c80de6ab1b9692a18a;hb=c171058a46aff32967ca6e5af204cac7ce012060;hp=c93cc065ee6a437b1240ed718ac2c66a47bbfd1e;hpb=9719b1140507ce779ffa4bdd67a9b034fcb78620;p=gitlive

diff --git a/NewBranch.bjs b/NewBranch.bjs
index c93cc065..5a447dc6 100644
--- a/NewBranch.bjs
+++ b/NewBranch.bjs
@@ -56,7 +56,7 @@
        "bool homogeneous" : false,
        "* pack" : "append_page,_this.label_select_ticket.el",
        "xtype" : "Box",
-       "| void load_data" : "() {\n\n    GLib.debug(\"Loading tickets\"); \n    \n    var curproj = RooProject.getProjectByRepo(this.repo);\n     _this.prmodel.loadProjects(curproj == null ? \"\" : curproj.id);\n    \n \t_this.dbmodel.loadTickets(curproj == null ? \"\": curproj.id, tid);\n \t_this.createbtn.updateState();\n \t\n\t_this.ticketsel.el.get_child().get_style_context().remove_class(\"warning\");\n \tif (tid != \"\") { \n\t \tvar name = RooTicket.singleton().usernameLocal();\n \t\tvar ticket = RooTicket.singleton().getById(tid);\n\t\t_this.name.el.set_text(\"wip_%s_T%s_%s\".printf(name,ticket.id, ticket.summaryToBranchName()));\n\t} else {\n\t\t_this.ticketsel.el.get_child().get_style_context().add_class(\"warning\");\n\t}\n    _this.view.loadTicket(tid);\n    \n    \n}\n",
+       "| void load_data" : "() {\n\n    GLib.debug(\"Loading tickets\"); \n    \n    var curproj = RooProject.getProjectByRepo(this.repo);\n     _this.prmodel.loadProjects(curproj == null ? \"\" : curproj.id);\n    \n \t_this.dbmodel.loadTickets(curproj == null ? \"\": curproj.id, tid);\n \t_this.branchbtn.updateState();\n \t\n\t_this.ticketsel.el.get_child().get_style_context().remove_class(\"warning\");\n \tif (tid != \"\") { \n\t \tvar name = RooTicket.singleton().usernameLocal();\n \t\tvar ticket = RooTicket.singleton().getById(tid);\n\t\t_this.name.el.set_text(\"wip_%s_T%s_%s\".printf(name,ticket.id, ticket.summaryToBranchName()));\n\t} else {\n\t\t_this.ticketsel.el.get_child().get_style_context().add_class(\"warning\");\n\t}\n    _this.view.loadTicket(tid);\n    \n    \n}\n",
        "$ xns" : "Gtk",
        "Gtk.Orientation orientation" : "Gtk.Orientation.VERTICAL",
        "items" : [
@@ -174,7 +174,7 @@
            },
            "label" : "Create Branch",
            "| void updateState" : "() {\n\n\tvar ticket_id = _this.ticketsel.selectedTicketId();\n\t\n\tif (ticket_id == \"\") {\n\t\tthis.el.set_sensitive(false);\n\t\treturn;\n\t}\n \n\tthis.el.set_sensitive(true);\n \n}\n",
-           "id" : "createbtn",
+           "id" : "branchbtn",
            "* init" : "{\n   this.el.get_style_context().add_class(\"suggested-action\");\n}\n",
            "xtype" : "Button",
            "* pack" : "attach_defaults,4,5,4,5",
@@ -285,7 +285,7 @@
            },
            "* ctor" : "new Gtk.ComboBox.with_entry()",
            "id" : "project_id",
-           "| 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",
+           "| string selectedProjectId" : "() {\n\tGtk.TreeIter iter;\n\tValue val1;\n \n \n\tthis.el.get_active_iter (out iter);\n\t_this.tprmodel.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",
@@ -293,14 +293,14 @@
            "$ xns" : "Gtk",
            "items" : [
             {
-             "id" : "prcellrenderer",
+             "id" : "tprcellrenderer",
              "xtype" : "CellRendererText",
              "* pack" : "pack_start,true",
              "$ xns" : "Gtk"
             },
             {
              "| void loadProjects" : "  (string id) {\n\n    \n    _this.project_id.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.project_id.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.project_id.el.set_active_iter(iter);\n\t    }   \n        \n    }\n    \n    _this.project_id.loading = false;\n     //this.el.set_sort_column_id(0, Gtk.SortType.ASCENDING);          \n                                     \n}\n",
-             "id" : "prmodel",
+             "id" : "tprmodel",
              "* pack" : "set_model",
              "xtype" : "ListStore",
              "$ columns" : "typeof(string),typeof(string)",