patch from Wishmaster51:

-link to skins section in options page
-unhook events on exit
-some typos
and resource optimization


git-svn-id: http://miranda-plugins.googlecode.com/svn/trunk@83 e753b5eb-9565-29b2-b5c5-2cc6f99dfbcb

6 files changed, 63 insertions, 64 deletions

diff --git a/popup/resource.h b/popup/resource.h
index 4ab7ccb..f6124bb 100644
--- a/popup/resource.h
+++ b/popup/resource.h
@@ -2,39 +2,39 @@
 // Microsoft Visual C++ generated include file.

 // Used by resource.rc

 //

-#define IDD_OPT_POPUP                   107

-#define IDD_OPT_POPUP_ADVANCED          117

+#define IDD_OPT_POPUP                   101

+#define IDD_OPT_POPUP_ADVANCED          102

+#define IDD_OPT_SKIN2                   103

+#define IDD_OPT_ACTIONS                 104

+#define IDD_OPT_NOTIFICATIONS           105

+#define IDD_OPT_CONTACTS                106

+#define IDD_OPT_POPUP_GENERAL           107

+#define IDD_HISTORY                     108

+#define IDD_POSITION                    109

+#define IDB_NOAVATAR                    110

+#define IDR_WHATSNEW                    111

 #define IDI_POPUP                       118

 #define IDI_NOPOPUP                     120

-#define IDD_OPT_SKIN2                   178

-#define IDD_HISTORY                     183

 #define IDI_HISTORY                     184

 #define IDI_RELOAD                      185

-#define IDB_NOAVATAR                    186

-#define IDR_WHATSNEW                    187

 #define IDI_MB_STOP                     189

 #define IDI_MB_INFO                     191

 #define IDI_MB_WARN                     194

-#define IDD_POSITION                    195

 #define IDI_RESIZE                      196

 #define IDI_OPT_CHECK_OFF               198

-#define IDD_OPT_ACTIONS                 198

 #define IDI_OPT_CHECK_ON                199

-#define IDD_OPT_NOTIFICATIONS           199

 #define IDI_OPT_RADIO_OFF               200

-#define IDD_OPT_CONTACTS                200

 #define IDI_OPT_RADIO_ON                201

-#define IDD_OPT_POPUP_PAGE1             202

 #define IDI_ACT_INFO                    203

 #define IDI_ACT_MENU                    204

 #define IDI_ACT_MESSAGE                 205

 #define IDI_ACT_OK                      206

-#define IDI_OPT_SHOWDEF                 206

 #define IDI_ACT_ADD                     207

 #define IDI_ACT_CLOSE                   208

 #define IDI_ACT_PINNED                  209

 #define IDI_ACT_PIN                     210

 #define IDI_ACT_COPY                    211

+#define IDI_OPT_SHOWDEF                 212

 #define IDI_OPT_GROUP                   213

 #define IDI_OPT_FULLSCREEN              215

 #define IDI_OPT_BLOCK                   216

@@ -60,14 +60,10 @@
 #define IDC_MULTIMONITOR_DESC           1036

 #define IDC_MIRANDAWND                  1037

 #define IDC_ACTIVEWND                   1038

-#define IDC_GRP_MULTIMONITOR2           1040

 #define IDC_AVT_BORDER                  1050

 #define IDC_AVT_PNGBORDER               1051

-#define IDC_AVT_RADIUSTXT1              1052

 #define IDC_AVT_RADIUS                  1053

 #define IDC_AVT_RADIUS_SPIN             1054

-#define IDC_AVT_RADIUSTXT2              1055

-#define IDC_AVT_SIZETXT1                1056

 #define IDC_AVT_SIZE_SLIDE              1057

 #define IDC_AVT_SIZE                    1058

 #define IDC_AVT_REQUEST                 1059

@@ -99,33 +95,32 @@
 #define IDC_SDND2                       1116

 #define IDC_TREE1                       1117

 #define IDC_SKINLIST                    1118

-#define IDC_SFREE4CHAT2                 1118

 #define IDC_SINVISIBLE2                 1119

 #define IDC_SPHONE2                     1120

 #define IDC_SLUNCH2                     1121

 #define IDC_TXT_TIMEOUT_SEC             1122

 #define IDC_PREVIEWBOX                  1123

-#define IDC_TXT_TIMEOUT_DEFAULT         1123

 #define IDC_TXT_TIMEOUT_INFINITE        1124

