Removed support for TrayExecuteL and TrayExecuteDL

Library/Rainmeter.cpp

@@ -2205,10 +2205,8 @@ void CRainmeter::ReadGeneralSettings(const std::wstring& iniFile)
 		LogWithArgs(LOG_NOTICE, L"LogViewer: %s", m_LogViewer.c_str());
 	}
 
-	m_TrayExecuteL = parser.ReadString(L"Rainmeter", L"TrayExecuteL", L"", false);
 	m_TrayExecuteR = parser.ReadString(L"Rainmeter", L"TrayExecuteR", L"", false);
 	m_TrayExecuteM = parser.ReadString(L"Rainmeter", L"TrayExecuteM", L"", false);
-	m_TrayExecuteDL = parser.ReadString(L"Rainmeter", L"TrayExecuteDL", L"", false);
 	m_TrayExecuteDR = parser.ReadString(L"Rainmeter", L"TrayExecuteDR", L"", false);
 	m_TrayExecuteDM = parser.ReadString(L"Rainmeter", L"TrayExecuteDM", L"", false);
 
@@ -2378,7 +2376,6 @@ void CRainmeter::LoadTheme(const std::wstring& name)
 		PreserveSetting(backup, L"DisableVersionCheck");
 		PreserveSetting(backup, L"Language");
 		PreserveSetting(backup, L"NormalStayDesktop");
-		PreserveSetting(backup, L"TrayExecuteL", false);
 		PreserveSetting(backup, L"TrayExecuteM", false);
 		PreserveSetting(backup, L"TrayExecuteR", false);
 		PreserveSetting(backup, L"TrayExecuteDM", false);

Library/Rainmeter.h

@@ -210,11 +210,9 @@ public:
 	bool IsMenuActive() { return m_MenuActive; }
 	void ShowContextMenu(POINT pos, CMeterWindow* meterWindow);
 
-	const std::wstring& GetTrayExecuteL() { return m_TrayExecuteL; }
 	const std::wstring& GetTrayExecuteR() { return m_TrayExecuteR; }
 	const std::wstring& GetTrayExecuteM() { return m_TrayExecuteM; }
 	const std::wstring& GetTrayExecuteDR() { return m_TrayExecuteDR; }
-	const std::wstring& GetTrayExecuteDL() { return m_TrayExecuteDL; }
 	const std::wstring& GetTrayExecuteDM() { return m_TrayExecuteDM; }
 
 	void ExecuteCommand(const WCHAR* command, CMeterWindow* meterWindow);
@@ -288,10 +286,8 @@ private:
 
 	std::wstring m_StatsDate;					// The date when stats gathering started
 
-	std::wstring m_TrayExecuteL;
 	std::wstring m_TrayExecuteR;
 	std::wstring m_TrayExecuteM;
-	std::wstring m_TrayExecuteDL;
 	std::wstring m_TrayExecuteDR;
 	std::wstring m_TrayExecuteDM;
 

Library/TrayWindow.cpp

@@ -101,10 +101,8 @@ CTrayWindow::~CTrayWindow()
 	if (m_Window) DestroyWindow(m_Window);
 }
 
-BOOL CTrayWindow::AddTrayIcon()
+void CTrayWindow::AddTrayIcon()
 {
-	BOOL res = FALSE;
-
 	if (m_TrayIcon)
 	{
 		DestroyIcon(m_TrayIcon);
@@ -123,15 +121,12 @@ BOOL CTrayWindow::AddTrayIcon()
 		tnid.hIcon = m_TrayIcon;
 		wcsncpy_s(tnid.szTip, L"Rainmeter", _TRUNCATE);
 
-		res = Shell_NotifyIcon(NIM_ADD, &tnid);
+		Shell_NotifyIcon(NIM_ADD, &tnid);
 	}
-	return res;
 }
 
-BOOL CTrayWindow::RemoveTrayIcon()
+void CTrayWindow::RemoveTrayIcon()
 {
-	BOOL res = FALSE;
-
 	if (m_TrayIcon)
 	{
 		NOTIFYICONDATA tnid = {sizeof(NOTIFYICONDATA)};
@@ -139,19 +134,15 @@ BOOL CTrayWindow::RemoveTrayIcon()
 		tnid.uID = IDI_TRAY;
 		tnid.uFlags = 0;
 
-		res = Shell_NotifyIcon(NIM_DELETE, &tnid);
+		Shell_NotifyIcon(NIM_DELETE, &tnid);
 
 		DestroyIcon(m_TrayIcon);
 		m_TrayIcon = NULL;
 	}
-
-	return res;
 }
 
