mirror/openmw-tes3mp
1
0
Fork 1
mirror of https://github.com/TES3MP/openmw-tes3mp.git synced 2025-01-16 11:49:56 +00:00
Code Issues Releases Wiki Activity

Resolve merge issues and add back user preference setting for auto selecting a modified record.

Browse source 
(cherry picked from commit 321b1b5106a47500bffd4c78a66d3d6f44a06f5b)

Conflicts:
	apps/opencs/model/settings/usersettings.cpp
This commit is contained in:
cc9cii 2015-05-31 07:14:37 +10:00
parent fb3015c9b8
commit 007c733578
2 changed files with 7 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
apps/opencs/model/settings/usersettings.cpp
View file

@ -243,6 +243,11 @@ void CSMSettings::UserSettings::buildSettingModelDefaults()
jumpToAdded->setDefaultValue (defaultValue); jumpToAdded->setDefaultValue (defaultValue);
jumpToAdded->setDeclaredValues (jumpValues); jumpToAdded->setDeclaredValues (jumpValues);
Setting *jumpToModified = createSetting (Type_CheckBox, "jump-to-modified", "Jump to modified Record");
jumpToModified->setDefaultValue ("true");
jumpToModified->setToolTip ("Whether to jump to the modified record. This setting effects the instances table only."
"\nCan be useful in finding the moved or modified object instance while 3D editing.");
Setting *extendedConfig = createSetting (Type_CheckBox, "extended-config", Setting *extendedConfig = createSetting (Type_CheckBox, "extended-config",
"Manually specify affected record types for an extended delete/revert"); "Manually specify affected record types for an extended delete/revert");
extendedConfig->setDefaultValue("false"); extendedConfig->setDefaultValue("false");

3
apps/opencs/view/world/tablesubview.cpp
View file

@ -54,7 +54,8 @@ CSVWorld::TableSubView::TableSubView (const CSMWorld::UniversalId& id, CSMDoc::D
autoJump->setToolTip ("Whether to jump to the modified record." autoJump->setToolTip ("Whether to jump to the modified record."
"\nCan be useful in finding the moved or modified" "\nCan be useful in finding the moved or modified"
"\nobject instance while 3D editing."); "\nobject instance while 3D editing.");
autoJump->setCheckState(Qt::Unchecked); autoJump->setCheckState(
userSettings.settingValue ("table-input/jump-to-modified") == "true" ? Qt::Checked : Qt::Unchecked);
connect(autoJump, SIGNAL (stateChanged(int)), mTable, SLOT (jumpAfterModChanged(int))); connect(autoJump, SIGNAL (stateChanged(int)), mTable, SLOT (jumpAfterModChanged(int)));
optHLayout->insertWidget(0, autoJump); optHLayout->insertWidget(0, autoJump);
optHLayout->insertWidget(1, added); optHLayout->insertWidget(1, added);