Revert "Auto-detect when setting is back to default value"

This reverts commit 998d83c15c.

This change was wrong and it shouldn't get merged in first place.
See https://github.com/Open-Shell/Open-Shell-Menu/pull/829#issuecomment-907667829 for further explanation.

Fixes #1135.

Src/Lib/Settings.cpp

@@ -793,9 +793,6 @@ CString CSettingsManager::LoadSettingsXml( const wchar_t *fname )
 					}
 					string.push_back(0);
 					pSetting->value=CComVariant(&string[0]);
-					if (pSetting->value==pSetting->defValue)
-						pSetting->flags|=CSetting::FLAG_DEFAULT;
-					else
 					pSetting->flags&=~CSetting::FLAG_DEFAULT;
 				}
 				else
@@ -809,9 +806,6 @@ CString CSettingsManager::LoadSettingsXml( const wchar_t *fname )
 							if (pSetting->type>=CSetting::TYPE_STRING)
 							{
 								pSetting->value=value;
-								if (pSetting->value==pSetting->defValue)
-									pSetting->flags|=CSetting::FLAG_DEFAULT;
-								else
 								pSetting->flags&=~CSetting::FLAG_DEFAULT;
 							}
 							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)
@@ -821,9 +815,6 @@ CString CSettingsManager::LoadSettingsXml( const wchar_t *fname )
 									pSetting->value=CComVariant(val?1:0);
 								else
 									pSetting->value=CComVariant(val);
-								if (pSetting->value==pSetting->defValue)
-									pSetting->flags|=CSetting::FLAG_DEFAULT;
-								else
 								pSetting->flags&=~CSetting::FLAG_DEFAULT;
 							}
 							else if (pSetting->type==CSetting::TYPE_INT && pSetting[1].type==CSetting::TYPE_RADIO)
@@ -834,9 +825,6 @@ CString CSettingsManager::LoadSettingsXml( const wchar_t *fname )
 									if (_wcsicmp(pRadio->name,value.bstrVal)==0)
 									{
 										pSetting->value=CComVariant(val);
-										if (pSetting->value==pSetting->defValue)
-											pSetting->flags|=CSetting::FLAG_DEFAULT;
-										else
 										pSetting->flags&=~CSetting::FLAG_DEFAULT;
 										break;
 									}

Src/Lib/SettingsUIHelper.cpp

@@ -1828,9 +1828,6 @@ void CCustomTreeDlg::SerializeData( void )
 	if ((m_pSetting->flags&CSetting::FLAG_DEFAULT) || wcscmp(strNew,strOld)!=0)
 		SetSettingsDirty();
 	m_pSetting->value=CComVariant(strNew);
-	if (m_pSetting->value==m_pSetting->defValue)
-		m_pSetting->flags|=CSetting::FLAG_DEFAULT;
-	else
 	m_pSetting->flags&=~CSetting::FLAG_DEFAULT;
 	ItemsChanged();
 }
@@ -2811,9 +2808,6 @@ void CTreeSettingsDlg::ToggleItem( HTREEITEM hItem, bool bDefault )
 		{
 			CSettingsLockWrite lock;
 			pSetting->value=CComVariant(state?0:1);
-			if (pSetting->value==pSetting->defValue)
-				pSetting->flags|=CSetting::FLAG_DEFAULT;
-			else
 			pSetting->flags&=~CSetting::FLAG_DEFAULT;
 			SetSettingsDirty();
 		}
@@ -2838,9 +2832,6 @@ void CTreeSettingsDlg::ToggleItem( HTREEITEM hItem, bool bDefault )
 				{
 					CSettingsLockWrite lock;
 					pTarget->value=CComVariant(val);
-					if (pTarget->value==pTarget->defValue)
-						pTarget->flags|=CSetting::FLAG_DEFAULT;
-					else
 					pTarget->flags&=~CSetting::FLAG_DEFAULT;
 					SetSettingsDirty();
 				}
@@ -3052,9 +3043,6 @@ void CTreeSettingsDlg::ApplyEditBox( void )
 				if (pSetting->value.vt!=VT_I4 || pSetting->value.intVal!=val)
 				{
 					pSetting->value=CComVariant(val);
-					if (pSetting->value==pSetting->defValue)
-						pSetting->flags|=CSetting::FLAG_DEFAULT;
-					else
 					pSetting->flags&=~CSetting::FLAG_DEFAULT;
 				}
 			}
@@ -3065,9 +3053,6 @@ void CTreeSettingsDlg::ApplyEditBox( void )
 				if (pSetting->value.vt!=VT_I4 || pSetting->value.intVal!=val)
 				{
 					pSetting->value=CComVariant(val);
-					if (pSetting->value==pSetting->defValue)
-						pSetting->flags|=CSetting::FLAG_DEFAULT;
-					else
 					pSetting->flags&=~CSetting::FLAG_DEFAULT;
 				}
 			}
