{
"listeners" : {
"delete_event" : "(self, event) => {\n this.el.hide();\n return true; \n //test \n}\n ",
- "response" : "(self, response_id) => { \n \n this.el.hide();\n \n}"
+ "response" : " (self, response_id) => { \n \n\tGLib.debug(\"got %d\", (int) response_id);\n\tif (response_id == 0) {\n\t _this.el.hide();\t\n\t this.running = false; \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\n\t\tvar res = this.repo.setActiveTicket(\t\t\t\n\t\t\t RooTicket.singleton().getById(ticket_id != \"\" ? ticket_id : \"-1\"), bn\n\t\t );\n\t\t if (res) {\n\t\t \t// start the monitoring..\n\t\t \t GitMonitor.gitmonitor.start();\n\t\t \t \n\t\t }\n }\n \n\n this.running = false; \n\n\tthis.el.hide();\n\t \n\t \n\n\t \n}",
+ "show" : "(self) => {\n \n\n //test\n}"
},
- "default_width" : 800,
+ "default_width" : 500,
"$ deletable" : true,
- "| void show" : "() {\n\n \n this.el.set_deletable(false);\n this.el.set_gravity(Gdk.Gravity.NORTH);\n this.el.move(Gdk.Screen.width() / 2 ,0);\n this.el.show_all();\n _this.reposStore.load();\n // load clones..\n// this.get('/reposStore').load();\n \n //this.get('/ok_button').el.set_sensitive(false);\n \n // block until we return.\n// var run_ret = this.el.run();\n// if (run_ret < 1 ) {\n// return \"DONE\";\n// }\n// print(\"RUN RETURN : \" + run_ret);\n// return \"DONE\";\n //print(JSON.stringify(this.get('bug').getValue()));\n // return this.get('bug').getValue();\n //this.success = c.success;\n}\n",
- "title" : "Manage Clones",
+ "title" : "Create a working branch ",
"xtype" : "Dialog",
- "default_height" : 500,
- "$ modal" : true,
+ "# GitRepo? repo" : "null",
+ "| void show" : "( GitRepo repo, Gee.ArrayList<GitMonitorQueue> queue ) \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\tthis.queue = queue;\n\t\n\tthis.running = true;\n\tGitMonitor.gitmonitor.stop();\n\t\n this.repo = repo;\n \n\tthis.el.move((Gdk.Screen.width() / 2)- 250 ,0);\n \tGLib.debug(\"Loading tickets\"); \n\n\n this.el.show_all();\n this.el.set_keep_above(true);\n \t_this.dbmodel.loadTickets();\n \tthis.el.run();\n\n}",
+ "default_height" : 200,
"$ xns" : "Gtk",
- "border_width" : 3,
+ "# bool running" : false,
+ "# Gee.ArrayList<GitMonitorQueue> queue" : "null",
+ "bool modal" : true,
"items" : [
{
- "xtype" : "Box",
- "$ pack" : "get_content_area().add ",
+ "xtype" : "VBox",
+ "$ pack" : "get_content_area().add",
"$ xns" : "Gtk",
- "Gtk.Orientation orientation" : "Gtk.Orientation.VERTICAL",
"items" : [
{
+ "bool homogeneous" : false,
"* pack" : "pack_start,false,false,0",
- "xtype" : "Box",
+ "xtype" : "Table",
+ "uint column_spacing" : 2,
+ "n_columns" : 2,
"$ xns" : "Gtk",
- "Gtk.Orientation orientation" : "Gtk.Orientation.HORIZONTAL",
+ "n_rows" : 2,
+ "int margin" : 2,
"items" : [
{
- "listeners" : {
- "clicked" : "() => {\n/*\n var rv = this.get('/reposView');\n var rs = this.get('/reposStore');\n if (rv.el.get_selection().count_selected_rows() != 1) {\n //nothing?\n // error condition.\n return;\n }\n var Branches = imports.Branches.Branches;\n \n \n var ret = {}; \n var s = rv.el.get_selection();\n var path = '';\n s.selected_foreach(function(model,p,iter) {\n \n path = model.get_value(iter, 6).value.get_string();\n \n }); \n\n var repo = false;\n rs.repos.forEach(function(r) {\n if (r.repopath == path) {\n repo = r;\n \n }\n \n });\n Branches.repo = repo;\n Branches.el.set_transient_for(Clones.el);\n Clones.el.set_title(\"Manage Clones - \" + repo.repopath);\n Branches.show();\n Clones.el.set_title(\"Manage Clones\");\n\n \n \n \n \n\n \n */ \n \n}"
- },
- "label" : "Branches",
- "xtype" : "Button",
- "* pack" : "add",
+ "label" : "Select Ticket",
+ "$ visible" : true,
+ "xalign" : 0.90000000000000002,
+ "* pack" : "attach_defaults,0,1,0,1",
+ "xtype" : "Label",
+ "$ justify" : "Gtk.Justification.RIGHT",
+ "x_options" : 4,
"$ xns" : "Gtk"
},
{
"listeners" : {
- "clicked" : "() => {\n/*\n var rv = this.get('/reposView');\n var rs = this.get('/reposStore');\n if (rv.el.get_selection().count_selected_rows() != 1) {\n //nothing?\n // error condition.\n return;\n }\n var Merger = imports.Merger.Merger;\n \n \n var ret = {}; \n var s = rv.el.get_selection();\n var path = '';\n s.selected_foreach(function(model,p,iter) {\n \n path = model.get_value(iter, 6).value.get_string();\n \n }); \n\n var repo = false;\n rs.repos.forEach(function(r) {\n if (r.repopath == path) {\n repo = r;\n \n }\n \n });\n Merger.repo = repo;\n Merger.el.set_transient_for(Clones.el);\n Clones.el.set_title(\"Manage Clones - \" + repo.repopath);\n Merger.show();\n Clones.el.set_title(\"Manage Clones\");\n\n \n \n\n \n \n\n */ \n \n \n}"
+ "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\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}"
},
- "label" : "Merge",
- "xtype" : "Button",
- "* pack" : "add",
- "$ xns" : "Gtk"
+ "id" : "ticketsel",
+ "* init" : "this.el.add_attribute(_this.dbcellrenderer.el , \"markup\", 1 );",
+ "* pack" : "attach_defaults,1,2,0,1",
+ "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" : " () {\n\n RooTicket.singleton().loadTickets();\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 (data.get(i) == cur) {\n // _this.build_module.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 \n \n \n \n \n \n}"
- },
- "label" : "Switch Branch",
- "xtype" : "Button",
- "* pack" : "add",
+ "label" : "or use this as branch name",
+ "xalign" : 0.90000000000000002,
+ "* pack" : "attach_defaults,0,1,1,2",
+ "xtype" : "Label",
+ "$ justify" : "Gtk.Justification.RIGHT",
+ "x_options" : 4,
"$ xns" : "Gtk"
},
{
- "listeners" : {
- "clicked" : "() => {\n \n \n \n \n \n \n}"
- },
- "label" : "Pull",
- "xtype" : "Button",
- "* pack" : "add",
+ "id" : "name",
+ "$ visible" : true,
+ "xtype" : "Entry",
+ "* pack" : "attach_defaults,1,2,1,2",
"$ xns" : "Gtk"
}
]
]
},
{
- "label" : "Close",
- "id" : "ok_button",
- "bool expand" : false,
- "* pack" : "add_action_widget,1 ",
+ "label" : "Do not create Branch",
+ "xtype" : "Button",
+ "* pack" : "add_action_widget,0",
+ "Gtk.ReliefStyle relief" : "Gtk.ReliefStyle.NONE",
+ "$ xns" : "Gtk"
+ },
+ {
+ "label" : "Create Branch",
"xtype" : "Button",
+ "* pack" : "add_action_widget,1",
"$ xns" : "Gtk"
}
]
projects / gitlive / blobdiff