Reverted some broken plugins settings.

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

8 files changed, 35 insertions, 35 deletions

diff --git a/plugins/BuddyExpectator/src/options.cpp b/plugins/BuddyExpectator/src/options.cpp
index 1df594b9ed..5f09e17638 100644
--- a/plugins/BuddyExpectator/src/options.cpp
+++ b/plugins/BuddyExpectator/src/options.cpp
@@ -36,19 +36,19 @@ void LoadOptions()
 	options.iAbsencePeriod2    = db_get_dw(NULL, MODULE_NAME, "iAbsencePeriod2", 30 * 3);

 	options.iSilencePeriod     = db_get_dw(NULL, MODULE_NAME, "iSilencePeriod", 30);

 

-	options.iShowPopup         = db_get_b(NULL, MODULE_NAME, "iShowPopup", 1);

+	options.iShowPopup         = db_get_b(NULL, MODULE_NAME, "iShowPopUp", 1);

 	options.iShowEvent         = db_get_b(NULL, MODULE_NAME, "iShowEvent", 0);

 	options.iShowUDetails      = db_get_b(NULL, MODULE_NAME, "iShowUDetails", 0);

 	options.iShowMessageWindow = db_get_b(NULL, MODULE_NAME, "iShowMessageWindow", 1);

 

-	options.iPopupColorBack    = db_get_dw(NULL, MODULE_NAME, "iPopupColorBack", DEF_COLOR_BACK);

-	options.iPopupColorFore    = db_get_dw(NULL, MODULE_NAME, "iPopupColorFore", DEF_COLOR_FORE);

+	options.iPopupColorBack    = db_get_dw(NULL, MODULE_NAME, "iPopUpColorBack", DEF_COLOR_BACK);

+	options.iPopupColorFore    = db_get_dw(NULL, MODULE_NAME, "iPopUpColorFore", DEF_COLOR_FORE);

 

 	options.iUsePopupColors    = db_get_b(NULL, MODULE_NAME, "iUsePopupColors", 0);

 	options.iUseWinColors      = db_get_b(NULL, MODULE_NAME, "iUseWinColors", 0);

-	options.iPopupDelay        = db_get_b(NULL, MODULE_NAME, "iPopupDelay", 0);

+	options.iPopupDelay        = db_get_b(NULL, MODULE_NAME, "iPopUpDelay", 0);

 

-	options.iShowPopup2        = db_get_b(NULL, MODULE_NAME, "iShowPopup2", 1);

+	options.iShowPopup2        = db_get_b(NULL, MODULE_NAME, "iShowPopUp2", 1);

 	options.iShowEvent2        = db_get_b(NULL, MODULE_NAME, "iShowEvent2", 0);

 	options.action2            = (GoneContactAction)db_get_b(NULL, MODULE_NAME, "Action2", (BYTE)GCA_NOACTION);

 	options.notifyFirstOnline  = db_get_b(NULL, MODULE_NAME, "bShowFirstSight", 0) ? true : false;

@@ -63,12 +63,12 @@ void SaveOptions()
 	db_set_dw(NULL, MODULE_NAME, "iAbsencePeriod2", options.iAbsencePeriod2);

 	db_set_dw(NULL, MODULE_NAME, "iSilencePeriod", options.iSilencePeriod);

 

-	db_set_b(NULL, MODULE_NAME, "iShowPopup", options.iShowPopup);

+	db_set_b(NULL, MODULE_NAME, "iShowPopUp", options.iShowPopup);

 	db_set_b(NULL, MODULE_NAME, "iShowEvent", options.iShowEvent);

 	db_set_b(NULL, MODULE_NAME, "iShowUDetails", options.iShowUDetails);

 	db_set_b(NULL, MODULE_NAME, "iShowMessageWindow", options.iShowMessageWindow);

 

-	db_set_b(NULL, MODULE_NAME, "iShowPopup2", options.iShowPopup2);

