From: Alan Knowles Date: Fri, 15 May 2015 09:38:32 +0000 (+0800) Subject: src/Builder4/MainWindow.bjs X-Git-Url: http://git.roojs.org/?a=commitdiff_plain;h=db7a2c92f9c50453cd8ac09ec43f9a435a444717;p=app.Builder.js src/Builder4/MainWindow.bjs src/Builder4/MainWindow.vala --- diff --git a/src/Builder4/MainWindow.bjs b/src/Builder4/MainWindow.bjs index 4587ce857..6368a1a95 100644 --- a/src/Builder4/MainWindow.bjs +++ b/src/Builder4/MainWindow.bjs @@ -11,7 +11,7 @@ "listeners" : { "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 Resources.singleton().checkResources();\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}" }, "id" : "MainWindow", "default_width" : 800, @@ -31,8 +31,8 @@ "items" : [ { "id" : "headerbar", - "* pack" : "set_titlebar", "xtype" : "HeaderBar", + "* pack" : "set_titlebar", "bool show_close_button" : true, "$ xns" : "Gtk", "string title" : "Application Builder", @@ -44,8 +44,8 @@ "items" : [ { "bool use_popover" : false, - "* pack" : "add", "xtype" : "MenuButton", + "* pack" : "add", "$ xns" : "Gtk", "items" : [ { @@ -59,9 +59,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}" }, + "string label" : "Open a new Window", "* pack" : "append", "xtype" : "MenuItem", - "string label" : "Open a new Window", "$ xns" : "Gtk" }, { @@ -73,26 +73,26 @@ "listeners" : { "activate" : " ( ) => {\n Resources.singleton().fetchStart();\n}" }, + "xtype" : "MenuItem", "string label" : "Download updated Resources", "* pack" : "append", - "xtype" : "MenuItem", "$ xns" : "Gtk" }, { "listeners" : { "activate" : "() => {\n About.singleton().el.show();\n }" }, + "* pack" : "append", "xtype" : "MenuItem", "string label" : "About the Builder", - "* pack" : "append", "$ xns" : "Gtk" } ] }, { + "utf8 icon_name" : "help-about", "* pack" : "set_image", "xtype" : "Image", - "utf8 icon_name" : "help-about", "$ xns" : "Gtk" } ] @@ -103,8 +103,8 @@ }, { "id" : "vbox", - "xtype" : "VBox", "* pack" : "add", + "xtype" : "VBox", "$ xns" : "Gtk", "$ homogeneous" : false, "items" : [ @@ -118,26 +118,26 @@ "items" : [ { "id" : "leftpane", - "* pack" : "add1", "xtype" : "VBox", + "* pack" : "add1", "$ xns" : "Gtk", "items" : [ { "id" : "editpane", - "* pack" : "pack_start,false,true,0", "xtype" : "VPaned", + "* pack" : "pack_start,false,true,0", "$ xns" : "Gtk", "items" : [ { "id" : "tree", - "* pack" : "add1", "xtype" : "VBox", + "* pack" : "add1", "$ xns" : "Gtk" }, { "id" : "props", - "* pack" : "add2", "xtype" : "VBox", + "* pack" : "add2", "$ xns" : "Gtk" } ] @@ -216,8 +216,8 @@ "items" : [ { "* init" : "((Gtk.Container)(this.el.get_widget())).add ( child_0.el);", - "* pack" : "add_child", "xtype" : "Actor", + "* pack" : "add_child", "$ xns" : "GtkClutter", "items" : [ { @@ -225,16 +225,16 @@ "clicked" : " ( ) => {\n \n _this.windowstate.switchState(WindowState.State.PREVIEW);\n \n\n}" }, "utf8 tooltip_text" : "Back", - "xtype" : "Button", "* pack" : false, + "xtype" : "Button", "width_request" : 50, "$ xns" : "Gtk", "height_request" : 50, "items" : [ { + "xtype" : "Image", "utf8 icon_name" : "go-previous", "* pack" : "set_image", - "xtype" : "Image", "$ xns" : "Gtk" } ] @@ -252,8 +252,8 @@ "items" : [ { "* init" : "((Gtk.Container)(this.el.get_widget())).add ( child_0.el);", - "xtype" : "Actor", "* pack" : "add_child", + "xtype" : "Actor", "$ xns" : "GtkClutter", "items" : [ { @@ -268,9 +268,9 @@ "$ tooltop_text" : "\"Open File\"", "items" : [ { + "* pack" : "set_image", "xtype" : "Image", "utf8 icon_name" : "document-open", - "* pack" : "set_image", "$ xns" : "Gtk" } ] @@ -288,8 +288,8 @@ "items" : [ { "* init" : "((Gtk.Container)(this.el.get_widget())).add ( child_0.el);", - "xtype" : "Actor", "* pack" : "add_child", + "xtype" : "Actor", "$ xns" : "GtkClutter", "items" : [ { @@ -304,9 +304,9 @@ "height_request" : 50, "items" : [ { + "utf8 icon_name" : "document-properties", "* pack" : "set_image", "xtype" : "Image", - "utf8 icon_name" : "document-properties", "$ xns" : "Gtk" } ] @@ -324,8 +324,8 @@ "items" : [ { "* init" : "((Gtk.Container)(this.el.get_widget())).add ( child_0.el);", - "xtype" : "Actor", "* pack" : "add_child", + "xtype" : "Actor", "$ xns" : "GtkClutter", "items" : [ { @@ -340,9 +340,9 @@ "height_request" : 50, "items" : [ { + "xtype" : "Image", "utf8 icon_name" : "emblem-system", "* pack" : "set_image", - "xtype" : "Image", "$ xns" : "Gtk" } ] @@ -364,8 +364,8 @@ "items" : [ { "* init" : "((Gtk.Container)(this.el.get_widget())).add ( child_0.el);", - "xtype" : "Actor", "* pack" : "add_child", + "xtype" : "Actor", "$ xns" : "GtkClutter", "items" : [ { @@ -380,9 +380,9 @@ "height_request" : 50, "items" : [ { + "* pack" : "set_image", "xtype" : "Image", "utf8 icon_name" : "list-add", - "* pack" : "set_image", "$ xns" : "Gtk" } ] @@ -400,8 +400,8 @@ "items" : [ { "* init" : "((Gtk.Container)(this.el.get_widget())).add ( child_0.el);", - "xtype" : "Actor", "* pack" : "add_child", + "xtype" : "Actor", "$ xns" : "GtkClutter", "items" : [ { @@ -416,9 +416,9 @@ "height_request" : 50, "items" : [ { + "utf8 icon_name" : "format-justify-left", "* pack" : "set_image", "xtype" : "Image", - "utf8 icon_name" : "format-justify-left", "$ xns" : "Gtk" } ] @@ -436,8 +436,8 @@ "items" : [ { "* init" : "((Gtk.Container)(this.el.get_widget())).add ( child_0.el);", - "xtype" : "Actor", "* pack" : "add_child", + "xtype" : "Actor", "$ xns" : "GtkClutter", "items" : [ { @@ -452,9 +452,9 @@ "height_request" : 50, "items" : [ { + "xtype" : "Image", "utf8 icon_name" : "appointment-new", "* pack" : "set_image", - "xtype" : "Image", "$ xns" : "Gtk" } ] @@ -472,8 +472,8 @@ "items" : [ { "* init" : "((Gtk.Container)(this.el.get_widget())).add ( child_0.el);", - "xtype" : "Actor", "* pack" : "add_child", + "xtype" : "Actor", "$ xns" : "GtkClutter", "items" : [ { @@ -488,9 +488,9 @@ "height_request" : 50, "items" : [ { + "utf8 icon_name" : "folder-new", "* pack" : "set_image", "xtype" : "Image", - "utf8 icon_name" : "folder-new", "$ xns" : "Gtk" } ] @@ -508,8 +508,8 @@ "items" : [ { "* init" : "((Gtk.Container)(this.el.get_widget())).add ( child_0.el);", - "xtype" : "Actor", "* pack" : "add_child", + "xtype" : "Actor", "$ xns" : "GtkClutter", "items" : [ { @@ -524,9 +524,9 @@ "height_request" : 50, "items" : [ { + "* pack" : "set_image", "xtype" : "Image", "utf8 icon_name" : "document-new", - "* pack" : "set_image", "$ xns" : "Gtk" } ] @@ -544,8 +544,8 @@ "items" : [ { "* init" : "((Gtk.Container)(this.el.get_widget())).add ( child_0.el);", - "xtype" : "Actor", "* pack" : "add_child", + "xtype" : "Actor", "$ xns" : "GtkClutter", "items" : [ { @@ -560,9 +560,9 @@ "height_request" : 50, "items" : [ { + "utf8 icon_name" : "user-trash", "* pack" : "set_image", "xtype" : "Image", - "utf8 icon_name" : "user-trash", "$ xns" : "Gtk" } ] @@ -581,14 +581,19 @@ }, { "bool homogeneous" : false, - "* pack" : "pack_end,false,true,0", "xtype" : "HBox", + "* pack" : "pack_end,false,true,0", "$ xns" : "Gtk", "items" : [ + { + "* pack" : "pack_start,true,true,0", + "xtype" : "Label", + "$ xns" : "Gtk" + }, { "bool show_text" : true, - "ulong handler_id" : "-1", "id" : "statusbar", + "ulong handler_id" : "-1", "* 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", @@ -608,9 +613,9 @@ "$ xns" : "Gtk", "items" : [ { + "xtype" : "Image", "utf8 icon_name" : "dialog-error", "* pack" : "set_image", - "xtype" : "Image", "$ xns" : "Gtk" } ] @@ -624,9 +629,9 @@ "$ xns" : "Gtk", "items" : [ { + "* pack" : "set_image", "xtype" : "Image", "utf8 icon_name" : "dialog-warning", - "* pack" : "set_image", "$ xns" : "Gtk" } ] @@ -640,9 +645,9 @@ "$ xns" : "Gtk", "items" : [ { + "utf8 icon_name" : "dialog-information", "* pack" : "set_image", "xtype" : "Image", - "utf8 icon_name" : "dialog-information", "$ xns" : "Gtk" } ] diff --git a/src/Builder4/MainWindow.vala b/src/Builder4/MainWindow.vala index e66cfc07e..16280b40e 100644 --- a/src/Builder4/MainWindow.vala +++ b/src/Builder4/MainWindow.vala @@ -95,6 +95,11 @@ public class Xcls_MainWindow : Object //this.hideViewEditing(); _this.statusbar.el.hide(); + _this.statusbar_errors.el.hide(); + _this.statusbar_warnings.el.hide(); + _this.statusbar_depricated.el.hide(); + + Resources.singleton().checkResources(); }); @@ -2144,12 +2149,36 @@ public class Xcls_MainWindow : Object // my vars (dec) // set gobject values - var child_0 = new Xcls_statusbar( _this ); + var child_0 = new Xcls_Label67( _this ); child_0.ref(); this.el.pack_start ( child_0.el , true,true,0 ); - var child_1 = new Xcls_MenuBar68( _this ); + var child_1 = new Xcls_statusbar( _this ); child_1.ref(); - this.el.pack_end ( child_1.el , false,true,0 ); + this.el.pack_start ( child_1.el , true,true,0 ); + var child_2 = new Xcls_MenuBar69( _this ); + child_2.ref(); + this.el.pack_end ( child_2.el , false,true,0 ); + } + + // user defined functions + } + public class Xcls_Label67 : Object + { + public Gtk.Label el; + private Xcls_MainWindow _this; + + + // my vars (def) + + // ctor + public Xcls_Label67(Xcls_MainWindow _owner ) + { + _this = _owner; + this.el = new Gtk.Label( null ); + + // my vars (dec) + + // set gobject values } // user defined functions @@ -2197,7 +2226,7 @@ public class Xcls_MainWindow : Object // user defined functions } - public class Xcls_MenuBar68 : Object + public class Xcls_MenuBar69 : Object { public Gtk.MenuBar el; private Xcls_MainWindow _this; @@ -2206,7 +2235,7 @@ public class Xcls_MainWindow : Object // my vars (def) // ctor - public Xcls_MenuBar68(Xcls_MainWindow _owner ) + public Xcls_MenuBar69(Xcls_MainWindow _owner ) { _this = _owner; this.el = new Gtk.MenuBar(); @@ -2247,14 +2276,14 @@ public class Xcls_MainWindow : Object // set gobject values this.el.always_show_image = true; this.el.label = "Errors"; - var child_0 = new Xcls_Image70( _this ); + var child_0 = new Xcls_Image71( _this ); child_0.ref(); this.el.set_image ( child_0.el ); } // user defined functions } - public class Xcls_Image70 : Object + public class Xcls_Image71 : Object { public Gtk.Image el; private Xcls_MainWindow _this; @@ -2263,7 +2292,7 @@ public class Xcls_MainWindow : Object // my vars (def) // ctor - public Xcls_Image70(Xcls_MainWindow _owner ) + public Xcls_Image71(Xcls_MainWindow _owner ) { _this = _owner; this.el = new Gtk.Image(); @@ -2296,14 +2325,14 @@ public class Xcls_MainWindow : Object // set gobject values this.el.always_show_image = true; this.el.label = "Warnings"; - var child_0 = new Xcls_Image72( _this ); + var child_0 = new Xcls_Image73( _this ); child_0.ref(); this.el.set_image ( child_0.el ); } // user defined functions } - public class Xcls_Image72 : Object + public class Xcls_Image73 : Object { public Gtk.Image el; private Xcls_MainWindow _this; @@ -2312,7 +2341,7 @@ public class Xcls_MainWindow : Object // my vars (def) // ctor - public Xcls_Image72(Xcls_MainWindow _owner ) + public Xcls_Image73(Xcls_MainWindow _owner ) { _this = _owner; this.el = new Gtk.Image(); @@ -2345,14 +2374,14 @@ public class Xcls_MainWindow : Object // set gobject values this.el.always_show_image = true; this.el.label = "Depricated"; - var child_0 = new Xcls_Image74( _this ); + var child_0 = new Xcls_Image75( _this ); child_0.ref(); this.el.set_image ( child_0.el ); } // user defined functions } - public class Xcls_Image74 : Object + public class Xcls_Image75 : Object { public Gtk.Image el; private Xcls_MainWindow _this; @@ -2361,7 +2390,7 @@ public class Xcls_MainWindow : Object // my vars (def) // ctor - public Xcls_Image74(Xcls_MainWindow _owner ) + public Xcls_Image75(Xcls_MainWindow _owner ) { _this = _owner; this.el = new Gtk.Image();