Commit Graph

72 Commits

Author SHA1 Message Date
coppro c4e340f9e4 Fixed crash with new thread-safety code (primarily on watermarks)
Actually added only showing "open recent set" if exists
Removed a call to deprecated functions.


git-svn-id: svn://svn.code.sf.net/p/magicseteditor/code/trunk@415 0fc631ac-6414-0410-93d0-97cfa31319b6
2007-06-09 05:10:53 +00:00
coppro 62ff837352 Added thread-safety to thumbnail request system.
Marked symbol requests as not being thread-safe.
Added icon to symbol editor
Made *.* actually register on *



git-svn-id: svn://svn.code.sf.net/p/magicseteditor/code/trunk@407 0fc631ac-6414-0410-93d0-97cfa31319b6
2007-05-21 16:11:38 +00:00
coppro 9a2b992c06 Fixed GTK GetTextExtent bug
Added resources shell script


git-svn-id: svn://svn.code.sf.net/p/magicseteditor/code/trunk@401 0fc631ac-6414-0410-93d0-97cfa31319b6
2007-05-19 21:15:20 +00:00
coppro c51d7f8458 Fixed keyword list replacements messing up due to being multi-line.
Fixed GCC warnings.
Added linux installer directory.



git-svn-id: svn://svn.code.sf.net/p/magicseteditor/code/trunk@394 0fc631ac-6414-0410-93d0-97cfa31319b6
2007-05-19 15:11:14 +00:00
twanvl 7230a79d85 Fixed thumbnails for choices without images
git-svn-id: svn://svn.code.sf.net/p/magicseteditor/code/trunk@391 0fc631ac-6414-0410-93d0-97cfa31319b6
2007-05-18 22:37:50 +00:00
twanvl 4a6e10ad93 Support for extra card fields in stylesheets;
Fixed some bugs:
 - Missing choice images can crash mse.
 - The wrong style is used for making preview choice images on style panel.
FOR_EACH(x, *y.z) should now work without parentheses on linux as well.

git-svn-id: svn://svn.code.sf.net/p/magicseteditor/code/trunk@389 0fc631ac-6414-0410-93d0-97cfa31319b6
2007-05-18 21:26:21 +00:00
coppro 82a7690909 Fixed input.
Update configure script to wxWidgets 2.8
Added required 2.8 includes.

git-svn-id: svn://svn.code.sf.net/p/magicseteditor/code/trunk@382 0fc631ac-6414-0410-93d0-97cfa31319b6
2007-05-15 16:41:08 +00:00
twanvl 7faddb9d90 cut/delete for image values
git-svn-id: svn://svn.code.sf.net/p/magicseteditor/code/trunk@359 0fc631ac-6414-0410-93d0-97cfa31319b6
2007-05-13 22:19:08 +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 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
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 e1c067a9a1 Forgot to add find_replace.hpp
git-svn-id: svn://svn.code.sf.net/p/magicseteditor/code/trunk@301 0fc631ac-6414-0410-93d0-97cfa31319b6
2007-04-24 20:53:19 +00:00
twanvl c8f5b8c4a2 find/replace working better (but not done yet)
git-svn-id: svn://svn.code.sf.net/p/magicseteditor/code/trunk@300 0fc631ac-6414-0410-93d0-97cfa31319b6
2007-04-23 23:02:38 +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 e4500ce490 Font name can now be scripted
git-svn-id: svn://svn.code.sf.net/p/magicseteditor/code/trunk@291 0fc631ac-6414-0410-93d0-97cfa31319b6
2007-04-22 22:37:20 +00:00
twanvl fe0f6838b8 fixes to non-unicode build
git-svn-id: svn://svn.code.sf.net/p/magicseteditor/code/trunk@280 0fc631ac-6414-0410-93d0-97cfa31319b6
2007-04-21 21:09:17 +00:00
twanvl c1471e2e39 type_over for combined_editor;
keyword compatability disabled for new file versions

git-svn-id: svn://svn.code.sf.net/p/magicseteditor/code/trunk@278 0fc631ac-6414-0410-93d0-97cfa31319b6
2007-04-21 19:07:12 +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 f530cd7244 added toggle reminder text action;
updated SymbolsInFont when creating 'insert symbol' menu

git-svn-id: svn://svn.code.sf.net/p/magicseteditor/code/trunk@266 0fc631ac-6414-0410-93d0-97cfa31319b6
2007-04-19 14:04:50 +00:00
twanvl 9f24da8d02 dependency handling for keywords
git-svn-id: svn://svn.code.sf.net/p/magicseteditor/code/trunk@265 0fc631ac-6414-0410-93d0-97cfa31319b6
2007-04-18 22:59:03 +00:00
twanvl 3dd0521c40 MultipleChoiceValueEditor: implemented drop down list
git-svn-id: svn://svn.code.sf.net/p/magicseteditor/code/trunk@252 0fc631ac-6414-0410-93d0-97cfa31319b6
2007-04-12 19:18:17 +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 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 0f48513684 symmetric selection handling
git-svn-id: svn://svn.code.sf.net/p/magicseteditor/code/trunk@240 0fc631ac-6414-0410-93d0-97cfa31319b6
2007-03-25 01:38:09 +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 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 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 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 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
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
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 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 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 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 b059c867d2 fixed crash in drop down list when switching between editors
git-svn-id: svn://svn.code.sf.net/p/magicseteditor/code/trunk@165 0fc631ac-6414-0410-93d0-97cfa31319b6
2006-12-24 14:08:08 +00:00
twanvl 77c6acf90f hack to fix completely transparent images
git-svn-id: svn://svn.code.sf.net/p/magicseteditor/code/trunk@161 0fc631ac-6414-0410-93d0-97cfa31319b6
2006-12-24 00:41:46 +00:00
twanvl 40606d975e debuged some horrible race conditions & deadlocks
git-svn-id: svn://svn.code.sf.net/p/magicseteditor/code/trunk@160 0fc631ac-6414-0410-93d0-97cfa31319b6
2006-12-24 00:12:06 +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 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 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 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