Commit graph

5314 commits

Author SHA1 Message Date
Thomas Goyne
9936bf0eca Initialize drop when loading timecodes (CID #1111295) 2013-10-23 17:08:12 -07:00
Thomas Goyne
09a3174cb8 Initialize more stuff in OpenALPlayer's constructor (CID #1111296) 2013-10-23 17:08:11 -07:00
Thomas Goyne
0e2cc0938f Strongly bind global lua functions used in the standard modules 2013-10-22 08:55:04 -07:00
Thomas Goyne
8367f9960c Eliminate warnings with VS2012 + Win8 SDK 2013-10-22 07:45:23 -07:00
Thomas Goyne
d3247d16fb Pass -mmacosx-version-min=10.7 to more stuff 2013-10-21 18:12:42 -07:00
Thomas Goyne
535a17bcf2 Remove pointess OSX_ prefix from functions 2013-10-21 18:11:37 -07:00
Thomas Goyne
cbff449f8f Put config files in the right place on OS X 2013-10-21 18:09:34 -07:00
Thomas Goyne
eeb574b1f9 Fix dmg creation on 10.9 2013-10-17 10:08:27 -07:00
Thomas Goyne
2640dc42a1 Fix EBU STL export 2013-10-17 09:43:44 -07:00
Thomas Goyne
73e1dc1b60 Honor the color matrix tag from the subtitles file when appropriate
If the script's matrix matches the video's matrix, use that even if
Force BT.601 is on, and if it's TV.601, use that even if Force BT.601 is
off.

This should mostly eliminate the common problems resulting from  mixed
values of the Force BT.601 option.

Closes #1649.
2013-10-17 08:04:03 -07:00
Thomas Goyne
4116f030af Clean up factory_manager a bit 2013-10-16 18:08:43 -07:00
Thomas Goyne
7bd1da7d45 Fix saving screenshots of dummy video 2013-10-16 17:29:03 -07:00
Thomas Goyne
e57035c832 Lock aspect ratio in the scale tool when alt is held down 2013-10-16 16:41:21 -07:00
Thomas Goyne
b254a6823b Fix double confirmation when exiting with unsaved changes
For some reason the close event is getting sent multiple times and
them getting processed in the event loop for the confirmation dialog,
resulting in two dialogs.
2013-10-16 16:41:04 -07:00
Thomas Goyne
9ea3dbd847 Make ffmpeg explicitly depend on zlib 2013-10-16 14:04:42 -07:00
Thomas Goyne
9dbca06179 Actually copy the current value in IntValidator's copy constructor 2013-10-15 16:02:25 -07:00
Thomas Goyne
d4a7a1a9b6 Build osx-bundle-restart-helper via the Makefile rather than as part of bundle creation 2013-10-15 12:17:47 -07:00
Thomas Goyne
ebd01c50c9 Rewrite NumValidator
Split int validating and double validating into two separate classes.

Make double parsing, validating and stringifying locale-aware. This is
far more complicated than it needs to be due to that Aegisub's locale
handling is a total mess.

Use DoubleValidator rather than wxFloatingPointValidator, because the
latter doesn't work with Aegisub's locale mess (on OS X it uses the C
locale for some things, and the locale reported by CoreFoundation for
others).

Closes #1568.
2013-10-15 10:59:23 -07:00
Thomas Goyne
3691849bac Fix logging on OS X
Passing nullptr to ostrstream's constructor is a nonstandard extension
that libc++ doesn't support, and as it turns out preallocating a buffer
doesn't actually meaningfully improve performance anyway.
2013-10-13 09:06:46 -07:00
Thomas Goyne
82412e6428 Fix compilation with UTF-8 wxString 2013-10-12 08:41:37 -07:00
Thomas Goyne
e5faae462f Remove some pointless configure checks
Speeds up configure by about 10%.
2013-10-11 18:45:22 -07:00
Thomas Goyne
267de7ed07 Fix crash when the video height or width is zero
Closes #1555. Closes #1644.
2013-10-08 15:21:26 -07:00
Thomas Goyne
4d8adff9d6 Build wx with wxStandardPaths enabled
It's still needed to get the path to the executable when restarting to
switch UI languages.
2013-10-08 07:33:01 -07:00
Thomas Goyne
6694baf3f0 Allow using , as the separator in time edit controls 2013-10-08 07:19:56 -07:00
Thomas Goyne
7a6fd4bb1e Make saving transient UI state in the file optional
It significantly increases the amount of noise when tracking subtitle
files in source control.

Closes #1535.
2013-10-07 17:57:16 -07:00
Thomas Goyne
1cdd461023 Separate UI state info from functional ASS info headers a bit
Prefix script info entries that are just storing Aegisub UI state with
"Aegisub ", and use a separate AssFile method to get/set them.
2013-10-07 17:57:16 -07:00
Thomas Goyne
62114d45f5 Fix reading MicroDVD files 2013-10-06 07:37:35 -07:00
Thomas Goyne
822c596206 Fix overriding charset for subtitle files
IconvWrapper needs the non-lowercased charset for the pretty -> real
name mapping to work.
2013-10-06 07:11:53 -07:00
Thomas Goyne
6f79d8731f Pass the detected or chosen charset to SubtitleFormat::CanReadFile
The MicroDVD format needs it since it also probes the file contents.
2013-10-06 07:04:40 -07:00
Thomas Goyne
73b0f7c88c Add support for Windows 7's taskbar progress indicator 2013-10-05 20:12:35 -07:00
Thomas Goyne
216b5ef0c7 Increase maximum template depth for parser.o
The latest version of clang has reduced the default.
2013-10-05 20:12:34 -07:00
Thomas Goyne
91c31f646e Opt out of AppNap while progress bars are active 2013-10-05 20:12:34 -07:00
Thomas Goyne
9a21c13cbe Use agi::scoped_holder to close files in mkvwrap 2013-10-05 15:41:22 -07:00
Thomas Goyne
bbd4cbef78 Fix shifting contiguous selections downward
Reverse iterators behave differently from regular iterators when
swapping (regular iterators continue to point at the same elements,
while reverse iterators do not), so instead use regular iterators with a
negative step for shifting down.
2013-09-30 17:01:15 -07:00
Thomas Goyne
921d5ed01a Only paint the margin values in the grid if they're non-zero
Showing zero is mildly misleading since it's actually default margin
rather than no margin, and this makes it much easier to spot the rows
where there's actually an interesting value.
2013-09-27 18:02:54 -07:00
Thomas Goyne
04435a13a3 Remove some unused AudioPlayer methods 2013-09-26 20:31:20 -07:00
Thomas Goyne
703b1fc3a7 Extract common stuff for wrapper audio providers to a base class 2013-09-26 20:18:29 -07:00
Thomas Goyne
07ad40dd3f Improve audio loading progress reporting
Even without the animation the reported progress was an average of 1.5
blocks behind the actual progress, and with the animation it was two
blocks behind. Assuming constant-speed audio decoding it should now be
nearly accurate (it still ignores that the last block may be smaller
than the rest).
2013-09-26 19:01:18 -07:00
Thomas Goyne
932747e70a Make progress bars less jerky 2013-09-26 16:13:32 -07:00
Thomas Goyne
382708132c Update indexing progress less often
wxTheApp->QueueEvent is sufficiently slow that updating the progress
could sometimes take longer than the actual indexing.
2013-09-26 16:13:24 -07:00
Thomas Goyne
a28aafcdab Fix crash when cancelling an automation script 2013-09-24 07:45:50 -07:00
Thomas Goyne
7651e83314 Fix setting selection/active line from automation scripts
The error handling function is under the results of the called function,
not at the top of the stack, so lua_pop was removing the wrong thing.
2013-09-23 14:15:45 -07:00
Thomas Goyne
260b37ba8e Fix line numbers for moonscript files in error messages 2013-09-22 18:44:03 -07:00
Thomas Goyne
646e5deb52 Canonicalize Automation script file names for nicer errors 2013-09-22 17:40:27 -07:00
Thomas Goyne
2be9218560 Double the size of the Automation log window 2013-09-21 16:20:19 -07:00
Thomas Goyne
32990fce49 Don't try to add stack traces to non-string errors 2013-09-21 16:12:19 -07:00
Thomas Goyne
ec7d75d1ae Fix an occasional crash when loading Automation scripts
cmd::reg and AssExportFilterChain::Register are not thread-safe, so
guard them with a mutex.
2013-09-21 15:59:28 -07:00
Thomas Goyne
f1ed0e4313 Fix display of automation errors on startup
The wxLogger isn't created until it's needed by the main thread, so any
errors logged on a background thread before the logger was first used on
the main thread were simply being discarded. Fix this by forcing the
creation of the logger very early in the startup process.
2013-09-21 12:52:11 -07:00
Thomas Goyne
ced3dd7a7e Improve error reporting when an automation script fails to load
Cut down on the amount of redundant information displayed so that the
actual error is visible.
2013-09-21 12:10:37 -07:00
Thomas Goyne
1a8fbf35f1 Improve lua stack trace display 2013-09-21 11:22:58 -07:00
Thomas Goyne
8fade74026 Actually trim whitespace when combining lines
regex_replace does not mutate the string in place.
2013-09-21 11:21:25 -07:00
Thomas Goyne
e315ceb236 Print the stack trace on lua errors 2013-09-21 09:44:44 -07:00
Thomas Goyne
d81e2f45ac Add an option to ignore whitespace for the character counter 2013-09-20 07:43:33 -07:00
Thomas Goyne
ac09590389 Devirtualize OptionValue::GetName 2013-09-20 06:51:04 -07:00
Thomas Goyne
bd88cde436 Remove agi::OptionValue::GetDefault*
They aren't actually used for much of anything.
2013-09-20 06:51:04 -07:00
Thomas Goyne
cb549e5aa9 Significantly speed up dragging lots of vector clip control points 2013-09-18 16:18:38 -07:00
Thomas Goyne
8d5a54ff5e Fix crash when smoothing freehand curves 2013-09-18 15:59:01 -07:00
Thomas Goyne
6a6c983f19 Add box selection to the move mode of the vector clip tool
Closes #1404.
2013-09-18 15:52:48 -07:00
Thomas Goyne
c62ebf7e8b Use std::to_wstring rather than wxString::Format("%d", ...)
std::to_wstring is significantly faster and is a bit shorter.
2013-09-18 08:32:30 -07:00
Thomas Goyne
64ecd29169 Switch to using an intrusive list for the visual tool features
Slightly improves performance and eliminates a bunch of really clunky
passing around and storing of iterators.
2013-09-17 16:23:36 -07:00
Thomas Goyne
b4ba31fe45 Bump dependency versions 2013-09-17 09:09:57 -07:00
Thomas Goyne
6cd6ee9845 Use auto more places 2013-09-17 07:51:07 -07:00
Thomas Goyne
0d50820178 Clean up BaseGrid a little 2013-09-17 07:51:06 -07:00
Thomas Goyne
e5afaf8a45 Handle subtitle lines pasted into the edit box
If the text being pasted can be parsed as ASS dialogue events, then do
so even if the edit box is focused since it's rather unlikely that
the user actually wants ASS subtitle events in their subs.
2013-09-16 11:02:20 -07:00
Thomas Goyne
5787ca4ae0 Cache widths of strings in SetColumnWidths 2013-09-16 10:43:56 -07:00
Thomas Goyne
079ccc728d Significantly speed up resizing the window with large files open
SetColumnWidths can take a long time to run and the only column that can
change width on resize is the last one, so only update that.
2013-09-16 10:26:41 -07:00
Thomas Goyne
bb89378b7f Skip empty lines in the kanji timer 2013-09-16 09:43:57 -07:00
Thomas Goyne
98048c135a Shut up clang analyzer warning 2013-09-16 08:40:27 -07:00
Thomas Goyne
e72e183f27 Remove incorrect ! in check for changed calltip position 2013-09-16 07:58:06 -07:00
Thomas Goyne
af2028e971 Pass unique_ptrs around by value 2013-09-16 06:43:17 -07:00
Thomas Goyne
40a0d8b2f7 Actually delete the lines in AssFile's destructor 2013-09-15 16:58:04 -07:00
Thomas Goyne
bfc7f56e20 Only go back one line rather than two 2013-09-15 15:37:49 -07:00
Thomas Goyne
80c9f67ce8 Rewrite the auto-matcher for the karaoke timing copier
Operate on characters rather than bytes in the dialog so that it
actually works with Kanji.

Rewrite the auto-matcher to handle more cases and add unit tests for it.
2013-09-15 14:52:16 -07:00
Thomas Goyne
3e3bd37a26 Switch to using Bind for DialogKanjiTimer events 2013-09-14 08:26:59 -07:00
Thomas Goyne
1d7334c129 Disable the wxGTK accelerator workaround for wx 2.9.5
Unsurprisingly the munging around with the menu bar implementation
details has resulted in things breaking, but fortunately the problem it
was working around (#1314) appears to have been fixed entirely.

Closes #1628.
2013-09-01 13:34:53 -07:00
Thomas Goyne
2a35763a8a Add Backspace to the table of key names. Closes #1631. 2013-09-01 12:27:42 -07:00
Thomas Goyne
51b21576cc Support duplicate order numbers in Matroska files
Such files are pretty broken, but apparently other stuff allows it.
2013-08-26 17:25:26 -07:00
Thomas Goyne
f427c4574d Revert "Don't invert horizontal scroll on the audio display on OS X"
This has been fixed upstream.
2013-08-20 12:20:37 -07:00
Thomas Goyne
0b210673f9 Zoom into the mouse's position in the audio display
Rather than pinning the time at the center of the audio display, pin the
time at the mouse's position since that's the area the user probably
cares about. If the mouse is not over the audio display (such as if the
user is adjusting the zoom via the sliders rather than the mouse wheel),
just use the center as it used to.
2013-08-20 12:11:39 -07:00
Thomas Goyne
1f5b98b11d Bump ffmpeg and boost versions 2013-08-19 12:51:19 -07:00
Thomas Goyne
6c5adde19a Fix wx compilation and silence a warning when compiling wx 2013-08-19 12:51:19 -07:00
Maxime Gauduin
0a2c0ab75e wxStandardPaths is protected as of wxgtk 2.9.5
Closes #1625, #1626, #1627.
2013-08-18 19:14:53 -07:00
Thomas Goyne
ae9f05d876 "Allow grid to take focus" -> "Focus grid on click"
The grid can still be focused via the keyboard, so the previous label
was misleading.
2013-08-17 15:10:17 -07:00
Thomas Goyne
f714d60a54 Build parser.cpp first
Shaves a few seconds off parallel builds with 4+ cores by avoiding
having everything else finish while it's still building.
2013-08-17 15:08:58 -07:00
Thomas Goyne
b68578f1d9 Eliminate a bogus limit of 100 for a bunch of rarely-used options 2013-08-17 15:06:07 -07:00
Thomas Goyne
dd6542c143 Use ForwardMouseWheelEvent rather than checking window bounds 2013-08-14 20:09:10 -07:00
tophf
c7aba2f54a Also forward page up/down and home/end from the video slider to the subs grid 2013-08-14 20:06:16 -07:00
tophf
51edb4caca Add support for the scroll wheel to the video slider 2013-08-14 20:05:48 -07:00
Thomas Goyne
9eca8c5733 Correct custom labels for buttons with standard IDs 2013-08-10 07:50:07 -07:00
Thomas Goyne
92887b53cf Fix crash when pasting styles in the styles manager 2013-08-08 20:36:12 -07:00
Thomas Goyne
106fb663c7 Eliminate a pointless roundtrip through wxString when copying styles to the clipboard 2013-08-08 20:18:12 -07:00
tophf
74fbe22afe Honor custom labels for buttons with standard IDs 2013-08-01 20:42:01 -07:00
Thomas Goyne
52d67accb4 Fix some issues with resampling drawings
The X scale/offset was being used for both X and Y coordinates.

Only non-negative integers were supported. xy-VSFilter and libass both
now support non-integer coordinates, and negative coordinates have of
course always been valid. Resampled coordinates are now rounded to
eighth-pixels rather than whole pixels.
2013-07-30 20:50:31 -07:00
Thomas Goyne
13d31d17ef Return full paths from aegisub.dialog.open rather than just filenames 2013-07-21 16:38:32 -07:00
Thomas Goyne
5ebc2032d4 Fix test compilation 2013-07-13 09:50:21 -07:00
Thomas Goyne
c4dae9e783 Support reading keyframes files from ffmpeg/avconv 2013-07-13 08:40:57 -07:00
Thomas Goyne
d0779e7ed7 Make DialogTranslation::UpdateDisplay a bit less slow 2013-07-11 20:18:41 -07:00
Thomas Goyne
b9b804ff55 Fix selection preserving in SubsTextEditCtrl::SetTextTo
Calling GetReverseUnicodePosition on the selection positioning after
calling SetText resulted in the conversions between UTF-8 indices and
wxString indices just being a very slow no-op.
2013-07-10 18:03:17 -07:00
Thomas Goyne
8ab163cb5a Make GetReverseUnicodePosition less horribly awful 2013-07-10 17:43:41 -07:00
Thomas Goyne
5ff42d9469 Also handle wxID_CANCEL in DialogManager
wxEVT_CLOSE_WINDOW is only triggered from the platform's close buttons,
not cancel buttons/ESC, so modeless dialogs closed in that way were not
getting deleted.
2013-07-09 08:35:51 -07:00
Thomas Goyne
791c1f88ad Remove pointless wxID_CANCEL binding 2013-07-09 08:35:51 -07:00
Thomas Goyne
e0bf0317c9 Fix display of Unicode font names in the fonts collector dialog 2013-07-09 08:35:50 -07:00
Thomas Goyne
2fdbc73721 Fully extract the resolution resampling logic from DialogResample 2013-07-09 08:35:50 -07:00
Thomas Goyne
ce23d72399 Kill AssDialogue::GetMarginString
It didn't actually make the calling code any shorter or simpler.
2013-07-09 08:35:50 -07:00
Thomas Goyne
bb83193253 Kill AssDialogue::SetMarginString
It's no longer used anywhere.
2013-07-09 08:35:50 -07:00
Thomas Goyne
df73591a54 Load autoloaded automation scripts in parallel 2013-07-09 08:35:50 -07:00
Thomas Goyne
a75b7f6ca8 Prefetch the list of fonts for the style editor dialog
On my machine (with ~5000 fonts installed), enumerating the installed
fonts was about 75% of the total construction time of the style editor
dialog.
2013-07-09 08:35:50 -07:00
Xabier Aramendi (Azpidatziak)
55379d506a Update Basque translation 2013-07-04 10:45:38 -07:00
Thomas Goyne
c542922a88 Use -Wno-c++11-narrowing when available
Needed to build boost.gil with Apple Clang 5.0
2013-07-04 08:29:06 -07:00
Thomas Goyne
ecc08f5e77 Fix conversion of video frames to RGB
Video frames aren't actually BGRA; the alpha channel is actually just
garbage since CSRI uses 0 for opaque and other things use 255. To work
around this, add a custom colorspace converter.

Fixes the subtitles preview in the style editor and copying frames to
the clipboard/saving them.

Closes #1621.
2013-07-04 08:25:25 -07:00
Thomas Goyne
cb3b72af36 Update to moonscript 0.2.4 2013-07-03 16:11:42 -07:00
Thomas Goyne
dd49539555 Eliminate double dot in temporary file names
Probably didn't cause any problems, but it was slightly ugly.
2013-07-02 20:09:01 -07:00
Thomas Goyne
af74371f6d Retry commits of file writes for up to a second to work around AV scanning
Poorly-written antivirus software briefly lock newly written files to
scan them for viruses, which makes the rename from the temp file to
actual file fail. Work around this by retrying the rename up to ten
times.

Closes #1620.
2013-07-02 20:09:01 -07:00
Thomas Goyne
5bf4f80920 Slightly simplify spectrum image generation in the colorpicker 2013-07-02 20:08:57 -07:00
Thomas Goyne
e2022449d9 Use gil in ColourButton rather than wxMemoryDC
Basic drawing with wxMemoryDC is relatively slow.
2013-07-02 20:08:57 -07:00
Thomas Goyne
991569463a Fix the Select None button in the export dialog 2013-07-01 18:52:15 -07:00
Thomas Goyne
a1d44cafc1 Redesign VideoFrame
Eliminate the manual memory management and shuffle around where the
copies are made to eliminate the need for non-owning video frames.
2013-07-01 18:35:09 -07:00
Thomas Goyne
8760c9a547 Use unique_ptr in Connection rather than a shared_ptr 2013-06-30 16:06:36 -07:00
Thomas Goyne
098ffd0a92 Clean up signal.h a little 2013-06-30 15:51:51 -07:00
Thomas Goyne
7473fb1af6 Fix issues with loading the video AR from subtitles
Removing the first character from the non-custom case resulted in an
error when the value was empty and resulted in nothing happening when a
valid value was present.
2013-06-30 15:37:07 -07:00
Thomas Goyne
96d7912d0b Only generate fake focus lost events when using the generic implementation 2013-06-26 12:59:10 -07:00
Thomas Goyne
a4dd4f6986 Send a fake focus lost event to wxSpinCtrlDouble before reading the value
wxSpinCtrlDouble only updates its value when the spin button is clicked
or it loses focus, and in some cases we want to read the value while it
still has focus.

Closes #1610.
2013-06-26 12:15:31 -07:00
Thomas Goyne
5199923a66 Correctly strip the separator character when loading plain-text files 2013-06-26 11:26:18 -07:00
Thomas Goyne
b3ff6a854d Allow malformed timestamps in SRT. Closes #1614. 2013-06-22 07:54:56 -07:00
Thomas Goyne
135133e4c2 Allow garbage after the timestamp in SRT files. Updates #1614. 2013-06-22 07:53:42 -07:00
Thomas Goyne
7c7cfc79e6 Delete SubtitlesGrid since it's now empty 2013-06-18 19:43:16 -07:00
Thomas Goyne
ad58ae14bf Extract RecombineLines from SubtitlesGrid 2013-06-18 19:43:16 -07:00
Thomas Goyne
bda127144d Extract adjoin lines logic from SubtitlesGrid 2013-06-18 19:43:16 -07:00
Thomas Goyne
e0fcfef32e Remove some unused includes in video_box.cpp 2013-06-12 20:01:21 -07:00
Thomas Goyne
ca9a2f533e Clean up DialogJumpTo slightly 2013-06-12 20:01:21 -07:00
Thomas Goyne
d2a16ed923 Slightly simplify DialogVideoDetails 2013-06-12 20:01:21 -07:00
Thomas Goyne
de7b09f7f7 Change some enums into enum classes 2013-06-12 20:01:21 -07:00
Thomas Goyne
e99f4c4da1 Simplify clipboard_set slightly 2013-06-12 15:52:30 -07:00
Thomas Goyne
b90a77c74b Update the title of the detached video dialog when videos are opened. Closes #1607. 2013-06-12 14:21:56 -07:00
Thomas Goyne
0acec9c874 Fix crash when opening non-cached audio 2013-06-12 14:13:35 -07:00
Thomas Goyne
3306ee126d More unique_ptr 2013-06-11 20:54:07 -07:00
Thomas Goyne
b67a0538ff Drop support for non-little-endian platforms
Aegisub doesn't actually currently run on any.
2013-06-11 20:54:07 -07:00
Thomas Goyne
160346df99 Remove a bunch of cruft from the configure script 2013-06-11 19:52:44 -07:00
Thomas Goyne
4472552fab Fix setting the style editor preview background color 2013-06-11 19:46:28 -07:00
Thomas Goyne
39bff418ca Remove handling for no subtitle providers available 2013-06-11 19:46:26 -07:00
Thomas Goyne
9735397a93 Make libass a hard dependency
There's really no point in letting people build Aegisub without any
subtitle renderers.
2013-06-11 19:46:12 -07:00
Thomas Goyne
f5ee5ca740 Use ColorValidator in DialogStyleEditor 2013-06-11 19:46:10 -07:00
Thomas Goyne
77dd026555 Extract ColorValidator from Automation's dialog stuff 2013-06-11 16:32:59 -07:00
Thomas Goyne
72d4577d7d Kill scoped_ptr in favor of unique_ptr 2013-06-11 16:06:58 -07:00
Thomas Goyne
9133f17e82 Insignificantly speed up opening UTF-8 files 2013-06-09 07:56:20 -07:00
Thomas Goyne
2a2a623bb4 Fix importing styles from files in non-local charsets (i.e. hopefully all of them) 2013-06-09 07:53:07 -07:00
Thomas Goyne
ef2a39fc7b Eliminate pointless UTF-8 -> utf-8 conversion 2013-06-09 07:39:00 -07:00
Thomas Goyne
51d083fe70 Add "edit/line/duplicate/shift_back" to the default grid context menu 2013-06-08 19:22:10 -07:00
Thomas Goyne
7658f6e329 Add default hotkey for "edit/line/duplicate/shift_back" 2013-06-08 19:21:51 -07:00
Thomas Goyne
cff5afbb08 Don't overwrite existing hotkeys in migrations 2013-06-08 19:21:51 -07:00