MergeBranch.bjs

[gitlive] / MergeBranch.bjs

diff --git a/MergeBranch.bjs b/MergeBranch.bjs
index 7575206..0f1c7a1 100644 (file)
--- a/MergeBranch.bjs
+++ b/MergeBranch.bjs
@@ -163,7 +163,24 @@
          "xtype" : "Box",
          "gboolean homogeneous" : false,
          "$ xns" : "Gtk",
-         "Gtk.Orientation orientation" : "Gtk.Orientation.VERTICAL"
+         "Gtk.Orientation orientation" : "Gtk.Orientation.VERTICAL",
+         "items" : [
+          {
+           "int height_request" : 400,
+           "* pack" : "pack_start,true,true,0",
+           "xtype" : "ScrolledWindow",
+           "$ 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);",
+             "xtype" : "View",
+             "* pack" : "add",
+             "$ xns" : "GtkSource"
+            }
+           ]
+          }
+         ]
         },
         {
          "* pack" : "append_page,_this.label_ticket.el",