1
0
Fork 0
mirror of https://github.com/OpenMW/openmw.git synced 2025-01-22 11:23:52 +00:00
Commit graph

211 commits

Author SHA1 Message Date
Marc Zinnschlag
8d22d26669 Merge remote-tracking branch 'cc9cii/scrollbar-fix' 2015-06-10 18:51:14 +02: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
cc9cii
ce421b230b Move scrollbar to newly opened subview. Should resolve Bug #2576. 2015-05-29 14:07:41 +10:00
Marc Zinnschlag
5176e3d84b Merge remote-tracking branch 'cc9cii/mainwindow-scrollbar' 2015-05-18 16:46:03 +02:00
cc9cii
cfcfb17320 Updates to optional horizontal scrollbar.
- move SizeHintWidget out to separate files
- remove redundant logic in view.cpp
- remove sizehint from dialogue subview
- add tooltip hints in user preferences
2015-05-18 07:12:02 +10:00
Marc Zinnschlag
93c3bb3716 fixed subview-closing related crash (Fixes #2564) 2015-05-17 14:27:17 +02:00
cc9cii
e9ca022162 Add an optional horizontal scrollbar to the main view window. Should resolve Feature #2549.
- TableSubviews and DialogueSubviews now provide size hints
- Option to stop the growth of the window at the screen boundary for multi-monitor setup with different resolution.
- Three options:
  Grow Only: No change to current, except the use of size hints
  Scrollbar Only: Simple addition of a scrollbar, the view window does not grow
  Grow then Scroll: Window grows as per current behaviour. The scrollbar appears once it cannot grow any further.
2015-05-17 20:45:13 +10:00
Marc Zinnschlag
048d7be87c Adjusted terminology for references/referenceables in OpenMW-CS user-interface (Fixes #2516) 2015-05-03 16:35:10 +02:00
cc9cii
f326b14604 Allow Qt to cleanup its signals. 2015-04-21 10:25:19 +10:00
cc9cii
47d5eac290 Merge branch 'master' into NonTableFields
Conflicts:
	apps/opencs/model/world/columnbase.cpp
	apps/opencs/model/world/columnbase.hpp
	apps/opencs/model/world/idtable.hpp
2015-04-17 12:37:34 +10:00
Marc Zinnschlag
38ce074a62 Merge branch 'replace' 2015-04-16 20:11:25 +02:00
cc9cii
7990fab708 Fix crash when exiting via window manager on some systems. 2015-04-10 18:09:33 +10:00
Marc Zinnschlag
23cf859fee added search stages (cell table only for now) 2015-03-27 16:33:54 +01:00
Marc Zinnschlag
413b35de6c moved search menu item from view to edit 2015-03-19 21:03:24 +01:00
Marc Zinnschlag
d053c62032 setting up global search operation and subview 2015-03-17 12:30:47 +01:00
scrawl
19e8280f45 OpenCS window title unicode fixes 2015-03-16 15:45:41 +01:00
scrawl
6ff2523d8a Fix for line focus when clicking on a verifier script error
- setFocus() on the script editor, otherwise setting the text cursor has no effect.
- setFocus() must be done after the widgets are created/shown, or the newly created widgets will "steal" the focus again.
- Missing useHint in case subviews are reused.
2015-03-16 03:07:37 +01:00
Marc Zinnschlag
a148b851c0 added start script table 2015-03-03 14:32:12 +01:00
scrawl
b39cc0c8c8 Fix OpenCS window opening issue when config file doesn't exist
It would attempt to create a zero-sized window (or even negative-sized, after subtracting the frame dimensions).
2015-01-15 02:49:54 +01:00
cc9cii
2720e5ea9d Remove PhysicsManager singleton and use shared_ptr instead. Resolves the issue where sometimes destructors were called in an unexpected sequence resulting in a crash while exiting the application. 2014-12-01 06:44:12 +11:00
cc9cii
911839bb91 Simplify detecting whether a universal id represents a referenceable type. 2014-11-21 06:48:42 +11:00
cc9cii
ede1b97b46 Check the type of universal id before getting its id. Should resolve bug #2137 2014-11-19 18:10:29 +10:00
cc9cii
b328aa1fb9 Multiple document support. 2014-11-01 18:57:39 +11:00
cc9cii
057982b1f8 Fix Subview interface clutter by keeping a map of Scenewidgets. 2014-11-01 08:29:08 +11:00
cc9cii
fbadaf55ee Multiple SceneManagers per physics engine now working. 2014-10-31 21:50:57 +11:00
Marc Zinnschlag
e604fcf282 Merge branch 'double' 2014-10-27 09:56:52 +01:00
Marc Zinnschlag
6f4b753750 replaced regular function call from SubView to View with signal-slot-connection 2014-10-27 09:51:55 +01:00
Marc Zinnschlag
1aef9304e9 replaced the signal/slot user settings update with a regular function call 2014-10-27 09:44:18 +01:00
Marc Zinnschlag
275bf854ed added new user setting: window/hide-subview (hide subview titlebar if there is only one subview in the window) 2014-10-27 08:57:18 +01:00
cc9cii
95683bc8c3 Add user interface for top level window status-bar setting (implementation already existed). For feature #854. 2014-10-26 15:04:52 +10:00
Marc Zinnschlag
aad13e6bff close view when closing last sub-view unless this view is the last view 2014-10-25 18:13:56 +02:00
Marc Zinnschlag
4b921c3876 user settings cleanup 2014-10-17 13:49:33 +02:00
Marc Zinnschlag
21b16f8425 Merge branch 'tables'
Conflicts:
	apps/opencs/CMakeLists.txt
	apps/opencs/model/world/data.cpp
	apps/opencs/model/world/data.hpp
2014-10-10 16:11:54 +02:00
cc9cii
115841d31d Do not save window size on exit. 2014-10-03 05:59:24 +10:00
Marc Zinnschlag
00073694c6 added pathgrid subview 2014-10-02 15:16:19 +02:00
cc9cii
517a797a3e Remove seemingly unnecessary clearFocus() call (thanks scrawl for help). Fix saving window size on linux. 2014-10-02 07:00:15 +10:00
cc9cii
a25cffc242 Fixed default value not being set for spinbox. Changed the default value of max subviews to 256. Simplified the call signature to get settings & set an initial value. Fixed missing settings for num_lights. 2014-09-28 10:17:54 +10:00
Marc Zinnschlag
23fd314294 added magic effects table 2014-09-26 13:12:17 +02:00
cc9cii
61bab6b1f1 Sanitised version. Some settings are only accessible via manually editing the config file. 2014-09-25 08:15:07 +10:00
cc9cii
66852d5392 Code cleanup and revert incorrect settings. 2014-09-24 22:41:49 +10:00
cc9cii
fdf375fb4d Reusing subviews implemented. 2014-09-24 13:49:19 +10:00
Marc Zinnschlag
7ab4881661 added sound gen table 2014-09-23 13:21:54 +02:00
cc9cii
d41230a0c5 Tweak the look of the recordfilterbox. Keep titlebar if floating. 2014-09-23 20:51:14 +10:00
cc9cii
ffae816aab Max subviews setting working. However there is no way to remove the last subview once the title bar is removed and the look of the filter box is broken without the title bar. 2014-09-23 17:01:08 +10:00
cc9cii
437fb774c5 Re-implemented subview minimum size setting. 2014-09-23 07:16:07 +10:00
cc9cii
d9b0c81299 Show status bar setting working (feature #854). Turns out signals were not needed, may need to clean up later. 2014-09-18 16:05:32 +10:00
cc9cii
62d2811285 Window size improvements. Added promoted widgets but seems to be require signal filters for disabled widgets to receive mouse events. 2014-09-18 07:52:54 +10:00
U-NSFW-50TH\cc9c
ca80a2b856 Merge remote-tracking branch 'upstream/master' into opencs-settings 2014-09-17 21:00:22 +10:00
cc9cii
9dc4af69c6 Got window size to work correctly. Started to incorporate parts of previous settings implementation where possible. 2014-09-17 17:13:21 +10:00
Marc Zinnschlag
b31c4e2bcd Merge remote-tracking branch 'cc9cii/Bug-No-1301' 2014-09-16 12:52:12 +02:00
cc9cii
e4b836608c Partially address feature #854 by reading the status bar setting from opencs.ini. Missing GUI update that will affect new top level windows. 2014-09-15 06:08:56 +10:00
cc9cii
4471fe771e Fix logic errors. 2014-09-09 21:09:37 +10:00
cc9cii
84f5784575 Remove document when closing the last view. Should resolve Bug #1292. 2014-09-09 13:04:48 +10:00
Marc Zinnschlag
cf05d3c69f added run log 2014-09-05 13:49:34 +02:00
Marc Zinnschlag
a728d6d77a full implementation of global run menu item (replaces earlier placeholder implementation) 2014-09-04 17:45:43 +02:00
Marc Zinnschlag
67dfaa7f35 update actions in main menu when creating a new view 2014-09-04 10:47:30 +02:00
Marc Zinnschlag
bee36c9167 block saving while OpenMW process is running 2014-09-02 11:59:04 +02:00
Marc Zinnschlag
c88b3a1520 track state of OpenMW process and enable/disable run/stop actions accordingly 2014-09-02 11:56:35 +02:00
Marc Zinnschlag
1b4ab6e130 added OpenMW runner 2014-09-02 10:21:17 +02:00
Marc Zinnschlag
4d49924025 added debug profile record table 2014-08-04 13:36:01 +02:00
Marc Zinnschlag
19828df799 added subviews for resources tables 2014-07-05 15:51:17 +02:00
Marc Zinnschlag
d96ed38d49 added body part table 2014-07-01 12:37:22 +02:00
Marc Zinnschlag
e97fd35ae6 added enchantments table 2014-06-30 20:40:34 +02:00
Marc Zinnschlag
aadaf7827d added load error log 2014-05-10 12:04:36 +02:00
graffy76
a17cb1f389 Fixed opencs.ini formatting 2014-05-06 07:37:52 -05:00
graffy76
2e06414b43 Fixed broken delegate display modes (Display Format settings). Moved
UserSetting update functions to DataDisplayDelegate.
2014-04-25 07:16:40 -05:00
graffy76
3f2ae950f5 Disabled view resize for open views when user setting changes. Fixed
new view size issue to match existing user settings.
2014-04-24 12:50:10 -05:00
graffy76
4b607d658f Re-link user settings to editor main application 2014-04-22 22:19:53 -05:00
Marek Kochanowicz
5ad572346b referencables also work now 2014-03-11 13:02:25 +01:00
Marc Zinnschlag
26c2f28879 replaced global world->scene menu item with individual view context menu items in cell and reference tables 2014-03-02 22:43:44 +01:00
Marc Zinnschlag
55195f819a changed edit requests from row index format to UniversalId/hint format 2014-03-02 22:34:41 +01:00
Marc Zinnschlag
797f5527ee added hint parameter for UniversalId viewing requests 2014-03-02 13:29:02 +01:00
Marc Zinnschlag
cb3994281c changed UniversalId::Type_Scene from index to string ID argument (argument is the worldspace) 2014-03-02 13:11:15 +01:00
Marc Zinnschlag
ba88c94d58 first attempt at an info record collection 2013-10-29 13:18:22 +01:00
Marc Zinnschlag
88e09159c4 splitting off characters menu from mechanics menu (was getting too big) 2013-10-21 18:04:40 +02:00
Marc Zinnschlag
adf3a41a83 added topic and journal tables 2013-10-20 17:15:32 +02:00
Marc Zinnschlag
9ea092927f added basic scene subview (no functionality yet) 2013-09-28 09:25:54 +02:00
Marc Zinnschlag
e9f14449eb added AdjusterWidget 2013-09-10 16:45:01 +02:00
Marc Zinnschlag
ecedb60169 splitting new game and new addon functions (new game currently not working) 2013-09-08 12:06:28 +02:00
Marc Zinnschlag
cae5eb424d cleaned up opening the settings dialogue from a view 2013-09-08 09:33:45 +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
55e7e71c11 added optional per-subview status bar 2013-07-25 14:29:56 +02:00
Marc Zinnschlag
7600d6c04b basic filter table 2013-07-22 21:18:47 +02:00
Marc Zinnschlag
0fad2e7f40 restructured main menu 2013-07-20 13:46:56 +02:00
Marc Zinnschlag
365ea11e86 Merge remote-tracking branch 'graffy76/RefIdTypeDelegate' 2013-07-18 13:51:24 +02: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
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
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
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
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
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
10165d3c6b Feature #468 2013-06-09 00:34:27 +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
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