+#define IDC_SFREE4CHAT2                 1125

+#define IDC_TXT_TIMEOUT_DEFAULT         1126

 #define IDC_POPUP_LIST                  1134

 #define IDC_SHOWHISTORY                 1135

 #define IDC_ENABLE_HISTORY              1137

 #define IDC_HPPLOG                      1138

 #define IDC_BTN_RELOAD                  1144

 #define IDC_MAXPOPUPS                   1145

-#define IDC_FONTS_STATIC                1146

-#define IDC_HISTORYSIZE                 1146

 #define IDC_HISTORY_STATIC1             1147

 #define IDC_HISTORY_STATIC2             1148

+#define IDC_HISTORYSIZE                 1149

 #define IDC_TITLE                       1150

-#define IDC_TXT_TOP                     1164

+#define IDC_TXT_TOP                     1163

 #define IDC_TIMEOUT_SPIN                1164

 #define IDC_TXT_LEFT                    1165

 #define IDC_TXT_RIGHT                   1166

-#define IDC_LIST                        1166

 #define IDC_TXT_BOTTOM                  1167

-#define IDC_ACTIONS                     1167

 #define IDC_TXT_SPACING                 1168

+#define IDC_LIST                        1169

+#define IDC_ACTIONS                     1170

 #define IDC_CHK_ENABLEACTIONS           1175

 #define IDC_CHK_IMCONTACTSONLY          1176

 #define IDC_CHK_LARGEICONS              1177

@@ -135,19 +130,16 @@
 #define IDC_RD_RIGHTICONS               1181

 #define IDC_RD_LEFTICONS                1182

 #define IDC_ICO_INFO                    1183

-#define IDC_GRP_GENERAL                 1184

 #define IDC_GRP_CUSTOMACTIONS           1185

 #define IDC_GRP_SIZEPOSITION            1186

 #define IDC_GRP_ACTIONS                 1187

-#define IDC_TXT_INFO                    1188

 #define IDC_TXT_CUSTOMACTIONS           1189

 #define IDC_TXT_POSITION                1190

 #define IDC_ICO_RESTART                 1191

-#define IDC_TXT_POSITION2               1191

 #define IDC_TXT_RESTART                 1192

 #define IDC_MORE                        1193

-#define IDC_GRP_SIZEPOSITION2           1193

 #define IDC_TXT_TITLE1                  1194

+#define IDC_TXT_POSITION2               1195

 #define IDC_TXT_TITLE3                  1196

 #define IDC_TXT_TITLE4                  1197

 #define IDC_ENABLE                      1198

@@ -159,7 +151,8 @@
 #define IDC_ICO_FULLSCREEN              1204

 #define IDC_ICO_BLOCK                   1205

 #define IDC_ICO_AUTO                    1206

-#define IDC_ICO_OK                      1206

+#define IDC_GRP_SIZEPOSITION2           1207

+#define IDC_ICO_OK                      1208

 #define IDC_CB_RIGHT                    1213

 #define IDC_CB_MIDDLE                   1214

 #define IDC_CB_LEFT                     1215

@@ -178,15 +171,14 @@
 #define IDC_USEMAXIMUMWIDTH             1229

 #define IDC_MAXIMUMWIDTH                1230

 #define IDC_MAXIMUMWIDTH_SPIN           1231

-#define IDC_WHERE_TEXT                  1232

 #define IDC_WHERE                       1233

 #define IDC_CUSTOMPOS                   1234

-#define IDC_LAYOUT_TEXT                 1235

 #define IDC_LAYOUT                      1236

 #define IDC_REORDERPOPUPS               1238

 #define IDC_POPUPENABLED                1240

 #define IDC_DISABLEINFS                 1241

 #define IDC_STATUSES                    1242

+#define IDC_GETSKINS                    1243

 #define IDC_CHK_OFFLINE                 40071

 #define IDC_CHK_ONLINE                  40072

 #define IDC_CHK_NA                      40075

@@ -200,7 +192,7 @@
 #ifndef APSTUDIO_READONLY_SYMBOLS

 #define _APS_NEXT_RESOURCE_VALUE        224

 #define _APS_NEXT_COMMAND_VALUE         40001

-#define _APS_NEXT_CONTROL_VALUE         1249

+#define _APS_NEXT_CONTROL_VALUE         1244

 #define _APS_NEXT_SYMED_VALUE           101

 #endif

 #endif

