From: Alan Knowles Date: Thu, 21 Mar 2019 04:38:59 +0000 (+0800) Subject: NewBranch.bjs X-Git-Url: http://git.roojs.org/?p=gitlive;a=commitdiff_plain;h=30454f0fc1f043702f3b6690f1062acef7034a31 NewBranch.bjs NewBranch.vala --- diff --git a/NewBranch.bjs b/NewBranch.bjs index 50fb97ba..d37d1a9f 100644 --- a/NewBranch.bjs +++ b/NewBranch.bjs @@ -30,178 +30,6 @@ "$ xns" : "Gtk", "Gtk.Orientation orientation" : "Gtk.Orientation.VERTICAL", "items" : [ - { - "bool homogeneous" : true, - "bool expand" : false, - "xtype" : "Table", - "* pack" : "pack_start,false,false,0", - "uint column_spacing" : 4, - "n_columns" : 5, - "$ xns" : "Gtk", - "n_rows" : 5, - "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()", - "| 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", - "id" : "projectsel", - "* 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", - "* pack" : "pack_start,true", - "xtype" : "CellRendererText", - "$ 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,4,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", - "xtype" : "CellRendererText", - "* pack" : "pack_start,true", - "$ xns" : "Gtk" - }, - { - "id" : "dbmodel", - "xtype" : "ListStore", - "* pack" : "set_model", - "| 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" - } - ] - }, - { - "listeners" : { - "clicked" : "() => {\n _this.el.response(-1);\n\tTicket.singleton().show(_this.repo);\n\n}" - }, - "bool expand" : false, - "* pack" : "attach_defaults,4,5,1,2", - "xtype" : "Button", - "string label" : "New Ticket", - "$ xns" : "Gtk" - }, - { - "label" : "Use this as branch name", - "Gtk.Align halign" : "Gtk.Align.START", - "xalign" : 0.90000000000000002, - "* pack" : "attach_defaults,0,1,3,4", - "xtype" : "Label", - "$ justify" : "Gtk.Justification.RIGHT", - "x_options" : 4, - "$ xns" : "Gtk" - }, - { - "id" : "name", - "$ visible" : true, - "xtype" : "Entry", - "* pack" : "attach_defaults,0,4,4,5", - "$ xns" : "Gtk" - }, - { - "listeners" : { - "clicked" : "() => {\n\n\tGLib.debug(\"fire response = 1\");\n\t\n\tvar ticket_id = _this.ticketsel.selectedTicketId();\n\t\n\tif (ticket_id == \"\") {\n\t\t_this.ticketsel.el.get_child().get_style_context().add_class(\"warning\");\n\t\treturn;\n\t}\n\t \n\t_this.el.response(1);\n}" - }, - "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", - "* init" : "{\n this.el.get_style_context().add_class(\"suggested-action\");\n}\n", - "xtype" : "Button", - "* pack" : "attach_defaults,4,5,4,5", - "$ xns" : "Gtk" - }, - { - "* pack" : "attach_defaults,0,5,2,3", - "xtype" : "Box", - "$ xns" : "Gtk", - "Gtk.Orientation orientation" : "Gtk.Orientation.HORIZONTAL", - "items" : [ - { - "listeners" : { - "toggled" : "() => {\n\tvar project_id = _this.projectsel.selectedProjectId();\n\t_this.dbmodel.loadTickets(project_id);\t\n}" - }, - "id" : "btn_not_me", - "* pack" : "add", - "string label" : "Show tickets not assigned to me", - "xtype" : "CheckButton", - "$ xns" : "Gtk" - }, - { - "listeners" : { - "toggled" : "() => {\n \tvar project_id = _this.projectsel.selectedProjectId();\n\t_this.dbmodel.loadTickets(project_id);\t\n\t \n}" - }, - "id" : "btn_closed", - "string label" : "Show closed Tickets", - "xtype" : "CheckButton", - "* pack" : "add", - "$ xns" : "Gtk" - }, - { - "listeners" : { - "activate_link" : "(uri) => {\n\tif (uri == \"refresh\") {\n\t\tRooProject.reload();\n\t\tvar curproj = RooProject.getProjectByRepo(_this.repo);\n\t\t _this.prmodel.loadProjects(curproj == null ? \"\": curproj.id);\n\n\t\t_this.dbmodel.loadTickets(curproj == null ? \"\": curproj.id);\t\t\n\t}\n\treturn true;\n}" - }, - "bool use_markup" : true, - "Gtk.Align halign" : "Gtk.Align.END", - "bool hexpand" : true, - "* pack" : "add", - "xtype" : "Label", - "string label" : "Refresh Ticket list", - "$ xns" : "Gtk" - } - ] - } - ] - }, { "int height_request" : 500, "id" : "scrolled_window", @@ -254,7 +82,181 @@ "* pack" : "append_page,_this.label_select_ticket.el", "xtype" : "Box", "$ xns" : "Gtk", - "Gtk.Orientation orientation" : "Gtk.Orientation.VERTICAL" + "Gtk.Orientation orientation" : "Gtk.Orientation.VERTICAL", + "items" : [ + { + "bool homogeneous" : true, + "bool expand" : false, + "xtype" : "Table", + "* pack" : "pack_start,false,false,0", + "uint column_spacing" : 4, + "n_columns" : 5, + "$ xns" : "Gtk", + "n_rows" : 5, + "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()", + "| 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", + "id" : "projectsel", + "* 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", + "* pack" : "pack_start,true", + "xtype" : "CellRendererText", + "$ 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,4,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", + "xtype" : "CellRendererText", + "* pack" : "pack_start,true", + "$ xns" : "Gtk" + }, + { + "id" : "dbmodel", + "xtype" : "ListStore", + "* pack" : "set_model", + "| 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" + } + ] + }, + { + "listeners" : { + "clicked" : "() => {\n _this.el.response(-1);\n\tTicket.singleton().show(_this.repo);\n\n}" + }, + "bool expand" : false, + "* pack" : "attach_defaults,4,5,1,2", + "xtype" : "Button", + "string label" : "New Ticket", + "$ xns" : "Gtk" + }, + { + "label" : "Use this as branch name", + "Gtk.Align halign" : "Gtk.Align.START", + "xalign" : 0.90000000000000002, + "* pack" : "attach_defaults,0,1,3,4", + "xtype" : "Label", + "$ justify" : "Gtk.Justification.RIGHT", + "x_options" : 4, + "$ xns" : "Gtk" + }, + { + "id" : "name", + "$ visible" : true, + "xtype" : "Entry", + "* pack" : "attach_defaults,0,4,4,5", + "$ xns" : "Gtk" + }, + { + "listeners" : { + "clicked" : "() => {\n\n\tGLib.debug(\"fire response = 1\");\n\t\n\tvar ticket_id = _this.ticketsel.selectedTicketId();\n\t\n\tif (ticket_id == \"\") {\n\t\t_this.ticketsel.el.get_child().get_style_context().add_class(\"warning\");\n\t\treturn;\n\t}\n\t \n\t_this.el.response(1);\n}" + }, + "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", + "* init" : "{\n this.el.get_style_context().add_class(\"suggested-action\");\n}\n", + "xtype" : "Button", + "* pack" : "attach_defaults,4,5,4,5", + "$ xns" : "Gtk" + }, + { + "* pack" : "attach_defaults,0,5,2,3", + "xtype" : "Box", + "$ xns" : "Gtk", + "Gtk.Orientation orientation" : "Gtk.Orientation.HORIZONTAL", + "items" : [ + { + "listeners" : { + "toggled" : "() => {\n\tvar project_id = _this.projectsel.selectedProjectId();\n\t_this.dbmodel.loadTickets(project_id);\t\n}" + }, + "id" : "btn_not_me", + "* pack" : "add", + "string label" : "Show tickets not assigned to me", + "xtype" : "CheckButton", + "$ xns" : "Gtk" + }, + { + "listeners" : { + "toggled" : "() => {\n \tvar project_id = _this.projectsel.selectedProjectId();\n\t_this.dbmodel.loadTickets(project_id);\t\n\t \n}" + }, + "id" : "btn_closed", + "string label" : "Show closed Tickets", + "xtype" : "CheckButton", + "* pack" : "add", + "$ xns" : "Gtk" + }, + { + "listeners" : { + "activate_link" : "(uri) => {\n\tif (uri == \"refresh\") {\n\t\tRooProject.reload();\n\t\tvar curproj = RooProject.getProjectByRepo(_this.repo);\n\t\t _this.prmodel.loadProjects(curproj == null ? \"\": curproj.id);\n\n\t\t_this.dbmodel.loadTickets(curproj == null ? \"\": curproj.id);\t\t\n\t}\n\treturn true;\n}" + }, + "bool use_markup" : true, + "Gtk.Align halign" : "Gtk.Align.END", + "bool hexpand" : true, + "* pack" : "add", + "xtype" : "Label", + "string label" : "Refresh Ticket list", + "$ xns" : "Gtk" + } + ] + } + ] + } + ] }, { "bool homogeneous" : false, diff --git a/NewBranch.vala b/NewBranch.vala index 0284d35d..78356ba5 100644 --- a/NewBranch.vala +++ b/NewBranch.vala @@ -12,6 +12,11 @@ public class NewBranch : Object } return _NewBranch; } + public Xcls_scrolled_window scrolled_window; + public Xcls_view view; + public Xcls_label_select_ticket label_select_ticket; + public Xcls_label_create_ticket label_create_ticket; + public Xcls_label_quick_commit label_quick_commit; public Xcls_projectsel projectsel; public Xcls_prcellrenderer prcellrenderer; public Xcls_prmodel prmodel; @@ -22,11 +27,6 @@ public class NewBranch : Object public Xcls_createbtn createbtn; public Xcls_btn_not_me btn_not_me; public Xcls_btn_closed btn_closed; - public Xcls_scrolled_window scrolled_window; - public Xcls_view view; - public Xcls_label_select_ticket label_select_ticket; - public Xcls_label_create_ticket label_create_ticket; - public Xcls_label_quick_commit label_quick_commit; // my vars (def) public GitRepo? repo; @@ -53,7 +53,7 @@ public class NewBranch : Object var child_0 = new Xcls_Box2( _this ); child_0.ref(); this.el.get_content_area().add ( child_0.el ); - var child_1 = new Xcls_Notebook22( _this ); + var child_1 = new Xcls_Notebook5( _this ); child_1.ref(); this.el.add ( child_1.el ); @@ -171,17 +171,223 @@ public class NewBranch : Object // my vars (dec) // set gobject values - var child_0 = new Xcls_Table3( _this ); + var child_0 = new Xcls_scrolled_window( _this ); child_0.ref(); - this.el.pack_start ( child_0.el , false,false,0 ); - var child_1 = new Xcls_scrolled_window( _this ); + this.el.add ( child_0.el ); + } + + // user defined functions + } + public class Xcls_scrolled_window : Object + { + public Gtk.ScrolledWindow el; + private NewBranch _this; + + + // my vars (def) + + // ctor + public Xcls_scrolled_window(NewBranch _owner ) + { + _this = _owner; + _this.scrolled_window = this; + this.el = new Gtk.ScrolledWindow( null, null ); + + // my vars (dec) + + // set gobject values + this.el.height_request = 500; + this.el.vexpand = true; + var child_0 = new Xcls_view( _this ); + child_0.ref(); + this.el.add ( child_0.el ); + + // init method + + { + this.el.set_policy(Gtk.PolicyType.AUTOMATIC, Gtk.PolicyType.AUTOMATIC); + } + } + + // user defined functions + } + public class Xcls_view : Object + { + public WebKit.WebView el; + private NewBranch _this; + + + // my vars (def) + + // ctor + public Xcls_view(NewBranch _owner ) + { + _this = _owner; + _this.view = this; + this.el = new WebKit.WebView(); + + // my vars (dec) + + // set gobject values + } + + // user defined functions + public void loadTicket (string tid) { + int h,w; + _this.el.get_size(out w, out h); + + if (tid == "") { + _this.scrolled_window.el.hide(); + _this.el.resize(w, 150); + } else { + _this.scrolled_window.el.show(); + _this.el.resize(w, 800); + } + + var rs = RooTicket.singleton(); + var uri = new WebKit.URIRequest("https://roojs.com/admin.php/MTrack/View/" + tid); + var hd = uri.get_http_headers(); + var authCode = Base64.encode ("%s:%s".printf(rs.username, rs.password).data); + hd.append("Authorization", "Basic %s".printf(authCode)); + + this.el.load_request(uri); + } + } + + + + public class Xcls_Notebook5 : Object + { + public Gtk.Notebook el; + private NewBranch _this; + + + // my vars (def) + + // ctor + public Xcls_Notebook5(NewBranch _owner ) + { + _this = _owner; + this.el = new Gtk.Notebook(); + + // my vars (dec) + + // set gobject values + this.el.vexpand = true; + var child_0 = new Xcls_label_select_ticket( _this ); + child_0.ref(); + var child_1 = new Xcls_label_create_ticket( _this ); child_1.ref(); - this.el.add ( child_1.el ); + var child_2 = new Xcls_label_quick_commit( _this ); + child_2.ref(); + var child_3 = new Xcls_Box9( _this ); + child_3.ref(); + this.el.append_page ( child_3.el , _this.label_select_ticket.el ); + var child_4 = new Xcls_Box27( _this ); + child_4.ref(); + this.el.append_page ( child_4.el , _this.label_create_ticket.el ); + var child_5 = new Xcls_Box28( _this ); + child_5.ref(); + this.el.append_page ( child_5.el , _this.label_quick_commit.el ); + } + + // user defined functions + } + public class Xcls_label_select_ticket : Object + { + public Gtk.Label el; + private NewBranch _this; + + + // my vars (def) + + // ctor + public Xcls_label_select_ticket(NewBranch _owner ) + { + _this = _owner; + _this.label_select_ticket = this; + this.el = new Gtk.Label( "Select Existing Ticket to work on" ); + + // my vars (dec) + + // set gobject values + } + + // user defined functions + } + + public class Xcls_label_create_ticket : Object + { + public Gtk.Label el; + private NewBranch _this; + + + // my vars (def) + + // ctor + public Xcls_label_create_ticket(NewBranch _owner ) + { + _this = _owner; + _this.label_create_ticket = this; + this.el = new Gtk.Label( "Create a new Ticket" ); + + // my vars (dec) + + // set gobject values + } + + // user defined functions + } + + public class Xcls_label_quick_commit : Object + { + public Gtk.Label el; + private NewBranch _this; + + + // my vars (def) + + // ctor + public Xcls_label_quick_commit(NewBranch _owner ) + { + _this = _owner; + _this.label_quick_commit = this; + this.el = new Gtk.Label( "Quick Commit" ); + + // my vars (dec) + + // set gobject values + } + + // user defined functions + } + + public class Xcls_Box9 : Object + { + public Gtk.Box el; + private NewBranch _this; + + + // my vars (def) + + // ctor + public Xcls_Box9(NewBranch _owner ) + { + _this = _owner; + this.el = new Gtk.Box( Gtk.Orientation.VERTICAL, 0 ); + + // my vars (dec) + + // set gobject values + this.el.homogeneous = false; + var child_0 = new Xcls_Table10( _this ); + child_0.ref(); + this.el.pack_start ( child_0.el , false,false,0 ); } // user defined functions } - public class Xcls_Table3 : Object + public class Xcls_Table10 : Object { public Gtk.Table el; private NewBranch _this; @@ -190,7 +396,7 @@ public class NewBranch : Object // my vars (def) // ctor - public Xcls_Table3(NewBranch _owner ) + public Xcls_Table10(NewBranch _owner ) { _this = _owner; this.el = new Gtk.Table( 5, 5, true ); @@ -202,10 +408,10 @@ public class NewBranch : Object this.el.margin = 2; this.el.column_spacing = 4; this.el.vexpand = false; - var child_0 = new Xcls_Label4( _this ); + var child_0 = new Xcls_Label11( _this ); child_0.ref(); this.el.attach_defaults ( child_0.el , 0,1,0,1 ); - var child_1 = new Xcls_Label5( _this ); + var child_1 = new Xcls_Label12( _this ); child_1.ref(); this.el.attach_defaults ( child_1.el , 1,2,0,1 ); var child_2 = new Xcls_projectsel( _this ); @@ -214,10 +420,10 @@ public class NewBranch : Object var child_3 = new Xcls_ticketsel( _this ); child_3.ref(); this.el.attach_defaults ( child_3.el , 1,4,1,2 ); - var child_4 = new Xcls_Button12( _this ); + var child_4 = new Xcls_Button19( _this ); child_4.ref(); this.el.attach_defaults ( child_4.el , 4,5,1,2 ); - var child_5 = new Xcls_Label13( _this ); + var child_5 = new Xcls_Label20( _this ); child_5.ref(); this.el.attach_defaults ( child_5.el , 0,1,3,4 ); var child_6 = new Xcls_name( _this ); @@ -226,14 +432,14 @@ public class NewBranch : Object var child_7 = new Xcls_createbtn( _this ); child_7.ref(); this.el.attach_defaults ( child_7.el , 4,5,4,5 ); - var child_8 = new Xcls_Box16( _this ); + var child_8 = new Xcls_Box23( _this ); child_8.ref(); this.el.attach_defaults ( child_8.el , 0,5,2,3 ); } // user defined functions } - public class Xcls_Label4 : Object + public class Xcls_Label11 : Object { public Gtk.Label el; private NewBranch _this; @@ -242,7 +448,7 @@ public class NewBranch : Object // my vars (def) // ctor - public Xcls_Label4(NewBranch _owner ) + public Xcls_Label11(NewBranch _owner ) { _this = _owner; this.el = new Gtk.Label( "Project" ); @@ -258,7 +464,7 @@ public class NewBranch : Object // user defined functions } - public class Xcls_Label5 : Object + public class Xcls_Label12 : Object { public Gtk.Label el; private NewBranch _this; @@ -267,7 +473,7 @@ public class NewBranch : Object // my vars (def) // ctor - public Xcls_Label5(NewBranch _owner ) + public Xcls_Label12(NewBranch _owner ) { _this = _owner; this.el = new Gtk.Label( "Ticket" ); @@ -619,7 +825,7 @@ public class NewBranch : Object } - public class Xcls_Button12 : Object + public class Xcls_Button19 : Object { public Gtk.Button el; private NewBranch _this; @@ -628,7 +834,7 @@ public class NewBranch : Object // my vars (def) // ctor - public Xcls_Button12(NewBranch _owner ) + public Xcls_Button19(NewBranch _owner ) { _this = _owner; this.el = new Gtk.Button(); @@ -650,7 +856,7 @@ public class NewBranch : Object // user defined functions } - public class Xcls_Label13 : Object + public class Xcls_Label20 : Object { public Gtk.Label el; private NewBranch _this; @@ -659,7 +865,7 @@ public class NewBranch : Object // my vars (def) // ctor - public Xcls_Label13(NewBranch _owner ) + public Xcls_Label20(NewBranch _owner ) { _this = _owner; this.el = new Gtk.Label( "Use this as branch name" ); @@ -756,7 +962,7 @@ public class NewBranch : Object } } - public class Xcls_Box16 : Object + public class Xcls_Box23 : Object { public Gtk.Box el; private NewBranch _this; @@ -765,7 +971,7 @@ public class NewBranch : Object // my vars (def) // ctor - public Xcls_Box16(NewBranch _owner ) + public Xcls_Box23(NewBranch _owner ) { _this = _owner; this.el = new Gtk.Box( Gtk.Orientation.HORIZONTAL, 0 ); @@ -779,7 +985,7 @@ public class NewBranch : Object var child_1 = new Xcls_btn_closed( _this ); child_1.ref(); this.el.add ( child_1.el ); - var child_2 = new Xcls_Label19( _this ); + var child_2 = new Xcls_Label26( _this ); child_2.ref(); this.el.add ( child_2.el ); } @@ -847,7 +1053,7 @@ public class NewBranch : Object // user defined functions } - public class Xcls_Label19 : Object + public class Xcls_Label26 : Object { public Gtk.Label el; private NewBranch _this; @@ -856,7 +1062,7 @@ public class NewBranch : Object // my vars (def) // ctor - public Xcls_Label19(NewBranch _owner ) + public Xcls_Label26(NewBranch _owner ) { _this = _owner; this.el = new Gtk.Label( "Refresh Ticket list" ); @@ -886,212 +1092,6 @@ public class NewBranch : Object - public class Xcls_scrolled_window : Object - { - public Gtk.ScrolledWindow el; - private NewBranch _this; - - - // my vars (def) - - // ctor - public Xcls_scrolled_window(NewBranch _owner ) - { - _this = _owner; - _this.scrolled_window = this; - this.el = new Gtk.ScrolledWindow( null, null ); - - // my vars (dec) - - // set gobject values - this.el.height_request = 500; - this.el.vexpand = true; - var child_0 = new Xcls_view( _this ); - child_0.ref(); - this.el.add ( child_0.el ); - - // init method - - { - this.el.set_policy(Gtk.PolicyType.AUTOMATIC, Gtk.PolicyType.AUTOMATIC); - } - } - - // user defined functions - } - public class Xcls_view : Object - { - public WebKit.WebView el; - private NewBranch _this; - - - // my vars (def) - - // ctor - public Xcls_view(NewBranch _owner ) - { - _this = _owner; - _this.view = this; - this.el = new WebKit.WebView(); - - // my vars (dec) - - // set gobject values - } - - // user defined functions - public void loadTicket (string tid) { - int h,w; - _this.el.get_size(out w, out h); - - if (tid == "") { - _this.scrolled_window.el.hide(); - _this.el.resize(w, 150); - } else { - _this.scrolled_window.el.show(); - _this.el.resize(w, 800); - } - - var rs = RooTicket.singleton(); - var uri = new WebKit.URIRequest("https://roojs.com/admin.php/MTrack/View/" + tid); - var hd = uri.get_http_headers(); - var authCode = Base64.encode ("%s:%s".printf(rs.username, rs.password).data); - hd.append("Authorization", "Basic %s".printf(authCode)); - - this.el.load_request(uri); - } - } - - - - public class Xcls_Notebook22 : Object - { - public Gtk.Notebook el; - private NewBranch _this; - - - // my vars (def) - - // ctor - public Xcls_Notebook22(NewBranch _owner ) - { - _this = _owner; - this.el = new Gtk.Notebook(); - - // my vars (dec) - - // set gobject values - this.el.vexpand = true; - var child_0 = new Xcls_label_select_ticket( _this ); - child_0.ref(); - var child_1 = new Xcls_label_create_ticket( _this ); - child_1.ref(); - var child_2 = new Xcls_label_quick_commit( _this ); - child_2.ref(); - var child_3 = new Xcls_Box26( _this ); - child_3.ref(); - this.el.append_page ( child_3.el , _this.label_select_ticket.el ); - var child_4 = new Xcls_Box27( _this ); - child_4.ref(); - this.el.append_page ( child_4.el , _this.label_create_ticket.el ); - var child_5 = new Xcls_Box28( _this ); - child_5.ref(); - this.el.append_page ( child_5.el , _this.label_quick_commit.el ); - } - - // user defined functions - } - public class Xcls_label_select_ticket : Object - { - public Gtk.Label el; - private NewBranch _this; - - - // my vars (def) - - // ctor - public Xcls_label_select_ticket(NewBranch _owner ) - { - _this = _owner; - _this.label_select_ticket = this; - this.el = new Gtk.Label( "Select Existing Ticket to work on" ); - - // my vars (dec) - - // set gobject values - } - - // user defined functions - } - - public class Xcls_label_create_ticket : Object - { - public Gtk.Label el; - private NewBranch _this; - - - // my vars (def) - - // ctor - public Xcls_label_create_ticket(NewBranch _owner ) - { - _this = _owner; - _this.label_create_ticket = this; - this.el = new Gtk.Label( "Create a new Ticket" ); - - // my vars (dec) - - // set gobject values - } - - // user defined functions - } - - public class Xcls_label_quick_commit : Object - { - public Gtk.Label el; - private NewBranch _this; - - - // my vars (def) - - // ctor - public Xcls_label_quick_commit(NewBranch _owner ) - { - _this = _owner; - _this.label_quick_commit = this; - this.el = new Gtk.Label( "Quick Commit" ); - - // my vars (dec) - - // set gobject values - } - - // user defined functions - } - - public class Xcls_Box26 : Object - { - public Gtk.Box el; - private NewBranch _this; - - - // my vars (def) - - // ctor - public Xcls_Box26(NewBranch _owner ) - { - _this = _owner; - this.el = new Gtk.Box( Gtk.Orientation.VERTICAL, 0 ); - - // my vars (dec) - - // set gobject values - this.el.homogeneous = false; - } - - // user defined functions - } public class Xcls_Box27 : Object {