fixed to options

git-svn-id: https://server.scottellis.com.au/svn/mim_plugs@373 4f64403b-2f21-0410-a795-97e2b3489a10

12 files changed, 50 insertions, 76 deletions

diff --git a/message_notify/common.h b/message_notify/common.h
index a446c6c..cf0be72 100644
--- a/message_notify/common.h
+++ b/message_notify/common.h
@@ -29,6 +29,7 @@
 #include <m_updater.h>

 #include <m_metacontacts.h>

 

+#include "m_speak.h"

 

 extern HINSTANCE hInst;

 extern PLUGINLINK *pluginLink;

diff --git a/message_notify/messagenotify.cpp b/message_notify/messagenotify.cpp
index 03d88a4..fa29b07 100644
--- a/message_notify/messagenotify.cpp
+++ b/message_notify/messagenotify.cpp
@@ -10,7 +10,6 @@
 #include <time.h>

 

 #include "collection.h"

-#include "m_speak.h"

 

 Map<HANDLE, HWND> open_msg_windows;

 

diff --git a/message_notify/options.cpp b/message_notify/options.cpp
index cb2058c..e5ea989 100644
--- a/message_notify/options.cpp
+++ b/message_notify/options.cpp
@@ -3,7 +3,7 @@
 

 Options options;

 

