Skip to content

Commit 179a59a

Browse files
ge0rdige0rdi
committed
Revert "Auto-detect when setting is back to default value"
This reverts commit 998d83c. This change was wrong and it shouldn't get merged in first place. See #829 (comment) for further explanation. Fixes #1135.
1 parent 2a5ed14 commit 179a59a

File tree

3 files changed

+24
-96
lines changed

3 files changed

+24
-96
lines changed

‎Src/Lib/Settings.cpp‎

Lines changed: 4 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -793,10 +793,7 @@ CString CSettingsManager::LoadSettingsXml( const wchar_t *fname )
793793
}
794794
string.push_back(0);
795795
pSetting->value=CComVariant(&string[0]);
796-
if (pSetting->value==pSetting->defValue)
797-
pSetting->flags|=CSetting::FLAG_DEFAULT;
798-
else
799-
pSetting->flags&=~CSetting::FLAG_DEFAULT;
796+
pSetting->flags&=~CSetting::FLAG_DEFAULT;
800797
}
801798
else
802799
{
@@ -809,10 +806,7 @@ CString CSettingsManager::LoadSettingsXml( const wchar_t *fname )
809806
if (pSetting->type>=CSetting::TYPE_STRING)
810807
{
811808
pSetting->value=value;
812-
if (pSetting->value==pSetting->defValue)
813-
pSetting->flags|=CSetting::FLAG_DEFAULT;
814-
else
815-
pSetting->flags&=~CSetting::FLAG_DEFAULT;
809+
pSetting->flags&=~CSetting::FLAG_DEFAULT;
816810
}
817811
else if (pSetting->type==CSetting::TYPE_BOOL || (pSetting->type==CSetting::TYPE_INT && pSetting[1].type!=CSetting::TYPE_RADIO) || pSetting->type==CSetting::TYPE_HOTKEY || pSetting->type==CSetting::TYPE_HOTKEY_ANY || pSetting->type==CSetting::TYPE_COLOR)
818812
{
@@ -821,10 +815,7 @@ CString CSettingsManager::LoadSettingsXml( const wchar_t *fname )
821815
pSetting->value=CComVariant(val?1:0);
822816
else
823817
pSetting->value=CComVariant(val);
824-
if (pSetting->value==pSetting->defValue)
825-
pSetting->flags|=CSetting::FLAG_DEFAULT;
826-
else
827-
pSetting->flags&=~CSetting::FLAG_DEFAULT;
818+
pSetting->flags&=~CSetting::FLAG_DEFAULT;
828819
}
829820
else if (pSetting->type==CSetting::TYPE_INT && pSetting[1].type==CSetting::TYPE_RADIO)
830821
{
@@ -834,10 +825,7 @@ CString CSettingsManager::LoadSettingsXml( const wchar_t *fname )
834825
if (_wcsicmp(pRadio->name,value.bstrVal)==0)
835826
{
836827
pSetting->value=CComVariant(val);
837-
if (pSetting->value==pSetting->defValue)
838-
pSetting->flags|=CSetting::FLAG_DEFAULT;
839-
else
840-
pSetting->flags&=~CSetting::FLAG_DEFAULT;
828+
pSetting->flags&=~CSetting::FLAG_DEFAULT;
841829
break;
842830
}
843831
}

‎Src/Lib/SettingsUIHelper.cpp‎

Lines changed: 7 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -1828,10 +1828,7 @@ void CCustomTreeDlg::SerializeData( void )
18281828
if ((m_pSetting->flags&CSetting::FLAG_DEFAULT) || wcscmp(strNew,strOld)!=0)
18291829
SetSettingsDirty();
18301830
m_pSetting->value=CComVariant(strNew);
1831-
if (m_pSetting->value==m_pSetting->defValue)
1832-
m_pSetting->flags|=CSetting::FLAG_DEFAULT;
1833-
else
1834-
m_pSetting->flags&=~CSetting::FLAG_DEFAULT;
1831+
m_pSetting->flags&=~CSetting::FLAG_DEFAULT;
18351832
ItemsChanged();
18361833
}
18371834

