timamsk/Open-Shell-Menu
1
0
Fork 0
mirror of https://github.com/Open-Shell/Open-Shell-Menu.git synced 2026-04-13 20:28:31 +10:00
Code Issues Packages Projects Releases Wiki Activity

Compare commits

base: timamsk:v4.4.177
Branches Tags
timamsk:master timamsk:custom-button-dpi-scaling timamsk:gh-pages
timamsk:v4.4.197 timamsk:v4.4.196 timamsk:v4.4.195 timamsk:v4.4.194 timamsk:v4.4.192 timamsk:v4.4.191 timamsk:v4.4.190 timamsk:v4.4.189 timamsk:v4.4.188 timamsk:v4.4.187 timamsk:v4.4.186 timamsk:v4.4.185 timamsk:v4.4.184 timamsk:v4.4.183 timamsk:v4.4.182 timamsk:v4.4.181 timamsk:v4.4.180 timamsk:v4.4.179 timamsk:v4.4.178 timamsk:v4.4.177 timamsk:v4.4.176 timamsk:v4.4.175 timamsk:v4.4.174 timamsk:v4.4.170 timamsk:4.4.161-beta timamsk:4.4.169-beta timamsk:v4.4.160 timamsk:v4.4.152 timamsk:v4.4.142 timamsk:v4.4.131 timamsk:v4.4.108-dev timamsk:v4.4.109-dev timamsk:v4.4.102-dev timamsk:v4.3.1
...
compare: timamsk:v4.4.180
Branches Tags
timamsk:master timamsk:custom-button-dpi-scaling timamsk:gh-pages
timamsk:v4.4.197 timamsk:v4.4.196 timamsk:v4.4.195 timamsk:v4.4.194 timamsk:v4.4.192 timamsk:v4.4.191 timamsk:v4.4.190 timamsk:v4.4.189 timamsk:v4.4.188 timamsk:v4.4.187 timamsk:v4.4.186 timamsk:v4.4.185 timamsk:v4.4.184 timamsk:v4.4.183 timamsk:v4.4.182 timamsk:v4.4.181 timamsk:v4.4.180 timamsk:v4.4.179 timamsk:v4.4.178 timamsk:v4.4.177 timamsk:v4.4.176 timamsk:v4.4.175 timamsk:v4.4.174 timamsk:v4.4.170 timamsk:4.4.161-beta timamsk:4.4.169-beta timamsk:v4.4.160 timamsk:v4.4.152 timamsk:v4.4.142 timamsk:v4.4.131 timamsk:v4.4.108-dev timamsk:v4.4.109-dev timamsk:v4.4.102-dev timamsk:v4.3.1

5 Commits
v4.4.177 ... v4.4.180

