Commit graph

2478 commits

Author SHA1 Message Date
Thomas Goyne
3d3a74c5d2 Audio display cosmetics 2012-10-02 07:27:52 -07:00
Thomas Goyne
55bdbf8d48 Add scroll arrows to the karaoke syllable bar when the contents are too wide to fit. Closes #1516. 2012-10-01 16:55:20 -07:00
Thomas Goyne
b020322a3a Update the size of the karaoke syllable bar when the window is resized. Updates #1516. 2012-10-01 15:38:02 -07:00
Thomas Goyne
1b089795f1 Also stop the video when stopping audio playback as 2.1.9 did. Closes #1515. 2012-10-01 10:28:42 -07:00
Thomas Goyne
0a5fa6ff39 Don't use ARC in the Obj-C++ code
It never allocated any non-autoreleased objects so ARC wasn't actually
doing anything other than breaking compilation with gcc.
2012-09-29 22:10:45 -07:00
Thomas Goyne
25e65237cd Mark "Action" as translatable in the fonts collector dialog
Fortunately "Action" is also used in the select lines dialog so it's
already present in the translations.
2012-09-27 17:10:33 -07:00
Thomas Goyne
08c9781dfb Actually modify the line time when applying lead-in/out in karaoke mode 2012-09-24 18:56:49 -07:00
Thomas Goyne
7433b814a7 Modify the first syllable when normalizing karaoke syllable lengths 2012-09-24 18:46:15 -07:00
Thomas Goyne
85f2774033 Report the user's UI language in addition to the system language to the update checker 2012-09-24 13:00:52 -07:00
Thomas Goyne
ccf3e94d96 Bundle the Serbian translation as sr_YU on OS X as it doesn't have sr_RS 2012-09-23 08:20:24 -07:00
Thomas Goyne
51e23a3c7e Remove the period from the catalog name since gettext seems to not like it 2012-09-22 21:29:44 -07:00
Thomas Goyne
39bf2ab5fd Don't list languages in the language dialog which won't actually work. Updates #1508. 2012-09-22 09:51:39 -07:00
Thomas Goyne
9a6eb70f12 Try to find an English locale ID which is available
wxLANGUAGE_ENGLISH corresponds to the "en" locale on Linux, which is
generally not installed, which resulted in English actually being the
system default locale.

Updates #1508.
2012-09-22 09:42:32 -07:00
Thomas Goyne
c4f6e729f9 Add missing period in 2.35 in a string that probably isn't actually visible anywhere 2012-09-21 18:13:10 -07:00
Thomas Goyne
6943b868da Handle file not found errors when opening linked audio from subtitles 2012-09-21 18:07:30 -07:00
Thomas Goyne
ffab39b21f Don't automatically load audio from video if audio from that file is already open 2012-09-21 17:58:22 -07:00
Thomas Goyne
7b5bb6f57a Add missing languages to the hardcoded list for non-windows 2012-09-16 19:12:05 -07:00
Thomas Goyne
ef99f77087 Make the open/save keyframes dialog title translatable 2012-09-16 18:52:50 -07:00
Thomas Goyne
2c2f60d4e0 Fix completely incorrect behavior when AR changing is enabled in the resolution resampler 2012-09-14 07:55:31 -07:00
Thomas Goyne
e552dc4c9c Remove some dead assigns 2012-09-14 07:55:01 -07:00
Thomas Goyne
9ae6e3c538 Fix compilation with precompiled headers disabled 2012-09-06 08:25:38 -07:00
Thomas Goyne
0d1ffbbdf7 Update manual URL 2012-09-03 17:28:45 -07:00
Thomas Goyne
1c9af767e5 Move audio decode error handling to GetAudio
Errors when not getting with volume need to be handled too.

Updates #1509.
2012-09-01 21:45:18 -07:00
Thomas Goyne
e995cd2616 Don't stop video playback when undoing or redoing changes 2012-09-01 21:45:17 -07:00
Thomas Goyne
9f8e25ed0a Force LC_CTYPE to en_US.UTF-8 on OS X
When run from an app bundle the locale environment variables are unset,
and the default locale settings are bogus as a result.
2012-08-26 19:15:48 -07:00
Thomas Goyne
09962a56d1 Use the last valid mouse position for VideoDisplay::GetMousePosition
On Windows opening the context menu triggers a mouse leave event, which
invalidates the current mouse position, so the Copy coordinates to
Clipboard command didn't work.
2012-08-25 18:33:46 -07:00
Thomas Goyne
b0036b4d99 Statically link libaegisub
Dynamically linking it caused a steady stream of issues for no apparent
benefits.
2012-08-21 07:02:45 -07:00
Thomas Goyne
4208fa362c Fix stack check failure when a script fails to load in a debug build 2012-08-19 20:32:18 -07:00
Thomas Goyne
1e030289ad Revamp how version tagging works
Rather than having it be a configurable option, simply build in final
release mode if Aegisub is being built from a signed tag, and get the
version information from that tag.

Drop the version number from the OS X app bundle when not building from
a tag as it done everywhere else. Drop the arch suffix since ppc hasn't
been tested in years and isn't worth testing as it's only going to get
less relevant as time goes on.

