Commit Graph

98 Commits

Author SHA1 Message Date
twanvl 5f9a7819fe Fixed initialization bug in Graph;
Added regeneration keyword;
0.3.3 installer

git-svn-id: svn://svn.code.sf.net/p/magicseteditor/code/trunk@377 0fc631ac-6414-0410-93d0-97cfa31319b6
2007-05-14 20:34:52 +00:00
twanvl 39e379006f Minor tweak of scatter pie graph;
Version bump to 0.3.3

git-svn-id: svn://svn.code.sf.net/p/magicseteditor/code/trunk@371 0fc631ac-6414-0410-93d0-97cfa31319b6
2007-05-14 16:39:38 +00:00
twanvl ce51c7061a Legends for graphs; pie scatter graphs
git-svn-id: svn://svn.code.sf.net/p/magicseteditor/code/trunk@369 0fc631ac-6414-0410-93d0-97cfa31319b6
2007-05-14 15:37:04 +00:00
twanvl a26bdc547f Some more statistics tweaks;
Another minor fix for alignment of sorted columns

git-svn-id: svn://svn.code.sf.net/p/magicseteditor/code/trunk@367 0fc631ac-6414-0410-93d0-97cfa31319b6
2007-05-14 01:55:27 +00:00
twanvl f30b14b0f7 Alignment is preserved when sorting (changing column images)
git-svn-id: svn://svn.code.sf.net/p/magicseteditor/code/trunk@366 0fc631ac-6414-0410-93d0-97cfa31319b6
2007-05-14 00:43:54 +00:00
twanvl 41989c0755 Scatter plots
git-svn-id: svn://svn.code.sf.net/p/magicseteditor/code/trunk@363 0fc631ac-6414-0410-93d0-97cfa31319b6
2007-05-13 23:43:24 +00:00
twanvl ff745244d3 choice fields show only the highest level of choices in statistics panel
git-svn-id: svn://svn.code.sf.net/p/magicseteditor/code/trunk@361 0fc631ac-6414-0410-93d0-97cfa31319b6
2007-05-13 22:23:38 +00:00
twanvl 3702ff5846 clipboard functions for keywords
git-svn-id: svn://svn.code.sf.net/p/magicseteditor/code/trunk@358 0fc631ac-6414-0410-93d0-97cfa31319b6
2007-05-13 22:16:58 +00:00
twanvl 7bad8154e3 Nicer colors for card list/stats panel;
Keywords updated so <name><cost> splits correctly

git-svn-id: svn://svn.code.sf.net/p/magicseteditor/code/trunk@352 0fc631ac-6414-0410-93d0-97cfa31319b6
2007-05-13 15:34:40 +00:00
twanvl 8d5fc6949f Choice images recomputed less often;
Implemented GraphType for choosing different layouts on the stats panel;
Added option to define order of graph groups;
Added busy cursor when loading recent file;
Parentheses in FOR_EACH macro

git-svn-id: svn://svn.code.sf.net/p/magicseteditor/code/trunk@351 0fc631ac-6414-0410-93d0-97cfa31319b6
2007-05-13 15:22:26 +00:00
twanvl 3b45bb81f6 Support for 2d bar graphs;
separator_after for keywords;
Slightly more advanced english_plural/singular;
Windows uninstaller will remove app data

git-svn-id: svn://svn.code.sf.net/p/magicseteditor/code/trunk@348 0fc631ac-6414-0410-93d0-97cfa31319b6
2007-05-13 01:22:11 +00:00
twanvl 33fd2b5e18 default smart pointer type switched to intrusive_ptr
git-svn-id: svn://svn.code.sf.net/p/magicseteditor/code/trunk@337 0fc631ac-6414-0410-93d0-97cfa31319b6
2007-05-11 21:34:53 +00:00
twanvl 3b6743b110 Added support for custom colors for graphs;
Moved 'choice colors' from styel to field, split into 'choice colors' and 'choice colors cardlist';
Added support for pie graphs (no gui to use them, though);
Fixed bugs caused by selecting a card before the set was changed on all panels.

git-svn-id: svn://svn.code.sf.net/p/magicseteditor/code/trunk@336 0fc631ac-6414-0410-93d0-97cfa31319b6
2007-05-11 14:10:29 +00:00
twanvl 00b3e3a3cd Conversion to new ScriptableImage complete, this affected quite a bit, including the evil thumbnail thread;
Added StyleListener, so style changes are only propagated to interested viewers.

