src/Builder4/MainWindow.bjs

src/Builder4/MainWindow.vala

diff --git a/src/Builder4/MainWindow.bjs b/src/Builder4/MainWindow.bjs
index 3f0c14e..127aeee 100644 (file)
--- a/src/Builder4/MainWindow.bjs
+++ b/src/Builder4/MainWindow.bjs
@@ -12,7 +12,7 @@
     "delete_event" : "  (   event) => {\n    return false;\n} ",
     "destroy" : "() =>  {\n Xcls_MainWindow.singleton().no_windows--;\n \n Resources.singleton().disconnect(_this.statusbar.handler_id);\n \n \n if (Xcls_MainWindow.singleton().no_windows < 1) {\n\n     Gtk.main_quit();\n }\n}",
     "show" : "  ( ) => {\n    // hide the file editing..\n   \n    //this.hideViewEditing();\n    _this.statusbar.el.hide();\n     _this.statusbar_errors.el.hide();\n    _this.statusbar_warnings.el.hide();\n    _this.statusbar_depricated.el.hide();\n    \n  \n    Resources.singleton().checkResources();\n\n}",
-    "key_release_event" : " (event) => {\n    \n    if (this.search_entry.el.is_visible()) {\n\t\tif (event.keyval == Gdk.Key.f && (event.state & Gdk.ModifierType.CONTROL_MASK ) > 0 ) {\n\t\t    print(\"SAVE: ctrl-f  pressed\");\n\t\t\tthis.search_entry.el.grab_focus();\n\t\t    return false;\n\t\t}\n\t\t\n\t\t  if (event.keyval == Gdk.Key.g && (event.state & Gdk.ModifierType.CONTROL_MASK ) > 0 ) {\n\t\t    print(\"SAVE: ctrl-g  pressed\");\n\t\t\tthis.search_entry.forwardSearch(true);\n\t\t    return false;\n\t\t}\n\t}    \n   // print(event.key.keyval)\n    \n    return false;\n\n} \n\n"
+    "key_release_event" : " (event) => {\n    \n    if (this.search_entry.el.is_visible()) {\n\t\tif (event.keyval == Gdk.Key.f && (event.state & Gdk.ModifierType.CONTROL_MASK ) > 0 ) {\n\t\t    print(\"SAVE: ctrl-f  pressed\");\n\t\t\tthis.search_entry.el.grab_focus();\n\t\t    return false;\n\t\t}\n\t\t\n\t\tif (event.keyval == Gdk.Key.g && (event.state & Gdk.ModifierType.CONTROL_MASK ) > 0 ) {\n\t\t    print(\"SAVE: ctrl-g  pressed\");\n\t\t\tthis.search_entry.forwardSearch(true);\n\t\t    return false;\n\t\t}\n\t\t\n\t}    \n\t\n\tif (event.keyval == Gdk.Key.n && (event.state & Gdk.ModifierType.CONTROL_MASK ) > 0 ) {\n\t\tprint(\"SAVE: ctrl-n  pressed\");\n\n\t\treturn false;\n\t}\n\t\n   // print(event.key.keyval)\n    \n    return false;\n\n} \n\n"
    },
    "id" : "MainWindow",
    "default_width" : 800,