diff --git a/popup/resource.rc b/popup/resource.rc
index 1d01f2c..2388d74 100644
--- a/popup/resource.rc
+++ b/popup/resource.rc
@@ -66,7 +66,7 @@ EXSTYLE WS_EX_CONTROLPARENT
 FONT 8, "MS Shell Dlg", 0, 0, 0x1

 BEGIN

     GROUPBOX        "Content && Style",IDC_STATIC,3,3,143,151

-    LTEXT           "Go to Customize > Fonts && Colors for fonts and colors options",IDC_FONTS_STATIC,28,60,113,18

+    LTEXT           "Go to Customize > Fonts && Colors for fonts and colors options",IDC_STATIC,28,60,113,18

     GROUPBOX        "Miscellaneous",IDC_STATIC,3,159,143,38

     GROUPBOX        "Effects",IDC_STATIC,151,84,146,113

     PUSHBUTTON      "Live Preview",IDC_PREVIEW,219,203,73,14

@@ -90,11 +90,11 @@ BEGIN
     CONTROL         "Draw avatar borders",IDC_AVT_BORDER,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,9,74,134,8

     CONTROL         "Draw borders for semitransparent avatars too",IDC_AVT_PNGBORDER,

                     "Button",BS_AUTOCHECKBOX | BS_LEFT | BS_TOP | BS_MULTILINE | WS_TABSTOP,21,85,118,18

-    LTEXT           "Round corners by",IDC_AVT_RADIUSTXT1,9,103,74,12,SS_CENTERIMAGE

+    LTEXT           "Round corners by",IDC_STATIC,9,103,74,12,SS_CENTERIMAGE

     EDITTEXT        IDC_AVT_RADIUS,83,103,39,12,ES_RIGHT | ES_AUTOHSCROLL | ES_NUMBER

     CONTROL         "",IDC_AVT_RADIUS_SPIN,"msctls_updown32",UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | UDS_NOTHOUSANDS,112,103,11,14

-    LTEXT           "pixels",IDC_AVT_RADIUSTXT2,125,103,18,12,SS_CENTERIMAGE

-    LTEXT           "Avatar size:",IDC_AVT_SIZETXT1,9,116,44,12,SS_CENTERIMAGE

+    LTEXT           "pixels",IDC_STATIC,125,103,18,12,SS_CENTERIMAGE

+    LTEXT           "Avatar size:",IDC_STATIC,9,116,44,12,SS_CENTERIMAGE

     CONTROL         "",IDC_AVT_SIZE_SLIDE,"msctls_trackbar32",WS_TABSTOP,53,116,72,12

     CTEXT           "32",IDC_AVT_SIZE,125,116,17,12,SS_CENTERIMAGE | NOT WS_GROUP

     CONTROL         "Enable avatar updates",IDC_AVT_REQUEST,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,9,132,134,8

@@ -114,7 +114,7 @@ BEGIN
     CONTROL         "Slide Popup",IDC_USEANIMATIONS,"Button",BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP,157,79,136,8

     LTEXT           "Effect:",IDC_EFFECT_TXT,157,90,33,12,SS_CENTERIMAGE

     COMBOBOX        IDC_EFFECT,191,91,78,64,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP

-    RTEXT           "Time (in)..:",IDC_FADEIN_TXT1,157,107,69,12,SS_CENTERIMAGE

+    RTEXT           "Time (in):",IDC_FADEIN_TXT1,157,107,69,12,SS_CENTERIMAGE

     EDITTEXT        IDC_FADEIN,230,107,39,12,ES_RIGHT | ES_AUTOHSCROLL | ES_NUMBER

     CONTROL         "",IDC_FADEIN_SPIN,"msctls_updown32",UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | UDS_NOTHOUSANDS,257,107,11,14

     LTEXT           "ms",IDC_FADEIN_TXT2,274,107,20,12,SS_CENTERIMAGE

@@ -127,6 +127,7 @@ BEGIN
     ICON            IDI_MB_WARN,IDC_ICO_RESTART,8,201,20,20,SS_CENTERIMAGE | SS_REALSIZEIMAGE | NOT WS_VISIBLE

     LTEXT           "*need restart",IDC_TXT_RESTART,36,203,83,14,SS_CENTERIMAGE | NOT WS_VISIBLE

     PUSHBUTTON      "Live Preview",IDC_PREVIEW,219,203,73,14

