Commit graph

3497 commits

Author SHA1 Message Date
Amar Takhar
9159721be7 * Fix two syntax errors in master.cfg
* Add twistd.pid to svn:ignore

Originally committed to SVN as r3290.
2009-07-26 16:40:04 +00:00
Niels Martin Hansen
c50d57838c More changes to Windows buildbot script, going to use VCBuild now instead of MSBuild.
Originally committed to SVN as r3288.
2009-07-26 14:33:23 +00:00
Niels Martin Hansen
18596a5f27 Shot at new, improved building script for Windows buildbot.
Originally committed to SVN as r3287.
2009-07-26 01:36:41 +00:00
Niels Martin Hansen
e16fa24293 Updated solution file for Windows buildbot, added respack project
Originally committed to SVN as r3286.
2009-07-26 00:41:08 +00:00
Thomas Goyne
d401e67402 Switch the main window's icon back to the .ico version on windows as it was rejecting the png one.
Originally committed to SVN as r3285.
2009-07-25 20:32:58 +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
Amar Takhar
37010aee03 I thought res.rc was already updated, I should have looked.. this fixes breakage in r3281.
Originally committed to SVN as r3283.
2009-07-25 19:46:10 +00:00
Niels Martin Hansen
f51e7b1483 Let's make setup.cpp fail on wx 2.8
Originally committed to SVN as r3282.
2009-07-25 19:39:34 +00:00
Amar Takhar
6da57c3c8d We don't need the XPM icons anymore, and eyedropper.cur/icon.ico have moved to windows/
Originally committed to SVN as r3281.
2009-07-25 19:29:08 +00:00
harukalover
072520bf5f Removed most of the wxWidgets 2.8 compatibility code
Originally committed to SVN as r3280.
2009-07-25 18:45:30 +00:00
Niels Martin Hansen
075439f405 Fix bugs in kara-templater causing tenv.relayer and tenv.restyle functions to fail.
Closes #950.

Originally committed to SVN as r3277.
2009-07-25 18:16:37 +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
Niels Martin Hansen
966f88e577 Move a bunch of project properties for respack into VSProps files:
* Support picking up wx from $solution/wxlib/ location
 * Use standard_outdirs
 * Move post-build resource-packing event into new VSProps

Originally committed to SVN as r3275.
2009-07-25 17:13:10 +00:00
Niels Martin Hansen
23767950a9 Let Aegisub project file pick up wx relative to the solution file, using VSProps from r3273.
Originally committed to SVN as r3274.
2009-07-25 16:57:11 +00:00
Niels Martin Hansen
0cd1058e8d VSProps files to pick up a wx installation relative to the solution file.
Originally committed to SVN as r3273.
2009-07-25 16:56:01 +00:00
Thomas Goyne
e6d6a056c9 Change resources filename back to libresrc.cpp/h.
Originally committed to SVN as r3272.
2009-07-25 16:15:13 +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
Amar Takhar
ffe628f29a Move tellg() usage to the start of the block rather than at the end, otherwise it would always return -1. This should be harmless for windows.
Originally committed to SVN as r3269.
2009-07-25 08:32:21 +00:00
Amar Takhar
2522102465 Change .wc_str() to .char_str() to fix unix build breakage, should be fine on windows..
Originally committed to SVN as r3268.
2009-07-25 08:01:30 +00:00
Amar Takhar
a0099e7f74 s/scripts/tools/ after the rename
Originally committed to SVN as r3267.
2009-07-25 05:23:04 +00:00
Thomas Goyne
c641c6e656 Switch all icons in Aegisub to use the new png versions, using a new small tool to store the pngs as byte arrays in a cpp file.
Originally committed to SVN as r3265.
2009-07-25 04:49:59 +00:00
Amar Takhar
c87e0f2c7b Add icon.ico and eyedropper.cur to windows/ and splash.png to misc/.
Originally committed to SVN as r3264.
2009-07-25 03:32:06 +00:00
Amar Takhar
972c5e7f12 Add in missing buttons, which are very ugly scales of the original .bmp icons, these are for interm use until we have svg versions.
Originally committed to SVN as r3263.
2009-07-25 03:25:11 +00:00
Amar Takhar
586f3f8d2b Commit png versions of the (new) .svg icons Kaverin made, these have been made as original work or from the original .bmp icons.
Originally committed to SVN as r3262.
2009-07-25 03:23:35 +00:00
Amar Takhar
d51396738b Revert part of r3260: SIGH, why can't svn let you ctrl-c out of a commit further down in the process? You can only do it if you catch it early, though it's also my fault for not paying attention that I had local changes.
Originally committed to SVN as r3261.
2009-07-25 02:34:33 +00:00
Amar Takhar
4a757421d9 Rename scripts/ to tools/ as it makes more sense, initially the directory only contained scripts however with the addition of our 3rd tool it makes sense to just rename the entire direectory. Keeping the old scripts/ dir around was just extra clutter and would probably cause confusion as to which place a new script/tool should go.
Originally committed to SVN as r3260.
2009-07-25 02:29:04 +00:00
Amar Takhar
75a5c70297 Remove some old scripts from Makefile.am that were used for the bmp->xpm conversion.
Originally committed to SVN as r3259.
2009-07-25 02:11:27 +00:00
Amar Takhar
bab2720596 Fix fosx (10.5) build factory, also remove an obsoleted option.
Originally committed to SVN as r3258.
2009-07-24 19:31:34 +00:00
Amar Takhar
9002cddd3f Add OSX 10.5 buildslave setup.
Originally committed to SVN as r3257.
2009-07-24 19:29:04 +00:00
Amar Takhar
34773d4ea1 Fix the FreeBSD build factory.
Originally committed to SVN as r3256.
2009-07-24 07:55:56 +00:00
Karl Blomster
1e4119f337 Add quicktime audio provider to VS2008 project and to Makefile.am.
Originally committed to SVN as r3255.
2009-07-24 06:06:56 +00:00
Karl Blomster
bec8951534 Implement a basic QuickTime audio provider. Currently a bit limited in functionality (it will convert everything to 16-bit mono), but seems to work fine with the one .mov test file I have. Also does a lot of ugly downcasting, I'll try to fix that later.
Originally committed to SVN as r3254.
2009-07-24 06:04:19 +00:00
Amar Takhar
8cb1e62831 Remove libresrc.h from config.h as it's now included per-file.
Originally committed to SVN as r3253.
2009-07-24 05:47:03 +00:00
Thomas Goyne
e21337f34f Made it so that the font collector does not crash Aegisub when it is built with both no freetype and no fontconfig.
Originally committed to SVN as r3252.
2009-07-24 02:30:11 +00:00
Thomas Goyne
83bb2ecedd Fix the number of rows in another sizer.
Originally committed to SVN as r3251.
2009-07-24 02:18:11 +00:00
Thomas Goyne
766ae98a76 Add wxOK to some message boxes that specified flags without including either wxOK or wxYESNO.
Originally committed to SVN as r3250.
2009-07-24 02:10:41 +00:00
Thomas Goyne
f81b147031 Remove a double addition of a single button to the kanji timer dialog.
Originally committed to SVN as r3249.
2009-07-24 02:06:15 +00:00
Karl Blomster
f59dcf19f6 Add option to set FFMS2 logging level (i.e. how much spam FFmpeg prints to STDERR).
Option is called "ffmpegsource log level" and possible values are (in order of increasing spam) quiet, panic, fatal, error, warning, info, verbose, debug. The default is quiet, and I strongly recommend avoiding anything above warning.

