Commit graph

1798 commits

Author SHA1 Message Date
Thomas Goyne 2109d677a7 Handle unicode in string lists in the preferences dialog
Originally committed to SVN as r6303.
2012-01-17 03:03:13 +00:00
Thomas Goyne 96211b79cf Focus the frame number field of the Jump To dialog when it's opened
Originally committed to SVN as r6302.
2012-01-17 02:47:37 +00:00
Thomas Goyne cf6f54720d Change the default hotkey for the Jumo To dialog to Ctrl-G
The hotkey should only be Ctrl-J on OS X (where Ctrl-G is taken by Find
Next), but platform-specific hotkeys aren't implemented yet.

Originally committed to SVN as r6301.
2012-01-17 02:47:31 +00:00
Thomas Goyne f463bf4bd9 Derive the custom hotkey renderers from wxDataViewCustomRenderer
Deriving from the more specialized renderes reduces the amount of code
required, but it depends on implementation details of the specific
implementations, resulting in the custom renderers not working with
wxGTK. In addition, this makes it possible to bypass the default
handling for 'Enter' which made it impossible to set it as a hotkey.

Originally committed to SVN as r6300.
2012-01-17 02:47:25 +00:00
Thomas Goyne 3ed84ba70d Update distdir generation
The list of files to include was out of date and only included files
for dependencies which were actually enabled, and the script was
FreeBSD-specific.