git-svn-id: svn://svn.code.sf.net/p/magicseteditor/code/trunk@329 0fc631ac-6414-0410-93d0-97cfa31319b6
2007-05-10 00:47:27 +00:00
twanvl 3c4729aaa2 Added 'position hint' to packages, used to specify the order of the packages in a package list;
Added 'pack type', intended for playtesting (random boosters/starters);
Added 'default(_image)' property to ImageStyle, and added the frame fillers for magic;
Added blurring and bold printing (rather hacky) to the text rendering functions (used for "double click to add image" text);
Added 'symmetric overlay' combine mode, which will look really nice for hybrids;
Moved the watermark choices from the game to an include file in magic-watermarks;
Working on a replacement for the image scripting system that plays nicer with the rest of the code. In particular, it will be possible to compare generated images quickly, so they can be updated continuously. This is a work in progress, currently there are two versions of everything.

git-svn-id: svn://svn.code.sf.net/p/magicseteditor/code/trunk@327 0fc631ac-6414-0410-93d0-97cfa31319b6
2007-05-09 21:41:15 +00:00
twanvl 6feef4feb0 Fixed/hacked 'no parameter' for 0.2.7 keyword compatability;
Added 'just_header' flag to make stylesheet list load faster;
Added versioning and dependency support to packages

git-svn-id: svn://svn.code.sf.net/p/magicseteditor/code/trunk@320 0fc631ac-6414-0410-93d0-97cfa31319b6
2007-05-05 23:19:52 +00:00
twanvl e38cc6e2c9 Fixed dependencies for 'styling';
Fixed: specific character prefered over .* for keywords

git-svn-id: svn://svn.code.sf.net/p/magicseteditor/code/trunk@306 0fc631ac-6414-0410-93d0-97cfa31319b6
2007-04-28 21:58:29 +00:00
coppro 7c40df0624 Updated a few GCC issues, and case-sensitivity of filenames.
I had to rename the export function in Apprentice.cpp since "export" is a reserved word according to the C++ standard. I don't know whether GCC supports it yet, but it certainly complains.

git-svn-id: svn://svn.code.sf.net/p/magicseteditor/code/trunk@302 0fc631ac-6414-0410-93d0-97cfa31319b6
2007-04-25 00:16:29 +00:00
twanvl 89ce208198 find/replace kind of working
git-svn-id: svn://svn.code.sf.net/p/magicseteditor/code/trunk@299 0fc631ac-6414-0410-93d0-97cfa31319b6
2007-04-23 22:25:14 +00:00
twanvl 61550b9e44 implemented justification;
fixed initialization bug in item_list;
commented out statistics fields for debugging and added 'match' for all keywords in magic.mse-game

git-svn-id: svn://svn.code.sf.net/p/magicseteditor/code/trunk@279 0fc631ac-6414-0410-93d0-97cfa31319b6
2007-04-21 20:41:44 +00:00
twanvl a2e709d86b It is 2007 by now
git-svn-id: svn://svn.code.sf.net/p/magicseteditor/code/trunk@275 0fc631ac-6414-0410-93d0-97cfa31319b6
2007-04-21 17:06:29 +00:00
twanvl 5327520646 "insert parameter" and "user parameter" buttons now work.
git-svn-id: svn://svn.code.sf.net/p/magicseteditor/code/trunk@271 0fc631ac-6414-0410-93d0-97cfa31319b6
2007-04-21 01:10:32 +00:00
twanvl fef99c78e3 Added list for refering to keyword parameters; keyword database updated when keywords change
git-svn-id: svn://svn.code.sf.net/p/magicseteditor/code/trunk@270 0fc631ac-6414-0410-93d0-97cfa31319b6
2007-04-20 16:10:54 +00:00
twanvl c8fc427da3 Added ChangeKeywordModeAction;
Hopefully fixed the 'Invalid multibyte character' build error on linux (I was using left/right-angle-brackets in string constants);
Fixed 'cost' keywords;


git-svn-id: svn://svn.code.sf.net/p/magicseteditor/code/trunk@263 0fc631ac-6414-0410-93d0-97cfa31319b6
2007-04-18 18:02:09 +00:00
twanvl e685b56830 Working on the keywords panel;
Correct styling data now shown on style panel

git-svn-id: svn://svn.code.sf.net/p/magicseteditor/code/trunk@259 0fc631ac-6414-0410-93d0-97cfa31319b6
2007-04-16 22:27:05 +00:00
twanvl 7b45f6f69e Editing of keywords
git-svn-id: svn://svn.code.sf.net/p/magicseteditor/code/trunk@255 0fc631ac-6414-0410-93d0-97cfa31319b6
2007-04-13 23:59:42 +00:00
twanvl f915a491a8 fixed: "Double click to select image" text now always shown when editing;
Correct control used for clipboard actions in CardsPanel