Remove some redundant definitions in the build system.
2012-08-19 14:33:50 -07:00
Thomas Goyne
42a016a83b Update the revision checks to work with a pure-git repo 2012-08-19 14:05:38 -07:00
Thomas Goyne
18db0b09ac Log audio decoding errors
Originally committed to SVN as r6961.
2012-08-19 14:11:29 -07:00
Thomas Goyne
79684d5ad6 Factor out bounds-checking for GetAudio to a single place
It was being done in inconsistent ways in several places, which did not
include all of the places it needed to be done.

Closes #1509.

Originally committed to SVN as r6960.
2012-08-19 14:11:29 -07:00
Thomas Goyne
037d385419 Guard uses of audio providers with a mutex when not using a cache as they aren't thread-safe. Updates #1509.
Originally committed to SVN as r6959.
2012-08-19 14:11:29 -07:00
Thomas Goyne
5a38d69921 Open files as binary in TextFileReader
Text mode does undesirable things like stopping when it hits an EOF
byte, which can be a valid part of a UTF-16 character, and line_iterator
handles stripping \r anyway.

Originally committed to SVN as r6958.
2012-08-19 14:11:29 -07:00
Thomas Goyne
e774902a29 Always write a newline at the end of ASS files
Originally committed to SVN as r6957.
2012-08-19 14:11:29 -07:00
Thomas Goyne
b265d1fa0e Actually set the actor when reading from txt files
Originally committed to SVN as r6956.
2012-08-19 14:11:29 -07:00
Thomas Goyne
d132364025 Fix check for OS X version in the update checker
Originally committed to SVN as r6955.
2012-08-19 14:11:28 -07:00
Thomas Goyne
21841e84a8 Get the locale name for OS X from CF rather than wx
Originally committed to SVN as r6954.
2012-08-19 14:11:28 -07:00
Thomas Goyne
f2035d76fc Don't block the source of a drag-and-drop while the dropped audio/video are loading
Originally committed to SVN as r6953.
2012-08-04 16:31:44 +00:00
Thomas Goyne
b86a1bfb2d Fix compilation with wx 2.9.4 with 2.8 compatibility enabled. Closes #1504.
Originally committed to SVN as r6952.
2012-08-03 02:32:30 +00:00
Thomas Goyne
e2e304f2cb Don't try to shift to a negative start time when shifting lines to frame zero
Originally committed to SVN as r6951.
2012-07-29 03:23:27 +00:00
Thomas Goyne
ffe41cdf20 Don't discard frames which are decoded before the video display becomes visible
Originally committed to SVN as r6950.
2012-07-29 03:23:24 +00:00
Thomas Goyne
8c42f09235 Don't pass size_t to wxString::Format since there's no portable specifier for it
Originally committed to SVN as r6949.
2012-07-24 02:40:39 +00:00
Thomas Goyne
8ba149a7e6 Actually save the video zoom to the subtitles file
Originally committed to SVN as r6948.
2012-07-24 02:40:37 +00:00
Thomas Goyne
65d3c4cc2d Save keyframe and timecode file names even if video isn't loaded
Originally committed to SVN as r6947.
2012-07-24 02:40:34 +00:00
Thomas Goyne
de7dd7e07f Use the video AR from the script rather than the video's AR when opening linked video
Originally committed to SVN as r6946.
2012-07-24 02:40:31 +00:00
Thomas Goyne
269a206053 Fix loading linked audio when automatic opening of audio from video is enabled
Originally committed to SVN as r6945.
2012-07-24 02:40:29 +00:00
cantabile
7bd7ef7cd6 Shift times: Make Enter in the time edit do the same as clicking OK
Originally committed to SVN as r6944.
2012-07-24 02:39:40 +00:00
cantabile
5ecb89eeec Shift times: Use TimeEdit::SetTime() instead of TimeEdit::SetValue()
TimeEdit::SetValue() will trigger TimeEdit::OnModified(), but that
doesn't always update the internal "time" property.
TimeEdit::OnModified() seems to be designed to handle editing the value
with the keyboard, not with SetValue().

Originally committed to SVN as r6943.
2012-07-24 02:39:37 +00:00
cantabile
3193e05747 Use correct format specifier in AssColor::GetSSAFormatted()
Avoids a ton of assertion failures when saving SSA files.

Originally committed to SVN as r6942.
2012-07-24 02:39:35 +00:00
cantabile
ef65262920 SRTSubtitleFormat: don't mix line endings in non-Windows
Originally committed to SVN as r6941.
2012-07-24 02:39:32 +00:00
Thomas Goyne
b2fb39b67f Fix leak of the Indexer when an audio/video file has already been indexed
Originally committed to SVN as r6940.
2012-07-23 00:44:47 +00:00
Thomas Goyne
11a4ede9a0 Add Layer to the things lines can be sorted by
Originally committed to SVN as r6939.
2012-07-23 00:44:44 +00:00
Thomas Goyne
ef3e75dbe9 Pass the row length rather than frame width to OpenGL for the unpack row length
Originally committed to SVN as r6937.
2012-07-21 03:50:38 +00:00
Thomas Goyne
556f0514c2 Fix crash in the Kanji timer when the source begins with whitespace and the dest is empty
Originally committed to SVN as r6936.
2012-07-21 03:50:35 +00:00
Thomas Goyne
291a4050d8 Fix manual path generation
Originally committed to SVN as r6935.
2012-07-14 16:54:15 +00:00
Thomas Goyne
38217c6c59 Implement the timing adjustment commands
Originally committed to SVN as r6933.
2012-07-14 13:35:15 +00:00
Thomas Goyne
60c38bd2e5 Fix potential crash when deleting lines with audio open
Don't assume that the active line is valid in RegenerateInactiveLines,
as it may get called by the commit signal before the selection is
updated when the active line is deleted.

