mantarimay/Aegisub
1
0
Fork 0
forked from mia/Aegisub
Code Pull requests Activity
5669 commits 10 branches 31 tags 48 MiB
Commit graph

192 commits

Author SHA1 Message Date
Thomas Goyne 6bf4a95428 Add a subtitles save slot to AudioController which stores the audio URI in the subtitles 
Originally committed to SVN as r5659.
 2011-09-28 19:51:35 +00:00
Thomas Goyne af9315f1aa Remove some lingering unused automation things in frame_main 
Originally committed to SVN as r5637.
 2011-09-28 19:48:11 +00:00
Thomas Goyne 7680d6c246 Move the local script logic from FrameMain to a new LocalScriptManager 
Originally committed to SVN as r5623.
 2011-09-28 19:45:55 +00:00
Thomas Goyne 0a91be1c7c Unconditionally enable building automation even if there are no enabled engines as there isn't really any reason not to and the defines uglify the code. 
Originally committed to SVN as r5621.
 2011-09-28 19:45:35 +00:00
Thomas Goyne cc147d1660 Eliminate uses of c_str made unnecessary by changed to wxString::Format in wx 2.9 
Originally committed to SVN as r5612.
 2011-09-28 19:43:48 +00:00
Thomas Goyne d990bbbb99 Eliminate all unnecessary uses of L and _T 
Originally committed to SVN as r5611.
 2011-09-28 19:43:11 +00:00
Thomas Goyne 1f095b0a01 Remove the SubsEditBox from the context in favor of the SubsEditTextCtrl as it was the only public member of SubsEditBox 
Originally committed to SVN as r5595.
 2011-09-15 05:17:07 +00:00
Thomas Goyne 934a5b24eb Refine the commit types 
Switch to a bitmask with much more finely-grained information about what
changed in the commit, fixing a few potential correctness problems and
significantly improving the performance of several scenarios where commits
are spammed very frequently.

Originally committed to SVN as r5590.
 2011-09-15 05:16:32 +00:00
Thomas Goyne 27867421b2 Fix some whitespace in frame_main.cpp 
Originally committed to SVN as r5557.
 2011-08-27 06:29:57 +00:00
Thomas Goyne fb1e6fcbaf Delete some obsolete event handling in FrameMain 
Originally committed to SVN as r5556.
 2011-08-27 06:29:51 +00:00
Thomas Goyne 5d07756838 Kill FrameMain::HasASSDraw as it's no longer used 
Originally committed to SVN as r5555.
 2011-08-27 06:29:45 +00:00
Thomas Goyne 626df4db05 Rewrite the dynamic menu generation code 
Remove hardcoded assumptions about where in the menu items are and
instead bind menu items directly to commands so that customizing the
menu actually works.

Add support for user menu files that override the default one.

Add better support for multiple menus so that all of the menus can
potentially be created by the dynamic menu system rather than just the
main menu bar.

Add support for commands whose names change based on the current project
state so that undo and redo can work properly.

Simplify the menu json format and make commands responsible for
controlling what type of menu item is created rather than allowing
nonsensical configurations.

The Automation menu is currently not implemented.

Originally committed to SVN as r5554.
 2011-08-27 06:29:36 +00:00
Thomas Goyne 319b454bb8 Add hotkeys to the tooltip for toolbar items 
Originally committed to SVN as r5538.
 2011-08-17 05:32:27 +00:00
Thomas Goyne 561216d4c8 Make hotkey::check take a project context and make FrameMain::context private 
Originally committed to SVN as r5532.
 2011-07-29 23:16:55 +00:00
Thomas Goyne ef26170214 Rearrange FrameMain deinitialization so that things which depend on the project context are guaranteed to be destroyed before the context 
Originally committed to SVN as r5531.
 2011-07-29 23:16:46 +00:00
Thomas Goyne 65368c5f35 Detangle FrameMain and DialogDetachedVideo 
Originally committed to SVN as r5530.
 2011-07-29 23:16:36 +00:00
