X-Git-Url: http://git.roojs.org/?a=blobdiff_plain;f=NewBranch.bjs;h=5a447dc6c61c24157f0e60c80de6ab1b9692a18a;hb=c171058a46aff32967ca6e5af204cac7ce012060;hp=f1ab8bcdcc08ce06371805ead7fbfa069e3985a9;hpb=d8fa8905b9a947cc1b331f6262e9c927604784c1;p=gitlive

diff --git a/NewBranch.bjs b/NewBranch.bjs
index f1ab8bcd..5a447dc6 100644
--- a/NewBranch.bjs
+++ b/NewBranch.bjs
@@ -17,7 +17,7 @@
    "title" : "Create a working branch ",
    "xtype" : "Dialog",
    "# GitRepo? repo" : "null",
-   "|   void show" : "( GitRepo repo, Gee.ArrayList<GitMonitorQueue> queue, string tid = \"\" ) \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     \n    \n\tthis.el.move((Gdk.Screen.width() / 2)- 250 ,0);\n\tthis.el.set_default_size( 500,200); // not sure why it grows..\n    GLib.debug(\"Loading tickets\"); \n     \n\n    this.el.show_all();\n    this.el.set_keep_above(true);\n   \n    \n    var curproj = RooProject.getProjectByRepo(this.repo);\n     _this.prmodel.loadProjects(curproj == null ? \"\" : curproj.id);\n    \n \t_this.dbmodel.loadTickets(curproj == null ? \"\": curproj.id, tid);\n \t_this.createbtn.updateState();\n \t\n\t_this.ticketsel.el.get_child().get_style_context().remove_class(\"warning\");\n \tif (tid != \"\") { \n\t \tvar name = RooTicket.singleton().usernameLocal();\n \t\tvar ticket = RooTicket.singleton().getById(tid);\n\t\t_this.name.el.set_text(\"wip_%s_T%s_%s\".printf(name,ticket.id, ticket.summaryToBranchName()));\n\t} else {\n\t\t_this.ticketsel.el.get_child().get_style_context().add_class(\"warning\");\n\t}\n    _this.view.loadTicket(tid);\n \tthis.el.run();\n\n}",
+   "|   void show" : "( GitRepo repo, Gee.ArrayList<GitMonitorQueue> queue, string tid = \"\" ) \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\t\n\t\n\tthis.queue = queue;\n\tthis.running  = true;\n\tGitMonitor.gitmonitor.stop();\n\t\n\t\n    this.repo = repo;\n\tthis.el.move((Gdk.Screen.width() / 2)- 250 ,0);\n\tthis.el.set_default_size( 500,200); // not sure why it grows..\n\t\n\t\n\t\n\t\n     \n\n    this.el.show_all();\n    this.el.set_keep_above(true);\n\t\n\t_this.select_ticket_tab.load_data();\n\t_this.create_ticket_tab.load_data();\n\t_this.quick_commit_tab.load_data();\n   \n   \n    \n    \n    \n    \n    \n \tthis.el.run();\n\n}",
    "default_height" : 500,
    "$ xns" : "Gtk",
    "# bool running" : false,
@@ -52,9 +52,11 @@
        "$ xns" : "Gtk"
       },
       {
+       "id" : "select_ticket_tab",
        "bool homogeneous" : false,
        "* pack" : "append_page,_this.label_select_ticket.el",
        "xtype" : "Box",
+       "| void load_data" : "() {\n\n    GLib.debug(\"Loading tickets\"); \n    \n    var curproj = RooProject.getProjectByRepo(this.repo);\n     _this.prmodel.loadProjects(curproj == null ? \"\" : curproj.id);\n    \n \t_this.dbmodel.loadTickets(curproj == null ? \"\": curproj.id, tid);\n \t_this.branchbtn.updateState();\n \t\n\t_this.ticketsel.el.get_child().get_style_context().remove_class(\"warning\");\n \tif (tid != \"\") { \n\t \tvar name = RooTicket.singleton().usernameLocal();\n \t\tvar ticket = RooTicket.singleton().getById(tid);\n\t\t_this.name.el.set_text(\"wip_%s_T%s_%s\".printf(name,ticket.id, ticket.summaryToBranchName()));\n\t} else {\n\t\t_this.ticketsel.el.get_child().get_style_context().add_class(\"warning\");\n\t}\n    _this.view.loadTicket(tid);\n    \n    \n}\n",
        "$ xns" : "Gtk",
        "Gtk.Orientation orientation" : "Gtk.Orientation.VERTICAL",
        "items" : [
@@ -126,7 +128,7 @@
            "* 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,4,1,2",
+           "* pack" : "attach_defaults,1,5,1,2",
            "xtype" : "ComboBox",
            "# bool loading" : false,
            "$ xns" : "Gtk",
@@ -172,7 +174,7 @@
            },
            "label" : "Create Branch",
            "| void updateState" : "() {\n\n\tvar ticket_id = _this.ticketsel.selectedTicketId();\n\t\n\tif (ticket_id == \"\") {\n\t\tthis.el.set_sensitive(false);\n\t\treturn;\n\t}\n \n\tthis.el.set_sensitive(true);\n \n}\n",
-           "id" : "createbtn",
+           "id" : "branchbtn",
            "* init" : "{\n   this.el.get_style_context().add_class(\"suggested-action\");\n}\n",
            "xtype" : "Button",
            "* pack" : "attach_defaults,4,5,4,5",
@@ -283,7 +285,7 @@
            },
            "* ctor" : "new Gtk.ComboBox.with_entry()",
            "id" : "project_id",
