From b56e322c9e16b666a0a01a31b7ea9ad4adc2f955 Mon Sep 17 00:00:00 2001 From: Alan Knowles Date: Mon, 18 May 2015 17:01:18 +0800 Subject: [PATCH] src/Builder4/MainWindow.bjs src/Builder4/MainWindow.vala --- src/Builder4/MainWindow.bjs | 80 ++++++++++++++++++------------------ src/Builder4/MainWindow.vala | 11 +++++ 2 files changed, 51 insertions(+), 40 deletions(-) diff --git a/src/Builder4/MainWindow.bjs b/src/Builder4/MainWindow.bjs index 515221b66..1bd410ec8 100644 --- a/src/Builder4/MainWindow.bjs +++ b/src/Builder4/MainWindow.bjs @@ -31,8 +31,8 @@ "items" : [ { "id" : "headerbar", - "xtype" : "HeaderBar", "* pack" : "set_titlebar", + "xtype" : "HeaderBar", "bool show_close_button" : true, "$ xns" : "Gtk", "string title" : "Application Builder", @@ -44,8 +44,8 @@ "items" : [ { "bool use_popover" : false, - "xtype" : "MenuButton", "* pack" : "add", + "xtype" : "MenuButton", "$ 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}" }, + "xtype" : "MenuItem", "string label" : "Open a new Window", "* pack" : "append", - "xtype" : "MenuItem", "$ xns" : "Gtk" }, { @@ -73,26 +73,26 @@ "listeners" : { "activate" : " ( ) => {\n Resources.singleton().fetchStart();\n}" }, + "* pack" : "append", "xtype" : "MenuItem", "string label" : "Download updated Resources", - "* pack" : "append", "$ xns" : "Gtk" }, { "listeners" : { "activate" : "() => {\n About.singleton().el.show();\n }" }, + "string label" : "About the Builder", "* pack" : "append", "xtype" : "MenuItem", - "string label" : "About the Builder", "$ xns" : "Gtk" } ] }, { + "xtype" : "Image", "utf8 icon_name" : "help-about", "* pack" : "set_image", - "xtype" : "Image", "$ xns" : "Gtk" } ] @@ -103,8 +103,8 @@ }, { "id" : "vbox", - "* pack" : "add", "xtype" : "VBox", + "* pack" : "add", "$ xns" : "Gtk", "$ homogeneous" : false, "items" : [ @@ -118,26 +118,26 @@ "items" : [ { "id" : "leftpane", - "xtype" : "VBox", "* pack" : "add1", + "xtype" : "VBox", "$ xns" : "Gtk", "items" : [ { "id" : "editpane", - "xtype" : "VPaned", "* pack" : "pack_start,false,true,0", + "xtype" : "VPaned", "$ xns" : "Gtk", "items" : [ { "id" : "tree", - "xtype" : "VBox", "* pack" : "add1", + "xtype" : "VBox", "$ xns" : "Gtk" }, { "id" : "props", - "xtype" : "VBox", "* pack" : "add2", + "xtype" : "VBox", "$ xns" : "Gtk" } ] @@ -216,8 +216,8 @@ "items" : [ { "* init" : "((Gtk.Container)(this.el.get_widget())).add ( child_0.el);", - "xtype" : "Actor", "* pack" : "add_child", + "xtype" : "Actor", "$ xns" : "GtkClutter", "items" : [ { @@ -225,16 +225,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" : [ { + "* pack" : "set_image", "xtype" : "Image", "utf8 icon_name" : "go-previous", - "* pack" : "set_image", "$ xns" : "Gtk" } ] @@ -252,8 +252,8 @@ "items" : [ { "* init" : "((Gtk.Container)(this.el.get_widget())).add ( child_0.el);", - "* pack" : "add_child", "xtype" : "Actor", + "* pack" : "add_child", "$ xns" : "GtkClutter", "items" : [ { @@ -268,9 +268,9 @@ "$ tooltop_text" : "\"Open File\"", "items" : [ { + "utf8 icon_name" : "document-open", "* pack" : "set_image", "xtype" : "Image", - "utf8 icon_name" : "document-open", "$ xns" : "Gtk" } ] @@ -288,8 +288,8 @@ "items" : [ { "* init" : "((Gtk.Container)(this.el.get_widget())).add ( child_0.el);", - "* pack" : "add_child", "xtype" : "Actor", + "* pack" : "add_child", "$ xns" : "GtkClutter", "items" : [ { @@ -304,9 +304,9 @@ "height_request" : 50, "items" : [ { + "xtype" : "Image", "utf8 icon_name" : "document-properties", "* pack" : "set_image", - "xtype" : "Image", "$ xns" : "Gtk" } ] @@ -324,8 +324,8 @@ "items" : [ { "* init" : "((Gtk.Container)(this.el.get_widget())).add ( child_0.el);", - "* pack" : "add_child", "xtype" : "Actor", + "* pack" : "add_child", "$ xns" : "GtkClutter", "items" : [ { @@ -340,9 +340,9 @@ "height_request" : 50, "items" : [ { + "* pack" : "set_image", "xtype" : "Image", "utf8 icon_name" : "emblem-system", - "* pack" : "set_image", "$ xns" : "Gtk" } ] @@ -364,8 +364,8 @@ "items" : [ { "* init" : "((Gtk.Container)(this.el.get_widget())).add ( child_0.el);", - "* pack" : "add_child", "xtype" : "Actor", + "* pack" : "add_child", "$ xns" : "GtkClutter", "items" : [ { @@ -380,9 +380,9 @@ "height_request" : 50, "items" : [ { + "utf8 icon_name" : "list-add", "* pack" : "set_image", "xtype" : "Image", - "utf8 icon_name" : "list-add", "$ xns" : "Gtk" } ] @@ -400,8 +400,8 @@ "items" : [ { "* init" : "((Gtk.Container)(this.el.get_widget())).add ( child_0.el);", - "* pack" : "add_child", "xtype" : "Actor", + "* pack" : "add_child", "$ xns" : "GtkClutter", "items" : [ { @@ -416,9 +416,9 @@ "height_request" : 50, "items" : [ { + "xtype" : "Image", "utf8 icon_name" : "format-justify-left", "* pack" : "set_image", - "xtype" : "Image", "$ xns" : "Gtk" } ] @@ -436,8 +436,8 @@ "items" : [ { "* init" : "((Gtk.Container)(this.el.get_widget())).add ( child_0.el);", - "* pack" : "add_child", "xtype" : "Actor", + "* pack" : "add_child", "$ xns" : "GtkClutter", "items" : [ { @@ -452,9 +452,9 @@ "height_request" : 50, "items" : [ { + "* pack" : "set_image", "xtype" : "Image", "utf8 icon_name" : "appointment-new", - "* pack" : "set_image", "$ xns" : "Gtk" } ] @@ -472,8 +472,8 @@ "items" : [ { "* init" : "((Gtk.Container)(this.el.get_widget())).add ( child_0.el);", - "* pack" : "add_child", "xtype" : "Actor", + "* pack" : "add_child", "$ xns" : "GtkClutter", "items" : [ { @@ -488,9 +488,9 @@ "height_request" : 50, "items" : [ { + "xtype" : "Image", "utf8 icon_name" : "folder-new", "* pack" : "set_image", - "xtype" : "Image", "$ xns" : "Gtk" } ] @@ -508,8 +508,8 @@ "items" : [ { "* init" : "((Gtk.Container)(this.el.get_widget())).add ( child_0.el);", - "* pack" : "add_child", "xtype" : "Actor", + "* pack" : "add_child", "$ xns" : "GtkClutter", "items" : [ { @@ -524,9 +524,9 @@ "height_request" : 50, "items" : [ { + "utf8 icon_name" : "document-new", "* pack" : "set_image", "xtype" : "Image", - "utf8 icon_name" : "document-new", "$ xns" : "Gtk" } ] @@ -544,8 +544,8 @@ "items" : [ { "* init" : "((Gtk.Container)(this.el.get_widget())).add ( child_0.el);", - "* pack" : "add_child", "xtype" : "Actor", + "* pack" : "add_child", "$ xns" : "GtkClutter", "items" : [ { @@ -560,9 +560,9 @@ "height_request" : 50, "items" : [ { + "xtype" : "Image", "utf8 icon_name" : "user-trash", "* pack" : "set_image", - "xtype" : "Image", "$ xns" : "Gtk" } ] @@ -581,20 +581,20 @@ }, { "bool homogeneous" : false, - "xtype" : "HBox", "* pack" : "pack_end,false,true,0", + "xtype" : "HBox", "$ xns" : "Gtk", "items" : [ { + "string label" : " ", "* pack" : "pack_start,true,true,0", "xtype" : "Label", - "string 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", @@ -607,7 +607,7 @@ "items" : [ { "listeners" : { - "button_press_event" : "() => {\n if (this.popup == null) {\n this.popup = new Xcls_ValaCompileErrors();\n this.popup.window = _this;\n }\n this.popup.show(this.notices, this.el);\n return true;\n}" + "button_press_event" : "() => {\n if (this.popup == null) {\n this.popup = new Xcls_ValaCompileErrors();\n this.popup.window = _this;\n }\n if (this.popup.active) {\n this.popup.active = false;\n this.popup.el.hide();\n return true;\n }\n \n this.popup.show(this.notices, this.el);\n return true;\n}" }, "bool always_show_image" : true, "id" : "statusbar_errors", @@ -619,16 +619,16 @@ "$ xns" : "Gtk", "items" : [ { + "* pack" : "set_image", "xtype" : "Image", "utf8 icon_name" : "dialog-error", - "* pack" : "set_image", "$ xns" : "Gtk" } ] }, { "listeners" : { - "button_press_event" : "() => {\n if (this.popup == null) {\n this.popup = new Xcls_ValaCompileErrors();\n this.popup.window = _this;\n }\n this.popup.show(this.notices, this.el);\n return true;\n}" + "button_press_event" : "() => {\n if (this.popup == null) {\n this.popup = new Xcls_ValaCompileErrors();\n this.popup.window = _this;\n }\n if (this.popup.active) {\n this.popup.active = false;\n this.popup.el.hide();\n return true;\n }\n this.popup.show(this.notices, this.el);\n return true;\n}" }, "bool always_show_image" : true, "id" : "statusbar_warnings", @@ -640,9 +640,9 @@ "$ xns" : "Gtk", "items" : [ { + "utf8 icon_name" : "dialog-warning", "* pack" : "set_image", "xtype" : "Image", - "utf8 icon_name" : "dialog-warning", "$ xns" : "Gtk" } ] @@ -661,9 +661,9 @@ "$ xns" : "Gtk", "items" : [ { + "xtype" : "Image", "utf8 icon_name" : "dialog-information", "* pack" : "set_image", - "xtype" : "Image", "$ xns" : "Gtk" } ] diff --git a/src/Builder4/MainWindow.vala b/src/Builder4/MainWindow.vala index 600d27d62..0f10d5440 100644 --- a/src/Builder4/MainWindow.vala +++ b/src/Builder4/MainWindow.vala @@ -2289,6 +2289,12 @@ public class Xcls_MainWindow : Object this.popup = new Xcls_ValaCompileErrors(); this.popup.window = _this; } + if (this.popup.active) { + this.popup.active = false; + this.popup.el.hide(); + return true; + } + this.popup.show(this.notices, this.el); return true; }); @@ -2351,6 +2357,11 @@ public class Xcls_MainWindow : Object this.popup = new Xcls_ValaCompileErrors(); this.popup.window = _this; } + if (this.popup.active) { + this.popup.active = false; + this.popup.el.hide(); + return true; + } this.popup.show(this.notices, this.el); return true; }); -- 2.39.2