-static BOOL CALLBACK DlgProcOpts(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lParam) {

+BOOL CALLBACK DlgProcOpts(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lParam) {

 

 	switch ( msg ) {

 	case WM_INITDIALOG:

@@ -71,15 +71,20 @@ static BOOL CALLBACK DlgProcOpts(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM l
 			CheckDlgButton(hwndDlg, IDC_CHK_CLOSE, options.close_win ? TRUE : FALSE);

 			CheckDlgButton(hwndDlg, IDC_CHK_MSG, options.show_msg ? TRUE : FALSE);

 

-			CheckDlgButton(hwndDlg, IDC_CHK_SPEECH, (options.flags & MNNF_SPEAK));

+			CheckDlgButton(hwndDlg, IDC_CHK_SPEECH, (options.flags & MNNF_SPEAK) ? TRUE : FALSE);

 			if(options.flags & MNNF_POPUP) {

 				CheckDlgButton(hwndDlg, IDC_CHK_POPUPS, TRUE);

-				HWND hwnd = GetDlgItem(hwndDlg, IDC_CHK_CLOSE);

-				EnableWindow(hwndDlg, FALSE);

-				hwnd = GetDlgItem(hwndDlg, IDC_CHK_MSG);

-				EnableWindow(hwndDlg, FALSE);

 			} else {

 				CheckDlgButton(hwndDlg, IDC_CHK_POPUPS, FALSE);

+				HWND hwnd = GetDlgItem(hwndDlg, IDC_CHK_CLOSE);

+				EnableWindow(hwnd, FALSE);

+				hwnd = GetDlgItem(hwndDlg, IDC_CHK_MSG);

+				EnableWindow(hwnd, FALSE);

+			}

+

+			if(!ServiceExists(MS_SPEAK_SAYEX)) {

+				HWND hwnd = GetDlgItem(hwndDlg, IDC_CHK_SPEECH);

+				EnableWindow(hwnd, FALSE);

 			}

 		}

 

@@ -112,9 +117,9 @@ static BOOL CALLBACK DlgProcOpts(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM l
 					{

 						bool checked = IsDlgButtonChecked(hwndDlg, IDC_CHK_POPUPS) ? true : false;

 						HWND hwnd = GetDlgItem(hwndDlg, IDC_CHK_CLOSE);

-						EnableWindow(hwndDlg, checked ? TRUE : FALSE);

+						EnableWindow(hwnd, checked ? TRUE : FALSE);

 						hwnd = GetDlgItem(hwndDlg, IDC_CHK_MSG);

-						EnableWindow(hwndDlg, checked ? TRUE : FALSE);

+						EnableWindow(hwnd, checked ? TRUE : FALSE);

 					}

 					SendMessage( GetParent( hwndDlg ), PSM_CHANGED, 0, 0 );

 					return TRUE;

@@ -174,20 +179,16 @@ static BOOL CALLBACK DlgProcOpts(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM l
 int OptInit(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.flags						= ODPF_BOLDGROUPS;

 	odp.hInstance					= hInst;

+	odp.pszGroup					= "Popups";

+	odp.pszTitle					= MODULE;

+

 	odp.pszTemplate					= MAKEINTRESOURCEA(IDD_OPTIONS);

-	odp.pszTitle					= Translate(MODULE);

-	odp.pszGroup					= Translate("Popups");

-	odp.flags						= ODPF_BOLDGROUPS;

-	odp.nIDBottomSimpleControl		= 0;

 	odp.pfnDlgProc					= DlgProcOpts;

 	

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

-

 	return 0;

 }

 

diff --git a/message_notify/resource.h b/message_notify/resource.h
index 83486fc..b969029 100644
--- a/message_notify/resource.h
+++ b/message_notify/resource.h
@@ -14,12 +14,10 @@
 #define IDC_CP_TXT                      1008

 #define IDC_CHK_TABS                    1009

 #define IDC_CHK_CLOSE                   1010

-#define IDC_CHK_CLOSE2                  1011

 #define IDC_CHK_MSG                     1011

 #define IDC_LIST1                       1012

 #define IDC_LST_STATUS                  1012

 #define IDC_CHK_POPUPS                  1013

-#define IDC_CHK_SPEACH                  1014

 #define IDC_CHK_SPEECH                  1014

 

 // Next default values for new objects

diff --git a/message_notify/resource.rc b/message_notify/resource.rc
index 1bfc075..e0bf111 100644
--- a/message_notify/resource.rc
+++ b/message_notify/resource.rc
@@ -60,15 +60,15 @@ BEGIN
     CONTROL         "Notify if window not open",IDC_RAD_CLOSED,"Button",BS_AUTORADIOBUTTON | WS_GROUP,13,21,132,10

     CONTROL         "Notify if window isn't 'foreground'",IDC_RAD_NFORE,

                     "Button",BS_AUTORADIOBUTTON,13,41,132,10

-    CONTROL         "Notify always",IDC_RAD_ALWAYS,"Button",BS_AUTORADIOBUTTON,13,77,132,10

     CONTROL         "Consider tabs",IDC_CHK_TABS,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,29,57,112,10

-    CONTROL         "Close window on right click",IDC_CHK_CLOSE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,40,129,132,10

+    CONTROL         "Notify always",IDC_RAD_ALWAYS,"Button",BS_AUTORADIOBUTTON,13,77,132,10

     GROUPBOX        "Disable when",IDC_STATIC,155,7,107,94

     CONTROL         "",IDC_LST_STATUS,"SysListView32",LVS_REPORT | LVS_NOLABELWRAP | LVS_ALIGNLEFT | LVS_NOCOLUMNHEADER | LVS_NOSORTHEADER | WS_TABSTOP,159,17,99,80,WS_EX_CLIENTEDGE

-    CONTROL         "Include message text",IDC_CHK_MSG,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,40,142,132,10

     GROUPBOX        "Notification Types",IDC_STATIC,7,103,255,71

     CONTROL         "Popups",IDC_CHK_POPUPS,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,23,116,104,10

-    CONTROL         "Speech",IDC_CHK_SPEECH,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,23,154,104,10

+    CONTROL         "Include message text",IDC_CHK_MSG,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,40,142,132,10

+    CONTROL         "Close window on right click",IDC_CHK_CLOSE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,40,129,132,10

+    CONTROL         "Speech",IDC_CHK_SPEECH,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,23,156,104,10

 END

 

 

diff --git a/ping/options.cpp b/ping/options.cpp
index 56e2d69..7da7639 100644
--- a/ping/options.cpp
+++ b/ping/options.cpp
@@ -539,36 +539,23 @@ static BOOL CALLBACK DlgProcOpts2(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM
 

 int PingOptInit(WPARAM wParam,LPARAM lParam)

 {

-#define OPTIONPAGE_OLD_SIZE2 60

-	DWORD mirVir = (DWORD)CallService(MS_SYSTEM_GETVERSION, 0, 0);

-

 	OPTIONSDIALOGPAGE odp = { 0 };

-	//odp.cbSize						= sizeof(odp);

-	odp.cbSize						= (mirVir >= 0x00060000 ? sizeof(odp) : OPTIONPAGE_OLD_SIZE2);

-	odp.position					= -790000000;

+	odp.cbSize						= sizeof(odp);

 	odp.hInstance					= hInst;

-	odp.pszTemplate					= MAKEINTRESOURCE(IDD_DIALOG1);

-	odp.pszTitle					= Translate("PING");

-	odp.pszGroup					= Translate("Network");

 	odp.flags						= ODPF_BOLDGROUPS;

-	odp.nIDBottomSimpleControl		= 0;

+	odp.pszGroup					= "Network";

+	odp.pszTitle					= "PING";

+

+	odp.pszTab						= "Settings";

+	odp.pszTemplate					= MAKEINTRESOURCE(IDD_DIALOG1);

 	odp.pfnDlgProc					= DlgProcOpts;

-	odp.pszTab						= Translate("Settings");

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

 

-	OPTIONSDIALOGPAGE odp2 = { 0 };

-	//odp.cbSize						= sizeof(odp);

-	odp2.cbSize						= (mirVir >= 0x00060000 ? sizeof(odp) : OPTIONPAGE_OLD_SIZE2);

-	odp2.position					= -790000100;

-	odp2.hInstance					= hInst;

-	odp2.pszTemplate				= MAKEINTRESOURCE(IDD_DIALOG2);

-	odp2.pszTitle					= (mirVir >= 0x00060000 ? Translate("PING") : Translate("PING Hosts"));

-	odp2.pszGroup					= Translate("Network");

-	odp2.flags						= ODPF_BOLDGROUPS;

-	odp2.nIDBottomSimpleControl		= 0;

-	odp2.pfnDlgProc					= DlgProcOpts2;

-	odp2.pszTab						= Translate("Hosts");

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

+	odp.pszTab						= "Hosts";

+	odp.pszTemplate					= MAKEINTRESOURCE(IDD_DIALOG2);

+	odp.pfnDlgProc					= DlgProcOpts2;

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

+

 	return 0;

 }

 

diff --git a/ping/ping_8.vcproj b/ping/ping_8.vcproj
index 6f08f14..a234b86 100644
--- a/ping/ping_8.vcproj
+++ b/ping/ping_8.vcproj
@@ -78,7 +78,6 @@
 				Name="VCLinkerTool"

 				IgnoreImportLibrary="true"

 				AdditionalDependencies="user32.lib gdi32.lib ws2_32.lib shell32.lib comdlg32.lib"

-				OutputFile="../../bin/debug/plugins/pingplug.dll"

 				LinkIncremental="2"

 				SuppressStartupBanner="true"

 				GenerateDebugInformation="true"

@@ -180,7 +179,6 @@
 			<Tool

 				Name="VCLinkerTool"

 				AdditionalDependencies="ws2_32.lib wsock32.lib user32.lib gdi32.lib shell32.lib comdlg32.lib"

-				OutputFile="../../bin/release/plugins/pingplug.dll"

 				LinkIncremental="1"

 				SuppressStartupBanner="true"

 				GenerateManifest="true"

diff --git a/ping/pingthread.cpp b/ping/pingthread.cpp
index 3c6b2c9..6623b51 100644
--- a/ping/pingthread.cpp
+++ b/ping/pingthread.cpp
@@ -746,19 +746,21 @@ LRESULT CALLBACK FrameWindowProc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lPar
 			return TRUE;

 		case ID_MENU_OPTIONS:

 			{

-				OPENOPTIONSDIALOG oop;

+				OPENOPTIONSDIALOG oop = {0};

 				oop.cbSize = sizeof(oop);

-				oop.pszGroup = Translate("Network");

-				oop.pszPage = Translate("PING");

+				oop.pszGroup = "Network";

+				oop.pszPage = "PING";

+				oop.pszTab = "Settings";

 				CallService(MS_OPT_OPENOPTIONS, 0, (WPARAM)&oop);

 			}

 			return TRUE;

 		case ID_MENU_DESTINATIONS:

 			{

-				OPENOPTIONSDIALOG oop;

+				OPENOPTIONSDIALOG oop = {0};

 				oop.cbSize = sizeof(oop);

-				oop.pszGroup = Translate("Network");

-				oop.pszPage = Translate("PING Hosts");

+				oop.pszGroup = "Network";

+				oop.pszPage = "PING";

+				oop.pszTab = "Hosts";

 				CallService(MS_OPT_OPENOPTIONS, 0, (WPARAM)&oop);

 			}

 			return TRUE;

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);

 		}