git-svn-id: svn://svn.code.sf.net/p/magicseteditor/code/trunk@253 0fc631ac-6414-0410-93d0-97cfa31319b6
2007-04-12 19:39:08 +00:00
twanvl 42ab8c84c0 Fixed TextCtrl to work for keyword properties;
Added wrapping of <> around parameters to TextElement;
Added colors for keyword parameters;
Added menu & toolbar for keyword panel;
Fixed bug in package, save/save-as was the wrong way around;
Added third quality setting to RotatedDC: using SetUserScale, this gets you more precise positioning.

git-svn-id: svn://svn.code.sf.net/p/magicseteditor/code/trunk@250 0fc631ac-6414-0410-93d0-97cfa31319b6
2007-04-12 17:35:00 +00:00
twanvl 7deecad835 cleaned up magic keywords; correct drawing of placeholders
git-svn-id: svn://svn.code.sf.net/p/magicseteditor/code/trunk@235 0fc631ac-6414-0410-93d0-97cfa31319b6
2007-03-24 22:06:15 +00:00
twanvl f1c5a8b974 Fixed Actions for TextCtrl, actions used to apply to the wrong value.
Changed some TABs to spaces in macros, that should end the conflicts because we use different tab sizes (4 vs 8)

git-svn-id: svn://svn.code.sf.net/p/magicseteditor/code/trunk@234 0fc631ac-6414-0410-93d0-97cfa31319b6
2007-03-24 20:27:38 +00:00
twanvl c0eb224386 Icons for file->export
git-svn-id: svn://svn.code.sf.net/p/magicseteditor/code/trunk@233 0fc631ac-6414-0410-93d0-97cfa31319b6
2007-03-23 22:02:57 +00:00
coppro 851799d1b6 Fixed some bugs to make GCC work. I needed to change SimpleValueAction to take the function as a variable as opposed to a template parameter - GCC won't accept pointers from a base class in templates.
git-svn-id: svn://svn.code.sf.net/p/magicseteditor/code/trunk@231 0fc631ac-6414-0410-93d0-97cfa31319b6
2007-03-23 00:57:06 +00:00
twanvl 0fbd417057 (partially working) keyword list
git-svn-id: svn://svn.code.sf.net/p/magicseteditor/code/trunk@230 0fc631ac-6414-0410-93d0-97cfa31319b6
2007-03-22 22:50:01 +00:00
twanvl e51af9677b split ItemList from CardList, this class can also be used to list keywords
git-svn-id: svn://svn.code.sf.net/p/magicseteditor/code/trunk@229 0fc631ac-6414-0410-93d0-97cfa31319b6
2007-03-22 20:23:12 +00:00
twanvl 1bf5af3de4 Scroll wheel in native look editor now scrolls window under cursor
git-svn-id: svn://svn.code.sf.net/p/magicseteditor/code/trunk@226 0fc631ac-6414-0410-93d0-97cfa31319b6
2007-03-22 13:07:39 +00:00
twanvl 2c2bf88a40 redraw on resize
git-svn-id: svn://svn.code.sf.net/p/magicseteditor/code/trunk@225 0fc631ac-6414-0410-93d0-97cfa31319b6
2007-03-22 13:07:17 +00:00
twanvl 3f0c284a50 added scrollbar to NativeLookEditor
git-svn-id: svn://svn.code.sf.net/p/magicseteditor/code/trunk@223 0fc631ac-6414-0410-93d0-97cfa31319b6
2007-03-21 23:40:17 +00:00
twanvl d30e0f7bc5 Added support for informational headings in native look editor.
git-svn-id: svn://svn.code.sf.net/p/magicseteditor/code/trunk@212 0fc631ac-6414-0410-93d0-97cfa31319b6
2007-03-18 14:50:44 +00:00
twanvl 074ff12816 Keyword parameters in the text are processed, placeholders are inserted
git-svn-id: svn://svn.code.sf.net/p/magicseteditor/code/trunk@211 0fc631ac-6414-0410-93d0-97cfa31319b6
2007-03-18 01:05:43 +00:00
twanvl 0464f5f7fc The DECLARE_TYPEOF(()) calls don't work in MSVC, I changed it to use a COMMA macro instead of ,
If this doesn't work in GCC, the COMMA definition could be made only for MSVC, then GCC sees DECLARE_TYPEOF(map<int COMMA string>). GCC doesn't need DECLARE_TYPEOF anyway.

Keyword expansion now works, still todo:
 - marking parameters, e.g. "Cycling 2W" -> "Cycling <param-mana>2W</param-mana>"
 - user interface for toggling reminder text
 - user interface for keywords

