sync

diff --git a/NewBranch.bjs b/NewBranch.bjs
index 6d1ba95..20752db 100644 (file)
--- a/NewBranch.bjs
+++ b/NewBranch.bjs
@@ -9,7 +9,7 @@
  "items" : [
   {
    "listeners" : {
  "items" : [
   {
    "listeners" : {

-    "delete_event" : "(self, event) => {\n    this.el.hide();\n    return true; \n    //test  \n}\n ",
+    "delete_event" : "(self, event) => {\n    this.el.hide();\n    this.running = false;\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\t\tGitMonitor.gitmonitor.start();\t    \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\tGitMonitor.gitmonitor.start();\n\t\t    this.running = false; \n\n\t \n\t \n\t \n\n\t \n}",
     "show" : "(self)  => {\n \n\n  //test\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\tGitMonitor.gitmonitor.start();\t    \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\tGitMonitor.gitmonitor.start();\n\t\t    this.running = false; \n\n\t \n\t \n\t \n\n\t \n}",
     "show" : "(self)  => {\n \n\n  //test\n}"
    },


@@ -18,7 +18,7 @@
    "title" : "Create a working branch ",
    "xtype" : "Dialog",
    "# GitRepo? repo" : "null",
    "title" : "Create a working branch ",
    "xtype" : "Dialog",
    "# GitRepo? repo" : "null",

-   "|   void show" : "( GitRepo repo ) \n{\n     // this.el.set_gravity(Gdk.Gravity.NORTH);\n    if (this.running) {\n    \treturn;\n\t}\n\t\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 \t_this.dbmodel.loadTickets();\n\n}",
+   "|   void show" : "( GitRepo repo ) \n{\n     // this.el.set_gravity(Gdk.Gravity.NORTH);\n    if (this.running) {\n    \treturn;\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 \t_this.dbmodel.loadTickets();\n\n}",

    "default_height" : 200,
    "$ xns" : "Gtk",
    "# bool running" : false,
    "default_height" : 200,
    "$ xns" : "Gtk",
    "# bool running" : false,


@@ -31,8 +31,8 @@
      "items" : [
       {
        "bool homogeneous" : false,
      "items" : [
       {
        "bool homogeneous" : false,

-       "xtype" : "Table",

        "* pack" : "pack_start,false,false,0",
        "* pack" : "pack_start,false,false,0",

+       "xtype" : "Table",

        "uint column_spacing" : 2,
        "n_columns" : 2,
        "$ xns" : "Gtk",
        "uint column_spacing" : 2,
        "n_columns" : 2,
        "$ xns" : "Gtk",


@@ -63,14 +63,14 @@
          "items" : [
           {
            "id" : "dbcellrenderer",
          "items" : [
           {
            "id" : "dbcellrenderer",

-           "* pack" : "pack_start,true",

            "xtype" : "CellRendererText",
            "xtype" : "CellRendererText",

+           "* pack" : "pack_start,true",

            "$ xns" : "Gtk"
           },
           {
            "id" : "dbmodel",
            "$ xns" : "Gtk"
           },
           {
            "id" : "dbmodel",

-           "* pack" : "set_model",

            "xtype" : "ListStore",
            "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,
            "| 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,


@@ -100,15 +100,15 @@
     },
     {
      "label" : "Do not create Branch",
     },
     {
      "label" : "Do not create Branch",

-     "* pack" : "add_action_widget,0",

      "xtype" : "Button",
      "xtype" : "Button",

+     "* pack" : "add_action_widget,0",

      "Gtk.ReliefStyle relief" : "Gtk.ReliefStyle.NONE",
      "$ xns" : "Gtk"
     },
     {
      "label" : "Create Branch",
      "Gtk.ReliefStyle relief" : "Gtk.ReliefStyle.NONE",
      "$ xns" : "Gtk"
     },
     {
      "label" : "Create Branch",

-     "* pack" : "add_action_widget,1",

      "xtype" : "Button",
      "xtype" : "Button",

+     "* pack" : "add_action_widget,1",

      "$ xns" : "Gtk"
     }
    ]
      "$ xns" : "Gtk"
     }
    ]

diff --git a/NewBranch.vala b/NewBranch.vala
index 6a48613..74d09e0 100644 (file)
--- a/NewBranch.vala
+++ b/NewBranch.vala
@@ -50,6 +50,7 @@ public class NewBranch : Object
         //listeners
         this.el.delete_event.connect( (self, event) => {
             this.el.hide();
         //listeners
         this.el.delete_event.connect( (self, event) => {
             this.el.hide();

+            this.running = false;

             return true; 
             //test  
         });
             return true; 
             //test  
         });


@@ -103,7 +104,8 @@ public class NewBranch : Object
         if (this.running) {
                return;
        }
         if (this.running) {
                return;
        }

-               GitMonitor.gitmonitor.stop();
+       this.running  = true;
+       GitMonitor.gitmonitor.stop();

        
         this.repo = repo;
         
        
         this.repo = repo;
         

diff --git a/RooTicket.vala b/RooTicket.vala
index 7ea316b..5ddbeae 100644 (file)
--- a/RooTicket.vala
+++ b/RooTicket.vala
@@ -123,8 +123,7 @@ public class RooTicket : Object
        public void loadTickets()
        {
                RooTicket.singleton().tickets = new Gee.ArrayList<RooTicket>();
        public void loadTickets()
        {
                RooTicket.singleton().tickets = new Gee.ArrayList<RooTicket>();

-               
- 
+        

                
                var table = new GLib.HashTable<string, string>(str_hash, str_equal);
         
                
                var table = new GLib.HashTable<string, string>(str_hash, str_equal);