-BOOL CTrayWindow::ModifyTrayIcon(double value)
+void CTrayWindow::ModifyTrayIcon(double value)
 {
-	BOOL res = FALSE;
-
 	if (m_TrayIcon)
 	{
 		DestroyIcon(m_TrayIcon);
@@ -166,8 +157,7 @@ BOOL CTrayWindow::ModifyTrayIcon(double value)
 	tnid.uFlags = NIF_ICON;
 	tnid.hIcon = m_TrayIcon;
 
-	res = Shell_NotifyIcon(NIM_MODIFY, &tnid);
+	Shell_NotifyIcon(NIM_MODIFY, &tnid);
-	return res;
 }
 
 HICON CTrayWindow::CreateTrayIcon(double value)
@@ -406,7 +396,6 @@ void CTrayWindow::ReadConfig(CConfigParser& parser)
 	}
 }
 
-
 LRESULT CALLBACK CTrayWindow::WndProc(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam)
 {
 	CTrayWindow* tray = Rainmeter->GetTrayWindow();
@@ -521,10 +510,6 @@ LRESULT CALLBACK CTrayWindow::WndProc(HWND hWnd, UINT uMsg, WPARAM wParam, LPARA
 
 			switch (uMouseMsg)
 			{
-			case WM_LBUTTONDOWN:
-				bang = Rainmeter->GetTrayExecuteL();
-				break;
-
 			case WM_MBUTTONDOWN:
 				bang = Rainmeter->GetTrayExecuteM();
 				break;
@@ -533,10 +518,6 @@ LRESULT CALLBACK CTrayWindow::WndProc(HWND hWnd, UINT uMsg, WPARAM wParam, LPARA
 				bang = Rainmeter->GetTrayExecuteR();
 				break;
 
-			case WM_LBUTTONDBLCLK:
-				bang = Rainmeter->GetTrayExecuteDL();
-				break;
-
 			case WM_MBUTTONDBLCLK:
 				bang = Rainmeter->GetTrayExecuteDM();
 				break;
@@ -611,11 +592,6 @@ LRESULT CALLBACK CTrayWindow::WndProc(HWND hWnd, UINT uMsg, WPARAM wParam, LPARA
 				sendCopyData(Rainmeter->GetStatsDate());
 				return 0;
 			}
-			else if (wParam == RAINMETER_QUERY_ID_TRAY_EX_L)
-			{
-				sendCopyData(Rainmeter->GetTrayExecuteL());
-				return 0;
-			}
 			else if (wParam == RAINMETER_QUERY_ID_TRAY_EX_R)
 			{
 				sendCopyData(Rainmeter->GetTrayExecuteR());
@@ -626,11 +602,6 @@ LRESULT CALLBACK CTrayWindow::WndProc(HWND hWnd, UINT uMsg, WPARAM wParam, LPARA
 				sendCopyData(Rainmeter->GetTrayExecuteM());
 				return 0;
 			}
-			else if (wParam == RAINMETER_QUERY_ID_TRAY_EX_DL)
-			{
-				sendCopyData(Rainmeter->GetTrayExecuteDL());
-				return 0;
-			}
 			else if (wParam == RAINMETER_QUERY_ID_TRAY_EX_DR)
 			{
 				sendCopyData(Rainmeter->GetTrayExecuteDR());

SkinInstaller/Rainstaller.cpp

@@ -1368,10 +1368,8 @@ void LaunchRainmeter()
 			PreserveSetting(iniFile, backupFile, L"Rainmeter", L"Logging");
 			PreserveSetting(iniFile, backupFile, L"Rainmeter", L"DisableVersionCheck");
 			PreserveSetting(iniFile, backupFile, L"Rainmeter", L"Language");
-			PreserveSetting(iniFile, backupFile, L"Rainmeter", L"TrayExecuteL");
 			PreserveSetting(iniFile, backupFile, L"Rainmeter", L"TrayExecuteM");
 			PreserveSetting(iniFile, backupFile, L"Rainmeter", L"TrayExecuteR");
-			PreserveSetting(iniFile, backupFile, L"Rainmeter", L"TrayExecuteDL");
 			PreserveSetting(iniFile, backupFile, L"Rainmeter", L"TrayExecuteDM");
 			PreserveSetting(iniFile, backupFile, L"Rainmeter", L"TrayExecuteDR");
 		}