+	db_set_b(NULL, MODULE_NAME, "iShowPopUp2", options.iShowPopup2);

 	db_set_b(NULL, MODULE_NAME, "iShowEvent2", options.iShowEvent2);

 	db_set_b(NULL, MODULE_NAME, "Action2", (BYTE)options.action2);

 	db_set_b(NULL, MODULE_NAME, "bShowFirstSight", options.notifyFirstOnline ? 1 : 0);

@@ -78,12 +78,12 @@ void SaveOptions()
 

 void SavePopupOptions()

 {

-	db_set_dw(NULL, MODULE_NAME, "iPopupColorBack", options.iPopupColorBack);

-	db_set_dw(NULL, MODULE_NAME, "iPopupColorFore", options.iPopupColorFore);

+	db_set_dw(NULL, MODULE_NAME, "iPopUpColorBack", options.iPopupColorBack);

+	db_set_dw(NULL, MODULE_NAME, "iPopUpColorFore", options.iPopupColorFore);

 

 	db_set_b(NULL, MODULE_NAME, "iUsePopupColors", options.iUsePopupColors);

 	db_set_b(NULL, MODULE_NAME, "iUseWinColors", options.iUseWinColors);

-	db_set_b(NULL, MODULE_NAME, "iPopupDelay", options.iPopupDelay);

+	db_set_b(NULL, MODULE_NAME, "iPopUpDelay", options.iPopupDelay);

 }

 

 /**

diff --git a/plugins/DbEditorPP/src/main.cpp b/plugins/DbEditorPP/src/main.cpp
index 11641cc3bb..d69e9e7c54 100644
--- a/plugins/DbEditorPP/src/main.cpp
+++ b/plugins/DbEditorPP/src/main.cpp
@@ -221,7 +221,7 @@ int ModulesLoaded(WPARAM wParam,LPARAM lParam)
 	db_free(&dbv);

 	UnhookEvent(hModulesLoadedHook);

 

-	usePopups = db_get_b(NULL,modname,"UsePopups",0);

+	usePopups = db_get_b(NULL,modname,"UsePopUps",0);

 

 	// Load the name order

 	for(i=0; i < NAMEORDERCOUNT; i++)

diff --git a/plugins/DbEditorPP/src/options.cpp b/plugins/DbEditorPP/src/options.cpp
index e877ae6411..77cb67abfe 100644
--- a/plugins/DbEditorPP/src/options.cpp
+++ b/plugins/DbEditorPP/src/options.cpp
@@ -58,7 +58,7 @@ INT_PTR CALLBACK DlgProcOpts(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam)
 								db_set_b(NULL,modname,"UserMenuItem",(BYTE)IsDlgButtonChecked(hwnd,IDC_MENU));

 								db_set_b(NULL,modname,"UseKnownModList",(BYTE)IsDlgButtonChecked(hwnd,IDC_USEKNOWNMODS));

 								usePopups = IsDlgButtonChecked(hwnd,IDC_POPUPS);

-								db_set_b(NULL,modname,"UsePopups",(BYTE)usePopups);

+								db_set_b(NULL,modname,"UsePopUps",(BYTE)usePopUps);

 								if (GetDlgItemText(hwnd,IDC_MODULES,mods,4096))

 									db_set_s(NULL,modname,"CoreModules",mods);

 								db_set_w(NULL,modname,"PopupDelay",(WORD)GetDlgItemInt(hwnd,IDC_POPUPTIMEOUT,NULL,0));

diff --git a/plugins/Scriver/src/chat/options.cpp b/plugins/Scriver/src/chat/options.cpp
index 78a809e907..eee5dd32cf 100644
--- a/plugins/Scriver/src/chat/options.cpp
+++ b/plugins/Scriver/src/chat/options.cpp
@@ -90,19 +90,19 @@ static struct branch_t branch4[] = {
 };

 

 static struct branch_t branch6[] = {

-	{LPGENT("Show Popups only when the chat room is not active"), "PopupInactiveOnly", 0, 1, NULL},

-	{LPGENT("Show Popup for topic changes"), "PopupFlags", GC_EVENT_TOPIC, 0, NULL},

-	{LPGENT("Show Popup for users joining"), "PopupFlags", GC_EVENT_JOIN, 0, NULL},

-	{LPGENT("Show Popup for users disconnecting"), "PopupFlags", GC_EVENT_QUIT, 0, NULL},

-	{LPGENT("Show Popup for messages"), "PopupFlags", GC_EVENT_MESSAGE, 0, NULL},

-	{LPGENT("Show Popup for actions"), "PopupFlags", GC_EVENT_ACTION, 0, NULL},

-	{LPGENT("Show Popup for highlights"), "PopupFlags", GC_EVENT_HIGHLIGHT, 0, NULL},

-	{LPGENT("Show Popup for users leaving"), "PopupFlags", GC_EVENT_PART, 0, NULL},

-	{LPGENT("Show Popup for users kicking other user"), "PopupFlags", GC_EVENT_KICK, 0, NULL},

-	{LPGENT("Show Popup for notices "), "PopupFlags", GC_EVENT_NOTICE, 0, NULL},

-	{LPGENT("Show Popup for name changes"), "PopupFlags", GC_EVENT_NICK, 0, NULL},

-	{LPGENT("Show Popup for information messages"), "PopupFlags", GC_EVENT_INFORMATION, 0, NULL},

-	{LPGENT("Show Popup for status changes"), "PopupFlags", GC_EVENT_ADDSTATUS, 0, NULL},

+	{LPGENT("Show popups only when the chat room is not active"), "PopupInactiveOnly", 0, 1, NULL},

+	{LPGENT("Show popup for topic changes"), "PopupFlags", GC_EVENT_TOPIC, 0, NULL},

+	{LPGENT("Show popup for users joining"), "PopupFlags", GC_EVENT_JOIN, 0, NULL},

+	{LPGENT("Show popup for users disconnecting"), "PopupFlags", GC_EVENT_QUIT, 0, NULL},

+	{LPGENT("Show popup for messages"), "PopupFlags", GC_EVENT_MESSAGE, 0, NULL},

+	{LPGENT("Show popup for actions"), "PopupFlags", GC_EVENT_ACTION, 0, NULL},

+	{LPGENT("Show popup for highlights"), "PopupFlags", GC_EVENT_HIGHLIGHT, 0, NULL},

+	{LPGENT("Show popup for users leaving"), "PopupFlags", GC_EVENT_PART, 0, NULL},

+	{LPGENT("Show popup for users kicking other user"), "PopupFlags", GC_EVENT_KICK, 0, NULL},

+	{LPGENT("Show popup for notices "), "PopupFlags", GC_EVENT_NOTICE, 0, NULL},

+	{LPGENT("Show popup for name changes"), "PopupFlags", GC_EVENT_NICK, 0, NULL},

+	{LPGENT("Show popup for information messages"), "PopupFlags", GC_EVENT_INFORMATION, 0, NULL},

+	{LPGENT("Show popup for status changes"), "PopupFlags", GC_EVENT_ADDSTATUS, 0, NULL},

 };

 

 static HTREEITEM InsertBranch(HWND hwndTree, TCHAR* pszDescr, BOOL bExpanded)

@@ -618,7 +618,7 @@ INT_PTR CALLBACK DlgProcOptions2(HWND hwndDlg,UINT uMsg,WPARAM wParam,LPARAM lPa
 			g_Settings.dwPopupFlags = db_get_dw(NULL, "Chat", "PopupFlags", 0x0000);

 			g_Settings.StripFormat = (BOOL)db_get_b(NULL, "Chat", "TrimFormatting", 0);

 			g_Settings.TrayIconInactiveOnly = (BOOL)db_get_b(NULL, "Chat", "TrayIconInactiveOnly", 1);

-			g_Settings.PopupInactiveOnly = (BOOL)db_get_b(NULL, "Chat", "PopupInactiveOnly", 1);

+			g_Settings.PopupInactiveOnly = (BOOL)db_get_b(NULL, "Chat", "PopUpInactiveOnly", 1);

 

 			g_Settings.LogIndentEnabled = (db_get_b(NULL, "Chat", "LogIndentEnabled", 1) != 0)?TRUE:FALSE;

 			MM_FontsChanged();

@@ -793,7 +793,7 @@ void LoadGlobalSettings(void)
 	g_Settings.crLogBackground = db_get_dw(NULL, "Chat", "ColorLogBG", GetSysColor(COLOR_WINDOW));

 	g_Settings.StripFormat = (BOOL)db_get_b(NULL, "Chat", "StripFormatting", 0);

 	g_Settings.TrayIconInactiveOnly = (BOOL)db_get_b(NULL, "Chat", "TrayIconInactiveOnly", 1);

-	g_Settings.PopupInactiveOnly = (BOOL)db_get_b(NULL, "Chat", "PopupInactiveOnly", 1);

+	g_Settings.PopupInactiveOnly = (BOOL)db_get_b(NULL, "Chat", "PopUpInactiveOnly", 1);

 	g_Settings.AddColonToAutoComplete = (BOOL)db_get_b(NULL, "Chat", "AddColonToAutoComplete", 1);

 	g_Settings.iPopupStyle = db_get_b(NULL, "Chat", "PopupStyle", 1);

 	g_Settings.iPopupTimeout = db_get_w(NULL, "Chat", "PopupTimeout", 3);

diff --git a/plugins/Weather/src/weather_contacts.cpp b/plugins/Weather/src/weather_contacts.cpp
index c8b50a49a2..2cc4187bf1 100644
--- a/plugins/Weather/src/weather_contacts.cpp
+++ b/plugins/Weather/src/weather_contacts.cpp
@@ -202,7 +202,7 @@ INT_PTR CALLBACK DlgProcChange(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lPa
 		EnableWindow(GetDlgItem(hwndDlg, IDC_BROWSE), (BYTE)IsDlgButtonChecked(hwndDlg, IDC_External));

 

 		// other checkbox options

-		CheckDlgButton(hwndDlg, IDC_DPop, db_get_b(hContact, WEATHERPROTONAME, "DPopup", FALSE));

+		CheckDlgButton(hwndDlg, IDC_DPop, db_get_b(hContact, WEATHERPROTONAME, "DPopUp", FALSE));

 		CheckDlgButton(hwndDlg, IDC_DAutoUpdate, db_get_b(hContact, WEATHERPROTONAME, "DAutoUpdate", FALSE));

 		CheckDlgButton(hwndDlg, IDC_Internal, db_get_b(hContact, WEATHERPROTONAME, "History", 0));

 

@@ -389,7 +389,7 @@ INT_PTR CALLBACK DlgProcChange(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lPa
 			db_set_b(hContact, WEATHERPROTONAME, "History", (BYTE)IsDlgButtonChecked(hwndDlg, IDC_Internal));

 			db_set_b(hContact, WEATHERPROTONAME, "Overwrite", (BYTE)IsDlgButtonChecked(hwndDlg, IDC_Overwrite));

 			db_set_b(hContact, WEATHERPROTONAME, "File", (BYTE)IsDlgButtonChecked(hwndDlg, IDC_External));

-			db_set_b(hContact, WEATHERPROTONAME, "DPopup", (BYTE)IsDlgButtonChecked(hwndDlg, IDC_DPop));

+			db_set_b(hContact, WEATHERPROTONAME, "DPopUp", (BYTE)IsDlgButtonChecked(hwndDlg, IDC_DPop));

 			db_set_b(hContact, WEATHERPROTONAME, "DAutoUpdate", (BYTE)IsDlgButtonChecked(hwndDlg, IDC_DAutoUpdate));

 

 			// re-enable the protocol and update the data for the station

diff --git a/plugins/Weather/src/weather_opt.cpp b/plugins/Weather/src/weather_opt.cpp
index b1fdff274b..57df8cd08d 100644
--- a/plugins/Weather/src/weather_opt.cpp
+++ b/plugins/Weather/src/weather_opt.cpp
@@ -185,10 +185,10 @@ void LoadOptions(void)
 	// advanced

 	opt.DisCondIcon = db_get_b(NULL, WEATHERPROTONAME, "DisableConditionIcon", false);

 	// popup options

-	opt.UsePopup = db_get_b(NULL, WEATHERPROTONAME, "UsePopup", true);

+	opt.UsePopup = db_get_b(NULL, WEATHERPROTONAME, "UsePopUp", true);

 	opt.UpdatePopup = db_get_b(NULL, WEATHERPROTONAME, "UpdatePopup", true);

 	opt.AlertPopup = db_get_b(NULL, WEATHERPROTONAME, "AlertPopup", true);

-	opt.PopupOnChange = db_get_b(NULL, WEATHERPROTONAME, "PopupOnChange", true);

+	opt.PopupOnChange = db_get_b(NULL, WEATHERPROTONAME, "PopUpOnChange", true);

 	opt.ShowWarnings = db_get_b(NULL, WEATHERPROTONAME, "ShowWarnings", true);

 	// popup colors

 	opt.BGColour = db_get_dw(NULL, WEATHERPROTONAME, "BackgroundColour", GetSysColor(COLOR_BTNFACE));

@@ -254,10 +254,10 @@ void SaveOptions(void)
 	// advanced

 	db_set_b(NULL, WEATHERPROTONAME, "DisableConditionIcon", (BYTE)opt.DisCondIcon);

 	// popup options

-	db_set_b(NULL, WEATHERPROTONAME, "UsePopup", (BYTE)opt.UsePopup);

+	db_set_b(NULL, WEATHERPROTONAME, "UsePopUp", (BYTE)opt.UsePopup);

 	db_set_b(NULL, WEATHERPROTONAME, "UpdatePopup", (BYTE)opt.UpdatePopup);

 	db_set_b(NULL, WEATHERPROTONAME, "AlertPopup", (BYTE)opt.AlertPopup);

-	db_set_b(NULL, WEATHERPROTONAME, "PopupOnChange", (BYTE)opt.PopupOnChange);

+	db_set_b(NULL, WEATHERPROTONAME, "PopUpOnChange", (BYTE)opt.PopupOnChange);

 	db_set_b(NULL, WEATHERPROTONAME, "ShowWarnings", (BYTE)opt.ShowWarnings);

 	// popup colors

 	db_set_dw(NULL, WEATHERPROTONAME, "BackgroundColour", opt.BGColour);

diff --git a/plugins/Weather/src/weather_popup.cpp b/plugins/Weather/src/weather_popup.cpp
index 0ad926e5a1..d8396532fd 100644
--- a/plugins/Weather/src/weather_popup.cpp
+++ b/plugins/Weather/src/weather_popup.cpp
@@ -36,7 +36,7 @@ int WeatherPopup(WPARAM wParam, LPARAM lParam)
 {

 	// determine if the popup should display or not

 	if (opt.UsePopup && opt.UpdatePopup && (!opt.PopupOnChange || (BOOL)lParam) &&

-	      !db_get_b((HANDLE)wParam, WEATHERPROTONAME, "DPopup", 0)) 

+	      !db_get_b((HANDLE)wParam, WEATHERPROTONAME, "DPopUp", 0)) 

 	{

 		POPUPDATAT ppd = {0};

 		WEATHERINFO winfo;

diff --git a/plugins/Weather/src/weather_update.cpp b/plugins/Weather/src/weather_update.cpp
index 95777c3fd5..a6cee642ff 100644
--- a/plugins/Weather/src/weather_update.cpp
+++ b/plugins/Weather/src/weather_update.cpp
@@ -102,7 +102,7 @@ int UpdateWeather(HANDLE hContact)
 	// have weather alert issued?

 	dbres = db_get_ts(hContact, WEATHERCONDITION, "Alert", &dbv);

 	if ( !dbres && dbv.ptszVal[0] != 0) {

-		if (opt.AlertPopup && !db_get_b(hContact, WEATHERPROTONAME, "DPopup", 0) && Ch) {

+		if (opt.AlertPopup && !db_get_b(hContact, WEATHERPROTONAME, "DPopUp", 0) && Ch) {

 			// display alert popup

 			wsprintf(str, _T("Alert for %s%c%s"), winfo.city, 255, dbv.ptszVal);

 			WPShowMessage(str, SM_WEATHERALERT);