From 83c111fcc326b50c2540e64b012ece45d45a34d4 Mon Sep 17 00:00:00 2001 From: phasefx Date: Sat, 31 Jan 2009 23:23:01 +0000 Subject: [PATCH] Upgrade Venkman to version 0.9.87.4 Have it launched from chrome scope Add a open-ils.debug_options pref for showing debug options on the login window (an alternative to using a versionless build to do this) git-svn-id: svn://svn.open-ils.org/ILS/branches/staff-client-experiment@12026 dcc99617-32d9-48b4-a31d-7c20da2025e4 --- Open-ILS/web/opac/locale/en-US/lang.dtd | 2 ++ Open-ILS/xul/staff_client/application.ini | 2 +- Open-ILS/xul/staff_client/chrome/chrome.manifest | 16 ++++++++++-- .../staff_client/chrome/content/auth/controller.js | 6 +++++ .../xul/staff_client/chrome/content/main/main.js | 29 ++++++++++++++++++--- .../xul/staff_client/chrome/content/main/main.xul | 3 +++ Open-ILS/xul/staff_client/chrome/venkman.jar | Bin 877004 -> 871633 bytes .../xul/staff_client/components/venkman-service.js | 17 +++++++++--- .../xul/staff_client/defaults/preferences/prefs.js | 3 +++ .../staff_client/server/main/menu_frame_menus.xul | 2 +- 10 files changed, 69 insertions(+), 11 deletions(-) diff --git a/Open-ILS/web/opac/locale/en-US/lang.dtd b/Open-ILS/web/opac/locale/en-US/lang.dtd index 27e523ca45..3771991c8a 100644 --- a/Open-ILS/web/opac/locale/en-US/lang.dtd +++ b/Open-ILS/web/opac/locale/en-US/lang.dtd @@ -565,6 +565,8 @@ + + diff --git a/Open-ILS/xul/staff_client/application.ini b/Open-ILS/xul/staff_client/application.ini index a98b767ca8..8e5c64664b 100644 --- a/Open-ILS/xul/staff_client/application.ini +++ b/Open-ILS/xul/staff_client/application.ini @@ -11,7 +11,7 @@ Name=open_ils_staff_client ; ; This field specifies your application's build ID (timestamp). This field is ; required. -BuildID=20081116 +BuildID=20090131 ; ; ; This ID is just an example. Every XUL app ought to have it's own unique ID. diff --git a/Open-ILS/xul/staff_client/chrome/chrome.manifest b/Open-ILS/xul/staff_client/chrome/chrome.manifest index cec0d7bfa9..af124ae02d 100644 --- a/Open-ILS/xul/staff_client/chrome/chrome.manifest +++ b/Open-ILS/xul/staff_client/chrome/chrome.manifest @@ -2,6 +2,18 @@ content open_ils_staff_client content/ locale open_ils_staff_client en-US locale/en-US/ skin open_ils_staff_client open_ils_staff_client skin/ locale branding en-US branding/locale/en-US/ -content venkman jar:venkman.jar!/content/venkman/ + +style chrome://global/content/customizeToolbar.xul chrome://venkman/skin/venkman-overlay.css +overlay chrome://messenger/content/messenger.xul chrome://venkman/content/venkman-overlay.xul application={3550f703-e582-4d05-9a08-453d09bdfdc6} +overlay chrome://venkman/content/venkman-menus.xul chrome://communicator/content/tasksOverlay.xul application={92650c4d-4b8e-4d2a-b7eb-24ecf4f6b63a} +overlay chrome://communicator/content/tasksOverlay.xul chrome://venkman/content/venkman-overlay.xul application={92650c4d-4b8e-4d2a-b7eb-24ecf4f6b63a} +overlay chrome://calendar/content/calendar.xul chrome://venkman/content/venkman-overlay.xul application={718e30fb-e89b-41dd-9da7-e25a45638b28} +overlay chrome://venkman/content/venkman.xul chrome://communicator/content/utilityOverlay.xul application={92650c4d-4b8e-4d2a-b7eb-24ecf4f6b63a} +content venkman-ff jar:venkman.jar!/content/venkman/ff/ +content venkman jar:venkman.jar!/content/venkman/ +content venkman jar:venkman.jar!/content/venkman/ contentaccessible=yes +skin venkman modern/1.0 jar:venkman.jar!/skin/modern/venkman/ +content venkman-sm jar:venkman.jar!/content/venkman/sm/ +overlay chrome://browser/content/browser.xul chrome://venkman/content/venkman-overlay.xul application={ec8030f7-c20a-464f-9b0e-13a3a9e97384} application={a463f10c-3994-11da-9945-000d60ca027b} locale venkman en-US jar:venkman.jar!/locale/en-US/venkman/ -skin venkman modern/1.0 jar:venkman.jar!/skin/modern/venkman/ + diff --git a/Open-ILS/xul/staff_client/chrome/content/auth/controller.js b/Open-ILS/xul/staff_client/chrome/content/auth/controller.js index d4483972f0..a0d7756f04 100644 --- a/Open-ILS/xul/staff_client/chrome/content/auth/controller.js +++ b/Open-ILS/xul/staff_client/chrome/content/auth/controller.js @@ -60,6 +60,12 @@ auth.controller.prototype = { obj.debug('js_console'); } ], + 'cmd_debugger' : [ + ['command'], + function() { + start_debugger(); + } + ], 'cmd_override' : [ ['command'], function() { diff --git a/Open-ILS/xul/staff_client/chrome/content/main/main.js b/Open-ILS/xul/staff_client/chrome/content/main/main.js index 6a712748b8..a963ad9082 100644 --- a/Open-ILS/xul/staff_client/chrome/content/main/main.js +++ b/Open-ILS/xul/staff_client/chrome/content/main/main.js @@ -31,6 +31,23 @@ function clear_the_cache() { } } +function toOpenWindowByType(inType, uri) { /* for Venkman */ + try { + var winopts = "chrome,extrachrome,menubar,resizable,scrollbars,status,toolbar"; + window.open(uri, "_blank", winopts); + } catch(E) { + alert(E); throw(E); + } +} + +function start_debugger() { + setTimeout( + function() { + try { start_venkman(); } catch(E) { alert(E); } + }, 0 + ); +}; + function main_init() { dump('entering main_init()\n'); try { @@ -47,6 +64,8 @@ function main_init() { } ///////////////////////////////////////////////////////////////////////////// + var pref = Components.classes["@mozilla.org/preferences-service;1"].getService(Components.interfaces.nsIPrefBranch); + JSAN.errorLevel = "die"; // none, warn, or die JSAN.addRepository('..'); @@ -249,6 +268,11 @@ function main_init() { version = 'versionless debug build'; document.getElementById('debug_gb').hidden = false; } + + if (pref && pref.getBoolPref('open-ils.debug_options')) { + document.getElementById('debug_gb').hidden = false; + } + window.title = authStrings.getFormattedString('staff.auth.titlebar.label', version); var x = document.getElementById('about_btn'); x.addEventListener( @@ -322,10 +346,7 @@ function main_init() { false ); - var pref = Components.classes["@mozilla.org/preferences-service;1"] - .getService(Components.interfaces.nsIPrefBranch); - - if ( found_ws_info_in_Achrome() && pref.getBoolPref("open-ils.write_in_user_chrome_directory") ) { + if ( found_ws_info_in_Achrome() && pref && pref.getBoolPref("open-ils.write_in_user_chrome_directory") ) { //var hbox = x.parentNode; var b = document.createElement('button'); //b.setAttribute('label','Migrate legacy settings'); hbox.appendChild(b); //b.addEventListener( diff --git a/Open-ILS/xul/staff_client/chrome/content/main/main.xul b/Open-ILS/xul/staff_client/chrome/content/main/main.xul index 5347bcb59c..71c89e3bbc 100644 --- a/Open-ILS/xul/staff_client/chrome/content/main/main.xul +++ b/Open-ILS/xul/staff_client/chrome/content/main/main.xul @@ -55,6 +55,7 @@ dump("lang.version = &lang.version;" + '\n'); +