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

diff --git a/NewBranch.bjs b/NewBranch.bjs
index 15639164..799764b2 100644
--- a/NewBranch.bjs
+++ b/NewBranch.bjs
@@ -126,7 +126,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",
@@ -149,16 +149,6 @@
             }
            ]
           },
-          {
-           "listeners" : {
-            "clicked" : "() => {\n    _this.el.response(-1);\n\tTicket.singleton().show(_this.repo);\n\n}"
-           },
-           "bool expand" : false,
-           "* pack" : "attach_defaults,4,5,1,2",
-           "xtype" : "Button",
-           "string label" : "New Ticket",
-           "$ xns" : "Gtk"
-          },
           {
            "label" : "Use this as branch name",
            "Gtk.Align halign" : "Gtk.Align.START",
@@ -491,7 +481,7 @@
            "listeners" : {
             "clicked" : "() => {\n\tGLib.debug(\"fire response = 1\");\n\t\n\t\n\tvar invalid = false;\n\t\n\t// validate first...\n\t_this.project_id.el.get_child().get_style_context().remove_class(\"warning\");\t\n\tif (_this.project_id.selectedProjectId() == \"\") {\n\t\t_this.project_id.el.get_child().get_style_context().add_class(\"warning\");\n\t\tinvalid = true;\n\t}\n\t\n\t_this.milestone_id.el.get_child().get_style_context().remove_class(\"warning\");\t\n\n\t_this.priority_id.el.get_child().get_style_context().remove_class(\"warning\");\t\n\tif (_this.priority_id.selectedPriorityId() == \"\") {\n\t\t_this.priority_id.el.get_child().get_style_context().add_class(\"warning\");\n\t\tinvalid = true;\n\t}\n\t\n\t_this.classification_id.el.get_child().get_style_context().remove_class(\"warning\");\t\n\tif (_this.classification_id.selectedClassificationId() == \"\") {\n\t\t_this.classification_id.el.get_child().get_style_context().add_class(\"warning\");\n\t\tinvalid = true;\n\t}\n\t\n\t_this.developer_id.el.get_child().get_style_context().remove_class(\"warning\");\t\n\tif (_this.developer_id.selectedDeveloperId() == \"\") {\n\t\t_this.developer_id.el.get_child().get_style_context().add_class(\"warning\");\n\t\tinvalid = true;\n\t}\n\t\n\t_this.summary.el.get_style_context().remove_class(\"warning\");\t\n\tif (_this.summary.el.get_text() == \"\") {\n\t\t_this.summary.el.get_style_context().add_class(\"warning\");\n\t\tinvalid = true;\n\t}\n\t\n\t_this.description.el.get_style_context().remove_class(\"warning\");\t\n \n\tif (invalid) {\n\t\treturn;\n\t}\n\tGLib.debug(\"for is valid\");\n\t\n\t_this.el.response(1);\n}"
            },
-           "label" : "Create Ticket",
+           "label" : "Create Ticket & Branch",
            "* init" : "{\n   this.el.get_style_context().add_class(\"suggested-action\");\n}\n",
            "xtype" : "Button",
            "* pack" : "attach_defaults,0,4,13,14",
@@ -506,7 +496,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"
+          }
+         ]
+        }
+       ]
       }
      ]
     }