@@ -3076,9 +3061,6 @@ void CTreeSettingsDlg::ApplyEditBox( void )
 				if (pSetting->value.vt!=VT_I4 || pSetting->value.intVal!=g_HotKey)
 				{
 					pSetting->value=CComVariant(g_HotKey);
-					if (pSetting->value==pSetting->defValue)
-						pSetting->flags|=CSetting::FLAG_DEFAULT;
-					else
 					pSetting->flags&=~CSetting::FLAG_DEFAULT;
 				}
 			}
@@ -3101,9 +3083,6 @@ void CTreeSettingsDlg::ApplyEditBox( void )
 				if (pSetting->value.vt!=VT_BSTR || str!=pSetting->value.bstrVal)
 				{
 					pSetting->value=CComVariant(str);
-					if (pSetting->value==pSetting->defValue)
-						pSetting->flags|=CSetting::FLAG_DEFAULT;
-					else
 					pSetting->flags&=~CSetting::FLAG_DEFAULT;
 				}
 			}

Src/StartMenu/StartMenuDLL/SettingsUI.cpp

@@ -3624,9 +3624,6 @@ void CCustomMenuDlg7::SerializeData( void )
 	stringBuilder.push_back(0);
 	CSettingsLockWrite lock;
 	m_pSetting->value=CComVariant(&stringBuilder[0]);
-	if (m_pSetting->value==m_pSetting->defValue)
-		m_pSetting->flags|=CSetting::FLAG_DEFAULT;
-	else
 	m_pSetting->flags&=~CSetting::FLAG_DEFAULT;
 	SetSettingsDirty();
 }
@@ -3854,9 +3851,6 @@ LRESULT CMenuStyleDlg::OnClick( WORD wNotifyCode, WORD wID, HWND hWndCtl, BOOL&
 		CheckDlgButton(IDC_RADIO_CLASSIC,pSetting->value.intVal==MENU_CLASSIC1?BST_CHECKED:BST_UNCHECKED);
 		CheckDlgButton(IDC_RADIO_TWO_COLUMNS,pSetting->value.intVal==MENU_CLASSIC2?BST_CHECKED:BST_UNCHECKED);
 		CheckDlgButton(IDC_RADIO_WIN7,pSetting->value.intVal==MENU_WIN7?BST_CHECKED:BST_UNCHECKED);
-		if (pSetting->value==pSetting->defValue)
-			pSetting->flags|=CSetting::FLAG_DEFAULT;
-		else
 		pSetting->flags&=~CSetting::FLAG_DEFAULT;
 		SetSettingsDirty();
 
@@ -3875,9 +3869,6 @@ LRESULT CMenuStyleDlg::OnEnabled( WORD wNotifyCode, WORD wID, HWND hWndCtl, BOOL
 		CSettingsLockWrite lock;
 		CSetting *pSetting=FindSetting(L"EnableStartButton");
 		pSetting->value=CComVariant(bEnabled);
-		if (pSetting->value==pSetting->defValue)
-			pSetting->flags|=CSetting::FLAG_DEFAULT;
-		else
 		pSetting->flags&=~CSetting::FLAG_DEFAULT;
 		SetSettingsDirty();
 	}
@@ -3917,9 +3908,6 @@ LRESULT CMenuStyleDlg::OnButtonStyle( WORD wNotifyCode, WORD wID, HWND hWndCtl,
 		CSettingsLockWrite lock;
 		CSetting *pSetting=FindSetting(L"StartButtonType");
 		pSetting->value=CComVariant(style);
-		if (pSetting->value==pSetting->defValue)
-			pSetting->flags|=CSetting::FLAG_DEFAULT;
-		else
 		pSetting->flags&=~CSetting::FLAG_DEFAULT;
 		SetSettingsDirty();
 	}
@@ -3944,9 +3932,6 @@ LRESULT CMenuStyleDlg::OnPick( WORD wNotifyCode, WORD wID, HWND hWndCtl, BOOL& b
 			CSettingsLockWrite lock;
 			CSetting *pSetting=FindSetting(L"StartButtonPath");
 			pSetting->value=CComVariant(path);
-			if (pSetting->value==pSetting->defValue)
-				pSetting->flags|=CSetting::FLAG_DEFAULT;
-			else
 			pSetting->flags&=~CSetting::FLAG_DEFAULT;
 			SetSettingsDirty();
 		}
@@ -4586,9 +4571,6 @@ void UpgradeSettings( bool bShared )
 		items.Replace(L"Command=recent_items\n",L"Command=recent_programs\n");
 		items.Replace(L"Command=control_panel_categories\n",L"Command=control_panel\n");
 		pSettingItems->value=items;
-		if (pSettingItems->value==pSettingItems->defValue)
-			pSettingItems->flags|=CSetting::FLAG_DEFAULT;
-		else
 		pSettingItems->flags&=~CSetting::FLAG_DEFAULT;
 	}
 
