diff --git a/Inquirer.js b/Inquirer.js index cd81fb3..cfc426d 100644 --- a/Inquirer.js +++ b/Inquirer.js @@ -109,15 +109,15 @@ inqapp = merger.app("inquirer", { title: "Inquirer", icon: icon, - appMenu: [ - merger.ui.menuItem("app_close", { - text: "Close", - icon: merger.media.closeIcon(), - onClick: function () { - merger.leave(); - } - }), - ], + // appMenu: [ + // merger.ui.menuItem("app_close", { + // text: "Close", + // icon: merger.media.closeIcon(), + // onClick: function () { + // merger.leave(); + // } + // }), + // ], menu: [ merger.ui.menuItem("app_tools", { text: "Tools", @@ -475,6 +475,7 @@ // Publish this.merge({ + version: VERSION, autoShow: true, // Open Inquirer environment when a new unhandled error happen show: show, // Enters environment hide: hide, // Exit environent diff --git a/Merger.js b/Merger.js index bbf54dc..302c855 100644 --- a/Merger.js +++ b/Merger.js @@ -28,7 +28,7 @@ sys = { // Configuration _type: "system", icon: "data:image/gif;base64,R0lGODlhIAAgAOMAAP///zOZ/47N8FxqpgAAAMzM/7+/v9nu+QBjpAA9hP///////////////////////yH5BAEKAA8ALAAAAAAgACAAAATq8MlJH7k16y3JEQXGjZVXBGBIkKQpoEIqsuVRxHAsr3Rn6zndjuYCCo8F1ahoPCJDG2bTKbTxKNIpVWAbXH03atDZ9ZYKh49zXC0M3l/LKZA+Bthc99uMnd/rLzhBZXtxBH53dGpAKISFZ4mJCIpHjo99kQGTiWmdbgkJe3AGmJKZdwUPem+ghQavHX6bpyABoqyhBK+wh3ezpwGrtwMJurtymsCRwsPGpHK/ysyizhME0dLDo7DWBMqZ017HFQYX36jN4xrl3tnU6hzswMLVPfLLrtw9EvfB28/7KMhzUy9gBnYFDa6DtyECADs=", - ver: "0.3b", + ver: "0.3c", color: { frame: "teal", //"orange" client: "white", @@ -280,6 +280,17 @@ m.parentControl = menu.sysMenu; } } + if (a.allowDefaultClose) + menu.sysMenu.items.push( + m = merger.ui.menuItem("sys_closedesktop", { + icon: merger.media.closeIcon(), + text: "Close", + _app: ax, + onClick: function () { + merger.leave(); + } + }) + ); // Application menu while (menu.client.lastChild) menu.client.removeChild(menu.client.lastChild); @@ -382,6 +393,7 @@ this.merge({ _type: "app", icon: sys.icon, + allowDefaultClose: true, getId: function () { return id; }, diff --git a/MergerTester.js b/MergerTester.js index e0cecc1..700bfe5 100644 --- a/MergerTester.js +++ b/MergerTester.js @@ -22,15 +22,15 @@ var mTester = merger.app("mTester", { title: "Merger Tester Application", - appMenu: [ - merger.ui.menuItem("app_close", { - text: "Close Merger Desktop", - icon: merger.media.closeIcon(), - onClick: function () { - merger.leave(); - } - }), - ], + // appMenu: [ + // merger.ui.menuItem("app_close", { + // text: "Close Merger Desktop", + // icon: merger.media.closeIcon(), + // onClick: function () { + // merger.leave(); + // } + // }), + // ], menu: [ merger.ui.menuItem("m_test", { text: "Test", @@ -48,7 +48,7 @@ width: 400, height: 200, content: [merger.ui.picture("Iico", { - src: "https://cdn1.iconfinder.com/static/e9bcefc0c5591114fcd0b4b0aff67962/assets/img/extended-library/icon.svg", + src: "http://simpleicon.com/wp-content/uploads/rocket.svg", top: 0, left: 0, width: 48,