From ada0f6c679be1006fb96e97786fd67c477c11593 Mon Sep 17 00:00:00 2001 From: Paulo Gustavo Veiga Date: Mon, 2 Jul 2012 00:06:26 -0300 Subject: [PATCH] Add Keyboard Shorcuts Support. --- distribution/copy-dist.sh | 8 +- mindplot/resources/messages_en.properties | 2 - mindplot/resources/messages_es.properties | 2 - mindplot/src/main/javascript/widget/Menu.js | 24 ++- .../main/webapp/icons/legacy/mac-metaKey.png | Bin 531 -> 0 bytes .../WEB-INF/classes/messages_en.properties | 19 +++ .../WEB-INF/classes/messages_es.properties | 21 ++- .../main/webapp/WEB-INF/defs/definitions.xml | 2 +- .../src/main/webapp/jsp/mindmapEditor.jsp | 11 +- .../main/webapp/jsp/mindmapEditorKeyboard.jsp | 150 +++++++++++------- 10 files changed, 166 insertions(+), 73 deletions(-) delete mode 100644 wise-editor/src/main/webapp/icons/legacy/mac-metaKey.png diff --git a/distribution/copy-dist.sh b/distribution/copy-dist.sh index 10edb156..ff1260f9 100755 --- a/distribution/copy-dist.sh +++ b/distribution/copy-dist.sh @@ -9,12 +9,12 @@ SERVER_DOWNLOAD_DIR=/var/www/wisemapping.org/stable WISE_BIN_FILE_NAME=wisemapping-${WISE_VERSION}.zip WISE_BIN_FILE_PATH=./target/${WISE_BIN_FILE_NAME} -WISE_SRC_FILE_NAME=wisemapping-${WISE_VERSION}-src.tar.gz -WISE_SRC_FILE_PATH=./target/${WISE_SRC_FILE_NAME} +#WISE_SRC_FILE_NAME=wisemapping-${WISE_VERSION}-src.tar.gz +#WISE_SRC_FILE_PATH=./target/${WISE_SRC_FILE_NAME} -scp ${WISE_SRC_FILE_PATH} thecrow@wisemapping.com:${SERVER_DOWNLOAD_DIR}/ +#scp ${WISE_SRC_FILE_PATH} thecrow@wisemapping.com:${SERVER_DOWNLOAD_DIR}/ scp ${WISE_BIN_FILE_PATH} thecrow@wisemapping.com:${SERVER_DOWNLOAD_DIR} # It's there ? wget -S http://downloads.wisemapping.org/stable/${WISE_BIN_FILE_NAME} -wget -S http://downloads.wisemapping.org/stable/${WISE_SRC_FILE_NAME} +#wget -S http://downloads.wisemapping.org/stable/${WISE_SRC_FILE_NAME} diff --git a/mindplot/resources/messages_en.properties b/mindplot/resources/messages_en.properties index 53b6fe60..6217c065 100644 --- a/mindplot/resources/messages_en.properties +++ b/mindplot/resources/messages_en.properties @@ -13,8 +13,6 @@ FONT_FAMILY=Font Type FONT_SIZE=Text Size FONT_BOLD=Text Bold FONT_ITALIC=Text Italic -UNDO_EDITION=Undo Edition -REDO_EDITION=Redo Edition UNDO=Undo REDO=Redo INSERT=Insert diff --git a/mindplot/resources/messages_es.properties b/mindplot/resources/messages_es.properties index a300d913..d5bd061d 100644 --- a/mindplot/resources/messages_es.properties +++ b/mindplot/resources/messages_es.properties @@ -20,8 +20,6 @@ FONT_BOLD=Negrita FONT_ITALIC=Italica FONT_COLOR=Color de Texto -UNDO_EDITION=Undo Edition -REDO_EDITION=Redo Edition UNDO=Rehacer NOTE=Nota LOADING=Cargando ... diff --git a/mindplot/src/main/javascript/widget/Menu.js b/mindplot/src/main/javascript/widget/Menu.js index 1facb287..bfb7ea16 100644 --- a/mindplot/src/main/javascript/widget/Menu.js +++ b/mindplot/src/main/javascript/widget/Menu.js @@ -211,7 +211,7 @@ mindplot.widget.Menu = new Class({ {'class':'modalDialog exportModalDialog', closeButton:true, destroyOnClose:true, - title: $msg('EXPORT') + title:$msg('EXPORT') }); reqDialog.setRequestOptions({ onRequest:function () { @@ -405,6 +405,28 @@ mindplot.widget.Menu = new Class({ } this._registerEvents(designer); + + // Keyboard Shortcuts Action ... + var keyboardShortcut = $('keyboardShortcuts'); + if (keyboardShortcut) { + + keyboardShortcut.addEvent('click', function (event) { + var reqDialog = new MooDialog.Request('c/keyboard', null, + {'class':'modalDialog keyboardModalDialog', + closeButton:true, + destroyOnClose:true, + title:$msg('SHORTCUTS') + }); + reqDialog.setRequestOptions({ + onRequest:function () { + reqDialog.setContent($msg('LOADING')); + } + }); + MooDialog.Request.active = reqDialog; + event.preventDefault(); + }); + } + }, _registerEvents:function (designer) { diff --git a/wise-editor/src/main/webapp/icons/legacy/mac-metaKey.png b/wise-editor/src/main/webapp/icons/legacy/mac-metaKey.png deleted file mode 100644 index 63579a46914dc5a2af2dd1382d2bf2998e946d34..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 531 zcmV+u0_^>XP)2q5NFt5-7sg(E^jLf!)e5Mz9N{BuJiqe2#-qTsV<&TL{5 z6cm(YXJ=;x2q4Df=oK4N5KWCjAE8#iuD z0SF+*w6wI#8X6k?Dk>`T)~{dx#LUbrl0`{LY4U{&7g}Dwetk((Q&a2o>C+FGSXo&& zF)%PNefjc5>dBKQ#vUFXLLfKZ{r~^J$gf|&Tz~xd5zNia{hry=(^DMCF)}bPP+((Y zdj@oR9YBDwWMySt2fA-JP~hyNM~|igU84$g$=8b)FFul%mahE!_pi*GH*X>s`zK6@ zy>#(nKL-cLukYW#ivj6(OiWDwzkT~A0%X4gTE(uVrB%ZsD{%_@rK3J)HDF-*I7W5Du98~0`&VHpw$dFZ{94qdiCmsuV24@Gcq!Y001&a VyvEmzPTK$g002ovPDHLkV1jyn?^yr< diff --git a/wise-webapp/src/main/webapp/WEB-INF/classes/messages_en.properties b/wise-webapp/src/main/webapp/WEB-INF/classes/messages_en.properties index 3036f27b..fa20c5fa 100644 --- a/wise-webapp/src/main/webapp/WEB-INF/classes/messages_en.properties +++ b/wise-webapp/src/main/webapp/WEB-INF/classes/messages_en.properties @@ -184,3 +184,22 @@ SHOW_REGISTERS=Show _MENU_ entries LOADING=Loading ... NO_MATCHING_FOUND=No matching records found TABLE_ROWS=\ _START_-_END_ of _TOTAL_ +ACTION=Action +CREATE_SIBLING_TOPIC=Create Sibling Topic +CREATE_CHILD_TOPIC=Create Child Topic +DELETE_TOPIC=Delete Topic +EDIT_TOPIC_TEXT=Edit Topic Text +JUST_START_TYPING=Just start typing +CANCEL_TEXT_CHANGES=Cancel Text Changes +TOPIC_NAVIGATION=Topic Navigation +ARROW_KEYS=Arrow Keys +SELECT_MULTIPLE_NODES=Select Multiple Nodes +UNDO_EDITION=Undo Edition +REDO_EDITION=Redo Edition +SELECT_ALL_TOPIC=Select All Topic +CHANGE_TEXT_BOLD=Change Text Bold Type +SAVE_CHANGES=Save Chages +CHANGE_TEXT_ITALIC=Change Text Italic +DESELECT_ALL_TOPIC=Deselect All Topic +SHORTCUTS=Shortcuts + diff --git a/wise-webapp/src/main/webapp/WEB-INF/classes/messages_es.properties b/wise-webapp/src/main/webapp/WEB-INF/classes/messages_es.properties index f3cfed20..0b624ead 100644 --- a/wise-webapp/src/main/webapp/WEB-INF/classes/messages_es.properties +++ b/wise-webapp/src/main/webapp/WEB-INF/classes/messages_es.properties @@ -143,7 +143,7 @@ WARNING=Cuidado DELETE_MAPS_WARNING=Una vez borrado de un mapa no puede ser recuperado. Desea continuar ? WHAT_IS_NEW=Novedades WHAT_IS_NEW_DETAILS=
  • Nueva interfaz
  • Soporte de FreeMind 0.9
  • Soporte HTML 5.0
  • Soporte de Firefox 12
