aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorneauoire <[email protected]>2020-02-05 10:06:09 -0500
committerneauoire <[email protected]>2020-02-05 10:06:09 -0500
commite7e401dbb7cdd36d11400339b722cb037dab2c5d (patch)
tree2fd91fdfa5314f93ba08b89d9193b83fbe62a599
parentd55c73f0abb0ee4a8da5e9b472e8aa194deb5b66 (diff)
downloadOrca-e7e401dbb7cdd36d11400339b722cb037dab2c5d.tar.gz
Orca-e7e401dbb7cdd36d11400339b722cb037dab2c5d.zip
Added MANUAL.txt
-rw-r--r--MANUAL.txt90
-rw-r--r--desktop/package.json3
-rw-r--r--desktop/sources/scripts/client.js2
-rw-r--r--desktop/sources/scripts/lib/acels.js5
4 files changed, 96 insertions, 4 deletions
diff --git a/MANUAL.txt b/MANUAL.txt
new file mode 100644
index 0000000..fae4393
--- /dev/null
+++ b/MANUAL.txt
@@ -0,0 +1,90 @@
+File
+
+New...................... CmdOrCtrl+N
+Open..................... CmdOrCtrl+O
+Import Modules........... CmdOrCtrl+L
+Import Images............ CmdOrCtrl+Shift+L
+Export................... CmdOrCtrl+S
+Export Selection......... CmdOrCtrl+Shift+S
+
+Edit
+
+Select All............... CmdOrCtrl+A
+Erase Selection.......... Backspace
+Undo..................... CmdOrCtrl+Z
+Redo..................... CmdOrCtrl+Shift+Z
+
+Project
+
+Find..................... CmdOrCtrl+J
+Inject................... CmdOrCtrl+B
+Toggle Commander......... CmdOrCtrl+K
+Run Commander............ Enter
+
+Cursor
+
+Toggle Insert Mode....... CmdOrCtrl+I
+Toggle Block Comment..... CmdOrCtrl+/
+Trigger Operator......... CmdOrCtrl+P
+Reset.................... Escape
+
+Move
+
+Move North............... ArrowUp
+Move East................ ArrowRight
+Move South............... ArrowDown
+Move West................ ArrowLeft
+Scale North.............. Shift+ArrowUp
+Scale East............... Shift+ArrowRight
+Scale South.............. Shift+ArrowDown
+Scale West............... Shift+ArrowLeft
+Drag North............... Alt+ArrowUp
+Drag East................ Alt+ArrowRight
+Drag South............... Alt+ArrowDown
+Drag West................ Alt+ArrowLeft
+Move North(Leap)......... CmdOrCtrl+ArrowUp
+Move East(Leap).......... CmdOrCtrl+ArrowRight
+Move South(Leap)......... CmdOrCtrl+ArrowDown
+Move West(Leap).......... CmdOrCtrl+ArrowLeft
+Scale North(Leap)........ CmdOrCtrl+Shift+ArrowUp
+Scale East(Leap)......... CmdOrCtrl+Shift+ArrowRight
+Scale South(Leap)........ CmdOrCtrl+Shift+ArrowDown
+Scale West(Leap)......... CmdOrCtrl+Shift+ArrowLeft
+Drag North(Leap)......... CmdOrCtrl+Alt+ArrowUp
+Drag East(Leap).......... CmdOrCtrl+Alt+ArrowRight
+Drag South(Leap)......... CmdOrCtrl+Alt+ArrowDown
+Drag West(Leap).......... CmdOrCtrl+Alt+ArrowLeft
+
+Clock
+
+Play/Pause............... Space
+Frame By Frame........... CmdOrCtrl+F
+Reset Frame.............. CmdOrCtrl+Shift+R
+Incr. Speed.............. >
+Decr. Speed.............. <
+Incr. Speed(10x)......... CmdOrCtrl+>
+Decr. Speed(10x)......... CmdOrCtrl+<
+
+View
+
+Toggle Retina............ Tab
+Toggle Guide............. CmdOrCtrl+G
+Incr. Col................ ]
+Decr. Col................ [
+Incr. Row................ }
+Decr. Row................ {
+Zoom In.................. CmdOrCtrl+=
+Zoom Out................. CmdOrCtrl+-
+Zoom Reset............... CmdOrCtrl+0
+
+Midi
+
+Play/Pause Midi.......... CmdOrCtrl+Space
+Next Input Device........ CmdOrCtrl+,
+Next Output Device....... CmdOrCtrl+.
+Refresh Devices.......... CmdOrCtrl+Shift+M
+
+Communication
+
+Choose OSC Port.......... alt+O
+Choose UDP Port.......... alt+U \ No newline at end of file
diff --git a/desktop/package.json b/desktop/package.json
index 049da30..1651fa6 100644
--- a/desktop/package.json
+++ b/desktop/package.json
@@ -11,7 +11,8 @@
"build_osx": "electron-packager . Orca --platform=darwin --arch=x64 --out ~/Documents/ --overwrite --icon=icon.icns ; echo 'Built for OSX'",
"build_linux": "electron-packager . Orca --platform=linux --arch=x64 --out ~/Documents/ --overwrite --icon=icon.ico ; echo 'Built for LINUX'",
"build_win": "electron-packager . Orca --platform=win32 --arch=x64 --out ~/Documents/ --overwrite --icon=icon.ico ; echo 'Built for WIN'",
- "build": "npm run clean ; npm run build_osx ; npm run build_linux ; npm run build_win",
+ "add_manual": "cp ../MANUAL.txt ~/Documents/Orca-darwin-x64/MANUAL.txt ; cp ../MANUAL.txt ~/Documents/Orca-linux-x64/MANUAL.txt ; cp ../MANUAL.txt ~/Documents/Orca-win32-x64/MANUAL.txt",
+ "build": "npm run clean ; npm run build_osx ; npm run build_linux ; npm run build_win ; npm run add_manual",
"push_osx": "~/Applications/butler push ~/Documents/Orca-darwin-x64/ hundredrabbits/orca:osx-64",
"push_linux": "~/Applications/butler push ~/Documents/Orca-linux-x64/ hundredrabbits/orca:linux-64",
"push_win": "~/Applications/butler push ~/Documents/Orca-win32-x64/ hundredrabbits/orca:windows-64",
diff --git a/desktop/sources/scripts/client.js b/desktop/sources/scripts/client.js
index d1580a5..525158a 100644
--- a/desktop/sources/scripts/client.js
+++ b/desktop/sources/scripts/client.js
@@ -103,7 +103,7 @@ function Client () {
this.acels.set('Clock', 'Incr. Speed(10x)', 'CmdOrCtrl+>', () => { this.clock.modSpeed(10, true) })
this.acels.set('Clock', 'Decr. Speed(10x)', 'CmdOrCtrl+<', () => { this.clock.modSpeed(-10, true) })
- this.acels.set('View', 'Toggle Retina', '`', () => { this.toggleRetina() })
+ this.acels.set('View', 'Toggle Retina', 'Tab', () => { this.toggleRetina() })
this.acels.set('View', 'Toggle Guide', 'CmdOrCtrl+G', () => { this.toggleGuide() })
this.acels.set('View', 'Incr. Col', ']', () => { this.modGrid(1, 0) })
this.acels.set('View', 'Decr. Col', '[', () => { this.modGrid(-1, 0) })
diff --git a/desktop/sources/scripts/lib/acels.js b/desktop/sources/scripts/lib/acels.js
index 14c56d6..cc00d61 100644
--- a/desktop/sources/scripts/lib/acels.js
+++ b/desktop/sources/scripts/lib/acels.js
@@ -73,7 +73,7 @@ function Acels (client) {
for (const cat in cats) {
text += `\n### ${cat}\n\n`
for (const item of cats[cat]) {
- text += item.accelerator ? `- \`${item.accelerator}\`: ${item.name}\n` : ''
+ text += item.accelerator ? `- \`${item.accelerator.replace('`','tilde')}\`: ${item.name}\n` : ''
}
}
return text.trim()
@@ -83,8 +83,9 @@ function Acels (client) {
const cats = this.sort()
let text = ''
for (const cat in cats) {
+ text += `\n${cat}\n\n`
for (const item of cats[cat]) {
- text += item.accelerator ? `${cat}: ${item.name} | ${item.accelerator}\n` : ''
+ text += item.accelerator ? `${item.name.padEnd(25, '.')} ${item.accelerator}\n` : ''
}
}
return text.trim()