Commit Graph

339 Commits

Author SHA1 Message Date
twanvl 1cb5700a00 Added compact syntax for package dependencies:
"depends on: package version"

git-svn-id: svn://svn.code.sf.net/p/magicseteditor/code/trunk@777 0fc631ac-6414-0410-93d0-97cfa31319b6
2007-12-21 18:14:51 +00:00
coppro d1ce2232cb Apparently GCC considers #elseif a substitute for #elif.
git-svn-id: svn://svn.code.sf.net/p/magicseteditor/code/trunk@769 0fc631ac-6414-0410-93d0-97cfa31319b6
2007-10-20 02:57:13 +00:00
coppro fc28cf099a Fixed TLS
git-svn-id: svn://svn.code.sf.net/p/magicseteditor/code/trunk@768 0fc631ac-6414-0410-93d0-97cfa31319b6
2007-10-19 00:16:14 +00:00
coppro a7efdf89c2 Added some stuff for platforms without TLS
git-svn-id: svn://svn.code.sf.net/p/magicseteditor/code/trunk@767 0fc631ac-6414-0410-93d0-97cfa31319b6
2007-10-18 23:55:24 +00:00
coppro 2fcf2f359d Finished update window (YAY!)
Updates now work, and have been tested.
Made a few other updates.
To work on: aesthetics?


git-svn-id: svn://svn.code.sf.net/p/magicseteditor/code/trunk@759 0fc631ac-6414-0410-93d0-97cfa31319b6
2007-09-26 22:13:39 +00:00
coppro 30e18663f6 Added some new update code (YET TO BE TESTED) and some fixes to the VS
templates.
Still looking to find one source of a reference to 
"futsymbol_artifact.png" (case-sensitive)


git-svn-id: svn://svn.code.sf.net/p/magicseteditor/code/trunk@757 0fc631ac-6414-0410-93d0-97cfa31319b6
2007-09-25 23:28:12 +00:00
coppro 3ea0a4abd7 Made it so that update window and set window can't be open simultaneously (don't explode the set by deleting the style, say).
Made update window enforce dependencies
Added update button to welcome window (need icon still)


git-svn-id: svn://svn.code.sf.net/p/magicseteditor/code/trunk@756 0fc631ac-6414-0410-93d0-97cfa31319b6
2007-09-25 02:02:53 +00:00
twanvl 4c40394ba5 Now also requires a dependency for symbol fonts;
Fixed all the dependency warnings for the magic templates

git-svn-id: svn://svn.code.sf.net/p/magicseteditor/code/trunk@754 0fc631ac-6414-0410-93d0-97cfa31319b6
2007-09-24 21:54:52 +00:00
twanvl 36a36356c5 The 'Big Whine' patch:
Any use of a file from another package without a declared dependency will give a warning;

Also added some more _LOCALE_123_ macros so we need less format_string calls

git-svn-id: svn://svn.code.sf.net/p/magicseteditor/code/trunk@753 0fc631ac-6414-0410-93d0-97cfa31319b6
2007-09-24 20:24:22 +00:00
twanvl 1580b8deaf Fixed bug in smart_less, strings ending in numbers were compared incorrectly;
Text viewer now doesn't scale when there is a line break inside a word;
Fixed: extra newline was inserted when there was a line break inside a word if there was padding.

git-svn-id: svn://svn.code.sf.net/p/magicseteditor/code/trunk@743 0fc631ac-6414-0410-93d0-97cfa31319b6
2007-09-22 13:10:51 +00:00
twanvl 69d59eb9e7 Simpler implementation of stretch-overflow with rotation and alignment.
git-svn-id: svn://svn.code.sf.net/p/magicseteditor/code/trunk@734 0fc631ac-6414-0410-93d0-97cfa31319b6
2007-09-21 17:57:23 +00:00
twanvl f1fe10462c stretch-overflow biw works with rotation and alignment.
git-svn-id: svn://svn.code.sf.net/p/magicseteditor/code/trunk@733 0fc631ac-6414-0410-93d0-97cfa31319b6
2007-09-21 17:53:53 +00:00
twanvl 29c9f9ae8d Some minor performance tweaks
git-svn-id: svn://svn.code.sf.net/p/magicseteditor/code/trunk@726 0fc631ac-6414-0410-93d0-97cfa31319b6
2007-09-21 11:55:54 +00:00
twanvl 1f3f4e01fe Added support for named colors, e.g. "white" and "black";
Added missing keys to locale.