git-svn-id: svn://svn.code.sf.net/p/magicseteditor/code/trunk@210 0fc631ac-6414-0410-93d0-97cfa31319b6
2007-03-17 23:58:16 +00:00
coppro 83b6aa36f8 Removed DECLARE_TYPEOF2; replaced with double-parenthesized macro calls. (GCC doesn't accept the other way in all cases.. I don't know whether MSW accepts this way.) Fixed a few resource names.
git-svn-id: svn://svn.code.sf.net/p/magicseteditor/code/trunk@209 0fc631ac-6414-0410-93d0-97cfa31319b6
2007-03-15 23:48:01 +00:00
twanvl 0c66191ab3 Changed all resources to .png files;
Added 'snap to grid' to symbol editor

git-svn-id: svn://svn.code.sf.net/p/magicseteditor/code/trunk@207 0fc631ac-6414-0410-93d0-97cfa31319b6
2007-02-16 00:07:14 +00:00
twanvl e83c00c05a Changed scroll size of PackageList;
Added 'collapse' option for card notes;
Made variant of  DECLARE_TYPEOF for maps (two template arguments).

git-svn-id: svn://svn.code.sf.net/p/magicseteditor/code/trunk@202 0fc631ac-6414-0410-93d0-97cfa31319b6
2007-02-08 22:15:11 +00:00
twanvl 73a2f61e68 Added 'insert symbol' menu for SymbolFonts;
Added scriptable 'enabled' to symbols in symbol font, used instead of scripted filenames. This means changing the tap symbol style now works;
Added localisation for games, stylesheets and symbolfonts;
Warnings from Reader are now shown onIdle;

git-svn-id: svn://svn.code.sf.net/p/magicseteditor/code/trunk@198 0fc631ac-6414-0410-93d0-97cfa31319b6
2007-02-07 22:31:21 +00:00
coppro 3c4790cac9 Fixed many resource file names, removed raw-char matches input-char requirement for Linux operation.
WARNING: This version is unstable. High possibility of encountering a complete processor lockup (likely an infinite loop).

Known bugs on Linux: Some fields are being drawn off-target (such as text) and they need to be fixed in order to allow compatibility. Different style files on different platforms would not be a good idea. The combined-editors are not working. When a text-replacement is made via "~", the cursor is placed before it and attempting to remove or select it causes a lockup. Symbol editor seems to be working fine. The symbol selection dialog causes a crash when used.

git-svn-id: svn://svn.code.sf.net/p/magicseteditor/code/trunk@194 0fc631ac-6414-0410-93d0-97cfa31319b6
2007-02-02 04:23:35 +00:00
twanvl 51546ca2d8 Changed resource names to be lowercase, and to match the filenames (or what they should be);
Replaced all direct construction of bitmaps and icons using wxBitmap("name") with load_resource_* calls.

git-svn-id: svn://svn.code.sf.net/p/magicseteditor/code/trunk@191 0fc631ac-6414-0410-93d0-97cfa31319b6
2007-01-30 18:29:02 +00:00
coppro 28bcb1068c Compiled Linux version. The welcome screen doesn't display the icon images, and the buttons don't work. Data is found at *prefix*/Magic Set Editor/data and the images at *prefix*/Magic Set Editor/resource. On Ubuntu, *prefix* is /usr/local/share. Resource files are all the image files from resource. I haven't configured them, because I haven't made it past the welcome screen.
git-svn-id: svn://svn.code.sf.net/p/magicseteditor/code/trunk@188 0fc631ac-6414-0410-93d0-97cfa31319b6
2007-01-30 04:03:22 +00:00
twanvl 27d5b2c94b removed minimum width of notes field
git-svn-id: svn://svn.code.sf.net/p/magicseteditor/code/trunk@187 0fc631ac-6414-0410-93d0-97cfa31319b6
2007-01-29 14:35:19 +00:00
twanvl 3a18f787ce Compiles again under MSW after porting changes for linux
git-svn-id: svn://svn.code.sf.net/p/magicseteditor/code/trunk@186 0fc631ac-6414-0410-93d0-97cfa31319b6
2007-01-29 14:16:57 +00:00
twanvl 3d9181e5f6 Eliminated most build errors (gcc,linux,wxGTK).
What is left is mostly:
 - warning: converting double to int
     -> add a cast/to_int or ignore
 - wrong initialization order in ctor
     -> just swap the order to match the class
 - errors about wxCursors
     -> add a function loadResourceCursor


git-svn-id: svn://svn.code.sf.net/p/magicseteditor/code/trunk@183 0fc631ac-6414-0410-93d0-97cfa31319b6
2007-01-29 00:04:20 +00:00