Commit Graph

130 Commits

Author SHA1 Message Date
twanvl 37fe4c84ae added guild mana support for all magic styles;
uses correct script context for cards using a stylesheet other then the default one.

git-svn-id: svn://svn.code.sf.net/p/magicseteditor/code/trunk@262 0fc631ac-6414-0410-93d0-97cfa31319b6
2007-04-17 20:59:17 +00:00
twanvl 8e3049d0ee improved error reporting for the keyword editor
git-svn-id: svn://svn.code.sf.net/p/magicseteditor/code/trunk@260 0fc631ac-6414-0410-93d0-97cfa31319b6
2007-04-16 23:45:01 +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 1be1304c94 Added actions for adding/removing keywords
git-svn-id: svn://svn.code.sf.net/p/magicseteditor/code/trunk@254 0fc631ac-6414-0410-93d0-97cfa31319b6
2007-04-13 17:21:35 +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 e55e5ae806 fixed default value for tr()
git-svn-id: svn://svn.code.sf.net/p/magicseteditor/code/trunk@245 0fc631ac-6414-0410-93d0-97cfa31319b6
2007-03-29 18:43:10 +00:00
twanvl f025630b8b Fixed mask for image fields, added mask support to slice window
git-svn-id: svn://svn.code.sf.net/p/magicseteditor/code/trunk@243 0fc631ac-6414-0410-93d0-97cfa31319b6
2007-03-29 18:27:05 +00:00
twanvl 3d98bbb870 correct cursor position for formating actions
git-svn-id: svn://svn.code.sf.net/p/magicseteditor/code/trunk@239 0fc631ac-6414-0410-93d0-97cfa31319b6
2007-03-25 00:31:41 +00:00
twanvl 114c03b6e1 improved cursor motion for up/down/home/end; text editor now remembers cursor positions (instead of indices) when applying scripts.
git-svn-id: svn://svn.code.sf.net/p/magicseteditor/code/trunk@237 0fc631ac-6414-0410-93d0-97cfa31319b6
2007-03-24 23:42:33 +00:00
twanvl 135941fb43 non-optional keyword parameters
git-svn-id: svn://svn.code.sf.net/p/magicseteditor/code/trunk@236 0fc631ac-6414-0410-93d0-97cfa31319b6
2007-03-24 22:17:48 +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 0f8f8a3334 Added 'export all card images' functionality
git-svn-id: svn://svn.code.sf.net/p/magicseteditor/code/trunk@232 0fc631ac-6414-0410-93d0-97cfa31319b6
2007-03-23 18:37:49 +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 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 f5de36057c Working MultipleChoiceValueEditor for checklist style
git-svn-id: svn://svn.code.sf.net/p/magicseteditor/code/trunk@228 0fc631ac-6414-0410-93d0-97cfa31319b6
2007-03-22 15:36:07 +00:00
twanvl 21781a559a localization of symbol editor
git-svn-id: svn://svn.code.sf.net/p/magicseteditor/code/trunk@227 0fc631ac-6414-0410-93d0-97cfa31319b6
2007-03-22 14:27:55 +00:00
twanvl 2a2471fda7 implemented 'default set style', so that doesn't have to be duplicated for each style
git-svn-id: svn://svn.code.sf.net/p/magicseteditor/code/trunk@224 0fc631ac-6414-0410-93d0-97cfa31319b6
2007-03-22 12:57:10 +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 0c6068d6a2 paritially implemented MultipleChoice viewer/editor
git-svn-id: svn://svn.code.sf.net/p/magicseteditor/code/trunk@222 0fc631ac-6414-0410-93d0-97cfa31319b6
2007-03-21 18:04:09 +00:00
twanvl 9052636ff9 Addded script functions for exporting, ExportTemplate package type
git-svn-id: svn://svn.code.sf.net/p/magicseteditor/code/trunk@220 0fc631ac-6414-0410-93d0-97cfa31319b6
2007-03-20 17:21:08 +00:00
twanvl dcfee659d0 Added some REFLECT_ macros, so the reflection code doesn't have to mess with the internals of reflection.
git-svn-id: svn://svn.code.sf.net/p/magicseteditor/code/trunk@218 0fc631ac-6414-0410-93d0-97cfa31319b6
2007-03-18 22:45:02 +00:00
twanvl f2ce80d88a Split script/functions.cpp into multiple files in new script/functions/ directory.
git-svn-id: svn://svn.code.sf.net/p/magicseteditor/code/trunk@217 0fc631ac-6414-0410-93d0-97cfa31319b6
2007-03-18 22:13:27 +00:00
twanvl 2cc6aa5524 Magic Workstation spoiler format export
git-svn-id: svn://svn.code.sf.net/p/magicseteditor/code/trunk@216 0fc631ac-6414-0410-93d0-97cfa31319b6
2007-03-18 19:15:29 +00:00
twanvl 332f17e543 minor cleanup of comments and includes
git-svn-id: svn://svn.code.sf.net/p/magicseteditor/code/trunk@215 0fc631ac-6414-0410-93d0-97cfa31319b6
2007-03-18 15:24:33 +00:00
twanvl e75f63e038 fixed bug with package specific localization.
git-svn-id: svn://svn.code.sf.net/p/magicseteditor/code/trunk@214 0fc631ac-6414-0410-93d0-97cfa31319b6
2007-03-18 15:23:19 +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 4e88ff8cf0 fixed RemoveControlPointAction
git-svn-id: svn://svn.code.sf.net/p/magicseteditor/code/trunk@206 0fc631ac-6414-0410-93d0-97cfa31319b6
2007-02-13 22:23:41 +00:00
twanvl 719b893354 automatic foreground/background color detection
git-svn-id: svn://svn.code.sf.net/p/magicseteditor/code/trunk@205 0fc631ac-6414-0410-93d0-97cfa31319b6
2007-02-13 18:32:21 +00:00
twanvl f855b6a690 some fixes to image import
git-svn-id: svn://svn.code.sf.net/p/magicseteditor/code/trunk@204 0fc631ac-6414-0410-93d0-97cfa31319b6
2007-02-13 18:17:45 +00:00
twanvl 914f1186f2 Added image to symbol conversion
git-svn-id: svn://svn.code.sf.net/p/magicseteditor/code/trunk@203 0fc631ac-6414-0410-93d0-97cfa31319b6
2007-02-13 18:02:51 +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
twanvl b93e5b2ae3 Reverted resource references for combine_something, you can't use tool_image here, because on MSW that only works for .bmps'
Added dependency stuff to invalidate Choice images;
Fixed 'duplicate' in symbol editor

