summaryrefslogtreecommitdiff
path: root/plugins/NotesAndReminders
diff options
context:
space:
mode:
Diffstat (limited to 'plugins/NotesAndReminders')
-rw-r--r--plugins/NotesAndReminders/NotesReminders_10.vcxproj2
-rw-r--r--plugins/NotesAndReminders/NotesReminders_10.vcxproj.filters6
-rw-r--r--plugins/NotesAndReminders/NotesReminders_11.vcxproj2
-rw-r--r--plugins/NotesAndReminders/NotesReminders_11.vcxproj.filters6
-rw-r--r--plugins/NotesAndReminders/res/Version.rc38
-rw-r--r--plugins/NotesAndReminders/res/resource.rc65
-rw-r--r--plugins/NotesAndReminders/src/Version.h14
-rw-r--r--plugins/NotesAndReminders/src/globals.h34
-rw-r--r--plugins/NotesAndReminders/src/main.cpp38
-rw-r--r--plugins/NotesAndReminders/src/options.cpp3
10 files changed, 102 insertions, 106 deletions
diff --git a/plugins/NotesAndReminders/NotesReminders_10.vcxproj b/plugins/NotesAndReminders/NotesReminders_10.vcxproj
index ea9c35ee6b..46451824dc 100644
--- a/plugins/NotesAndReminders/NotesReminders_10.vcxproj
+++ b/plugins/NotesAndReminders/NotesReminders_10.vcxproj
@@ -204,9 +204,11 @@
<ClInclude Include="src\globals.h" />
<ClInclude Include="src\miscutils.h" />
<ClInclude Include="src\resource.h" />
+ <ClInclude Include="src\Version.h" />
</ItemGroup>
<ItemGroup>
<ResourceCompile Include="res\resource.rc" />
+ <ResourceCompile Include="res\Version.rc" />
</ItemGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets">
diff --git a/plugins/NotesAndReminders/NotesReminders_10.vcxproj.filters b/plugins/NotesAndReminders/NotesReminders_10.vcxproj.filters
index 304adc7d25..65043d7c74 100644
--- a/plugins/NotesAndReminders/NotesReminders_10.vcxproj.filters
+++ b/plugins/NotesAndReminders/NotesReminders_10.vcxproj.filters
@@ -47,10 +47,16 @@
<ClInclude Include="src\resource.h">
<Filter>Header Files</Filter>
</ClInclude>
+ <ClInclude Include="src\Version.h">
+ <Filter>Header Files</Filter>
+ </ClInclude>
</ItemGroup>
<ItemGroup>
<ResourceCompile Include="res\resource.rc">
<Filter>Resource Files</Filter>
</ResourceCompile>
+ <ResourceCompile Include="res\Version.rc">
+ <Filter>Resource Files</Filter>
+ </ResourceCompile>
</ItemGroup>
</Project> \ No newline at end of file
diff --git a/plugins/NotesAndReminders/NotesReminders_11.vcxproj b/plugins/NotesAndReminders/NotesReminders_11.vcxproj
index 8392cfde79..6bee8ac85d 100644
--- a/plugins/NotesAndReminders/NotesReminders_11.vcxproj
+++ b/plugins/NotesAndReminders/NotesReminders_11.vcxproj
@@ -208,9 +208,11 @@
<ClInclude Include="src\globals.h" />
<ClInclude Include="src\miscutils.h" />
<ClInclude Include="src\resource.h" />
+ <ClInclude Include="src\Version.h" />
</ItemGroup>
<ItemGroup>
<ResourceCompile Include="res\resource.rc" />
+ <ResourceCompile Include="res\Version.rc" />
</ItemGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets">
diff --git a/plugins/NotesAndReminders/NotesReminders_11.vcxproj.filters b/plugins/NotesAndReminders/NotesReminders_11.vcxproj.filters
index 304adc7d25..65043d7c74 100644
--- a/plugins/NotesAndReminders/NotesReminders_11.vcxproj.filters
+++ b/plugins/NotesAndReminders/NotesReminders_11.vcxproj.filters
@@ -47,10 +47,16 @@
<ClInclude Include="src\resource.h">
<Filter>Header Files</Filter>
</ClInclude>
+ <ClInclude Include="src\Version.h">
+ <Filter>Header Files</Filter>
+ </ClInclude>
</ItemGroup>
<ItemGroup>
<ResourceCompile Include="res\resource.rc">
<Filter>Resource Files</Filter>
</ResourceCompile>
+ <ResourceCompile Include="res\Version.rc">
+ <Filter>Resource Files</Filter>
+ </ResourceCompile>
</ItemGroup>
</Project> \ No newline at end of file
diff --git a/plugins/NotesAndReminders/res/Version.rc b/plugins/NotesAndReminders/res/Version.rc
new file mode 100644
index 0000000000..5bfbab4754
--- /dev/null
+++ b/plugins/NotesAndReminders/res/Version.rc
@@ -0,0 +1,38 @@
+// Microsoft Visual C++ generated resource script.
+//
+#ifdef APSTUDIO_INVOKED
+#error this file is not editable by Microsoft Visual C++
+#endif //APSTUDIO_INVOKED
+
+#include "afxres.h"
+#include "..\src\version.h"
+
+VS_VERSION_INFO VERSIONINFO
+ FILEVERSION __FILEVERSION_STRING
+ PRODUCTVERSION __FILEVERSION_STRING
+ FILEFLAGSMASK 0x17L
+#ifdef _DEBUG
+ FILEFLAGS 0x1L
+#else
+ FILEFLAGS 0x0L
+#endif
+ FILEOS 0x4L
+ FILETYPE 0x0L
+ FILESUBTYPE 0x0L
+BEGIN
+ BLOCK "StringFileInfo"
+ BEGIN
+ BLOCK "000004b0"
+ BEGIN
+ VALUE "FileDescription", __DESCRIPTION
+ VALUE "InternalName", __PLUGIN_NAME
+ VALUE "LegalCopyright", __COPYRIGHT
+ VALUE "OriginalFilename", __FILENAME
+ VALUE "ProductName", __PLUGIN_NAME
+ END
+ END
+ BLOCK "VarFileInfo"
+ BEGIN
+ VALUE "Translation", 0x0, 1200
+ END
+END
diff --git a/plugins/NotesAndReminders/res/resource.rc b/plugins/NotesAndReminders/res/resource.rc
index 8435a2bb20..fc4186f862 100644
--- a/plugins/NotesAndReminders/res/resource.rc
+++ b/plugins/NotesAndReminders/res/resource.rc
@@ -47,57 +47,6 @@ END
/////////////////////////////////////////////////////////////////////////////
//
-// Version
-//
-
-VS_VERSION_INFO VERSIONINFO
- FILEVERSION 0,0,5,1
- PRODUCTVERSION 0,0,5,1
- FILEFLAGSMASK 0x3fL
-#ifdef _DEBUG
- FILEFLAGS 0x1L
-#else
- FILEFLAGS 0x0L
-#endif
- FILEOS 0x40004L
- FILETYPE 0x2L
- FILESUBTYPE 0x0L
-BEGIN
- BLOCK "StringFileInfo"
- BEGIN
- BLOCK "000004b0"
- BEGIN
- VALUE "Comments", "New ""Notes And Reminders"" plugin for Miranda NG"
- VALUE "CompanyName", "Jokusoftware, Digital Forcess"
- VALUE "FileDescription", "New ""Notes And Reminders"""
- VALUE "FileVersion", "0.0.5.1"
- VALUE "InternalName", "NewNotesAndReminders"
- VALUE "LegalCopyright", "(C) 2003,2005 by Joe Kucera, Lubomir Ivanov"
- VALUE "LegalTrademarks", "Digital Forcess"
- VALUE "OriginalFilename", "NewNR.dll"
- VALUE "ProductName", "New ""Notes And Reminders"""
- VALUE "ProductVersion", "0.0.5.1"
- END
- END
- BLOCK "VarFileInfo"
- BEGIN
- VALUE "Translation", 0x0, 1200
- END
-END
-
-#endif // Neutral resources
-/////////////////////////////////////////////////////////////////////////////
-
-
-/////////////////////////////////////////////////////////////////////////////
-// English (United States) resources
-
-#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU)
-LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
-#pragma code_page(1252)
-
-/////////////////////////////////////////////////////////////////////////////
-//
// Dialog
//
@@ -323,22 +272,10 @@ BEGIN
VERTGUIDE, 291
VERTGUIDE, 296
END
-
- IDD_ADDREMINDER, DIALOG
- BEGIN
- END
-
- IDD_NOTIFYREMINDER, DIALOG
- BEGIN
- END
-
- IDD_LISTREMINDERS, DIALOG
- BEGIN
- END
END
#endif // APSTUDIO_INVOKED
-#endif // English (United States) resources
+#endif // Neutral resources
/////////////////////////////////////////////////////////////////////////////
diff --git a/plugins/NotesAndReminders/src/Version.h b/plugins/NotesAndReminders/src/Version.h
new file mode 100644
index 0000000000..6e1d0faab9
--- /dev/null
+++ b/plugins/NotesAndReminders/src/Version.h
@@ -0,0 +1,14 @@
+#define __MAJOR_VERSION 0
+#define __MINOR_VERSION 0
+#define __RELEASE_NUM 5
+#define __BUILD_NUM 1
+
+#define __FILEVERSION_STRING __MAJOR_VERSION,__MINOR_VERSION,__RELEASE_NUM,__BUILD_NUM
+
+#define __PLUGIN_NAME "Sticky Notes & Reminders"
+#define __FILENAME "NotesReminders.dll"
+#define __DESCRIPTION "Sticky Notes & Reminders Implementation for Miranda NG."
+#define __AUTHOR "Joe Kucera, Lubomir Kolev Ivanov, Georg Fischer"
+#define __AUTHOREMAIL "jokusoftware@users.sourceforge.net; d00mEr@dir.bg"
+#define __AUTHORWEB "http://miranda-ng.org/"
+#define __COPYRIGHT "© 2003-2005 Joe Kucera, Lubomir Ivanov"
diff --git a/plugins/NotesAndReminders/src/globals.h b/plugins/NotesAndReminders/src/globals.h
index 56076f83d6..35a7188126 100644
--- a/plugins/NotesAndReminders/src/globals.h
+++ b/plugins/NotesAndReminders/src/globals.h
@@ -2,31 +2,25 @@
#include <windows.h>
#include <commctrl.h>
-#include <memory.h>
#include <time.h>
#include <richedit.h>
-#include <stdio.h>
-#include <WinSock.h>
-#include <mmsystem.h>
-
-#include "win2k.h"
-#include "newpluginapi.h"
-#include "m_system.h"
-#include "m_database.h"
-#include "m_clist.h"
-#include "m_langpack.h"
-#include "m_options.h"
-#include "m_skin.h"
-#include "m_fontservice.h"
-#include "m_hotkeys.h"
-#include "m_icolib.h"
-
-#include "m_toptoolbar.h"
-#include "miscutils.h"
-#include "resource.h"
+#include <win2k.h>
+#include <newpluginapi.h>
+#include <m_database.h>
+#include <m_clist.h>
+#include <m_langpack.h>
+#include <m_options.h>
+#include <m_skin.h>
+#include <m_fontservice.h>
+#include <m_hotkeys.h>
+#include <m_icolib.h>
+#include <m_toptoolbar.h>
+#include "miscutils.h"
+#include "resource.h"
+#include "Version.h"
#define MODULENAME "StickyNotes"
#define SECTIONNAME LPGEN("Notes & Reminders")
diff --git a/plugins/NotesAndReminders/src/main.cpp b/plugins/NotesAndReminders/src/main.cpp
index a099178f7d..4738d1496f 100644
--- a/plugins/NotesAndReminders/src/main.cpp
+++ b/plugins/NotesAndReminders/src/main.cpp
@@ -19,13 +19,13 @@ extern TREEELEMENT *RemindersList;
static PLUGININFOEX pluginInfo =
{
sizeof(PLUGININFOEX),
- "Sticky Notes & Reminders",
- PLUGIN_MAKE_VERSION(0,0,5,1),
- "Sticky Notes & Reminders Implementation for Miranda NG.",
- "Joe Kucera, Lubomir Kolev Ivanov, Georg Fischer",
- "jokusoftware@users.sourceforge.net; d00mEr@dir.bg",
- "(C) 2003,2005 Joe Kucera, Lubomir Ivanov",
- "http://d00mer.freeshell.org/miranda/",
+ __PLUGIN_NAME,
+ PLUGIN_MAKE_VERSION(__MAJOR_VERSION, __MINOR_VERSION, __RELEASE_NUM, __BUILD_NUM),
+ __DESCRIPTION,
+ __AUTHOR,
+ __AUTHOREMAIL,
+ __COPYRIGHT,
+ __AUTHORWEB,
UNICODE_AWARE,
{0x842a6668, 0xf9da, 0x4968, {0xbf, 0xd7, 0xd2, 0xbd, 0x9d, 0xf8, 0x48, 0xee}} // {842A6668-F9DA-4968-BFD7-D2BD9DF848EE}
};
@@ -38,7 +38,7 @@ void BringAllNotesToFront(STICKYNOTE *pActive);
void CloseNotesList();
void CloseReminderList();
-INT_PTR PluginMenuCommandAddNew(WPARAM w,LPARAM l)
+INT_PTR PluginMenuCommandAddNew(WPARAM w, LPARAM l)
{
STICKYNOTE *PSN = NewNote(0,0,0,0,NULL,NULL,TRUE,TRUE,0);
if(PSN)
@@ -46,44 +46,44 @@ INT_PTR PluginMenuCommandAddNew(WPARAM w,LPARAM l)
return 0;
}
-INT_PTR PluginMenuCommandDeleteAll(WPARAM w,LPARAM l)
+INT_PTR PluginMenuCommandDeleteAll(WPARAM w, LPARAM l)
{
if (g_Stickies && MessageBox(NULL, TranslateT("Are you sure you want to delete all notes?"), TranslateT(SECTIONNAME), MB_OKCANCEL) == IDOK)
DeleteNotes();
return 0;
}
-INT_PTR PluginMenuCommandShowHide(WPARAM w,LPARAM l)
+INT_PTR PluginMenuCommandShowHide(WPARAM w, LPARAM l)
{
ShowHideNotes();
return 0;
}
-INT_PTR PluginMenuCommandViewNotes(WPARAM w,LPARAM l)
+INT_PTR PluginMenuCommandViewNotes(WPARAM w, LPARAM l)
{
ListNotes();
return 0;
}
-INT_PTR PluginMenuCommandAllBringFront(WPARAM w,LPARAM l)
+INT_PTR PluginMenuCommandAllBringFront(WPARAM w, LPARAM l)
{
BringAllNotesToFront(NULL);
return 0;
}
-INT_PTR PluginMenuCommandNewReminder(WPARAM w,LPARAM l)
+INT_PTR PluginMenuCommandNewReminder(WPARAM w, LPARAM l)
{
NewReminder();
return 0;
}
-INT_PTR PluginMenuCommandViewReminders(WPARAM w,LPARAM l)
+INT_PTR PluginMenuCommandViewReminders(WPARAM w, LPARAM l)
{
ListReminders();
return 0;
}
-INT_PTR PluginMenuCommandDeleteReminders(WPARAM w,LPARAM l)
+INT_PTR PluginMenuCommandDeleteReminders(WPARAM w, LPARAM l)
{
if (RemindersList && MessageBox(NULL, TranslateT("Are you sure you want to delete all reminders?"), TranslateT(SECTIONNAME), MB_OKCANCEL) == IDOK)
DeleteReminders();
@@ -122,7 +122,7 @@ int OnOptInitialise(WPARAM w, LPARAM L)
odp.position = 900002000;
odp.hInstance = hinstance;
odp.pszTemplate = MAKEINTRESOURCEA(IDD_STNOTEOPTIONS);
- odp.ptszTitle = _T(SECTIONNAME);
+ odp.ptszTitle = SECTIONNAME;
odp.ptszGroup = LPGENT("Plugins");
odp.pfnDlgProc = DlgProcOptions;
odp.flags = ODPF_TCHAR;
@@ -130,7 +130,7 @@ int OnOptInitialise(WPARAM w, LPARAM L)
return 0;
}
-int OnTopToolBarInit(WPARAM w,LPARAM L)
+int OnTopToolBarInit(WPARAM w, LPARAM L)
{
TTBButton ttb = {0};
ttb.cbSize = sizeof(TTBButton);
@@ -177,7 +177,7 @@ static void InitServices()
CreateServiceFunction(MODULENAME"/OpenTriggeredReminder",OpenTriggeredReminder);
}
-int OnModulesLoaded(WPARAM wparam,LPARAM lparam)
+int OnModulesLoaded(WPARAM wparam, LPARAM lparam)
{
// register fonts and hotkeys
RegisterFontServiceFonts();
@@ -343,7 +343,7 @@ extern "C" __declspec(dllexport) int Load(void)
InitServices();
WS_Init();
- hkModulesLoaded = HookEvent(ME_SYSTEM_MODULESLOADED,OnModulesLoaded);
+ hkModulesLoaded = HookEvent(ME_SYSTEM_MODULESLOADED, OnModulesLoaded);
InitIcons();
return 0;
diff --git a/plugins/NotesAndReminders/src/options.cpp b/plugins/NotesAndReminders/src/options.cpp
index 385c8a004a..3f3b889409 100644
--- a/plugins/NotesAndReminders/src/options.cpp
+++ b/plugins/NotesAndReminders/src/options.cpp
@@ -1,11 +1,8 @@
#include "globals.h"
-
-
// min allowed alpha (don't want 0 because it's a waste of resources as well as might confuse user)
#define MIN_ALPHA 30
-
extern HANDLE hkFontChange;
extern HANDLE hkColorChange;
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-16 21:43:11 +0000