Marc Zinnschlag
6a5ab34971
Merge branch 'region'
2013-07-14 12:19:02 +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
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
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
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
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
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
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
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
28f2a7d2b4
added missing column for clothing records
2013-05-15 11:37:46 +02:00
Marc Zinnschlag
fce9939f83
added missing columns for armor record
2013-05-14 14:33:34 +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
graffy76
88df3b980f
Implemented UserSettings as a singleton.
2013-05-11 20:55:36 -05:00
Marc Zinnschlag
9426eda47a
small test with statics and two columns
2013-05-11 17:01:16 +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
f6203cac2a
update for master
2013-05-07 20:33:42 -05: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
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
60cc95305d
added basic birthsign table
2013-04-07 20:26:39 +02:00
Marc Zinnschlag
e25f5c6dfe
added basic region table
2013-04-07 16:32:06 +02:00
Marc Zinnschlag
ff1d908af4
added script table
2013-04-07 15:17:35 +02:00
Marc Zinnschlag
8bf569d58a
added basic sound table
2013-04-06 21:21:10 +02:00
Marc Zinnschlag
73da794d77
added basic race table
2013-04-04 14:34:39 +02:00
Marc Zinnschlag
676a92e2e0
moved Verify function from World menu to File menu
2013-04-02 15:47:25 +02:00
Marc Zinnschlag
9d009af2a1
simplified code for sub view factory creation
2013-04-02 15:33:28 +02:00
Marc Zinnschlag
384c88182d
dealing with unset attribute fields
2013-04-02 14:15:22 +02:00
Marc Zinnschlag
c71edb613d
added faction table
2013-04-02 12:00:45 +02:00
Marc Zinnschlag
c7275965b8
added basic class record table
2013-03-25 13:22:06 +01:00
Marc Zinnschlag
10c5f29075
added attribute column to skills
2013-03-24 15:50:29 +01:00
Marc Zinnschlag
0ce962e815
added specialisation column to skill table
2013-03-23 13:13:53 +01:00
Marc Zinnschlag
92f0098911
added new constructors for EnumDelegateFactory
2013-03-23 13:13:34 +01:00
Marc Zinnschlag
fefe061294
added basic support for skills to editor
2013-03-21 14:31:32 +01:00
Marc Zinnschlag
d05508db52
switching editor id tables from QAbstractTableModel to QAbstractItemModel (in preparation for record types like containers)
2013-03-21 10:07:25 +01:00
Marc Zinnschlag
10fad47a81
some cleanup
2013-03-12 14:51:16 +01:00
graffy76
50abb22162
Fix to allow application closing from multiple views and a single view.
2013-03-12 06:28:13 -05:00
graffy76
96b62940b3
Fixes docked subviews becoming tabbed and application closure when
...
closing one of several views.
2013-03-11 06:38:27 -05:00
graffy76
ce91ef36ea
Fix for warnings on close, leaves all views open until a decision is
...
made
2013-03-10 07:49:43 -05:00
graffy76
c17821e6c8
Merge branch 'master' of https://github.com/zinnschlag/openmw into saveOnClose
2013-03-08 20:08:56 -06:00
graffy76
03c7f18112
Fixes for save-on-close message boxes
2013-03-07 17:48:05 -06:00
Pieter van der Kloet
9145fb210b
Merge remote-tracking branch 'upstream/master' into opencsui
2013-03-07 03:02:03 +01:00
Pieter van der Kloet
7504ae675b
Implemented a file dialog for the editor using launcher .ui
2013-03-07 03:00:59 +01:00
Marc Zinnschlag
46de45b9a2
added var type column to globals
2013-03-05 11:37:13 +01:00
Marc Zinnschlag
65081f5520
added variant class
2013-03-04 14:32:23 +01:00
graffy76
6911868f2a
File->close and File->exit menu items added. Exit uses
...
closeAllWindows() to ensure ViewManager::closeRequest is called on the
last open window. Exit will close all open windows but the last one in
cases of active save operation or modified file.
2013-03-03 15:58:26 -06:00
graffy76
eb90bd71ba
Fixed triggering confirmation messages boxes when more than one view is
...
open.
2013-03-02 21:34:55 -06:00
graffy76
bf6c855e6d
Final changes to implement save-on-close features
2013-03-02 12:49:26 -06:00
graffy76
9193ddc9d3
Merge branch 'master' into saveOnClose
2013-03-02 09:24:42 -06:00
graffy76
a2e36594c9
Completed "abort save on close" feature
2013-03-02 09:22:44 -06:00
graffy76
f85be6a744
80% complete save-on-close feature
2013-03-02 07:57:41 -06:00
Marc Zinnschlag
d98ec67671
Merge remote-tracking branch 'graffy76/recentfiles'
2013-02-23 18:53:33 +01:00
graffy76
89dace3cc3
Fix for operations widget - hides when no operations are running.
2013-02-23 09:07:13 -06:00
Marc Zinnschlag
c9ca565462
removed a redundant function call
2013-02-23 12:05:09 +01:00
graffy76
6f89d453a5
Operations widget height fix and abort button feature. Successfully
...
tested resizing of Operations QDockWidget for multiple concurrent
operations.
2013-02-22 21:53:32 -06:00
Marc Zinnschlag
abd307d70e
Issue #567 : workaround for crash with non-English ESX files
2013-02-17 19:26:01 +01:00
Marc Zinnschlag
bb990b96bf
Merge branch 'globaltype' into next
2013-02-17 17:27:41 +01:00
Marc Zinnschlag
50d61a5b6e
proper implementation of gmst type column
2013-02-17 17:27:25 +01:00
Marc Zinnschlag
1fd7d8ed2a
Merge remote-tracking branch 'graffy76/master' into next
2013-02-11 15:35:59 +01:00
graffy76
55dd17c27c
Added setBarColor() function to CSVDoc::Operation. Created four color
...
types for existing operations (save, verify, compile and search), with a
default for future / undefined ops.
2013-02-11 04:30:16 -06:00
Marc Zinnschlag
eb6590f7d8
added delegate factory
2013-02-10 17:21:25 +01:00
Marc Zinnschlag
828695f295
added value column to gmst table
2013-02-08 14:48:38 +01:00
Marc Zinnschlag
d5dd0640c7
basic gmst support
2013-02-08 09:58:19 +01:00
Michal Sciubidlo
347a734364
Move OpenDialog to editor and use it in startup dialogue.
...
Remove debug output from DataFilesList.
2013-02-05 22:06:36 +01:00
Michal Sciubidlo
f7e5ea24f4
Merge branch 'startup' into cs_load.
...
Fix include in textinputdialog.cpp.
2013-02-05 21:23:49 +01:00
Michal Sciubidlo
66ec4ca7d9
Split launcher specific code from DataFilesList back to DataFilesPage.
2013-02-04 22:14:14 +01:00