git-svn-id: svn://svn.code.sf.net/p/magicseteditor/code/trunk@716 0fc631ac-6414-0410-93d0-97cfa31319b6
2007-09-20 18:16:10 +00:00
twanvl 77ace5354c Fixed: keyword expanding could hang if there is a keyword that matches "";
Fixed: drop down list now stays open after mouse out the second time it is used;
Fixed some typos in comments;
Disabled 'check updates' menu item for 0.3.5 release

git-svn-id: svn://svn.code.sf.net/p/magicseteditor/code/trunk@711 0fc631ac-6414-0410-93d0-97cfa31319b6
2007-09-20 14:40:13 +00:00
coppro 99d385eb00 Added some fixes
More work on update window.


git-svn-id: svn://svn.code.sf.net/p/magicseteditor/code/trunk@700 0fc631ac-6414-0410-93d0-97cfa31319b6
2007-09-15 03:38:54 +00:00
twanvl 1dbdbd5786 with paragraph_height text now resizes if a single paragraph becomes full;
Fixed issue with reader looping when save_value=false;
Package manager will not contain packages that failed to load

git-svn-id: svn://svn.code.sf.net/p/magicseteditor/code/trunk@681 0fc631ac-6414-0410-93d0-97cfa31319b6
2007-09-09 18:12:55 +00:00
twanvl c38166c2bd Added dialog for selecting a new stylesheet if the one from a set is not found;
'availible' is not a word

git-svn-id: svn://svn.code.sf.net/p/magicseteditor/code/trunk@657 0fc631ac-6414-0410-93d0-97cfa31319b6
2007-09-01 21:11:56 +00:00
twanvl bdc1e12e95 Added <prefix> and <suffix> tags;
Added prefix and suffix support to combined_editor;
'always symbol' now checks if the symbols are available in the symbol font;
Fixed parser bug in spec_sort;
A first information field is no longer used as set identification

git-svn-id: svn://svn.code.sf.net/p/magicseteditor/code/trunk@653 0fc631ac-6414-0410-93d0-97cfa31319b6
2007-09-01 19:56:43 +00:00
twanvl 322e8715fc Fixed: choice images were generated with the wrong context from invalidate()
Choice thumbnails are now checked to not be 'local' before reading from cache, fixes issue with wrong rarity symbol in the drop down list;
Disabled unimplemented menu items;
Multiple choice items for RENDER_LIST are now zoomed, and positioning is on rotated cards is fixed.

git-svn-id: svn://svn.code.sf.net/p/magicseteditor/code/trunk@650 0fc631ac-6414-0410-93d0-97cfa31319b6
2007-08-29 22:52:56 +00:00
twanvl e200c6839a Found the source of the growing style file bug (and fixed it)
git-svn-id: svn://svn.code.sf.net/p/magicseteditor/code/trunk@645 0fc631ac-6414-0410-93d0-97cfa31319b6
2007-08-29 15:51:04 +00:00
twanvl 5fa4867cdc Symbol font measurments (margin/fontsize) now scaled by font size, this requires all symbol files to change (or you get really large margins);
Symbol fonts now support stretching/compressing of text;
Made the default symbols of mana-future lighter (compare with real cards);
Use sort_text instead of sort for vanguard;
Fixed initial card list for vs

git-svn-id: svn://svn.code.sf.net/p/magicseteditor/code/trunk@643 0fc631ac-6414-0410-93d0-97cfa31319b6
2007-08-29 14:35:39 +00:00
twanvl 087af8360d Added <soft> tag that takes up no space for alignment purposes;
used this tag for magic creature types;
Added correct handling of Tribal sub types;
Fixed sort_index use by spoiler export template

git-svn-id: svn://svn.code.sf.net/p/magicseteditor/code/trunk@637 0fc631ac-6414-0410-93d0-97cfa31319b6
2007-08-28 20:49:25 +00:00
twanvl fcc89b64d6 Added support for scripts to determine word lists;
Added 'trim' and 'remove_tags' script functions;
Simplified safety improvements of locale checker;
Added 'is_targeted' function to magic game to replace the contains(..) calls

git-svn-id: svn://svn.code.sf.net/p/magicseteditor/code/trunk@635 0fc631ac-6414-0410-93d0-97cfa31319b6
2007-08-28 18:33:38 +00:00
twanvl f7b82e3f6b Implemented auto replace, including GUI
git-svn-id: svn://svn.code.sf.net/p/magicseteditor/code/trunk@631 0fc631ac-6414-0410-93d0-97cfa31319b6
2007-08-26 19:39:23 +00:00
twanvl 52ec7b38c0 Images are now cached as wxBitmap, not wxImage. This should improve performance.
Fixed some more corner cases of rotation+zoom.