@@ -32,8 +32,8 @@
    "items" : [
     {
      "id" : "headerbar",
-     "xtype" : "HeaderBar",
      "* pack" : "set_titlebar",
+     "xtype" : "HeaderBar",
      "bool show_close_button" : true,
      "$ xns" : "Gtk",
      "string title" : "Application Builder",
@@ -46,8 +46,8 @@
        "items" : [
         {
          "bool use_popover" : false,
-         "xtype" : "MenuButton",
          "* pack" : "add",
+         "xtype" : "MenuButton",
          "$ xns" : "Gtk",
          "items" : [
           {
@@ -61,9 +61,9 @@
              "listeners" : {
               "activate" : "  ( ) => {\n        Xcls_MainWindow.singleton().no_windows++;\n        var w = new Xcls_MainWindow();\n        w.ref();\n\n        w.el.show_all();\n        w.initChildren();\n        w.windowstate.switchState(WindowState.State.FILES);\n}"
              },
+             "* pack" : "append",
              "xtype" : "MenuItem",
              "string label" : "Open a new Window",
-             "* pack" : "append",
              "$ xns" : "Gtk"
             },
             {
@@ -75,26 +75,26 @@
              "listeners" : {
               "activate" : " ( ) => {\n         Resources.singleton().fetchStart();\n}"
              },
+             "string label" : "Download updated Resources",
              "* pack" : "append",
              "xtype" : "MenuItem",
-             "string label" : "Download updated Resources",
              "$ xns" : "Gtk"
             },
             {
              "listeners" : {
               "activate" : "() => {\n    About.singleton().el.show();\n    }"
              },
+             "xtype" : "MenuItem",
              "string label" : "About the Builder",
              "* pack" : "append",
-             "xtype" : "MenuItem",
              "$ xns" : "Gtk"
             }
            ]
           },
           {
+           "* pack" : "set_image",
            "xtype" : "Image",
            "utf8 icon_name" : "help-about",
-           "* pack" : "set_image",
            "$ xns" : "Gtk"
           }
          ]
@@ -105,8 +105,8 @@
     },
     {
      "id" : "vbox",
-     "* pack" : "add",
      "xtype" : "Box",
+     "* pack" : "add",
      "$ xns" : "Gtk",
      "Gtk.Orientation orientation" : "Gtk.Orientation.VERTICAL",
      "$ homogeneous" : false,
@@ -122,29 +122,29 @@
        "items" : [
         {
          "id" : "leftpane",
-         "xtype" : "Box",
          "* pack" : "add1",
+         "xtype" : "Box",
          "$ xns" : "Gtk",
          "Gtk.Orientation orientation" : "Gtk.Orientation.VERTICAL",
          "items" : [
           {
            "id" : "editpane",
-           "xtype" : "Paned",
            "* pack" : "pack_start,true,true,0",
+           "xtype" : "Paned",
            "$ xns" : "Gtk",
            "Gtk.Orientation orientation" : "Gtk.Orientation.VERTICAL",
            "items" : [
             {
              "id" : "tree",
-             "xtype" : "Box",
              "* pack" : "add1",
+             "xtype" : "Box",
              "$ xns" : "Gtk",
              "Gtk.Orientation orientation" : "Gtk.Orientation.VERTICAL"
             },
             {
              "id" : "props",
-             "xtype" : "Box",
              "* pack" : "add2",
+             "xtype" : "Box",
              "$ xns" : "Gtk",
              "Gtk.Orientation orientation" : "Gtk.Orientation.VERTICAL"
             }
@@ -225,8 +225,8 @@
                "items" : [
                 {
                  "* init" : "((Gtk.Container)(this.el.get_widget())).add ( child_0.el);",
-                 "xtype" : "Actor",
                  "* pack" : "add_child",
+                 "xtype" : "Actor",
                  "$ xns" : "GtkClutter",
                  "items" : [
                   {
@@ -234,16 +234,16 @@
                     "clicked" : "  ( ) => {\n  \n    _this.windowstate.switchState(WindowState.State.PREVIEW);\n    \n\n}"
                    },
                    "utf8 tooltip_text" : "Back",
-                   "* pack" : false,
                    "xtype" : "Button",
+                   "* pack" : false,
                    "width_request" : 50,
                    "$ xns" : "Gtk",
                    "height_request" : 50,
                    "items" : [
                     {
+                     "utf8 icon_name" : "go-previous",
                      "* pack" : "set_image",
                      "xtype" : "Image",
-                     "utf8 icon_name" : "go-previous",
                      "$ xns" : "Gtk"
                     }
                    ]
@@ -261,8 +261,8 @@
                "items" : [
                 {
                  "* init" : "((Gtk.Container)(this.el.get_widget())).add ( child_0.el);",
-                 "* pack" : "add_child",
                  "xtype" : "Actor",
+                 "* pack" : "add_child",
                  "$ xns" : "GtkClutter",
                  "items" : [
                   {
@@ -277,9 +277,9 @@
                    "$ tooltop_text" : "\"Open File\"",
                    "items" : [
                     {
+                     "xtype" : "Image",
                      "utf8 icon_name" : "document-open",
                      "* pack" : "set_image",
-                     "xtype" : "Image",
                      "$ xns" : "Gtk"
                     }
                    ]
@@ -297,8 +297,8 @@
                "items" : [
                 {
                  "* init" : "((Gtk.Container)(this.el.get_widget())).add ( child_0.el);",
-                 "* pack" : "add_child",
                  "xtype" : "Actor",
+                 "* pack" : "add_child",
                  "$ xns" : "GtkClutter",
                  "items" : [
                   {
@@ -313,9 +313,9 @@
                    "height_request" : 50,
                    "items" : [
                     {
+                     "* pack" : "set_image",
                      "xtype" : "Image",
                      "utf8 icon_name" : "document-properties",
-                     "* pack" : "set_image",
                      "$ xns" : "Gtk"
                     }
                    ]
@@ -333,8 +333,8 @@
                "items" : [
                 {
                  "* init" : "((Gtk.Container)(this.el.get_widget())).add ( child_0.el);",
-                 "* pack" : "add_child",
                  "xtype" : "Actor",
+                 "* pack" : "add_child",
                  "$ xns" : "GtkClutter",
                  "items" : [
                   {
@@ -349,9 +349,9 @@
                    "height_request" : 50,
                    "items" : [
                     {
+                     "utf8 icon_name" : "emblem-system",
                      "* pack" : "set_image",
                      "xtype" : "Image",
-                     "utf8 icon_name" : "emblem-system",
                      "$ xns" : "Gtk"
                     }
                    ]
@@ -373,8 +373,8 @@
                "items" : [
                 {
                  "* init" : "((Gtk.Container)(this.el.get_widget())).add ( child_0.el);",
-                 "* pack" : "add_child",
                  "xtype" : "Actor",
+                 "* pack" : "add_child",
                  "$ xns" : "GtkClutter",
                  "items" : [
                   {
@@ -389,9 +389,9 @@
                    "height_request" : 50,
                    "items" : [
                     {
+                     "xtype" : "Image",
                      "utf8 icon_name" : "list-add",
                      "* pack" : "set_image",
-                     "xtype" : "Image",
                      "$ xns" : "Gtk"
                     }
                    ]
@@ -409,8 +409,8 @@
                "items" : [
                 {
                  "* init" : "((Gtk.Container)(this.el.get_widget())).add ( child_0.el);",
-                 "* pack" : "add_child",
                  "xtype" : "Actor",
+                 "* pack" : "add_child",
                  "$ xns" : "GtkClutter",
                  "items" : [
                   {
@@ -425,9 +425,9 @@
                    "height_request" : 50,
                    "items" : [
                     {
+                     "* pack" : "set_image",
                      "xtype" : "Image",
                      "utf8 icon_name" : "format-justify-left",
-                     "* pack" : "set_image",
                      "$ xns" : "Gtk"
                     }
                    ]
@@ -445,8 +445,8 @@
                "items" : [
                 {
                  "* init" : "((Gtk.Container)(this.el.get_widget())).add ( child_0.el);",
-                 "* pack" : "add_child",
                  "xtype" : "Actor",
+                 "* pack" : "add_child",
                  "$ xns" : "GtkClutter",
                  "items" : [
                   {
@@ -461,9 +461,9 @@
                    "height_request" : 50,
                    "items" : [
                     {
+                     "utf8 icon_name" : "appointment-new",
                      "* pack" : "set_image",
                      "xtype" : "Image",
-                     "utf8 icon_name" : "appointment-new",
                      "$ xns" : "Gtk"
                     }
                    ]
@@ -481,8 +481,8 @@
                "items" : [
                 {
                  "* init" : "((Gtk.Container)(this.el.get_widget())).add ( child_0.el);",
-                 "* pack" : "add_child",
                  "xtype" : "Actor",
+                 "* pack" : "add_child",
                  "$ xns" : "GtkClutter",
                  "items" : [
                   {
@@ -497,9 +497,9 @@
                    "height_request" : 50,
                    "items" : [
                     {
+                     "* pack" : "set_image",
                      "xtype" : "Image",
                      "utf8 icon_name" : "folder-new",
-                     "* pack" : "set_image",
                      "$ xns" : "Gtk"
                     }
                    ]
@@ -517,8 +517,8 @@
                "items" : [
                 {
                  "* init" : "((Gtk.Container)(this.el.get_widget())).add ( child_0.el);",
-                 "* pack" : "add_child",
                  "xtype" : "Actor",
+                 "* pack" : "add_child",
                  "$ xns" : "GtkClutter",
                  "items" : [
                   {
@@ -533,9 +533,9 @@
                    "height_request" : 50,
                    "items" : [
                     {
+                     "xtype" : "Image",
                      "utf8 icon_name" : "document-new",
                      "* pack" : "set_image",
-                     "xtype" : "Image",
                      "$ xns" : "Gtk"
                     }
                    ]
@@ -553,8 +553,8 @@
                "items" : [
                 {
                  "* init" : "((Gtk.Container)(this.el.get_widget())).add ( child_0.el);",
-                 "* pack" : "add_child",
                  "xtype" : "Actor",
+                 "* pack" : "add_child",
                  "$ xns" : "GtkClutter",
                  "items" : [
                   {
@@ -569,9 +569,9 @@
                    "height_request" : 50,
                    "items" : [
                     {
+                     "* pack" : "set_image",
                      "xtype" : "Image",
                      "utf8 icon_name" : "user-trash",
-                     "* pack" : "set_image",
                      "$ xns" : "Gtk"
                     }
                    ]
@@ -590,21 +590,21 @@
       },
       {
        "bool homogeneous" : false,
-       "xtype" : "Box",
        "* pack" : "pack_end,false,true,0",
+       "xtype" : "Box",
        "$ xns" : "Gtk",
        "Gtk.Orientation orientation" : "Gtk.Orientation.HORIZONTAL",
        "items" : [
         {
+         "xtype" : "Label",
          "string label" : "   ",
          "* pack" : "pack_start,true,true,0",
-         "xtype" : "Label",
          "$ xns" : "Gtk"
         },
         {
          "bool show_text" : true,
-         "id" : "statusbar",
          "ulong handler_id" : "-1",
+         "id" : "statusbar",
          "* init" : "{\n     this.handler_id = Resources.singleton().updateProgress.connect((pos,total) => {\n        if (pos < 1) {\n            this.el.hide();\n            _this.mainpane.el.set_sensitive(true);\n            \n            return;\n        }\n         _this.mainpane.el.set_sensitive(false);\n         this.el.show();\n         this.el.set_fraction ((1.0f * pos) / (1.0f * total));\n         this.el.set_text(\"Fetching Resource : %s/%s\".printf(pos.to_string(), total.to_string()));\n       \n     });\n}\n",
          "xtype" : "ProgressBar",
          "* pack" : "pack_start,true,true,0",
@@ -640,9 +640,9 @@
            "$ xns" : "Gtk",
            "items" : [
             {
+             "xtype" : "Image",
              "utf8 icon_name" : "system-search",
              "* pack" : "set_image",
-             "xtype" : "Image",
              "bool sensitive" : false,
              "$ xns" : "Gtk"
             }
@@ -650,8 +650,8 @@
           },
           {
            "id" : "statusbar_compilestatus_label",
-           "* pack" : "add",
            "xtype" : "MenuItem",
+           "* pack" : "add",
            "string label" : "Compile Status:",
            "$ xns" : "Gtk"
           },
@@ -670,9 +670,9 @@
            "$ xns" : "Gtk",
            "items" : [
             {
+             "utf8 icon_name" : "dialog-error",
              "* pack" : "set_image",
              "xtype" : "Image",
-             "utf8 icon_name" : "dialog-error",
              "$ xns" : "Gtk"
             }
            ]
@@ -692,9 +692,9 @@
            "$ xns" : "Gtk",
            "items" : [
             {
+             "xtype" : "Image",
              "utf8 icon_name" : "dialog-warning",
              "* pack" : "set_image",
-             "xtype" : "Image",
              "$ xns" : "Gtk"
             }
            ]
@@ -714,9 +714,9 @@
            "$ xns" : "Gtk",
            "items" : [
             {
+             "* pack" : "set_image",
              "xtype" : "Image",
              "utf8 icon_name" : "dialog-information",
-             "* pack" : "set_image",
              "$ xns" : "Gtk"
             }
            ]
@@ -734,9 +734,9 @@
            "$ xns" : "Gtk",
            "items" : [
             {
+             "xtype" : "Image",
              "utf8 icon_name" : "media-playback-start",
              "* pack" : "set_image",
-             "xtype" : "Image",
              "$ xns" : "Gtk"
             }
            ]

diff --git a/src/Builder4/MainWindow.vala b/src/Builder4/MainWindow.vala
index c4e3d79..f74dfe9 100644 (file)
--- a/src/Builder4/MainWindow.vala
+++ b/src/Builder4/MainWindow.vala
@@ -116,12 +116,20 @@ public class Xcls_MainWindow : Object
                            return false;
                        }
                        
-                         if (event.keyval == Gdk.Key.g && (event.state & Gdk.ModifierType.CONTROL_MASK ) > 0 ) {
+                       if (event.keyval == Gdk.Key.g && (event.state & Gdk.ModifierType.CONTROL_MASK ) > 0 ) {
                            print("SAVE: ctrl-g  pressed");
                                this.search_entry.forwardSearch(true);
                            return false;
                        }
+                       
                }    
+               
+               if (event.keyval == Gdk.Key.n && (event.state & Gdk.ModifierType.CONTROL_MASK ) > 0 ) {
+                       print("SAVE: ctrl-n  pressed");
+        
+                       return false;
+               }
+               
            // print(event.key.keyval)
             
             return false;