-THANKS_FOR_SIGN_UP=Graciar por registarse! +THANKS_FOR_SIGN_UP=Graciar por registarse ! SIGN_UP_CONFIRMATION_EMAIL=You will receive a confirmation message shortly from WiseMapping. This message will ask you to activate your WiseMapping account.
Please select the link to activate and start creating and sharing maps. SIGN_UP_SUCCESS=Su cuenta a sido creada exitosamente,haga click ac\u00e1 para ingresar y empezar a disfrutar de WiseMapping. ACCOUNT_DOES_NOT_EXISTS=El e-mail ingresado no pertenece a un usuario registrado o la cuenta no ha sido activada todav\u00eda. @@ -185,3 +185,22 @@ SHOW_REGISTERS=Mostrar _MENU_ registros LOADING=Cargando ... NO_MATCHING_FOUND=No se encontraron resultados TABLE_ROWS=\ _START_-_END_ de _TOTAL_ +ACTION=Acci\u00f3n +CREATE_SIBLING_TOPIC=Agregar T\u00f3pico Hermano +CREATE_CHILD_TOPIC=Agregar T\u00f3pico Hijo +DELETE_TOPIC=Borrar T\u00f3pico +EDIT_TOPIC_TEXT=Editar Texto de T\u00f3pico +JUST_START_TYPING=Comenza a escribir +CANCEL_TEXT_CHANGES=Cancelar Edici\u00f3n de Texto +TOPIC_NAVIGATION=Navegaci\u00f3n Entre T\u00f3picos +ARROW_KEYS=Flechas Del Cursor +SELECT_MULTIPLE_NODES=Selecci\u00f3nar Multiples T\u00f3picos +UNDO_EDITION=Revertir Cambios +REDO_EDITION=Rehacer Cambios +SELECT_ALL_TOPIC=Seleccionar Todos los T\u00f3picos +CHANGE_TEXT_BOLD=Cambiar Texto a Negrita +SAVE_CHANGES=Guardar los Cambios +CHANGE_TEXT_ITALIC=Cambiar Texto a Italica +DESELECT_ALL_TOPIC=Revertir Selecci\u00f3n de T\u00f3picos +SHORTCUTS=Shortcuts + diff --git a/wise-webapp/src/main/webapp/WEB-INF/defs/definitions.xml b/wise-webapp/src/main/webapp/WEB-INF/defs/definitions.xml index a7c95e27..63a3df0c 100644 --- a/wise-webapp/src/main/webapp/WEB-INF/defs/definitions.xml +++ b/wise-webapp/src/main/webapp/WEB-INF/defs/definitions.xml @@ -181,6 +181,6 @@ - + diff --git a/wise-webapp/src/main/webapp/jsp/mindmapEditor.jsp b/wise-webapp/src/main/webapp/jsp/mindmapEditor.jsp index 948306a4..5493a3b0 100644 --- a/wise-webapp/src/main/webapp/jsp/mindmapEditor.jsp +++ b/wise-webapp/src/main/webapp/jsp/mindmapEditor.jsp @@ -63,13 +63,10 @@
- , ${principal.firstname} | | - <%-- - <%--title=""> |--%> - "> - - + , ${principal.firstname} | + | + | + ">
diff --git a/wise-webapp/src/main/webapp/jsp/mindmapEditorKeyboard.jsp b/wise-webapp/src/main/webapp/jsp/mindmapEditorKeyboard.jsp index d16d4046..6ba5cd66 100644 --- a/wise-webapp/src/main/webapp/jsp/mindmapEditorKeyboard.jsp +++ b/wise-webapp/src/main/webapp/jsp/mindmapEditorKeyboard.jsp @@ -2,6 +2,26 @@ <%@ include file="/jsp/init.jsp" %> +
@@ -11,63 +31,83 @@ - - - - - + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
ActionWindows - LinuxOS X
Windows - LinuxMac OS X
Create Sibling NodeEnterEnter
Create Child NodeInsertMeta+Enter
Delete Child NodeDeleteDelete
Edit Node TextJust start typing | F2Just start typing | F2
Cancel Text ChangesEscEsc
Collapse / Extend NodeSpace BarSpace Bar
Node NavigationArrow KeysArrow Keys
Select Multiple NodesCtrl+clickCtrl+click
Undo EditionCtrl+zMeta+z
Redo EditionCtrl+Shift+zMeta+Shift+z
Ctrl + s⌘ + s
EnterEnter
Insert⌘ + Enter
DeleteDelete
| F2 | F2
Ctrl + Mouse ClickCtrl + Mouse Click
Ctrl + z⌘ + z
Ctrl + Shift + z⌘ + Shift + z
Ctrl + a⌘ + a
EscEsc
Ctrl + Shift + a⌘ + Shift + a
Ctrl + i⌘ + i
Ctrl + b⌘ + b
\ No newline at end of file