Thomas Goyne 3f50ce6d46 Delete FrameMain::LoadVFR as it's not longer used by anything 
Originally committed to SVN as r5529.
 2011-07-29 23:16:24 +00:00
Thomas Goyne 87abcddd87 Make the MRU code not so bizzarely overcomplicated 
Originally committed to SVN as r5502.
 2011-07-26 19:51:56 +00:00
Thomas Goyne 88f0659307 Rewrite the toolbar generation code 
The old toolbar code didn't actually support any nontrivial
customization of toolbars, as it had a hardcoded list of commands which
would be enabled or disabled, and the checks for enabling/disabling
toolbar buttons was done only in the specific situations which those
commands used.

Make icon size a user customizable option and add support for
dynamically changing it at runtime.

Originally committed to SVN as r5468.
 2011-07-15 04:06:23 +00:00
Thomas Goyne f4d44f7c18 Move the zoom box from the main toolbar to the video box 
Originally committed to SVN as r5467.
 2011-07-15 04:06:16 +00:00
Thomas Goyne b93bb888e3 Use IsActive in frame_main 
Originally committed to SVN as r5466.
 2011-07-15 04:06:10 +00:00
Thomas Goyne 0af7ae7fca Clean up frame_main a bit 
Delete some pointless comments, move documentation to the header, and
extend it a bit

Sort prototypes in the header

Move event IDs out of the header

Remove a few unused includes

Assorted cosmetic changse

Originally committed to SVN as r5463.
 2011-07-15 04:05:49 +00:00
Thomas Goyne fdb6d108f8 Use agi::Context::Validate for the main frame's menus and toolbar 
Originally committed to SVN as r5461.
 2011-07-15 04:05:37 +00:00
Thomas Goyne f098e2fac8 Add an optional Validate method to commands 
Originally committed to SVN as r5459.
 2011-07-15 04:05:22 +00:00
Thomas Goyne 256e098aa7 Remove header include order requirements 
Originally committed to SVN as r5449.
 2011-07-15 04:04:13 +00:00
Thomas Goyne 3df2885ce5 Temporary hack to make automation macros work 
Originally committed to SVN as r5444.
 2011-07-15 04:03:42 +00:00
Thomas Goyne 10c3a2ca16 Only bind wxEVT_COMMAND_MENU_SELECTED once rather than once per command as large numbers of event handlers make wx explode 
Originally committed to SVN as r5263.
 2011-01-23 06:45:03 +00:00
Thomas Goyne 6ad2098749 Make VideoSlider use commands for its key events 
Originally committed to SVN as r5256.
 2011-01-21 04:57:36 +00:00
Thomas Goyne 9c07798cb5 Delete some dead code in FrameMain 
Originally committed to SVN as r5253.
 2011-01-21 04:57:12 +00:00
Thomas Goyne a8ebc1e456 Make AssFile handle autosaving on every commit itself rather than going through FrameMain 
Originally committed to SVN as r5247.
 2011-01-20 05:57:23 +00:00
Thomas Goyne cecaff404b Finish killing FrameMain::SaveSubtitles 
Originally committed to SVN as r5246.
 2011-01-20 05:57:15 +00:00
Thomas Goyne 5270a3bf3a Remove withCharset parameter from FrameMain::SaveSubtitles as it was never used (saving with a charset is done by exporting) 
Originally committed to SVN as r5245.
 2011-01-20 05:57:08 +00:00
Thomas Goyne 1a26edc869 Delete FrameMain::SynchronizeProject as the last use of it was removed in r5207 
Originally committed to SVN as r5244.
 2011-01-20 05:56:59 +00:00
Thomas Goyne ccddf8eab1 Make hotkey::check return whether any hotkeys matched, and skip events which did not match any hotkeys 
Originally committed to SVN as r5241.
 2011-01-19 03:12:46 +00:00
Thomas Goyne e0051e09e3 Use commands for most of the buttons in the audio box and add hotkey support 
Originally committed to SVN as r5233.
 2011-01-17 23:54:05 +00:00
Thomas Goyne 04a4c074b0 Add function to get the string representation of the hotkeys for a command, use it when generating the menu 
Originally committed to SVN as r5230.
 2011-01-17 23:53:46 +00:00
