Nudge: version bump

+ 64bit version
+ unhook hooks on exit
+ destroy services on exit
+ open message window on popup click
+ open message window on preview
+ moved sounds in "Nudge" section
- fixed navigation in options
+ new option: "Open message window"
+ New option: "Open contact list"
+ new option: "Respect ignore settings (status changes)"
* status changes are now stored in UTF8
- Removed popup on sending nudges (on popular request)
* popup options are moved into popup classes, needs a recent version of popup+ or YAPP

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

4 files changed, 21 insertions, 66 deletions

diff --git a/Nudge/include/IcoLib.h b/Nudge/include/IcoLib.h
deleted file mode 100644
index a911ba5..0000000
--- a/Nudge/include/IcoLib.h
+++ /dev/null
@@ -1,26 +0,0 @@
-typedef struct {

-	int cbSize;

-    char *pszSection;        //section name used to group icons

-	char *pszDescription;	   //description for options dialog

-	char *pszName;		   //name to refer to icon when playing and in db

-    char *pszDefaultFile;    //default icon file to use

-	int  iDefaultIndex;

-} SKINICONDESC;

-

-//

-//  Add a icon into options UI

-//  NB! pszName should be unique, e.g.: clistmw_apply, tabsrmm_history

-//

-//  wParam = (WPARAM)0

-//  lParam = (LPARAM)(SKINICONDESC*)sid;

-//

-#define MS_SKIN2_ADDICON "Skin2/Icons/AddIcon"

-//

-//  Retrieve HICON with name specified in lParam

-//  Returned HICON SHOULDN'T be destroyed, it managed by IcoLib

-//

-#define MS_SKIN2_GETICON "Skin2/Icons/GetIcon"

-//

-//  Icons change notification

-//

-#define ME_SKIN2_ICONSCHANGED "Skin2/IconsChanged"

diff --git a/Nudge/main.cpp b/Nudge/main.cpp
index 47a9d73..470ac43 100644
--- a/Nudge/main.cpp
+++ b/Nudge/main.cpp
@@ -14,7 +14,9 @@ CShake shake;
 CNudge GlobalNudge;

 

 MM_INTERFACE mmi;

+#ifdef UNICODE

 UTF8_INTERFACE utfi;

+#endif

 int hLangpack = 0;

 

 

@@ -25,52 +27,28 @@ PLUGININFOEX pluginInfo={
 	sizeof(PLUGININFOEX),

 #ifdef WIN64

 	"Nudge (x64)",

-#else

+#elif UNICODE

 	"Nudge",

+#else

+	"Nudge (ANSI)",

 #endif

-	PLUGIN_MAKE_VERSION(0,0,1,19),

+	PLUGIN_MAKE_VERSION(0,0,2,0),

 	"Plugin to shake the clist and chat window",

-	"Tweety/GouZ",

-	"francois.mean@skynet.be / Sylvain.gougouzian@gmail.com ",

+	"Tweety/GouZ, FREAK_THEMIGHTY",

+	"francois.mean@skynet.be, Sylvain.gougouzian@gmail.com, wishmaster51@googlemail.com",

 	"copyright to the miranda community",

-	"http://addons.miranda-im.org/details.php?action=viewfile&id=2708",		// www

+	"http://addons.miranda-im.org/",		// www

 	UNICODE_AWARE,

 	0,		//doesn't replace anything built-in

 #ifdef WIN64

 	{ 0xf6f60ea4, 0xfa8e, 0x4d17, { 0xb2, 0x9d, 0xff, 0x74, 0x1a, 0x3c, 0xc, 0x51 } } // {F6F60EA4-FA8E-4D17-B29D-FF741A3C0C51}

+#elif UNICODE

+	{ 0xe47cc215, 0xd28, 0x462d, { 0xa0, 0xf6, 0x3a, 0xe4, 0x44, 0x3d, 0x29, 0x26 } } // {E47CC215-0D28-462D-A0F6-3AE4443D2926}

 #else

 	{ 0x9ceee701, 0x35cd, 0x4ff7, { 0x8c, 0xc4, 0xef, 0x7d, 0xd2, 0xac, 0x53, 0x5c } }	// {9CEEE701-35CD-4ff7-8CC4-EF7DD2AC535C}

 #endif

 };

 

-

- 

-void RegisterToUpdate(void)