Closes #1502.

Originally committed to SVN as r6932.
2012-07-08 23:22:27 +00:00
Thomas Goyne
5162c28684 Check for audio hotkeys in both key down and char hook
wx doesn't call the keyboard hook when a window has capture, which
results in hotkeys not working while a mouse button is held down. This
usually doesn't matter much, but in the audio display one might want to
play audio while moving a marker. In general checking for hotkeys in
keydown doesn't work, but in the specific cast of marker dragging
keyboard focus is guaranteed to be on the audio display so it works out.

Originally committed to SVN as r6931.
2012-07-08 23:22:25 +00:00
Thomas Goyne
4e53ab3eab Remove the uses of wxNumberFormatter
We currently require mismatched locales for non-English since we don't
distinguish between locale-independent things like the config file and
UI things, which wxNumberFormatter barfs on.

Originally committed to SVN as r6930.
2012-07-06 02:14:46 +00:00
Thomas Goyne
8244271508 Use curl to fetch updates on OS X
The update checker sometimes triggers crashes on startup on OS X when
trying to release the CFSocket, so hopefully sidestep whatever the issue
is by just using curl to retrieve the update list.

Originally committed to SVN as r6929.
2012-07-05 23:05:37 +00:00
Thomas Goyne
3dc9e4fbea Don't try to set the zoom dropdown selection if it'd be out of bounds
Originally committed to SVN as r6928.
2012-07-05 23:05:34 +00:00
Thomas Goyne
2fb6b19e45 Destroy the old video context when detaching video
It was previously not being destroyed until video was reattached, which
wasted VRAM and caused problems on OS X.

Originally committed to SVN as r6927.
2012-07-04 15:30:21 +00:00
Thomas Goyne
f90d7a56fa Mostly rewrite the VideoDisplay sizing logic
Fixes layout errors after maximizing when the window previously wasn't
big enough to fit the video and an infinite loop caused by wxGTK not
updating the window size immediately.

Makes it so that the bottom video toolbar is not pushed offscreen by
high video zoom. This is not always desirable, but should be an
improvement in most cases.

Closes #1409.

Originally committed to SVN as r6926.
2012-07-04 15:30:16 +00:00
Thomas Goyne
a7b254e95f Use the user's ffms2 error handling mode when indexing video files to avoid reindexing when opening the audio
Originally committed to SVN as r6925.
2012-06-30 15:27:11 +00:00
Thomas Goyne
fbd0681d2a Use the translated text for submenus
Originally committed to SVN as r6924.
2012-06-27 01:44:38 +00:00
Thomas Goyne
7bb1e10736 Add Basque translation by Xabier Aramendi. Closes #1499.
Originally committed to SVN as r6923.
2012-06-27 01:44:33 +00:00
Thomas Goyne
400520daa4 Fix handling of \N, \n and \h in the fonts collector
Originally committed to SVN as r6922.
2012-06-26 01:50:41 +00:00
Thomas Goyne
e945c02151 Fix some warnings
Originally committed to SVN as r6919.
2012-06-25 14:21:32 +00:00
Thomas Goyne
4129051684 Add license headers to libresrc.(h|cpp)
Originally committed to SVN as r6917.
2012-06-23 01:06:43 +00:00
Thomas Goyne
ed070b7b6a Wrap standard headers in libresrc.h with #ifndef AGI_PRE
Originally committed to SVN as r6916.
2012-06-23 01:06:40 +00:00
Thomas Goyne
257e25eb0e Make libresrc_getconfig less weird
Originally committed to SVN as r6915.
2012-06-23 01:06:38 +00:00
Thomas Goyne
e99b1aaad4 Remove some pointess stuff in the icon code
Originally committed to SVN as r6914.
2012-06-23 01:06:35 +00:00
Thomas Goyne
bfa3aba654 Don't try to use wxFileName::Exists with wx 2.9.3. Closes #1500.
Originally committed to SVN as r6913.
2012-06-23 01:06:32 +00:00
Thomas Goyne
fd017b52ac Fix incorrectly positioned controls in the fonts collector dialog
The documentation claims that making things in static boxes children of
the static box is the right thing to do, but it's broken things a few
times now, so just make them children of the static box's parent.

Originally committed to SVN as r6912.
2012-06-21 04:32:10 +00:00
Thomas Goyne
7d2fb49828 Make the update checker configurable
Move the server and base url to the build-time configuration options and make
it disablable entirely.

Originally committed to SVN as r6911.
2012-06-21 02:09:40 +00:00
Thomas Goyne
87370eb9c0 Fix crash when clicking in the screen dropper area on Windows
Originally committed to SVN as r6910.
2012-06-17 20:22:38 +00:00
Thomas Goyne
9f7bdd8d17 Don't force ffms2 threads to 1 if it's recent enough
Originally committed to SVN as r6909.
2012-06-16 04:10:32 +00:00
Thomas Goyne
77821c10b7 Don't also force TV range when Force BT.601 is enabled
Originally committed to SVN as r6908.
2012-06-15 13:09:15 +00:00
cantabile
5ea71bce89 HD audio cache: initialise variables before checking for free space
Originally committed to SVN as r6907.
2012-06-15 13:08:45 +00:00
cantabile
d99f3e3841 Fix missing ending slash in the HD cache file's location
Given the location "/home/asdf/.aegisub" and name "audio%02i.tmp",
the cache file was ".aegisubaudio00.tmp" in "/home/asdf"...