Thomas Goyne a1bd974969 Partially convert the subtitles grid's context menu over to using commands 
Originally committed to SVN as r5216.
 2011-01-16 07:17:46 +00:00
Thomas Goyne df1dce3593 Kill SubtitlesGrid::ass and SubtitlesGrid::EditBox and convert everything that used them over to agi::Context 
Originally committed to SVN as r5215.
 2011-01-16 07:17:36 +00:00
Thomas Goyne 778338fa2b Remove FrameMain::menuCreated 
Originally committed to SVN as r5214.
 2011-01-16 07:17:29 +00:00
Thomas Goyne d84b768171 Remove the 'audio' and 'grid' public members from VideoContext and migrate everything that used them over to Context 
Originally committed to SVN as r5211.
 2011-01-16 07:17:08 +00:00
Thomas Goyne 169d3cd31c Add the selection controller to the context 
Originally committed to SVN as r5210.
 2011-01-16 07:17:02 +00:00
Thomas Goyne 8544565c0e Rearrange FrameMain initialization order to seperate context initialization and control creation a bit, and eliminate local pointers to non-view parts of the context 
Originally committed to SVN as r5209.
 2011-01-16 07:16:54 +00:00
Thomas Goyne 7210ea17d8 Add pre-save signal to AssFile and move most of the logic in FrameMain::SaveSubtitles to slots for this signal 
Originally committed to SVN as r5207.
 2011-01-16 07:16:40 +00:00
Thomas Goyne 59300cbc27 Add a subtitle open signal and move most of the logic in FrameMain::LoadSubtitles to slots for this signal. 
Originally committed to SVN as r5206.
 2011-01-16 07:16:33 +00:00
Thomas Goyne 314a07c9ab Move post-video-load logic from FrameMain::LoadVideo to FrameMain::OnVideoOpen, and open videos via VideoContext directly 
Originally committed to SVN as r5205.
 2011-01-16 07:16:27 +00:00
Thomas Goyne 71937757a2 Remove #pragma once from context.h and fix resulting compilation errors 
Originally committed to SVN as r5201.
 2011-01-16 07:16:00 +00:00
Thomas Goyne 08ec92046f Implement MRU commands 
Originally committed to SVN as r5199.
 2011-01-16 07:15:46 +00:00
Thomas Goyne 9779eacbf1 Implement almost all stubbed-out commands other than the MRU ones 
Originally committed to SVN as r5196.
 2011-01-16 07:15:24 +00:00
Thomas Goyne 77cb5b75b8 Disable the video details menu item when no video is loaded 
Originally committed to SVN as r5193.
 2011-01-16 07:15:05 +00:00
Amar Takhar 75b732bf60 Use lowercase filenames for OS X includes. HFS is case-insensitive and since I'm cross-compiling the OS X version from Linux it fails when you try to include files using uppercase names when they're actually lowercase. 
Originally committed to SVN as r5173.
 2011-01-11 17:52:17 +00:00
Amar Takhar a3534f2cae Fix identifers, _misc is no longer used. 
Originally committed to SVN as r5169.
 2011-01-11 17:00:11 +00:00
Amar Takhar 0d7b2c6e76 Add missing headers when not using precompiled header support. Some minor formatting in libaegisub/common/hotkey.cpp. 
Originally committed to SVN as r5135.
 2011-01-08 12:10:40 +00:00
Thomas Goyne e450cb3e7e Fix include paths 
Originally committed to SVN as r5132.
 2011-01-05 18:40:37 +00:00
Amar Takhar 167f09a610 Merge the dynamic menu, hotkey and toolbar branch to trunk. This doesn't include Windows support as vs2008 was being a major pain. This involves revisions r4921:4950, r4961:5002, r5005:5006, r5008:5056, r5062:5065, r5072, r5081:5082, r5087, r5096:5110, r5124:5125. Updates #1258. 
Originally committed to SVN as r5126.
 2011-01-05 13:00:46 +00:00
