Commit graph

231 commits

Author SHA1 Message Date
dfighter1985
669c15eda9 Removed yet another unused variable.
--HG--
branch : gsoc2014-dfighter
2014-08-06 13:04:30 +02:00
dfighter1985
e7ded1f82c Removed unused variable.
--HG--
branch : gsoc2014-dfighter
2014-08-06 13:01:44 +02:00
dfighter1985
613643b033 Repaint immediately when the display channel is changed.
--HG--
branch : gsoc2014-dfighter
2014-08-05 16:01:45 +02:00
dfighter1985
edf1da1294 Save the last directory where we loaded a tile image from.
--HG--
branch : gsoc2014-dfighter
2014-08-05 15:34:29 +02:00
dfighter1985
04d17b7a05 Save the last directoy where we loaded a tilebank from.
--HG--
branch : gsoc2014-dfighter
2014-08-05 15:16:25 +02:00
dfighter1985
f25d152f4f Rotation is now set in the tilebank wrapper and applied when replacing a tile.
--HG--
branch : gsoc2014-dfighter
2014-08-05 13:42:56 +02:00
dfighter1985
99bcb6cf79 Line endings and copyright headers...
--HG--
branch : gsoc2014-dfighter
2014-08-05 13:18:41 +02:00
dfighter1985
e2a579c03e Set all images by default.
--HG--
branch : gsoc2014-dfighter
2014-08-05 03:35:10 +02:00
dfighter1985
84fc5f27b6 Clear before loading the model data.
--HG--
branch : gsoc2014-dfighter
2014-08-05 03:20:30 +02:00
dfighter1985
2a55904b3e Makes no sense, but doesn't seem to be crashing anymore o.O
--HG--
branch : gsoc2014-dfighter
2014-08-05 03:17:29 +02:00
dfighter1985
d21aa2b678 Tile loading more or less works. TODO: investigate why displacement map lookup causes crashes.
--HG--
branch : gsoc2014-dfighter
2014-08-05 02:58:31 +02:00
dfighter1985
8bead3f3fd Saving tilebank
--HG--
branch : gsoc2014-dfighter
2014-08-04 22:14:39 +02:00
dfighter1985
92e850d296 Texture path.
--HG--
branch : gsoc2014-dfighter
2014-08-04 21:59:05 +02:00
dfighter1985
bdedd145e4 Surface data.
--HG--
branch : gsoc2014-dfighter
2014-08-04 21:53:22 +02:00
dfighter1985
55c046252f Oriented stuff.
--HG--
branch : gsoc2014-dfighter
2014-08-04 21:41:33 +02:00
dfighter1985
688f6de090 Vegetation set stuff.
--HG--
branch : gsoc2014-dfighter
2014-08-04 21:33:11 +02:00
dfighter1985
caf76f09c8 Most of the functionality works with the new code.
--HG--
branch : gsoc2014-dfighter
2014-08-04 21:22:44 +02:00
dfighter1985
30bae94ac3 Started to rework tile checks, tile banks loading / saving. A tilebank will now be in the tilemodel, and it will work from there. Also moved some constants into an independent file.
--HG--
branch : gsoc2014-dfighter
2014-08-03 21:33:13 +02:00
dfighter1985
299629860b Rotation can now be set.
--HG--
branch : gsoc2014-dfighter
2014-08-03 19:04:34 +02:00
dfighter1985
49deedad7d Save the tile border, etc data when saving.
--HG--
branch : gsoc2014-dfighter
2014-08-03 17:58:02 +02:00
dfighter1985
175af2fa74 Added checks. Yes it's horrible and needs to be refactored.
--HG--
branch : gsoc2014-dfighter
2014-08-03 04:15:12 +02:00
dfighter1985
1a49f9fedb Apply the current zoom factor!
--HG--
branch : gsoc2014-dfighter
2014-08-01 02:38:04 +02:00
dfighter1985
851afcf955 Don't reload the pixmaps every time they are displayed... -.-
--HG--
branch : gsoc2014-dfighter
2014-08-01 02:34:57 +02:00
dfighter1985
1265d6b064 Line endings...
--HG--
branch : gsoc2014-dfighter
2014-07-31 23:23:52 +02:00
dfighter1985
a994f23948 When hitting 'save as' ask for a filename even if one is set.
--HG--
branch : gsoc2014-dfighter
2014-07-30 15:55:09 +02:00
dfighter1985
0cef115a74 Should store the filename after opening..
--HG--
branch : gsoc2014-dfighter
2014-07-30 15:44:02 +02:00
dfighter1985
ac643d2bb9 Should only add 1 tile here...
--HG--
branch : gsoc2014-dfighter
2014-07-30 15:40:02 +02:00
dfighter1985
eee43ad1ea 128 and 256 tiles don't have alpha, so no need to load/save them.
--HG--
branch : gsoc2014-dfighter
2014-07-30 15:29:50 +02:00
dfighter1985
4bff87ca36 Replace and delete image should be applied to the correct channel now.
--HG--
branch : gsoc2014-dfighter
2014-07-30 14:39:19 +02:00
dfighter1985
7b1ee54427 Show the image that belongs to the channel that is selected.
--HG--
branch : gsoc2014-dfighter
2014-07-30 14:28:17 +02:00
dfighter1985
4d54cca6a0 Copyright headers...
--HG--
branch : gsoc2014-dfighter
2014-07-30 11:20:29 +02:00
dfighter1985
ddd687325f Close the loaded file and return true...
--HG--
branch : gsoc2014-dfighter
2014-07-30 11:15:14 +02:00
dfighter1985
ac73999f07 Set teh current selection to row 0
--HG--
branch : gsoc2014-dfighter
2014-07-30 11:14:41 +02:00
dfighter1985
3e2addc057 Save and load the tilebank texture path.
--HG--
branch : gsoc2014-dfighter
2014-07-30 11:10:15 +02:00
dfighter1985
0f5e475d1c Save and load the veget set filename.
--HG--
branch : gsoc2014-dfighter
2014-07-30 10:58:37 +02:00
dfighter1985
431178321f TileBank loading.
--HG--
branch : gsoc2014-dfighter
2014-07-30 10:54:08 +02:00
dfighter1985
c8914248db Add the already selected tilesets to the land when editing.
--HG--
branch : gsoc2014-dfighter
2014-07-30 07:43:02 +02:00
dfighter1985
ddc7961e9b Connected the oriented combobox and now saving it's value to the tilebank.
--HG--
branch : gsoc2014-dfighter
2014-07-30 01:50:01 +02:00
dfighter1985
95b67026bf Implemented saving of the currently stored tilebank data.
--HG--
branch : gsoc2014-dfighter
2014-07-30 01:29:17 +02:00
dfighter1985
89c6180144 As it turns out, tilesets can be assigned to multiple lands...
--HG--
branch : gsoc2014-dfighter
2014-07-28 17:05:51 +02:00
dfighter1985
8a704b7f5f Implemented the GUI part of saving...
--HG--
branch : gsoc2014-dfighter
2014-07-27 20:38:08 +02:00
dfighter1985
b004bb9d01 128x128 tab should be shown by default.
--HG--
branch : gsoc2014-dfighter
2014-07-27 18:23:25 +02:00
dfighter1985
4326ca1df8 Implemented tile image replace.
--HG--
branch : gsoc2014-dfighter
2014-07-26 02:24:32 +02:00
dfighter1985
5866a61cff Implemented tile image deletion.
--HG--
branch : gsoc2014-dfighter
2014-07-26 02:19:13 +02:00
dfighter1985
599ba19de2 A little refactoring.
--HG--
branch : gsoc2014-dfighter
2014-07-26 02:11:02 +02:00
dfighter1985
e06858f2df Reindex tile item nodes after deleting a node.
--HG--
branch : gsoc2014-dfighter
2014-07-26 02:05:21 +02:00
dfighter1985
f0a67d0c2e Implemented tile deletion.
--HG--
branch : gsoc2014-dfighter
2014-07-26 01:57:50 +02:00
dfighter1985
d31dfdb6e4 I must be blind...
--HG--
branch : gsoc2014-dfighter
2014-07-26 00:32:42 +02:00
dfighter1985
d2a414edb4 Implemented Tile addition.
--HG--
branch : gsoc2014-dfighter
2014-07-26 00:29:37 +02:00
dfighter1985
78f4654063 Implemented tilebank texture path setting.
--HG--
branch : gsoc2014-dfighter
2014-07-24 23:41:42 +02:00
dfighter1985
df7307583b Implemented choosing / resetting vegetset for tile sets.
--HG--
branch : gsoc2014-dfighter
2014-07-24 23:31:37 +02:00
dfighter1985
2993c88a5d When selecting another land, select the first tile set, if it exists.
--HG--
branch : gsoc2014-dfighter
2014-07-24 18:44:00 +02:00
dfighter1985
f66c1e837e Connect the selection model so the widgets are updated.
--HG--
branch : gsoc2014-dfighter
2014-07-24 18:39:34 +02:00
dfighter1985
9b403212c0 Each land has it's own TilesetModel now. When changing the land the model also changes.
--HG--
branch : gsoc2014-dfighter
2014-07-24 18:31:07 +02:00
dfighter1985
947782a2c5 Implemented land name changing.
--HG--
branch : gsoc2014-dfighter
2014-07-24 16:25:28 +02:00
dfighter1985
9519c4f0f5 Implemented land removal.
--HG--
branch : gsoc2014-dfighter
2014-07-24 16:20:44 +02:00
dfighter1985
02ccd3b1c1 Implemented land adding.
--HG--
branch : gsoc2014-dfighter
2014-07-24 16:18:01 +02:00
dfighter1985
e9e42701b9 Renamed land related widgets.
--HG--
branch : gsoc2014-dfighter
2014-07-24 16:09:58 +02:00
dfighter1985
c7ca20c748 Implemented tileset move up and move down.
--HG--
branch : gsoc2014-dfighter
2014-07-24 02:28:19 +02:00
dfighter1985
9d1fec6ce1 Implemented tileset rename.
--HG--
branch : gsoc2014-dfighter
2014-07-23 21:53:09 +02:00
dfighter1985
71fc4a098b Implemented tileset removal.
--HG--
branch : gsoc2014-dfighter
2014-07-23 18:35:26 +02:00
dfighter1985
5301b00e58 Don't try to delete the same items more than once!
--HG--
branch : gsoc2014-dfighter
2014-07-22 15:38:26 +02:00
dfighter1985
4d6de3f737 Don't allow 2 tilesets to have the same name.
--HG--
branch : gsoc2014-dfighter
2014-07-22 15:35:14 +02:00
dfighter1985
dcc072ba18 Update qrc location.
--HG--
branch : gsoc2014-dfighter
2014-07-22 14:44:31 +02:00
dfighter1985
3940e656e3 Error message when files can't be opened.
--HG--
branch : gsoc2014-dfighter
2014-07-21 23:25:35 +02:00
dfighter1985
32172e0e77 Added save and save as items to the context menu.
--HG--
branch : gsoc2014-dfighter
2014-07-21 23:08:05 +02:00
dfighter1985
ed44cc4823 Shouldn't crash when adding a new row.
--HG--
branch : gsoc2014-dfighter
2014-07-21 17:46:01 +02:00
dfighter1985
26b120f664 Mark translated item with green, untranslated ones with red.
--HG--
branch : gsoc2014-dfighter
2014-07-21 04:11:53 +02:00
dfighter1985
e92a07db33 New context menu options: mark / unmark translated.
--HG--
branch : gsoc2014-dfighter
2014-07-21 03:51:03 +02:00
dfighter1985
2fea6f45f5 Make sure a correct hash is not used for untranslated strings.
--HG--
branch : gsoc2014-dfighter
2014-07-21 03:24:18 +02:00
dfighter1985
0bd4b56589 Save to the right file.
--HG--
branch : gsoc2014-dfighter
2014-07-20 20:03:16 +02:00
dfighter1985
76d3e0df20 Set header text according to the language.
--HG--
branch : gsoc2014-dfighter
2014-07-20 19:52:23 +02:00
dfighter1985
2c812e90ab Work with translated files, instead of work files.
--HG--
branch : gsoc2014-dfighter
2014-07-20 17:24:04 +02:00
dfighter1985
fbcfa4ee6f Ask for confirmation before deleting a row.
--HG--
branch : gsoc2014-dfighter
2014-07-19 17:26:59 +02:00
dfighter1985
62a6b408a2 Show insert / delete row in context menu.
--HG--
branch : gsoc2014-dfighter
2014-07-19 17:23:53 +02:00
dfighter1985
d9c2620e6e Implemented row deletion / insertion.
--HG--
branch : gsoc2014-dfighter
2014-07-18 01:52:23 +02:00
dfighter1985
485ee77406 Use the QWidget modified property instead of the UXTEditor's own.
--HG--
branch : gsoc2014-dfighter
2014-07-18 01:18:41 +02:00
dfighter1985
3e188334fe Allow only 1 instance of the uxt editor.
--HG--
branch : gsoc2014-dfighter
2014-07-18 01:08:31 +02:00
dfighter1985
9bda0bd1e7 Added copyright headers to the new files.
--HG--
branch : gsoc2014-dfighter
2014-07-18 00:53:36 +02:00
dfighter1985
05216897f0 Implemented saving.
--HG--
branch : gsoc2014-dfighter
2014-07-18 00:50:40 +02:00
dfighter1985
fbc1632d04 Apply table changes to the loaded data, and offer to save when closing the changed table.
--HG--
branch : gsoc2014-dfighter
2014-07-18 00:27:05 +02:00
dfighter1985
0de5152aa9 Set header texts.
--HG--
branch : gsoc2014-dfighter
2014-07-17 19:17:02 +02:00
dfighter1985
d33fb9345e UXT Editor widget
--HG--
branch : gsoc2014-dfighter
2014-07-17 19:08:29 +02:00
dfighter1985
f60f761b7a I don't really know what to write here.
--HG--
branch : gsoc2014-dfighter
2014-07-16 02:52:17 +02:00
dfighter1985
28c30b70f1 Set the undostack so we won't crash...
--HG--
branch : gsoc2014-dfighter
2014-07-15 21:46:16 +02:00
dfighter1985
d30e9ad226 Initialize the undostack to NULL, so we get a proper crash instead of a dangled pointer crash.
--HG--
branch : gsoc2014-dfighter
2014-07-15 21:41:11 +02:00
dfighter1985
63b6a03f85 Fixed another crash.
--HG--
branch : gsoc2014-dfighter
2014-07-15 20:29:57 +02:00
dfighter1985
1cbcca259c 'Fixed' the Mission Compiler crash.
--HG--
branch : gsoc2014-dfighter
2014-07-15 20:19:53 +02:00
dfighter1985
56a4c3ea7d When changing a property make sure to set default to false, so it's actually saved!
--HG--
branch : gsoc2014-dfighter
2014-07-15 18:51:06 +02:00
dfighter1985
61b8a4ef82 Save world editor files.
--HG--
branch : gsoc2014-dfighter
2014-07-15 01:30:30 +02:00
dfighter1985
2d865a8567 Trying to load an invalid world editor file shouldn't crash the application, and an error messagebox should inform the user.
--HG--
branch : gsoc2014-dfighter
2014-07-13 21:38:14 +02:00
dfighter1985
3517283526 Apply property changes.
--HG--
branch : gsoc2014-dfighter
2014-07-12 01:54:45 +02:00
dfighter1985
3ad5ffee15 Block only the propertychanged signal in the const_string_array property manager.
--HG--
branch : gsoc2014-dfighter
2014-07-12 00:38:35 +02:00
dfighter1985
8f8b4fae65 Store QtProperty, IPrimitive pairs and look the primitive up when the property changes.
--HG--
branch : gsoc2014-dfighter
2014-07-12 00:01:17 +02:00
dfighter1985
820b6bc8ca Changed property to p, property is a reserved word in VS.
--HG--
branch : gsoc2014-dfighter
2014-07-11 20:47:24 +02:00
dfighter1985
aa82655ee7 Use \n instead of ; as a separator.
--HG--
branch : gsoc2014-dfighter
2014-07-11 20:41:15 +02:00
dfighter1985
8ff5317f01 Identation
--HG--
branch : gsoc2014-dfighter
2014-07-11 20:37:32 +02:00
dfighter1985
a222e44eaa Implemented const_string_array editor.
--HG--
branch : gsoc2014-dfighter
2014-07-11 20:35:05 +02:00
dfighter1985
094210a079 Workaround related to the unknown statusbar crash.
--HG--
branch : gsoc2014-dfighter
2014-07-09 23:20:50 +02:00
dfighter1985
d850a07e9e Copyright banner + line endings... I always mess this up somehow..
--HG--
branch : gsoc2014-dfighter
2014-07-09 21:13:57 +02:00