amy/MagicSetEditor2
1
0
Fork 0
mirror of https://github.com/amyinspace/MagicSetEditor2.git synced 2026-06-11 13:17:00 -04:00
Code Issues Packages Projects Releases Wiki Activity
1,554 Commits 3 Branches 0 Tags
29c0dca669d0d5265469677d46b22ad9eaa08dcc
Commit Graph

220 Commits

Author SHA1 Message Date
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
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 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 ed8f96ec50 forgot initialization, fixed 
git-svn-id: svn://svn.code.sf.net/p/magicseteditor/code/trunk@162 0fc631ac-6414-0410-93d0-97cfa31319b6
 2006-12-24 13:35: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 f241fb91fa filtered card list is used 
git-svn-id: svn://svn.code.sf.net/p/magicseteditor/code/trunk@156 0fc631ac-6414-0410-93d0-97cfa31319b6
 2006-12-23 16:54:03 +00:00
twanvl dcdd000aef redrawing of editors (for drop down lists) 
git-svn-id: svn://svn.code.sf.net/p/magicseteditor/code/trunk@155 0fc631ac-6414-0410-93d0-97cfa31319b6
 2006-12-23 13:26:53 +00:00
twanvl 2233295cfd scrollbar in text editor 
git-svn-id: svn://svn.code.sf.net/p/magicseteditor/code/trunk@154 0fc631ac-6414-0410-93d0-97cfa31319b6
 2006-12-23 12:47:08 +00:00
twanvl 106afceaf9 perliminaries for filtered card list 
git-svn-id: svn://svn.code.sf.net/p/magicseteditor/code/trunk@152 0fc631ac-6414-0410-93d0-97cfa31319b6
 2006-12-22 23:03:02 +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 7ba562ea2e fixed flickering cursor in text control 
git-svn-id: svn://svn.code.sf.net/p/magicseteditor/code/trunk@146 0fc631ac-6414-0410-93d0-97cfa31319b6
 2006-12-22 16:02:33 +00:00
twanvl a16c098eac Layout() always called when editor/viewer control changes size 
git-svn-id: svn://svn.code.sf.net/p/magicseteditor/code/trunk@145 0fc631ac-6414-0410-93d0-97cfa31319b6
 2006-12-22 15:33:14 +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 a9a93c07c3 exception/error handling 
git-svn-id: svn://svn.code.sf.net/p/magicseteditor/code/trunk@137 0fc631ac-6414-0410-93d0-97cfa31319b6
 2006-12-21 22:09:42 +00:00
twanvl 2ba1d0b1b8 events on script update; fix in cycle_sort; card list updated on value action 
git-svn-id: svn://svn.code.sf.net/p/magicseteditor/code/trunk@136 0fc631ac-6414-0410-93d0-97cfa31319b6
 2006-12-21 21:56:49 +00:00
twanvl 572881aa31 enabled card rotation 
git-svn-id: svn://svn.code.sf.net/p/magicseteditor/code/trunk@135 0fc631ac-6414-0410-93d0-97cfa31319b6
 2006-12-21 19:54:42 +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 6529f6df89 Card list for selecting cards; window using that list; print function using that window (actual printing todo) 
git-svn-id: svn://svn.code.sf.net/p/magicseteditor/code/trunk@116 0fc631ac-6414-0410-93d0-97cfa31319b6
 2006-12-18 21:43:28 +00:00
twanvl 4c10107dbb Thread for generating thumbnail images; 
Used for card list;
Implemented reordering from card list

git-svn-id: svn://svn.code.sf.net/p/magicseteditor/code/trunk@115 0fc631ac-6414-0410-93d0-97cfa31319b6
 2006-12-18 19:30:44 +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 2f1b2756ee added overdrawDC for drawing selection 
git-svn-id: svn://svn.code.sf.net/p/magicseteditor/code/trunk@107 0fc631ac-6414-0410-93d0-97cfa31319b6
 2006-12-10 18:28:26 +00:00
twanvl 95a5c2f42b fixed update ui for NewWindow 
git-svn-id: svn://svn.code.sf.net/p/magicseteditor/code/trunk@106 0fc631ac-6414-0410-93d0-97cfa31319b6
 2006-12-10 16:47:56 +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 f344b8a1db ImageValueEditor; slice window; fixed bug in resample 
git-svn-id: svn://svn.code.sf.net/p/magicseteditor/code/trunk@97 0fc631ac-6414-0410-93d0-97cfa31319b6
 2006-11-26 23:23:51 +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
twanvl 0a916f89bc Added value actions for common value types; drop down list is now correctly aligned 
git-svn-id: svn://svn.code.sf.net/p/magicseteditor/code/trunk@92 0fc631ac-6414-0410-93d0-97cfa31319b6
 2006-11-24 16:36:17 +00:00
twanvl e2544e9d53 implemented resampled text ("high quality") 
git-svn-id: svn://svn.code.sf.net/p/magicseteditor/code/trunk@87 0fc631ac-6414-0410-93d0-97cfa31319b6
 2006-11-22 20:23:28 +00:00