Originally committed to SVN as r6906.
2012-06-15 13:08:41 +00:00
cantabile
67c05519fa Allow the use of standard paths in the HD cache file's location
Originally committed to SVN as r6905.
2012-06-15 13:08:39 +00:00
Thomas Goyne
b8c6a41ac4 Add support for floating-point audio. Closes #1490.
Originally committed to SVN as r6904.
2012-06-13 15:58:28 +00:00
Thomas Goyne
5eb14a1f7a Maybe really fix hurr durr gtk. Closes #1474.
Originally committed to SVN as r6903.
2012-06-13 15:58:24 +00:00
Thomas Goyne
05f63f14b2 Log which audio provider is actually used
Originally committed to SVN as r6902.
2012-06-13 15:58:21 +00:00
Thomas Goyne
d4635b723a Support wx built with utf-32 strings
Originally committed to SVN as r6901.
2012-06-13 04:16:53 +00:00
Thomas Goyne
7c461ddfcf Use size_t rather than int64_t as the array index in AudioProvider::GetAudioWithVolume
In 32-bit builds the int64_t index resulted in two (inlined) calls to
allmul per audio sample, which took 25-50% of the total CPU time
involved in playing audio from the RAM cache.

Originally committed to SVN as r6900.
2012-06-13 04:16:50 +00:00
Thomas Goyne
998fc633b9 osx: Fix assertion failure when expanding hotkey categories
Originally committed to SVN as r6899.
2012-06-12 03:13:58 +00:00
Thomas Goyne
2db20778fc Mostly rewrite the screen dropper code
Eliminate a lot of the platform-specific code by just using the portable
versions everywhere, and use CoreGraphics rather than wxScreenDC to grab
an image of the screen on OS X as wxScreenDC doesn't actually work on
10.6+.

Originally committed to SVN as r6898.
2012-06-12 03:13:55 +00:00
Thomas Goyne
82d955ba96 Exit on error in osx-run.sh
Originally committed to SVN as r6897.
2012-06-12 03:13:53 +00:00
Thomas Goyne
0f071d978a Rewrite the OS X bundle utils in Obj-C++ and return std::strings rather than malloced char *
Originally committed to SVN as r6896.
2012-06-12 03:13:49 +00:00
cantabile
4b78e05695 Video box: tweak the tab order
Move the slider before the buttons,
and move the video display before the slider.

Originally committed to SVN as r6895.
2012-06-12 02:59:41 +00:00
cantabile
46c83d7f1c Allow tabbing out of the video slider
Originally committed to SVN as r6894.
2012-06-12 02:59:38 +00:00
cantabile
acea3a04e0 Make run.sh work regardless of $PWD.
Originally committed to SVN as r6893.
2012-06-12 02:59:35 +00:00
Thomas Goyne
03b1b8e1c0 Flush options before restarting so that language changes actually apply
Originally committed to SVN as r6892.
2012-06-08 21:20:21 +00:00
Thomas Goyne
a51de67d68 ffms2: Reindex and reload audio when the error handling mode is changed
Originally committed to SVN as r6891.
2012-06-07 21:03:11 +00:00
Thomas Goyne
8c17d45e8c osx: Move the detached video dialog to the normal window level when it goes fullscreen as it's hilariously broken otherwise
Originally committed to SVN as r6890.
2012-06-07 21:03:08 +00:00
Thomas Goyne
f0f7ad2858 osx: Make modelss dialogs stay on top of the main window as they're floating panels, not documents
Originally committed to SVN as r6889.
2012-06-07 02:48:13 +00:00
Thomas Goyne
26a5fbe4b8 osx: Add the full screen button to the detached video dialog
Originally committed to SVN as r6888.
2012-06-07 02:48:11 +00:00
Thomas Goyne
b65e867455 Enable the Accept Splits button even when it's only the autosplit that would be committed
Originally committed to SVN as r6887.
2012-06-07 02:48:08 +00:00
Thomas Goyne
c6237865af Unconditionally add -lz to WX_LIBS
Originally committed to SVN as r6885.
2012-05-28 15:00:54 +00:00
Thomas Goyne
9cb5178c4b Revert r6758
The explicit cast should not be required, and the type of the parameter
has changed between wx versions so it breaks things.

Originally committed to SVN as r6884.
2012-05-28 14:55:42 +00:00
Thomas Goyne
108c38b9bc Don't swallow : keypresses in TimeEdit
Originally committed to SVN as r6883.
2012-05-28 14:18:40 +00:00
cantabile
a3d7d2bbc0 TimeEdit: handle Shift-Insert the same way as Ctrl-V
Shift-Insert pasted the text anyway, but without anyone "noticing",
which meant the TimeEdit's internal variable "time" didn't get updated,
causing TimeEdit::GetTime() to return the old time. Because of this,
pasting a time in the Jump To dialog with Shift-Insert didn't update the
frame number.

