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

128 commits

Author SHA1 Message Date
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
Amar Takhar
5a635ebdb3 Merge r4855-4894 from the new_build_system branch. This still has rough spots and some of the dependency relations haven't been expressed but it works, and it's much better than what we had before as it kills off automake, libtool, gettext (package not library), intltool usage. 
Originally committed to SVN as r4895.
 2010-12-05 19:12:42 +00:00
Thomas Goyne
1214290e90 Change default path to dictionaries to ?user/dictionaries (from ?user/dictionary) to match 2.1.x 
Originally committed to SVN as r4844.
 2010-11-17 05:43:48 +00:00
Karl Blomster
f34d37d091 remove assorted forgotten traces of the splash screen 
Originally committed to SVN as r4831.
 2010-11-07 19:32:40 +00:00
Karl Blomster
26b9985d3d Use Tahoma 8pt as default grid font. This is what got used in earlier versions. 
Originally committed to SVN as r4830.
 2010-11-06 19:51:36 +00:00
Thomas Goyne
daa77301eb Remove "Colour/Background/Modified" option, which was made irrelevant by r4699. 
Originally committed to SVN as r4762.
 2010-08-26 18:38:26 +00:00
Thomas Goyne
5d5f24cbd8 Remove Tip of the Day setting from default_config.json 
Originally committed to SVN as r4759.
 2010-08-26 18:38:09 +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
Amar Takhar
461616a47f Hook up default_path.json to the build 
Originally committed to SVN as r4491.
 2010-06-13 01:43:19 +00:00
Amar Takhar
f497144525 Fix syntax errors 
Originally committed to SVN as r4490.
 2010-06-13 01:42:50 +00:00
Amar Takhar
2c703a3baa Remove instances of ^USER and swap them with ^CONFIG, ^USER will still exist but won't be in the default config. Also add 'last opened' paths. 
Originally committed to SVN as r4470.
 2010-06-09 23:45:05 +00:00
Amar Takhar
ad0241e3df Add default_menu.json for safe keeping, I'm not sure if this is the final format.. whatever it ends up being this will be close. 
Originally committed to SVN as r4453.
 2010-06-07 06:40:19 +00:00
Thomas Goyne
90893f1048 Make the capitalization of FFmpegSource in options consistent, as option names are now case-sensitive. 
Originally committed to SVN as r4414.
 2010-06-03 05:07:10 +00:00
Amar Takhar
2d57debd49 Commit the beginings of the Path class to hold the internal representation of paths, this is extremely rough since I have to wait until we can do charset conversion in libaegisub to handle windows paths before going any further. 
Originally committed to SVN as r4359.
 2010-05-24 17:57:07 +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
Amar Takhar
f002850e17 Fix distfile creation. 
Originally committed to SVN as r4260.
 2010-05-06 16:05:34 +00:00
Kevin Ollivier
9fcdfebf82 Fix the waf build after the libresrc changes, and also tweak the script to properly handle dependency tracking with the generated files. 
Originally committed to SVN as r4173.
 2010-03-13 17:50:51 +00:00
Amar Takhar
6a9b0b5589 * Return an std::string 
* Be const correct.
 * Use c_str() to ensure null termination.
 * Remove stray , from default_mru.json.

Originally committed to SVN as r4171.
 2010-03-06 03:55:27 +00:00
Amar Takhar
c3c14b0815 Change how libresrc is built: 
* Instead of putting code into the .(c|h) files place it into two new files libresrc.(c|h)
 * Bitmaps now go into bitmaps.(c|h)
 * Default configs into default_config.(c|h)

With this approach we can easily embed any resources by simply calling it with common-respack and not having to do anything else.

Originally committed to SVN as r4169.
 2010-03-03 00:44:17 +00:00
Kevin Ollivier
dd0da6744b Commit of start on waf build system. Uses the most recent waf release. Currently builds on OS X with ffmpeg, OpenAL and libass providers, do waf configure; waf build to build. 
Originally committed to SVN as r3854.
 2009-12-07 00:42:51 +00:00
Amar Takhar
27256ae44a Add libresrc.cpp, libresrc.h to CLEANFILES. 
Originally committed to SVN as r3373.
 2009-08-06 21:26:27 +00:00
Amar Takhar
0f841aae1a Convert the icon to png from xpm, I'm not sure how Windows will handle the alpha on this image.. someone on Windows will need to check. 
Originally committed to SVN as r3284.
 2009-07-25 20:07:07 +00:00
Thomas Goyne
01505e3d37 Mostly fix unix build issues related to the new image embedding. 
Originally committed to SVN as r3276.
 2009-07-25 18:08:17 +00:00
Amar Takhar
fb3431df66 Commit changes to support importing bitmaps as character strings, this is still broken however the final fix should be quite simple. 
Originally committed to SVN as r3270.
 2009-07-25 09:35:44 +00:00
Thomas Goyne
87e96be4b5 Make the windows build system work with the XMP buttons. 
Originally committed to SVN as r3242.
 2009-07-23 23:54:06 +00:00
Amar Takhar
356ea76703 Commit libres files, these used to be automatically generated using some AWK scripts I wrote. 
Originally committed to SVN as r3240.
 2009-07-23 23:46:32 +00:00
Amar Takhar
b88254856b s/static/const/ to silence gcc warnings. 
Originally committed to SVN as r2897.
 2009-05-04 06:50:37 +00:00
Amar Takhar
91d73ec8ea SVN Transition Step 3/7 
1. cd aegisub/
  2. svn mv *cpp *h src/
  3. svn mv Makefile.am MatroskaParser.c auto4_perldata.inc bitmaps boost \
     changelog.txt config gl include libosxutil libresrc md5.c msvc mythes.cxx \
     mythes.hxx res.rc src/
  4. cd ..
  5. svn mv FFmpegSource2/ INSTALL Makefile.am README  acinclude.m4 \
     autogen.sh automation/ bin build configure.in desktop dummy.txt lib \
     libass/ m4macros/ packages/ po/ scripts/ universalchardet/ aegisub/
  6. mkdir -p docs/wiki_convert
  7. svn add docs/wiki_convert
  8. cd docs
  9. svn mv aegisub_convert_docs.pl convert.bat output wiki_convert/

* See r2749 for full description.

Originally committed to SVN as r2752.
 2009-03-08 08:30:39 +00:00