Commit graph

282 commits

Author SHA1 Message Date
dfighter1985
2f56a5eee4 Statically load the empty tile image so that we don't need to have over 9000 instances of it. Also display an error message if loading fails on startup. 2014-08-06 13:25:50 +02:00
dfighter1985
3fc31ee2ad Removed yet another unused variable. 2014-08-06 13:04:30 +02:00
dfighter1985
4f05fea63c Removed unused variable. 2014-08-06 13:01:44 +02:00
dfighter1985
f22f9fbc08 Repaint immediately when the display channel is changed. 2014-08-05 16:01:45 +02:00
dfighter1985
53f771690c Save the last directory where we loaded a tile image from. 2014-08-05 15:34:29 +02:00
dfighter1985
f23a557e77 Save the last directoy where we loaded a tilebank from. 2014-08-05 15:16:25 +02:00
dfighter1985
1e9e492f0f Rotation is now set in the tilebank wrapper and applied when replacing a tile. 2014-08-05 13:42:56 +02:00
dfighter1985
6c8ae2fafe Line endings and copyright headers... 2014-08-05 13:18:41 +02:00
dfighter1985
29bf9e0a93 Set all images by default. 2014-08-05 03:35:10 +02:00
dfighter1985
53e118eb04 Clear before loading the model data. 2014-08-05 03:20:30 +02:00
dfighter1985
a7022146ec Makes no sense, but doesn't seem to be crashing anymore o.O 2014-08-05 03:17:29 +02:00
dfighter1985
cc12fb91b4 Tile loading more or less works. TODO: investigate why displacement map lookup causes crashes. 2014-08-05 02:58:31 +02:00
dfighter1985
1255cdb3e7 Saving tilebank 2014-08-04 22:14:39 +02:00
dfighter1985
1309834e49 Texture path. 2014-08-04 21:59:05 +02:00
dfighter1985
716903fd5f Surface data. 2014-08-04 21:53:22 +02:00
dfighter1985
bcfcb5bb83 Oriented stuff. 2014-08-04 21:41:33 +02:00
dfighter1985
de15faa5d2 Vegetation set stuff. 2014-08-04 21:33:11 +02:00
dfighter1985
90b9a592b8 Most of the functionality works with the new code. 2014-08-04 21:22:44 +02:00
dfighter1985
80f7dd725d 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. 2014-08-03 21:33:13 +02:00
dfighter1985
df4446701e Rotation can now be set. 2014-08-03 19:04:34 +02:00
dfighter1985
ca1f00e35a Save the tile border, etc data when saving. 2014-08-03 17:58:02 +02:00
dfighter1985
3823a9a01b Added checks. Yes it's horrible and needs to be refactored. 2014-08-03 04:15:12 +02:00
dfighter1985
b34db5e7da Apply the current zoom factor! 2014-08-01 02:38:04 +02:00
dfighter1985
66c8b95e2d Don't reload the pixmaps every time they are displayed... -.- 2014-08-01 02:34:57 +02:00
dfighter1985
2ddd7e1035 Line endings... 2014-07-31 23:23:52 +02:00
dfighter1985
ab2e54a3c8 When hitting 'save as' ask for a filename even if one is set. 2014-07-30 15:55:09 +02:00
dfighter1985
6386c5aac4 Should store the filename after opening.. 2014-07-30 15:44:02 +02:00
dfighter1985
8ea69d4b81 Should only add 1 tile here... 2014-07-30 15:40:02 +02:00
dfighter1985
677d13c7ab 128 and 256 tiles don't have alpha, so no need to load/save them. 2014-07-30 15:29:50 +02:00
dfighter1985
fadd8fbf89 Replace and delete image should be applied to the correct channel now. 2014-07-30 14:39:19 +02:00
dfighter1985
0750ca7a4d Show the image that belongs to the channel that is selected. 2014-07-30 14:28:17 +02:00
dfighter1985
47a5f95b71 Copyright headers... 2014-07-30 11:20:29 +02:00
dfighter1985
8e3ec659d5 Close the loaded file and return true... 2014-07-30 11:15:14 +02:00
dfighter1985
4a69a4f8b2 Set teh current selection to row 0 2014-07-30 11:14:41 +02:00
dfighter1985
99683c6569 Save and load the tilebank texture path. 2014-07-30 11:10:15 +02:00
dfighter1985
447caab681 Save and load the veget set filename. 2014-07-30 10:58:37 +02:00
dfighter1985
e82ffc9b14 TileBank loading. 2014-07-30 10:54:08 +02:00
dfighter1985
5b2aa71b90 Add the already selected tilesets to the land when editing. 2014-07-30 07:43:02 +02:00
dfighter1985
240844c1cd Connected the oriented combobox and now saving it's value to the tilebank. 2014-07-30 01:50:01 +02:00
dfighter1985
a513af355d Implemented saving of the currently stored tilebank data. 2014-07-30 01:29:17 +02:00
dfighter1985
fed92a47d3 As it turns out, tilesets can be assigned to multiple lands... 2014-07-28 17:05:51 +02:00
dfighter1985
d3698a5c1a Implemented the GUI part of saving... 2014-07-27 20:38:08 +02:00
dfighter1985
2f9b4f1b5e 128x128 tab should be shown by default. 2014-07-27 18:23:25 +02:00
dfighter1985
aef9f58242 Implemented tile image replace. 2014-07-26 02:24:32 +02:00
dfighter1985
2f6faf05c1 Implemented tile image deletion. 2014-07-26 02:19:13 +02:00
dfighter1985
39bde4b257 A little refactoring. 2014-07-26 02:11:02 +02:00
dfighter1985
fe044b8592 Reindex tile item nodes after deleting a node. 2014-07-26 02:05:21 +02:00
dfighter1985
fc4856f28c Implemented tile deletion. 2014-07-26 01:57:50 +02:00
dfighter1985
4d0002a6f4 I must be blind... 2014-07-26 00:32:42 +02:00
dfighter1985
a1b8737776 Implemented Tile addition. 2014-07-26 00:29:37 +02:00
dfighter1985
41f8104f19 Implemented tilebank texture path setting. 2014-07-24 23:41:42 +02:00
dfighter1985
a14a16f935 Implemented choosing / resetting vegetset for tile sets. 2014-07-24 23:31:37 +02:00
dfighter1985
7b13b09e01 When selecting another land, select the first tile set, if it exists. 2014-07-24 18:44:00 +02:00
dfighter1985
8034eac2e0 Connect the selection model so the widgets are updated. 2014-07-24 18:39:34 +02:00
dfighter1985
25dba4695d Each land has it's own TilesetModel now. When changing the land the model also changes. 2014-07-24 18:31:07 +02:00
dfighter1985
c1d6ada9c6 Implemented land name changing. 2014-07-24 16:25:28 +02:00
dfighter1985
c81e70b9b2 Implemented land removal. 2014-07-24 16:20:44 +02:00
dfighter1985
7c1f53994d Implemented land adding. 2014-07-24 16:18:01 +02:00
dfighter1985
f67e5b4e5b Renamed land related widgets. 2014-07-24 16:09:58 +02:00
dfighter1985
347a883d7b Implemented tileset move up and move down. 2014-07-24 02:28:19 +02:00
dfighter1985
764b80b751 Implemented tileset rename. 2014-07-23 21:53:09 +02:00
dfighter1985
acf3f656b2 Implemented tileset removal. 2014-07-23 18:35:26 +02:00
dfighter1985
068a10ea6d Don't try to delete the same items more than once! 2014-07-22 15:38:26 +02:00
dfighter1985
c369f49b8a Don't allow 2 tilesets to have the same name. 2014-07-22 15:35:14 +02:00
dfighter1985
395fafd2fe Update qrc location. 2014-07-22 14:44:31 +02:00
dfighter1985
bfb04d7dda Error message when files can't be opened. 2014-07-21 23:25:35 +02:00
dfighter1985
7c0cd64ae7 Added save and save as items to the context menu. 2014-07-21 23:08:05 +02:00
dfighter1985
d63c78b503 Shouldn't crash when adding a new row. 2014-07-21 17:46:01 +02:00
dfighter1985
741fee935e Mark translated item with green, untranslated ones with red. 2014-07-21 04:11:53 +02:00
dfighter1985
7988a71c98 New context menu options: mark / unmark translated. 2014-07-21 03:51:03 +02:00
dfighter1985
232e830c3c Make sure a correct hash is not used for untranslated strings. 2014-07-21 03:24:18 +02:00
dfighter1985
164eac0eba Save to the right file. 2014-07-20 20:03:16 +02:00
dfighter1985
ad06212de7 Set header text according to the language. 2014-07-20 19:52:23 +02:00
dfighter1985
a51f76d036 Work with translated files, instead of work files. 2014-07-20 17:24:04 +02:00
dfighter1985
b0c916276d Ask for confirmation before deleting a row. 2014-07-19 17:26:59 +02:00
dfighter1985
39c43b03a8 Show insert / delete row in context menu. 2014-07-19 17:23:53 +02:00
dfighter1985
ec89725824 Implemented row deletion / insertion. 2014-07-18 01:52:23 +02:00
dfighter1985
237ac85e9c Use the QWidget modified property instead of the UXTEditor's own. 2014-07-18 01:18:41 +02:00
dfighter1985
b86fce833c Allow only 1 instance of the uxt editor. 2014-07-18 01:08:31 +02:00
dfighter1985
80d0c7c9c6 Added copyright headers to the new files. 2014-07-18 00:53:36 +02:00
dfighter1985
de87aca09d Implemented saving. 2014-07-18 00:50:40 +02:00
dfighter1985
512aa4c867 Apply table changes to the loaded data, and offer to save when closing the changed table. 2014-07-18 00:27:05 +02:00
dfighter1985
1df00cc8b3 Set header texts. 2014-07-17 19:17:02 +02:00
dfighter1985
85f1e37155 UXT Editor widget 2014-07-17 19:08:29 +02:00
dfighter1985
bc50ca150b I don't really know what to write here. 2014-07-16 02:52:17 +02:00
dfighter1985
be977a23b7 Set the undostack so we won't crash... 2014-07-15 21:46:16 +02:00
dfighter1985
19570b735d Initialize the undostack to NULL, so we get a proper crash instead of a dangled pointer crash. 2014-07-15 21:41:11 +02:00
dfighter1985
5a39d59fb9 Fixed another crash. 2014-07-15 20:29:57 +02:00
dfighter1985
b55b0c5e0d 'Fixed' the Mission Compiler crash. 2014-07-15 20:19:53 +02:00
dfighter1985
2a6e5115e1 When changing a property make sure to set default to false, so it's actually saved! 2014-07-15 18:51:06 +02:00
dfighter1985
12d33f1024 Save world editor files. 2014-07-15 01:30:30 +02:00
dfighter1985
cabcff881c Trying to load an invalid world editor file shouldn't crash the application, and an error messagebox should inform the user. 2014-07-13 21:38:14 +02:00
dfighter1985
5f941d812d Apply property changes. 2014-07-12 01:54:45 +02:00
dfighter1985
790ac4524f Block only the propertychanged signal in the const_string_array property manager. 2014-07-12 00:38:35 +02:00
dfighter1985
3b713d152a Store QtProperty, IPrimitive pairs and look the primitive up when the property changes. 2014-07-12 00:01:17 +02:00
dfighter1985
ae120af5b5 Changed property to p, property is a reserved word in VS. 2014-07-11 20:47:24 +02:00
dfighter1985
3dc9d07f59 Use \n instead of ; as a separator. 2014-07-11 20:41:15 +02:00
dfighter1985
b9e12caaef Identation 2014-07-11 20:37:32 +02:00
dfighter1985
77b98d796c Implemented const_string_array editor. 2014-07-11 20:35:05 +02:00
dfighter1985
a4ccf0b86c Workaround related to the unknown statusbar crash. 2014-07-09 23:20:50 +02:00
dfighter1985
f694cfdb8e Copyright banner + line endings... I always mess this up somehow.. 2014-07-09 21:13:57 +02:00
dfighter1985
2ca6c73d09 Texture chooser now supports atlas textures as well. 2014-07-09 21:07:12 +02:00
dfighter1985
559968ba41 Added texture property editor, editor factory, manager. Textures can now be selected using these in the property tree browser. 2014-07-08 18:59:30 +02:00
dfighter1985
3b0b82423f Added action property editor, editor factory, manager. Actions can now be edited using the editor widget in the property tree. 2014-07-08 18:26:20 +02:00
dfighter1985
6f3e230cad Allow TextureChooser's texture selection to be queried. 2014-07-07 19:19:03 +02:00
dfighter1985
c736145c2f CPath can now return the file list with a path filter. 2014-07-06 23:21:25 +02:00
dfighter1985
28807c5eea Make sure to always convert to plain bitmap. 2014-07-05 03:31:21 +02:00
dfighter1985
2a47ce3292 No need to store the loaded image data after passing it to the label. 2014-07-05 03:13:01 +02:00
dfighter1985
95defff448 Prototype of the texture chooser. 2014-07-05 02:55:46 +02:00
dfighter1985
cf2e18143f ActionList dialog can now select an action, and is used with the proc editor. 2014-07-03 00:44:38 +02:00
dfighter1985
668bbc1780 Added facilities for viewing the loaded actions. 2014-07-02 22:27:04 +02:00
dfighter1985
0f489d209c Line endings... 2014-07-02 20:44:46 +02:00
dfighter1985
40805d6526 Changed some property types. 2014-07-01 01:54:55 +02:00
dfighter1985
112f90fbbb Bitmap alignment can now be set as an enum. 2014-07-01 01:51:41 +02:00
dfighter1985
c8c162308d tooltip parent is now changable using an enum. 2014-06-29 02:53:33 +02:00
dfighter1985
5deea1a13b Tooltip posrefs are now enums in the GUI Editor. 2014-06-29 01:44:06 +02:00
dfighter1985
9690392ec6 Forgot the widget settings... 2014-06-27 00:49:31 +02:00
dfighter1985
6dd11d7fad Got rid of a memleak. 2014-06-27 00:47:29 +02:00
dfighter1985
78c83d83b0 The proper enum type is now determined by type not name. 2014-06-27 00:24:31 +02:00
dfighter1985
afd1d96363 text posref is now an enum too. 2014-06-27 00:07:44 +02:00
dfighter1985
762139cc1e Some refactoring. 2014-06-21 22:55:10 +02:00
dfighter1985
87778c86c9 Posref can now be set as an enum, instead of a string in the property editor. 2014-06-21 18:25:14 +02:00
dfighter1985
d506f6bc22 Text justification can now be set using an enum property editor. 2014-06-20 17:07:27 +02:00
dfighter1985
2c900d20e5 A little refactoring 2014-06-20 16:26:10 +02:00
dfighter1985
701b7f29db Button types can now be set using an enum property editor. 2014-06-20 16:22:07 +02:00
dfighter1985
4a8bd7c7c1 Line endings... 2014-06-20 15:09:13 +02:00
dfighter1985
775278d9de As Object Viewer no longer uses the QtOpenGL widget this is not needed. 2014-06-19 18:40:50 +02:00
dfighter1985
8f6fb7ea99 More widgets can use the color picker now. 2014-06-19 17:21:11 +02:00
dfighter1985
03e4c5ccd4 Added color picking support to the GUI Editor. TODO: change all the widget definitions. 2014-06-18 16:48:33 +02:00
dfighter1985
8fb7c1c5f0 Why did I make these public in the first place? 2014-06-18 02:53:39 +02:00
dfighter1985
625dc4cc3e Making master Dnk happy. 2014-06-18 02:51:53 +02:00
dfighter1985
470896d85a Wrong slash... 2014-06-18 02:41:58 +02:00
dfighter1985
c4da612ba6 Crashfix: If the status info widget isn't removed it miraclously crashes the app on shutdown. TODO: investigate why. 2014-06-18 01:20:37 +02:00
dfighter1985
bf16d2addf Unload plugins when killing them. 2014-06-18 01:15:39 +02:00
dfighter1985
bfe1805927 Object Viewer plugin will now use the Nel3DWidget in the Core plugin. 2014-06-16 16:22:52 +02:00
dfighter1985
320a9dd33a Had to move the Nel3DWidget library to the core plugin, because Nel can only be used statically at this point. Which makes using the separate Nel3DWidget library inparctical. 2014-06-16 15:30:35 +02:00
dfighter1985
f28b134fb4 Moved the Nel 3d widget into it's own library. 2014-06-15 22:22:01 +02:00
dfighter1985
b51660f2dd Nel3DWidget is no longer in the GUI Editor namespace. 2014-06-15 19:52:04 +02:00
dfighter1985
324fd79243 Set some windows attributes. 2014-06-15 19:42:41 +02:00
dfighter1985
4f0cae93d2 Activate the driver when getting a show event, and clear the GUI Editor display widget when there's no GUI loaded. 2014-06-15 19:28:57 +02:00
dfighter1985
5d71cdd56d Moved the event listener from the 3d widget to the gui control class. 2014-06-15 19:16:52 +02:00
dfighter1985
29526906c4 Fixed build error that was caused by two widgets having the same filenames. 2014-06-15 18:41:54 +02:00
dfighter1985
1992e17172 Renamed nelgui_widget.* to nelgui_ctrl.* 2014-06-14 19:37:42 +02:00
dfighter1985
7b41b68186 Renamed NelGUIWidget to NelGUICtrl, and changed it's base class from QWidget to QObject. 2014-06-14 18:44:57 +02:00
dfighter1985
2a4af46577 TimerId should be set to 0 when hiding. 2014-06-14 18:32:27 +02:00
dfighter1985
86fe3045cf GUI Editor main window will now send the show/hide events to NelGUIWidget. 2014-06-14 18:31:50 +02:00
dfighter1985
23ad19d0ff Split Nel3DWidget and NelGUIWidget. 2014-06-14 17:28:33 +02:00
dfighter1985
844e93ec65 Rename log menu item. 2014-06-09 18:01:14 +02:00
dfighter1985
6cc76c9670 Updated qrc location. 2014-06-09 17:58:07 +02:00
dfighter1985
6cd1f2c9d3 Move the log trigger menu item into it's own menu, and remove the menu when unloading the plugin. 2014-06-09 17:55:45 +02:00