@@ -4597,9 +4579,6 @@ void UpgradeSettings( bool bShared )
 	if (!pSettingStyle->IsLocked())
 	{
 		pSettingStyle->value=(bTwoColumns?1:0);
-		if (pSettingStyle->value==pSettingStyle->defValue)
-			pSettingStyle->flags|=CSetting::FLAG_DEFAULT;
-		else
 		pSettingStyle->flags&=~CSetting::FLAG_DEFAULT;
 		SetSettingsStyle(bTwoColumns?CSetting::FLAG_MENU_CLASSIC2:CSetting::FLAG_MENU_CLASSIC1,CSetting::FLAG_MENU_MASK);
 	}
@@ -4612,9 +4591,6 @@ void UpgradeSettings( bool bShared )
 		if (!pSetting->IsDefault())
 		{
 			pSettingSkin->value=pSetting->value;
-			if (pSettingSkin->value==pSettingSkin->defValue)
-				pSettingSkin->flags|=CSetting::FLAG_DEFAULT;
-			else
 			pSettingSkin->flags&=~CSetting::FLAG_DEFAULT;
 		}
 	}
@@ -4625,9 +4601,6 @@ void UpgradeSettings( bool bShared )
 		if (!pSetting->IsDefault())
 		{
 			pSettingOpt->value=pSetting->value;
-			if (pSettingOpt->value==pSettingOpt->defValue)
-				pSettingOpt->flags|=CSetting::FLAG_DEFAULT;
-			else
 			pSettingOpt->flags&=~CSetting::FLAG_DEFAULT;
 		}
 	}
@@ -4638,9 +4611,6 @@ void UpgradeSettings( bool bShared )
 		if (!pSetting->IsDefault())
 		{
 			pSettingVar->value=pSetting->value;
-			if (pSettingVar->value==pSettingVar->defValue)
-				pSettingVar->flags|=CSetting::FLAG_DEFAULT;
-			else
 			pSettingVar->flags&=~CSetting::FLAG_DEFAULT;
 		}
 	}
@@ -4653,9 +4623,6 @@ void UpgradeSettings( bool bShared )
 		if (!pSetting->IsDefault())
 		{
 			pSettingSkin->value=pSetting->value;
-			if (pSettingSkin->value==pSettingSkin->defValue)
-				pSettingSkin->flags|=CSetting::FLAG_DEFAULT;
-			else
 			pSettingSkin->flags&=~CSetting::FLAG_DEFAULT;
 		}
 	}
@@ -4666,9 +4633,6 @@ void UpgradeSettings( bool bShared )
 		if (!pSetting->IsDefault())
 		{
 			pSettingOpt->value=pSetting->value;
-			if (pSettingOpt->value==pSettingOpt->defValue)
-				pSettingOpt->flags|=CSetting::FLAG_DEFAULT;
-			else
 			pSettingOpt->flags&=~CSetting::FLAG_DEFAULT;
 		}
 	}
@@ -4679,9 +4643,6 @@ void UpgradeSettings( bool bShared )
 		if (!pSetting->IsDefault())
 		{
 			pSettingVar->value=pSetting->value;
-			if (pSettingVar->value==pSettingVar->defValue)
-				pSettingVar->flags|=CSetting::FLAG_DEFAULT;
-			else
 			pSettingVar->flags&=~CSetting::FLAG_DEFAULT;
 		}
 	}

Src/StartMenu/StartMenuDLL/StartMenuDLL.rc

@@ -1300,7 +1300,7 @@ BEGIN
     IDS_NO_DBLCLICK         "Single-click to open folder shortcuts"
     IDS_NO_DBLCLICK_TIP     "When this is checked, single-clicking shortcuts (links) to folders will open them in explorer. Hovering over the shortcut will still expand sub-menus"
     IDS_BOLD_SETTINGS       "Highlight modified settings"
-    IDS_BOLD_SETTINGS_TIP   "When this is checked, settings that have been modified from their defaults will be highlighted in bold"
+    IDS_BOLD_SETTINGS_TIP   "When this is checked, settings that have been modified will be highlighted in bold"
     IDS_SEARCH_HINT         "Custom search hint"
     IDS_SEARCH_HINT_TIP     "When this is checked, the hint text in the search box will be replaced"
     IDS_NEW_SEARCH_HINT     "Custom search hint text"