From: Alan Knowles Date: Mon, 5 Nov 2018 06:37:24 +0000 (+0800) Subject: sync X-Git-Url: http://git.roojs.org/?p=gitlive;a=commitdiff_plain;h=e09ce2ec32171c4bd184f624e8d75040910b4089 sync --- diff --git a/MergeBranch.bjs b/MergeBranch.bjs new file mode 100644 index 00000000..f57dd66d --- /dev/null +++ b/MergeBranch.bjs @@ -0,0 +1,157 @@ +{ + "name" : "MergeBranch", + "parent" : "", + "title" : "", + "path" : "/home/alan/gitlive/gitlive/MergeBranch.bjs", + "permname" : "", + "modOrder" : "", + "build_module" : "gitlive", + "items" : [ + { + "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 == 0) {\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\tGitRepo.doMerges(\n\t\t_this.actionsel.selectedAction(), \n\t\t_this.ticketsel.selectedTicketId(),\n\t\t_this.name.el.get_text()\n\t);\n\t\n\tthis.running = false; \n\n\t \n\t_this.el.hide();\t\n \tGitMonitor.gitmonitor.start();\n\n\t \n}", + "show" : "(self) => {\n \n\n //test\n}" + }, + "default_width" : 500, + "$ deletable" : true, + "title" : "Merge Branch", + "xtype" : "Dialog", + "| void show" : "( RooTicket ticket ) \n{\n // this.el.set_gravity(Gdk.Gravity.NORTH);\n if (this.running) {\n \treturn;\n\t}\n\tGitMonitor.gitmonitor.stop();\n\t\n this.ticket = ticket;\n \n\tthis.el.move((Gdk.Screen.width() / 2)- 250 ,0);\n \tGLib.debug(\"Loading tickets\"); \n\n\n this.el.show_all();\n \t_this.dbmodel.loadTickets();\n \t_this.actionmodel.loadActions();\n\n\n}", + "default_height" : 200, + "# RooTicket? ticket" : "null", + "$ xns" : "Gtk", + "# bool running" : false, + "bool modal" : true, + "items" : [ + { + "xtype" : "VBox", + "$ pack" : "get_content_area().add", + "$ xns" : "Gtk", + "items" : [ + { + "bool homogeneous" : false, + "xtype" : "Table", + "* pack" : "pack_start,false,false,0", + "uint column_spacing" : 2, + "n_columns" : 2, + "$ xns" : "Gtk", + "n_rows" : 2, + "int margin" : 2, + "items" : [ + { + "label" : "Do what?", + "$ visible" : true, + "xalign" : 0.90000000000000002, + "* 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}" + }, + "id" : "actionsel", + "* init" : "this.el.add_attribute(_this.actioncellrenderer.el , \"markup\", 1 );", + "* pack" : "attach_defaults,1,2,0,1", + "xtype" : "ComboBox", + "# bool loading" : false, + "| string selectedAction" : "() {\n\tGtk.TreeIter iter;\n\tValue val1;\n \n\tthis.el.get_active_iter (out iter);\n\t_this.actionmodel.el.get_value (iter, 0, out val1);\n\n\treturn (string) val1;\n}\n", + "$ xns" : "Gtk", + "items" : [ + { + "id" : "actioncellrenderer", + "xtype" : "CellRendererText", + "* pack" : "pack_start,true", + "$ xns" : "Gtk" + }, + { + "id" : "actionmodel", + "xtype" : "ListStore", + "* pack" : "set_model", + "$ columns" : "typeof(string),typeof(string)", + "n_columns" : 2, + "$ xns" : "Gtk", + "| void loadActions" : " () {\n\n \n \n _this.actionsel.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 action --\");\n \n _this.actionsel.el.set_active_iter(iter);\n\n el.append(out iter); \n el.set_value(iter, 0, \"CLOSE\");\n el.set_value(iter, 1, \"Merge changes to master - and CLOSE ticket\");\n \n \n el.append(out iter); \n el.set_value(iter, 0, \"LEAVE\");\n el.set_value(iter, 1, \"Merge changes to master - and LEAVE ticket open\");\n\n el.append(out iter); \n el.set_value(iter, 0, \"MASTER\");\n el.set_value(iter, 1, \"Merge changes FROM master into this branch\"); \n \n el.append(out iter); \n el.set_value(iter, 0, \"EXIT\");\n el.set_value(iter, 1, \"Switch back to MASTER branch - no merge\"); \n \n \n \n _this.actionsel.loading = false;\n //this.el.set_sort_column_id(0, Gtk.SortType.ASCENDING); \n \n}\n" + } + ] + }, + { + "label" : "Select Ticket", + "$ visible" : true, + "xalign" : 0.90000000000000002, + "* pack" : "attach_defaults,0,1,1,2", + "xtype" : "Label", + "$ justify" : "Gtk.Justification.RIGHT", + "x_options" : 4, + "$ xns" : "Gtk" + }, + { + "listeners" : { + "changed" : "() => {\n\tif (this.loading) {\n\t\treturn;\n\t}\n\t\n\t \n \t_this.name.updateText();\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}" + }, + "id" : "ticketsel", + "* init" : "this.el.add_attribute(_this.dbcellrenderer.el , \"markup\", 1 );", + "* pack" : "attach_defaults,1,2,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", + "* pack" : "pack_start,true", + "xtype" : "CellRendererText", + "$ xns" : "Gtk" + }, + { + "id" : "dbmodel", + "* pack" : "set_model", + "xtype" : "ListStore", + "| 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\t\tif (_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" + } + ] + }, + { + "label" : "Use this commit message", + "xalign" : 0.90000000000000002, + "* pack" : "attach_defaults,0,1,2,3", + "xtype" : "Label", + "$ justify" : "Gtk.Justification.RIGHT", + "x_options" : 4, + "$ xns" : "Gtk" + }, + { + "id" : "name", + "$ 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", + "$ xns" : "Gtk" + } + ] + } + ] + }, + { + "label" : "Cancel", + "* pack" : "add_action_widget,0", + "xtype" : "Button", + "Gtk.ReliefStyle relief" : "Gtk.ReliefStyle.NONE", + "$ xns" : "Gtk" + }, + { + "label" : "Do Merge", + "* pack" : "add_action_widget,1", + "xtype" : "Button", + "$ xns" : "Gtk" + } + ] + } + ] +} \ No newline at end of file diff --git a/MergeBranch.vala b/MergeBranch.vala new file mode 100644 index 00000000..43820cc8 --- /dev/null +++ b/MergeBranch.vala @@ -0,0 +1,654 @@ +static MergeBranch _MergeBranch; + +public class MergeBranch : Object +{ + public Gtk.Dialog el; + private MergeBranch _this; + + public static MergeBranch singleton() + { + if (_MergeBranch == null) { + _MergeBranch= new MergeBranch(); + } + return _MergeBranch; + } + public Xcls_actionsel actionsel; + public Xcls_actioncellrenderer actioncellrenderer; + public Xcls_actionmodel actionmodel; + public Xcls_ticketsel ticketsel; + public Xcls_dbcellrenderer dbcellrenderer; + public Xcls_dbmodel dbmodel; + public Xcls_name name; + + // my vars (def) + public RooTicket? ticket; + public bool running; + + // ctor + public MergeBranch() + { + _this = this; + this.el = new Gtk.Dialog(); + + // my vars (dec) + this.ticket = null; + this.running = false; + + // set gobject values + this.el.title = "Merge Branch"; + this.el.default_height = 200; + this.el.default_width = 500; + this.el.deletable = true; + this.el.modal = true; + var child_0 = new Xcls_VBox2( _this ); + child_0.ref(); + this.el.get_content_area().add ( child_0.el ); + var child_1 = new Xcls_Button14( _this ); + child_1.ref(); + this.el.add_action_widget ( child_1.el , 0 ); + var child_2 = new Xcls_Button15( _this ); + child_2.ref(); + this.el.add_action_widget ( child_2.el , 1 ); + + //listeners + this.el.delete_event.connect( (self, event) => { + this.el.hide(); + return true; + //test + }); + this.el.response.connect( (self, response_id) => { + + GLib.debug("got %d", (int) response_id); + if (response_id == 0) { + _this.el.hide(); + this.running = false; + GitMonitor.gitmonitor.start(); + return; + } + /* + // have they selected a ticket.. + // make that the current active ticket? + // we really need to store locally what ticket is being worked on.. + // in theory we could be working on multiple project and not merging.. + // -- each repo would have their active ticket (only one per repo) + // -- so we could just store that in there + // -- initial load can check the contents of the ticket files on first scan. + var ticket_id = _this.ticketsel.selectedTicketId(); + + if (this.repo != null) { + var bn = _this.name.el.get_text(); + if (ticket_id != "" ) { + this.repo.setActiveTicket( RooTicket.singleton().getById(ticket_id), bn); + } else { + this.repo.createBranchNamed(bn); + } + } + */ + + GitRepo.doMerges( + _this.actionsel.selectedAction(), + _this.ticketsel.selectedTicketId(), + _this.name.el.get_text() + ); + + this.running = false; + + + _this.el.hide(); + GitMonitor.gitmonitor.start(); + + + }); + this.el.show.connect( (self) => { + + + //test + }); + } + + // user defined functions + public void show ( RooTicket ticket ) + { + // this.el.set_gravity(Gdk.Gravity.NORTH); + if (this.running) { + return; + } + GitMonitor.gitmonitor.stop(); + + this.ticket = ticket; + + this.el.move((Gdk.Screen.width() / 2)- 250 ,0); + GLib.debug("Loading tickets"); + + + this.el.show_all(); + _this.dbmodel.loadTickets(); + _this.actionmodel.loadActions(); + + + } + public class Xcls_VBox2 : Object + { + public Gtk.VBox el; + private MergeBranch _this; + + + // my vars (def) + + // ctor + public Xcls_VBox2(MergeBranch _owner ) + { + _this = _owner; + this.el = new Gtk.VBox( true, 0 ); + + // my vars (dec) + + // set gobject values + var child_0 = new Xcls_Table3( _this ); + child_0.ref(); + this.el.pack_start ( child_0.el , false,false,0 ); + } + + // user defined functions + } + public class Xcls_Table3 : Object + { + public Gtk.Table el; + private MergeBranch _this; + + + // my vars (def) + + // ctor + public Xcls_Table3(MergeBranch _owner ) + { + _this = _owner; + this.el = new Gtk.Table( 2, 2, false ); + + // my vars (dec) + + // set gobject values + this.el.margin = 2; + this.el.column_spacing = 2; + var child_0 = new Xcls_Label4( _this ); + child_0.ref(); + this.el.attach_defaults ( child_0.el , 0,1,0,1 ); + var child_1 = new Xcls_actionsel( _this ); + child_1.ref(); + this.el.attach_defaults ( child_1.el , 1,2,0,1 ); + 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 ); + 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 ); + child_5.ref(); + this.el.attach_defaults ( child_5.el , 1,2,2,3 ); + } + + // user defined functions + } + public class Xcls_Label4 : Object + { + public Gtk.Label el; + private MergeBranch _this; + + + // my vars (def) + + // ctor + public Xcls_Label4(MergeBranch _owner ) + { + _this = _owner; + this.el = new Gtk.Label( "Do what?" ); + + // my vars (dec) + + // set gobject values + this.el.justify = Gtk.Justification.RIGHT; + this.el.xalign = 0.900000f; + this.el.visible = true; + } + + // user defined functions + } + + public class Xcls_actionsel : Object + { + public Gtk.ComboBox el; + private MergeBranch _this; + + + // my vars (def) + public bool loading; + + // ctor + public Xcls_actionsel(MergeBranch _owner ) + { + _this = _owner; + _this.actionsel = this; + this.el = new Gtk.ComboBox(); + + // my vars (dec) + this.loading = false; + + // set gobject values + var child_0 = new Xcls_actioncellrenderer( _this ); + child_0.ref(); + this.el.pack_start ( child_0.el , true ); + var child_1 = new Xcls_actionmodel( _this ); + child_1.ref(); + this.el.set_model ( child_1.el ); + + // init method + + this.el.add_attribute(_this.actioncellrenderer.el , "markup", 1 ); + + //listeners + this.el.changed.connect( () => { + if (this.loading) { + return; + } + _this.name.updateText(); + //GLib.debug (//"Selection: %s, %s\n", (string) val1, (string) val2); + }); + } + + // user defined functions + public string selectedAction () { + Gtk.TreeIter iter; + Value val1; + + this.el.get_active_iter (out iter); + _this.actionmodel.el.get_value (iter, 0, out val1); + + return (string) val1; + } + } + public class Xcls_actioncellrenderer : Object + { + public Gtk.CellRendererText el; + private MergeBranch _this; + + + // my vars (def) + + // ctor + public Xcls_actioncellrenderer(MergeBranch _owner ) + { + _this = _owner; + _this.actioncellrenderer = this; + this.el = new Gtk.CellRendererText(); + + // my vars (dec) + + // set gobject values + } + + // user defined functions + } + + public class Xcls_actionmodel : Object + { + public Gtk.ListStore el; + private MergeBranch _this; + + + // my vars (def) + + // ctor + public Xcls_actionmodel(MergeBranch _owner ) + { + _this = _owner; + _this.actionmodel = this; + this.el = new Gtk.ListStore( 2, typeof(string),typeof(string) ); + + // my vars (dec) + + // set gobject values + } + + // user defined functions + public void loadActions () { + + + + _this.actionsel.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 action --"); + + _this.actionsel.el.set_active_iter(iter); + + el.append(out iter); + el.set_value(iter, 0, "CLOSE"); + el.set_value(iter, 1, "Merge changes to master - and CLOSE ticket"); + + + el.append(out iter); + el.set_value(iter, 0, "LEAVE"); + el.set_value(iter, 1, "Merge changes to master - and LEAVE ticket open"); + + el.append(out iter); + el.set_value(iter, 0, "MASTER"); + el.set_value(iter, 1, "Merge changes FROM master into this branch"); + + el.append(out iter); + el.set_value(iter, 0, "EXIT"); + el.set_value(iter, 1, "Switch back to MASTER branch - no merge"); + + + + _this.actionsel.loading = false; + //this.el.set_sort_column_id(0, Gtk.SortType.ASCENDING); + + } + } + + + public class Xcls_Label8 : Object + { + public Gtk.Label el; + private MergeBranch _this; + + + // my vars (def) + + // ctor + public Xcls_Label8(MergeBranch _owner ) + { + _this = _owner; + this.el = new Gtk.Label( "Select Ticket" ); + + // my vars (dec) + + // set gobject values + this.el.justify = Gtk.Justification.RIGHT; + this.el.xalign = 0.900000f; + this.el.visible = true; + } + + // user defined functions + } + + public class Xcls_ticketsel : Object + { + public Gtk.ComboBox el; + private MergeBranch _this; + + + // my vars (def) + public bool loading; + + // ctor + public Xcls_ticketsel(MergeBranch _owner ) + { + _this = _owner; + _this.ticketsel = this; + this.el = new Gtk.ComboBox(); + + // my vars (dec) + this.loading = false; + + // set gobject values + var child_0 = new Xcls_dbcellrenderer( _this ); + child_0.ref(); + this.el.pack_start ( child_0.el , true ); + var child_1 = new Xcls_dbmodel( _this ); + child_1.ref(); + this.el.set_model ( child_1.el ); + + // init method + + this.el.add_attribute(_this.dbcellrenderer.el , "markup", 1 ); + + //listeners + this.el.changed.connect( () => { + if (this.loading) { + return; + } + + + _this.name.updateText(); + //_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 selectedTicketId () { + Gtk.TreeIter iter; + Value val1; + + + this.el.get_active_iter (out iter); + _this.dbmodel.el.get_value (iter, 0, out val1); + + + return (string) val1; + + + + + } + } + public class Xcls_dbcellrenderer : Object + { + public Gtk.CellRendererText el; + private MergeBranch _this; + + + // my vars (def) + + // ctor + public Xcls_dbcellrenderer(MergeBranch _owner ) + { + _this = _owner; + _this.dbcellrenderer = this; + this.el = new Gtk.CellRendererText(); + + // my vars (dec) + + // set gobject values + } + + // user defined functions + } + + public class Xcls_dbmodel : Object + { + public Gtk.ListStore el; + private MergeBranch _this; + + + // my vars (def) + + // ctor + public Xcls_dbmodel(MergeBranch _owner ) + { + _this = _owner; + _this.dbmodel = this; + this.el = new Gtk.ListStore( 2, typeof(string),typeof(string) ); + + // my vars (dec) + + // set gobject values + } + + // user defined functions + public void loadTickets () { + + RooTicket.singleton().loadTickets(); + + _this.ticketsel.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 ticket --"); + + _this.ticketsel.el.set_active_iter(iter); + var tickets = RooTicket.singleton().tickets; + foreach(var ticket in tickets) { + + el.append(out iter); + + el.set_value(iter, 0, ticket.id); + el.set_value(iter, 1, "#%s [%s] %s".printf( ticket.id, ticket.project_id_name , ticket.summary)); + if (_this.ticket.id == ticket.id) { + _this.ticketsel.el.set_active_iter(iter); + } + + } + + _this.ticketsel.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( "Use this commit message" ); + + // my vars (dec) + + // set gobject values + this.el.justify = Gtk.Justification.RIGHT; + this.el.xalign = 0.900000f; + } + + // user defined functions + } + + public class Xcls_name : Object + { + public Gtk.Entry el; + private MergeBranch _this; + + + // my vars (def) + + // ctor + public Xcls_name(MergeBranch _owner ) + { + _this = _owner; + _this.name = this; + this.el = new Gtk.Entry(); + + // my vars (dec) + + // set gobject values + this.el.visible = true; + } + + // user defined functions + public void updateText () { + var ticket_id = _this.ticketsel.selectedTicketId(); + + RooTicket ticket = null; + if (ticket_id.length > 0){ + ticket = RooTicket.singleton().getById(ticket_id); + } + + var name = RooTicket.singleton().usernameLocal(); + var action = _this.actionsel.selectedAction(); + this.el.set_editable(true); + switch (action) { + case "CLOSE": // merge changes and close.. + this.el.set_text("Fix #%s - %s".printf(ticket_id, ticket != null ? ticket.summary : "")); + break; + case "LEAVE": // partial fix + this.el.set_text("Partial Fix #%s - %s".printf(ticket_id, ticket != null ? ticket.summary : "")); + break; + case "MASTER": // merge master + case "EXIT": // just switch back... + this.el.set_editable(false); + this.el.set_text(""); // not relivant.. + break; + default: + + break; /// don't fix the text value. + } + + } + } + + + + public class Xcls_Button14 : Object + { + public Gtk.Button el; + private MergeBranch _this; + + + // my vars (def) + + // ctor + public Xcls_Button14(MergeBranch _owner ) + { + _this = _owner; + this.el = new Gtk.Button(); + + // my vars (dec) + + // set gobject values + this.el.relief = Gtk.ReliefStyle.NONE; + this.el.label = "Cancel"; + } + + // user defined functions + } + + public class Xcls_Button15 : Object + { + public Gtk.Button el; + private MergeBranch _this; + + + // my vars (def) + + // ctor + public Xcls_Button15(MergeBranch _owner ) + { + _this = _owner; + this.el = new Gtk.Button(); + + // my vars (dec) + + // set gobject values + this.el.label = "Do Merge"; + } + + // user defined functions + } + +}