Originally committed to SVN as r3248.
2009-07-24 01:41:16 +00:00
Thomas Goyne
af6492d867 Fix the number of rows in several wxFlexGridSizers in the options dialog.
Originally committed to SVN as r3247.
2009-07-24 00:58:17 +00:00
Thomas Goyne
3eacb9ba42 Remove an unnecessary StretchSpacer from the color picker dialog that caused problems with wx 2.9.
Originally committed to SVN as r3246.
2009-07-24 00:50:31 +00:00
Thomas Goyne
b7412a08c6 Make the windows buildbot not try to copy the now non-existent auto3 dll.
Originally committed to SVN as r3245.
2009-07-24 00:38:48 +00:00
Thomas Goyne
fcbc9fcdc0 Move the libresrc include to the individual files that need it.
Originally committed to SVN as r3244.
2009-07-24 00:08:25 +00:00
Karl Blomster
7149e01888 Move more stuff to the common QT provider class and generalize initializing/de-initializing QuickTime.
Originally committed to SVN as r3243.
2009-07-23 23:57:12 +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
98dad055ff Switch from converting .bmp->XPM dynamically during the autogen step into building libresrc directly from the XPM buttons now that the .bmp files are gone.
Originally committed to SVN as r3241.
2009-07-23 23:51:13 +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
0d40a537f4 Add XPM versions of the .bmp buttons.
Originally committed to SVN as r3239.
2009-07-23 23:44:27 +00:00
Amar Takhar
54c535789a Move bmp buttons from trunk/aegisub/src/bitmaps -> trunk/docs/art-sources/buttons now that we're using XPM buttons.
Originally committed to SVN as r3238.
2009-07-23 23:43:49 +00:00
Amar Takhar
b62f52d8f8 Swap wxBITMAP(.*) with wxBitmap(.*_xpm) now that we're switching to xpm buttons on _all_ platforms, this makes things much easier.
Originally committed to SVN as r3237.
2009-07-23 23:38:04 +00:00
Amar Takhar
bc7c028538 Add ACLOCAL_FLAGS to autogen and --with-wx-config to configure for linux build factory. This is required since there are no system packages for 2.9 (as it hasn't been released yet.)
Originally committed to SVN as r3236.
2009-07-23 22:56:04 +00:00