+    CONTROL         "Download more skins",IDC_GETSKINS,"Hyperlink",WS_TABSTOP,109,204,100,16

 END

 

 IDD_OPT_SKIN2 DIALOGEX 0, 0, 304, 228

@@ -185,10 +186,10 @@ STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD
 EXSTYLE WS_EX_CONTROLPARENT

 FONT 8, "MS Shell Dlg", 0, 0, 0x1

 BEGIN

-    GROUPBOX        "General",IDC_GRP_GENERAL,3,3,143,45

+    GROUPBOX        "General",IDC_STATIC,3,3,143,45

     CONTROL         "Enable popup actions",IDC_CHK_ENABLEACTIONS,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,8,14,136,10

     ICON            IDI_MB_INFO,IDC_ICO_INFO,6,23,21,20,SS_CENTERIMAGE | SS_REALSIZEIMAGE

-    LTEXT           "Popup Actions are those tiny buttons below notification text.",IDC_TXT_INFO,27,24,116,22

+    LTEXT           "Popup Actions are those tiny buttons below notification text.",IDC_STATIC,27,24,116,22

     GROUPBOX        "Common Actions",IDC_GRP_CUSTOMACTIONS,3,51,143,71

     LTEXT           "Please choose in what cases default actions should be added:",IDC_TXT_CUSTOMACTIONS,8,61,136,17

     CONTROL         "Add info && menu for IM contacts only",IDC_CHK_IMCONTACTSONLY,

@@ -220,7 +221,7 @@ STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD
 EXSTYLE WS_EX_CONTROLPARENT

 FONT 8, "MS Shell Dlg", 0, 0, 0x1

 BEGIN

-    GROUPBOX        "Notifications",IDC_GRP_GENERAL,3,3,294,194

+    GROUPBOX        "Notifications",IDC_STATIC,3,3,294,194

     CONTROL         "",IDC_TREE1,"SysTreeView32",TVS_HASBUTTONS | TVS_HASLINES | TVS_LINESATROOT | TVS_DISABLEDRAGDROP | TVS_SHOWSELALWAYS | TVS_INFOTIP | WS_BORDER | WS_HSCROLL | WS_TABSTOP,8,13,99,179

     LTEXT           "General options",IDC_TXT_TITLE1,112,13,180,8

     CONTROL         "Enable this notification",IDC_ENABLE,"Button",BS_AUTOCHECKBOX | BS_LEFT | BS_VCENTER | WS_TABSTOP,122,26,170,8

@@ -281,7 +282,7 @@ BEGIN
     LTEXT           "Show default",IDC_STATIC,30,198,49,20,SS_CENTERIMAGE

 END

 

-IDD_OPT_POPUP_PAGE1 DIALOGEX 0, 0, 304, 228

+IDD_OPT_POPUP_GENERAL DIALOGEX 0, 0, 304, 228

 STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD

 EXSTYLE WS_EX_CONTROLPARENT

 FONT 8, "MS Shell Dlg", 0, 0, 0x1

@@ -301,14 +302,14 @@ BEGIN
     CONTROL         "Maximum width",IDC_USEMAXIMUMWIDTH,"Button",BS_AUTOCHECKBOX | BS_VCENTER | BS_NOTIFY | WS_TABSTOP,7,95,88,12,WS_EX_RIGHT

     EDITTEXT        IDC_MAXIMUMWIDTH,100,95,40,12,ES_RIGHT | ES_AUTOHSCROLL | ES_NUMBER

     CONTROL         "",IDC_MAXIMUMWIDTH_SPIN,"msctls_updown32",UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | UDS_NOTHOUSANDS,128,93,11,14

-    RTEXT           "Position:",IDC_WHERE_TEXT,7,110,34,12,SS_CENTERIMAGE

+    RTEXT           "Position:",IDC_STATIC,7,110,34,12,SS_CENTERIMAGE

     COMBOBOX        IDC_WHERE,46,110,79,70,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP

     CONTROL         "...",IDC_CUSTOMPOS,"MButtonClass",WS_TABSTOP,127,110,14,13

-    RTEXT           "Layout:",IDC_LAYOUT_TEXT,7,125,34,12,SS_CENTERIMAGE

+    RTEXT           "Layout:",IDC_STATIC,7,125,34,12,SS_CENTERIMAGE

     COMBOBOX        IDC_LAYOUT,46,125,94,64,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP

     GROUPBOX        "Miscellaneous",IDC_STATIC,3,147,143,50

     CONTROL         "Reorder Popups",IDC_REORDERPOPUPS,"Button",BS_AUTOCHECKBOX | BS_NOTIFY | WS_TABSTOP,9,158,133,8

