{
 "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 < 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,
   "$ 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}",
   "default_height" : 200,
   "# RooTicket? ticket" : "null",
   "$ xns" : "Gtk",
   "# bool running" : false,
   "bool modal" : true,
   "items" : [
    {
     "xtype" : "Box",
     "$ pack" : "get_content_area().add",
     "$ xns" : "Gtk",
     "Gtk.Orientation orientation" : "Gtk.Orientation.VERTICAL",
     "items" : [
      {
       "id" : "table",
       "bool homogeneous" : false,
       "xtype" : "Table",
       "* pack" : "pack_start,false,false,0",
       "uint column_spacing" : 2,
       "n_columns" : 2,
       "$ xns" : "Gtk",
       "n_rows" : 4,
       "bool vexpand" : false,
       "int margin" : 2,
       "items" : [
        {
         "label" : "Do what?",
         "$ visible" : true,
         "Gtk.Align halign" : "Gtk.Align.END",
         "int margin_right" : 3,
         "* pack" : "attach_defaults,0,1,0,1",
         "xtype" : "Label",
         "$ xns" : "Gtk"
        },
        {
         "listeners" : {
          "changed" : "() => {\n\tif (this.loading) {\n\t\treturn;\n\t}\n  \t_this.name.updateText();\n  \t_this.mergebtn.updateState();\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 );",
         "bool hexpand" : true,
         "* 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" : "Project",
         "$ visible" : true,
         "Gtk.Align halign" : "Gtk.Align.END",
         "int margin_right" : 3,
         "* pack" : "attach_defaults,0,1,1,2",
         "xtype" : "Label",
         "x_options" : 4,
         "$ xns" : "Gtk"
        },
        {
         "listeners" : {
          "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()",
         "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",
         "xtype" : "ComboBox",
         "# bool loading" : false,
         "$ xns" : "Gtk",
         "items" : [
          {
           "id" : "prcellrenderer",
           "xtype" : "CellRendererText",
           "* pack" : "pack_start,true",
           "$ xns" : "Gtk"
          },
          {
           "| void loadProjects" : "  (string id) {\n\n\n    \n    _this.projectsel.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 project --\");\n    if (id == \"\") {\n\t    _this.projectsel.el.set_active_iter(iter);\n    }\n  \n    foreach(var project in RooProject.projects()) {\n    \n        el.append(out iter);\n        \n        el.set_value(iter, 0, project.id);\n        el.set_value(iter, 1,  project.name );\n        if (id == project.id) {\n\t \t   _this.projectsel.el.set_active_iter(iter);\n\t    }   \n        \n    }\n    \n    _this.projectsel.loading = false;\n     //this.el.set_sort_column_id(0, Gtk.SortType.ASCENDING);          \n                                     \n}\n",
           "id" : "prmodel",
           "* pack" : "set_model",
           "xtype" : "ListStore",
           "$ columns" : "typeof(string),typeof(string)",
           "n_columns" : 2,
           "$ xns" : "Gtk"
          }
         ]
        },
        {
         "label" : "Select Ticket",
         "$ visible" : true,
         "Gtk.Align halign" : "Gtk.Align.END",
         "xalign" : 0.90000000000000002,
         "int margin_right" : 3,
         "* pack" : "attach_defaults,0,1,2,3",
         "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_this.view.loadTicket(this.selectedTicketId());\n\t _this.name.updateText();\n\t//GLib.debug (//\"Selection: %s, %s\\n\", (string) val1, (string) val2);\n}"
         },
         "* ctor" : "new Gtk.ComboBox.with_entry()",
         "id" : "ticketsel",
         "* init" : "//this.el.add_attribute(_this.dbcellrenderer.el , \"markup\", 1 );\nthis.el.set_entry_text_column(1);\nthis.el.get_child().set_sensitive(false);",
         "* pack" : "attach_defaults,1,2,2,3",
         "xtype" : "ComboBox",
         "# bool loading" : false,
         "$ xns" : "Gtk",
         "| string selectedTicketId" : "() {\nGtk.TreeIter iter;\n\tValue val1;\n \n \n\tif (!this.el.get_active_iter (out iter)) {\n\t\treturn \"\";\n\t}\n\t \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" : "(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,
           "$ xns" : "Gtk"
          }
         ]
        },
        {
         "* pack" : "attach_defaults,0,2,3,4",
         "xtype" : "Box",
         "$ xns" : "Gtk",
         "Gtk.Orientation orientation" : "Gtk.Orientation.HORIZONTAL",
         "items" : [
          {
           "listeners" : {
            "toggled" : "() => {\n\tvar project_id = _this.projectsel.selectedProjectId();\n\t_this.dbmodel.loadTickets(project_id);\t\n}"
           },
           "id" : "btn_not_me",
           "string label" : "Show tickets not assigned to me",
           "* pack" : "add",
           "xtype" : "CheckButton",
           "$ xns" : "Gtk"
          },
          {
           "listeners" : {
            "toggled" : "() => {\n \tvar project_id = _this.projectsel.selectedProjectId();\n\t_this.dbmodel.loadTickets(project_id);\t\n\t \n}"
           },
           "id" : "btn_closed",
           "xtype" : "CheckButton",
           "string label" : "Show closed Tickets",
           "* pack" : "add",
           "$ xns" : "Gtk"
          },
          {
           "listeners" : {
            "activate_link" : "(uri) => {\n\tif (uri == \"refresh\") {\n\t\tRooProject.reload();\n\t\tvar curproj = RooProject.getProjectByRepo(_this.repo);\n\t\t _this.prmodel.loadProjects(curproj == null ? \"\": curproj.id);\n\n\t\t_this.dbmodel.loadTickets(curproj == null ? \"\": curproj.id);\t\t\n\t}\n\treturn true;\n}"
           },
           "bool use_markup" : true,
           "Gtk.Align halign" : "Gtk.Align.END",
           "bool hexpand" : true,
           "* pack" : "add",
           "xtype" : "Label",
           "string label" : "<a href=\"refresh\">Refresh Ticket list</a>",
           "$ xns" : "Gtk"
          }
         ]
        },
        {
         "label" : "Use this commit message",
         "Gtk.Align halign" : "Gtk.Align.END",
         "int margin_right" : 3,
         "* pack" : "attach_defaults,0,1,4,5",
         "xtype" : "Label",
         "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,4,5",
         "$ xns" : "Gtk"
        }
       ]
      },
      {
       "* pack" : "add",
       "xtype" : "Notebook",
       "$ xns" : "Gtk",
       "bool vexpand" : true,
       "items" : [
        {
         "id" : "label_diff",
         "xtype" : "Label",
         "* pack" : false,
         "string label" : "Projected Commit Diff",
         "$ xns" : "Gtk"
        },
        {
         "id" : "label_ticket",
         "* pack" : false,
         "string label" : "Ticket Details",
         "xtype" : "Label",
         "$ xns" : "Gtk"
        },
        {
         "* pack" : "append_page,_this.label_diff.el",
         "xtype" : "Box",
         "gboolean homogeneous" : false,
         "$ xns" : "Gtk",
         "Gtk.Orientation orientation" : "Gtk.Orientation.VERTICAL",
         "items" : [
          {
           "int height_request" : 400,
           "xtype" : "ScrolledWindow",
           "* pack" : "pack_start,true,true,0",
           "$ xns" : "Gtk",
           "items" : [
            {
             "id" : "diff_view",
             "* init" : " \n    var description =   Pango.FontDescription.from_string(\"monospace\");\n    description.set_size(9000);\n    this.el.override_font(description);\n     var lm = Gtk.SourceLanguageManager.get_default();\n                    \n    ((Gtk.SourceBuffer)(this.el.get_buffer())).set_language(\n        lm.get_language(\"diff\")\n    );",
             "xtype" : "View",
             "* pack" : "add",
             "$ xns" : "GtkSource"
            }
           ]
          }
         ]
        },
        {
         "* pack" : "append_page,_this.label_ticket.el",
         "xtype" : "Box",
         "gboolean homogeneous" : false,
         "$ xns" : "Gtk",
         "Gtk.Orientation orientation" : "Gtk.Orientation.VERTICAL",
         "items" : [
          {
           "int height_request" : 500,
           "id" : "scrolled_window",
           "* init" : "{\n\tthis.el.set_policy(Gtk.PolicyType.AUTOMATIC, Gtk.PolicyType.AUTOMATIC);\n}\n",
           "* pack" : "add",
           "xtype" : "ScrolledWindow",
           "$ xns" : "Gtk",
           "bool vexpand" : true,
           "items" : [
            {
             "id" : "view",
             "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"
            }
           ]
          }
         ]
        }
       ]
      },
      {
       "id" : "spinner",
       "bool hexpand" : true,
       "* pack" : "add",
       "xtype" : "Spinner",
       "$ xns" : "Gtk",
       "bool vexpand" : true
      }
     ]
    },
    {
     "label" : "Cancel",
     "* pack" : "add_action_widget,0",
     "xtype" : "Button",
     "Gtk.ReliefStyle relief" : "Gtk.ReliefStyle.NONE",
     "$ xns" : "Gtk"
    },
    {
     "label" : "Do Merge",
     "| 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",
     "$ xns" : "Gtk"
    }
   ]
  }
 ]
}