-           "| 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",
+           "| string selectedProjectId" : "() {\n\tGtk.TreeIter iter;\n\tValue val1;\n \n \n\tthis.el.get_active_iter (out iter);\n\t_this.tprmodel.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);",
            "* pack" : "attach_defaults,0,1,1,2",
            "xtype" : "ComboBox",
@@ -291,14 +293,14 @@
            "$ xns" : "Gtk",
            "items" : [
             {
-             "id" : "prcellrenderer",
+             "id" : "tprcellrenderer",
              "xtype" : "CellRendererText",
              "* pack" : "pack_start,true",
              "$ xns" : "Gtk"
             },
             {
              "| void loadProjects" : "  (string id) {\n\n    \n    _this.project_id.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.project_id.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.project_id.el.set_active_iter(iter);\n\t    }   \n        \n    }\n    \n    _this.project_id.loading = false;\n     //this.el.set_sort_column_id(0, Gtk.SortType.ASCENDING);          \n                                     \n}\n",
-             "id" : "prmodel",
+             "id" : "tprmodel",
              "* pack" : "set_model",
              "xtype" : "ListStore",
              "$ columns" : "typeof(string),typeof(string)",
@@ -496,7 +498,68 @@
        "* pack" : "append_page,_this.label_quick_commit.el",
        "xtype" : "Box",
        "$ xns" : "Gtk",
-       "Gtk.Orientation orientation" : "Gtk.Orientation.VERTICAL"
+       "Gtk.Orientation orientation" : "Gtk.Orientation.VERTICAL",
+       "items" : [
+        {
+         "bool homogeneous" : true,
+         "bool expand" : false,
+         "xtype" : "Table",
+         "* pack" : "pack_start,false,false,0",
+         "uint column_spacing" : 4,
+         "n_columns" : 5,
+         "$ xns" : "Gtk",
+         "n_rows" : 2,
+         "bool vexpand" : false,
+         "int margin" : 2,
+         "items" : [
+          {
+           "label" : "Just commit with this comment",
+           "Gtk.Align halign" : "Gtk.Align.START",
+           "xalign" : 0.90000000000000002,
+           "* pack" : "attach_defaults,0,1,0,1",
+           "xtype" : "Label",
+           "$ justify" : "Gtk.Justification.RIGHT",
+           "x_options" : 4,
+           "$ xns" : "Gtk"
+          },
+          {
+           "id" : "commit_message",
+           "$ visible" : true,
+           "xtype" : "Entry",
+           "* pack" : "attach_defaults,0,4,1,2",
+           "$ xns" : "Gtk"
+          },
+          {
+           "listeners" : {
+            "clicked" : "() => {\n\n\tGLib.debug(\"fire response = 1\");\n\t\n\tvar ticket_id = _this.ticketsel.selectedTicketId();\n\t\n\tif (ticket_id == \"\") {\n\t\t_this.ticketsel.el.get_child().get_style_context().add_class(\"warning\");\n\t\treturn;\n\t}\n\t \n\t_this.el.response(1);\n}"
+           },
+           "label" : "Commit Changes",
+           "id" : "createbtn",
+           "| void updateState" : "() {\n\n\tvar ticket_id = _this.ticketsel.selectedTicketId();\n\t\n\tif (ticket_id == \"\") {\n\t\tthis.el.set_sensitive(false);\n\t\treturn;\n\t}\n \n\tthis.el.set_sensitive(true);\n \n}\n",
+           "* init" : "{\n   this.el.get_style_context().add_class(\"suggested-action\");\n}\n",
+           "xtype" : "Button",
+           "* pack" : "attach_defaults,4,5,1,2",
+           "$ xns" : "Gtk"
+          }
+         ]
+        },
+        {
+         "int height_request" : 400,
+         "* pack" : "add",
+         "xtype" : "ScrolledWindow",
+         "$ xns" : "Gtk",
+         "bool vexpand" : true,
+         "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"
+          }
+         ]
+        }
+       ]
       }
      ]
     }