Popup:

fixed popup icons in toptoolbar

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

4 files changed, 21 insertions, 26 deletions

diff --git a/plugins/Popup/PopUp_10.vcxproj.filters b/plugins/Popup/PopUp_10.vcxproj.filters
index c0e3330860..1fe3cb9eca 100644
--- a/plugins/Popup/PopUp_10.vcxproj.filters
+++ b/plugins/Popup/PopUp_10.vcxproj.filters
@@ -20,9 +20,6 @@
       <UniqueIdentifier>{2c54b55f-1f99-474e-99ef-34c8f4210772}</UniqueIdentifier>

       <Extensions>txt</Extensions>

     </Filter>

-    <Filter Include="Deprecatet">

-      <UniqueIdentifier>{1316908b-5179-4ca2-abc4-3ba591f6489c}</UniqueIdentifier>

-    </Filter>

     <Filter Include="Option Pages">

       <UniqueIdentifier>{529f787f-6a3b-402b-8451-73ab712c2fd5}</UniqueIdentifier>

     </Filter>

diff --git a/plugins/Popup/src/main.cpp b/plugins/Popup/src/main.cpp
index b44725c0bc..66c345017a 100644
--- a/plugins/Popup/src/main.cpp
+++ b/plugins/Popup/src/main.cpp
@@ -1,9 +1,9 @@
 /*

 Popup Plus plugin for Miranda IM

 

-Copyright	© 2002 Luca Santarelli,

-			© 2004-2007 Victor Pavlychko

-			© 2010 MPK

+Copyright	� 2002 Luca Santarelli,

+			� 2004-2007 Victor Pavlychko

+			� 2010 MPK

 

 This program is free software; you can redistribute it and/or

 modify it under the terms of the GNU General Public License

@@ -205,15 +205,15 @@ static int TTBLoaded(WPARAM wParam,LPARAM lParam)
 {

 	if ( !hTTButton) {

 		TTBButton btn = {0};

-		btn.cbSize        = sizeof(btn);

-		btn.pszService	   = MENUCOMMAND_SVC;

-		btn.lParamUp      = 1;

-		btn.dwFlags       = TTBBF_VISIBLE | TTBBF_SHOWTOOLTIP | TTBBF_ICONBYHANDLE;

-		btn.name          = LPGEN("Toggle Popups");

-		btn.hIconHandleUp = Skin_GetIconHandle(ICO_TB_POPUP_OFF);

-		btn.hIconHandleDn = Skin_GetIconHandle(ICO_TB_POPUP_ON);

-		btn.pszTooltipUp  = LPGEN("Enable popups");

-		btn.pszTooltipDn  = LPGEN("Disable popups");

+		btn.cbSize = sizeof(btn);

+		btn.pszService = MENUCOMMAND_SVC;

+		btn.lParamUp = 1;

+		btn.dwFlags = TTBBF_VISIBLE | TTBBF_SHOWTOOLTIP | TTBBF_ICONBYHANDLE;

+		btn.name = LPGEN("Toggle Popups");

+		btn.hIconHandleUp = Skin_GetIconHandle(ICO_TB_POPUP_ON);

+		btn.hIconHandleDn = Skin_GetIconHandle(ICO_TB_POPUP_OFF);

+		btn.pszTooltipUp = LPGEN("Disable popups");

+		btn.pszTooltipDn = LPGEN("Enable popups");

 		hTTButton = TopToolbar_AddButton(&btn);

 	}

 

diff --git a/plugins/Popup/version.h b/plugins/Popup/version.h
index 1d3f681270..544f73c7a6 100644
--- a/plugins/Popup/version.h
+++ b/plugins/Popup/version.h
@@ -1,10 +1,10 @@
 /*

 Popup Plus plugin for Miranda IM

 

-Copyright	© 2002 Luca Santarelli,

-			© 2004-2007 Victor Pavlychko

-			© 2010 MPK

-			© 2010 Merlin_de

+Copyright	� 2002 Luca Santarelli,

+			� 2004-2007 Victor Pavlychko

+			� 2010 MPK

+			� 2010 Merlin_de

 

 This program is free software; you can redistribute it and/or

 modify it under the terms of the GNU General Public License

@@ -35,15 +35,14 @@ Last change by : $Author: Merlin_de $
 	#define MODULNAME					"PopUp"

 	#define MODULNAME_LONG				"Popup Plus"		//dont use "PopUp Plus" coz notify register use "Popup Plus"

 	#define MODULNAME_PLU				"PopUps"

-	

+

 	#define POPUP_FILENAME				"PopUp.dll"

 	#define POPUP_DISPLAYNAME			"PopUp Plus"

 	#define __FLVersionURL				"http://addons.miranda-im.org/details.php?action=viewfile&id=4292"

 	#define __FLVersionPrefix			"<span class=\"fileNameHeader\">PopUp Plus (Unicode) "

 	#define __FLUpdateURL				"http://addons.miranda-im.org/feed.php?dlfile=4292"			//.zip

 	#define __BetaUpdateURL				""

-		

-	

+

 	#define __BetaVersionURL			"http://svn.miranda.im/mainrepo/popup/trunk/docs/Changelog.txt"

 	#define __BetaVersionPrefix			"beta: "

 	#define __BetaChangelogURL			"http://svn.miranda.im/mainrepo/popup/trunk/docs/Changelog.txt"

@@ -61,11 +60,10 @@ Last change by : $Author: Merlin_de $
 	#define __VERSION_STRING			__STRINGIFY2(__FILEVERSION_STRING)

 	#define __VERSION_STRING_DOT		__STRINGIFY2(__FILEVERSION_STRING_DOTS)

 

-	#define POPUP_DESCRIPT		"Provides popup notification services for different plugins."

-	#define POPUP_DESCRIPTION	POPUP_DESCRIPT " [Built " __DATE__ " " __TIME__ "]"

+	#define POPUP_DESCRIPTION	"Provides popup notification services for different plugins."

 	#define POPUP_AUTHOR		"MPK, Merlin_de (Luca Santarelli, Victor Pavlychko)"

 	#define POPUP_EMAIL			"mp-king@web.de"

-	#define POPUP_COPYRIGHT		"©2002 Luca Santarelli, ©2004-2007 Victor Pavlychko, ©2010 MPK, Merlin_de"

+	#define POPUP_COPYRIGHT		"�2002 Luca Santarelli, �2004-2007 Victor Pavlychko, �2010 MPK, Merlin_de"

 	#define POPUP_WEBPAGE		"http://www.miranda-im.org/"

 	#define POPUP_UUID			{0x26a9125d, 0x7863, 0x4e01, {0xaf, 0xe, 0xd1, 0x4e, 0xf9, 0x5c, 0x50, 0x54}}

 	#define POPUP_PID			0x12a3fdbdecd273ee67dbc4d6d00e9268

diff --git a/plugins/Popup/version.rc b/plugins/Popup/version.rc
index 2831b4a41b..160afdf230 100644
--- a/plugins/Popup/version.rc
+++ b/plugins/Popup/version.rc
@@ -25,7 +25,7 @@ BEGIN
     BEGIN

         BLOCK "000004b0"

         BEGIN

-            VALUE "Comments", POPUP_DESCRIPT

+            VALUE "Comments", POPUP_DESCRIPTION

             VALUE "CompanyName", "MPK"

             VALUE "FileDescription", "Popup Plus plugin for Miranda IM"

             VALUE "FileVersion", __VERSION_STRING_DOT