Originally committed to SVN as r6298.
2012-01-14 18:46:43 +00:00
Thomas Goyne 3c6e28ec2e Make default_config.h/cpp depend on the json files packed into it
Originally committed to SVN as r6296.
2012-01-14 18:46:33 +00:00
Thomas Goyne 72c9bdeebf Add some super-kludgy hotkey migration logic
Originally committed to SVN as r6295.
2012-01-14 01:40:32 +00:00
Thomas Goyne 40e4f887ba Make the enter-key-in-edit-box logic a standard hotkeyed command
Originally committed to SVN as r6294.
2012-01-14 01:40:21 +00:00
Thomas Goyne d8cedf0eec Implement the "Auto-focus audio display on mouse over" option
Originally committed to SVN as r6293.
2012-01-13 21:17:51 +00:00
Thomas Goyne 9166eb1d6b Store the selection range for the audio display srollbar in pixels so it remains valid when the zoom changes
Originally committed to SVN as r6292.
2012-01-13 21:17:40 +00:00
Thomas Goyne 3ec9514636 Fix bogus inactive line markers for the previous line when the first dialogue line is active
Originally committed to SVN as r6291.
2012-01-13 20:59:48 +00:00
Thomas Goyne 37cb9d0548 Fix some 32-bit int overflows at high zoom with long audio
Originally committed to SVN as r6290.
2012-01-13 20:59:35 +00:00
Thomas Goyne 789f25aff2 Move all selected rows up/down rather than just the active row
Originally committed to SVN as r6288.
2012-01-13 20:19:06 +00:00
Thomas Goyne 7e557c1dad Rename edit/line/swap to grid/swap and grid/swap/* to grid/move/*
Continue moving all the reordering commands to grid (why were they in
three different categories?), and change swap to move to better reflect
what they do.

Originally committed to SVN as r6287.
2012-01-13 20:18:57 +00:00
Thomas Goyne e2984b93b0 Rename time/sort/* to grid/sort/*
Sorting lines doesn't effect the timing of them, and sorting by style
doesn't even involve time in any way. Moving lines up and down is
already in the grid category, so it seems logical to put sorting there
as well.

Originally committed to SVN as r6286.
2012-01-13 20:18:48 +00:00
Thomas Goyne 1bcbc728c8 Mark the current visual tool as active in the toolbar
Originally committed to SVN as r6285.
2012-01-13 20:18:40 +00:00
Thomas Goyne 54ebe9b37a Fix incorrect (un)wrapping of the subs edit box toolbar on video zoom changes
The size of the contents is not updated until after SubsEditBox::OnSize
is called, so the wrapping logic was being done based on the previous
available area, rather than the new size.

Originally committed to SVN as r6284.
2012-01-13 20:18:29 +00:00
Thomas Goyne 4ab04b79dd Repaint the visual tools when the active line changes
Originally committed to SVN as r6282.
2012-01-12 22:49:24 +00:00
Thomas Goyne 695559d403 Add missing parentheses that resulted in repainting issues in the audio display with inactive lines disabled
Originally committed to SVN as r6281.
2012-01-12 22:32:28 +00:00
Thomas Goyne ca5c968d4f Non-precomp-header compilation fixes
Originally committed to SVN as r6280.
2012-01-12 22:32:20 +00:00
Thomas Goyne 988ade0c00 Rewrite the font collector
The fontconfig collector should now always pick the exact font files
used by libass rather than a giant mishmash of vaguely related files
which may or may not include the correct font.

Make the freetype font collector windows-only, as it's far inferior to
the fontconfig collector and is only present as a fallback.

Add option to copy the fonts to the script's folder.

Closes #1059.

Originally committed to SVN as r6279.
2012-01-12 22:32:09 +00:00
Thomas Goyne 7dd6cfe37d Derive agi::acs exceptions from agi::FileSystemError and friends rather than having two sets of errors for the same thing
Originally committed to SVN as r6278.
2012-01-12 22:31:54 +00:00
Thomas Goyne 7031ba807b Fix gcc compilation error
Originally committed to SVN as r6277.
2012-01-12 21:33:14 +00:00
Thomas Goyne 85733835d1 Kill setup.cpp and move library inclusion to config_windows0.h. Closes #949.
Originally committed to SVN as r6276.
2012-01-11 20:03:46 +00:00
Thomas Goyne 86aacca631 Move SplitLine from SubtitlesGrid to SubsEditCtrl
This still isn't a very good place for the functionality, but it breaks
SubsEditCtrl's dependency on SubtitlesGrid.

Originally committed to SVN as r6275.
2012-01-11 19:19:30 +00:00
Thomas Goyne c8d67ea0ff Fix disabling the spellchecker
Originally committed to SVN as r6274.
2012-01-11 19:19:21 +00:00
Thomas Goyne db18cea308 Don't sort automation macros by name
Leaving macros in the order they're registered makes it possible to
group related macros. Once a UI for editing the menus has been added it
might make sense to default to sorting them, but for now it's just
unhelpful.

Closes #1381.

Originally committed to SVN as r6273.
2012-01-11 19:19:11 +00:00
Thomas Goyne 896a1ab902 Don't mark things in drawing blocks as words in GetWordBoundaries
This disables spell checking in drawing blocks and potential weird
behavior when right-clicking on drawing blocks.

Originally committed to SVN as r6272.
2012-01-11 19:19:03 +00:00
Thomas Goyne 3f8b9b8213 Fix use of uninitialized variables in GetWordAtPosition when the position is not in a word
Originally committed to SVN as r6271.
2012-01-11 19:18:54 +00:00
Thomas Goyne 1293f86afe Refactor SubsTextEditCtrl::OnContextMenu a bit
Originally committed to SVN as r6270.
2012-01-11 19:18:45 +00:00
Thomas Goyne 4726402abd Don't embolden spell check suggestions
Setting the font to bold also changes the font size, which results in
the suggestions looking worse than the default appearance is.

Originally committed to SVN as r6269.
2012-01-11 19:18:35 +00:00
Thomas Goyne ce01b39248 Add some of the FFMS2 options to the advanced audio page of the preferences dialog
Originally committed to SVN as r6268.
2012-01-10 22:10:57 +00:00
Thomas Goyne 2b49d6ea62 Fix typo in preferences dialog
Originally committed to SVN as r6267.
2012-01-10 22:10:47 +00:00
Thomas Goyne 237193a4bb Add option to only show non-comment inactive dialogue lines in the audio display. Closes #1386.
Originally committed to SVN as r6264.
2012-01-10 20:03:31 +00:00
Thomas Goyne 1a02d2ba3e Add missing #include <algorithm> to dialog_log.cpp. Closes #1391.
Originally committed to SVN as r6262.
2012-01-10 19:09:51 +00:00
Thomas Goyne ea819a2e1a Fix portaudio compilation failure
Originally committed to SVN as r6261.
2012-01-10 19:09:41 +00:00
Thomas Goyne d451cf3e9c Add option to show the previous and next inactive lines in the audio display in addition to previous, all or none. Updates #1386.
Originally committed to SVN as r6260.
2012-01-10 01:16:39 +00:00
Thomas Goyne a0fcd535c1 Store the names of commands in the menu rather than references to the commands themselves, to avoid crashes with dynamically created and removed commands. This makes most menu operations a bit slower, but it appears to be sufficiently fast.
Originally committed to SVN as r6259.
2012-01-09 20:31:55 +00:00
Thomas Goyne 1801583ed7 Reload the video when reattaching the video display. Fixes a pile of issues and potential crashes
Originally committed to SVN as r6258.
2012-01-09 20:31:47 +00:00
Thomas Goyne cd48b711b4 Fix opengl errors when the file is modified with a minimized detached video window open
Originally committed to SVN as r6257.
2012-01-09 20:31:38 +00:00
Thomas Goyne 93c96d1f82 Increase default audio marker snap distance to 10 pixels to match 2.1.9
Originally committed to SVN as r6256.
2012-01-09 20:31:30 +00:00
Thomas Goyne 8bfefd356c Return nil from lua functions which require a project context if they're called during script initialization. Closes #1380.
Originally committed to SVN as r6255.
2012-01-09 20:31:19 +00:00
Thomas Goyne bf26c14999 Remove redundant check in AudioDispaly::SetZoomLevel
Originally committed to SVN as r6254.
2012-01-08 01:37:19 +00:00
Thomas Goyne f4c8bf429b Remove AudioTimingController::HasLabels as the rewritten audio display doesn't need it
Originally committed to SVN as r6253.
2012-01-08 01:37:12 +00:00
Thomas Goyne d04753aaf2 Remove AudioController::GetAudioProvider as it was a temporary hack which is no longer needed
Originally committed to SVN as r6252.
2012-01-08 01:37:05 +00:00
Thomas Goyne 702d1e9c22 Split AudioDisplay::OnPaint into several methods
Originally committed to SVN as r6251.
2012-01-08 01:36:58 +00:00
Thomas Goyne 3c62a38c7a Replace MyThes thesaurus implementation with a custom one
Fixes a pile of unicode-related issues, such as dictionaries in a path
which does not fit into the system's local charset, and significantly
cuts down on the amount of code.

Originally committed to SVN as r6250.
2012-01-08 01:36:50 +00:00
Thomas Goyne 518f93f18f Create the json log writer after checking for local config so it goes to the right place
Originally committed to SVN as r6249.
2012-01-08 01:36:35 +00:00
Thomas Goyne e2d31b708e Split the json log writing into a seperate class from LogSink
Originally committed to SVN as r6248.
2012-01-08 01:36:23 +00:00
Thomas Goyne 59ce8bf414 Pass wxStrings to wxString::Format rather than std::string in LogWindow
Originally committed to SVN as r6247.
2012-01-08 01:36:16 +00:00
Thomas Goyne d148bbbf2a Make agi::log::LogSink take ownership of the emitters passed to it
Originally committed to SVN as r6246.
2012-01-08 01:36:09 +00:00
Thomas Goyne ba1a1dc737 Load configuration before initializing commands, hotkeys and icons, as hotkeys uses ?user which may be changed by configuration loading
Originally committed to SVN as r6245.
2012-01-08 01:36:03 +00:00
Thomas Goyne d2d28401bd Change how local config mode works
Rather than loading both the local and user config files and saving to
the local directory if an option is set, simply try to load the local
config file, and if it exists switch to local mode and never even touch
the user file.

Originally committed to SVN as r6244.
2012-01-08 01:35:56 +00:00
Thomas Goyne ae62cb75b4 Add missing uses of STD_STR when converting from wxString to std::string
Originally committed to SVN as r6243.
2012-01-08 01:35:49 +00:00
Thomas Goyne 976da6717e Change "windows specific" things in the preferences dialog to avisynth-specific
Originally committed to SVN as r6241.
2012-01-08 01:35:37 +00:00
Thomas Goyne 32abbde477 Pass a copy of the video filename to SetVideo in VideoContext::Reload so that it doesn't get cleared by Reset
Originally committed to SVN as r6240.
2012-01-08 01:35:31 +00:00
Thomas Goyne 6f7836c11e Paint keyframe markers on top of line markers so that they don't vanish when lines are scenetimed
Originally committed to SVN as r6239.
2012-01-08 01:35:25 +00:00
Thomas Goyne 58c7bbd78a Sort inactive markers so that lower_bound will actually work when lines are out of order or overlapping
Originally committed to SVN as r6238.
2012-01-08 01:35:18 +00:00
Thomas Goyne c84275d6fa Snap to markers in the audio display on click in addition to on drag
Originally committed to SVN as r6237.
2012-01-08 01:35:11 +00:00
Thomas Goyne 4dcb6240d4 Move audio marker snapping logic from the audio display to the dialogue timing controller
Originally committed to SVN as r6236.
2012-01-08 01:35:04 +00:00
Thomas Goyne 1285584e89 Add ?local for the user's local config dir; use it for FFMS2 indexes
Originally committed to SVN as r6235.
2012-01-08 01:34:57 +00:00
Thomas Goyne 44bc249fe8 Don't suffix the configuration directory with the version on unix
Aegisub is not a library that needs to support having many versions
installed at once, and having multiple versions sharing a config
directory mostly works fine on Windows anyway.

Closes #1031.

Originally committed to SVN as r6234.
2012-01-08 01:34:49 +00:00
Thomas Goyne 43d4e785fb Cosmetics in standard_paths.cpp
Originally committed to SVN as r6233.
2012-01-08 01:34:43 +00:00
Thomas Goyne 01646d7cf4 Remove StandardPaths::DecodePathMaybeRelative, as it's been deprecated forever
Originally committed to SVN as r6232.
2012-01-08 01:34:37 +00:00
Thomas Goyne 15d49fb655 Revamp AssFile::AddLine and related functions to eliminate the statics and hopefully make it less brittle
Originally committed to SVN as r6231.
2012-01-08 01:34:30 +00:00
Thomas Goyne f8b4dd3a61 Bump copyright year in about dialog to 2012
Originally committed to SVN as r6230.
2012-01-08 01:34:24 +00:00
Thomas Goyne afca7e9732 Don't overwrite overridden menu text when hotkeys change
Originally committed to SVN as r6229.
2012-01-08 01:34:18 +00:00
Thomas Goyne 8511376da5 Make strings from the menu json translatable
Originally committed to SVN as r6228.
2012-01-08 01:34:12 +00:00
Thomas Goyne 4d7518e127 Make OpenStream and CloseStream pure virtual
Originally committed to SVN as r6227.
2012-01-08 01:34:06 +00:00
Thomas Goyne 2f38efede6 Remove pointless call to CloseStream in AudioPlayer's destructor (calling virtual functions in constructors/destructors calls the version from the current class, not the most derived type)
Originally committed to SVN as r6226.
2012-01-08 01:34:01 +00:00
Thomas Goyne 81a99ae27b Remove pointless duplicated member variable in OSSPlayer and document a few of the members
Originally committed to SVN as r6225.
2012-01-08 01:33:55 +00:00
Thomas Goyne 02fa5bee3e Add option to automatically open audio when opening video. Closes #1134.
Originally committed to SVN as r6224.
2012-01-08 01:33:47 +00:00
Thomas Goyne df9c6b627f Improve audio open error reporting and remove a pile of unused stuff in AudioPlayer
Originally committed to SVN as r6223.
2012-01-08 01:33:39 +00:00
Thomas Goyne a927672c27 Remove unused private variables in AudioProvider
Originally committed to SVN as r6222.
2012-01-08 01:33:33 +00:00
Thomas Goyne 4e06c198d0 Kill AssStyle::Get\SetMarginString, as it isn't really used for much of anything
Originally committed to SVN as r6221.
2012-01-08 01:33:26 +00:00
Thomas Goyne 8fdd5d987e Remove the encoding parameter from AssFile::SaveMemory, as it only supports utf-8, and simplify the implementation
Originally committed to SVN as r6220.
2012-01-08 01:33:19 +00:00
Thomas Goyne c379e1e8e0 Prompt to save changes before creating new subtitles
Originally committed to SVN as r6218.
2012-01-08 01:05:57 +00:00
Thomas Goyne dc58b3db40 Clean up SetThreadName a little
Originally committed to SVN as r6217.
2012-01-08 01:05:51 +00:00
Thomas Goyne 2b07b3411f Fill in a few placeholder strings
Originally committed to SVN as r6215.
2012-01-08 01:05:39 +00:00
Thomas Goyne dfafbc082d Delete unused command "subtitle/tags/show"
Originally committed to SVN as r6214.
2012-01-08 01:05:33 +00:00
Thomas Goyne e8ba128fa8 Synchronize a bunch of similar but not quite identical strings. Closes #1081.
Originally committed to SVN as r6213.
2012-01-08 01:05:25 +00:00
Thomas Goyne c847318ddb Mark command strings as translatable
Originally committed to SVN as r6212.
2012-01-08 01:05:19 +00:00
Thomas Goyne 3efdef2224 Tweak a few strings to make them easier to translate
Originally committed to SVN as r6211.
2012-01-08 01:05:13 +00:00
Thomas Goyne eaa1001d7a Don't mark help button page names as translatable
Originally committed to SVN as r6210.
2012-01-08 01:05:07 +00:00
Thomas Goyne 25c1225ad1 Fix bug where on wxGTK the display mode would get set to "Subs Only" the first time the menus were opened after opening video or audio
Originally committed to SVN as r6208.
2012-01-08 01:04:55 +00:00
Thomas Goyne 89705b4f9c Add missing config.h include in preferences.cpp
Originally committed to SVN as r6207.
2012-01-08 01:04:50 +00:00
Thomas Goyne 4990d8255c Don't bother refcounting portaudio initializations as portaudio does that internally
Originally committed to SVN as r6206.
2012-01-08 01:04:44 +00:00
Thomas Goyne 0fd475031a Make default script resolution customizable
Originally committed to SVN as r6205.
2012-01-08 01:04:37 +00:00
Thomas Goyne 6b85782dc5 Fix signed/unsigned comparison warning on x64
Originally committed to SVN as r6204.
2012-01-08 01:04:29 +00:00
Thomas Goyne 71968aa4f3 Fix wxString::Format assertion failures in the stack walker
Originally committed to SVN as r6203.
2012-01-08 01:04:16 +00:00
Thomas Goyne 0113b33d66 Always build with -g and optionally strip the debugging symbols on install so that crash backtraces aren't completely meaningless
Originally committed to SVN as r6201.
2012-01-08 01:04:05 +00:00
Thomas Goyne 58d6ac1fad Make DataBlockCache::Age roughly ten times as fast
Originally committed to SVN as r6197.
2012-01-08 01:03:40 +00:00
Thomas Goyne 83805934dd Fix order of Cut and Copy on the subtitles grid context menu
Originally committed to SVN as r6196.
2012-01-08 01:03:33 +00:00
Thomas Goyne 3f9080bbee Fix left-click check on audio display
Originally committed to SVN as r6189.
2011-12-30 15:52:04 +00:00
Thomas Goyne e34b401201 Return -1 from AegisubApp::FilterEvent rather than wxEventFilter::Event_Skip, as the enum was added in wx 2.9.4
Originally committed to SVN as r6188.
2011-12-30 15:51:58 +00:00
Thomas Goyne 84d1315736 Write the config and MRU files to ?data in portable mode rather than ?user
Originally committed to SVN as r6187.
2011-12-30 01:21:03 +00:00
Thomas Goyne d01d7eb78b Fix crash when the audio commit hotkey is pressed with the grid focused and no audio open
Originally committed to SVN as r6185.
2011-12-29 15:12:36 +00:00
Thomas Goyne d192f1c332 Fix bad format string that made stack trace writing fail after one stack frame
Originally committed to SVN as r6184.
2011-12-29 05:36:49 +00:00
Thomas Goyne 68b2ae8275 Eliminate most clang warnings
Originally committed to SVN as r6183.
2011-12-28 21:27:22 +00:00
Thomas Goyne cae10121ed Fix a bunch of -pedantic stuff
Originally committed to SVN as r6181.
2011-12-28 21:27:06 +00:00