scrawl
adc8e0b93e
Merge branch 'smbas-master'
2015-06-02 14:35:45 +02:00
Stanislav Bas
959fe3eb87
Reset the scrollbar position in the topic list when DialogueWindow is closed
2015-06-01 23:49:40 +03:00
Marc Zinnschlag
b866e11873
Merge remote-tracking branch 'cc9cii/pathgrid-check-extra'
2015-06-01 16:49:28 +02:00
Stanislav Bas
5dc6cdeb99
Scroll to the top of the topic list when dialog is started
2015-06-01 01:14:11 +03:00
Marc Zinnschlag
9f0ccdc37a
Merge remote-tracking branch 'scrawl/master'
2015-05-31 11:05:43 +02:00
scrawl
7f2dd21c66
Fix for StartScript regression ( Fixes #2590 )
2015-05-30 17:20:49 +02:00
cc9cii
c4aa3d3ee3
Revert user preference setting checks until a thread safe method is worked out. The OSX namespace issue is retained.
2015-05-30 21:12:47 +10:00
Marc Zinnschlag
88d5aed62d
removed code that interfered with the default window size on Linux ( Fixes #2568 )
2015-05-30 12:05:35 +02:00
Marc Zinnschlag
d7cd4203ad
Merge remote-tracking branch 'k1ll/mingw'
2015-05-30 11:39:53 +02:00
cc9cii
01eba7b721
Extra check for thread affinity.
2015-05-30 19:17:42 +10:00
cc9cii
76196d815d
Update user preference setting value via an event message queue.
2015-05-30 18:58:33 +10:00
Marc Zinnschlag
17747a2dd9
Merge remote-tracking branch 'cc9cii/highlight-colours'
2015-05-30 10:23:27 +02:00
cc9cii
0aaac59cc3
Return to startup dialog when the open/create action is cancelled. Should resolve Bug #2588 .
2015-05-30 08:37:58 +10:00
cc9cii
9cbda0ffad
Allow users to select syntax highlighting colours. Should resolve Feature #2507 .
2015-05-29 22:20:43 +10:00
cc9cii
393cee406f
Use signals for user preference setting updates.
2015-05-29 19:28:25 +10:00
cc9cii
734e52d1c8
Move the user preference check to the preparation step before the running of the operation.
2015-05-29 06:40:40 +10:00
cc9cii
9ad69d9085
Allow wheel events in dialogue spin box types only when they have focus. Should resolve Feature #2585 .
2015-05-29 05:44:35 +10:00
cc9cii
6821cb4133
Use the tree model rather than a nested proxy for the dialogue only listing (i.e. non table) items. Should resolve Bug #2586 .
...
- QDataWidgetMapper requires the rootindex to be set, which was not possible with the nested proxy model.
2015-05-29 05:40:20 +10:00
cc9cii
00c165d3a5
Add user preference option to check unused or redundant pathgrid points. Also resolve namespace clash issue in osx.
2015-05-28 08:44:17 +10:00
Marc Zinnschlag
b6878c2e0c
improved error handling in LocalScripts::add
2015-05-27 19:45:26 +02:00
Marc Zinnschlag
baaf801521
Merge remote-tracking branch 'cc9cii/loadcell-fix'
2015-05-27 19:31:25 +02:00
cc9cii
674a124bc6
Don't use local type as a template parameter.
2015-05-27 22:27:32 +10:00
cc9cii
3a31468af0
Pathgrid record verifier. Feature #2000 .
2015-05-27 22:12:11 +10:00
cc9cii
6966555377
Object verifier check to see if the script used by that object actually exists. Should resolve Bug #2582 .
2015-05-27 15:55:00 +10:00
cc9cii
b7044ac119
Fix crash loading some addon files. Should resolve Bug #2583 .
...
- This may be a bug within QSortFilterProxyModel
- It isn't 100% clear what aspects of these addon files cause the issue, but something about them causes Qt to lose track of its internal row numbers.
2015-05-27 10:27:57 +10:00
scrawl
2f97649540
Fix for cleanup issue when exiting after a failed savegame load ( Fixes #2580 )
2015-05-27 00:30:39 +02:00
Marc Zinnschlag
99dbd82a44
Merge remote-tracking branch 'cc9cii/fix-dialogue-subview-crash'
2015-05-26 14:37:50 +02:00
Marc Zinnschlag
ae1a606876
Merge remote-tracking branch 'cc9cii/selective-refresh'
2015-05-26 14:32:03 +02:00
cc9cii
f06ddd47c4
Return the correct range for a given topic. Should resolve Bug #2569 .
2015-05-26 17:38:22 +10:00
cc9cii
aafcaf32c5
Qualify the scope of Flag_Dialogue. (another one)
2015-05-26 16:12:54 +10:00
cc9cii
2f29c2c077
Qualify the scope of Flag_Dialogue.
2015-05-26 13:58:58 +10:00
cc9cii
ec808843c3
Do not rebuild the dialogue subview unless required. Should resolve Bug #2581 .
...
The loss of focus was caused by each text change (i.e. character entry) to a QPlainTextEdit resulting in dataChanged() signal which in turn rebuilt the dialogue subview. Changes in this commit include:
- Do not send signal to update entire row if only a single item has changed.
- Do not rebuild the dialogue subview unless the data item that triggers a conditional display is changed.
- Add column flags to indicate whether the data in this column should rebuild the dialogue subview.
- Return the correct flags for nested columns
- Disable, rather than grey out, checkbox that does not apply to creature levelled list
2015-05-26 13:35:10 +10:00
cc9cii
95f740ec40
Give CSVWorld::EditWidget::mMainWidget a chance to clean up its children. Should resolve Bug #2578 .
2015-05-25 22:28:41 +10:00
Marc Zinnschlag
5f41ef4809
Merge remote-tracking branch 'cc9cii/master'
2015-05-25 11:10:17 +02:00
cc9cii
3c82e6d034
Retrieve the correct index for the type of record being un-deleted.
2015-05-25 16:36:42 +10:00
cc9cii
e6d2821b78
Refresh table filters when the model is updated. Should resolve Bug #2579 .
2015-05-25 09:15:07 +10:00
Marc Zinnschlag
6402b82823
Merge remote-tracking branch 'cc9cii/master'
2015-05-24 21:15:36 +02:00
Marc Zinnschlag
07ce7b95cf
Merge remote-tracking branch 'cc9cii/npc-additional-data'
2015-05-24 21:15:26 +02:00
cc9cii
22420c3a83
Close DialogueSubView if the corresponding record is deleted. Should resolve Bug #2575 .
...
- ToDo: Doesn't seem to shrink the widget width properly (when horizontal scrollbar is active)
2015-05-24 23:19:06 +10:00
cc9cii
c721e340d8
Merge branch 'master' into npc-additional-data
...
Conflicts:
apps/opencs/view/world/dialoguesubview.cpp
2015-05-24 19:24:27 +10:00
cc9cii
21af1913e1
Ensure ColumnId names are unique.
2015-05-24 19:18:54 +10:00
Marc Zinnschlag
53b4c15d85
Merge remote-tracking branch 'smbas/master'
2015-05-23 16:02:09 +02:00
Marc Zinnschlag
913caf96bd
Merge branch 'openmw-36'
2015-05-23 09:46:54 +02:00
Marc Zinnschlag
b58b7a89ed
Merge remote-tracking branch 'rohit-n/reorder2'
2015-05-23 09:19:03 +02:00
Stanislav Bas
a5183aefbe
Add record state tracking to the ModifyCommand ( Fix #2555 )
2015-05-22 23:53:25 +03:00
scrawl
d1b6289cad
Don't teleport followers when using teleportation spells
2015-05-22 19:57:02 +02:00
Rohit Nirmal
396fba7fa9
Silence -Wreorder warnings, and remove -Wno-reorder.
2015-05-21 22:46:44 -05:00
Stanislav Bas
d27b92e9f1
Avoid gaps between local indexes in RefIdData after removal of records ( Fix #2545 )
2015-05-22 00:57:47 +03:00
cc9cii
aecd9a275e
Remove debugging comments.
2015-05-22 06:09:55 +10:00
cc9cii
2fc964ca73
Grey out disabled entries rather than hiding them.
2015-05-21 13:11:07 +10:00