-    GROUPBOX        "Disable when:",IDC_GRP_MULTIMONITOR2,151,3,146,194

+    GROUPBOX        "Disable when:",IDC_STATIC,151,3,146,194

     CONTROL         "Always (has priority)",IDC_POPUPENABLED,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,159,15,135,8

     CONTROL         "Fullscreen mode",IDC_DISABLEINFS,"Button",BS_AUTOCHECKBOX | BS_NOTIFY | WS_TABSTOP,159,26,135,8

     CONTROL         "Tree1",IDC_STATUSES,"SysTreeView32",WS_BORDER | WS_HSCROLL | WS_TABSTOP,159,39,130,151

@@ -365,7 +366,7 @@ IDR_WHATSNEW            TEXT                    "res\\whatsnew.txt"
 #ifdef APSTUDIO_INVOKED

 GUIDELINES DESIGNINFO

 BEGIN

-    IDD_OPT_POPUP_PAGE1, DIALOG

+    IDD_OPT_POPUP_GENERAL, DIALOG

     BEGIN

         HORZGUIDE, 203

     END

diff --git a/popup/src/main.cpp b/popup/src/main.cpp
index 8dd9ae9..41ad1b5 100644
--- a/popup/src/main.cpp
+++ b/popup/src/main.cpp
@@ -143,7 +143,7 @@ static int OptionsInitialize(WPARAM wParam,LPARAM lParam)
 

 	odp.ptszTab			= LPGENT("General");

 	odp.pfnDlgProc		= DlgProcPopUpGeneral;

-	odp.pszTemplate		= MAKEINTRESOURCEA(IDD_OPT_POPUP_PAGE1);

+	odp.pszTemplate		= MAKEINTRESOURCEA(IDD_OPT_POPUP_GENERAL);

 	CallService(MS_OPT_ADDPAGE,wParam,(LPARAM)&odp);

 

 	odp.ptszTab			= LPGENT("Classes");

@@ -151,11 +151,6 @@ static int OptionsInitialize(WPARAM wParam,LPARAM lParam)
 	odp.pszTemplate		= MAKEINTRESOURCEA(IDD_OPT_NOTIFICATIONS);

 	CallService( MS_OPT_ADDPAGE, wParam,(LPARAM)&odp );

 

-	odp.ptszTab			= LPGENT("Skins");

-	odp.pfnDlgProc		= DlgProcPopSkinsOpts;

-	odp.pszTemplate		= MAKEINTRESOURCEA(IDD_OPT_SKIN2);

-	CallService(MS_OPT_ADDPAGE,wParam,(LPARAM)&odp);

-

 	odp.ptszTab			= LPGENT("Actions");

 	odp.pfnDlgProc		= DlgProcPopupActions;

 	odp.pszTemplate		= MAKEINTRESOURCEA(IDD_OPT_ACTIONS);

@@ -172,6 +167,12 @@ static int OptionsInitialize(WPARAM wParam,LPARAM lParam)
 	odp.flags			|= ODPF_EXPERTONLY;

 	CallService(MS_OPT_ADDPAGE,wParam,(LPARAM)&odp);

 

+	odp.ptszGroup		= LPGENT("Skins");

+	odp.ptszTab			= LPGENT(MODULNAME_PLU);

+	odp.pfnDlgProc		= DlgProcPopSkinsOpts;

+	odp.pszTemplate		= MAKEINTRESOURCEA(IDD_OPT_SKIN2);

+	CallService(MS_OPT_ADDPAGE,wParam,(LPARAM)&odp);

+

 	//Test page

 	//odp.ptszTab			= LPGEN("General (old)");

 	//odp.pfnDlgProc		= DlgProcPopUpOpts;

