From ada33e15355aaf0e222f7aa93063ab1efcdd21a1 Mon Sep 17 00:00:00 2001
From: sje <sje@4f64403b-2f21-0410-a795-97e2b3489a10>
Date: Tue, 30 Oct 2007 04:59:55 +0000
Subject: fixed to options

git-svn-id: https://server.scottellis.com.au/svn/mim_plugs@373 4f64403b-2f21-0410-a795-97e2b3489a10
---
 worldtime/WorldTime.cpp    |  8 +-------
 worldtime/WorldTime.vcproj |  2 --
 worldtime/options.cpp      | 12 ++++--------
 worldtime/plugwin.cpp      |  6 +++---
 4 files changed, 8 insertions(+), 20 deletions(-)

(limited to 'worldtime')

diff --git a/worldtime/WorldTime.cpp b/worldtime/WorldTime.cpp
index 90adb4a..bb5b58d 100644
--- a/worldtime/WorldTime.cpp
+++ b/worldtime/WorldTime.cpp
@@ -7,7 +7,7 @@ PLUGINLINK *pluginLink;
 PLUGININFOEX pluginInfo={
 	sizeof(PLUGININFOEX),
 	"World Time",
-	PLUGIN_MAKE_VERSION(0, 3, 1, 0),
+	PLUGIN_MAKE_VERSION(0, 4, 0, 0),
 	"Display world times.",
 	"Scott Ellis",
 	"mail@scottellis.com.au",
@@ -46,12 +46,6 @@ extern "C" WORLDTIME_API PLUGININFOEX* MirandaPluginInfoEx(DWORD mirandaVersion)
 	return &pluginInfo;
 }
 
-extern "C" WORLDTIME_API PLUGININFO* MirandaPluginInfo(DWORD mirandaVersion)
-{
-	pluginInfo.cbSize = sizeof(PLUGININFO);
-	return (PLUGININFO*)&pluginInfo;
-}
-
 static const MUUID interfaces[] = {MIID_WORLDTIME, MIID_LAST};
 extern "C" __declspec(dllexport) const MUUID* MirandaPluginInterfaces(void)
 {
diff --git a/worldtime/WorldTime.vcproj b/worldtime/WorldTime.vcproj
index 2a5583f..578a340 100644
--- a/worldtime/WorldTime.vcproj
+++ b/worldtime/WorldTime.vcproj
@@ -78,7 +78,6 @@
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalDependencies="comctl32.lib odbc32.lib odbccp32.lib"
-				OutputFile="../../bin/release/plugins/WorldTime.dll"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
 				ProgramDatabaseFile=".\Release/WorldTime.pdb"
@@ -176,7 +175,6 @@
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalDependencies="user32.lib gdi32.lib shell32.lib advapi32.lib comctl32.lib"
-				OutputFile="../../bin/debug/plugins/WorldTime.dll"
 				LinkIncremental="2"
 				SuppressStartupBanner="true"
 				GenerateDebugInformation="true"
diff --git a/worldtime/options.cpp b/worldtime/options.cpp
index 8dc5da8..1d991a0 100644
--- a/worldtime/options.cpp
+++ b/worldtime/options.cpp
@@ -527,17 +527,13 @@ static BOOL CALLBACK DlgProcOpts(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM l
 int WorldTimeOptInit(WPARAM wParam,LPARAM lParam)
 {
 	OPTIONSDIALOGPAGE odp = { 0 };
-#define OPTIONPAGE_OLD_SIZE2 60
 
-	//odp.cbSize						= sizeof(odp);
-	odp.cbSize						= OPTIONPAGE_OLD_SIZE2;
-	odp.position					= -790000000;
+	odp.cbSize						= sizeof(odp);
 	odp.hInstance					= hInst;
-	odp.pszTemplate					= MAKEINTRESOURCE(IDD_DIALOG1);
-	odp.pszTitle					= Translate("World Time");
-	odp.pszGroup					= Translate("Plugins");
+	odp.pszTemplate					= MAKEINTRESOURCEA(IDD_DIALOG1);
+	odp.pszTitle					= "World Time";
+	odp.pszGroup					= "Plugins";
 	odp.flags						= ODPF_BOLDGROUPS;
-	//odp.nIDBottomSimpleControl		= IDC_PPM;
 	odp.pfnDlgProc					= DlgProcOpts;
 	CallService( MS_OPT_ADDPAGE, wParam,( LPARAM )&odp );
 
diff --git a/worldtime/plugwin.cpp b/worldtime/plugwin.cpp
index 569f1bb..920b19c 100644
--- a/worldtime/plugwin.cpp
+++ b/worldtime/plugwin.cpp
@@ -615,10 +615,10 @@ LRESULT CALLBACK mypluginwindow1proc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM
 
 	case WM_CONTEXTMENU:
 		{	
-			OPENOPTIONSDIALOG ood;
+			OPENOPTIONSDIALOG ood = {0};
 			ood.cbSize = sizeof(ood);
-			ood.pszGroup = Translate("Plugins");
-			ood.pszPage = Translate("World Time");
+			ood.pszGroup = "Plugins";
+			ood.pszPage = "World Time";
 
 			CallService(MS_OPT_OPENOPTIONS, 0, (LPARAM)&ood);
 		}
-- 
cgit v1.2.3