From: Alan Knowles <alan@roojs.com>
Date: Wed, 31 Oct 2018 08:52:44 +0000 (+0800)
Subject: NewBranch.bjs
X-Git-Url: http://git.roojs.org/?p=gitlive;a=commitdiff_plain;h=2fe6c0fa15b9ef1c6449585bfd81c64bfbade737

NewBranch.bjs
NewBranch.vala
---

diff --git a/NewBranch.bjs b/NewBranch.bjs
index 4ecfa425..2a1a1af1 100644
--- a/NewBranch.bjs
+++ b/NewBranch.bjs
@@ -10,7 +10,7 @@
   {
    "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 \treturn;\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.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\n\t\n\n\t \n\t \n\t \n\n\t \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 \treturn;\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\n\t\n\n\t \n\t \n\t \n\n\t \n}",
     "show" : "(self)  => {\n \n\n  //test\n}"
    },
    "default_width" : 500,
@@ -18,7 +18,7 @@
    "title" : "Create a working branch ",
    "xtype" : "Dialog",
    "# GitRepo? repo" : "null",
-   "|   void show" : "( ) \n{\n     // this.el.set_gravity(Gdk.Gravity.NORTH);\n     \n\tthis.el.move((Gdk.Screen.width() / 2)- 250 ,0);\n       \tGLib.debug(\"Loading tickets\"); \n \t_this.dbmodel.loadTickets();\n\n    this.el.show_all();\n\n\n \n    \n      \n}",
+   "|   void show" : "( GitRepo repo ) \n{\n     // this.el.set_gravity(Gdk.Gravity.NORTH);\n    \n    this.repo = repo;\n    \n\tthis.el.move((Gdk.Screen.width() / 2)- 250 ,0);\n       \tGLib.debug(\"Loading tickets\"); \n \t_this.dbmodel.loadTickets();\n\n    this.el.show_all();\n\n\n \n    \n      \n}",
    "default_height" : 200,
    "$ xns" : "Gtk",
    "bool modal" : true,
@@ -30,8 +30,8 @@
      "items" : [
       {
        "bool homogeneous" : false,
-       "* pack" : "pack_start,false,false,0",
        "xtype" : "Table",
+       "* pack" : "pack_start,false,false,0",
        "uint column_spacing" : 2,
        "n_columns" : 2,
        "$ xns" : "Gtk",
@@ -61,15 +61,15 @@
          "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();\n    \n    \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.build_module.el.set_active_iter(iter);\n    var tickets = RooTicket.singleton().tickets;\n    foreach(var ticket in tickets) {\n    \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     //this.el.set_sort_column_id(0, Gtk.SortType.ASCENDING);          \n                                     \n}\n",
+           "xtype" : "ListStore",
+           "| void loadTickets" : "  () {\n\n    RooTicket.singleton().loadTickets();\n    \n    \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\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     //this.el.set_sort_column_id(0, Gtk.SortType.ASCENDING);          \n                                     \n}\n",
            "$ columns" : "typeof(string),typeof(string)",
            "n_columns" : 2,
            "$ xns" : "Gtk"
@@ -98,15 +98,15 @@
     },
     {
      "label" : "Do not create Branch",
-     "xtype" : "Button",
      "* pack" : "add_action_widget,0",
+     "xtype" : "Button",
      "Gtk.ReliefStyle relief" : "Gtk.ReliefStyle.NONE",
      "$ xns" : "Gtk"
     },
     {
      "label" : "Create Branch",
-     "xtype" : "Button",
      "* pack" : "add_action_widget,1",
+     "xtype" : "Button",
      "$ xns" : "Gtk"
     }
    ]
diff --git a/NewBranch.vala b/NewBranch.vala
index f4df8dc0..836eee16 100644
--- a/NewBranch.vala
+++ b/NewBranch.vala
@@ -68,9 +68,9 @@ public class NewBranch : Object
         	var ticket_id = _this.ticketsel.selectedTicketId();
         	
             if (this.repo != null) {
-            	var bn = _this.name.get_text();
+            	var bn = _this.name.el.get_text();
             	if (ticket_id != "" ) {
-        			this.repo.setActiveTicket( RooTicket.singleton.getById(ticket_id), bn);
+        			this.repo.setActiveTicket( RooTicket.singleton().getById(ticket_id), bn);
         		} else {
         			this.repo.createBranchNamed(bn);
         		}
@@ -92,10 +92,12 @@ public class NewBranch : Object
     }
 
     // user defined functions
-    public   void show ( ) 
+    public   void show ( GitRepo repo ) 
     {
          // this.el.set_gravity(Gdk.Gravity.NORTH);
-         
+        
+        this.repo = repo;
+        
     	this.el.move((Gdk.Screen.width() / 2)- 250 ,0);
            	GLib.debug("Loading tickets"); 
      	_this.dbmodel.loadTickets();
@@ -319,7 +321,7 @@ public class NewBranch : Object
             el.set_value(iter, 0, "");
             el.set_value(iter, 1, "-- select a ticket --");
             
-            _this.build_module.el.set_active_iter(iter);
+            _this.ticketsel.el.set_active_iter(iter);
             var tickets = RooTicket.singleton().tickets;
             foreach(var ticket in tickets) {