change property type dialog to use dropdown (has bug with popover autohide, but added...
[roobuilder] / src / Builder4 / PopoverProperty.vala
index bc4df81..7de01f9 100644 (file)
@@ -13,25 +13,24 @@ public class Xcls_PopoverProperty : Object
                return _PopoverProperty;
        }
        public Xcls_header header;
+       public Xcls_cancelbtn cancelbtn;
        public Xcls_headertitle headertitle;
+       public Xcls_savebtn savebtn;
        public Xcls_ptype ptype;
-       public Xcls_pselmodel pselmodel;
-       public Xcls_pmodel pmodel;
        public Xcls_ktype ktype;
        public Xcls_kname kname;
        public Xcls_error error;
-       public Xcls_buttonbar buttonbar;
 
                // my vars (def)
        public bool is_new;
        public Gtk.PositionType position;
        public signal void success (Project.Project pr, JsRender.JsRender file);
        public string key_type;
-       public JsRender.NodeProp? prop;
-       public bool done;
        public Xcls_MainWindow mainwindow;
        public JsRender.Node node;
        public JsRender.NodeProp? original_prop;
+       public JsRender.NodeProp? prop;
+       public bool done;
        public string old_keyname;
 
        // ctor
@@ -43,14 +42,14 @@ public class Xcls_PopoverProperty : Object
                // my vars (dec)
                this.is_new = false;
                this.position = Gtk.PositionType.RIGHT;
-               this.prop = null;
-               this.done = false;
                this.mainwindow = null;
                this.original_prop = null;
+               this.prop = null;
+               this.done = false;
 
                // set gobject values
                this.el.autohide = true;
-               var child_1 = new Xcls_Box2( _this );
+               var child_1 = new Xcls_Box1( _this );
                child_1.ref();
                this.el.set_child ( child_1.el  );
 
@@ -182,16 +181,18 @@ public class Xcls_PopoverProperty : Object
                 GLib.debug("SHOWALL - POPIP\n");
                
                this.kname.el.grab_focus();
-               this.buttonbar.el.hide();
+               this.savebtn.el.set_label("Save");
+               this.cancelbtn.el.visible = false;
                if (this.is_new) {
-                       this.buttonbar.el.show();
+                       this.savebtn.el.set_label("Add Property");
+                       this.cancelbtn.el.visible = true;
                }
                this.error.setError("");
                this.el.show();
                //this.success = c.success;
         
        }
-       public class Xcls_Box2 : Object
+       public class Xcls_Box1 : Object
        {
                public Gtk.Box el;
                private Xcls_PopoverProperty  _this;
@@ -200,7 +201,7 @@ public class Xcls_PopoverProperty : Object
                        // my vars (def)
 
                // ctor
-               public Xcls_Box2(Xcls_PopoverProperty _owner )
+               public Xcls_Box1(Xcls_PopoverProperty _owner )
                {
                        _this = _owner;
                        this.el = new Gtk.Box( Gtk.Orientation.VERTICAL, 0 );
@@ -211,29 +212,30 @@ public class Xcls_PopoverProperty : Object
                        this.el.homogeneous = false;
                        new Xcls_header( _this );
                        this.el.append( _this.header.el );
+                       var child_2 = new Xcls_Label4( _this );
+                       child_2.ref();
+                       this.el.append( child_2.el );
                        new Xcls_ptype( _this );
                        this.el.append( _this.ptype.el );
-                       var child_3 = new Xcls_Label10( _this );
-                       child_3.ref();
-                       this.el.append( child_3.el );
+                       var child_4 = new Xcls_Label7( _this );
+                       child_4.ref();
+                       this.el.append( child_4.el );
                        new Xcls_ktype( _this );
                        this.el.append( _this.ktype.el );
-                       var child_5 = new Xcls_Label12( _this );
-                       child_5.ref();
-                       this.el.append( child_5.el );
+                       var child_6 = new Xcls_Label9( _this );
+                       child_6.ref();
+                       this.el.append( child_6.el );
                        new Xcls_kname( _this );
                        this.el.append( _this.kname.el );
                        new Xcls_error( _this );
                        this.el.append( _this.error.el );
-                       new Xcls_buttonbar( _this );
-                       this.el.append( _this.buttonbar.el );
                }
 
                // user defined functions
        }
        public class Xcls_header : Object
        {
-               public Gtk.HeaderBar el;
+               public Gtk.Box el;
                private Xcls_PopoverProperty  _this;
 
 
@@ -244,224 +246,250 @@ public class Xcls_PopoverProperty : Object
                {
                        _this = _owner;
                        _this.header = this;
-                       this.el = new Gtk.HeaderBar();
+                       this.el = new Gtk.Box( Gtk.Orientation.HORIZONTAL, 0 );
 
                        // my vars (dec)
 
                        // set gobject values
-                       this.el.show_title_buttons = false;
+                       new Xcls_cancelbtn( _this );
+                       this.el.append( _this.cancelbtn.el );
                        new Xcls_headertitle( _this );
-                       this.el.title_widget = _this.headertitle.el;
+                       this.el.append( _this.headertitle.el );
+                       new Xcls_savebtn( _this );
+                       this.el.append( _this.savebtn.el );
                }
 
                // user defined functions
        }