diff --git a/popup/src/opt_class.cpp b/popup/src/opt_class.cpp
index 12b1233..b6376b8 100644
--- a/popup/src/opt_class.cpp
+++ b/popup/src/opt_class.cpp
@@ -160,7 +160,7 @@ INT_PTR CALLBACK DlgProcOptsClasses(HWND hwnd, UINT msg, WPARAM wParam, LPARAM l
 		{IDC_SOFFLINE,		SKINICON_STATUS_OFFLINE,	"Offline",			PF2_IDLE,		PF2_IDLE},

 		{IDC_SONLINE,		SKINICON_STATUS_ONLINE,		"Online",			PF2_ONLINE,		PF2_ONLINE},

 		{IDC_SAWAY,			SKINICON_STATUS_AWAY,		"Away",				PF2_SHORTAWAY,	PF2_SHORTAWAY},

-		{IDC_SNA,			SKINICON_STATUS_NA,			"N/A",				PF2_LONGAWAY,	PF2_LONGAWAY},

+		{IDC_SNA,			SKINICON_STATUS_NA,			"NA",				PF2_LONGAWAY,	PF2_LONGAWAY},

 		{IDC_SOCCUPIED,		SKINICON_STATUS_OCCUPIED,	"Occupied",			PF2_LIGHTDND,	PF2_LIGHTDND},

 		{IDC_SDND,			SKINICON_STATUS_DND,		"DND",				PF2_HEAVYDND,	PF2_HEAVYDND},

 		{IDC_SFREE4CHAT,	SKINICON_STATUS_FREE4CHAT,	"Free for chat",	PF2_FREECHAT,	PF2_FREECHAT},

@@ -171,7 +171,7 @@ INT_PTR CALLBACK DlgProcOptsClasses(HWND hwnd, UINT msg, WPARAM wParam, LPARAM l
 		{IDC_SOFFLINE2,		SKINICON_STATUS_OFFLINE,	"Offline",			PF2_IDLE,		PF2_IDLE<<16},

 		{IDC_SONLINE2,		SKINICON_STATUS_ONLINE,		"Online",			PF2_ONLINE,		PF2_ONLINE<<16},

 		{IDC_SAWAY2,		SKINICON_STATUS_AWAY,		"Away",				PF2_SHORTAWAY,	PF2_SHORTAWAY<<16},

-		{IDC_SNA2,			SKINICON_STATUS_NA,			"N/A",				PF2_LONGAWAY,	PF2_LONGAWAY<<16},

+		{IDC_SNA2,			SKINICON_STATUS_NA,			"NA",				PF2_LONGAWAY,	PF2_LONGAWAY<<16},

 		{IDC_SOCCUPIED2,	SKINICON_STATUS_OCCUPIED,	"Occupied",			PF2_LIGHTDND,	PF2_LIGHTDND<<16},

 		{IDC_SDND2,			SKINICON_STATUS_DND,		"DND",				PF2_HEAVYDND,	PF2_HEAVYDND<<16},

 		{IDC_SFREE4CHAT2,	SKINICON_STATUS_FREE4CHAT,	"Free for chat",	PF2_FREECHAT,	PF2_FREECHAT<<16},

@@ -396,7 +396,7 @@ INT_PTR CALLBACK DlgProcOptsClasses(HWND hwnd, UINT msg, WPARAM wParam, LPARAM l
 							OPENOPTIONSDIALOG ood = {0};

 							ood.cbSize = sizeof(OPENOPTIONSDIALOG);

 							ood.pszGroup = "Customize";

-							ood.pszPage = Translate("Fonts & Colors");

+							ood.pszPage = "Fonts & Colors";

 							CallService(MS_OPT_OPENOPTIONS, 0, (LPARAM)&ood);

 						}

 						break;

diff --git a/popup/src/opt_skins.cpp b/popup/src/opt_skins.cpp
index 64b49b0..d91efe5 100644
--- a/popup/src/opt_skins.cpp
+++ b/popup/src/opt_skins.cpp
@@ -235,12 +235,12 @@ int  SkinOptionList_AddSkin(OPTTREE_OPTION* &options, int *OptionsCount, int pos
 int  SkinOptionList_AddMain(OPTTREE_OPTION* &options, int *OptionsCount, int pos, DWORD *dwGlobalOptions) {

 	BOOL bCheck;

 	LPTSTR mainOption [] = {

-		_T("Show clock"),

-		_T("Drop shadow effect (Windows XP+)"),

-		_T("Drop shadow effect (Windows XP+)/non rectangular"),

-		_T("Enable Aero Glass (Vista+)"),

-		_T("Use Windows colours"),

-		_T("Use advanced text render")};

+		LPGENT("Show clock"),

+		LPGENT("Drop shadow effect (Windows XP+)"),

+		LPGENT("Drop shadow effect (Windows XP+)/non rectangular"),

+		LPGENT("Enable Aero Glass (Vista+)"),

+		LPGENT("Use Windows colours"),

+		LPGENT("Use advanced text render")};

 	for (int i = 0; i < SIZEOF(mainOption); i++) {

 		bCheck = 0;

 		switch (i) {

@@ -334,7 +334,7 @@ void LoadOption_Skins() {
 	PopUpOptions.DisplayTime			= DBGetContactSettingByte(NULL,MODULNAME, "DisplayTime", TRUE);

 	PopUpOptions.DropShadow				= DBGetContactSettingByte(NULL,MODULNAME, "DropShadow", TRUE);

 	PopUpOptions.EnableFreeformShadows	= DBGetContactSettingByte(NULL,MODULNAME, "EnableShadowRegion", 1);

-	PopUpOptions.EnableAeroGlass		= DBGetContactSettingByte(NULL,MODULNAME, "EnableAeroGlass", 0);

+	PopUpOptions.EnableAeroGlass		= DBGetContactSettingByte(NULL,MODULNAME, "EnableAeroGlass", 1);

 	PopUpOptions.UseWinColors			= DBGetContactSettingByte(NULL,MODULNAME, "UseWinColors", FALSE);

 	PopUpOptions.UseMText				= DBGetContactSettingByte(NULL,MODULNAME, "UseMText", TRUE);

 }

@@ -477,6 +477,9 @@ INT_PTR CALLBACK DlgProcPopSkinsOpts(HWND hwndDlg, UINT msg, WPARAM wParam, LPAR
 							SendMessage(GetParent(hwndDlg), PSM_CHANGED, 0, 0);

 							}//end IDC_BTN_RELOAD:

 							break;

+						case IDC_GETSKINS:

+							CallService(MS_UTILS_OPENURL,0,(LPARAM)"http://addons.miranda-im.org/index.php?action=display&id=72");

+							break;

 						default:

 							break;

 					}//end switch(idCtrl)

diff --git a/popup/src/srmm_menu.cpp b/popup/src/srmm_menu.cpp
index a200286..398d500 100644
--- a/popup/src/srmm_menu.cpp
+++ b/popup/src/srmm_menu.cpp
@@ -39,8 +39,8 @@ Last change by : $Author: Merlin_de $
 *************************************************************************************/

 

 static HANDLE hDialogsList = NULL;

+static HANDLE hIconPressed=0,hWindowEvent=0;

 

-static void SrmmMenu_UpdateIcon(HANDLE hContact);

 static int SrmmMenu_ProcessEvent(WPARAM wParam, LPARAM lParam);

 static int SrmmMenu_ProcessIconClick(WPARAM wParam, LPARAM lParam);

 

@@ -60,7 +60,7 @@ void SrmmMenu_Load()
 		CallService(MS_MSG_ADDICON, 0, (LPARAM)&sid);

 

 		sid.dwId = 1;

-		sid.szTooltip = Translate("Popup Mode: Favourtite");

+		sid.szTooltip = Translate("Popup Mode: Favourite");

 		sid.hIcon = sid.hIconDisabled = IcoLib_GetIcon(ICO_FAV,0);

 		CallService(MS_MSG_ADDICON, 0, (LPARAM)&sid);

 

@@ -74,8 +74,8 @@ void SrmmMenu_Load()
 		sid.hIcon = sid.hIconDisabled = IcoLib_GetIcon(ICO_POPUP_OFF,0);

 		CallService(MS_MSG_ADDICON, 0, (LPARAM)&sid);

 	

-		HookEvent(ME_MSG_ICONPRESSED, SrmmMenu_ProcessIconClick);

-		HookEvent(ME_MSG_WINDOWEVENT, SrmmMenu_ProcessEvent);

+		hIconPressed = HookEvent(ME_MSG_ICONPRESSED, SrmmMenu_ProcessIconClick);

+		hWindowEvent = HookEvent(ME_MSG_WINDOWEVENT, SrmmMenu_ProcessEvent);

 /*

 		HANDLE hContact = (HANDLE)CallService(MS_DB_CONTACT_FINDFIRST, 0, 0);

 		while (hContact)

@@ -89,6 +89,8 @@ void SrmmMenu_Load()
 

 void SrmmMenu_Unload()

 {

+	UnhookEvent(hIconPressed);

+	UnhookEvent(hWindowEvent);

 }

 

 static void SrmmMenu_UpdateIcon(HANDLE hContact)