git-svn-id: svn://svn.code.sf.net/p/magicseteditor/code/trunk@630 0fc631ac-6414-0410-93d0-97cfa31319b6
2007-08-25 21:24:28 +00:00
twanvl 694566fef4 Attemp at scaling the spacing between lines to better fill the text box;
Did some profiling, conclusions:
 - we want to buffer our input streams, apperantly wx doesn't do this automatically
 - compiling regexes is SLOW.
   This is not just in the numbers, but it is actually noticable! The textbox used to be quite unresponsive.
   I wrapped the call to filter_text in the game file with a quick contains() call, so usually, the regex doesn't fire.
   It would be nicer if this was somehow automatic, but that will not be easy.

git-svn-id: svn://svn.code.sf.net/p/magicseteditor/code/trunk@627 0fc631ac-6414-0410-93d0-97cfa31319b6
2007-08-25 00:02:33 +00:00
twanvl 61136d79a8 Added regex_escape script function (was already used by keyword code);
Added icons for 'sort special rarity' choice.

git-svn-id: svn://svn.code.sf.net/p/magicseteditor/code/trunk@625 0fc631ac-6414-0410-93d0-97cfa31319b6
2007-08-24 20:24:10 +00:00
twanvl 0625a3ca87 Fixed UTF8 decoding for non-unicode build;
conclusion: @#%!@#% ASCII/Windows-1252/ISO-8859 must die!

git-svn-id: svn://svn.code.sf.net/p/magicseteditor/code/trunk@621 0fc631ac-6414-0410-93d0-97cfa31319b6
2007-08-24 01:05:39 +00:00
twanvl d68f73edfc Various tweaks and fixes, mostly to the drop down lists
git-svn-id: svn://svn.code.sf.net/p/magicseteditor/code/trunk@620 0fc631ac-6414-0410-93d0-97cfa31319b6
2007-08-23 23:29:20 +00:00
twanvl c3e10f2ccf Added as_text regex to symbol font as a more flexible replacement for merge_numbers.
This fixes "31/2" which is now rendered as "(3)(1/2)".
Reverted the mana_sort_guild change
Time for a version bump

git-svn-id: svn://svn.code.sf.net/p/magicseteditor/code/trunk@618 0fc631ac-6414-0410-93d0-97cfa31319b6
2007-08-23 16:58:08 +00:00
twanvl 9f2b30b2db Added word lists for choosing things like card type;
Added 'in_place' pattern to spec_sort

git-svn-id: svn://svn.code.sf.net/p/magicseteditor/code/trunk@616 0fc631ac-6414-0410-93d0-97cfa31319b6
2007-08-23 16:33:12 +00:00
coppro c46883eea1 Improved the update window further - now we just need a system to actual download and install them.
Added safeties to locale validation (ugly code though... I'd add another function, but I'm lazy and this is faster)


git-svn-id: svn://svn.code.sf.net/p/magicseteditor/code/trunk@614 0fc631ac-6414-0410-93d0-97cfa31319b6
2007-08-23 01:25:57 +00:00
twanvl 35bbf36e04 Added validator for locales based on all strings in the source code.
It checks:
 - whether all keys used by the program are in the locale
 - whether the right number of %s are used
 - if there are no extra keys in the locale that shouldn't be there
This will become very useful when translations need to be updated for new MSE versions.

There is a perl script for generating the 'expected_locale_keys' resource file.
This file contains a list of all the locale keys used.
This is a resource and not a data file because it is automatically generated from the code,
 the user has no business modifying it.

I also fixed all the locale errors I found in the process.

git-svn-id: svn://svn.code.sf.net/p/magicseteditor/code/trunk@613 0fc631ac-6414-0410-93d0-97cfa31319b6
2007-08-17 21:10:48 +00:00
twanvl 2b41abffe6 Restored "(..)" = "cycle(..)" for spec sort
git-svn-id: svn://svn.code.sf.net/p/magicseteditor/code/trunk@609 0fc631ac-6414-0410-93d0-97cfa31319b6
2007-08-11 15:47:31 +00:00
twanvl 565ddc1e12 Fixed: keys without save_value caused reader to loop
Fixed: first line of multi line text value could cause warnings about whitespace
Fixed some copy/paste errors in choice style reading;
Text viewer correctly uses mask for first line

git-svn-id: svn://svn.code.sf.net/p/magicseteditor/code/trunk@604 0fc631ac-6414-0410-93d0-97cfa31319b6
2007-08-07 14:19:38 +00:00
coppro 1ce4bd9c3d Added primitive update window.
Added diagonal directions (todo: add different text direcitons, primarily for Space)
Cleaned up keyword game file a bit.