-       public class Xcls_headertitle : Object
+       public class Xcls_cancelbtn : Object
        {
-               public Gtk.Label el;
+               public Gtk.Button el;
                private Xcls_PopoverProperty  _this;
 
 
                        // my vars (def)
+               public bool always_show_image;
 
                // ctor
-               public Xcls_headertitle(Xcls_PopoverProperty _owner )
+               public Xcls_cancelbtn(Xcls_PopoverProperty _owner )
                {
                        _this = _owner;
-                       _this.headertitle = this;
-                       this.el = new Gtk.Label( "Add / Edit property" );
+                       _this.cancelbtn = this;
+                       this.el = new Gtk.Button();
 
                        // my vars (dec)
+                       this.always_show_image = true;
 
                        // set gobject values
+                       this.el.hexpand = true;
+                       this.el.label = "Cancel";
+
+                       //listeners
+                       this.el.clicked.connect( () => {
+                               _this.prop = null;
+                               _this.is_new = false;
+                               _this.kname.el.set_text("Cancel");
+                               _this.el.hide();
+                               
+                       });
                }
 
                // user defined functions
        }
 
-
-       public class Xcls_ptype : Object
+       public class Xcls_headertitle : Object
        {
-               public Gtk.ColumnView el;
+               public Gtk.Label el;
                private Xcls_PopoverProperty  _this;
 
 
                        // my vars (def)
-               public bool show_separators;
 
                // ctor
-               public Xcls_ptype(Xcls_PopoverProperty _owner )
+               public Xcls_headertitle(Xcls_PopoverProperty _owner )
                {
                        _this = _owner;
-                       _this.ptype = this;
-                       new Xcls_pselmodel( _this );
-                       this.el = new Gtk.ColumnView( _this.pselmodel.el );
+                       _this.headertitle = this;
+                       this.el = new Gtk.Label( "Add / Edit property" );
 
                        // my vars (dec)
-                       this.show_separators = true;
 
                        // set gobject values
-                       this.el.show_row_separators = true;
-                       var child_2 = new Xcls_ColumnViewColumn8( _this );
-                       child_2.ref();
-                       this.el.append_column ( child_2.el  );
+                       this.el.hexpand = true;
                }
 
                // user defined functions
-               public JsRender.NodePropType getValue () {
-                       
-                       var li =  (JsRender.NodeProp) _this.pmodel.el.get_item(
-                               _this.pselmodel.el.get_selected()
-                               );
-                       return li.ptype;
-               
-               }
-               public void setValue (JsRender.NodePropType pt) 
-               {
-                       for (var i = 0; i < _this.pmodel.el.n_items; i++) {
-                               var li = (JsRender.NodeProp) _this.pmodel.el.get_item(i);
-                               if (li.ptype == pt) {
-                                       _this.pselmodel.el.set_selected(i);
-                                       return;
-                               }
-                       }
-                       GLib.debug("failed to set selected ptype");
-                       _this.pselmodel.el.set_selected(0);
-               }
        }