Originally committed to SVN as r6882.
2012-05-28 14:18:10 +00:00
cantabile
3a81e80aa5 Add workaround for tabbing out of SubsTextEditCtrl
wxStyledTextCtrl eats the tabs, so handle them in
SubsTextEditCtrl::OnKeyDown()

Originally committed to SVN as r6881.
2012-05-28 14:18:07 +00:00
Thomas Goyne
571752a955 Make the visual typesetting toolbar use all available space
When toolbars actually have a background (as on OS X), the stretch
spacer was very ugly, and there's no different on platforms without a
background.

Originally committed to SVN as r6880.
2012-05-26 20:16:12 +00:00
Thomas Goyne
cde9a34425 osx: Add the full screen button to the main window
Originally committed to SVN as r6879.
2012-05-26 20:16:08 +00:00
Thomas Goyne
1da7502d6e Remove pointless commented-out code
Originally committed to SVN as r6878.
2012-05-26 20:16:05 +00:00
Thomas Goyne
427c8406d5 hurr durr gtk. Closes #1474.
Originally committed to SVN as r6875.
2012-05-26 16:54:55 +00:00
Thomas Goyne
a75c8705bb Make bitmap.{h,cpp} depend on their input files
Originally committed to SVN as r6874.
2012-05-26 16:54:52 +00:00
Thomas Goyne
29e9d09859 Fix non-precompiled-header compilation
Originally committed to SVN as r6843.
2012-05-23 03:38:50 +00:00
Thomas Goyne
c6aa43de72 Add command audio/play/current
This is like audio/play/selection except it ignores changes to the
primary range during playback, and always stops when the original end of
the line is reached.

Originally committed to SVN as r6841.
2012-05-23 03:38:44 +00:00
Thomas Goyne
567549c55d OS X: Add default hotkey to show/hide toolbar
Originally committed to SVN as r6840.
2012-05-23 03:38:41 +00:00
Thomas Goyne
58de109085 Add Show/Hide toolbar to the View menu
The Apple HIG says to include this, and I see no reason not to include
it on the other platforms as well.

Originally committed to SVN as r6839.
2012-05-23 03:38:37 +00:00
Thomas Goyne
24cd2bbdf9 Fix the name of the quit command
Originally committed to SVN as r6837.
2012-05-19 16:22:21 +00:00
Thomas Goyne
35279b6e28 Remove pointless blank buttons
Originally committed to SVN as r6835.
2012-05-19 15:49:23 +00:00
Thomas Goyne
e4cc9d1404 OX X: Force 32x32 toolbar icons rather than 24x24
Originally committed to SVN as r6834.
2012-05-19 15:49:18 +00:00
Thomas Goyne
57d1d92a9e Make the 32x32 icons available in the program
Originally committed to SVN as r6833.
2012-05-19 15:49:12 +00:00
Thomas Goyne
dc99f02d1d Add 32x32 icons to the respack manifest
Originally committed to SVN as r6832.
2012-05-19 15:49:06 +00:00
Thomas Goyne
2fdded77fb Add 32x32 versions of the icons for OX X
Originally committed to SVN as r6831.
2012-05-19 15:48:57 +00:00
Thomas Goyne
467f4b0c52 Fix crash when changing hotkeys after detaching video
ToolTipManager's slots can outlive the windows they're for, so use
wxWeakRef to avoid trying to update the tooltip for windows that have
been destroyed.

Originally committed to SVN as r6830.
2012-05-19 03:02:21 +00:00
Thomas Goyne
b6e47f1cc0 Remove unused incldue in subs_edit_box.cpp
Originally committed to SVN as r6829.
2012-05-19 03:02:15 +00:00
Thomas Goyne
dcbe114361 Add version of run.sh that works on OS X
Originally committed to SVN as r6828.
2012-05-19 01:13:11 +00:00
Thomas Goyne
3d512eb422 OS X: Always use 24x24 icons for toolbars attached to frames
32x32 icons really should be used here as they'll get automatically
upscaled to that anyway, but we currently don't have those.