git-svn-id: svn://svn.code.sf.net/p/magicseteditor/code/trunk@600 0fc631ac-6414-0410-93d0-97cfa31319b6
2007-08-05 00:38:12 +00:00
twanvl a112f885ca Moved spec_sort to separate file, added more advanced options;
Split 'sort' script function into 'sort_text' and 'sort_list';
Double clicking card in stats panel switches to cards panel

git-svn-id: svn://svn.code.sf.net/p/magicseteditor/code/trunk@587 0fc631ac-6414-0410-93d0-97cfa31319b6
2007-08-01 18:34:24 +00:00
coppro 7709c21b5f Fixed installer bugs, added documentation for crop function.
git-svn-id: svn://svn.code.sf.net/p/magicseteditor/code/trunk@578 0fc631ac-6414-0410-93d0-97cfa31319b6
2007-07-16 18:25:08 +00:00
coppro 11609df5db Implemented reflection for PackageVersionData
A little memory cleanup (most memory loss is in wx and gtk though)


git-svn-id: svn://svn.code.sf.net/p/magicseteditor/code/trunk@563 0fc631ac-6414-0410-93d0-97cfa31319b6
2007-07-13 16:10:36 +00:00
coppro 8b069d3e6f Added installer code.
git-svn-id: svn://svn.code.sf.net/p/magicseteditor/code/trunk@561 0fc631ac-6414-0410-93d0-97cfa31319b6
2007-07-12 22:48:20 +00:00
twanvl a234b24728 Fixed error about enumeration of files in local_data_directory; It should now also find packages from *both* directories.
git-svn-id: svn://svn.code.sf.net/p/magicseteditor/code/trunk@559 0fc631ac-6414-0410-93d0-97cfa31319b6
2007-07-12 17:37:08 +00:00
twanvl d590819762 Removed last of the BeginDrawing/EndDrawing calls;
Added english_number_ordinal script function;
Working on symbols with a different aspect ratio (i.e. wider/smaller symbols)

git-svn-id: svn://svn.code.sf.net/p/magicseteditor/code/trunk@558 0fc631ac-6414-0410-93d0-97cfa31319b6
2007-07-12 17:01:07 +00:00
coppro b21192646b Added new feature allowing data files in the user's settings directory to override those in the default directory
It's for systems where the main data is not writable by everyone. (Unices, mainly, and potentially Windows Vista)
The Windows default directory is a little out-of-the-way, in %HOME%\Application Data\Magic Set Editor\Data
Maybe they should be configurable.
But it also paves the way for the installer being capable of putting packages into the user's local directory.
That way, users don't all have to have all the packages that the other users want.


git-svn-id: svn://svn.code.sf.net/p/magicseteditor/code/trunk@557 0fc631ac-6414-0410-93d0-97cfa31319b6
2007-07-12 01:10:45 +00:00
twanvl 8833d07c4a Added 'filter' support to position function; Made sure sort script can depend on the value of the field itself.
Cleaned up some things, why is a blank image not thread safe?

git-svn-id: svn://svn.code.sf.net/p/magicseteditor/code/trunk@548 0fc631ac-6414-0410-93d0-97cfa31319b6
2007-07-10 18:57:41 +00:00
coppro 7676c0b6b6 Compatibility
git-svn-id: svn://svn.code.sf.net/p/magicseteditor/code/trunk@547 0fc631ac-6414-0410-93d0-97cfa31319b6
2007-07-10 17:14:56 +00:00
twanvl 55a897e392 Implemented nicer string collation, with support for composed characters and accents;
Fixed symbol filter bug, green was not made transparent;
Slightly nicer error messages when forgeting 'type' keys.

git-svn-id: svn://svn.code.sf.net/p/magicseteditor/code/trunk@544 0fc631ac-6414-0410-93d0-97cfa31319b6
2007-07-10 16:19:36 +00:00
twanvl 3c6721a0cb Symmetry actions now work; reflection symmetry is forced to use a multiple of two copies
git-svn-id: svn://svn.code.sf.net/p/magicseteditor/code/trunk@539 0fc631ac-6414-0410-93d0-97cfa31319b6
2007-07-10 03:15:46 +00:00
twanvl 1a01ac55f2 Rotation and reflection should now work correctly;
Finished the symmetry editor

git-svn-id: svn://svn.code.sf.net/p/magicseteditor/code/trunk@538 0fc631ac-6414-0410-93d0-97cfa31319b6
2007-07-10 02:47:27 +00:00
twanvl b409188013 Symbol editor now has constraints on selection, but part list allows selection inside groups.
Added logical 'xor' operator for scripting.

git-svn-id: svn://svn.code.sf.net/p/magicseteditor/code/trunk@534 0fc631ac-6414-0410-93d0-97cfa31319b6
2007-07-09 20:43:16 +00:00