X-Git-Url: http://git.roojs.org/?a=blobdiff_plain;f=NewBranch.bjs;h=799764b27acf7a564e9964e93f8537483203b57d;hb=b794e8879619dec81772f3f62f37d40e9e9c0a5e;hp=907e575d8fa98d55cbb5c280ed3dffb43fbd65bd;hpb=e65be1a2e609c4440f07d0ef2f3e3068ba4e49fe;p=gitlive

diff --git a/NewBranch.bjs b/NewBranch.bjs
index 907e575d..799764b2 100644
--- a/NewBranch.bjs
+++ b/NewBranch.bjs
@@ -506,78 +506,54 @@
          "uint column_spacing" : 4,
          "n_columns" : 5,
          "$ xns" : "Gtk",
-         "n_rows" : 5,
+         "n_rows" : 2,
          "bool vexpand" : false,
          "int margin" : 2,
          "items" : [
           {
-           "label" : "Commit Message",
+           "label" : "Just commit with this comment",
            "Gtk.Align halign" : "Gtk.Align.START",
            "xalign" : 0.90000000000000002,
-           "* pack" : "attach_defaults,0,1,3,4",
+           "* pack" : "attach_defaults,0,1,0,1",
            "xtype" : "Label",
            "$ justify" : "Gtk.Justification.RIGHT",
            "x_options" : 4,
            "$ xns" : "Gtk"
           },
           {
-           "id" : "name",
+           "id" : "commit_message",
            "$ visible" : true,
            "xtype" : "Entry",
-           "* pack" : "attach_defaults,0,4,4,5",
+           "* 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" : "Create Branch",
+           "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,4,5",
+           "* pack" : "attach_defaults,4,5,1,2",
            "$ xns" : "Gtk"
-          },
+          }
+         ]
+        },
+        {
+         "int height_request" : 400,
+         "* pack" : "add",
+         "xtype" : "ScrolledWindow",
+         "$ xns" : "Gtk",
+         "bool vexpand" : true,
+         "items" : [
           {
-           "* pack" : "attach_defaults,0,5,2,3",
-           "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"
-            }
-           ]
+           "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"
           }
          ]
         }