Thomas Goyne 17c07cc131 Add timecodes opened signal to VideoContext 
Originally committed to SVN as r5080.
 2010-12-31 21:03:18 +00:00
Thomas Goyne edff7d6a2d Rewrite keyframe loading and saving code and move it to libaegisub 
Originally committed to SVN as r5073.
 2010-12-31 21:02:17 +00:00
Niels Martin Hansen 60b3ea15c3 Switch _WINDOWS for _WIN32, as _WINDOWS doesn't seem to be defined using MSVC 2010 headers. On the other hand, _WIN32 is always defined by the compiler. 
Originally committed to SVN as r4955.
 2010-12-11 16:47:03 +00:00
Thomas Goyne a6a4132ab5 Make the audio timing controller commit changes made 
Originally committed to SVN as r4914.
 2010-12-08 08:10:00 +00:00
Thomas Goyne 3345797ff6 Use signals in AudioController and AudioTimingController 
Originally committed to SVN as r4907.
 2010-12-08 08:09:16 +00:00
Thomas Goyne 7f076bbbc9 Fix crash on exit 
Originally committed to SVN as r4904.
 2010-12-08 08:09:00 +00:00
Amar Takhar c15777f844 Merge audio_display_rewrite branch to trunk. This is not a complete work, don't expect to time anything for a while. 
Originally committed to SVN as r4903.
 2010-12-08 03:36:10 +00:00
Thomas Goyne 6d2b941e76 Rework how committing changes works 
Rather than everything having to separately commit changes to the ass
and then tell the subs grid to notify various parts of Aegisub about the
changes, committing the AssFile now triggers an event which objects
listen for.

AssFile::Commit now also has an argument to indicate what sorts of
changes were made to the file. For now these types are very broad.

Originally committed to SVN as r4901.
 2010-12-07 19:09:28 +00:00
Thomas Goyne d9006b0eb4 Make VideoContext use events for some of its communication with other objects 
Originally committed to SVN as r4900.
 2010-12-07 19:09:21 +00:00
Thomas Goyne 13f052317e Convert OptionValue over to agi::signal 
Originally committed to SVN as r4899.
 2010-12-07 19:09:15 +00:00
Thomas Goyne 6affce0581 Make OPT_GET return a const OptionValue* and add OPT_SUB/OPT_UNSUB for subscribing to option changes 
Originally committed to SVN as r4834.
 2010-11-08 05:08:24 +00:00
Karl Blomster 65b5907a4c Get rid of the splash screen. If you want it back, you better make it a) not broken, and b) actually useful as a startup diagnostics tool. If you can't do both, get out. 
Originally committed to SVN as r4829.
 2010-11-06 19:44:21 +00:00
Thomas Goyne fcba0c8e2a Update grid column widths after opening a new subtitle file. 
Originally committed to SVN as r4800.
 2010-10-11 20:05:59 +00:00
Thomas Goyne ac2bac6d00 Use agi::io::Save in TextFileWriter 
Originally committed to SVN as r4772.
 2010-09-08 20:03:48 +00:00
Thomas Goyne 071ada7487 Add listener for the autosave timer 
Originally committed to SVN as r4765.
 2010-08-26 18:38:44 +00:00
Thomas Goyne f15dd92fb1 Change App/Auto/Check For Updates to a bool so that the correct control is used in the preferences dialog 
Originally committed to SVN as r4758.
 2010-08-26 18:38:03 +00:00
Thomas Goyne 9c93198c3b Honor the user's default zoom when possible rather than always overriding it based on the size of the window 
Originally committed to SVN as r4740.
 2010-08-13 05:51:26 +00:00
Thomas Goyne 768f74ae3c Make VideoDisplay set its initial zoom itself rather than FrameMain 
Originally committed to SVN as r4739.
 2010-08-13 05:51:17 +00:00
Amar Takhar 6bb5dd0bfd Use OSXSetModified() from wx instead of using Carbon directly. 
Originally committed to SVN as r4738.
 2010-08-13 00:33:54 +00:00