Author SHA1 Message Date
among-us-official
9606e11e0e Restore Main_no_icons2 behavior for inline subitems (#1172) 2022-10-15 10:53:16 +02:00
ge0rdi
7f04293361 Update README.md 
Download link should point to latest official release.
 2022-10-14 20:02:19 +02:00
ge0rdi
e6b33a70e4 Add -reloadsettings command line switch 
It will force Open-Shell to reload settings from registry.

Fixes #1157.
 2022-10-08 07:48:50 +02:00
ge0rdi
179a59ac1b 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.
 2022-09-12 16:17:06 +02:00
ge0rdi
2a5ed14599 Fix 'Highlight modified settings' option tooltip 2022-09-12 16:17:06 +02:00
7 changed files with 34 additions and 102 deletions
Expand all files Collapse all files

2
README.md
View File

@@ -17,7 +17,7 @@
### Download ### Download
If you just want to use it or looking for setup file, click here to download: If you just want to use it or looking for setup file, click here to download:
[![GitHub All Releases](https://img.shields.io/github/downloads/Open-Shell/Open-Shell-Menu/total?style=for-the-badge)](https://github.com/Open-Shell/Open-Shell-Menu/releases) [![GitHub All Releases](https://img.shields.io/github/downloads/Open-Shell/Open-Shell-Menu/total?style=for-the-badge)](https://github.com/Open-Shell/Open-Shell-Menu/releases/latest)
### Temporary Translation/Language Solution ### Temporary Translation/Language Solution
1. Download [language DLL](https://coddec.github.io/Classic-Shell/www.classicshell.net/translations/index.html) 1. Download [language DLL](https://coddec.github.io/Classic-Shell/www.classicshell.net/translations/index.html)

20
Src/Lib/Settings.cpp
View File

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

35
Src/Lib/SettingsUIHelper.cpp
View File

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

1
Src/StartMenu/StartMenu.cpp
View File

@@ -561,6 +561,7 @@ int WINAPI wWinMain( HINSTANCE hInstance, HINSTANCE hPrevInstance, LPTSTR lpstrC
else if (wcsstr(lpstrCmdLine,L"-toggle")!=NULL) open=MSG_TOGGLE; else if (wcsstr(lpstrCmdLine,L"-toggle")!=NULL) open=MSG_TOGGLE;
else if (wcsstr(lpstrCmdLine,L"-open")!=NULL) open=MSG_OPEN; else if (wcsstr(lpstrCmdLine,L"-open")!=NULL) open=MSG_OPEN;
else if (wcsstr(lpstrCmdLine,L"-settings")!=NULL) open=MSG_SETTINGS; else if (wcsstr(lpstrCmdLine,L"-settings")!=NULL) open=MSG_SETTINGS;
else if (wcsstr(lpstrCmdLine,L"-reloadsettings")!=NULL) open=MSG_RELOADSETTINGS;
else if (wcsstr(lpstrCmdLine,L"-exit")!=NULL) open=MSG_EXIT; else if (wcsstr(lpstrCmdLine,L"-exit")!=NULL) open=MSG_EXIT;
{ {

11
Src/StartMenu/StartMenuDLL/MenuContainer.cpp
View File

@@ -1071,7 +1071,7 @@ void CMenuContainer::AddStandardItems( void )
const StdMenuItem *pInlineParent=NULL; const StdMenuItem *pInlineParent=NULL;
int searchProviderIndex=-1; int searchProviderIndex=-1;
m_SearchProvidersCount=0; m_SearchProvidersCount=0;
MenuSkin::TIconSize mainIconSize=s_Skin.Main_icon_size; bool bSecondColumn=false;
for (const StdMenuItem *pStdItem=m_pStdItem;;pStdItem++) for (const StdMenuItem *pStdItem=m_pStdItem;;pStdItem++)
{ {
if (pStdItem->id==MENU_LAST) if (pStdItem->id==MENU_LAST)
@@ -1089,9 +1089,8 @@ void CMenuContainer::AddStandardItems( void )
if (m_bSubMenu && pStdItem->id==s_ShutdownCommand) if (m_bSubMenu && pStdItem->id==s_ShutdownCommand)
continue; continue;
const bool bTwoColumns = (!m_bSubMenu && s_Skin.TwoColumns); if (pStdItem->id==MENU_COLUMN_BREAK && !m_bSubMenu && s_Skin.TwoColumns)
if (pStdItem->id==MENU_COLUMN_BREAK && bTwoColumns) bSecondColumn=true;
mainIconSize=s_Skin.Main2_icon_size;
int stdOptions=GetStdOptions(pStdItem->id); int stdOptions=GetStdOptions(pStdItem->id);
if (!(stdOptions&MENU_ENABLED)) continue; if (!(stdOptions&MENU_ENABLED)) continue;
@@ -1272,6 +1271,10 @@ void CMenuContainer::AddStandardItems( void )
item.bSplit=item.bFolder && (item.pStdItem->settings&StdMenuItem::MENU_SPLIT_BUTTON)!=0; item.bSplit=item.bFolder && (item.pStdItem->settings&StdMenuItem::MENU_SPLIT_BUTTON)!=0;
// get icon // get icon
MenuSkin::TIconSize mainIconSize=!bSecondColumn ? s_Skin.Main_icon_size : s_Skin.Main2_icon_size;
if (item.bInline && mainIconSize==MenuSkin::ICON_SIZE_NONE)
mainIconSize=s_Skin.Main_icon_size;
CItemManager::TIconSizeType iconSizeType; CItemManager::TIconSizeType iconSizeType;
int refreshFlags; int refreshFlags;
if (bSearchProvider7 || m_bSubMenu) if (bSearchProvider7 || m_bSubMenu)

65
Src/StartMenu/StartMenuDLL/SettingsUI.cpp
View File

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

2
Src/StartMenu/StartMenuDLL/StartMenuDLL.rc
View File

@@ -1300,7 +1300,7 @@ BEGIN
IDS_NO_DBLCLICK "Single-click to open folder shortcuts" 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_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 "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 "Custom search hint"
IDS_SEARCH_HINT_TIP "When this is checked, the hint text in the search box will be replaced" 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" IDS_NEW_SEARCH_HINT "Custom search hint text"