Fix #7368 - auto show menu items

diff --git a/src/Builder4/MainWindow.vala b/src/Builder4/MainWindow.vala
index 922d90b..1a9a8c7 100644 (file)
--- a/src/Builder4/MainWindow.vala
+++ b/src/Builder4/MainWindow.vala
@@ -340,6 +340,7 @@ public class Xcls_MainWindow : Object
 
             // set gobject values
             this.el.label = "New Window";
+            this.el.show_all();
 
             //listeners
             this.el.activate.connect( ( ) => {
@@ -368,6 +369,7 @@ public class Xcls_MainWindow : Object
             // my vars (dec)
 
             // set gobject values
+            this.el.show_all();
         }
 
         // user defined functions
@@ -932,6 +934,7 @@ public class Xcls_MainWindow : Object
 
             // set gobject values
             this.el.label = "Download updated Resources";
+            this.el.show_all();
 
             //listeners
             this.el.activate.connect( ( ) => {
@@ -960,6 +963,7 @@ public class Xcls_MainWindow : Object
 
             // set gobject values
             this.el.label = "About the Builder";
+            this.el.show_all();
 
             //listeners
             this.el.activate.connect( () => {
@@ -1116,6 +1120,7 @@ public class Xcls_MainWindow : Object
 
             // set gobject values
             this.el.label = "Compile Status:";
+            this.el.show_all();
         }
 
         // user defined functions
@@ -1147,6 +1152,7 @@ public class Xcls_MainWindow : Object
             var child_0 = new Xcls_Image35( _this );
             child_0.ref();
             this.el.set_image (  child_0.el  );
+            this.el.show_all();
 
             //listeners
             this.el.button_press_event.connect( () => {
@@ -1219,6 +1225,7 @@ public class Xcls_MainWindow : Object
             var child_0 = new Xcls_Image37( _this );
             child_0.ref();
             this.el.set_image (  child_0.el  );
+            this.el.show_all();
 
             //listeners
             this.el.button_press_event.connect( () => {
@@ -1290,6 +1297,7 @@ public class Xcls_MainWindow : Object
             var child_0 = new Xcls_Image39( _this );
             child_0.ref();
             this.el.set_image (  child_0.el  );
+            this.el.show_all();
 
             //listeners
             this.el.button_press_event.connect( () => {
@@ -1360,6 +1368,7 @@ public class Xcls_MainWindow : Object
             var child_0 = new Xcls_Image41( _this );
             child_0.ref();
             this.el.set_image (  child_0.el  );
+            this.el.show_all();
 
             //listeners
             this.el.button_press_event.connect( () => {

diff --git a/src/Builder4/WindowLeftTree.bjs b/src/Builder4/WindowLeftTree.bjs
index 7ff79cc..4769803 100644 (file)
--- a/src/Builder4/WindowLeftTree.bjs
+++ b/src/Builder4/WindowLeftTree.bjs
@@ -865,12 +865,12 @@
         "cursor_changed" : [
          " ( ) => {",
          "    print(\"LEFT TREE Cursor Changed\\n\");",
-         "\tif (!this.button_is_pressed && !this.key_is_pressed) {",
+         "\t//if (!this.button_is_pressed && !this.key_is_pressed) {",
          "\t\t// then event was started by some other action",
          "\t\t// which should manually trigger all the events..",
-         "\t\tprint(\"SKIPPING select - no button or key pressed\\n\");",
-         "\t\treturn;",
-         "\t}",
+         "\t//\tprint(\"SKIPPING select - no button or key pressed\\n\");",
+         "\t//\treturn;",
+         "\t//}",
          "",
          "",
          "     if (this.blockChanges) { // probably not needed.. ",

diff --git a/src/Builder4/WindowLeftTree.vala b/src/Builder4/WindowLeftTree.vala
index f7f5b34..ad39952 100644 (file)
--- a/src/Builder4/WindowLeftTree.vala
+++ b/src/Builder4/WindowLeftTree.vala
@@ -272,12 +272,12 @@ public class Xcls_WindowLeftTree : Object
             });
             this.el.cursor_changed.connect( ( ) => {
                 print("LEFT TREE Cursor Changed\n");
-               if (!this.button_is_pressed && !this.key_is_pressed) {
+               //if (!this.button_is_pressed && !this.key_is_pressed) {
                        // then event was started by some other action
                        // which should manually trigger all the events..
-                       print("SKIPPING select - no button or key pressed\n");
-                       return;
-               }
+               //      print("SKIPPING select - no button or key pressed\n");
+               //      return;
+               //}
             
             
                  if (this.blockChanges) { // probably not needed.. 

diff --git a/src/Builder4/WindowRooView.bjs b/src/Builder4/WindowRooView.bjs
index e02260d..e066de4 100644 (file)
--- a/src/Builder4/WindowRooView.bjs
+++ b/src/Builder4/WindowRooView.bjs
@@ -987,7 +987,7 @@
             "    ",
             "    this.node_selected = sel;",
             "    ",
-            "    this.updateGreySelection(scroll);",
+            "   // this.updateGreySelection(scroll);",
             "    ",
             "    ",
             "    ",
@@ -1061,7 +1061,7 @@
             "            }",
             "            ltree.view.setCursor(tp, \"editor\");",
             "           // ltree.view.el.set_cursor(new Gtk.TreePath.from_string(tp), null, false); ",
-            "           this.nodeSelected(node,false);",
+            "           //this.nodeSelected(node,false);",
             "            ",
             "            // scrolling is disabled... as node selection calls scroll 10ms after it changes.",
             "             ",

diff --git a/src/Builder4/WindowRooView.vala b/src/Builder4/WindowRooView.vala
index 1027b68..dbbf4b9 100644 (file)
--- a/src/Builder4/WindowRooView.vala
+++ b/src/Builder4/WindowRooView.vala
@@ -1345,7 +1345,7 @@ public class Xcls_WindowRooView : Object
                     }
                     ltree.view.setCursor(tp, "editor");
                    // ltree.view.el.set_cursor(new Gtk.TreePath.from_string(tp), null, false); 
-                   this.nodeSelected(node,false);
+                   //this.nodeSelected(node,false);
                     
                     // scrolling is disabled... as node selection calls scroll 10ms after it changes.
                      
@@ -1367,7 +1367,7 @@ public class Xcls_WindowRooView : Object
             
             this.node_selected = sel;
             
-            this.updateGreySelection(scroll);
+           // this.updateGreySelection(scroll);
             
             
             

diff --git a/src/Builder4/WindowState.vala b/src/Builder4/WindowState.vala
index 16ad572..4629069 100644 (file)
--- a/src/Builder4/WindowState.vala
+++ b/src/Builder4/WindowState.vala
@@ -127,9 +127,9 @@ public class WindowState : Object
                });
                // node selected -- only by clicking?
                this.left_tree.node_selected.connect((sel, source) => {
-                       if (source == "editor") {
-                               return;
-                       }
+                       //if (source == "editor") {
+                       //      return;
+                       //}
                        if (this.file.xtype == "Roo") { 
                                this.window_rooview.sourceview.nodeSelected(sel,true); // foce scroll.
                        } else {

diff --git a/src/JsRender/NodeToVala.vala b/src/JsRender/NodeToVala.vala
index 6178db3..8e3d55b 100644 (file)
--- a/src/JsRender/NodeToVala.vala
+++ b/src/JsRender/NodeToVala.vala
@@ -188,6 +188,8 @@ public class JsRender.NodeToVala : Object {
                this.addInitMyVars();
                this.addWrappedProperties();
                this.addChildren();
+               this.addAutoShow(); // autoshow menuitems
+               
                this.addInit();
                this.addListeners();
                this.addEndCtor();
@@ -615,6 +617,24 @@ public class JsRender.NodeToVala : Object {
                
 
                        
+       }
+       public static Gee.ArrayList<string> menuitem_children = null;
+       
+       void addAutoShow()
+       {
+               if (menuitem_children == null) {
+                       menuitem_children = new Gee.ArrayList<string>();
+                       menuitem_children.add("Gtk.MenuItem");
+                       var gir = this.file.project.palete.getClass("Gtk.MenuItem");
+                       foreach(var impl in gir.implementations) {
+                               menuitem_children.add(impl);
+                       }
+               }
+
+               if (menuitem_children.contains(this.node.fqn())) {
+                       this.addLine(this.ipad + "this.el.show();");
+               
+               }
        }
 
        void addInitMyVars()

diff --git a/src/Palete/Gtk.vala b/src/Palete/Gtk.vala
index 202d2f0..6e968ae 100644 (file)
--- a/src/Palete/Gtk.vala
+++ b/src/Palete/Gtk.vala
@@ -293,7 +293,10 @@ namespace Palete {
                                        continue;
                                }
                                this.generic_child_widgets.add(fqn);
-                               this.add_special_children(fqn, "Gtk.Menu", "_menu"); // fake propety
+                               
+                               
+                               
+                               //this.add_special_children(fqn, "Gtk.Menu", "_menu"); // fake propety
                        }
                
                }