Thomas Goyne f66ef36f93 Change criteria for when opened files should be backed up; rather than not backing up binary files (which aren't detected correctly anymore and always was sort of kludgy), don't back up files which are not in a format we can't write. 
Originally committed to SVN as r4725.
 2010-08-03 20:21:04 +00:00
Thomas Goyne c10e9e3a5b Make video and audio providers throw typed exceptions. 
Don't display error messages and try other providers when the user
cancels loading a file.

Remove files from the MRU lists if they can't be found.

Closes #717.

Originally committed to SVN as r4717.
 2010-08-02 06:32:01 +00:00
Thomas Goyne 428fc78623 Kill dangling references to dialog_tip.h 
Originally committed to SVN as r4707.
 2010-07-23 07:00:35 +00:00
Thomas Goyne fde4a7815d Make the subtitle edit box auto-commit all changes 
This happens to fix most of the undo issues, as it's now much harder to
have uncommitted changes to the file.

Closes #355 and #586.

Originally committed to SVN as r4699.
 2010-07-20 03:11:11 +00:00
Thomas Goyne 4a8abae3a3 Kill options.h and options.cpp, which have been empty for a while 
Originally committed to SVN as r4676.
 2010-07-12 21:49:48 +00:00
Thomas Goyne c40aa7080a Eliminate almost all uses of AssFile::top. 
Originally committed to SVN as r4669.
 2010-07-09 07:31:48 +00:00
Thomas Goyne 2e5dc176db Rewrite Undo/Redo code 
Make the undo and redo stacks non-static members of AssFile, making it
theoretically possible to have multiple open AssFiles with working undo.

Slightly improve tracking of whether the file is modified: saving,
making a change, then undoing the change now results in the file being
shown as unmodified as with most programs with undo.

Add basic undo coalescing support.

Originally committed to SVN as r4667.
 2010-07-09 07:31:34 +00:00
Thomas Goyne acba2c6b63 Rewrite VFR handling in Aegisub. 
Kill vfr.h and vfr.cpp and use the libaegisub versions of them instead.

Rather than the globals VFR_Input and VFR_Output, everything related to
frame rate is now part of the video context. Most things which used to
use VFR_Output now call VideoContext::TimeAtFrame etc.; video providers,
rather than modifying VFR_Input directly, now have getters for their
frame rates which VideoContext calls. Read-only public access to
VFR_Input and VFR_Output are still provided (hopefully temporarily) for
a few things which were awkward to do through VideoContext.

The Avisynth provider now might correctly handle VFR MKVs which can be
opened with DirectShowSource but not DSS2.

Rework keyframe handling as well, so that it continues to match the vfr
handling in design and implementation.

Originally committed to SVN as r4662.
 2010-07-08 04:29:04 +00:00
Thomas Goyne 929fa83dd9 Move the bulk of TextFileWriter's logic to libaegisub. 
Originally committed to SVN as r4660.
 2010-07-07 02:41:46 +00:00
Niels Martin Hansen 37cd66c950 Make the cool stuff in r4606 a little less cool, but apparently wxGtk doesn't let you freeze invisible windows and get away with it, so we'll have to live with a little extra flicker. 
Originally committed to SVN as r4636.
 2010-06-28 22:15:40 +00:00
Thomas Goyne 934da32931 Select the first line when opening a file 
Originally committed to SVN as r4611.
 2010-06-27 04:54:46 +00:00
Niels Martin Hansen 52627a0fc5 Show splash screen much earlier, and show main window much later. Also be smoother about the display of the main window, avoid flickery relayouting. Remove splash screen "click to close" behaviour as well as timed close, just hide it when the main window has been shown. 
Originally committed to SVN as r4606.
 2010-06-26 14:16:59 +00:00
Niels Martin Hansen c4a27da4fc Change the grid to use more sensible maps to keep track of index/object mappings for subtitle lines, and follow the SelectionController model. (Hopefully the new maps can also give slightly better performance.) 
Try to keep the original API intact. Some redundant or unused functions in SubtitleGrid were removed. The LoadFromAss() function was renamed to UpdateMaps() since that was its real purpose. (Note that SubtitleGrid now has an UpdateMaps() function that overshadows BaseGrid::UpdateMaps(), but SubtitleGrid::UpdateMaps() calls the hidden function. They are not virtual.)
This does not yet fix visual tool feature selection.
Generally, things just feel more broken still. Further work will fix things.

Originally committed to SVN as r4603.
 2010-06-26 07:26:27 +00:00
Thomas Goyne faf2e562cd Rename FrameMain::SubsBox to SubsGrid for consistency with the rest of Aegisub. 
Originally committed to SVN as r4527.
 2010-06-16 06:20:33 +00:00
Thomas Goyne 43f3502043 Eliminate double inclusion of frame_main.h and remove #pragma once 
Originally committed to SVN as r4526.
 2010-06-16 06:20:27 +00:00
Thomas Goyne b6d29443a3 Move most character set conversion code to libaegisub and make everything use the new conversion functionality. 
Originally committed to SVN as r4423.
 2010-06-03 20:32:25 +00:00
Amar Takhar 719b7c2281 Add a basic "log window", this will be more polished and useful later on for now it's just something quick and dirty. 
There are a few issues to fix:
 * Delete the pointer in frame_main from the modless dialog.
 * Fix string storage in the logging class.
 * Close button doesn't work.

Originally committed to SVN as r4406.
 2010-06-02 23:47:39 +00:00
Amar Takhar 40e12403d5 Merge all changes from the libaegisub branch into trunk, the effective range is r4175:4330. All options have been re-done and now use Cajun to support a json-backed format. 
Initial support for low-level access and file I/O methods are included as well.

Originally committed to SVN as r4331.
 2010-05-21 01:13:36 +00:00
Thomas Goyne 2124a1dbd3 Rework how sorting works and add sorting by style 
Rather than going through a ton of work to ensure that every AssEvent
has a sensible start time that happens to leave it in the right place
after sorting, simply sort only consecutive blocks of AssDialogues and
leave everything else untouched. Note that this results in different
behavior when there are multiple [Events] sections in a file -- rather
than moving lines between sections and keeping the number of lines per
section constant, each section keeps the lines it had.

As it's now easy to do, also add sorting by style name and end time.

Closes #614.

Originally committed to SVN as r4307.
 2010-05-19 00:44:44 +00:00
Thomas Goyne a573b0897b Add "Open Subtitles From Video" menu option. Closes #253. 
Originally committed to SVN as r4306.
 2010-05-19 00:44:37 +00:00
Thomas Goyne 61c141a714 Change zoom to an arbitrary percentage rather than an index into a fixed list of allowed zooms 
Originally committed to SVN as r4256.
 2010-05-01 01:07:05 +00:00
Thomas Goyne 7a7b7fb5e9 Add menu options for the tag hiding modes to the view menu. Closes #433 
Originally committed to SVN as r4254.
 2010-04-30 20:42:07 +00:00
Amar Takhar 0cd4f1225d Merge 3906,r3909,r3910,r3912,r3928,r3931,r3932,r3933,r3935,r3936: merge update checker from 2.1.8, this also needs to be documented for doxygen. closes #1084. 
Originally committed to SVN as r4042.
 2010-01-26 13:14:05 +00:00
Amar Takhar 79c1716ccd merge r3982. 
Originally committed to SVN as r4017.
 2010-01-21 00:01:46 +00:00
Amar Takhar 6b454601da * Add a new function to libosxutil: OSX_OpenLocation which calls LSOpenCFURLRef, it accepts a URL (except for local paths) and opens the correct program using the Launcher. 
* Add a new help menu option to access internal resources located within the bundle.

Closes #1033 and updates #1070.

Originally committed to SVN as r3895.
 2009-12-25 03:28:15 +00:00
Niels Martin Hansen eb938aa5ed Check video size on open and change zoom level to 50% or 25% if the video is greater than some proportions of the window size. 
Updates #1054.

Originally committed to SVN as r3858.
 2009-12-12 01:38:09 +00:00
Thomas Goyne feb77217c7 Fix bug where detaching loaded but hidden video had broken results. 
Originally committed to SVN as r3798.
 2009-11-17 01:37:18 +00:00