-       public class Xcls_pselmodel : Object
+
+       public class Xcls_savebtn : Object
        {
-               public Gtk.SingleSelection el;
+               public Gtk.Button el;
                private Xcls_PopoverProperty  _this;
 
 
                        // my vars (def)
+               public bool always_show_image;
 
                // ctor
-               public Xcls_pselmodel(Xcls_PopoverProperty _owner )
+               public Xcls_savebtn(Xcls_PopoverProperty _owner )
                {
                        _this = _owner;
-                       _this.pselmodel = this;
-                       new Xcls_pmodel( _this );
-                       this.el = new Gtk.SingleSelection( _this.pmodel.el );
+                       _this.savebtn = this;
+                       this.el = new Gtk.Button();
 
                        // my vars (dec)
+                       this.always_show_image = true;
 
                        // set gobject values
+                       this.el.hexpand = true;
+                       this.el.label = "Add Property";
+
+                       //listeners
+                       this.el.clicked.connect( () => {
+                               if (!_this.is_new) {
+                                       _this.el.hide();
+                               }
+                               
+                               // check if text is not empty..
+                               if ( _this.kname.el.get_text().strip().length < 1) {
+                               
+                                       // error should already be showing?
+                                       return;
+                               }
+                                
+                               // since we can't add listeners?!?!?
+                               // only check props.
+                               // check if property already exists in node.    
+                       
+                       
+                               var prop = new JsRender.NodeProp(
+                                       _this.kname.el.get_text().strip(),
+                                       _this.ptype.getValue(),
+                                       _this.ktype.el.get_text().strip(),
+                                       _this.prop.val
+                               );
+                       
+                               if (_this.node.props.has_key(prop.to_index_key())) {
+                                       _this.error.setError("Property already exists");
+                                       return; 
+                               }
+                               
+                               
+                               
+                               _this.node.add_prop(prop);
+                               // hide self
+                               _this.prop = null; // skip checks..
+                               _this.is_new = false;
+                               _this.el.hide();
+                               _this.mainwindow.windowstate.left_props.changed();
+                               _this.mainwindow.windowstate.left_props.view.editProp(prop);
+                       
+                               
+                               
+                       });
                }
 
                // user defined functions
        }
-       public class Xcls_pmodel : Object
+
+
+       public class Xcls_Label4 : Object
        {
-               public GLib.ListStore el;
+               public Gtk.Label el;
                private Xcls_PopoverProperty  _this;
 
 
                        // my vars (def)
 
                // ctor
-               public Xcls_pmodel(Xcls_PopoverProperty _owner )
+               public Xcls_Label4(Xcls_PopoverProperty _owner )
                {
                        _this = _owner;
-                       _this.pmodel = this;
-                       this.el = new GLib.ListStore(typeof(JsRender.NodeProp));;
+                       this.el = new Gtk.Label( "Property Type (eg. property or method)" );
 
                        // my vars (dec)
 
                        // set gobject values
-
-                       // init method
-
-                       {
-                       
-                       
-                               this.el.append( new JsRender.NodeProp.prop(""));
-                               this.el.append( new JsRender.NodeProp.raw(""));
-                               this.el.append( new JsRender.NodeProp.valamethod(""));
-                               this.el.append( new JsRender.NodeProp.special(""));     
-                               this.el.append( new JsRender.NodeProp.listener(""));            
-                               this.el.append( new JsRender.NodeProp.user(""));        
-                               this.el.append( new JsRender.NodeProp.sig("")); 
-                               
-                       
-                       }
+                       this.el.halign = Gtk.Align.START;
+                       this.el.justify = Gtk.Justification.LEFT;
+                       this.el.margin_top = 12;
+                       this.el.visible = true;
                }
 
                // user defined functions
        }
 
-
-       public class Xcls_ColumnViewColumn8 : Object
+       public class Xcls_ptype : Object
        {
-               public Gtk.ColumnViewColumn el;
+               public Gtk.DropDown el;
                private Xcls_PopoverProperty  _this;
 
 
                        // my vars (def)
 
                // ctor
-               public Xcls_ColumnViewColumn8(Xcls_PopoverProperty _owner )
+               public Xcls_ptype(Xcls_PopoverProperty _owner )
                {
                        _this = _owner;
-                       var child_1 = new Xcls_SignalListItemFactory9( _this );
+                       _this.ptype = this;
+                       var child_1 = new Xcls_StringList6( _this );
                        child_1.ref();
-                       this.el = new Gtk.ColumnViewColumn( "Property Type", child_1.el );
+                       this.el = new Gtk.DropDown( child_1.el, null );
 
                        // my vars (dec)
 
                        // set gobject values
+                       this.el.show_arrow = true;
+
+                       //listeners
+                       this.el.notify["selected"].connect( () => {
+                       
+                               _this.el.grab_focus(); // stop prevent autohide breaking.
+                        });
                }
 
                // user defined functions
+               public JsRender.NodePropType getValue () {
+                       var sl = this.el.model as Gtk.StringList;
+                       var str = sl.get_string(this.el.selected);
+                       return JsRender.NodePropType.nameToType(str);
+               }
+               public void setValue (JsRender.NodePropType ty) {
+                       var str = ty.to_name();
+                       var sl = this.el.model as Gtk.StringList;
+                       for(var i = 0; i < sl.get_n_items(); i++) {
+                               if(sl.get_string(i) == str) {
+                                       this.el.set_selected(i);
+                                       break;
+                               }
+                       }
+                       
+               }
        }
