Marc Zinnschlag
76b9d3dbc1
columns are now identified via an enum instead the name string
2013-08-07 09:36:05 +02:00
Marc Zinnschlag
d2f96deb98
renamed columns.hpp to columimp.hpp
2013-08-02 10:42:52 +02:00
Marc Zinnschlag
adb05737ee
Merge branch 'master' into filter
...
Conflicts:
apps/opencs/model/world/universalid.cpp
apps/opencs/view/doc/view.cpp
apps/opencs/view/world/subviews.cpp
2013-07-30 15:55:50 +02:00
Marc Zinnschlag
434f97c95c
fixed two missing icons
2013-07-30 12:55:02 +02:00
Marc Zinnschlag
102700a498
added specialised Creator for references
2013-07-30 12:53:03 +02:00
Marc Zinnschlag
57be764cce
added specialised Creator for referenceable records
2013-07-30 12:34:18 +02:00
Marc Zinnschlag
34c825ce52
added icons and type listing to UniversalId class
2013-07-29 16:21:42 +02:00
Marc Zinnschlag
661b290c49
automatically scroll table to the position of a newly created record
2013-07-29 15:00:41 +02:00
Marc Zinnschlag
82958e6514
added custom creator for cell records
2013-07-28 18:08:57 +02:00
Marc Zinnschlag
899e18b2cf
report ID errors also via input field tool tips
2013-07-28 15:28:35 +02:00
Marc Zinnschlag
5ec9d370cb
check if ID is already in use when creating new IDs
2013-07-28 15:27:15 +02:00
Marc Zinnschlag
124a70906f
added creator edit lock
2013-07-28 14:51:47 +02:00
Marc Zinnschlag
32c697abc6
validate IDs entered by the user
2013-07-28 14:40:11 +02:00
Marc Zinnschlag
4f6e99c391
more compact layout for the bottom box
2013-07-28 14:00:26 +02:00
Marc Zinnschlag
00fcb79f08
moved record creation to GenericCreator class (now taking ID from user instead of using a procedurally generated one)
2013-07-28 13:43:16 +02:00
Marc Zinnschlag
2d46a1db2f
changed CreateCommand to work directly on the model instead of the proxy
2013-07-28 13:39:33 +02:00
Marc Zinnschlag
f93af52486
handling down a reference to Data and the undo stack to the creators
2013-07-27 13:28:12 +02:00
Marc Zinnschlag
fee748d4b5
added creator bar UI and cancel button
2013-07-26 21:09:23 +02:00
Marc Zinnschlag
b8ac45defe
added creator to bottom box layout and re-routed add record event to bottom box
2013-07-26 18:22:31 +02:00
Marc Zinnschlag
d899cbb449
removed some junk
2013-07-26 18:14:34 +02:00
Marc Zinnschlag
ed83e2e70a
added creator to bottom box; more cleanup
2013-07-26 12:51:45 +02:00
Marc Zinnschlag
6c4bdc0101
minor cleanup; less pointer usage
2013-07-26 12:42:15 +02:00
Marc Zinnschlag
ba5ca5beed
replaced createAndDelete flag with a new class hierarhy (Creator)
2013-07-26 12:35:17 +02:00
Marc Zinnschlag
4327b81bc3
fixed column handling in table (had problems with filtered out columns before)
2013-07-25 14:38:53 +02:00
Marc Zinnschlag
55e7e71c11
added optional per-subview status bar
2013-07-25 14:29:56 +02:00
Marc Zinnschlag
a80e80dd94
added layout to table sub view
2013-07-23 21:59:02 +02:00
Marc Zinnschlag
7600d6c04b
basic filter table
2013-07-22 21:18:47 +02:00
Marc Zinnschlag
66534a45da
replaced double click in table with a context menu item (edit) because double click was interfering with basic table functionality
2013-07-21 17:53:39 +02:00
Marc Zinnschlag
0fad2e7f40
restructured main menu
2013-07-20 13:46:56 +02:00
Marc Zinnschlag
2497c18702
replaced settings change notifications for columns with a more robust implementation
2013-07-20 13:19:27 +02:00
Marc Zinnschlag
365ea11e86
Merge remote-tracking branch 'graffy76/RefIdTypeDelegate'
2013-07-18 13:51:24 +02:00
graffy76
0ae254f6a8
Fixed segfault opening tables
2013-07-18 06:31:47 -05:00
graffy76
6486f342b5
Fixed setting synchronization issue
...
Moved default settings to CSMSettings::UserSettings.
Other minor code changes / cleanup
2013-07-17 20:19:01 -05:00
Marc Zinnschlag
47f7bbd48a
fixed OpenCS crash during cell loading when loading multiple ESX files
2013-07-16 12:08:35 +02:00
Marc Zinnschlag
6a5ab34971
Merge branch 'region'
2013-07-14 12:19:02 +02:00
Marc Zinnschlag
4cce466dc7
inverted region map y-axis
2013-07-13 16:34:10 +02:00
Marc Zinnschlag
c26a6f884f
added region map tooltips
2013-07-12 12:55:14 +02:00
greye
29b7734b52
add qualifiers for names in templates to make gcc 4.7+ happy
2013-07-12 08:33:02 +04:00
Marc Zinnschlag
c808bf2b23
updating region map on changes to region and cell records
2013-07-11 15:05:28 +02:00
Marc Zinnschlag
b17f383c6d
Merge remote-tracking branch 'graffy76/RefIdTypeDelegate'
...
Conflicts:
apps/opencs/view/world/table.cpp
2013-07-11 09:09:52 +02:00
graffy76
11178cc470
Repo permissions commit fix #3
2013-07-10 21:44:25 -05:00
graffy76
bb049806df
Repo permissions commit fix #2
2013-07-10 21:13:59 -05:00
graffy76
ae4e3181d9
Fixing repo permissions commit #1
2013-07-10 17:29:07 -05:00
Marc Zinnschlag
d389b70ec4
added missing case folding
2013-07-09 14:22:58 +02:00
Marc Zinnschlag
121978a69e
some cleanup; added handling of deleted cells (now displayed instead of ignored)
2013-07-09 14:20:28 +02:00
Marc Zinnschlag
116320cc0d
dealing with invalid regions and cells without regions
2013-07-08 17:13:58 +02:00
Marc Zinnschlag
6159724b04
build region map from records (only initial build; updates not implemented yet)
2013-07-08 16:53:08 +02:00
Marc Zinnschlag
4f05f2bddf
basic region map; non-interactive for now and working with dummy data instead of real cell/region records
2013-07-08 13:12:50 +02:00
Marc Zinnschlag
de5898c953
post merge fixes
2013-07-06 18:34:14 +02:00
Marc Zinnschlag
4986b7d65d
Merge branch 'master' into ref
2013-07-06 17:54:19 +02:00
Marc Zinnschlag
1c4b70805b
added missing reference table columns
2013-07-06 17:41:06 +02:00
Marc Zinnschlag
9a39f32c32
store ID of cell in reference struct
2013-07-06 17:06:06 +02:00
Marc Zinnschlag
9a49125281
added references table
2013-07-06 17:03:18 +02:00
graffy76
9f6d250463
QDebug reference removal
2013-07-01 07:40:47 -05:00
graffy76
55b115935a
Implemented RefRecordTypeDelegate
...
Added accessor functions to CSMWorld::UniversalId for static const
sIdArg[]
2013-06-30 07:43:58 -05:00
graffy76
9d95a38934
Implementing delegate for referenceables table Type column
...
Added delegate skeleton class
Added delegate creation code in ViewManager
Added Display_RefRecordType enum to columnbase.hpp
Changed Type column'sDisplay type to Display_RefRecordType in
refidcollection.cpp
modified OpenCS CMakeLists.txt to incorporate RefRecordTypeDelegate
class
2013-06-29 08:54:32 -05:00
Marc Zinnschlag
afb120d5ce
Merge remote-tracking branch 'graffy76/recordStatusDelegate'
2013-06-27 08:11:27 +02:00
graffy76
6deddf7229
Fixed code conventions in user settings, changed top-level page names
2013-06-26 21:18:21 -05:00
Marc Zinnschlag
8ffea60b72
some cleanup
2013-06-26 10:09:26 +02:00
Marc Zinnschlag
12cfe1fdfe
Merge remote-tracking branch 'graffy76/recordStatusDelegate'
2013-06-26 09:48:51 +02:00
graffy76
f0f895ad10
Fixed settings file error message
...
Errors only occur if both global and local settings files are not found.
All other file read errors fail silently.
2013-06-25 19:32:36 -05:00
Marc Zinnschlag
99508a6eaa
minor cleanup
2013-06-23 22:52:02 +02:00
mckibbenta
5803726233
modified gmst addition during creation of new base file
2013-06-23 15:19:08 -04:00
mckibbenta
16a27e28f7
inluded gmsts with default values to creation of new base files
2013-06-22 21:01:27 -04:00
graffy76
62e164b2aa
Fixed load file error if no file is found
2013-06-22 07:43:28 -05:00
graffy76
a73b97d125
Fixed broken references and other bugs
...
Removed references to CSVSettings::SamplePage class
Removed multiple QDebug references
Fixed custom LineEdits (window size user pref) would not accept data
2013-06-21 23:23:43 -05:00
graffy76
b3d185e421
Unsaved changes missed in previous commits
2013-06-20 18:08:53 -05:00
graffy76
f4a2cf64c2
Removed CSVSettings::SamplePage class files
2013-06-20 18:07:34 -05:00
graffy76
101c147217
Final changes for record status icon feature, incl. window size user
...
preference
1. Included updated status icons, added base.png
2. Added doxygen comments CSV / CSM Settings classes
3. Implemented Glorf's code for window size preference
4. Minor changes code that searches maps in CSV / CSM Settings classes
5. Removed CSVSettings::SamplePage class
6. Other minor code maintenance / improvements
2013-06-20 18:06:25 -05:00
Marc Zinnschlag
94ec05c2c6
Revert "simplifying CSMWorld::CellRef"
...
With the refactored collection class we can now handle the more complex load function
This reverts commit 97f421df8a
2013-06-18 11:27:05 +02:00
Marc Zinnschlag
5b3d2f5da1
gave Collection class its own header file and removed an unsed cpp file
2013-06-17 14:28:09 +02:00
Marc Zinnschlag
8f167a603c
split IdCollection into Collection and IdCollection class
2013-06-17 14:16:26 +02:00
Marc Zinnschlag
4b2d920f9d
rewrote IdCollection::load (not using private members of IdCollection anymore)
2013-06-17 13:49:32 +02:00
graffy76
f87eb67968
Fixed conflicts
...
Merge branch 'cs-windows' of https://github.com/Glorf/openmw
Conflicts:
apps/opencs/model/settings/usersettings.cpp
apps/opencs/model/settings/usersettings.hpp
apps/opencs/view/settings/usersettingsdialog.cpp
2013-06-17 06:45:44 -05:00
Marc Zinnschlag
2968b96882
added a bit more documentation
2013-06-17 13:03:32 +02:00
Marc Zinnschlag
f4e7916ec4
moved IdCollection base into its own source file pair and renamed it to Collection
2013-06-17 11:42:02 +02:00
graffy76
700d55f1fb
Fixed / implemented missing features for RecordStatusDelegate
...
Implemented updating editor application from preferences menu, loading
settings when editor loads, adding Record Status Display prefernce.
Fixed multiple bugs, made changes to CSM(V)Settings classes to make
implementing new prefrences easier.
Rewrote CSMSettings::UserSettings to retain last-loaded settings.
Adjusted icon position in Record Status column
Capitalized status text
Added delegate to referenceables table
2013-06-15 06:40:18 -05:00
Glorf
548f4d683f
Globalization of user settings
2013-06-12 12:36:35 +02:00
Glorf
10165d3c6b
Feature #468
2013-06-09 00:34:27 +02:00
Marc Zinnschlag
97f421df8a
simplifying CSMWorld::CellRef
2013-06-08 15:50:36 +02:00
Marc Zinnschlag
1e60ad3cd6
Promoted references to a top level record internally.
...
Note: This does not change the structure of the ESX format.
2013-06-08 12:45:13 +02:00
graffy76
1d93cf09bc
Cell formatting and code optimization changes
2013-05-29 21:55:19 -05:00
graffy76
35fb9b669a
Final details implemented
...
Png icons, alignments fixed.
2013-05-29 06:38:35 -05:00
Marc Zinnschlag
6d0b8f7bc8
added missing include
2013-05-22 10:14:12 +02:00
Marc Zinnschlag
c626e2b257
Merge branch 'ref'
...
Conflicts:
apps/opencs/view/doc/view.hpp
2013-05-19 14:59:01 +02:00
Marc Zinnschlag
ca33d66ed9
added missing columns for weapon records
2013-05-19 14:44:41 +02:00
Marc Zinnschlag
2123900db5
added missing columns for NPC records
2013-05-19 13:53:47 +02:00
Marc Zinnschlag
8d78bea4aa
added missing column for misc record
2013-05-18 18:55:23 +02:00
Marc Zinnschlag
862e568f9b
added missing columns for Light record
2013-05-18 18:46:41 +02:00
Marc Zinnschlag
749fd418b5
added missing columns for door record
2013-05-17 15:10:41 +02:00
Marc Zinnschlag
f8c675a638
Merge remote-tracking branch 'graffy76/usersettings'
2013-05-17 10:24:52 +02:00
graffy76
3ce35e691c
Commented out sample editor settings page
2013-05-16 20:43:05 -05:00
Glorf
19ce233667
Workaround for MOC compiler problem
2013-05-16 19:46:04 +02:00
Marc Zinnschlag
54f56b0515
Merge remote-tracking branch 'graffy76/usersettings'
...
Conflicts:
apps/opencs/view/doc/view.cpp
apps/opencs/view/doc/view.hpp
2013-05-16 18:04:55 +02:00
graffy76
13242c2bd5
Eliminated code centering the initial view in the middle of the screen
2013-05-16 10:14:13 -05:00
Marc Zinnschlag
889a87982e
added missing columns for creatures
2013-05-16 16:27:33 +02:00
Marc Zinnschlag
d794a62d19
added missing columns for container record
2013-05-15 17:02:34 +02:00
Marc Zinnschlag
28f2a7d2b4
added missing column for clothing records
2013-05-15 11:37:46 +02:00
Marc Zinnschlag
eba9d3e3ee
added missing columns for book record
2013-05-14 14:40:06 +02:00
Marc Zinnschlag
fce9939f83
added missing columns for armor record
2013-05-14 14:33:34 +02:00
Marc Zinnschlag
7c57f2c221
added AI-related actor columns
2013-05-14 13:20:59 +02:00
Marc Zinnschlag
74d791e207
fixed auto calc column
2013-05-13 14:07:31 +02:00
Marc Zinnschlag
897e55391d
added columns for tool IDs
2013-05-13 13:36:24 +02:00
Marc Zinnschlag
52d81dc9fa
added columns for enchantments
2013-05-13 13:11:43 +02:00
Marc Zinnschlag
90bae2bead
do not create editors for unused columns
2013-05-13 12:55:28 +02:00
Marc Zinnschlag
929b38ff6a
added missing columns for apparati records
2013-05-13 12:51:27 +02:00
graffy76
c71d921f09
Moved signalUpdateEditorSettings from UserSettingsDialog to
...
UserSettings.
UserSettings is now derived from QObject.
2013-05-12 15:15:57 -05:00
graffy76
144be59735
Changed enum names to match OpenMW naming conventions
2013-05-12 14:28:36 -05:00
Marc Zinnschlag
7fd277b87a
added missing column for potions
2013-05-12 15:50:29 +02:00
graffy76
88df3b980f
Implemented UserSettings as a singleton.
2013-05-11 20:55:36 -05:00
Marc Zinnschlag
da92921387
added columns related to items in inventories
2013-05-11 19:21:16 +02:00
Marc Zinnschlag
ee2bc94698
added script column
2013-05-11 18:57:23 +02:00
Marc Zinnschlag
e24ecfd5d2
added name column
2013-05-11 18:43:16 +02:00
Marc Zinnschlag
318ebe0cb6
added model column
2013-05-11 18:35:48 +02:00
Marc Zinnschlag
8ef2d04007
added type column
2013-05-11 17:49:38 +02:00
Marc Zinnschlag
c22f773f72
load all types of referenceable IDs
2013-05-11 17:45:28 +02:00
Marc Zinnschlag
d715cf5431
replaced static adapter with a template
2013-05-11 17:34:18 +02:00
Marc Zinnschlag
9426eda47a
small test with statics and two columns
2013-05-11 17:01:16 +02:00
Marc Zinnschlag
02ace69511
fixed RefID search
2013-05-11 16:55:10 +02:00
graffy76
d0b23a4786
Relocated "User Settings" to Edit->Preferences
...
Removed <QDebug> reference from view.hpp
2013-05-11 07:40:10 -05:00
graffy76
a8b45e0a13
Three primary changes:
...
1. Declared QStringPair::isEmpty() const
2. Split the CsSettings namespace into two: CSMSettings and
CSVSettings. (Required splitting the support.hpp file)
3. Declared several classes as _noqt in CMakeLists.txt for OpenCS
2013-05-11 05:55:46 -05:00
graffy76
8d0f350446
New file structure separating view classes from model classes. Deleted
...
.ui file.
2013-05-10 10:00:58 -05:00
graffy76
cb9c82324c
UserSettings system
2013-05-07 20:36:34 -05:00
graffy76
f6203cac2a
update for master
2013-05-07 20:33:42 -05:00
Marc Zinnschlag
0f29ab8cf9
fixed the interface of the adapter class
2013-05-07 14:19:02 +02:00
Marc Zinnschlag
f7f56a1a1f
added a RefIdCollection to Data
2013-05-07 11:23:18 +02:00
Marc Zinnschlag
e9f1aac7bd
added data structures for referenceable records
2013-05-06 14:11:55 +02:00
Marc Zinnschlag
13e7abd7df
added assign function to Record class
2013-05-03 12:52:45 +02:00
Marc Zinnschlag
1b84aeb5b9
fixed a problem with editing records that do not exist in base
2013-05-02 14:30:39 +02:00
Marc Zinnschlag
f8a331f173
fixed a bad cast
2013-05-01 16:49:34 +02:00
Marc Zinnschlag
236751ec45
some IdCollection and IdTable cleanup
2013-04-29 17:52:01 +02:00
Marc Zinnschlag
e7bf1d230c
fixed an indexing problem in IdCollection
2013-04-27 16:22:04 +02:00
Marc Zinnschlag
a17d17c191
added additional type argument to IdCollection::load
2013-04-23 11:22:07 +02:00
Marc Zinnschlag
808718d967
added referenceable record types to UniversalId
2013-04-23 11:21:21 +02:00
Marc Zinnschlag
afe7b3c64c
added additional type argument to IdCollection::appendBlankRecord
2013-04-23 10:56:55 +02:00
Marc Zinnschlag
518cb0e3b7
added another abstraction layer to ID access in IdCollection
2013-04-16 12:12:04 +02:00
Marc Zinnschlag
b2b953d2a8
added region column to cell table
2013-04-14 19:34:55 +02:00
Marc Zinnschlag
71148121a2
added flag columns to cell table
2013-04-14 17:10:37 +02:00
Marc Zinnschlag
0c33dd86d5
added basic cell table
2013-04-14 17:04:55 +02:00
Marc Zinnschlag
f17cebde0a
syntax colouring for comments
2013-04-11 10:50:35 +02:00
Marc Zinnschlag
74145410f2
basic syntax highlighting in script subview
2013-04-10 22:49:22 +02:00
Marc Zinnschlag
3a87b12baf
delete script subview on script deletion
2013-04-10 21:31:14 +02:00
Marc Zinnschlag
d61ec1063e
added script editor
2013-04-10 20:14:10 +02:00
Marc Zinnschlag
cd33f40c8f
re-enabled opening of record subviews via double click in table
2013-04-09 14:28:31 +02:00
Marc Zinnschlag
be4a01bdb4
added missing recrod type columns
2013-04-09 14:27:32 +02:00
Marc Zinnschlag
40bb772e34
added verifier for spell record
2013-04-09 12:44:49 +02:00
Marc Zinnschlag
ae0a7d5bcd
added cost and type columns to spell table
2013-04-09 11:53:47 +02:00
Marc Zinnschlag
ec6dff38b1
added basic spell table
2013-04-09 11:40:36 +02:00
Marc Zinnschlag
43a5013690
added verifier for birthsign record
2013-04-07 23:25:35 +02:00
Marc Zinnschlag
baf8eaecb8
added texture column to birthsign table
2013-04-07 20:46:04 +02:00