Originally committed to SVN as r6827.
2012-05-19 01:13:05 +00:00
Thomas Goyne
ba40e24326 Attach toolbars to the frame before populating them
Works around a wxOSX-Cocoa bug (http://trac.wxwidgets.org/ticket/13888)
that resulted in items never being added to the toolbar.

Originally committed to SVN as r6826.
2012-05-19 01:13:00 +00:00
Thomas Goyne
c7fb7eb295 Handle modeless dialogs which never fully open
Fixes crash when opening the spell checker dialog after no spelling
errors were found previously.

Closes #1491.

Originally committed to SVN as r6824.
2012-05-18 14:01:56 +00:00
Thomas Goyne
904b5aafe4 Set both the initial and value for font size spin ctrls as well
Originally committed to SVN as r6823.
2012-05-18 05:03:21 +00:00
Thomas Goyne
4f832e4b82 Cast size_ts passed to wxString::Format to ints
Originally committed to SVN as r6822.
2012-05-18 05:03:16 +00:00
Thomas Goyne
21100038f5 Explicitly set the value of the Matches radio box in the Select Lines dialog
On OS X is it not implicitly set to the opposite of the Doesn't Match
radio box as it is on other platforms.

Originally committed to SVN as r6821.
2012-05-18 05:03:11 +00:00
Thomas Goyne
5c10bfa2f3 OS X: Fix crash when opening Find/Replace dialog
Originally committed to SVN as r6820.
2012-05-18 05:03:05 +00:00
Thomas Goyne
2675bbb831 OS X: Adjust some default hotkeys to match the platform standards
Originally committed to SVN as r6819.
2012-05-18 05:03:00 +00:00
Thomas Goyne
2f2e33617a OS X: Rearrange menus a bit to get closer to normal
Originally committed to SVN as r6818.
2012-05-18 05:02:55 +00:00
Thomas Goyne
129edf3f12 OS X: Use Lucida Grande by default
Originally committed to SVN as r6817.
2012-05-18 05:02:50 +00:00
Thomas Goyne
3699a35988 Add OS X-specific default config, hotkey and menu files
Originally committed to SVN as r6816.
2012-05-18 05:02:43 +00:00
Thomas Goyne
33c36a3298 Fix double multiplication by sample rate that resulted in the waveform renderer allocating way more memory than needed
Originally committed to SVN as r6815.
2012-05-18 01:58:35 +00:00
Thomas Goyne
015d533556 Fix bad destruction order when exiting without closing the main window first
On OS X, when closing via Quit the document windows are not closed until
after OnExit is called, resulting the project context being destructed
after the global stuff, resulting in crashes on exit in some cases.

Originally committed to SVN as r6812.
2012-05-16 14:23:16 +00:00
Thomas Goyne
7ab4f85211 Stop audio undo coalescing when swtiching between lines
Originally committed to SVN as r6811.
2012-05-16 14:23:10 +00:00
Thomas Goyne
c86f553aa7 Handle the menu items that are moved to the application menu on OS X
Originally committed to SVN as r6810.
2012-05-16 04:57:24 +00:00
Thomas Goyne
e51a86195f Don't signal ScriptsChanged in ScriptManager's destructor
Fixes a crash on exit on OS X

Originally committed to SVN as r6809.
2012-05-16 04:57:18 +00:00
Thomas Goyne
7570d2b982 Fix wxString::Format assertion failure when opening the log window
Originally committed to SVN as r6808.
2012-05-16 04:57:12 +00:00
Thomas Goyne
7e8c18492f Fix non-precompiled-header compilation
Originally committed to SVN as r6807.
2012-05-16 04:57:06 +00:00
Thomas Goyne
0efae2fc85 Add ffms2's cflags to preferenes.cpp
Originally committed to SVN as r6806.
2012-05-16 04:56:59 +00:00
Thomas Goyne
e798e517bd Add padding to the sides of the jump to dialog
Originally committed to SVN as r6805.
2012-05-15 14:11:30 +00:00
cantabile
8960e840d2 Vertically center various widgets
Preferences: labels.
Properties dialog: resolution textboxes.
Fonts collector: path textbox.
Resample resolution: resolution spin boxes.
Video details: labels.

Originally committed to SVN as r6804.
2012-05-15 14:07:14 +00:00
cantabile
b8f7d5eb13 Jump To dialog: use correct format specifier in wxString::Format
Avoids an assertion failure.

Originally committed to SVN as r6803.
2012-05-15 14:07:10 +00:00
cantabile
5d9268792f Make the Jump To dialog less silly
- Don't set arbitrary sizes for the labels and textboxes.
- Get rid of the horizontal box sizers because the labels just wouldn't
  center vertically. Use a grid sizer instead.
- Use a wxStdDialogButtonSizer instead of creating the buttons manually.

Originally committed to SVN as r6802.
2012-05-15 14:07:05 +00:00
cantabile
9254ea8ff6 Dummy video dialog: make the OK button the default button of the dialog
Done by imitating the buttons in the timing postprocessor.

Originally committed to SVN as r6801.
2012-05-15 14:07:00 +00:00
cantabile
848ebf4d2d Move two accelerators
SubsEditBox: move accelerator so it doesn't conflict with "Timing" menu.
Dummy video dialog: move accelerator so it doesn't conflict with the
Cancel button.

Originally committed to SVN as r6800.
2012-05-15 14:06:55 +00:00
cantabile
597b92bb7f Silence three gcc warnings ("ambiguous else")
Originally committed to SVN as r6799.
2012-05-15 14:06:49 +00:00
cantabile
68d7677e14 Never focus the comment checkbox (wxGTK only)
The checkbox can be toggled using its accelerator, without needing to
switch focus back to whatever was focused before.

Originally committed to SVN as r6798.
2012-05-15 14:06:44 +00:00
cantabile
1afc3a816f Alsa player: avoid allocating an array of negative size and add some printfs for debugging.
Originally committed to SVN as r6797.
2012-05-15 14:06:39 +00:00
cantabile
9f6d117875 Preferences: give the font and path textboxes a minimum width of 160 px
The default minimum width was too small.

Originally committed to SVN as r6796.
2012-05-15 14:06:34 +00:00
cantabile
c868928817 Preferences, Colors page: make the box sizers expand
This way the Colors page behaves more or less like the other pages.

Originally committed to SVN as r6795.
2012-05-15 14:06:29 +00:00
cantabile
8887f96098 Preferences: rearrange the "Colors" page a bit
Make it look less asymmetrical.

Originally committed to SVN as r6794.
2012-05-15 14:06:24 +00:00
Thomas Goyne
d38e02c031 Always use wxPATH_WIN for wxFileName::GetForbiddenChars
While it's possible to have files with the DOS-only forbidden characters
on other platforms, wx doesn't actually support them very well.

Closes #1489.

Originally committed to SVN as r6792.
2012-05-15 13:40:10 +00:00
Thomas Goyne
ea1dbc3e8c Remove out of date bug workaround
Panel borders no longer make update region coordinates be out of sync
with drawing coordinates.

Originally committed to SVN as r6791.
2012-05-15 13:40:05 +00:00
Thomas Goyne
d31b795e60 Move the logic for Enter in a time edit to SubsEditBox
It doesn't make any sense for the time edits used elsewhere, and it made
Enter in a time edit not close dialogs.

Originally committed to SVN as r6790.
2012-05-15 13:40:00 +00:00
Thomas Goyne
fc7164422c Flush options after asking the first-startup questions
Originally committed to SVN as r6789.
2012-05-15 13:39:55 +00:00
Thomas Goyne
4940a98e85 Set both the initial and value fields of spin controls in the preferences dialog since wx ports are inconsistent about which is used
Originally committed to SVN as r6788.
2012-05-15 13:39:50 +00:00
Thomas Goyne
5b9ba0205a Always use change_value for setting spin ctrls in the color picker
With wxCocoa the change events from SetValue are processed immediately,
resulting in significant breakage as in some cases multiple spin
controls need to be set at once. Even on other platforms where things
appeared to work due to the change notifications being delayed, they
still didn't do anything useful and slowed updates down slightly.

Originally committed to SVN as r6787.
2012-05-15 13:39:45 +00:00
Thomas Goyne
ad64e8e48a Remove hardcoded widths for the labels in the color picker
This results in the controls being slightly misaligned, but that's not
as bad as truncating the labels.

Originally committed to SVN as r6786.
2012-05-15 13:39:40 +00:00
Thomas Goyne
a97c7fa1f6 Fix infinite loop when changing the color in the color picker on OS X
Originally committed to SVN as r6785.
2012-05-15 13:39:35 +00:00
Thomas Goyne
75305877f0 Set the initial values of the color picker before binding events
Originally committed to SVN as r6784.
2012-05-15 13:39:30 +00:00
Thomas Goyne
ba413fa64d Rework destruction of FrameMain's children
wxCocoa doesn't like reparenting SubsGrid to NULL, so instead
recursively destroy all of FrameMain's children other than SubsGrid and
its parent. Fixes a crash on exit on OS X.

Originally committed to SVN as r6783.
2012-05-15 13:39:24 +00:00
Thomas Goyne
6b21485c0b Add default_config_platform.json to distclean files
Originally committed to SVN as r6775.
2012-05-14 13:21:33 +00:00
Thomas Goyne
0239ab6688 Remove the explicit height from the preferences dialog
The height was too short to fit the contents in some cases, and wasn't
even used on Windows. Patch by cantabile.

Closes #1488.

Originally committed to SVN as r6773.
2012-05-13 00:58:16 +00:00
Thomas Goyne
57e06a6cad Fix error when a dropdown in the preferences dialog has no values
Originally committed to SVN as r6772.
2012-05-13 00:58:11 +00:00
Thomas Goyne
d04bc6d9b4 Don't paint the audio display if it hasn't been fully initialized due to audio not being open
Originally committed to SVN as r6771.
2012-05-13 00:58:06 +00:00
Thomas Goyne
35fa6c47ce Automatically add a "Default" style to the "Default" catalog as 2.1.x did. Patch by cantabile. Closes #1487.
Originally committed to SVN as r6765.
2012-05-13 00:57:34 +00:00
Thomas Goyne
3388281fb7 Fix error when the style catalog directory doesn't exist or is empty
Use wxDir::GetFirst/GetNext rather than wxFileFirstFile since the latter
doesn't have any way to signal that there aren't actually any files to
be found.

Closes #1486.

Originally committed to SVN as r6764.
2012-05-13 00:57:25 +00:00
Thomas Goyne
2addf40b31 Fix typo (204M -> 240M)
Originally committed to SVN as r6763.
2012-05-11 14:42:30 +00:00
Thomas Goyne
bc74dfc33b Update the video matrix tagging scheme
Write the color range and color space used to convert video to RGB to
the YCbCr Matrix field, or None if no non-RGB video was opened. See
http://code.google.com/p/xy-vsfilter/issues/detail?id=91 for related
discussion.

Originally committed to SVN as r6762.
2012-05-11 14:38:44 +00:00
Thomas Goyne
baacea6ab0 Force threads to 1 when opening video via lavf since the ffms2 bug that makes multithreaded decoding sometimes break still hasn't been fixed
Originally committed to SVN as r6761.
2012-05-11 02:58:34 +00:00
Thomas Goyne
c354dc9e30 Fix brokenness in the curve smoothing
Originally committed to SVN as r6760.
2012-05-11 02:47:24 +00:00
Thomas Goyne
a05d469741 Actually do the smoothing when drawing a smoothed freehand shape
Originally committed to SVN as r6759.
2012-05-11 02:47:18 +00:00
Thomas Goyne
c4e36e00a5 Fix compilation with wxGTK trunk
Originally committed to SVN as r6758.
2012-05-10 14:19:07 +00:00
Thomas Goyne
f1b2b4a3da Don't allow opening multiple copies of the spell checker dialog
Originally committed to SVN as r6757.
2012-05-10 14:19:02 +00:00
Thomas Goyne
47fb50d4d3 Fix crash after cancelling the shift times dialog. Closes #1483.
Originally committed to SVN as r6756.
2012-05-10 14:18:54 +00:00
Thomas Goyne
f724abd0b8 Add support for symlinking fonts rather than copying them in the fonts collector. Based on a patch by nodame.
Originally committed to SVN as r6755.
2012-05-10 14:18:47 +00:00
Thomas Goyne
18f158a364 Rename option "Always show visual tools" to "Only show visual tools when mouse is over video" as the old name said nothing about when they wouldn't be shown.
Originally committed to SVN as r6754.
2012-05-05 02:11:15 +00:00
Thomas Goyne
06e23b9296 Use SetSelectionAndActive whenever both are set at once
I'm not sure if this fixes any current actual problems as using slightly
stale data is normally only a problem when lines are being deleted, but
it's easier to fix it across the board than to figure out where it is
and isn't needed, and the speed impact of batching is trivial.

Originally committed to SVN as r6753.
2012-05-05 02:11:09 +00:00
Thomas Goyne
f756aa73c1 Add SelectionController::SetSelectionAndActive, which automatically batches the changes to the selection and active line
Originally committed to SVN as r6752.
2012-05-05 02:11:03 +00:00
Thomas Goyne
70abaf75d7 Don't cache the selection in the dialogue timing controller, as getting it isn't very expensive and it was used in a stale state when the active line changed
Originally committed to SVN as r6751.
2012-05-05 02:10:57 +00:00
Thomas Goyne
a15024e052 Trigger a modified event on Enter in a time edit so that selecting several lines and hitting Enter to set them all to the active line's time works
Originally committed to SVN as r6750.
2012-05-04 02:53:14 +00:00
Thomas Goyne
9269c79763 Only clear the selection due to a click on no visual features if there are actually multiple visual features to select
Originally committed to SVN as r6749.
2012-05-04 02:53:09 +00:00
Thomas Goyne
479de87068 Leave the selected range in the audio display unchanged when switching to an untimed line as 2.1.x did
Originally committed to SVN as r6748.
2012-05-04 02:53:03 +00:00
Thomas Goyne
1bd24d837c Allow block selections on the grid with modifier keys held down
Originally committed to SVN as r6747.
2012-05-04 02:52:58 +00:00
Thomas Goyne
213ccccf86 Redesign the logic for scrolling the grid on drags
Update the grid scroll position on mouse up rather than mouse down,
eliminating the need for the logic that made it impossible to do a drag
selection from the top or bottom rows of the grid, and fix some cases
where the grid would scroll in an undesirable direction.

Originally committed to SVN as r6746.
2012-05-04 02:52:52 +00:00
Thomas Goyne
4d7c6b08e0 Leave the current line selected after splitting at cursor rather than selecting the new line
Originally committed to SVN as r6745.
2012-05-03 03:14:11 +00:00
Thomas Goyne
4603a86953 Don't pointless recreate the subs provider when the subs preview is resized
Fixes a bug that made it rather awkward to resize the style editor
dialog with libass, as the libass provider briefly creates a modal
dialog whenever it's created, which would interrupt the drag

Originally committed to SVN as r6744.
2012-05-02 22:42:43 +00:00
Thomas Goyne
63d60b9b1e Save the size of the style editor in addition to the position
Originally committed to SVN as r6743.
2012-05-02 22:42:37 +00:00
Thomas Goyne
5a067f56e4 Add command "time/lead/both" which adds both lead in and out
Originally committed to SVN as r6742.
2012-05-02 22:42:31 +00:00
Thomas Goyne
8f3b027881 Improve the negative-duration-avoiding behavior of the time edit boxes
Save the initial start and end times of lines before adjusting them to
avoid negative line durations, so that if further changes to the edit
boxes make the adjustment unneccesary the original values can be
restored. This Fixes the problem where changing a line visible from
frames 800-900 to 800-901 would actually result in 90-901, due to the
end frame briefly being 90.

Originally committed to SVN as r6741.
2012-05-02 22:42:25 +00:00
Thomas Goyne
252351b7da Don't stop audio playback when switching lines
Originally committed to SVN as r6740.
2012-05-02 22:42:18 +00:00
Thomas Goyne
4be8e3595b Limit the duration of the lines created with Insert (before) and Insert (after) to the default timing length
Originally committed to SVN as r6739.
2012-05-02 00:31:44 +00:00
Thomas Goyne
cb75c42f04 Leave the old audio open when opening new audio fails for any reason
Originally committed to SVN as r6738.
2012-05-02 00:31:38 +00:00
Thomas Goyne
b8212512e7 Work around a bug which made style names in the style editor scrolled to the left far sooner than they needed to be
Originally committed to SVN as r6737.
2012-05-01 02:50:09 +00:00
Thomas Goyne
2ef7ed98c0 Update the audio scroll position at most once every 50ms when dragging markers
Originally committed to SVN as r6736.
2012-05-01 02:50:03 +00:00
Thomas Goyne
1558aa2dad Increase the height of the audio display scrollbar by 50%
Originally committed to SVN as r6735.
2012-05-01 02:49:58 +00:00
Thomas Goyne
4231653146 When joining lines, use the maximum of the lines' end times rather than the last line's end time
Originally committed to SVN as r6734.
2012-05-01 02:49:53 +00:00