-       public class Xcls_SignalListItemFactory9 : Object
+       public class Xcls_StringList6 : Object
        {
-               public Gtk.SignalListItemFactory el;
+               public Gtk.StringList el;
                private Xcls_PopoverProperty  _this;
 
 
                        // my vars (def)
 
                // ctor
-               public Xcls_SignalListItemFactory9(Xcls_PopoverProperty _owner )
+               public Xcls_StringList6(Xcls_PopoverProperty _owner )
                {
                        _this = _owner;
-                       this.el = new Gtk.SignalListItemFactory();
+                       this.el = new Gtk.StringList( JsRender.NodePropType.get_pulldown_list() );
 
                        // my vars (dec)
 
                        // set gobject values
-
-                       //listeners
-                       this.el.setup.connect( (listitem) => {
-                       
-                                
-                               var label = new Gtk.Label("");
-                               label.xalign = 0;
-                                
-                               ((Gtk.ListItem)listitem).set_child(label);
-                               ((Gtk.ListItem)listitem).activatable = false;
-                               
-                       });
-                       this.el.bind.connect( (listitem) => {
-                       
-                               var lbl = (Gtk.Label) ((Gtk.ListItem)listitem).get_child(); 
-                               var np = (JsRender.NodeProp)((Gtk.ListItem)listitem).get_item();
-                        
-                               
-                         
-                               lbl.label = np.ptype.to_name();
-                                
-                       });
                }
 
                // user defined functions
        }
 
 