@@ -2811,10 +2808,7 @@ void CTreeSettingsDlg::ToggleItem( HTREEITEM hItem, bool bDefault )
28112808
{
28122809
CSettingsLockWrite lock;
28132810
pSetting->value=CComVariant(state?0:1);
2814-
if (pSetting->value==pSetting->defValue)
2815-
pSetting->flags|=CSetting::FLAG_DEFAULT;
2816-
else
2817-
pSetting->flags&=~CSetting::FLAG_DEFAULT;
2811+
pSetting->flags&=~CSetting::FLAG_DEFAULT;
28182812
SetSettingsDirty();
28192813
}
28202814
if (pSetting->flags&CSetting::FLAG_CALLBACK)
@@ -2838,10 +2832,7 @@ void CTreeSettingsDlg::ToggleItem( HTREEITEM hItem, bool bDefault )
28382832
{
28392833
CSettingsLockWrite lock;
28402834
pTarget->value=CComVariant(val);
2841-
if (pTarget->value==pTarget->defValue)
2842-
pTarget->flags|=CSetting::FLAG_DEFAULT;
2843-
else
2844-
pTarget->flags&=~CSetting::FLAG_DEFAULT;
2835+
pTarget->flags&=~CSetting::FLAG_DEFAULT;
28452836
SetSettingsDirty();
28462837
}
28472838
if (pParent->flags&CSetting::FLAG_CALLBACK)
@@ -3052,10 +3043,7 @@ void CTreeSettingsDlg::ApplyEditBox( void )
30523043
if (pSetting->value.vt!=VT_I4 || pSetting->value.intVal!=val)
30533044
{
30543045
pSetting->value=CComVariant(val);
3055-
if (pSetting->value==pSetting->defValue)
3056-
pSetting->flags|=CSetting::FLAG_DEFAULT;
3057-
else
3058-
pSetting->flags&=~CSetting::FLAG_DEFAULT;
3046+
pSetting->flags&=~CSetting::FLAG_DEFAULT;
30593047
}
30603048
}
30613049
else if (pSetting->type==CSetting::TYPE_COLOR)
@@ -3065,21 +3053,15 @@ void CTreeSettingsDlg::ApplyEditBox( void )
30653053
if (pSetting->value.vt!=VT_I4 || pSetting->value.intVal!=val)
30663054
{
30673055
pSetting->value=CComVariant(val);
3068-
if (pSetting->value==pSetting->defValue)
3069-
pSetting->flags|=CSetting::FLAG_DEFAULT;
3070-
else
3071-
pSetting->flags&=~CSetting::FLAG_DEFAULT;
3056+
pSetting->flags&=~CSetting::FLAG_DEFAULT;
30723057
}
30733058
}
30743059
else if (pSetting->type==CSetting::TYPE_HOTKEY || pSetting->type==CSetting::TYPE_HOTKEY_ANY)
30753060
{
30763061
if (pSetting->value.vt!=VT_I4 || pSetting->value.intVal!=g_HotKey)
30773062
{
30783063
pSetting->value=CComVariant(g_HotKey);
3079-
if (pSetting->value==pSetting->defValue)
3080-
pSetting->flags|=CSetting::FLAG_DEFAULT;
3081-
else
3082-
pSetting->flags&=~CSetting::FLAG_DEFAULT;
3064+
pSetting->flags&=~CSetting::FLAG_DEFAULT;
30833065
}
30843066
}
30853067
else if (pSetting->type==CSetting::TYPE_DIRECTORY)
@@ -3101,10 +3083,7 @@ void CTreeSettingsDlg::ApplyEditBox( void )
31013083
if (pSetting->value.vt!=VT_BSTR || str!=pSetting->value.bstrVal)
31023084
{
31033085
pSetting->value=CComVariant(str);
3104-
if (pSetting->value==pSetting->defValue)
3105-
pSetting->flags|=CSetting::FLAG_DEFAULT;
3106-
else
3107-
pSetting->flags&=~CSetting::FLAG_DEFAULT;
3086+
pSetting->flags&=~CSetting::FLAG_DEFAULT;
31083087
}
31093088
}
31103089
SetSettingsDirty();

‎Src/StartMenu/StartMenuDLL/SettingsUI.cpp‎

Lines changed: 13 additions & 52 deletions
Original file line numberDiff line numberDiff line change
@@ -3624,10 +3624,7 @@ void CCustomMenuDlg7::SerializeData( void )
36243624
stringBuilder.push_back(0);
36253625
CSettingsLockWrite lock;
36263626
m_pSetting->value=CComVariant(&stringBuilder[0]);
3627-
if (m_pSetting->value==m_pSetting->defValue)
3628-
m_pSetting->flags|=CSetting::FLAG_DEFAULT;
3629-
else
3630-
m_pSetting->flags&=~CSetting::FLAG_DEFAULT;
3627+
m_pSetting->flags&=~CSetting::FLAG_DEFAULT;
36313628
SetSettingsDirty();
36323629
}
36333630

