github/svgedit
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Cursory revamp of shortcut keys and cleanup of tooltips that show shortcuts that don't work. Kept modkeys out of things for the moment.

Browse Source 
git-svn-id: http://svg-edit.googlecode.com/svn/trunk@1955 eee81c28-f429-11dd-99c0-75d572ba1ddd
This commit is contained in:
Adrian Jones
2011-01-30 20:03:09 +00:00
parent d85a7bc8a2
commit 212e5b1795
5 changed files with 28 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
editor/extensions/ext-connector.js
View File

@@ -305,7 +305,6 @@ svgEditor.addExtension("Connector", function(S) {
type: "mode",
icon: "images/cut.png",
title: "Connect two objects",
key: "Shift+3",
includeWith: {
button: '#tool_line',
isDefault: false,

1
editor/extensions/ext-eyedropper.js
View File

@@ -66,6 +66,7 @@ svgEditor.addExtension("eyedropper", function(S) {
id: "tool_eyedropper",
type: "mode",
title: "Eye Dropper Tool",
key: "I",
events: {
"click": function() {
svgCanvas.setMode("eyedropper");

2
editor/extensions/ext-grid.js
View File

@@ -162,7 +162,7 @@ svgEditor.addExtension("view_grid", function(s) {
id: "view_grid",
type: "context",
panel: "editor_panel",
title: "Show/Hide Grid [G]",
title: "Show/Hide Grid",
events: {
'click': function() {
var gr = !$('#view_grid').hasClass('push_button_pressed');

24
editor/svg-editor.html
View File

@@ -117,14 +117,14 @@
<ul>
<li id="tool_clear">
<div></div>
New Image [N]
New Image (N)
</li>
<li id="tool_open" style="display:none;">
<div id="fileinputs">
<div></div>
</div>
Open Image [O]
Open Image
</li>
<li id="tool_import" style="display:none;">
@@ -136,7 +136,7 @@
<li id="tool_save">
<div></div>
Save Image [S]
Save Image (S)
</li>
<li id="tool_export">
@@ -146,7 +146,7 @@
<li id="tool_docprops">
<div></div>
Document Properties [P]
Document Properties (D)
</li>
</ul>
@@ -436,18 +436,18 @@
</div> <!-- tools_top -->
<div id="tools_left" class="tools_panel">
<div class="tool_button" id="tool_select" title="Select Tool [1]"></div>
<div class="tool_button" id="tool_fhpath" title="Pencil Tool [2]"></div>
<div class="tool_button" id="tool_line" title="Line Tool [3]"></div>
<div class="tool_button flyout_current" id="tools_rect_show" title="Square/Rect Tool [4/Shift+4]">
<div class="tool_button" id="tool_select" title="Select Tool"></div>
<div class="tool_button" id="tool_fhpath" title="Pencil Tool"></div>
<div class="tool_button" id="tool_line" title="Line Tool"></div>
<div class="tool_button flyout_current" id="tools_rect_show" title="Square/Rect Tool">
<div class="flyout_arrow_horiz"></div>
</div>
<div class="tool_button flyout_current" id="tools_ellipse_show" title="Ellipse/Circle Tool [5/Shift+5]">
<div class="tool_button flyout_current" id="tools_ellipse_show" title="Ellipse/Circle Tool">
<div class="flyout_arrow_horiz"></div>
</div>
<div class="tool_button" id="tool_path" title="Path Tool [7]"></div>
<div class="tool_button" id="tool_text" title="Text Tool [6]"></div>
<div class="tool_button" id="tool_image" title="Image Tool [8]"></div>
<div class="tool_button" id="tool_path" title="Path Tool"></div>
<div class="tool_button" id="tool_text" title="Text Tool"></div>
<div class="tool_button" id="tool_image" title="Image Tool"></div>
<div class="tool_button" id="tool_zoom" title="Zoom Tool [Ctrl+Up/Down]"></div>
<div style="display: none">

28
editor/svg-editor.js
View File

@@ -3905,19 +3905,19 @@
var Actions = function() {
// sel:'selector', fn:function, evt:'event', key:[key, preventDefault, NoDisableInInput]
var tool_buttons = [
{sel:'#tool_select', fn: clickSelect, evt: 'click', key: 1},
{sel:'#tool_fhpath', fn: clickFHPath, evt: 'click', key: 2},
{sel:'#tool_line', fn: clickLine, evt: 'click', key: 3},
{sel:'#tool_rect', fn: clickRect, evt: 'mouseup', key: 4, parent: '#tools_rect', icon: 'rect'},
{sel:'#tool_square', fn: clickSquare, evt: 'mouseup', key: 'Shift+4', parent: '#tools_rect', icon: 'square'},
{sel:'#tool_select', fn: clickSelect, evt: 'click', key: ['V', true]},
{sel:'#tool_fhpath', fn: clickFHPath, evt: 'click', key: ['Q', true]},
{sel:'#tool_line', fn: clickLine, evt: 'click', key: ['L', true]},
{sel:'#tool_rect', fn: clickRect, evt: 'mouseup', key: ['R', true], parent: '#tools_rect', icon: 'rect'},
{sel:'#tool_square', fn: clickSquare, evt: 'mouseup', parent: '#tools_rect', icon: 'square'},
{sel:'#tool_fhrect', fn: clickFHRect, evt: 'mouseup', parent: '#tools_rect', icon: 'fh_rect'},
{sel:'#tool_ellipse', fn: clickEllipse, evt: 'mouseup', key: 5, parent: '#tools_ellipse', icon: 'ellipse'},
{sel:'#tool_circle', fn: clickCircle, evt: 'mouseup', key: 'Shift+5', parent: '#tools_ellipse', icon: 'circle'},
{sel:'#tool_ellipse', fn: clickEllipse, evt: 'mouseup', key: ['E', true], parent: '#tools_ellipse', icon: 'ellipse'},
{sel:'#tool_circle', fn: clickCircle, evt: 'mouseup', parent: '#tools_ellipse', icon: 'circle'},
{sel:'#tool_fhellipse', fn: clickFHEllipse, evt: 'mouseup', parent: '#tools_ellipse', icon: 'fh_ellipse'},
{sel:'#tool_path', fn: clickPath, evt: 'click', key: 6},
{sel:'#tool_text', fn: clickText, evt: 'click', key: 7},
{sel:'#tool_image', fn: clickImage, evt: 'mouseup', key: 8},
{sel:'#tool_zoom', fn: clickZoom, evt: 'mouseup', key: 9},
{sel:'#tool_path', fn: clickPath, evt: 'click', key: ['P', true]},
{sel:'#tool_text', fn: clickText, evt: 'click', key: ['T', true]},
{sel:'#tool_image', fn: clickImage, evt: 'mouseup'},
{sel:'#tool_zoom', fn: clickZoom, evt: 'mouseup', key: ['Z', true]},
{sel:'#tool_clear', fn: clickClear, evt: 'mouseup', key: ['N', true]},
{sel:'#tool_save', fn: function() { editingsource?saveSourceEditor():clickSave()}, evt: 'mouseup', key: ['S', true]},
{sel:'#tool_export', fn: clickExport, evt: 'mouseup'},
@@ -3928,9 +3928,9 @@
{sel:'#tool_source_cancel,#svg_source_overlay,#tool_docprops_cancel,#tool_prefs_cancel', fn: cancelOverlays, evt: 'click', key: ['esc', false, false], hidekey: true},
{sel:'#tool_source_save', fn: saveSourceEditor, evt: 'click'},
{sel:'#tool_docprops_save', fn: saveDocProperties, evt: 'click'},
{sel:'#tool_docprops', fn: showDocProperties, evt: 'mouseup', key: ['P', true]},
{sel:'#tool_docprops', fn: showDocProperties, evt: 'mouseup', key: ['D', true]},
{sel:'#tool_prefs_save', fn: savePreferences, evt: 'click'},
{sel:'#tool_prefs_option', fn: function() {showPreferences();return false}, evt: 'mouseup', key: ['I', true]},
{sel:'#tool_prefs_option', fn: function() {showPreferences();return false}, evt: 'mouseup'},
{sel:'#tool_delete,#tool_delete_multi', fn: deleteSelected, evt: 'click', key: ['del/backspace', true]},
{sel:'#tool_reorient', fn: reorientPath, evt: 'click'},
{sel:'#tool_node_link', fn: linkControlPoints, evt: 'click'},
@@ -4061,7 +4061,7 @@
// Put shortcut in title
if(opts.sel && !opts.hidekey) {
var new_title = btn.attr('title').split('[')[0] + '[' + keyval + ']';
var new_title = btn.attr('title').split('[')[0] + ' (' + keyval + ')';
key_assocs[keyval] = opts.sel;
// Disregard for menu items
if(!btn.parents('#main_menu').length) {