-
-       public class Xcls_Label10 : Object
+       public class Xcls_Label7 : Object
        {
                public Gtk.Label el;
                private Xcls_PopoverProperty  _this;
@@ -470,7 +498,7 @@ public class Xcls_PopoverProperty : Object
                        // my vars (def)
 
                // ctor
-               public Xcls_Label10(Xcls_PopoverProperty _owner )
+               public Xcls_Label7(Xcls_PopoverProperty _owner )
                {
                        _this = _owner;
                        this.el = new Gtk.Label( "Type or Return Type" );
@@ -511,7 +539,7 @@ public class Xcls_PopoverProperty : Object
                // user defined functions
        }
 
-       public class Xcls_Label12 : Object
+       public class Xcls_Label9 : Object
        {
                public Gtk.Label el;
                private Xcls_PopoverProperty  _this;
@@ -520,7 +548,7 @@ public class Xcls_PopoverProperty : Object
                        // my vars (def)
 
                // ctor
-               public Xcls_Label12(Xcls_PopoverProperty _owner )
+               public Xcls_Label9(Xcls_PopoverProperty _owner )
                {
                        _this = _owner;
                        this.el = new Gtk.Label( "Name" );
@@ -557,17 +585,17 @@ public class Xcls_PopoverProperty : Object
 
                        // set gobject values
                        this.el.visible = true;
-                       var child_1 = new Xcls_EventControllerFocus14( _this );
+                       var child_1 = new Xcls_EventControllerFocus11( _this );
                        child_1.ref();
                        this.el.add_controller(  child_1.el );
-                       var child_2 = new Xcls_EventControllerKey15( _this );
+                       var child_2 = new Xcls_EventControllerKey12( _this );
                        child_2.ref();
                        this.el.add_controller(  child_2.el );
                }
 
                // user defined functions
        }
-       public class Xcls_EventControllerFocus14 : Object
+       public class Xcls_EventControllerFocus11 : Object
        {
                public Gtk.EventControllerFocus el;
                private Xcls_PopoverProperty  _this;
@@ -576,7 +604,7 @@ public class Xcls_PopoverProperty : Object
                        // my vars (def)
 
                // ctor
-               public Xcls_EventControllerFocus14(Xcls_PopoverProperty _owner )
+               public Xcls_EventControllerFocus11(Xcls_PopoverProperty _owner )
                {
                        _this = _owner;
                        this.el = new Gtk.EventControllerFocus();
@@ -600,7 +628,7 @@ public class Xcls_PopoverProperty : Object
                // user defined functions
        }
 
-       public class Xcls_EventControllerKey15 : Object
+       public class Xcls_EventControllerKey12 : Object
        {
                public Gtk.EventControllerKey el;
                private Xcls_PopoverProperty  _this;
@@ -609,7 +637,7 @@ public class Xcls_PopoverProperty : Object
                        // my vars (def)
 
                // ctor
-               public Xcls_EventControllerKey15(Xcls_PopoverProperty _owner )
+               public Xcls_EventControllerKey12(Xcls_PopoverProperty _owner )
                {
                        _this = _owner;
                        this.el = new Gtk.EventControllerKey();
@@ -672,136 +700,5 @@ public class Xcls_PopoverProperty : Object
                }
        }
 
-       public class Xcls_buttonbar : Object
-       {
-               public Gtk.Box el;
-               private Xcls_PopoverProperty  _this;
-
-
-                       // my vars (def)
-
-               // ctor
-               public Xcls_buttonbar(Xcls_PopoverProperty _owner )
-               {
-                       _this = _owner;
-                       _this.buttonbar = this;
-                       this.el = new Gtk.Box( Gtk.Orientation.HORIZONTAL, 0 );
-
-                       // my vars (dec)
-
-                       // set gobject values
-                       this.el.margin_top = 20;
-                       var child_1 = new Xcls_Button18( _this );
-                       child_1.ref();
-                       this.el.append( child_1.el );
-                       var child_2 = new Xcls_Button19( _this );
-                       child_2.ref();
-                       this.el.append( child_2.el );
-               }
-
-               // user defined functions
-       }
-       public class Xcls_Button18 : Object
-       {
-               public Gtk.Button el;
-               private Xcls_PopoverProperty  _this;
-
-
-                       // my vars (def)
-               public bool always_show_image;
-
-               // ctor
-               public Xcls_Button18(Xcls_PopoverProperty _owner )
-               {
-                       _this = _owner;
-                       this.el = new Gtk.Button();
-
-                       // my vars (dec)
-                       this.always_show_image = true;
-
-                       // set gobject values
-                       this.el.hexpand = true;
-                       this.el.label = "Cancel";
-
-                       //listeners
-                       this.el.clicked.connect( () => {
-                               _this.prop = null;
-                               _this.is_new = false;
-                               _this.kname.el.set_text("Cancel");
-                               _this.el.hide();
-                               
-                       });
-               }
-
-               // user defined functions
-       }
-
-       public class Xcls_Button19 : Object
-       {
-               public Gtk.Button el;
-               private Xcls_PopoverProperty  _this;
-
-
-                       // my vars (def)
-               public bool always_show_image;
-
-               // ctor
-               public Xcls_Button19(Xcls_PopoverProperty _owner )
-               {
-                       _this = _owner;
-                       this.el = new Gtk.Button();
-
-                       // my vars (dec)
-                       this.always_show_image = true;
-
-                       // set gobject values
-                       this.el.hexpand = true;
-                       this.el.label = "Add Property";
-
-                       //listeners
-                       this.el.clicked.connect( () => {
-                               // check if text is not empty..
-                               if ( _this.kname.el.get_text().strip().length < 1) {
-                               
-                                       // error should already be showing?
-                                       return;
-                               }
-                                
-                               // since we can't add listeners?!?!?
-                               // only check props.
-                               // check if property already exists in node.    
-                       
-                       
-                               var prop = new JsRender.NodeProp(
-                                       _this.kname.el.get_text().strip(),
-                                       _this.ptype.getValue(),
-                                       _this.ktype.el.get_text().strip(),
-                                       _this.prop.val
-                               );
-                       
-                               if (_this.node.props.has_key(prop.to_index_key())) {
-                                       _this.error.setError("Property already exists");
-                                       return; 
-                               }
-                               
-                               
-                               
-                               _this.node.add_prop(prop);
-                               // hide self
-                               _this.prop = null; // skip checks..
-                               _this.is_new = false;
-                               _this.el.hide();
-                               _this.mainwindow.windowstate.left_props.changed();
-                               _this.mainwindow.windowstate.left_props.view.editProp(prop);
-                       
-                               
-                               
-                       });
-               }
-
-               // user defined functions
-       }
-
-
 
 }