details: /erp/devel/pi/rev/899e8dab644a
changeset: 12379:899e8dab644a
user: David Baz Fayos <david.baz <at> openbravo.com>
date: Tue May 24 16:14:37 2011 +0200
summary: [KS] Added and modified some KS in NavBar, ToolBar and StatusBar
diffstat:
modules/org.openbravo.client.application/src-db/database/sourcedata/AD_PREFERENCE.xml
| 36 ++-
modules/org.openbravo.client.application/web/org.openbravo.client.application/js/ob-alert-manager.js
| 102 +++++----
modules/org.openbravo.client.application/web/org.openbravo.client.application/js/ob-application-menu.js
| 1 -
modules/org.openbravo.client.application/web/org.openbravo.client.application/js/ob-statusbar.js
| 1 +
modules/org.openbravo.client.application/web/org.openbravo.client.application/js/ob-toolbar.js
| 8 +-
5 files changed, 85 insertions(+), 63 deletions(-)
diffs (223 lines):
diff -r 69602041db1f -r 899e8dab644a
modules/org.openbravo.client.application/src-db/database/sourcedata/AD_PREFERENCE.xml
---
a/modules/org.openbravo.client.application/src-db/database/sourcedata/AD_PREFERENCE.xml
Tue May 24 14:51:20 2011 +0200
+++
b/modules/org.openbravo.client.application/src-db/database/sourcedata/AD_PREFERENCE.xml
Tue May 24 16:14:37 2011 +0200
@@ -34,11 +34,12 @@
<!--6EE6D055A7FE4C4DA7EB557F6C61D0EB--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
<!--6EE6D055A7FE4C4DA7EB557F6C61D0EB--> <ISACTIVE><![CDATA[Y]]></ISACTIVE>
<!--6EE6D055A7FE4C4DA7EB557F6C61D0EB--> <VALUE><![CDATA[[
- {"id": "NavBar_OBQuickCreate", "keyComb": {"ctrl": true, "alt": true, "key":
"Q"}},
- {"id": "NavBar_OBQuickLaunch", "keyComb": {"ctrl": true, "alt": true, "key":
"O"}},
- {"id": "NavBar_MenuButton", "keyComb": {"ctrl": true, "alt": true, "key":
"M"}},
- {"id": "NavBar_OBUserProfile", "keyComb": {"ctrl": true, "alt": true, "key":
"U"}},
- {"id": "NavBar_OBHelpAbout", "keyComb": {"ctrl": true, "alt": true, "key":
"H"}},
+ {"id": "NavBar_OBQuickCreate", "keyComb": {"ctrl": true, "key": "Q"}},
+ {"id": "NavBar_OBQuickLaunch", "keyComb": {"ctrl": true, "key": "O"}},
+ {"id": "NavBar_MenuButton", "keyComb": {"ctrl": true, "key": "M"}},
+ {"id": "NavBar_OBAlertIcon", "keyComb": {"key": "f8"}},
+ {"id": "NavBar_OBHelpAbout", "keyComb": {"ctrl": true, "key": "H"}},
+ {"id": "NavBar_OBUserProfile", "keyComb": {"ctrl": true, "key": "P"}},
{"id": "NavBar_OBLogout", "keyComb": {"ctrl": true, "alt": true, "shift":
true, "key": "End"}}
]]]></VALUE>
<!--6EE6D055A7FE4C4DA7EB557F6C61D0EB-->
<PROPERTY><![CDATA[UINAVBA_KeyboardShortcuts]]></PROPERTY>
@@ -52,14 +53,20 @@
<!--7EE6D055A7FE4C4DA7EB557F6C61D0EC--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
<!--7EE6D055A7FE4C4DA7EB557F6C61D0EC--> <ISACTIVE><![CDATA[Y]]></ISACTIVE>
<!--7EE6D055A7FE4C4DA7EB557F6C61D0EC--> <VALUE><![CDATA[[
- {"id": "ToolBar_Save", "keyComb": {"ctrl": true, "alt": true, "key": "S"}},
- {"id": "ToolBar_SaveClose", "keyComb": {"ctrl": true, "alt": true, "key":
"X"}},
- {"id": "ToolBar_NewRow", "keyComb": {"ctrl": true, "alt": true, "key": "I"}},
- {"id": "ToolBar_NewDoc", "keyComb": {"ctrl": true, "alt": true, "key": "N"}},
- {"id": "ToolBar_Eliminate", "keyComb": {"ctrl": true, "alt": true, "key":
"D"}},
- {"id": "ToolBar_Refresh", "keyComb": {"ctrl": true, "alt": true, "key":
"R"}},
- {"id": "ToolBar_Undo", "keyComb": {"ctrl": true, "alt": true, "key": "Z"}},
- {"id": "ToolBar_Print", "keyComb": {"ctrl": true, "alt": true, "key": "P"}}
+ {"id": "ToolBar_NewDoc", "keyComb": {"ctrl": true, "key": "D"}},
+ {"id": "ToolBar_NewRow", "keyComb": {"ctrl": true, "key": "I"}},
+ {"id": "ToolBar_Save", "keyComb": {"ctrl": true, "key": "S"}},
+ {"id": "ToolBar_SaveClose", "keyComb": {"ctrl": true, "shift": true, "key":
"X"}},
+ {"id": "ToolBar_Undo", "keyComb": {"ctrl": true, "shift": true, "key": "Z"}},
+ {"id": "ToolBar_Eliminate", "keyComb": {"ctrl": true, "key": "Delete"}},
+ {"id": "ToolBar_Refresh", "keyComb": {"ctrl": true, "shift": true, "key":
"R"}},
+ {"id": "ToolBar_Export", "keyComb": {"ctrl": true, "shift": true, "key":
"E"}},
+ {"id": "ToolBar_Attachments", "keyComb": {"ctrl": true, "shift": true,
"key": "A"}},
+ {"id": "ToolBar_Clone", "keyComb": {"ctrl": true, "shift": true, "key":
"K"}},
+ {"id": "ToolBar_Print", "keyComb": {"ctrl": true, "shift": true, "key":
"P"}},
+ {"id": "ToolBar_Email", "keyComb": {"ctrl": true, "shift": true, "key":
"M"}},
+ {"id": "ToolBar_Audit", "keyComb": {"ctrl": true, "shift": true, "key":
"L"}},
+ {"id": "ToolBar_Link", "keyComb": {"ctrl": true, "shift": true, "key": "U"}}
]]]></VALUE>
<!--7EE6D055A7FE4C4DA7EB557F6C61D0EC-->
<PROPERTY><![CDATA[UITOOLB_KeyboardShortcuts]]></PROPERTY>
<!--7EE6D055A7FE4C4DA7EB557F6C61D0EC-->
<ISPROPERTYLIST><![CDATA[Y]]></ISPROPERTYLIST>
@@ -74,7 +81,8 @@
<!--8EE6D055A7FE4C4DA7EB557F6C61D0ED--> <VALUE><![CDATA[[
{"id": "StatusBar_Previous", "keyComb": {"alt": true, "shift": true, "key":
"Page_Up"}},
{"id": "StatusBar_Next", "keyComb": {"alt": true, "shift": true, "key":
"Page_Down"}},
- {"id": "StatusBar_Maximize-Restore", "keyComb": {"ctrl": true, "alt": true,
"key": "Enter"}}
+ {"id": "StatusBar_Maximize-Restore", "keyComb": {"ctrl": true, "alt": true,
"key": "Enter"}},
+ {"id": "StatusBar_Close", "keyComb": {"key": "Escape"}}
]]]></VALUE>
<!--8EE6D055A7FE4C4DA7EB557F6C61D0ED-->
<PROPERTY><![CDATA[UISTATB_KeyboardShortcuts]]></PROPERTY>
<!--8EE6D055A7FE4C4DA7EB557F6C61D0ED-->
<ISPROPERTYLIST><![CDATA[Y]]></ISPROPERTYLIST>
diff -r 69602041db1f -r 899e8dab644a
modules/org.openbravo.client.application/web/org.openbravo.client.application/js/ob-alert-manager.js
---
a/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/ob-alert-manager.js
Tue May 24 14:51:20 2011 +0200
+++
b/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/ob-alert-manager.js
Tue May 24 16:14:37 2011 +0200
@@ -104,53 +104,63 @@
// prompt.
// The OBAlertIcon extends from the Smartclient Button.
// The OBAlertIcon registers itself as a listener in the Alert Manager.
-isc.OBAlertIcon
- .addProperties( {
- initWidget : function() {
- var instance = this;
-
- var listener = function(rpcResponse, data, rpcRequest) {
- if (data.cnt > 0) {
- OB.I18N.getLabel(instance.alertLabel,
- [ data.cnt ], instance, 'setTitle');
- instance.setIcon(instance.alertIcon);
- } else {
- OB.I18N.getLabel(instance.alertLabel,
- [ 0 ], instance, 'setTitle');
- instance.setIcon( {});
- }
- instance.markForRedraw();
- };
+isc.OBAlertIcon.addProperties( {
+ initWidget : function() {
+ var instance = this;
- this.Super('initWidget', arguments);
+ var listener = function(rpcResponse, data, rpcRequest) {
+ if (data.cnt > 0) {
+ OB.I18N.getLabel(instance.alertLabel,
+ [ data.cnt ], instance, 'setTitle');
+ instance.setIcon(instance.alertIcon);
+ } else {
+ OB.I18N.getLabel(instance.alertLabel,
+ [ 0 ], instance, 'setTitle');
+ instance.setIcon( {});
+ }
+ instance.markForRedraw();
+ };
- OB.I18N.getLabel(instance.alertLabel,
- [ '-' ], instance, 'setTitle');
+ this.Super('initWidget', arguments);
- // call it to update the number of alerts directly after login
- OB.AlertManager.addListener(listener);
-
OB.TestRegistry.register('org.openbravo.client.application.AlertButton', this);
- },
- alertIcon : {
- src :
'[SKINIMG]../../org.openbravo.client.application/images/navbar/iconAlert.png'
- },
- alertLabel : 'UINAVBA_Alerts',
- iconWidth : 11,
- iconHeight : 13,
- autoFit : true,
- baseStyle : 'OBNavBarTextButton',
- showTitle : true,
- iconOrientation : 'left',
- src : '',
- overflow : 'visible',
- click : function() {
- var viewDefinition = {
- //obManualURL : '/ad_forms/AlertManagement.html',
- //command : 'DEFAULT',
- //formId : '800016',
- i18nTabTitle : 'UINAVBA_AlertManagement'
- };
- OB.Layout.ViewManager.openView('OBUIAPP_AlertManagement',
viewDefinition);
- }
+ OB.I18N.getLabel(instance.alertLabel,
+ [ '-' ], instance, 'setTitle');
- });
+ // call it to update the number of alerts directly after login
+ OB.AlertManager.addListener(listener);
+ OB.TestRegistry.register('org.openbravo.client.application.AlertButton',
this);
+ },
+ click : function() {
+ var viewDefinition = {
+ //obManualURL : '/ad_forms/AlertManagement.html',
+ //command : 'DEFAULT',
+ //formId : '800016',
+ i18nTabTitle : 'UINAVBA_AlertManagement'
+ };
+ OB.Layout.ViewManager.openView('OBUIAPP_AlertManagement', viewDefinition);
+ },
+ keyboardShortcutId: 'NavBar_OBAlertIcon',
+ draw: function(){
+ if (this.keyboardShortcutId) {
+ var me = this;
+ var ksAction = function(){
+ me.click();
+ return false; //To avoid keyboard shortcut propagation
+ };
+ OB.KeyboardManager.KS.set(this.keyboardShortcutId, ksAction);
+ }
+ this.Super('draw', arguments);
+ },
+ alertIcon : {
+ src :
'[SKINIMG]../../org.openbravo.client.application/images/navbar/iconAlert.png'
+ },
+ alertLabel : 'UINAVBA_Alerts',
+ iconWidth : 11,
+ iconHeight : 13,
+ autoFit : true,
+ baseStyle : 'OBNavBarTextButton',
+ showTitle : true,
+ iconOrientation : 'left',
+ src : '',
+ overflow : 'visible'
+});
diff -r 69602041db1f -r 899e8dab644a
modules/org.openbravo.client.application/web/org.openbravo.client.application/js/ob-application-menu.js
---
a/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/ob-application-menu.js
Tue May 24 14:51:20 2011 +0200
+++
b/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/ob-application-menu.js
Tue May 24 16:14:37 2011 +0200
@@ -44,7 +44,6 @@
this.submenuInheritanceMask.push('getBaseStyle');
this.Super('initWidget', arguments);
- isc.Page.registerKey({keyName: 'm', ctrlKey: true, shiftKey: true},
function(key, target) {theMenu.menuButton.showMenu();});
},
draw: function() {
diff -r 69602041db1f -r 899e8dab644a
modules/org.openbravo.client.application/web/org.openbravo.client.application/js/ob-statusbar.js
---
a/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/ob-statusbar.js
Tue May 24 14:51:20 2011 +0200
+++
b/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/ob-statusbar.js
Tue May 24 16:14:37 2011 +0200
@@ -166,6 +166,7 @@
this.closeButton = isc.OBStatusBarIconButton.create( {
view : this.view,
buttonType : 'close',
+ keyboardShortcutId : 'StatusBar_Close',
prompt : OB.I18N.getLabel('OBUIAPP_CLOSEBUTTON')
});
this.maximizeButton = isc.OBStatusBarIconButton.create( {
diff -r 69602041db1f -r 899e8dab644a
modules/org.openbravo.client.application/web/org.openbravo.client.application/js/ob-toolbar.js
---
a/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/ob-toolbar.js
Tue May 24 14:51:20 2011 +0200
+++
b/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/ob-toolbar.js
Tue May 24 16:14:37 2011 +0200
@@ -404,7 +404,7 @@
prompt: OB.I18N.getLabel('OBUIAPP_GetDirectLink'),
updateState: function(){
},
- keyboardShortcutId: 'ToolBar_Link'
+ keyboardShortcutId: 'ToolBar_Link'
},
// This offers a mechanism to add properties at runtime to buttons created
through
// templates and java
@@ -425,10 +425,14 @@
disabled = true;
}
this.setDisabled(disabled);
- }
+ },
+ keyboardShortcutId: 'ToolBar_Audit'
},
'print' : {
keyboardShortcutId: 'ToolBar_Print'
+ },
+ 'email' : {
+ keyboardShortcutId: 'ToolBar_Email'
}
},
CLONE_BUTTON_PROPERTIES: {
------------------------------------------------------------------------------
vRanger cuts backup time in half-while increasing security.
With the market-leading solution for virtual backup and recovery,
you get blazing-fast, flexible, and affordable data protection.
Download your free trial now.
http://p.sf.net/sfu/quest-d2dcopy1
_______________________________________________
Openbravo-commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/openbravo-commits