-{

-	//Use for the Updater plugin

-	if(ServiceExists(MS_UPDATE_REGISTER)) 

-	{

-		Update update = {0};

-		char szVersion[16];

-

-		update.szComponentName = pluginInfo.shortName;

-		update.pbVersion = (BYTE *)CreateVersionStringPluginEx(&pluginInfo, szVersion);

-		update.cpbVersion = (int)strlen((char *)update.pbVersion);

-		update.szUpdateURL = UPDATER_AUTOREGISTER;

-		update.szVersionURL = "http://addons.miranda-im.org/details.php?action=viewfile&id=2708";

-		update.pbVersionPrefix = (BYTE *)"<span class=\"fileNameHeader\">Nudge ";

-	    update.szBetaUpdateURL = "http://www.miranda-fr.net/tweety/Nudge/Nudge.zip";

-		update.szBetaVersionURL = "http://www.miranda-fr.net/tweety/Nudge/Nudge_beta.html";

-		update.pbBetaVersionPrefix = (BYTE *)"Nudge version ";

-

-		update.cpbVersionPrefix = (int)strlen((char *)update.pbVersionPrefix);

-		update.cpbBetaVersionPrefix = (int)strlen((char *)update.pbBetaVersionPrefix);

-

-		CallService(MS_UPDATE_REGISTER, 0, (WPARAM)&update);

-

-	}

-}

-

 INT_PTR NudgeShowMenu(WPARAM wParam,LPARAM lParam)

 {	

 

@@ -512,9 +490,6 @@ static int ContactWindowOpen(WPARAM wparam,LPARAM lParam)
 

 int ModulesLoaded(WPARAM,LPARAM)

 {

-#ifndef WIN64

-	RegisterToUpdate();

-#endif

 	RegisterToTrigger();

 	RegisterToDbeditorpp();

 	LoadProtocols();

@@ -554,11 +529,13 @@ extern "C" int __declspec(dllexport) Load(PLUGINLINK *link)
 		MessageBox(NULL,_T("Cannot retrieve Miranda Memory Manager Interface.\nYou need to update Miranda IM to the latest version."),_T("Nudge Plugin"),MB_OK);

 		return 1;

 	}

+#ifdef UNICODE

 	if(mir_getUTFI(&utfi))

 	{

 		MessageBox(NULL,_T("Cannot retrieve Miranda UTF8 Interface.\nYou need to update Miranda IM to the latest version."),_T("Nudge Plugin"),MB_OK);

 		return 1;

 	}

+#endif

 	mir_getLP(&pluginInfo);

 

 	g_hEventModulesLoaded = HookEvent(ME_SYSTEM_MODULESLOADED,ModulesLoaded);

diff --git a/Nudge/nudge.cpp b/Nudge/nudge.cpp
index 0d603bb..73f831d 100644
--- a/Nudge/nudge.cpp
+++ b/Nudge/nudge.cpp
@@ -102,6 +102,8 @@ void CNudgeElement::Load(void)
 			_tcsncpy(this->recText,TranslateT("You received a nudge"),TEXT_LEN);

 		DBFreeVariant(&dbv);

 	}

+	else

+		_tcsncpy(this->recText,TranslateT("You received a nudge"),TEXT_LEN);

 	mir_snprintf(SectionName,512,"%s-senText", ProtocolName);

 	if(!DBGetContactSettingTString(NULL,"Nudge",SectionName,&dbv)) 

 	{

@@ -110,4 +112,6 @@ void CNudgeElement::Load(void)
 			_tcsncpy(this->senText,TranslateT("You sent a nudge"),TEXT_LEN);

 		DBFreeVariant(&dbv);

 	}

+	else

+		_tcsncpy(this->senText,TranslateT("You sent a nudge"),TEXT_LEN);

 }
\ No newline at end of file
diff --git a/Nudge/resource.rc b/Nudge/resource.rc
index 4760a02..4188b69 100644
--- a/Nudge/resource.rc
+++ b/Nudge/resource.rc
@@ -221,8 +221,8 @@ END
 //

 

 VS_VERSION_INFO VERSIONINFO

- FILEVERSION 0,0,1,19

- PRODUCTVERSION 0,0,1,19

+ FILEVERSION 0,0,2,0

+ PRODUCTVERSION 0,0,2,0

  FILEFLAGSMASK 0x3fL

 #ifdef _DEBUG

  FILEFLAGS 0x1L

@@ -240,12 +240,12 @@ BEGIN
             VALUE "Comments", "Plugin that render nudge events from different protocols"

             VALUE "CompanyName", "Miranda community"

             VALUE "FileDescription", "Nudge plugin for Miranda-IM"

-            VALUE "FileVersion", "0, 0, 1, 19"

+            VALUE "FileVersion", "0, 0, 2, 0"

             VALUE "InternalName", "Nudge"

             VALUE "LegalCopyright", "Copyright © 2006-2011"

             VALUE "OriginalFilename", "nudge.dll"

             VALUE "ProductName", "nudge"

-            VALUE "ProductVersion", "0, 0, 1, 19"

+            VALUE "ProductVersion", "0, 0, 2, 0"

         END

     END

     BLOCK "VarFileInfo"