git-svn-id: svn://svn.code.sf.net/p/magicseteditor/code/trunk@197 0fc631ac-6414-0410-93d0-97cfa31319b6
2007-02-07 16:17:15 +00:00
twanvl 504269e903 Moved resources to better filenames;
Updated HoverButton, now an actual custom control, added focused and down states;
Added Help->Website

git-svn-id: svn://svn.code.sf.net/p/magicseteditor/code/trunk@196 0fc631ac-6414-0410-93d0-97cfa31319b6
2007-02-06 21:48:49 +00:00
twanvl 2291fe4405 Fixed some more compiler warnings
git-svn-id: svn://svn.code.sf.net/p/magicseteditor/code/trunk@192 0fc631ac-6414-0410-93d0-97cfa31319b6
2007-01-31 19:43:27 +00:00
twanvl 315af1f14a Changes to make it work in windows again;
New header util/platform.hpp for platform specific stuff that doesn't go elsewhere;
Changed resource names from "CURSOR_SOMETHING" to "cursor/something", so it matches the filenames (in progress for other resource types).

git-svn-id: svn://svn.code.sf.net/p/magicseteditor/code/trunk@190 0fc631ac-6414-0410-93d0-97cfa31319b6
2007-01-30 17:27:25 +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 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
twanvl 1cd80a3710 A working configure&makefile; now in the process of getting it to build on gcc
git-svn-id: svn://svn.code.sf.net/p/magicseteditor/code/trunk@182 0fc631ac-6414-0410-93d0-97cfa31319b6
2007-01-28 22:38:59 +00:00
twanvl fc03b5efa1 Fixed compilation errors for gcc@linux (not all yet).
git-svn-id: svn://svn.code.sf.net/p/magicseteditor/code/trunk@181 0fc631ac-6414-0410-93d0-97cfa31319b6
2007-01-28 19:13:01 +00:00
twanvl 439dbfce6b rewritten retrying part of reader, it is now implemented how it should have been from the start.
git-svn-id: svn://svn.code.sf.net/p/magicseteditor/code/trunk@175 0fc631ac-6414-0410-93d0-97cfa31319b6
2006-12-25 16:52:07 +00:00
twanvl 031266c71b separate short_name for packages, moved full_name,short_name and icon_filename to Packaged
git-svn-id: svn://svn.code.sf.net/p/magicseteditor/code/trunk@173 0fc631ac-6414-0410-93d0-97cfa31319b6
2006-12-25 14:19:36 +00:00
twanvl ca3b7b91b4 <sep-soft> support
git-svn-id: svn://svn.code.sf.net/p/magicseteditor/code/trunk@166 0fc631ac-6414-0410-93d0-97cfa31319b6
2006-12-24 15:03:52 +00:00
twanvl 5bed5892f3 thumbnails for choice editor
git-svn-id: svn://svn.code.sf.net/p/magicseteditor/code/trunk@159 0fc631ac-6414-0410-93d0-97cfa31319b6
2006-12-23 21:12:26 +00:00