From 9df01e59458293cdac3f984d7bc8f63055640e19 Mon Sep 17 00:00:00 2001 From: Alan Knowles Date: Wed, 30 Jan 2019 16:18:58 +0800 Subject: [PATCH] fix issue with merge tickets and disable do merge unless action is chosen --- Clones.bjs | 20 +-- MergeBranch.bjs | 134 ++++++++++++--- MergeBranch.vala | 417 +++++++++++++++++++++++++++++++++++++++++++---- NewBranch.bjs | 16 +- RooTicket.vala | 3 + 5 files changed, 518 insertions(+), 72 deletions(-) diff --git a/Clones.bjs b/Clones.bjs index 24c654f9..d1c1402f 100644 --- a/Clones.bjs +++ b/Clones.bjs @@ -73,8 +73,8 @@ "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}\n", "bool activate_on_single_click" : true, + "* 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", "int search_column" : 0, @@ -105,8 +105,8 @@ "toggled" : " (self, path) => {\n \n \tGtk.TreeIter iter;\n \t_this.reposStore.el.get_iter_from_string(out iter, path);\n \t\n \tGLib.Value val;\n \tGLib.Value rval;\n \t_this.reposStore.el.get_value(iter, 4, out val);\n \t_this.reposStore.el.get_value(iter, 6, out rval);\n \t\n \tvar repopath = (string)rval;\n \tvar bval = (bool)val;\n \t_this.reposStore.el.set_value(iter, 4, !bval);\n \tGLib.debug(\"got repopath? %s\", repopath);\n \t\n \tvar repo = GitRepo.get(repopath);\n \trepo.set_autocommit(!bval);\n \t\n \t\n \t\n \n}" }, "id" : "cr_autocommit", - "xtype" : "CellRendererToggle", "* pack" : "pack_start,false", + "xtype" : "CellRendererToggle", "$ xns" : "Gtk", "$ mode" : "Gtk.CellRendererMode.ACTIVATABLE" } @@ -126,8 +126,8 @@ "toggled" : " (self, path) => {\n \n \tGtk.TreeIter iter;\n \t_this.reposStore.el.get_iter_from_string(out iter, path);\n \t\n \tGLib.Value val;\n \tGLib.Value rval;\n \t_this.reposStore.el.get_value(iter, 5, out val);\n \t_this.reposStore.el.get_value(iter, 6, out rval);\n \t\n \tvar repopath = (string)rval;\n \tvar bval = (bool)val;\n \t_this.reposStore.el.set_value(iter, 5, !bval);\n \tvar repo = GitRepo.get(repopath);\n \trepo.set_autopush(!bval);\n \t\n \t\n \t\n \n}" }, "id" : "cr_autopush", - "xtype" : "CellRendererToggle", "* pack" : "pack_start,false", + "xtype" : "CellRendererToggle", "$ xns" : "Gtk", "$ mode" : "Gtk.CellRendererMode.ACTIVATABLE" } @@ -147,8 +147,8 @@ "toggled" : " (self, path) => {\n \n \tGtk.TreeIter iter;\n \t_this.reposStore.el.get_iter_from_string(out iter, path);\n \t\n \tGLib.Value val;\n \tGLib.Value rval;\n \t_this.reposStore.el.get_value(iter, 8, out val);\n \t_this.reposStore.el.get_value(iter, 6, out rval);\n \t\n \tvar repopath = (string)rval;\n \tvar bval = (bool)val;\n \t_this.reposStore.el.set_value(iter, 8, !bval);\n \tvar repo = GitRepo.get(repopath);\n \trepo.set_auto_branch(!bval);\n \t\n \t\n \t\n \n}" }, "id" : "cr_autobranch", - "* pack" : "pack_start,false", "xtype" : "CellRendererToggle", + "* pack" : "pack_start,false", "$ xns" : "Gtk", "$ mode" : "Gtk.CellRendererMode.ACTIVATABLE" } @@ -156,8 +156,8 @@ }, { "id" : "tv_repo", - "Gtk.SortType sort_order" : "Gtk.SortType.ASCENDING", "* init" : "\n this.el.add_attribute(_this.cr_repo.el , \"markup\", 0 );\n", + "Gtk.SortType sort_order" : "Gtk.SortType.ASCENDING", "title" : "Repo", "* pack" : "append_column", "xtype" : "TreeViewColumn", @@ -168,8 +168,8 @@ "items" : [ { "id" : "cr_repo", - "xtype" : "CellRendererText", "* pack" : "pack_start,false", + "xtype" : "CellRendererText", "$ xns" : "Gtk" } ] @@ -185,8 +185,8 @@ "items" : [ { "id" : "cr_active_ticket", - "* pack" : "pack_start,false", "xtype" : "CellRendererText", + "* pack" : "pack_start,false", "$ xns" : "Gtk" } ] @@ -202,8 +202,8 @@ "items" : [ { "id" : "cr_current_branch", - "xtype" : "CellRendererText", "* pack" : "pack_start,false", + "xtype" : "CellRendererText", "$ xns" : "Gtk" } ] @@ -219,8 +219,8 @@ "items" : [ { "id" : "cr_last_updated", - "xtype" : "CellRendererText", "* pack" : "pack_start,false", + "xtype" : "CellRendererText", "$ xns" : "Gtk" } ] @@ -237,8 +237,8 @@ "items" : [ { "id" : "cr_all_branches", - "xtype" : "CellRendererText", "* pack" : "pack_start,false", + "xtype" : "CellRendererText", "$ xns" : "Gtk" } ] diff --git a/MergeBranch.bjs b/MergeBranch.bjs index dffab203..239a5c5e 100644 --- a/MergeBranch.bjs +++ b/MergeBranch.bjs @@ -10,14 +10,14 @@ { "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 < 1) {\n\t _this.el.hide();\t\n\t this.running = false; \n \tGitMonitor.gitmonitor.start();\n\t \treturn;\n\t}\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\t*/\n\t\n\tif (this.repo != null) {\n\t\trepo.doMerge(\n\t\t\t_this.actionsel.selectedAction(), \n\t\t\t_this.ticketsel.selectedTicketId(),\n\t\t\t_this.name.el.get_text()\n\t\t);\n\t\n\t} else {\n\t\tGitRepo.doMerges(\n\t\t\t_this.actionsel.selectedAction(), \n\t\t\t_this.ticketsel.selectedTicketId(),\n\t\t\t_this.name.el.get_text()\n\t\t);\n\t}\n\tthis.running = false; \n\n\t \n\t_this.el.hide();\t\n \tGitMonitor.gitmonitor.start();\n\n\t \n}" + "response" : " (self, response_id) => { \n \n\tGLib.debug(\"got %d\", (int) response_id);\n\tif (response_id < 1) {\n\t _this.el.hide();\t\n\t this.running = false; \n \tGitMonitor.gitmonitor.start();\n\t \treturn;\n\t}\n\t\n\t\n\t\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\t*/\n\t\n\tif (this.repo != null) {\n\t\trepo.doMerge(\n\t\t\t_this.actionsel.selectedAction(), \n\t\t\t_this.ticketsel.selectedTicketId(),\n\t\t\t_this.name.el.get_text()\n\t\t);\n\t\n\t} else {\n\t\tGitRepo.doMerges(\n\t\t\t_this.actionsel.selectedAction(), \n\t\t\t_this.ticketsel.selectedTicketId(),\n\t\t\t_this.name.el.get_text()\n\t\t);\n\t}\n\tthis.running = false; \n\n\t \n\t_this.el.hide();\t\n \tGitMonitor.gitmonitor.start();\n\n\t \n}" }, "default_width" : 500, - "# GitRepo repo" : "", "$ deletable" : true, + "# GitRepo repo" : "", "title" : "Merge Branch", "xtype" : "Dialog", - "| void show" : "( RooTicket ticket, GitRepo? repo ) \n{\n // this.el.set_gravity(Gdk.Gravity.NORTH);\n if (this.running) {\n \treturn;\n\t}\n\tGitMonitor.gitmonitor.stop();\n\t\n\t_this.el.show_all();\n\t\n\t_this.table.el.hide();\n\t_this.scrolled_window.el.hide();\n\t_this.spinner.el.show();\n\t_this.spinner.el.start();\t\n\tthis.el.set_keep_above(true); \n\tthis.el.move((Gdk.Screen.width() / 2)- 250 ,0);\n \tGLib.debug(\"Loading tickets\"); \n \n\t\n this.ticket = ticket;\n this.repo = repo;\n \n\t\n\tTimeout.add_seconds(1, () => {\n\t _this.diff_view.el.get_buffer().set_text(\n\t \trepo != null ? repo.previewMerge() : GitRepo.previewMerges(ticket.id)\n \t);\t\t\n\t\t// if we are not working on a ticket, then we should be able to pick one?\n\t \t_this.dbmodel.loadTickets();\n\t \t_this.actionmodel.loadActions();\n\t\t_this.view.loadTicket(ticket.id);\n\t\t_this.spinner.el.stop();\n\t\t_this.spinner.el.hide();\t\n\n\t\tthis.table.el.show();\n\t\treturn false;\n\t});\n\t\n\tthis.el.run();\n\t \n}", + "| void show" : "( RooTicket ticket, GitRepo? repo ) \n{\n // this.el.set_gravity(Gdk.Gravity.NORTH);\n if (this.running) {\n \treturn;\n\t}\n\tGitMonitor.gitmonitor.stop();\n\t\n\t_this.el.show_all();\n\t\n\t_this.table.el.hide();\n\t_this.scrolled_window.el.hide();\n\t_this.spinner.el.show();\n\t_this.spinner.el.start();\t\n\tthis.el.set_keep_above(true); \n\tthis.el.move((Gdk.Screen.width() / 2)- 250 ,0);\n \tGLib.debug(\"Loading tickets\"); \n \n\t\n this.ticket = ticket;\n this.repo = repo;\n \n\t\n\tTimeout.add_seconds(1, () => {\n\t\n _this.prmodel.loadProjects(ticket.project_id);\n\t\n\t _this.diff_view.el.get_buffer().set_text(\n\t \trepo != null ? repo.previewMerge() : GitRepo.previewMerges(ticket.id)\n \t);\t\t\n\t\t// if we are not working on a ticket, then we should be able to pick one?\n\t \t_this.dbmodel.loadTickets(ticket.project_id);\n\t \t_this.actionmodel.loadActions();\n\t \t_this.mergebtn.updateState();\n\t\t_this.view.loadTicket(ticket.id);\n\t\t_this.spinner.el.stop();\n\t\t_this.spinner.el.hide();\t\n\n\t\tthis.table.el.show();\n\t\treturn false;\n\t});\n\t\n\tthis.el.run();\n\t \n}", "default_height" : 200, "# RooTicket? ticket" : "null", "$ xns" : "Gtk", @@ -38,26 +38,26 @@ "uint column_spacing" : 2, "n_columns" : 2, "$ xns" : "Gtk", - "n_rows" : 2, + "n_rows" : 4, "bool vexpand" : false, "int margin" : 2, "items" : [ { "label" : "Do what?", "$ visible" : true, - "xalign" : 0.90000000000000002, + "Gtk.Align halign" : "Gtk.Align.END", + "int margin_right" : 3, "* pack" : "attach_defaults,0,1,0,1", "xtype" : "Label", - "$ justify" : "Gtk.Justification.RIGHT", - "x_options" : 4, "$ xns" : "Gtk" }, { "listeners" : { - "changed" : "() => {\n\tif (this.loading) {\n\t\treturn;\n\t}\n \t_this.name.updateText();\n\t//GLib.debug (//\"Selection: %s, %s\\n\", (string) val1, (string) val2);\n}" + "changed" : "() => {\n\tif (this.loading) {\n\t\treturn;\n\t}\n \t_this.name.updateText();\n \t_this.mergebtn.updateState();\n\t//GLib.debug (//\"Selection: %s, %s\\n\", (string) val1, (string) val2);\n}" }, "id" : "actionsel", "* init" : "this.el.add_attribute(_this.actioncellrenderer.el , \"markup\", 1 );", + "bool hexpand" : true, "* pack" : "attach_defaults,1,2,0,1", "xtype" : "ComboBox", "# bool loading" : false, @@ -66,14 +66,14 @@ "items" : [ { "id" : "actioncellrenderer", - "* pack" : "pack_start,true", "xtype" : "CellRendererText", + "* pack" : "pack_start,true", "$ xns" : "Gtk" }, { "id" : "actionmodel", - "* pack" : "set_model", "xtype" : "ListStore", + "* pack" : "set_model", "$ columns" : "typeof(string),typeof(string)", "n_columns" : 2, "$ xns" : "Gtk", @@ -81,11 +81,54 @@ } ] }, + { + "label" : "Project", + "$ visible" : true, + "Gtk.Align halign" : "Gtk.Align.END", + "int margin_right" : 3, + "* pack" : "attach_defaults,0,1,1,2", + "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);", + "bool hexpand" : true, + "* pack" : "attach_defaults,1,2,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" + } + ] + }, { "label" : "Select Ticket", "$ visible" : true, + "Gtk.Align halign" : "Gtk.Align.END", "xalign" : 0.90000000000000002, - "* pack" : "attach_defaults,0,1,1,2", + "int margin_right" : 3, + "* pack" : "attach_defaults,0,1,2,3", "xtype" : "Label", "$ justify" : "Gtk.Justification.RIGHT", "x_options" : 4, @@ -97,7 +140,8 @@ }, "id" : "ticketsel", "* init" : "this.el.add_attribute(_this.dbcellrenderer.el , \"markup\", 1 );", - "* pack" : "attach_defaults,1,2,1,2", + "bool hexpand" : true, + "* pack" : "attach_defaults,1,2,2,3", "xtype" : "ComboBox", "# bool loading" : true, "$ xns" : "Gtk", @@ -105,27 +149,67 @@ "items" : [ { "id" : "dbcellrenderer", - "xtype" : "CellRendererText", "* pack" : "pack_start,true", + "xtype" : "CellRendererText", "$ xns" : "Gtk" }, { "id" : "dbmodel", - "xtype" : "ListStore", "* pack" : "set_model", - "| void loadTickets" : " () {\n\n RooTicket.singleton().loadTickets(\"\",RooTicket.Who.ME, RooTicket.Status.ACTIVE);\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 el.set_value(iter, 0, \"\");\n el.set_value(iter, 1, \"-- select a ticket --\");\n \n _this.ticketsel.el.set_active_iter(iter);\n \n if (_this.ticket != null && _this.ticket.id == \"-1\") {\n\t\tel.append(out iter);\n\t\tel.set_value(iter, 0, \"-1\");\n\t\tel.set_value(iter, 1, \"Temporary Branch - No ticket specified/relivant\");\n _this.ticketsel.el.set_active_iter(iter);\t\n }\n \n \n \n \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\t\tif (_this.ticket != null && _this.ticket.id == ticket.id) {\n\t\t _this.ticketsel.el.set_active_iter(iter);\n\t }\n \n }\n \n _this.ticketsel.loading = false;\n //this.el.set_sort_column_id(0, Gtk.SortType.ASCENDING); \n \n}\n", + "xtype" : "ListStore", + "| void loadTickets" : " (string project_id) {\n\n RooTicket.singleton().loadTickets(project_id,RooTicket.Who.ME, RooTicket.Status.ACTIVE);\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 el.set_value(iter, 0, \"\");\n el.set_value(iter, 1, \"-- select a ticket --\");\n \n _this.ticketsel.el.set_active_iter(iter);\n \n if (_this.ticket != null && _this.ticket.id == \"-1\") {\n\t\tel.append(out iter);\n\t\tel.set_value(iter, 0, \"-1\");\n\t\tel.set_value(iter, 1, \"Temporary Branch - No ticket specified/relivant\");\n _this.ticketsel.el.set_active_iter(iter);\t\n }\n \n \n \n \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\t\tif (_this.ticket != null && _this.ticket.id == ticket.id) {\n\t\t _this.ticketsel.el.set_active_iter(iter);\n\t }\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" } ] }, + { + "* pack" : "attach_defaults,0,2,3,4", + "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", + "string label" : "Show tickets not assigned to me", + "* pack" : "add", + "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", + "xtype" : "CheckButton", + "string label" : "Show closed Tickets", + "* 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" + } + ] + }, { "label" : "Use this commit message", - "xalign" : 0.90000000000000002, - "* pack" : "attach_defaults,0,1,2,3", + "Gtk.Align halign" : "Gtk.Align.END", + "int margin_right" : 3, + "* pack" : "attach_defaults,0,1,4,5", "xtype" : "Label", - "$ justify" : "Gtk.Justification.RIGHT", "x_options" : 4, "$ xns" : "Gtk" }, @@ -134,7 +218,7 @@ "$ visible" : true, "| void updateText" : "() {\n\tvar ticket_id = _this.ticketsel.selectedTicketId();\n\t\n\tRooTicket ticket = null;\n\tif (ticket_id.length > 0){\n\t\tticket = RooTicket.singleton().getById(ticket_id);\n\t}\n\t\n\tvar name = RooTicket.singleton().usernameLocal();\n\tvar action = _this.actionsel.selectedAction();\n\tthis.el.set_editable(true); \n \tswitch (action) {\n \t\tcase \"CLOSE\": // merge changes and close..\n\t \t\tthis.el.set_text(\"Fix #%s - %s\".printf(ticket_id, ticket != null ? ticket.summary : \"\"));\n\t \t\tbreak;\n\t \tcase \"LEAVE\": // partial fix\t\n\t \t\tthis.el.set_text(\"Partial Fix #%s - %s\".printf(ticket_id, ticket != null ? ticket.summary : \"\"));\n\t \t\tbreak;\n \t\tcase \"MASTER\": // merge master\n \t\tcase \"EXIT\": // just switch back... \t\t\n \t\t\tthis.el.set_editable(false);\n\t \t\tthis.el.set_text(\"\"); // not relivant.. \t\t\t\n\t\t\tbreak;\n \t\tdefault:\n \t\t\n \t\t\tbreak; /// don't fix the text value.\n\t}\n \n}\n", "xtype" : "Entry", - "* pack" : "attach_defaults,1,2,2,3", + "* pack" : "attach_defaults,1,2,4,5", "$ xns" : "Gtk" } ] @@ -147,15 +231,15 @@ "items" : [ { "id" : "label_diff", - "* pack" : false, "xtype" : "Label", + "* pack" : false, "string label" : "Projected Commit Diff", "$ xns" : "Gtk" }, { "id" : "label_ticket", - "string label" : "Ticket Details", "* pack" : false, + "string label" : "Ticket Details", "xtype" : "Label", "$ xns" : "Gtk" }, @@ -168,8 +252,8 @@ "items" : [ { "int height_request" : 400, - "* pack" : "pack_start,true,true,0", "xtype" : "ScrolledWindow", + "* pack" : "pack_start,true,true,0", "$ xns" : "Gtk", "items" : [ { @@ -201,8 +285,8 @@ "items" : [ { "id" : "view", - "* pack" : "add", "xtype" : "WebView", + "* pack" : "add", "$ xns" : "WebKit", "| void loadTicket" : "(string tid) {\n\tint h,w;\n\t_this.el.get_size(out w, out h);\n\t\n\tif (tid == \"\") {\n\t\t_this.scrolled_window.el.hide();\n\t\t_this.el.resize(w, 150);\n\t} else {\n\t\t_this.scrolled_window.el.show();\n\t\t_this.el.resize(w, 800);\n\t}\n\t\n\tvar rs = RooTicket.singleton();\t\t\n\tvar uri = new WebKit.URIRequest(\"https://roojs.com/admin.php/MTrack/View/\" + tid);\n\tvar hd = uri.get_http_headers();\n\tvar authCode = Base64.encode (\"%s:%s\".printf(rs.username, rs.password).data);\n\thd.append(\"Authorization\", \"Basic %s\".printf(authCode));\n\t\n\t this.el.load_request(uri);\n}\n" } @@ -224,13 +308,15 @@ }, { "label" : "Cancel", - "xtype" : "Button", "* pack" : "add_action_widget,0", + "xtype" : "Button", "Gtk.ReliefStyle relief" : "Gtk.ReliefStyle.NONE", "$ xns" : "Gtk" }, { "label" : "Do Merge", + "| void updateState" : "() {\n\tif (_this.actionsel.selectedAction() == \"\") {\n\t\t// need to select an action..\n\t\tthis.el.set_sensitive(false);\n\t\treturn;\n\t\n\t\n\t}\n\t\tthis.el.set_sensitive(true);\n\t\treturn;\n}\n", + "id" : "mergebtn", "* init" : "{\n this.el.get_style_context().add_class(\"suggested-action\");\n}\n", "xtype" : "Button", "* pack" : "add_action_widget,1", diff --git a/MergeBranch.vala b/MergeBranch.vala index 900c6679..61e267aa 100644 --- a/MergeBranch.vala +++ b/MergeBranch.vala @@ -16,9 +16,14 @@ public class MergeBranch : Object public Xcls_actionsel actionsel; public Xcls_actioncellrenderer actioncellrenderer; public Xcls_actionmodel actionmodel; + public Xcls_projectsel projectsel; + public Xcls_prcellrenderer prcellrenderer; + public Xcls_prmodel prmodel; public Xcls_ticketsel ticketsel; public Xcls_dbcellrenderer dbcellrenderer; public Xcls_dbmodel dbmodel; + public Xcls_btn_not_me btn_not_me; + public Xcls_btn_closed btn_closed; public Xcls_name name; public Xcls_label_diff label_diff; public Xcls_label_ticket label_ticket; @@ -26,6 +31,7 @@ public class MergeBranch : Object public Xcls_scrolled_window scrolled_window; public Xcls_view view; public Xcls_spinner spinner; + public Xcls_mergebtn mergebtn; // my vars (def) public GitRepo repo; @@ -51,10 +57,10 @@ public class MergeBranch : 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_Button24( _this ); + var child_1 = new Xcls_Button32( _this ); child_1.ref(); this.el.add_action_widget ( child_1.el , 0 ); - var child_2 = new Xcls_Button25( _this ); + var child_2 = new Xcls_mergebtn( _this ); child_2.ref(); this.el.add_action_widget ( child_2.el , 1 ); @@ -73,6 +79,9 @@ public class MergeBranch : Object GitMonitor.gitmonitor.start(); return; } + + + /* // have they selected a ticket.. // make that the current active ticket? @@ -142,12 +151,16 @@ public class MergeBranch : Object Timeout.add_seconds(1, () => { + + _this.prmodel.loadProjects(ticket.project_id); + _this.diff_view.el.get_buffer().set_text( repo != null ? repo.previewMerge() : GitRepo.previewMerges(ticket.id) ); // if we are not working on a ticket, then we should be able to pick one? - _this.dbmodel.loadTickets(); + _this.dbmodel.loadTickets(ticket.project_id); _this.actionmodel.loadActions(); + _this.mergebtn.updateState(); _this.view.loadTicket(ticket.id); _this.spinner.el.stop(); _this.spinner.el.hide(); @@ -179,7 +192,7 @@ public class MergeBranch : Object var child_0 = new Xcls_table( _this ); child_0.ref(); this.el.pack_start ( child_0.el , false,false,0 ); - var child_1 = new Xcls_Notebook14( _this ); + var child_1 = new Xcls_Notebook22( _this ); child_1.ref(); this.el.add ( child_1.el ); var child_2 = new Xcls_spinner( _this ); @@ -202,7 +215,7 @@ public class MergeBranch : Object { _this = _owner; _this.table = this; - this.el = new Gtk.Table( 2, 2, false ); + this.el = new Gtk.Table( 4, 2, false ); // my vars (dec) @@ -219,15 +232,24 @@ public class MergeBranch : Object var child_2 = new Xcls_Label8( _this ); child_2.ref(); this.el.attach_defaults ( child_2.el , 0,1,1,2 ); - var child_3 = new Xcls_ticketsel( _this ); + var child_3 = new Xcls_projectsel( _this ); child_3.ref(); this.el.attach_defaults ( child_3.el , 1,2,1,2 ); var child_4 = new Xcls_Label12( _this ); child_4.ref(); this.el.attach_defaults ( child_4.el , 0,1,2,3 ); - var child_5 = new Xcls_name( _this ); + var child_5 = new Xcls_ticketsel( _this ); child_5.ref(); this.el.attach_defaults ( child_5.el , 1,2,2,3 ); + var child_6 = new Xcls_Box16( _this ); + child_6.ref(); + this.el.attach_defaults ( child_6.el , 0,2,3,4 ); + var child_7 = new Xcls_Label20( _this ); + child_7.ref(); + this.el.attach_defaults ( child_7.el , 0,1,4,5 ); + var child_8 = new Xcls_name( _this ); + child_8.ref(); + this.el.attach_defaults ( child_8.el , 1,2,4,5 ); } // user defined functions @@ -249,8 +271,8 @@ public class MergeBranch : Object // my vars (dec) // set gobject values - this.el.justify = Gtk.Justification.RIGHT; - this.el.xalign = 0.900000f; + this.el.margin_right = 3; + this.el.halign = Gtk.Align.END; this.el.visible = true; } @@ -277,6 +299,7 @@ public class MergeBranch : Object this.loading = false; // set gobject values + this.el.hexpand = true; var child_0 = new Xcls_actioncellrenderer( _this ); child_0.ref(); this.el.pack_start ( child_0.el , true ); @@ -294,6 +317,7 @@ public class MergeBranch : Object return; } _this.name.updateText(); + _this.mergebtn.updateState(); //GLib.debug (//"Selection: %s, %s\n", (string) val1, (string) val2); }); } @@ -407,6 +431,195 @@ public class MergeBranch : Object // ctor public Xcls_Label8(MergeBranch _owner ) + { + _this = _owner; + this.el = new Gtk.Label( "Project" ); + + // my vars (dec) + + // set gobject values + this.el.margin_right = 3; + this.el.halign = Gtk.Align.END; + this.el.visible = true; + } + + // user defined functions + } + + public class Xcls_projectsel : Object + { + public Gtk.ComboBox el; + private MergeBranch _this; + + + // my vars (def) + public bool loading; + + // ctor + public Xcls_projectsel(MergeBranch _owner ) + { + _this = _owner; + _this.projectsel = this; + this.el = new Gtk.ComboBox.with_entry(); + + // my vars (dec) + this.loading = false; + + // set gobject values + this.el.hexpand = true; + var child_0 = new Xcls_prcellrenderer( _this ); + child_0.ref(); + this.el.pack_start ( child_0.el , true ); + var child_1 = new Xcls_prmodel( _this ); + child_1.ref(); + this.el.set_model ( child_1.el ); + + // init method + + this.el.set_entry_text_column(1); + + //listeners + this.el.changed.connect( () => { + if (this.loading) { + return; + } + var project_id = this.selectedProjectId(); + _this.dbmodel.loadTickets(project_id); + + + /*if (this.loading) { + return; + } + var ticket_id = this.selectedTicketId(); + + var name = RooTicket.singleton().usernameLocal(); + + 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())); + + //GLib.debug (//"Selection: %s, %s\n", (string) val1, (string) val2); + */ + }); + } + + // user defined functions + public string selectedProjectId () { + Gtk.TreeIter iter; + Value val1; + + + this.el.get_active_iter (out iter); + _this.prmodel.el.get_value (iter, 0, out val1); + + + return (string) val1; + + + + + } + } + public class Xcls_prcellrenderer : Object + { + public Gtk.CellRendererText el; + private MergeBranch _this; + + + // my vars (def) + + // ctor + public Xcls_prcellrenderer(MergeBranch _owner ) + { + _this = _owner; + _this.prcellrenderer = this; + this.el = new Gtk.CellRendererText(); + + // my vars (dec) + + // set gobject values + } + + // user defined functions + } + + public class Xcls_prmodel : Object + { + public Gtk.ListStore el; + private MergeBranch _this; + + + // my vars (def) + + // ctor + public Xcls_prmodel(MergeBranch _owner ) + { + _this = _owner; + _this.prmodel = this; + this.el = new Gtk.ListStore( 2, typeof(string),typeof(string) ); + + // my vars (dec) + + // set gobject values + } + + // user defined functions + public void loadProjects (string id) { + + + + _this.projectsel.loading = true; + + this.el.clear(); + Gtk.TreeIter iter; + var el = this.el; + + el.append(out iter); + + + el.set_value(iter, 0, ""); + el.set_value(iter, 1, "-- select a project --"); + if (id == "") { + _this.projectsel.el.set_active_iter(iter); + } + + foreach(var project in RooProject.projects()) { + + el.append(out iter); + + el.set_value(iter, 0, project.id); + el.set_value(iter, 1, project.name ); + if (id == project.id) { + _this.projectsel.el.set_active_iter(iter); + } + + } + + _this.projectsel.loading = false; + //this.el.set_sort_column_id(0, Gtk.SortType.ASCENDING); + + } + } + + + public class Xcls_Label12 : Object + { + public Gtk.Label el; + private MergeBranch _this; + + + // my vars (def) + + // ctor + public Xcls_Label12(MergeBranch _owner ) { _this = _owner; this.el = new Gtk.Label( "Select Ticket" ); @@ -414,6 +627,8 @@ public class MergeBranch : Object // my vars (dec) // set gobject values + this.el.margin_right = 3; + this.el.halign = Gtk.Align.END; this.el.justify = Gtk.Justification.RIGHT; this.el.xalign = 0.900000f; this.el.visible = true; @@ -442,6 +657,7 @@ public class MergeBranch : Object this.loading = true; // set gobject values + this.el.hexpand = true; var child_0 = new Xcls_dbcellrenderer( _this ); child_0.ref(); this.el.pack_start ( child_0.el , true ); @@ -528,9 +744,9 @@ public class MergeBranch : Object } // user defined functions - public void loadTickets () { + public void loadTickets (string project_id) { - RooTicket.singleton().loadTickets("",RooTicket.Who.ME, RooTicket.Status.ACTIVE); + RooTicket.singleton().loadTickets(project_id,RooTicket.Who.ME, RooTicket.Status.ACTIVE); _this.ticketsel.loading = true; @@ -574,7 +790,98 @@ public class MergeBranch : Object } - public class Xcls_Label12 : Object + public class Xcls_Box16 : Object + { + public Gtk.Box el; + private MergeBranch _this; + + + // my vars (def) + + // ctor + public Xcls_Box16(MergeBranch _owner ) + { + _this = _owner; + this.el = new Gtk.Box( Gtk.Orientation.HORIZONTAL, 0 ); + + // my vars (dec) + + // set gobject values + var child_0 = new Xcls_btn_not_me( _this ); + child_0.ref(); + this.el.add ( child_0.el ); + var child_1 = new Xcls_btn_closed( _this ); + child_1.ref(); + this.el.add ( child_1.el ); + var child_2 = new Xcls_Label19( _this ); + child_2.ref(); + this.el.add ( child_2.el ); + } + + // user defined functions + } + public class Xcls_btn_not_me : Object + { + public Gtk.CheckButton el; + private MergeBranch _this; + + + // my vars (def) + + // ctor + public Xcls_btn_not_me(MergeBranch _owner ) + { + _this = _owner; + _this.btn_not_me = this; + this.el = new Gtk.CheckButton(); + + // my vars (dec) + + // set gobject values + this.el.label = "Show tickets not assigned to me"; + + //listeners + this.el.toggled.connect( () => { + var project_id = _this.projectsel.selectedProjectId(); + _this.dbmodel.loadTickets(project_id); + }); + } + + // user defined functions + } + + public class Xcls_btn_closed : Object + { + public Gtk.CheckButton el; + private MergeBranch _this; + + + // my vars (def) + + // ctor + public Xcls_btn_closed(MergeBranch _owner ) + { + _this = _owner; + _this.btn_closed = this; + this.el = new Gtk.CheckButton(); + + // my vars (dec) + + // set gobject values + this.el.label = "Show closed Tickets"; + + //listeners + this.el.toggled.connect( () => { + var project_id = _this.projectsel.selectedProjectId(); + _this.dbmodel.loadTickets(project_id); + + }); + } + + // user defined functions + } + + public class Xcls_Label19 : Object { public Gtk.Label el; private MergeBranch _this; @@ -583,7 +890,45 @@ public class MergeBranch : Object // my vars (def) // ctor - public Xcls_Label12(MergeBranch _owner ) + public Xcls_Label19(MergeBranch _owner ) + { + _this = _owner; + this.el = new Gtk.Label( "Refresh Ticket list" ); + + // my vars (dec) + + // set gobject values + this.el.halign = Gtk.Align.END; + this.el.hexpand = true; + this.el.use_markup = true; + + //listeners + this.el.activate_link.connect( (uri) => { + if (uri == "refresh") { + RooProject.reload(); + var curproj = RooProject.getProjectByRepo(_this.repo); + _this.prmodel.loadProjects(curproj == null ? "": curproj.id); + + _this.dbmodel.loadTickets(curproj == null ? "": curproj.id); + } + return true; + }); + } + + // user defined functions + } + + + public class Xcls_Label20 : Object + { + public Gtk.Label el; + private MergeBranch _this; + + + // my vars (def) + + // ctor + public Xcls_Label20(MergeBranch _owner ) { _this = _owner; this.el = new Gtk.Label( "Use this commit message" ); @@ -591,8 +936,8 @@ public class MergeBranch : Object // my vars (dec) // set gobject values - this.el.justify = Gtk.Justification.RIGHT; - this.el.xalign = 0.900000f; + this.el.margin_right = 3; + this.el.halign = Gtk.Align.END; } // user defined functions @@ -652,7 +997,7 @@ public class MergeBranch : Object } - public class Xcls_Notebook14 : Object + public class Xcls_Notebook22 : Object { public Gtk.Notebook el; private MergeBranch _this; @@ -661,7 +1006,7 @@ public class MergeBranch : Object // my vars (def) // ctor - public Xcls_Notebook14(MergeBranch _owner ) + public Xcls_Notebook22(MergeBranch _owner ) { _this = _owner; this.el = new Gtk.Notebook(); @@ -674,10 +1019,10 @@ public class MergeBranch : Object child_0.ref(); var child_1 = new Xcls_label_ticket( _this ); child_1.ref(); - var child_2 = new Xcls_Box17( _this ); + var child_2 = new Xcls_Box25( _this ); child_2.ref(); this.el.append_page ( child_2.el , _this.label_diff.el ); - var child_3 = new Xcls_Box20( _this ); + var child_3 = new Xcls_Box28( _this ); child_3.ref(); this.el.append_page ( child_3.el , _this.label_ticket.el ); } @@ -730,7 +1075,7 @@ public class MergeBranch : Object // user defined functions } - public class Xcls_Box17 : Object + public class Xcls_Box25 : Object { public Gtk.Box el; private MergeBranch _this; @@ -739,7 +1084,7 @@ public class MergeBranch : Object // my vars (def) // ctor - public Xcls_Box17(MergeBranch _owner ) + public Xcls_Box25(MergeBranch _owner ) { _this = _owner; this.el = new Gtk.Box( Gtk.Orientation.VERTICAL, 0 ); @@ -748,14 +1093,14 @@ public class MergeBranch : Object // set gobject values this.el.homogeneous = false; - var child_0 = new Xcls_ScrolledWindow18( _this ); + var child_0 = new Xcls_ScrolledWindow26( _this ); child_0.ref(); this.el.pack_start ( child_0.el , true,true,0 ); } // user defined functions } - public class Xcls_ScrolledWindow18 : Object + public class Xcls_ScrolledWindow26 : Object { public Gtk.ScrolledWindow el; private MergeBranch _this; @@ -764,7 +1109,7 @@ public class MergeBranch : Object // my vars (def) // ctor - public Xcls_ScrolledWindow18(MergeBranch _owner ) + public Xcls_ScrolledWindow26(MergeBranch _owner ) { _this = _owner; this.el = new Gtk.ScrolledWindow( null, null ); @@ -814,7 +1159,7 @@ public class MergeBranch : Object - public class Xcls_Box20 : Object + public class Xcls_Box28 : Object { public Gtk.Box el; private MergeBranch _this; @@ -823,7 +1168,7 @@ public class MergeBranch : Object // my vars (def) // ctor - public Xcls_Box20(MergeBranch _owner ) + public Xcls_Box28(MergeBranch _owner ) { _this = _owner; this.el = new Gtk.Box( Gtk.Orientation.VERTICAL, 0 ); @@ -944,7 +1289,7 @@ public class MergeBranch : Object } - public class Xcls_Button24 : Object + public class Xcls_Button32 : Object { public Gtk.Button el; private MergeBranch _this; @@ -953,7 +1298,7 @@ public class MergeBranch : Object // my vars (def) // ctor - public Xcls_Button24(MergeBranch _owner ) + public Xcls_Button32(MergeBranch _owner ) { _this = _owner; this.el = new Gtk.Button(); @@ -968,7 +1313,7 @@ public class MergeBranch : Object // user defined functions } - public class Xcls_Button25 : Object + public class Xcls_mergebtn : Object { public Gtk.Button el; private MergeBranch _this; @@ -977,9 +1322,10 @@ public class MergeBranch : Object // my vars (def) // ctor - public Xcls_Button25(MergeBranch _owner ) + public Xcls_mergebtn(MergeBranch _owner ) { _this = _owner; + _this.mergebtn = this; this.el = new Gtk.Button(); // my vars (dec) @@ -995,6 +1341,17 @@ public class MergeBranch : Object } // user defined functions + public void updateState () { + if (_this.actionsel.selectedAction() == "") { + // need to select an action.. + this.el.set_sensitive(false); + return; + + + } + this.el.set_sensitive(true); + return; + } } } diff --git a/NewBranch.bjs b/NewBranch.bjs index 02621d83..335d58a7 100644 --- a/NewBranch.bjs +++ b/NewBranch.bjs @@ -66,8 +66,8 @@ "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", + "id" : "projectsel", "* init" : "this.el.set_entry_text_column(1);", "* pack" : "attach_defaults,0,1,1,2", "xtype" : "ComboBox", @@ -76,8 +76,8 @@ "items" : [ { "id" : "prcellrenderer", - "xtype" : "CellRendererText", "* pack" : "pack_start,true", + "xtype" : "CellRendererText", "$ xns" : "Gtk" }, { @@ -106,14 +106,14 @@ "items" : [ { "id" : "dbcellrenderer", - "* pack" : "pack_start,true", "xtype" : "CellRendererText", + "* pack" : "pack_start,true", "$ xns" : "Gtk" }, { "id" : "dbmodel", - "* pack" : "set_model", "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] %s\".printf( ticket.id, ticket.project_id_name , 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, @@ -126,8 +126,8 @@ "clicked" : "() => {\n _this.el.response(-1);\n\tTicket.singleton().show(_this.repo);\n\n}" }, "bool expand" : false, - "xtype" : "Button", "* pack" : "attach_defaults,4,5,1,2", + "xtype" : "Button", "string label" : "New Ticket", "$ xns" : "Gtk" }, @@ -169,8 +169,8 @@ "toggled" : "() => {\n\tvar project_id = _this.projectsel.selectedProjectId();\n\t_this.dbmodel.loadTickets(project_id);\t\n}" }, "id" : "btn_not_me", - "string label" : "Show tickets not assigned to me", "* pack" : "add", + "string label" : "Show tickets not assigned to me", "xtype" : "CheckButton", "$ xns" : "Gtk" }, @@ -179,8 +179,8 @@ "toggled" : "() => {\n \tvar project_id = _this.projectsel.selectedProjectId();\n\t_this.dbmodel.loadTickets(project_id);\t\n\t \n}" }, "id" : "btn_closed", - "xtype" : "CheckButton", "string label" : "Show closed Tickets", + "xtype" : "CheckButton", "* pack" : "add", "$ xns" : "Gtk" }, @@ -211,8 +211,8 @@ "items" : [ { "id" : "view", - "xtype" : "WebView", "* pack" : "add", + "xtype" : "WebView", "$ xns" : "WebKit", "| void loadTicket" : "(string tid) {\n\tint h,w;\n\t_this.el.get_size(out w, out h);\n\t\n\tif (tid == \"\") {\n\t\t_this.scrolled_window.el.hide();\n\t\t_this.el.resize(w, 150);\n\t} else {\n\t\t_this.scrolled_window.el.show();\n\t\t_this.el.resize(w, 800);\n\t}\n\t\n\tvar rs = RooTicket.singleton();\t\t\n\tvar uri = new WebKit.URIRequest(\"https://roojs.com/admin.php/MTrack/View/\" + tid);\n\tvar hd = uri.get_http_headers();\n\tvar authCode = Base64.encode (\"%s:%s\".printf(rs.username, rs.password).data);\n\thd.append(\"Authorization\", \"Basic %s\".printf(authCode));\n\t\n\t this.el.load_request(uri);\n}\n" } diff --git a/RooTicket.vala b/RooTicket.vala index d32ad478..00bc43bf 100644 --- a/RooTicket.vala +++ b/RooTicket.vala @@ -69,6 +69,7 @@ public class RooTicket : Object public string id; // not really important that they are numbers.. public string summary; public string description; + public string project_id; public string project_id_name; @@ -114,6 +115,7 @@ public class RooTicket : Object add.id = t.get_string_member("id"); add.summary = t.get_string_member("summary"); add.description = t.get_string_member("description"); + add.project_id = t.get_string_member("project_id"); add.project_id_name = t.get_string_member("project_id_name"); this.tickets.add(add); GLib.debug("ADD ticket %s : %s : %s", add.id, add.summary, add.project_id_name); @@ -130,6 +132,7 @@ public class RooTicket : Object t.id = "-1"; t.summary = ""; t.description = ""; + t.project_id = ""; t.project_id_name = ""; RooTicket.singleton().tickets.add(t); return t; -- 2.39.2