@@ -3854,10 +3851,7 @@ LRESULT CMenuStyleDlg::OnClick( WORD wNotifyCode, WORD wID, HWND hWndCtl, BOOL&
38543851
CheckDlgButton(IDC_RADIO_CLASSIC,pSetting->value.intVal==MENU_CLASSIC1?BST_CHECKED:BST_UNCHECKED);
38553852
CheckDlgButton(IDC_RADIO_TWO_COLUMNS,pSetting->value.intVal==MENU_CLASSIC2?BST_CHECKED:BST_UNCHECKED);
38563853
CheckDlgButton(IDC_RADIO_WIN7,pSetting->value.intVal==MENU_WIN7?BST_CHECKED:BST_UNCHECKED);
3857-
if (pSetting->value==pSetting->defValue)
3858-
pSetting->flags|=CSetting::FLAG_DEFAULT;
3859-
else
3860-
pSetting->flags&=~CSetting::FLAG_DEFAULT;
3854+
pSetting->flags&=~CSetting::FLAG_DEFAULT;
38613855
SetSettingsDirty();
38623856

38633857
SetSettingsStyle(styleFlag,CSetting::FLAG_MENU_MASK);
@@ -3875,10 +3869,7 @@ LRESULT CMenuStyleDlg::OnEnabled( WORD wNotifyCode, WORD wID, HWND hWndCtl, BOOL
38753869
CSettingsLockWrite lock;
38763870
CSetting *pSetting=FindSetting(L"EnableStartButton");
38773871
pSetting->value=CComVariant(bEnabled);
3878-
if (pSetting->value==pSetting->defValue)
3879-
pSetting->flags|=CSetting::FLAG_DEFAULT;
3880-
else
3881-
pSetting->flags&=~CSetting::FLAG_DEFAULT;
3872+
pSetting->flags&=~CSetting::FLAG_DEFAULT;
38823873
SetSettingsDirty();
38833874
}
38843875
Update(false);
@@ -3917,10 +3908,7 @@ LRESULT CMenuStyleDlg::OnButtonStyle( WORD wNotifyCode, WORD wID, HWND hWndCtl,
39173908
CSettingsLockWrite lock;
39183909
CSetting *pSetting=FindSetting(L"StartButtonType");
39193910
pSetting->value=CComVariant(style);
3920-
if (pSetting->value==pSetting->defValue)
3921-
pSetting->flags|=CSetting::FLAG_DEFAULT;
3922-
else
3923-
pSetting->flags&=~CSetting::FLAG_DEFAULT;
3911+
pSetting->flags&=~CSetting::FLAG_DEFAULT;
39243912
SetSettingsDirty();
39253913
}
39263914
Update(false);
@@ -3944,10 +3932,7 @@ LRESULT CMenuStyleDlg::OnPick( WORD wNotifyCode, WORD wID, HWND hWndCtl, BOOL& b
39443932
CSettingsLockWrite lock;
39453933
CSetting *pSetting=FindSetting(L"StartButtonPath");
39463934
pSetting->value=CComVariant(path);
3947-
if (pSetting->value==pSetting->defValue)
3948-
pSetting->flags|=CSetting::FLAG_DEFAULT;
3949-
else
3950-
pSetting->flags&=~CSetting::FLAG_DEFAULT;
3935+
pSetting->flags&=~CSetting::FLAG_DEFAULT;
39513936
SetSettingsDirty();
39523937
}
39533938
Update(true);
@@ -4586,21 +4571,15 @@ void UpgradeSettings( bool bShared )
45864571
items.Replace(L"Command=recent_items\n",L"Command=recent_programs\n");
45874572
items.Replace(L"Command=control_panel_categories\n",L"Command=control_panel\n");
45884573
pSettingItems->value=items;
4589-
if (pSettingItems->value==pSettingItems->defValue)
4590-
pSettingItems->flags|=CSetting::FLAG_DEFAULT;
4591-
else
4592-
pSettingItems->flags&=~CSetting::FLAG_DEFAULT;
4574+
pSettingItems->flags&=~CSetting::FLAG_DEFAULT;
45934575
}
45944576

