Add -reloadsettings command line switch

It will force Open-Shell to reload settings from registry.

Fixes #1157.

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/StartMenu.cpp

@@ -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"-open")!=NULL) open=MSG_OPEN;
 	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;
 
 	{

Src/StartMenu/StartMenuDLL/DragDrop.cpp

@@ -903,7 +903,7 @@ HRESULT STDMETHODCALLTYPE CMenuContainer::Drop( IDataObject *pDataObj, DWORD grf
 				else if (i<before)
 					skip++;
 			}
-			SortMenuItem ins(L"",FNV_HASH0,false,false,false,folderIndex*2,0);
+			SortMenuItem ins(L"",FNV_HASH0,false,false,folderIndex*2,0);
 			items.insert(items.begin()+(before-skip),ins);
 			SaveItemOrder(items);
 		}

Src/StartMenu/StartMenuDLL/MenuContainer.cpp

@@ -861,8 +861,7 @@ void CMenuContainer::AddFirstFolder( IShellItem *pFolder, std::vector<MenuItem>
 
 				if (bLibrary) flags&=~SFGAO_STREAM;
 				item.bLink=(flags&SFGAO_LINK)!=0;
-				item.bFolderLink=(flags&SFGAO_FOLDER && (!(flags&(SFGAO_STREAM|SFGAO_LINK)) || (s_bExpandLinks && item.bLink)));
+				item.bFolder=(!(options&CONTAINER_CONTROLPANEL) && !(options&CONTAINER_NOSUBFOLDERS) && (flags&SFGAO_FOLDER) && (!(flags&(SFGAO_STREAM|SFGAO_LINK)) || (s_bExpandLinks && item.bLink)));
-				item.bFolder=(!(options&CONTAINER_CONTROLPANEL) && !(options&CONTAINER_NOSUBFOLDERS) && item.bFolderLink);
 				{
 					CItemManager::RWLock lock(&g_ItemManager,false,CItemManager::RWLOCK_ITEMS);
 					if (item.pItemInfo->IsMetroLink())

Src/StartMenu/StartMenuDLL/MenuContainer.h

@@ -453,7 +453,7 @@ private:
 			drawType=MenuSkin::COLUMN1_ITEM;
 			column=row=0;
 			memset(&itemRect,0,sizeof(itemRect));
-			bFolder=bLink=bFolderLink=bPrograms=bAlignBottom=bBreak=bInline=bInlineFirst=bInlineLast=bSplit=bHasJumpList=bMetroLink=bMetroApp=bBlankSeparator=bNew=bStartScreen=bCustomAccelerator=false;
+			bFolder=bLink=bPrograms=bAlignBottom=bBreak=bInline=bInlineFirst=bInlineLast=bSplit=bHasJumpList=bMetroLink=bMetroApp=bBlankSeparator=bNew=bStartScreen=bCustomAccelerator=false;
 			priority=0;
 			pItem1=pItem2=NULL;
 			mfuHash=0;
@@ -477,7 +477,6 @@ private:
 		RECT itemRect;
 		bool bFolder:1; // this is a folder - draw arrow
 		bool bLink:1; // this is a link (if a link to a folder is expanded it is always single-column)
-		bool bFolderLink:1; // this is a folder that is not explicitly expandable - used for sorting the list-of-links style
 		bool bPrograms:1; // this item is part of the Start Menu folder hierarchy
 		bool bAlignBottom:1; // two-column menu: this item is aligned to the bottom
 		bool bBreak:1; // two-column menu: this item starts the second column
@@ -513,8 +512,8 @@ private:
 			if (priority>item.priority) return false;
 			if (row<item.row) return true;
 			if (row>item.row) return false;
-			if (((bFolder || bFolderLink) && !bHasJumpList) && !((item.bFolder || item.bFolderLink) && !item.bHasJumpList)) return true;
+			if ((bFolder && !bHasJumpList) && !(item.bFolder && !item.bHasJumpList)) return true;
-			if (!((bFolder || bFolderLink) && !bHasJumpList) && ((item.bFolder || item.bFolderLink) && !item.bHasJumpList)) return false;
+			if (!(bFolder && !bHasJumpList) && (item.bFolder && !item.bHasJumpList)) return false;
 			if (drive && !item.drive) return true;
 			if (!drive && item.drive) return false;
 			if (drive && item.drive) return drive<item.drive;
@@ -579,19 +578,18 @@ private:
 		CString name;
 		unsigned int nameHash;
 		bool bFolder;
-		bool bFolderLink;
 		bool bHasJumpList;
 		char priority;
 		char drive;
 
-		SortMenuItem( const CString &_name, unsigned _nameHash, bool _bFolder, bool _bFolderLink, bool _bHasJumpList, char _priority ,char _drive) { name=_name; nameHash=_nameHash; bFolder=_bFolder; bFolderLink=_bFolderLink; bHasJumpList=_bHasJumpList; priority=_priority; drive=_drive; }
+		SortMenuItem( const CString &_name, unsigned _nameHash, bool _bFolder, bool _bHasJumpList, char _priority ,char _drive) { name=_name; nameHash=_nameHash; bFolder=_bFolder; bHasJumpList=_bHasJumpList; priority=_priority; drive=_drive; }
-		SortMenuItem( const MenuItem &item ) { name=item.name; nameHash=item.nameHash; bFolder=item.bFolder; bFolderLink=item.bFolderLink; bHasJumpList=item.bHasJumpList; priority=item.priority; drive=item.drive; }
+		SortMenuItem( const MenuItem &item ) { name=item.name; nameHash=item.nameHash; bFolder=item.bFolder; bHasJumpList=item.bHasJumpList; priority=item.priority; drive=item.drive; }
 		bool operator<( const SortMenuItem &x ) const
 		{
 			if (priority<x.priority) return true;
 			if (priority>x.priority) return false;
-			if (((bFolder || bFolderLink) && !bHasJumpList) && !((x.bFolder || x.bFolderLink) && !x.bHasJumpList)) return true;
+			if ((bFolder && !bHasJumpList) && !(x.bFolder && !x.bHasJumpList)) return true;
-			if (!((bFolder || bFolderLink) && !bHasJumpList) && ((x.bFolder || x.bFolderLink) && !x.bHasJumpList)) return false;
+			if (!(bFolder && !bHasJumpList) && (x.bFolder && !x.bHasJumpList)) return false;
 			if (drive && !x.drive) return true;
 			if (!drive && x.drive) return false;
 			if (drive && x.drive) return drive<x.drive;

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"

appveyor.yml

@@ -21,5 +21,5 @@ deploy:
   on:
     APPVEYOR_ACCOUNT_NAME: passionate-coder
   auth_token:
-    secure: 01CsOFRdj9KFb1hp/RlFK/F1UzGhzwGQfok6OoqcL1ipbOwRF//Phbdm7iaFVWIx
+    secure: D0QZnRZfea3qJlWOwrxE6M2jrbiSrOfz/6U7RzdeeG8N0qNDFKI7LFjYyw2I/PcR
   prerelease: true