Commit Graph

112 Commits

Author SHA1 Message Date
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 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
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 ed5ac758f9 Fixed filename bug (linux); disabled hover buttons on welcome window (linux)
git-svn-id: svn://svn.code.sf.net/p/magicseteditor/code/trunk@193 0fc631ac-6414-0410-93d0-97cfa31319b6
2007-01-31 20:38:31 +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 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
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 d96d150138 improved selection
git-svn-id: svn://svn.code.sf.net/p/magicseteditor/code/trunk@180 0fc631ac-6414-0410-93d0-97cfa31319b6
2006-12-26 17:14:18 +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 f7d12a4114 MOVE_MID support for cursor_to_index
git-svn-id: svn://svn.code.sf.net/p/magicseteditor/code/trunk@172 0fc631ac-6414-0410-93d0-97cfa31319b6
2006-12-24 19:18:42 +00:00
twanvl 05cc16d070 formating works, cursor position now prefers to be inside tags
git-svn-id: svn://svn.code.sf.net/p/magicseteditor/code/trunk@171 0fc631ac-6414-0410-93d0-97cfa31319b6
2006-12-24 19:04:36 +00:00
twanvl 1ab6b0cb82 text scaling
git-svn-id: svn://svn.code.sf.net/p/magicseteditor/code/trunk@168 0fc631ac-6414-0410-93d0-97cfa31319b6
2006-12-24 16:04:24 +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
twanvl d5db3f46ff numeric statistics dimensions; minor tweaks of graph
git-svn-id: svn://svn.code.sf.net/p/magicseteditor/code/trunk@150 0fc631ac-6414-0410-93d0-97cfa31319b6
2006-12-22 22:47:48 +00:00
twanvl 69e4edff95 changed <line> semantics, usage is now <line>\n</line>
git-svn-id: svn://svn.code.sf.net/p/magicseteditor/code/trunk@149 0fc631ac-6414-0410-93d0-97cfa31319b6
2006-12-22 20:00:18 +00:00
twanvl cf39deec24 combined_editor function, and improved dependency handling (removing duplicates), viewer refreshes on events from script manager
git-svn-id: svn://svn.code.sf.net/p/magicseteditor/code/trunk@147 0fc631ac-6414-0410-93d0-97cfa31319b6
2006-12-22 19:05:52 +00:00
twanvl 274cb1117f rotation and style changing works
git-svn-id: svn://svn.code.sf.net/p/magicseteditor/code/trunk@144 0fc631ac-6414-0410-93d0-97cfa31319b6
2006-12-22 15:08:49 +00:00
twanvl 5a8febd82a fixed rotation bug
git-svn-id: svn://svn.code.sf.net/p/magicseteditor/code/trunk@143 0fc631ac-6414-0410-93d0-97cfa31319b6
2006-12-22 13:52:20 +00:00
twanvl 2504eb908b fixed: GetMember works on values without save_value
git-svn-id: svn://svn.code.sf.net/p/magicseteditor/code/trunk@130 0fc631ac-6414-0410-93d0-97cfa31319b6
2006-12-19 22:16:29 +00:00
twanvl fc4ae65e28 cursor position fix
git-svn-id: svn://svn.code.sf.net/p/magicseteditor/code/trunk@126 0fc631ac-6414-0410-93d0-97cfa31319b6
2006-12-19 16:51:41 +00:00
twanvl 8f5b813274 fixed: break now works from FOR_EACH
git-svn-id: svn://svn.code.sf.net/p/magicseteditor/code/trunk@124 0fc631ac-6414-0410-93d0-97cfa31319b6
2006-12-19 16:46:13 +00:00
twanvl 7d205f318f reading alignments
git-svn-id: svn://svn.code.sf.net/p/magicseteditor/code/trunk@123 0fc631ac-6414-0410-93d0-97cfa31319b6
2006-12-19 16:45:55 +00:00
twanvl f09f610e7c correct selection drawing, fixed cursor position around <line>
git-svn-id: svn://svn.code.sf.net/p/magicseteditor/code/trunk@122 0fc631ac-6414-0410-93d0-97cfa31319b6
2006-12-19 15:45:32 +00:00
twanvl d3c5335fc7 improved cursor handling in text editor
git-svn-id: svn://svn.code.sf.net/p/magicseteditor/code/trunk@121 0fc631ac-6414-0410-93d0-97cfa31319b6
2006-12-19 15:17:22 +00:00
twanvl 99e8f516be ...more localisation...
git-svn-id: svn://svn.code.sf.net/p/magicseteditor/code/trunk@120 0fc631ac-6414-0410-93d0-97cfa31319b6
2006-12-18 23:45:15 +00:00
twanvl 9ddc690d68 mtg editor import
git-svn-id: svn://svn.code.sf.net/p/magicseteditor/code/trunk@118 0fc631ac-6414-0410-93d0-97cfa31319b6
2006-12-18 23:06:43 +00:00
twanvl 3048befc2e more localisation
git-svn-id: svn://svn.code.sf.net/p/magicseteditor/code/trunk@117 0fc631ac-6414-0410-93d0-97cfa31319b6
2006-12-18 21:45:05 +00:00
twanvl ca42f31ccc Localisation, using Locale class
git-svn-id: svn://svn.code.sf.net/p/magicseteditor/code/trunk@113 0fc631ac-6414-0410-93d0-97cfa31319b6
2006-12-12 16:09:05 +00:00
twanvl c2a03bc445 added TextCtrl control for things like card.notes and keyword stuff
git-svn-id: svn://svn.code.sf.net/p/magicseteditor/code/trunk@112 0fc631ac-6414-0410-93d0-97cfa31319b6
2006-12-11 22:12:46 +00:00
twanvl 0a69db594e added order_by support to position function, orders are cached; TODO: clear the cache when a card changes
git-svn-id: svn://svn.code.sf.net/p/magicseteditor/code/trunk@109 0fc631ac-6414-0410-93d0-97cfa31319b6
2006-12-10 23:49:34 +00:00
twanvl db917c2b71 correct cursor movement accross lines & zero width things
git-svn-id: svn://svn.code.sf.net/p/magicseteditor/code/trunk@108 0fc631ac-6414-0410-93d0-97cfa31319b6
2006-12-10 20:51:16 +00:00
twanvl 2af6304844 fixed loading images from zip packages
git-svn-id: svn://svn.code.sf.net/p/magicseteditor/code/trunk@105 0fc631ac-6414-0410-93d0-97cfa31319b6
2006-12-10 15:42:26 +00:00
twanvl 482e6ede5b support for saving sets
git-svn-id: svn://svn.code.sf.net/p/magicseteditor/code/trunk@104 0fc631ac-6414-0410-93d0-97cfa31319b6
2006-12-10 15:01:11 +00:00
twanvl a400644b25 implemented import formats
git-svn-id: svn://svn.code.sf.net/p/magicseteditor/code/trunk@102 0fc631ac-6414-0410-93d0-97cfa31319b6
2006-12-09 23:22:33 +00:00
twanvl c130916465 Added 'symbol_variation' script function
git-svn-id: svn://svn.code.sf.net/p/magicseteditor/code/trunk@101 0fc631ac-6414-0410-93d0-97cfa31319b6
2006-12-09 16:31:22 +00:00
twanvl 86328aaeec more script functions and text editor improvements
git-svn-id: svn://svn.code.sf.net/p/magicseteditor/code/trunk@100 0fc631ac-6414-0410-93d0-97cfa31319b6
2006-12-06 21:41:02 +00:00
twanvl 42bec59451 Partially working text editor
git-svn-id: svn://svn.code.sf.net/p/magicseteditor/code/trunk@99 0fc631ac-6414-0410-93d0-97cfa31319b6
2006-12-05 18:30:45 +00:00
twanvl e2701a646f added SymbolValueEditor + minor fixes
git-svn-id: svn://svn.code.sf.net/p/magicseteditor/code/trunk@96 0fc631ac-6414-0410-93d0-97cfa31319b6
2006-11-26 18:51:31 +00:00