"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\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}",
"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",
"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",
+ "| 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);\nthis.el.get_child().set_sensitive(false);",
"bool hexpand" : true,
"* pack" : "attach_defaults,1,2,1,2",
"items" : [
{
"id" : "prcellrenderer",
- "* pack" : "pack_start,true",
"xtype" : "CellRendererText",
+ "* pack" : "pack_start,true",
"$ xns" : "Gtk"
},
{
"items" : [
{
"id" : "dbcellrenderer",
- "xtype" : "CellRendererText",
"* pack" : "pack_start,true",
+ "xtype" : "CellRendererText",
"$ xns" : "Gtk"
},
{
"id" : "dbmodel",
- "xtype" : "ListStore",
"* pack" : "set_model",
+ "xtype" : "ListStore",
"| void loadTickets" : "(string project_id ) {\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 \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 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 (_this.ticket != null && _this.ticket.id == ticket.id) {\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,
"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",
+ "* pack" : "add",
"xtype" : "CheckButton",
"$ xns" : "Gtk"
},
"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",
+ "string label" : "Show closed Tickets",
"* pack" : "add",
"$ xns" : "Gtk"
},
"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"
},
"items" : [
{
"int height_request" : 400,
- "* pack" : "pack_start,true,true,0",
"xtype" : "ScrolledWindow",
+ "* pack" : "pack_start,true,true,0",
"$ xns" : "Gtk",
"items" : [
{
"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"
}
},
{
"label" : "Cancel",
- "xtype" : "Button",
"* pack" : "add_action_widget,0",
+ "xtype" : "Button",
"Gtk.ReliefStyle relief" : "Gtk.ReliefStyle.NONE",
"$ xns" : "Gtk"
},
{
"label" : "Do Merge",
- "id" : "mergebtn",
"| 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",
{
"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\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\n\t \n\tif (response_id < 1) {\n\t _this.el.hide();\t\n\t this.running = false; \n\t \treturn;\n\t}\n\t\n\tswitch(response_id) {\n\t\tcase 1: \n\t\n\t\t\t\n\t\t\tvar ticket_id = _this.ticketsel.selectedTicketId();\n\t\t\t\n\t\t\tif (this.repo != null) {\n\t\t\t\tvar bn = _this.name.el.get_text();\n\n\t\t\t\tvar res = this.repo.setActiveTicket(\t\t\t\n\t\t\t\t\t RooTicket.singleton().getById(ticket_id != \"\" ? ticket_id : \"-1\"), bn\n\t\t\t\t );\n\t\t\t\t if (res) {\n\t\t\t\t \t// start the monitoring..\n\t\t\t\t \t GitMonitor.gitmonitor.start();\n\t\t\t\t \t \n\t\t\t\t }\n\t\t\t}\n \t\tbreak;\n \t\tcase 2: // create ticket + branch\n\t \t\tbreak;\n \t\t\n \t\tcase 3: // just commit...\n \t\t\n \t\t\tbreak;\n\t\tdefault:\n\t\t\tbreak;\n\t}\n this.running = false; \n\n\tthis.el.hide();\n\t \n\t \n\n\t \n}"
+ "response" : " (self, response_id) => { \n \n\tGLib.debug(\"got %d\", (int) response_id);\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\n\t \n\tif (response_id < 1) {\n\t _this.el.hide();\t \n\t this.running = false; \t \n\t GitMonitor.gitmonitor.start();\n\n\t \treturn;\n\t}\n\t\n\tswitch(response_id) {\n\t\tcase 1: \n\t\n\t\t\t\n\t\t\tvar ticket_id = _this.ticketsel.selectedTicketId();\n\t\t\t\n\t\t\tif (this.repo != null) {\n\t\t\t\t var bn = _this.name.el.get_text();\n\n\t\t\t\t var res = this.repo.setActiveTicket(\t\t\t\n\t\t\t\t\t RooTicket.singleton().getById(ticket_id != \"\" ? ticket_id : \"-1\"), bn\n\t\t\t\t );\n\t\t\t\t if (res) {\n\t\t\t\t \t// start the monitoring..\n\t\t\t\t \t GitMonitor.gitmonitor.start();\n\t\t\t\t \t \n\t\t\t\t }\n\t\t\t}\n \t\tbreak;\n \t\tcase 2: // create ticket + branch\n \t\t\n\t \t\tvar tid = RooTicket.singleton().createTicket(\n\t\t\n\t\t\t\t_this.project_id.selectedProjectId(),\n\t\t\t\n\t\t\t\t_this.milestone_id.selectedMilestoneId(),\n\t\t\t\t_this.priority_id.selectedPriorityId() ,\n\t\t\t\t_this.severity_id.selectedSeverityId() ,\t\t\n\t\t\t\t_this.classification_id.selectedClassificationId() ,\n\t\t\t\t_this.developer_id.selectedDeveloperId(),\n\t\t\t\t_this.summary.el.get_text() ,\n\t\t\t\t_this.description.el.buffer.text \n\t\t\t);\n\t\t\tvar ticket = RooTicket.singleton().getById(tid);\n\t\t\tvar name = RooTicket.singleton().usernameLocal();\n\t\t\t var bn = \"wip_%s_T%s_%s\".printf(name,ticket.id, ticket.summaryToBranchName());\n\n\n\t\t\t var res = this.repo.setActiveTicket( ticket, bn );\n\t\t\tif (res) {\n\t\t\t \t// start the monitoring..\n\t\t\t \t GitMonitor.gitmonitor.start(); \n\t\t\t }\n\t\t\t \n\t \t\t\n \t\t\n \t\t\n\t \t\tbreak;\n \t\t\n \t\tcase 3: // just commit...\n\t\t _this.repo.git({ \"commit\" , \"-a\" ,\"-m\", _this.commit_message.el.get_text() });\n\t\t _this.repo.push();\n\t\t _this.repo.loadBranches();\n\t\t _this.repo.loadStatus();\n\t\t \t GitMonitor.gitmonitor.start(); \n \t\t\tbreak;\n\t\tdefault:\n\t\t\tbreak;\n\t}\n this.running = false; \n\n\tthis.el.hide();\n\t \n\t \n\n\t \n}"
},
"default_width" : 500,
"$ deletable" : true,
"title" : "Create a working branch ",
"xtype" : "Dialog",
"# GitRepo? repo" : "null",
- "| void show" : "( GitRepo repo, Gee.ArrayList<GitMonitorQueue> queue, string tid = \"\" ) \n{\n // this.el.set_gravity(Gdk.Gravity.NORTH);\n if (this.running) { // should not happen!!\n \tGLib.error(\"new branch show called, when already being displayed?\");\n\t}\n\t\n\t\n\tthis.queue = queue;\n\tthis.running = true;\n\tGitMonitor.gitmonitor.stop();\n\t\n\t\n this.repo = repo;\n\tthis.el.move((Gdk.Screen.width() / 2)- 250 ,0);\n\tthis.el.set_default_size( 500,200); // not sure why it grows..\n\t\n\t\n\t\n\t\n \n\n this.el.show_all();\n this.el.set_keep_above(true);\n\t\n\t_this.notebook.el.set_current_page(0);\n\t\n\t_this.select_ticket_tab.load_data(tid);\n\t//_this.create_ticket_tab.load_data();\n\t//_this.quick_commit_tab.load_data();\n _this.commit_message.el.set_text(\"\");\n \n \n \n \n \n \n \tthis.el.run();\n\n}",
+ "| void show" : "( GitRepo repo, Gee.ArrayList<GitMonitorQueue> queue, string tid = \"\" ) \n{\n // this.el.set_gravity(Gdk.Gravity.NORTH);\n if (this.running) { // should not happen!!\n \tGLib.error(\"new branch show called, when already being displayed?\");\n\t}\n\t\n\t\n\tthis.queue = queue;\n\tthis.running = true;\n\tGitMonitor.gitmonitor.stop();\n\t\n\t\n this.repo = repo;\n\n\t\n\t\n\t\n \n\n this.el.show_all();\n _this.table.el.hide(); // hide ticket layout\n\t_this.diff_sv.el.hide();\n\t_this.el.resize( 500,100); \n \n this.el.set_keep_above(true);\n\t\n\t_this.notebook.el.set_current_page(0);\n\t\n\t_this.select_ticket_tab.load_data(tid);\n\t_this.create_ticket_tab.load_data();\n\t//_this.quick_commit_tab.load_data();\n _this.commit_message.el.set_text(\"\");\n _this.diff_view.el.get_buffer().set_text( this.repo.diffWorking() );\t\n \n \n\tthis.el.move((Gdk.Screen.width() / 2)- 250 ,0);\n\tthis.el.resize( 500,100); // not sure why it grows..\n\t \n \n \n \tthis.el.run();\n\n}",
"default_height" : 500,
"$ xns" : "Gtk",
"# bool running" : false,
"items" : [
{
"listeners" : {
- "switch_page" : "(page, page_num) => {\n\tGLib.debug(\"Switch to page: %d\", (int)page_num);\n\tswitch(page_num) {\n\t\tcase 0: \n\t\t\tbreak; // do nothing.. it's already loaded at start.\n\t\tcase 1: \n\t\t\t_this.create_ticket_tab.load_data();\n\t\t\tbreak;\n\t\tcase 2:\n\t\t\t_this.quick_commit_tab.load_data();\n\t\t\tbreak;\n\t\tdefault:\n\t\t\tbreak;\n\t}\n}\n"
+ "switch_page" : "(page, page_num) => {\n\tGLib.debug(\"Switch to page: %d\", (int)page_num);\n\tswitch(page_num) {\n\t\tcase 0: \n\t\t\t_this.table.el.hide(); // hide ticket layout\n\t\t\t_this.diff_sv.el.hide();\n\t\t\t_this.el.resize( 500,100); \n\t\t\tbreak; // do nothing.. it's already loaded at start.\n\t\tcase 1: \n\t\t\t_this.diff_sv.el.hide();\n\t\t\t_this.table.el.show(); \n\t\t\t_this.el.resize( 500,100); \n\t\t//\t_this.create_ticket_tab.load_data();\n\t\t\tbreak;\n\t\tcase 2:\n\t\t\t_this.quick_commit_tab.load_data();\n\t\t\t_this.diff_sv.el.show();\n\t\t\t_this.el.resize( 500,100); \n\t\t\tbreak;\n\t\tdefault:\n\t\t\tbreak;\n\t}\n}\n"
},
"id" : "notebook",
"* pack" : "get_content_area().add",
"bool homogeneous" : false,
"* pack" : "append_page,_this.label_select_ticket.el",
"xtype" : "Box",
- "| void load_data" : "(string tid = \"\") {\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",
+ "| void load_data" : "(string tid = \"\") {\n\n \n\t _this.branch_table.el.hide();\n\t _this.scrolled_window.el.hide();\n\t_this.branch_spinner.el.show();\n\t_this.branch_spinner.el.start();\t\n\t_this.el.resize( 500,100); \t\n Timeout.add(200, () => {\n\t\n\n\t\tGLib.debug(\"Loading tickets\"); \n\t\t\n\t\tvar curproj = RooProject.getProjectByRepo(_this.repo);\n\t\t _this.prmodel.loadProjects(curproj == null ? \"\" : curproj.id);\n\t\t\n\t \t_this.dbmodel.loadTickets(curproj == null ? \"\": curproj.id, tid);\n\t \t_this.branchbtn.updateState();\n\t \t\n\t\t_this.ticketsel.el.get_child().get_style_context().remove_class(\"warning\");\n\t \tif (tid != \"\") { \n\t\t \tvar name = RooTicket.singleton().usernameLocal();\n\t \t\tvar ticket = RooTicket.singleton().getById(tid);\n\t\t\t_this.name.el.set_text(\"wip_%s_T%s_%s\".printf(name,ticket.id, ticket.summaryToBranchName()));\n\t\t} else {\n\t\t\t_this.ticketsel.el.get_child().get_style_context().add_class(\"warning\");\n\t\t}\n\t\t_this.view.loadTicket(tid);\n\t \t _this.branch_table.el.show();\n\t\t_this.branch_spinner.el.stop();\n\t\t_this.branch_spinner.el.hide();\t\n\t\t_this.el.resize( 500,100); \n\t\treturn false;\n\t});\n\t\n}\n",
"$ xns" : "Gtk",
"Gtk.Orientation orientation" : "Gtk.Orientation.VERTICAL",
"items" : [
{
+ "id" : "branch_table",
"bool homogeneous" : true,
"bool expand" : false,
"xtype" : "Table",
"xtype" : "ScrolledWindow",
"$ xns" : "Gtk",
"bool vexpand" : true,
+ "bool visible" : false,
"items" : [
{
"id" : "view",
"| 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"
}
]
+ },
+ {
+ "id" : "branch_spinner",
+ "bool hexpand" : true,
+ "* pack" : "add",
+ "xtype" : "Spinner",
+ "$ xns" : "Gtk",
+ "bool vexpand" : true
}
]
},
"bool homogeneous" : false,
"xtype" : "Box",
"* pack" : "append_page,_this.label_create_ticket.el",
- "| void load_data" : "() {\n \n \t _this.table.el.hide();\n\t_this.spinner.el.show();\n\t_this.spinner.el.start();\t\n\t\n Timeout.add_seconds(1, () => {\n\t\t \n\t\tRooProject? curproj = null;\n\t\tif (_this.repo != null) {\n\t\t\tcurproj = RooProject.getProjectByRepo(_this.repo);\n\t\t}\n\t\t_this.tprmodel.loadProjects(curproj == null ? \"\" : curproj.id);\n\t\tif (curproj != null) {\n\t \n\t\t\t\n\t\t\tvar rt = RooTicket.singleton();\n\t\t\trt.loadProjectOptions(curproj.id);\n\t\t\t\n\t\t\t_this.msmodel.loadMilestones();\n\t\t\t_this.primodel.loadPriorities();\n\t\t\t_this.sevmodel.loadSeverities();\n\t\t\t_this.clmodel.loadClassifications();\t\n\t\t\t_this.devmodel.loadDevelopers();\t\n\t\t\t\n\t\t}\n\t\t_this.summary.el.set_text(\"\");\n\t\t_this.description.el.buffer.text = \"\"; \n\t\t_this.spinner.el.stop();\n\t\t_this.spinner.el.hide();\t\n\n\t\t_this.table.el.show();\n\t //_this.summary.el.grab_focus();\n \n\t \treturn false;\n \t});\n}\n",
+ "| void load_data" : "() {\n \n \t// _this.table.el.hide();\n\t//_this.spinner.el.show();\n\t//_this.spinner.el.start();\t\n\t\n Timeout.add_seconds(1, () => {\n\t\t \n\t\tRooProject? curproj = null;\n\t\tif (_this.repo != null) {\n\t\t\tcurproj = RooProject.getProjectByRepo(_this.repo);\n\t\t}\n\t\t_this.tprmodel.loadProjects(curproj == null ? \"\" : curproj.id);\n\t\tif (curproj != null) {\n\t \n\t\t\t\n\t\t\tvar rt = RooTicket.singleton();\n\t\t\trt.loadProjectOptions(curproj.id);\n\t\t\t\n\t\t\t_this.msmodel.loadMilestones();\n\t\t\t_this.primodel.loadPriorities();\n\t\t\t_this.sevmodel.loadSeverities();\n\t\t\t_this.clmodel.loadClassifications();\t\n\t\t\t_this.devmodel.loadDevelopers();\t\n\t\t\t\n\t\t}\n\t\t_this.summary.el.set_text(\"\");\n\t\t_this.description.el.buffer.text = \"\"; \n\t\t//_this.spinner.el.stop();\n//\t\t_this.spinner.el.hide();\t\n\n\t\t//_this.table.el.show();\n\t //_this.summary.el.grab_focus();\n \n\t \treturn false;\n \t});\n}\n",
"$ xns" : "Gtk",
"Gtk.Orientation orientation" : "Gtk.Orientation.VERTICAL",
"items" : [
},
{
"listeners" : {
- "clicked" : "() => {\n\tGLib.debug(\"fire response = 1\");\n\t\n\t\n\tvar invalid = false;\n\t\n\t// validate first...\n\t_this.project_id.el.get_child().get_style_context().remove_class(\"warning\");\t\n\tif (_this.project_id.selectedProjectId() == \"\") {\n\t\t_this.project_id.el.get_child().get_style_context().add_class(\"warning\");\n\t\tinvalid = true;\n\t}\n\t\n\t_this.milestone_id.el.get_child().get_style_context().remove_class(\"warning\");\t\n\n\t_this.priority_id.el.get_child().get_style_context().remove_class(\"warning\");\t\n\tif (_this.priority_id.selectedPriorityId() == \"\") {\n\t\t_this.priority_id.el.get_child().get_style_context().add_class(\"warning\");\n\t\tinvalid = true;\n\t}\n\t\n\t_this.classification_id.el.get_child().get_style_context().remove_class(\"warning\");\t\n\tif (_this.classification_id.selectedClassificationId() == \"\") {\n\t\t_this.classification_id.el.get_child().get_style_context().add_class(\"warning\");\n\t\tinvalid = true;\n\t}\n\t\n\t_this.developer_id.el.get_child().get_style_context().remove_class(\"warning\");\t\n\tif (_this.developer_id.selectedDeveloperId() == \"\") {\n\t\t_this.developer_id.el.get_child().get_style_context().add_class(\"warning\");\n\t\tinvalid = true;\n\t}\n\t\n\t_this.summary.el.get_style_context().remove_class(\"warning\");\t\n\tif (_this.summary.el.get_text() == \"\") {\n\t\t_this.summary.el.get_style_context().add_class(\"warning\");\n\t\tinvalid = true;\n\t}\n\t\n\t_this.description.el.get_style_context().remove_class(\"warning\");\t\n \n\tif (invalid) {\n\t\treturn;\n\t}\n\tGLib.debug(\"for is valid\");\n\t\n\t_this.el.response(1);\n}"
+ "clicked" : "() => {\n\tGLib.debug(\"fire response = 1\");\n\t\n\t\n\tvar invalid = false;\n\t\n\t// validate first...\n\t_this.project_id.el.get_child().get_style_context().remove_class(\"warning\");\t\n\tif (_this.project_id.selectedProjectId() == \"\") {\n\t\t_this.project_id.el.get_child().get_style_context().add_class(\"warning\");\n\t\tinvalid = true;\n\t}\n\t\n\t_this.milestone_id.el.get_child().get_style_context().remove_class(\"warning\");\t\n\n\t_this.priority_id.el.get_child().get_style_context().remove_class(\"warning\");\t\n\tif (_this.priority_id.selectedPriorityId() == \"\") {\n\t\t_this.priority_id.el.get_child().get_style_context().add_class(\"warning\");\n\t\tinvalid = true;\n\t}\n\t\n\t_this.classification_id.el.get_child().get_style_context().remove_class(\"warning\");\t\n\tif (_this.classification_id.selectedClassificationId() == \"\") {\n\t\t_this.classification_id.el.get_child().get_style_context().add_class(\"warning\");\n\t\tinvalid = true;\n\t}\n\t\n\t_this.developer_id.el.get_child().get_style_context().remove_class(\"warning\");\t\n\tif (_this.developer_id.selectedDeveloperId() == \"\") {\n\t\t_this.developer_id.el.get_child().get_style_context().add_class(\"warning\");\n\t\tinvalid = true;\n\t}\n\t\n\t_this.summary.el.get_style_context().remove_class(\"warning\");\t\n\tif (_this.summary.el.get_text() == \"\") {\n\t\t_this.summary.el.get_style_context().add_class(\"warning\");\n\t\tinvalid = true;\n\t}\n\t\n\t_this.description.el.get_style_context().remove_class(\"warning\");\t\n \n\tif (invalid) {\n\t\treturn;\n\t}\n\tGLib.debug(\"for is valid\");\n\t\n\t_this.el.response(2);\n}"
},
"label" : "Create Ticket & Branch",
"* init" : "{\n this.el.get_style_context().add_class(\"suggested-action\");\n}\n",
"$ xns" : "Gtk"
}
]
- },
- {
- "id" : "spinner",
- "bool hexpand" : true,
- "* pack" : "add",
- "xtype" : "Spinner",
- "$ xns" : "Gtk",
- "bool vexpand" : true
}
]
},
},
{
"int height_request" : 400,
+ "id" : "diff_sv",
"* pack" : "add",
"xtype" : "ScrolledWindow",
"$ xns" : "Gtk",
"bool vexpand" : true,
+ "bool visible" : false,
"items" : [
{
"id" : "diff_view",
public Xcls_label_create_ticket label_create_ticket;
public Xcls_label_quick_commit label_quick_commit;
public Xcls_select_ticket_tab select_ticket_tab;
+ public Xcls_branch_table branch_table;
public Xcls_projectsel projectsel;
public Xcls_prcellrenderer prcellrenderer;
public Xcls_prmodel prmodel;
public Xcls_btn_closed btn_closed;
public Xcls_scrolled_window scrolled_window;
public Xcls_view view;
+ public Xcls_branch_spinner branch_spinner;
public Xcls_create_ticket_tab create_ticket_tab;
public Xcls_table table;
public Xcls_project_id project_id;
public Xcls_clmodel clmodel;
public Xcls_developer_id developer_id;
public Xcls_devmodel devmodel;
- public Xcls_spinner spinner;
public Xcls_quick_commit_tab quick_commit_tab;
public Xcls_commit_message commit_message;
public Xcls_createbtn createbtn;
+ public Xcls_diff_sv diff_sv;
public Xcls_diff_view diff_view;
// my vars (def)
if (response_id < 1) {
- _this.el.hide();
- this.running = false;
+ _this.el.hide();
+ this.running = false;
+ GitMonitor.gitmonitor.start();
+
return;
}
var ticket_id = _this.ticketsel.selectedTicketId();
if (this.repo != null) {
- var bn = _this.name.el.get_text();
+ var bn = _this.name.el.get_text();
- var res = this.repo.setActiveTicket(
+ var res = this.repo.setActiveTicket(
RooTicket.singleton().getById(ticket_id != "" ? ticket_id : "-1"), bn
);
if (res) {
}
break;
case 2: // create ticket + branch
+
+ var tid = RooTicket.singleton().createTicket(
+
+ _this.project_id.selectedProjectId(),
+
+ _this.milestone_id.selectedMilestoneId(),
+ _this.priority_id.selectedPriorityId() ,
+ _this.severity_id.selectedSeverityId() ,
+ _this.classification_id.selectedClassificationId() ,
+ _this.developer_id.selectedDeveloperId(),
+ _this.summary.el.get_text() ,
+ _this.description.el.buffer.text
+ );
+ var ticket = RooTicket.singleton().getById(tid);
+ var name = RooTicket.singleton().usernameLocal();
+ var bn = "wip_%s_T%s_%s".printf(name,ticket.id, ticket.summaryToBranchName());
+
+
+ var res = this.repo.setActiveTicket( ticket, bn );
+ if (res) {
+ // start the monitoring..
+ GitMonitor.gitmonitor.start();
+ }
+
+
+
+
break;
case 3: // just commit...
-
+ _this.repo.git({ "commit" , "-a" ,"-m", _this.commit_message.el.get_text() });
+ _this.repo.push();
+ _this.repo.loadBranches();
+ _this.repo.loadStatus();
+ GitMonitor.gitmonitor.start();
break;
default:
break;
this.repo = repo;
- this.el.move((Gdk.Screen.width() / 2)- 250 ,0);
- this.el.set_default_size( 500,200); // not sure why it grows..
-
+
this.el.show_all();
+ _this.table.el.hide(); // hide ticket layout
+ _this.diff_sv.el.hide();
+ _this.el.resize( 500,100);
+
this.el.set_keep_above(true);
_this.notebook.el.set_current_page(0);
_this.select_ticket_tab.load_data(tid);
- //_this.create_ticket_tab.load_data();
+ _this.create_ticket_tab.load_data();
//_this.quick_commit_tab.load_data();
_this.commit_message.el.set_text("");
+ _this.diff_view.el.get_buffer().set_text( this.repo.diffWorking() );
-
-
-
-
+
+ this.el.move((Gdk.Screen.width() / 2)- 250 ,0);
+ this.el.resize( 500,100); // not sure why it grows..
+
+
this.el.run();
GLib.debug("Switch to page: %d", (int)page_num);
switch(page_num) {
case 0:
+ _this.table.el.hide(); // hide ticket layout
+ _this.diff_sv.el.hide();
+ _this.el.resize( 500,100);
break; // do nothing.. it's already loaded at start.
case 1:
- _this.create_ticket_tab.load_data();
+ _this.diff_sv.el.hide();
+ _this.table.el.show();
+ _this.el.resize( 500,100);
+ // _this.create_ticket_tab.load_data();
break;
case 2:
_this.quick_commit_tab.load_data();
+ _this.diff_sv.el.show();
+ _this.el.resize( 500,100);
break;
default:
break;
// set gobject values
this.el.homogeneous = false;
- var child_0 = new Xcls_Table7( _this );
+ var child_0 = new Xcls_branch_table( _this );
child_0.ref();
this.el.pack_start ( child_0.el , false,false,0 );
var child_1 = new Xcls_scrolled_window( _this );
child_1.ref();
this.el.add ( child_1.el );
+ var child_2 = new Xcls_branch_spinner( _this );
+ child_2.ref();
+ this.el.add ( child_2.el );
}
// user defined functions
public void load_data (string tid = "") {
- GLib.debug("Loading tickets");
-
- var curproj = RooProject.getProjectByRepo(_this.repo);
- _this.prmodel.loadProjects(curproj == null ? "" : curproj.id);
-
- _this.dbmodel.loadTickets(curproj == null ? "": curproj.id, tid);
- _this.branchbtn.updateState();
-
- _this.ticketsel.el.get_child().get_style_context().remove_class("warning");
- if (tid != "") {
- var name = RooTicket.singleton().usernameLocal();
- var ticket = RooTicket.singleton().getById(tid);
- _this.name.el.set_text("wip_%s_T%s_%s".printf(name,ticket.id, ticket.summaryToBranchName()));
- } else {
- _this.ticketsel.el.get_child().get_style_context().add_class("warning");
- }
- _this.view.loadTicket(tid);
-
+ _this.branch_table.el.hide();
+ _this.scrolled_window.el.hide();
+ _this.branch_spinner.el.show();
+ _this.branch_spinner.el.start();
+ _this.el.resize( 500,100);
+ Timeout.add(200, () => {
+
+
+ GLib.debug("Loading tickets");
+
+ var curproj = RooProject.getProjectByRepo(_this.repo);
+ _this.prmodel.loadProjects(curproj == null ? "" : curproj.id);
+
+ _this.dbmodel.loadTickets(curproj == null ? "": curproj.id, tid);
+ _this.branchbtn.updateState();
+
+ _this.ticketsel.el.get_child().get_style_context().remove_class("warning");
+ if (tid != "") {
+ var name = RooTicket.singleton().usernameLocal();
+ var ticket = RooTicket.singleton().getById(tid);
+ _this.name.el.set_text("wip_%s_T%s_%s".printf(name,ticket.id, ticket.summaryToBranchName()));
+ } else {
+ _this.ticketsel.el.get_child().get_style_context().add_class("warning");
+ }
+ _this.view.loadTicket(tid);
+ _this.branch_table.el.show();
+ _this.branch_spinner.el.stop();
+ _this.branch_spinner.el.hide();
+ _this.el.resize( 500,100);
+ return false;
+ });
+
}
}
- public class Xcls_Table7 : Object
+ public class Xcls_branch_table : Object
{
public Gtk.Table el;
private NewBranch _this;
// my vars (def)
// ctor
- public Xcls_Table7(NewBranch _owner )
+ public Xcls_branch_table(NewBranch _owner )
{
_this = _owner;
+ _this.branch_table = this;
this.el = new Gtk.Table( 5, 5, true );
// my vars (dec)
// set gobject values
this.el.height_request = 500;
this.el.vexpand = true;
+ this.el.visible = false;
var child_0 = new Xcls_view( _this );
child_0.ref();
this.el.add ( child_0.el );
}
+ public class Xcls_branch_spinner : Object
+ {
+ public Gtk.Spinner el;
+ private NewBranch _this;
+
+
+ // my vars (def)
+
+ // ctor
+ public Xcls_branch_spinner(NewBranch _owner )
+ {
+ _this = _owner;
+ _this.branch_spinner = this;
+ this.el = new Gtk.Spinner();
+
+ // my vars (dec)
+
+ // set gobject values
+ this.el.hexpand = true;
+ this.el.vexpand = true;
+ }
+
+ // user defined functions
+ }
+
public class Xcls_create_ticket_tab : 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_spinner( _this );
- child_1.ref();
- this.el.add ( child_1.el );
}
// user defined functions
public void load_data () {
- _this.table.el.hide();
- _this.spinner.el.show();
- _this.spinner.el.start();
+ // _this.table.el.hide();
+ //_this.spinner.el.show();
+ //_this.spinner.el.start();
Timeout.add_seconds(1, () => {
}
_this.summary.el.set_text("");
_this.description.el.buffer.text = "";
- _this.spinner.el.stop();
- _this.spinner.el.hide();
+ //_this.spinner.el.stop();
+ // _this.spinner.el.hide();
- _this.table.el.show();
+ //_this.table.el.show();
//_this.summary.el.grab_focus();
return false;
this.el.margin = 2;
this.el.column_spacing = 4;
this.el.vexpand = false;
- var child_0 = new Xcls_Label27( _this );
+ var child_0 = new Xcls_Label28( _this );
child_0.ref();
this.el.attach_defaults ( child_0.el , 0,1,0,1 );
- var child_1 = new Xcls_Label28( _this );
+ var child_1 = new Xcls_Label29( _this );
child_1.ref();
this.el.attach_defaults ( child_1.el , 1,2,0,1 );
var child_2 = new Xcls_project_id( _this );
var child_3 = new Xcls_summary( _this );
child_3.ref();
this.el.attach_defaults ( child_3.el , 1,4,1,2 );
- var child_4 = new Xcls_Label33( _this );
+ var child_4 = new Xcls_Label34( _this );
child_4.ref();
this.el.attach_defaults ( child_4.el , 0,1,2,3 );
var child_5 = new Xcls_milestone_id( _this );
child_5.ref();
this.el.attach_defaults ( child_5.el , 0,1,3,4 );
- var child_6 = new Xcls_Label36( _this );
+ var child_6 = new Xcls_Label37( _this );
child_6.ref();
this.el.attach_defaults ( child_6.el , 1,4,2,3 );
var child_7 = new Xcls_description( _this );
child_7.ref();
this.el.attach_defaults ( child_7.el , 1,4,3,12 );
- var child_8 = new Xcls_Label38( _this );
+ var child_8 = new Xcls_Label39( _this );
child_8.ref();
this.el.attach_defaults ( child_8.el , 0,1,4,5 );
var child_9 = new Xcls_priority_id( _this );
child_9.ref();
this.el.attach_defaults ( child_9.el , 0,1,5,6 );
- var child_10 = new Xcls_Label41( _this );
+ var child_10 = new Xcls_Label42( _this );
child_10.ref();
this.el.attach_defaults ( child_10.el , 0,1,6,7 );
var child_11 = new Xcls_severity_id( _this );
child_11.ref();
this.el.attach_defaults ( child_11.el , 0,1,7,8 );
- var child_12 = new Xcls_Label44( _this );
+ var child_12 = new Xcls_Label45( _this );
child_12.ref();
this.el.attach_defaults ( child_12.el , 0,1,8,9 );
var child_13 = new Xcls_classification_id( _this );
child_13.ref();
this.el.attach_defaults ( child_13.el , 0,1,9,10 );
- var child_14 = new Xcls_Label47( _this );
+ var child_14 = new Xcls_Label48( _this );
child_14.ref();
this.el.attach_defaults ( child_14.el , 0,1,10,11 );
var child_15 = new Xcls_developer_id( _this );
child_15.ref();
this.el.attach_defaults ( child_15.el , 0,1,11,12 );
- var child_16 = new Xcls_Button50( _this );
+ var child_16 = new Xcls_Button51( _this );
child_16.ref();
this.el.attach_defaults ( child_16.el , 0,4,13,14 );
}
// user defined functions
}
- public class Xcls_Label27 : Object
+ public class Xcls_Label28 : Object
{
public Gtk.Label el;
private NewBranch _this;
// my vars (def)
// ctor
- public Xcls_Label27(NewBranch _owner )
+ public Xcls_Label28(NewBranch _owner )
{
_this = _owner;
this.el = new Gtk.Label( "Project" );
// user defined functions
}
- public class Xcls_Label28 : Object
+ public class Xcls_Label29 : Object
{
public Gtk.Label el;
private NewBranch _this;
// my vars (def)
// ctor
- public Xcls_Label28(NewBranch _owner )
+ public Xcls_Label29(NewBranch _owner )
{
_this = _owner;
this.el = new Gtk.Label( "Summary" );
// user defined functions
}
- public class Xcls_Label33 : Object
+ public class Xcls_Label34 : Object
{
public Gtk.Label el;
private NewBranch _this;
// my vars (def)
// ctor
- public Xcls_Label33(NewBranch _owner )
+ public Xcls_Label34(NewBranch _owner )
{
_this = _owner;
this.el = new Gtk.Label( "Milestone" );
}
- public class Xcls_Label36 : Object
+ public class Xcls_Label37 : Object
{
public Gtk.Label el;
private NewBranch _this;
// my vars (def)
// ctor
- public Xcls_Label36(NewBranch _owner )
+ public Xcls_Label37(NewBranch _owner )
{
_this = _owner;
this.el = new Gtk.Label( "Description" );
// user defined functions
}
- public class Xcls_Label38 : Object
+ public class Xcls_Label39 : Object
{
public Gtk.Label el;
private NewBranch _this;
// my vars (def)
// ctor
- public Xcls_Label38(NewBranch _owner )
+ public Xcls_Label39(NewBranch _owner )
{
_this = _owner;
this.el = new Gtk.Label( "Priority" );
}
- public class Xcls_Label41 : Object
+ public class Xcls_Label42 : Object
{
public Gtk.Label el;
private NewBranch _this;
// my vars (def)
// ctor
- public Xcls_Label41(NewBranch _owner )
+ public Xcls_Label42(NewBranch _owner )
{
_this = _owner;
this.el = new Gtk.Label( "Severity" );
}
- public class Xcls_Label44 : Object
+ public class Xcls_Label45 : Object
{
public Gtk.Label el;
private NewBranch _this;
// my vars (def)
// ctor
- public Xcls_Label44(NewBranch _owner )
+ public Xcls_Label45(NewBranch _owner )
{
_this = _owner;
this.el = new Gtk.Label( "Classification" );
}
- public class Xcls_Label47 : Object
+ public class Xcls_Label48 : Object
{
public Gtk.Label el;
private NewBranch _this;
// my vars (def)
// ctor
- public Xcls_Label47(NewBranch _owner )
+ public Xcls_Label48(NewBranch _owner )
{
_this = _owner;
this.el = new Gtk.Label( "Assign to" );
}
- public class Xcls_Button50 : Object
+ public class Xcls_Button51 : Object
{
public Gtk.Button el;
private NewBranch _this;
// my vars (def)
// ctor
- public Xcls_Button50(NewBranch _owner )
+ public Xcls_Button51(NewBranch _owner )
{
_this = _owner;
this.el = new Gtk.Button();
}
GLib.debug("for is valid");
- _this.el.response(1);
+ _this.el.response(2);
});
}
}
- public class Xcls_spinner : Object
- {
- public Gtk.Spinner el;
- private NewBranch _this;
-
-
- // my vars (def)
-
- // ctor
- public Xcls_spinner(NewBranch _owner )
- {
- _this = _owner;
- _this.spinner = this;
- this.el = new Gtk.Spinner();
-
- // my vars (dec)
-
- // set gobject values
- this.el.hexpand = true;
- this.el.vexpand = true;
- }
-
- // user defined functions
- }
-
public class Xcls_quick_commit_tab : Object
{
var child_0 = new Xcls_Table53( _this );
child_0.ref();
this.el.pack_start ( child_0.el , false,false,0 );
- var child_1 = new Xcls_ScrolledWindow57( _this );
+ var child_1 = new Xcls_diff_sv( _this );
child_1.ref();
this.el.add ( child_1.el );
}
}
- public class Xcls_ScrolledWindow57 : Object
+ public class Xcls_diff_sv : Object
{
public Gtk.ScrolledWindow el;
private NewBranch _this;
// my vars (def)
// ctor
- public Xcls_ScrolledWindow57(NewBranch _owner )
+ public Xcls_diff_sv(NewBranch _owner )
{
_this = _owner;
+ _this.diff_sv = this;
this.el = new Gtk.ScrolledWindow( null, null );
// my vars (dec)
// set gobject values
this.el.height_request = 400;
this.el.vexpand = true;
+ this.el.visible = false;
var child_0 = new Xcls_diff_view( _this );
child_0.ref();
this.el.add ( child_0.el );