From 007c733578f249a4d9c683c81c1fb8fc37216820 Mon Sep 17 00:00:00 2001 From: cc9cii Date: Sun, 31 May 2015 07:14:37 +1000 Subject: [PATCH] Resolve merge issues and add back user preference setting for auto selecting a modified record. (cherry picked from commit 321b1b5106a47500bffd4c78a66d3d6f44a06f5b) Conflicts: apps/opencs/model/settings/usersettings.cpp --- apps/opencs/model/settings/usersettings.cpp | 5 +++++ apps/opencs/view/world/tablesubview.cpp | 3 ++- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/apps/opencs/model/settings/usersettings.cpp b/apps/opencs/model/settings/usersettings.cpp index a40a790b74..5cf3bd7a74 100644 --- a/apps/opencs/model/settings/usersettings.cpp +++ b/apps/opencs/model/settings/usersettings.cpp @@ -243,6 +243,11 @@ void CSMSettings::UserSettings::buildSettingModelDefaults() jumpToAdded->setDefaultValue (defaultValue); 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", "Manually specify affected record types for an extended delete/revert"); extendedConfig->setDefaultValue("false"); diff --git a/apps/opencs/view/world/tablesubview.cpp b/apps/opencs/view/world/tablesubview.cpp index 7a26804344..81f78cdadd 100644 --- a/apps/opencs/view/world/tablesubview.cpp +++ b/apps/opencs/view/world/tablesubview.cpp @@ -54,7 +54,8 @@ CSVWorld::TableSubView::TableSubView (const CSMWorld::UniversalId& id, CSMDoc::D autoJump->setToolTip ("Whether to jump to the modified record." "\nCan be useful in finding the moved or modified" "\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))); optHLayout->insertWidget(0, autoJump); optHLayout->insertWidget(1, added);