completly removed support for clist modern icons

git-svn-id: http://svn.miranda-ng.org/main/trunk@2187 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c

4 files changed, 3 insertions, 28 deletions

diff --git a/plugins/WhenWasIt/src/dlg_handlers.cpp b/plugins/WhenWasIt/src/dlg_handlers.cpp
index 2c8114eca5..6afc682b5d 100644
--- a/plugins/WhenWasIt/src/dlg_handlers.cpp
+++ b/plugins/WhenWasIt/src/dlg_handlers.cpp
@@ -31,9 +31,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 

 static WNDPROC OldBirthdaysListProc = NULL;

 

-const TCHAR *szAdvancedIcons[] = {_T("RES0"), _T("Email"), _T("Web"), _T("SMS"), _T("Advanced 1"), _T("Advanced 2"), _T("Advanced 3"), _T("Client"), _T("Advanced 4"), _T("Protocol"), _T("RES2/VisMode")};

-const int cAdvancedIcons = sizeof(szAdvancedIcons) / sizeof(szAdvancedIcons[0]); //don't forget to modify icons.cpp

-

 const TCHAR *szShowAgeMode[] = {_T("Upcoming age"), _T("Current age")};

 const int cShowAgeMode = sizeof(szShowAgeMode) / sizeof(szShowAgeMode[0]);

 

@@ -102,11 +99,6 @@ int EnableDialogGroup(HWND hWnd, int enable)
 int AddInfoToComboBoxes(HWND hWnd)

 {

 	int i;

-	TCHAR *buffer;

-	for (i = 0; i < cAdvancedIcons; i++) {

-		buffer = TranslateTS(szAdvancedIcons[i]);

-		SendMessage(GetDlgItem(hWnd, IDC_ADVANCED_ICON), CB_ADDSTRING, 0, (LPARAM) buffer);

-	}

 

 	for (i = 0; i < cShowAgeMode; i++)

 		SendMessage(GetDlgItem(hWnd, IDC_AGE_COMBOBOX), CB_ADDSTRING, 0, (LPARAM) TranslateTS(szShowAgeMode[i]));

@@ -143,10 +135,9 @@ SIZE GetControlTextSize(HWND hCtrl)
 int EnlargeControl(HWND hCtrl, HWND hGroup, SIZE oldSize)

 {

 	SIZE size = GetControlTextSize(hCtrl);

-	int offset = 0;

 	RECT rect;

 	GetWindowRect(hCtrl, &rect);

-	offset = (rect.right - rect.left) - oldSize.cx;

+	int offset = (rect.right - rect.left) - oldSize.cx;

 	SetWindowPos(hCtrl, HWND_TOP, 0, 0, size.cx + offset, oldSize.cy, SWP_NOMOVE);

 	SetWindowPos(hCtrl, HWND_BOTTOM, 0, 0, 0, 0, SWP_NOMOVE | SWP_NOSIZE);

 	//RedrawWindow(hCtrl, NULL, NULL, RDW_ERASE | RDW_INVALIDATE | RDW_ALLCHILDREN | RDW_ERASENOW);

diff --git a/plugins/WhenWasIt/src/hooked_events.cpp b/plugins/WhenWasIt/src/hooked_events.cpp
index bb2d44dd9b..da974281c7 100644
--- a/plugins/WhenWasIt/src/hooked_events.cpp
+++ b/plugins/WhenWasIt/src/hooked_events.cpp
@@ -26,21 +26,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #define EXCLUDE_HIDDEN  1

 #define EXCLUDE_IGNORED 2

 

-#define HOST "http://eblis.tla.ro/projects"

-

-

-#define WHENWASIT_DATA "WhenWasIt%20unicode"

-

-

-#if defined(WIN64) || defined(_WIN64)

-#define WHENWASIT_VERSION_URL HOST "/miranda/WhenWasIt/updater/x64/WhenWasIt.html"

-#define WHENWASIT_UPDATE_URL HOST "/miranda/WhenWasIt/updater/x64/" WHENWASIT_DATA ".zip"

-#else

-#define WHENWASIT_VERSION_URL HOST "/miranda/WhenWasIt/updater/WhenWasIt.html"

-#define WHENWASIT_UPDATE_URL HOST "/miranda/WhenWasIt/updater/" WHENWASIT_DATA ".zip"

-#endif

-#define WHENWASIT_VERSION_PREFIX "WhenWasIt version "

-

 HANDLE hModulesLoaded;

 HANDLE hOptionsInitialize;

 HANDLE hIconsChanged;

diff --git a/plugins/WhenWasIt/src/resource.h b/plugins/WhenWasIt/src/resource.h
index e43831ac79..2df37cf7f3 100644
--- a/plugins/WhenWasIt/src/resource.h
+++ b/plugins/WhenWasIt/src/resource.h
@@ -1,6 +1,6 @@
 //{{NO_DEPENDENCIES}}

 // Microsoft Visual C++ generated include file.

-// Used by WhenWasIt.rc

+// Used by C:\Users\xx\Documents\Visual Studio 2010\Projects\myranda\plugins\WhenWasIt\res\WhenWasIt.rc

 //

 #define IDD_OPT_WWI                     101

 #define IDI_BIRTHDAYS                   102

@@ -68,7 +68,7 @@
 #define IDC_OPENINBACKGROUND            1047

 

 // Next default values for new objects

-//

+// 

 #ifdef APSTUDIO_INVOKED

 #ifndef APSTUDIO_READONLY_SYMBOLS

 #define _APS_NEXT_RESOURCE_VALUE        129

diff --git a/plugins/WhenWasIt/src/services.cpp b/plugins/WhenWasIt/src/services.cpp
index 6da69a5a23..c7546138d5 100644
--- a/plugins/WhenWasIt/src/services.cpp
+++ b/plugins/WhenWasIt/src/services.cpp
@@ -45,7 +45,6 @@ int InitServices()
 	commonData.popupTimeout = DBGetContactSettingWord(NULL, ModuleName, "PopupTimeout", POPUP_TIMEOUT);

 	commonData.popupTimeoutToday = DBGetContactSettingWord(NULL, ModuleName, "PopupTimeoutToday", commonData.popupTimeout);

 	commonData.bUsePopups = DBGetContactSettingByte(NULL, ModuleName, "UsePopups", TRUE);

-	commonData.bUseClistIcon = DBGetContactSettingByte(NULL, ModuleName, "UseClistIcon", TRUE);

 	commonData.bUseDialog = DBGetContactSettingByte(NULL, ModuleName, "UseDialog", TRUE);

 	commonData.bIgnoreSubcontacts = DBGetContactSettingByte(NULL, ModuleName, "IgnoreSubcontacts", FALSE);

 	commonData.cShowAgeMode = DBGetContactSettingByte(NULL, ModuleName, "ShowCurrentAge", FALSE);