45954577
// set initial menu style
45964578
CSetting *pSettingStyle=FindSetting(L"MenuStyle");
45974579
if (!pSettingStyle->IsLocked())
45984580
{
45994581
pSettingStyle->value=(bTwoColumns?1:0);
4600-
if (pSettingStyle->value==pSettingStyle->defValue)
4601-
pSettingStyle->flags|=CSetting::FLAG_DEFAULT;
4602-
else
4603-
pSettingStyle->flags&=~CSetting::FLAG_DEFAULT;
4582+
pSettingStyle->flags&=~CSetting::FLAG_DEFAULT;
46044583
SetSettingsStyle(bTwoColumns?CSetting::FLAG_MENU_CLASSIC2:CSetting::FLAG_MENU_CLASSIC1,CSetting::FLAG_MENU_MASK);
46054584
}
46064585

@@ -4612,10 +4591,7 @@ void UpgradeSettings( bool bShared )
46124591
if (!pSetting->IsDefault())
46134592
{
46144593
pSettingSkin->value=pSetting->value;
4615-
if (pSettingSkin->value==pSettingSkin->defValue)
4616-
pSettingSkin->flags|=CSetting::FLAG_DEFAULT;
4617-
else
4618-
pSettingSkin->flags&=~CSetting::FLAG_DEFAULT;
4594+
pSettingSkin->flags&=~CSetting::FLAG_DEFAULT;
46194595
}
46204596
}
46214597
CSetting *pSettingOpt=FindSetting(bTwoColumns?L"SkinOptionsC2":L"SkinOptionsC1");
@@ -4625,10 +4601,7 @@ void UpgradeSettings( bool bShared )
46254601
if (!pSetting->IsDefault())
46264602
{
46274603
pSettingOpt->value=pSetting->value;
4628-
if (pSettingOpt->value==pSettingOpt->defValue)
4629-
pSettingOpt->flags|=CSetting::FLAG_DEFAULT;
4630-
else
4631-
pSettingOpt->flags&=~CSetting::FLAG_DEFAULT;
4604+
pSettingOpt->flags&=~CSetting::FLAG_DEFAULT;
46324605
}
46334606
}
46344607
CSetting *pSettingVar=FindSetting(bTwoColumns?L"SkinVariationC2":L"SkinVariationC1");
@@ -4638,10 +4611,7 @@ void UpgradeSettings( bool bShared )
46384611
if (!pSetting->IsDefault())
46394612
{
46404613
pSettingVar->value=pSetting->value;
4641-
if (pSettingVar->value==pSettingVar->defValue)
4642-
pSettingVar->flags|=CSetting::FLAG_DEFAULT;
4643-
else
4644-
pSettingVar->flags&=~CSetting::FLAG_DEFAULT;
4614+
pSettingVar->flags&=~CSetting::FLAG_DEFAULT;
46454615
}
46464616
}
46474617

@@ -4653,10 +4623,7 @@ void UpgradeSettings( bool bShared )
46534623
if (!pSetting->IsDefault())
46544624
{
46554625
pSettingSkin->value=pSetting->value;
4656-
if (pSettingSkin->value==pSettingSkin->defValue)
4657-
pSettingSkin->flags|=CSetting::FLAG_DEFAULT;
4658-
else
4659-
pSettingSkin->flags&=~CSetting::FLAG_DEFAULT;
4626+
pSettingSkin->flags&=~CSetting::FLAG_DEFAULT;
46604627
}
46614628
}
46624629
pSettingOpt=FindSetting(L"SkinOptionsA");
@@ -4666,10 +4633,7 @@ void UpgradeSettings( bool bShared )
46664633
if (!pSetting->IsDefault())
46674634
{
46684635
pSettingOpt->value=pSetting->value;
4669-
if (pSettingOpt->value==pSettingOpt->defValue)
4670-
pSettingOpt->flags|=CSetting::FLAG_DEFAULT;
4671-
else
4672-
pSettingOpt->flags&=~CSetting::FLAG_DEFAULT;
4636+
pSettingOpt->flags&=~CSetting::FLAG_DEFAULT;
46734637
}
46744638
}
46754639
pSettingVar=FindSetting(L"SkinVariationA");
@@ -4679,10 +4643,7 @@ void UpgradeSettings( bool bShared )
46794643
if (!pSetting->IsDefault())
46804644
{
46814645
pSettingVar->value=pSetting->value;
4682-
if (pSettingVar->value==pSettingVar->defValue)
4683-
pSettingVar->flags|=CSetting::FLAG_DEFAULT;
4684-
else
4685-
pSettingVar->flags&=~CSetting::FLAG_DEFAULT;
4646+
pSettingVar->flags&=~CSetting::FLAG_DEFAULT;
46864647
}
46874648
}
46884649
}

0 commit comments

Comments
 (0)