diff options
| author | Robert Pösel <robyer@seznam.cz> | 2013-05-19 14:39:37 +0000 |
|---|---|---|
| committer | Robert Pösel <robyer@seznam.cz> | 2013-05-19 14:39:37 +0000 |
| commit | 06c0a5ae32725b614c5c8c118c0f64d6742e5a36 (patch) | |
| tree | 835d1103c22e760f8347588ef626d3a45d0cd2ea /plugins | |
| parent | 2bfb7d60344d2256779b193f49032b103b40e480 (diff) | |
Changed PopUp to Popup in delphi files, langpack files and rc files.
git-svn-id: http://svn.miranda-ng.org/main/trunk@4734 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
Diffstat (limited to 'plugins')
24 files changed, 161 insertions, 161 deletions
diff --git a/plugins/!NotAdopted/Chess4Net/MI/MirandaINC/m_popup.inc b/plugins/!NotAdopted/Chess4Net/MI/MirandaINC/m_popup.inc index 22c5c01835..4d7632f25f 100644 --- a/plugins/!NotAdopted/Chess4Net/MI/MirandaINC/m_popup.inc +++ b/plugins/!NotAdopted/Chess4Net/MI/MirandaINC/m_popup.inc @@ -1,12 +1,12 @@ (*
===============================================================================
- PopUp plugin
-Plugin Name: PopUp
+ Popup plugin
+Plugin Name: Popup
Plugin author: hrk, Luca Santarelli, hrk@users.sourceforge.net
This file has been created by egodust, Sam, egodust@users.sourceforge.net
===============================================================================
-The purpose of this plugin is to give developers a common "platform/interface" to show PopUps. It is born from the source code of NewStatusNotify, another plugin I've made.
+The purpose of this plugin is to give developers a common "platform/interface" to show Popups. It is born from the source code of NewStatusNotify, another plugin I've made.
Remember that users *must* have this plugin enabled, or they won't get any popup. Write this in the requirements, do whatever you wish ;-)... but tell them!
===============================================================================
@@ -70,36 +70,36 @@ const (*
Creates, adds and shows a popup, given a (valid) POPUPDATA structure pointer.
- wParam = (WPARAM)(*POPUPDATA)PopUpDataAddress
+ wParam = (WPARAM)(*POPUPDATA)PopupDataAddress
lParam = 0
- Returns: > 0 on success, 0 if creation went bad, -1 if the PopUpData contained unacceptable values.
- NOTE: it returns -1 if the PopUpData was not valid, if there were already too many popups, if the module was disabled.
+ Returns: > 0 on success, 0 if creation went bad, -1 if the PopupData contained unacceptable values.
+ NOTE: it returns -1 if the PopupData was not valid, if there were already too many popups, if the module was disabled.
Otherwise, it can return anything else...
*)
- MS_POPUP_ADDPOPUP = 'PopUp/AddPopUp';
+ MS_POPUP_ADDPOPUP = 'Popup/AddPopup';
(*
The same, but with a POPUPDATAEX structure pointer.
- wParam = (WPARAM)(*POPUPDATAEX)PopUpDataExAddress
+ wParam = (WPARAM)(*POPUPDATAEX)PopupDataExAddress
lParam = 0
*)
- MS_POPUP_ADDPOPUP = 'PopUp/AddPopUpEx';
+ MS_POPUP_ADDPOPUP = 'Popup/AddPopupEx';
(*
- Returns the handle to the contact associated to the specified PopUpWindow.
+ Returns the handle to the contact associated to the specified PopupWindow.
You will probably need to know this handle inside your WNDPROC. Exampole: you want to open the MessageWindow. :-)
Call MS_POPUP_GETCONTACT on the hWnd you were given in the WNDPROC.
- wParam = (WPARAM)(HWND)hPopUpWindow
+ wParam = (WPARAM)(HWND)hPopupWindow
lParam = 0;
Returns: the HANDLE of the contact. Can return NULL, meaning it's the main contact. -1 means failure.
*)
- MS_POPUP_GETCONTACT = 'PopUp/GetContact';
+ MS_POPUP_GETCONTACT = 'Popup/GetContact';
(*
- wParam = hPopUpWindow
+ wParam = hPopupWindow
lParam = PluginDataAddress;
Returns: the address of the PLUGINDATA structure. Can return NULL, meaning nothing was given. -1 means failure.
IMPORTANT NOTE: it doesn't seem to work if you do:
@@ -107,16 +107,16 @@ const and then use that struct.
Do this, instead:
aPointerToStruct = CallService(..., (LPARAM)aPointerToAStruct);
- and it will work. Just look at the example I've written above (PopUpDlgProc).
+ and it will work. Just look at the example I've written above (PopupDlgProc).
*)
- MS_POPUP_GETPLUGINDATA = 'PopUp/GetPluginData';
+ MS_POPUP_GETPLUGINDATA = 'Popup/GetPluginData';
(*
wParam = 0
lParam = 0
Returns: 0 if the user has chosen not to have the second line, 1 if he choose to have the second line.
*)
- MS_POPUP_ISSECONDLINESHOWN = 'PopUp/IsSecondLineShown';
+ MS_POPUP_ISSECONDLINESHOWN = 'Popup/IsSecondLineShown';
(*
UM_FREEPLUGINDATA
@@ -132,29 +132,29 @@ const (*
UM_INITPOPUP
- wParam = (WPARAM)(HWND)hPopUpWindow (but this is useless, since I'll directly send it to your hPopUpWindow
+ wParam = (WPARAM)(HWND)hPopupWindow (but this is useless, since I'll directly send it to your hPopupWindow
lParam = 0.
- This message is sent to the PopUp when its creation has been finished, so POPUPDATA (and thus your PluginData) is reachable.
+ This message is sent to the Popup when its creation has been finished, so POPUPDATA (and thus your PluginData) is reachable.
Catch it if you needed to catch WM_CREATE or WM_INITDIALOG, which you'll never ever get in your entire popup-life.
Return value: if you process this message, return 0. If you don't process it, return 0. Do whatever you like ;-)
*)
UM_INITPOPUP = ($400(*WM_USER*) + $202);
(*
- wParam = hPopUpWindow
+ wParam = hPopupWindow
lParam = lpzNewText
returns: > 0 for success, -1 for failure, 0 if the failure is due to second line not being shown. (but you could call PUIsSecondLineShown() before changing the text...)
Changes the text displayed in the second line of the popup.
*)
- MS_POPUP_CHANGETEXT = 'PopUp/Changetext';
+ MS_POPUP_CHANGETEXT = 'Popup/Changetext';
(*
This is mainly for developers.
- Shows a warning message in a PopUp. It's useful if you need a "MessageBox" like function, but you don't want a modal window (which will interfere with a DialogProcedure. MessageBox steals focus and control, this one not.
+ Shows a warning message in a Popup. It's useful if you need a "MessageBox" like function, but you don't want a modal window (which will interfere with a DialogProcedure. MessageBox steals focus and control, this one not.
wParam = lpzMessage
lParam = 0; Returns: 0 if the popup was shown, -1 in case of failure.
*)
- MS_POPUP_SHOWMESSAGE = 'PopUp/ShowMessage';
+ MS_POPUP_SHOWMESSAGE = 'Popup/ShowMessage';
(* helper functions, will be inlined on FPC if you have the swithces enabled *)
@@ -167,15 +167,15 @@ const Result := CallService(MS_POPUP_ADDPOPUP, WPARAM(ppdp), 0);
end;
- function PUGetContact(hPopUpWindow: THandle): THandle;
+ function PUGetContact(hPopupWindow: THandle): THandle;
{$ifdef FPC}
inline;
{$endif}
begin
- Result := CallService(MS_POPUP_GETCONTACT, WPARAM(hPopUpWindow), 0);
+ Result := CallService(MS_POPUP_GETCONTACT, WPARAM(hPopupWindow), 0);
end;
- function PUGetPluginData(hPopUpWindow: THandle): Pointer;
+ function PUGetPluginData(hPopupWindow: THandle): Pointer;
{$ifdef FPC}
inline;
{$endif}
@@ -183,7 +183,7 @@ const dummy: pointer;
begin
dummy := nil;
- Int(Result) := CallService(MS_POPUP_GETPLUGINDATA, WPARAM(hPopUpWindow), LPARAM(dummy));
+ Int(Result) := CallService(MS_POPUP_GETPLUGINDATA, WPARAM(hPopupWindow), LPARAM(dummy));
end;
function PUIsSecondLineShown: BOOL;
@@ -194,20 +194,20 @@ const Int(Result) := CallService(MS_POPUP_ISSECONDLINESHOWN, 0, 0);
end;
- function PUDeletePopUp(hWndPopUp: THandle): int;
+ function PUDeletePopup(hWndPopup: THandle): int;
{$ifdef FPC}
inline;
{$endif}
begin
- Result := SendMessage(hWndPopUp, UM_DESTROYPOPUP, 0, 0);
+ Result := SendMessage(hWndPopup, UM_DESTROYPOPUP, 0, 0);
end;
- function PUChangeText(hWndPopUp: THandle; lpzNewText: PChar): int;
+ function PUChangeText(hWndPopup: THandle; lpzNewText: PChar): int;
{$ifdef FPC}
inline;
{$endif}
begin
- Result := CallService(MS_POPUP_CHANGETEXT, WPARAM(hWndPopUp), LPARAM(lpzNewText));
+ Result := CallService(MS_POPUP_CHANGETEXT, WPARAM(hWndPopup), LPARAM(lpzNewText));
end;
function PUShowMessage(lpzText: PChar; kind: Byte): int;
diff --git a/plugins/!NotAdopted/mDynDNS/resource.rc b/plugins/!NotAdopted/mDynDNS/resource.rc index 685e8d8062..682ce500b3 100644 --- a/plugins/!NotAdopted/mDynDNS/resource.rc +++ b/plugins/!NotAdopted/mDynDNS/resource.rc @@ -52,7 +52,7 @@ BEGIN "Button",BS_AUTOCHECKBOX | WS_TABSTOP,13,29,267,10
GROUPBOX "Delay",IDC_STATIC,159,47,147,69
CONTROL "&Custom",IDC_DELAY_CUSTOM,"Button",BS_AUTORADIOBUTTON,167,66,87,10
- CONTROL "&From PopUp plugin",IDC_DELAY_POPUP,"Button",BS_AUTORADIOBUTTON,167,96,131,10
+ CONTROL "&From Popup plugin",IDC_DELAY_POPUP,"Button",BS_AUTORADIOBUTTON,167,96,131,10
CONTROL "P&ermanent",IDC_DELAY_PERMANENT,"Button",BS_AUTORADIOBUTTON,167,81,131,10
EDITTEXT IDC_DELAY,268,64,21,12,ES_AUTOHSCROLL | ES_NUMBER
GROUPBOX "Colours",IDC_STATIC,5,47,147,69
diff --git a/plugins/Actman/services.ini b/plugins/Actman/services.ini index c40bbe1588..658b87ebc0 100644 --- a/plugins/Actman/services.ini +++ b/plugins/Actman/services.ini @@ -243,21 +243,21 @@ lparam=structure|0|native|bptr|bptr|bptr| return=int 0, if successful
descr=Opens the options dialog, optionally at the specified page
-[Service:PopUp/EnableDisableMenuCommand]
+[Service:Popup/EnableDisableMenuCommand]
wparam=0
lparam=0
plugin=Popup Plus (popup.dll)
-descr=Enables or disables PopUp windows
+descr=Enables or disables Popup windows
-[Service:PopUp/ShowMessage]
+[Service:Popup/ShowMessage]
alias=MS_POPUP_SHOWMESSAGE
wparam=Ansi Text
lparam=1 Warning|2 Notify|3 Error
return=int 0, if successful
-plugin=YAPP or PopUp
+plugin=YAPP or Popup
descr=Popup window
-[Service:PopUp/ShowMessageW]
+[Service:Popup/ShowMessageW]
alias=MS_POPUP_SHOWMESSAGEW
wparam=Unicode Text
lparam=1 Warning|2 Notify|3 Error
@@ -265,11 +265,11 @@ return=int 0, if successful plugin=YAPP only
descr=Popup window
-[Service:PopUp/ToggleEnabled]
+[Service:Popup/ToggleEnabled]
wparam=0
lparam=0
plugin=YAPP (yapp.dll)
-descr=Enables or disables PopUp windows
+descr=Enables or disables Popup windows
[Service:Proto/CallContactService]
alias=MS_PROTO_CALLCONTACTSERVICE
diff --git a/plugins/ChangeKeyboardLayout/res/ChangeKeyboardLayout.rc b/plugins/ChangeKeyboardLayout/res/ChangeKeyboardLayout.rc index c4e830b1cf..769e3d82b6 100644 --- a/plugins/ChangeKeyboardLayout/res/ChangeKeyboardLayout.rc +++ b/plugins/ChangeKeyboardLayout/res/ChangeKeyboardLayout.rc @@ -138,7 +138,7 @@ BEGIN GROUPBOX "Log operations",IDC_STATIC_GROUP_LOG,2,96,152,81
CONTROL "Copy result to clipboard",IDC_CHECK_CLIPBOARD,"Button",
BS_AUTOCHECKBOX | WS_TABSTOP,8,108,141,10
- CONTROL "Show result in PopUp",IDC_CHECK_POPUP,"Button",
+ CONTROL "Show result in Popup",IDC_CHECK_POPUP,"Button",
BS_AUTOCHECKBOX | WS_TABSTOP,8,121,141,10
GROUPBOX "Strings for keyboard layouts",IDC_STATIC_GROUP_STRINGS,
2,180,308,65
@@ -182,7 +182,7 @@ STYLE DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_SYSMENU FONT 8, "MS Shell Dlg", 400, 0, 0x1
BEGIN
GROUPBOX "Colours",IDC_GROUP_COLOURS,2,2,91,72,WS_GROUP
- CONTROL "PopUp colours",IDC_RADIO_COLOURS_POPUP,"Button",
+ CONTROL "Popup colours",IDC_RADIO_COLOURS_POPUP,"Button",
BS_AUTORADIOBUTTON,6,12,82,10
CONTROL "Windows colours",IDC_RADIO_COLOURS_WINDOWS,"Button",
BS_AUTORADIOBUTTON,6,23,82,10
@@ -195,7 +195,7 @@ BEGIN CONTROL "Custom1",IDC_CUSTOM_TEXT,"ColourPicker",WS_TABSTOP,56,
55,29,14
GROUPBOX "Timeout",IDC_GROUP_TIMEOUT,95,2,91,72,WS_GROUP
- CONTROL "From PopUp plugin",IDC_RADIO_TIMEOUT_POPUP,"Button",
+ CONTROL "From Popup plugin",IDC_RADIO_TIMEOUT_POPUP,"Button",
BS_AUTORADIOBUTTON,99,12,82,10
CONTROL "Permanent",IDC_RADIO_TIMEOUT_PERMANENT,"Button",
BS_AUTORADIOBUTTON,99,23,82,10
diff --git a/plugins/ExternalAPI/delphi/m_weather.inc b/plugins/ExternalAPI/delphi/m_weather.inc index 7a89288b39..d8fd41ae31 100644 --- a/plugins/ExternalAPI/delphi/m_weather.inc +++ b/plugins/ExternalAPI/delphi/m_weather.inc @@ -148,7 +148,7 @@ Condition_Changed is true; otherwise is false. ME_WEATHER_UPDATED:pAnsiChar = 'Miranda/Weather/Updated';
{
-Shows a warning message for Weather PopUp.
+Shows a warning message for Weather Popup.
wParam = (char*) lpzMessage
lParam = Type
Type can either be SM_WARNING, SM_NOTIFY, or SM_WEATHERALERT
diff --git a/plugins/ExternalAPI/delphi/m_yapp.inc b/plugins/ExternalAPI/delphi/m_yapp.inc index e85d382bec..ed42f17b91 100644 --- a/plugins/ExternalAPI/delphi/m_yapp.inc +++ b/plugins/ExternalAPI/delphi/m_yapp.inc @@ -66,7 +66,7 @@ const // wParam = 0
// lParam = (POPUPCLASS *)&pc
- MS_POPUP_REGISTERCLASS = 'PopUp/RegisterClass';
+ MS_POPUP_REGISTERCLASS = 'Popup/RegisterClass';
type
TPopupClassInstance = record
@@ -81,6 +81,6 @@ type const
// wParam = 0
// lParam = (POPUPDATACLASS *)&pdc
- MS_POPUP_ADDPOPUPCLASS = 'PopUp/AddPopupClass';
+ MS_POPUP_ADDPOPUPCLASS = 'Popup/AddPopupClass';
{$ENDIF}
diff --git a/plugins/NewEventNotify/res/resource.rc b/plugins/NewEventNotify/res/resource.rc index c3b672b955..96a29e6d30 100644 --- a/plugins/NewEventNotify/res/resource.rc +++ b/plugins/NewEventNotify/res/resource.rc @@ -31,7 +31,7 @@ STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD FONT 8, "MS Shell Dlg", 0, 0, 0x0
BEGIN
GROUPBOX "General Options",IDC_STATIC,6,2,199,43
- CONTROL "Show entry in the PopUps menu",IDC_CHKMENUITEM,"Button",
+ CONTROL "Show entry in the Popups menu",IDC_CHKMENUITEM,"Button",
BS_AUTOCHECKBOX | WS_TABSTOP,10,11,190,10
CONTROL "Temporarily disable Event Popups",IDC_CHKDISABLE,"Button",
BS_AUTOCHECKBOX | WS_TABSTOP,10,21,190,10
diff --git a/plugins/NewXstatusNotify/res/resource.rc b/plugins/NewXstatusNotify/res/resource.rc index 360926e770..5376514e8f 100644 --- a/plugins/NewXstatusNotify/res/resource.rc +++ b/plugins/NewXstatusNotify/res/resource.rc @@ -335,7 +335,7 @@ STYLE DS_SETFONT | DS_SETFOREGROUND | DS_FIXEDSYS | DS_CONTROL | DS_CENTER | WS_ FONT 8, "MS Shell Dlg", 400, 0, 0x1
BEGIN
GROUPBOX "General",IDC_STATIC,7,0,289,39
- CONTROL "Show PopUps when I connect",IDC_ONCONNECT,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,14,11,274,8
+ CONTROL "Show Popups when I connect",IDC_ONCONNECT,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,14,11,274,8
CONTROL "Ignore empty status messages",IDC_PUIGNOREREMOVE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,14,25,274,8
GROUPBOX "Protocols",IDC_STATIC,7,41,289,124
CTEXT "Enable/Disable protocols which you don't wish to be notified for:",IDC_STATIC,14,52,274,10
diff --git a/plugins/PackUpdater/Res/Resource.rc b/plugins/PackUpdater/Res/Resource.rc index 1d1891055b..cefd5c20d0 100644 --- a/plugins/PackUpdater/Res/Resource.rc +++ b/plugins/PackUpdater/Res/Resource.rc @@ -129,7 +129,7 @@ BEGIN CONTROL "",IDC_INFO_MESSAGES_MSG,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,153,45,8,10
CONTROL "",IDC_PROGR_DLG_MSG,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,153,59,8,10
CTEXT "Boxes",IDC_STATIC,146,8,23,8
- CTEXT "PopUps",IDC_STATIC,7,9,79,8
+ CTEXT "Popups",IDC_STATIC,7,9,79,8
END
diff --git a/plugins/Ping/res/ping.rc b/plugins/Ping/res/ping.rc index 581595bd75..a35a795a96 100644 --- a/plugins/Ping/res/ping.rc +++ b/plugins/Ping/res/ping.rc @@ -79,7 +79,7 @@ BEGIN LTEXT "Log Filename:",IDC_STATIC,14,198,56,8
EDITTEXT IDC_ED_FILENAME,74,195,158,14,ES_AUTOHSCROLL
GROUPBOX "Network",IDC_STATIC,4,5,205,72
- GROUPBOX "PopUps",IDC_STATIC,218,5,79,72
+ GROUPBOX "Popups",IDC_STATIC,218,5,79,72
CONTROL "Reply",IDC_CHECKPOPUP2,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,223,36,72,10
CONTROL "Block Repetitions",IDC_CHK_BLOCK,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,223,60,72,10
PUSHBUTTON "View Log",IDC_BTN_VIEWLOG,238,176,54,14
diff --git a/plugins/PluginUpdater/res/Resource.rc b/plugins/PluginUpdater/res/Resource.rc index 705565082e..b4b0271a75 100644 --- a/plugins/PluginUpdater/res/Resource.rc +++ b/plugins/PluginUpdater/res/Resource.rc @@ -122,7 +122,7 @@ BEGIN CONTROL "",IDC_INFO_MESSAGES_MSG,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,153,45,8,10
CONTROL "",IDC_PROGR_DLG_MSG,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,153,59,8,10
CTEXT "Boxes",IDC_STATIC,146,8,23,8
- CTEXT "PopUps",IDC_STATIC,7,9,79,8
+ CTEXT "Popups",IDC_STATIC,7,9,79,8
END
diff --git a/plugins/Quotes/res/Forex.rc b/plugins/Quotes/res/Forex.rc index 0ae1bff055..bbe911f4eb 100644 --- a/plugins/Quotes/res/Forex.rc +++ b/plugins/Quotes/res/Forex.rc @@ -203,7 +203,7 @@ BEGIN LTEXT "Text colour",IDC_STATIC,70,71,66,8
CONTROL "",IDC_TEXTCOLOR,"ColourPicker",WS_TABSTOP,26,67,35,14
GROUPBOX "Delay",IDC_STATIC,162,6,149,82,WS_GROUP
- CONTROL "From PopUp plugin",IDC_DELAYFROMPU,"Button",BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP,174,20,76,10
+ CONTROL "From Popup plugin",IDC_DELAYFROMPU,"Button",BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP,174,20,76,10
CONTROL "Custom",IDC_DELAYCUSTOM,"Button",BS_AUTORADIOBUTTON,174,35,47,10
CONTROL "Permanent",IDC_DELAYPERMANENT,"Button",BS_AUTORADIOBUTTON,174,50,50,10
EDITTEXT IDC_DELAY,252,33,35,14,ES_AUTOHSCROLL | ES_NUMBER | WS_GROUP
diff --git a/plugins/SecureIM/res/resource.rc b/plugins/SecureIM/res/resource.rc index b18e181cd5..fd8239eac8 100644 --- a/plugins/SecureIM/res/resource.rc +++ b/plugins/SecureIM/res/resource.rc @@ -153,15 +153,15 @@ BEGIN CONTROL "",IDC_BACKSR,"ColourPicker",WS_TABSTOP,14,79,28,14
CONTROL "",IDC_TEXTSR,"ColourPicker",WS_TABSTOP,50,79,28,14
LTEXT "Send/Receive encrypted colors",IDC_STATIC,82,84,104,8
- GROUPBOX "SecureIM PopUp Colors",IDC_STATIC,7,7,181,122
+ GROUPBOX "SecureIM Popup Colors",IDC_STATIC,7,7,181,122
PUSHBUTTON "Preview",IDC_PREV,15,107,57,16
GROUPBOX "Events",IDC_STATIC,7,132,248,88
- GROUPBOX "PopUp Timeout",IDC_STATIC,196,7,59,122
+ GROUPBOX "Popup Timeout",IDC_STATIC,196,7,59,122
EDITTEXT IDC_TIMEKEY,210,37,31,14,ES_AUTOHSCROLL
EDITTEXT IDC_TIMESEC,210,59,31,14,ES_AUTOHSCROLL
EDITTEXT IDC_TIMESR,210,81,31,14,ES_AUTOHSCROLL
CTEXT "Time in Seconds",IDC_STATIC,200,23,54,8
- CTEXT "0 = Default PopUp Timeout Value",IDC_STATIC,200,101,49,24
+ CTEXT "0 = Default Popup Timeout Value",IDC_STATIC,200,101,49,24
CONTROL "Show a popup on established connection",IDC_EC,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,12,144,168,10
CONTROL "Show a popup on disabled connection",IDC_DC,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,12,156,168,10
CONTROL "Show a popup on key send",IDC_KS,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,12,168,168,10
diff --git a/plugins/SeenPlugin/res/resource.rc b/plugins/SeenPlugin/res/resource.rc index 87f914463a..52649ca971 100644 --- a/plugins/SeenPlugin/res/resource.rc +++ b/plugins/SeenPlugin/res/resource.rc @@ -86,7 +86,7 @@ BEGIN EDITTEXT IDC_POPUPSTAMP,49,20,224,12,ES_AUTOHSCROLL | WS_GROUP
RTEXT "Text",IDC_LABTTITLE,19,37,25,10
EDITTEXT IDC_POPUPSTAMPTEXT,49,35,224,12,ES_AUTOHSCROLL | WS_GROUP
- GROUPBOX "PopUp Colors",IDC_STATIC,0,70,280,136,WS_GROUP
+ GROUPBOX "Popup Colors",IDC_STATIC,0,70,280,136,WS_GROUP
RTEXT "Online",IDC_STATIC,10,83,60,10
CONTROL "",ID_STATUS_ONLINE,"ColourPicker",WS_TABSTOP,80,80,20,14
CONTROL "",40092,"ColourPicker",WS_TABSTOP,105,80,20,14
diff --git a/plugins/StatusPlugins/resource.rc b/plugins/StatusPlugins/resource.rc index 99bd303790..e6f02e5283 100644 --- a/plugins/StatusPlugins/resource.rc +++ b/plugins/StatusPlugins/resource.rc @@ -212,7 +212,7 @@ BEGIN CONTROL "Show when reconnection has finished",IDC_PURESULT,
"Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,177,226,10
CONTROL "Show other messages",IDC_PUOTHER,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,189,226,10
- CONTROL "From PopUp plugin",IDC_DELAYFROMPU,"Button",BS_AUTORADIOBUTTON | WS_GROUP,143,19,94,10
+ CONTROL "From Popup plugin",IDC_DELAYFROMPU,"Button",BS_AUTORADIOBUTTON | WS_GROUP,143,19,94,10
CONTROL "Custom",IDC_DELAYCUSTOM,"Button",BS_AUTORADIOBUTTON,143,32,47,10
CONTROL "Permanent",IDC_DELAYPERMANENT,"Button",BS_AUTORADIOBUTTON,143,45,50,10
CONTROL "Show additional information in popups",IDC_PUSHOWEXTRA,
diff --git a/plugins/TabSRMM/res/resource.rc b/plugins/TabSRMM/res/resource.rc index 813812271c..4e206d54b0 100644 --- a/plugins/TabSRMM/res/resource.rc +++ b/plugins/TabSRMM/res/resource.rc @@ -438,7 +438,7 @@ STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD EXSTYLE WS_EX_CONTROLPARENT
FONT 8, "MS Shell Dlg", 0, 0, 0x1
BEGIN
- GROUPBOX "PopUps",IDC_STATIC,4,9,307,129
+ GROUPBOX "Popups",IDC_STATIC,4,9,307,129
CONTROL "...is &typing",IDC_START,"Button",BS_AUTOCHECKBOX | BS_NOTIFY | WS_TABSTOP,11,20,80,13
CONTROL "...stopped t&yping",IDC_STOP,"Button",BS_AUTOCHECKBOX | BS_NOTIFY | WS_TABSTOP,11,46,80,13
CTEXT "Back",IDC_STATIC,23,61,31,8
@@ -451,18 +451,18 @@ BEGIN CONTROL "Only &one popup for each contact",IDC_ONEPOPUP,"Button",BS_AUTOCHECKBOX | BS_NOTIFY | WS_TABSTOP,11,109,250,13
CONTROL "Show &entry in the main menu",IDC_SHOWMENU,"Button",BS_AUTOCHECKBOX | BS_NOTIFY | WS_TABSTOP,11,122,247,13
GROUPBOX "...is typing",IDC_STATIC,8,151,148,58,WS_GROUP
- CONTROL "From PopUp plugin",IDC_TIMEOUT_POPUP,"Button",BS_AUTORADIOBUTTON,16,161,130,10
+ CONTROL "From Popup plugin",IDC_TIMEOUT_POPUP,"Button",BS_AUTORADIOBUTTON,16,161,130,10
CONTROL "From protocol",IDC_TIMEOUT_PROTO,"Button",BS_AUTORADIOBUTTON,16,172,130,10
CONTROL "Permanent",IDC_TIMEOUT_PERMANENT,"Button",BS_AUTORADIOBUTTON,16,183,130,10
CONTROL "Custom",IDC_TIMEOUT_CUSTOM,"Button",BS_AUTORADIOBUTTON,16,194,95,10
EDITTEXT IDC_TIMEOUT_VALUE,125,193,25,12,ES_AUTOHSCROLL | ES_NUMBER
GROUPBOX "...stopped typing",IDC_STATIC,158,151,148,58,WS_GROUP
- CONTROL "From PopUp plugin",IDC_TIMEOUT_POPUP2,"Button",BS_AUTORADIOBUTTON,166,161,130,10
+ CONTROL "From Popup plugin",IDC_TIMEOUT_POPUP2,"Button",BS_AUTORADIOBUTTON,166,161,130,10
CONTROL "Permanent",IDC_TIMEOUT_PERMANENT2,"Button",BS_AUTORADIOBUTTON,166,172,130,10
CONTROL "Custom",IDC_TIMEOUT_CUSTOM2,"Button",BS_AUTORADIOBUTTON,166,193,95,10
EDITTEXT IDC_TIMEOUT_VALUE2,275,192,25,12,ES_AUTOHSCROLL | ES_NUMBER
PUSHBUTTON "Preview",IDC_PREVIEW,62,220,194,16
- GROUPBOX "PopUps timeout",IDC_STATIC,3,140,308,75
+ GROUPBOX "Popups timeout",IDC_STATIC,3,140,308,75
CTEXT "Back",IDC_STATIC,22,35,33,8
CONTROL "",IDC_TYPEON_BG,"ColourPicker",WS_TABSTOP,58,33,24,12
CTEXT "Text",IDC_STATIC,89,35,29,8
diff --git a/plugins/TrafficCounter/res/resource.rc b/plugins/TrafficCounter/res/resource.rc index 55fdeb9e68..777f03a756 100644 --- a/plugins/TrafficCounter/res/resource.rc +++ b/plugins/TrafficCounter/res/resource.rc @@ -68,7 +68,7 @@ BEGIN CONTROL "",IDC_COLOR2,"ColourPicker",WS_TABSTOP,242,28,33,12
PUSHBUTTON "Reset to default",IDC_RESETCOLORS,178,44,97,14
GROUPBOX "Popup timeout",IDC_STATIC,10,62,110,41
- CONTROL "From PopUp plugin",IDC_RADIO_FROMPOPUP,"Button",BS_AUTORADIOBUTTON,14,73,101,10
+ CONTROL "From Popup plugin",IDC_RADIO_FROMPOPUP,"Button",BS_AUTORADIOBUTTON,14,73,101,10
CONTROL "Custom",IDC_RADIO_CUSTOM,"Button",BS_AUTORADIOBUTTON,14,88,73,10
EDITTEXT IDC_POPUP_TIMEOUT,90,85,24,14,ES_AUTOHSCROLL | ES_NUMBER
PUSHBUTTON "Test",IDC_TEST,251,93,50,11
diff --git a/plugins/UserInfoEx/res/resource.rc b/plugins/UserInfoEx/res/resource.rc index 6a141f92ad..bd9a8f75ff 100644 --- a/plugins/UserInfoEx/res/resource.rc +++ b/plugins/UserInfoEx/res/resource.rc @@ -224,7 +224,7 @@ BEGIN CONTROL "Use Windows colours",CHECK_OPT_POPUP_WINCLR,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,32,101,114,10
CONTROL "Use default colours",CHECK_OPT_POPUP_DEFCLR,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,32,114,114,10
GROUPBOX "Delay",IDC_STATIC,176,132,108,58,WS_GROUP
- CONTROL "From PopUp plugin",RADIO_OPT_POPUP_DEFAULT,"Button",BS_AUTORADIOBUTTON,182,146,96,10
+ CONTROL "From Popup plugin",RADIO_OPT_POPUP_DEFAULT,"Button",BS_AUTORADIOBUTTON,182,146,96,10
CONTROL "Custom",RADIO_OPT_POPUP_CUSTOM,"Button",BS_AUTORADIOBUTTON,182,160,59,10
CONTROL "Permanent",RADIO_OPT_POPUP_PERMANENT,"Button",BS_AUTORADIOBUTTON,182,175,96,10
EDITTEXT EDIT_DELAY,246,159,33,14,ES_AUTOHSCROLL
diff --git a/plugins/Watrack/popup/pop_dlg.inc b/plugins/Watrack/popup/pop_dlg.inc index 129b538780..865cf94401 100644 --- a/plugins/Watrack/popup/pop_dlg.inc +++ b/plugins/Watrack/popup/pop_dlg.inc @@ -1,10 +1,10 @@ -{PopUp Option Dialog}
+{Popup Option Dialog}
-// PopUp options
+// Popup options
const
DLGPOPUP = 'POPUP';
-function DlgPopUpOpt(Dialog:HWnd;hMessage:Uint;wParam:WPARAM;lParam:LPARAM):LRESULT; stdcall;
+function DlgPopupOpt(Dialog:HWnd;hMessage:Uint;wParam:WPARAM;lParam:LPARAM):LRESULT; stdcall;
const
dlginit:boolean=false;
var
@@ -21,29 +21,29 @@ begin SetDlgItemTextW(Dialog,IDC_POPUP_TITLE,PopTitle);
SetDlgItemTextW(Dialog,IDC_POPUP_TEXT ,PopText);
- CheckDlgButton(Dialog,IDC_SHOWFILE ,PopUpFile);
+ CheckDlgButton(Dialog,IDC_SHOWFILE ,PopupFile);
CheckDlgButton(Dialog,IDC_REQUEST ,PopRequest);
- CheckDlgButton(Dialog,IDC_ACTLEFTCLOSE ,ord(LoByte(PopUpAction)=0));
- CheckDlgButton(Dialog,IDC_ACTLEFTINFO ,ord(LoByte(PopUpAction)=1));
- CheckDlgButton(Dialog,IDC_ACTLEFTPLAYER ,ord(LoByte(PopUpAction)=2));
- CheckDlgButton(Dialog,IDC_ACTLEFTNEXT ,ord(LoByte(PopUpAction)=3));
- CheckDlgButton(Dialog,IDC_ACTRIGHTCLOSE ,ord(HiByte(PopUpAction)=0));
- CheckDlgButton(Dialog,IDC_ACTRIGHTINFO ,ord(HiByte(PopUpAction)=1));
- CheckDlgButton(Dialog,IDC_ACTRIGHTPLAYER,ord(HiByte(PopUpAction)=2));
- CheckDlgButton(Dialog,IDC_ACTRIGHTNEXT ,ord(HiByte(PopUpAction)=3));
+ CheckDlgButton(Dialog,IDC_ACTLEFTCLOSE ,ord(LoByte(PopupAction)=0));
+ CheckDlgButton(Dialog,IDC_ACTLEFTINFO ,ord(LoByte(PopupAction)=1));
+ CheckDlgButton(Dialog,IDC_ACTLEFTPLAYER ,ord(LoByte(PopupAction)=2));
+ CheckDlgButton(Dialog,IDC_ACTLEFTNEXT ,ord(LoByte(PopupAction)=3));
+ CheckDlgButton(Dialog,IDC_ACTRIGHTCLOSE ,ord(HiByte(PopupAction)=0));
+ CheckDlgButton(Dialog,IDC_ACTRIGHTINFO ,ord(HiByte(PopupAction)=1));
+ CheckDlgButton(Dialog,IDC_ACTRIGHTPLAYER,ord(HiByte(PopupAction)=2));
+ CheckDlgButton(Dialog,IDC_ACTRIGHTNEXT ,ord(HiByte(PopupAction)=3));
- CheckDlgButton(Dialog,IDC_USEBUTTONS,PopUpButtons);
+ CheckDlgButton(Dialog,IDC_USEBUTTONS,PopupButtons);
- SetDlgItemInt (Dialog,IDC_DELAY,PopUpPause,false);
+ SetDlgItemInt (Dialog,IDC_DELAY,PopupPause,false);
- if PopUpDelay<0 then
+ if PopupDelay<0 then
CheckDlgButton(Dialog,IDC_DELAYPERM,BST_CHECKED)
- else if PopUpDelay=0 then
+ else if PopupDelay=0 then
CheckDlgButton(Dialog,IDC_DELAYDEF,BST_CHECKED)
else
CheckDlgButton(Dialog,IDC_DELAYCUST,BST_CHECKED);
- if PopUpDelay<=0 then
+ if PopupDelay<=0 then
EnableWindow(GetDlgItem(Dialog,IDC_DELAY),false);
SendDlgItemMessage(Dialog,IDC_MACRO_HELP,BM_SETIMAGE,IMAGE_ICON,
@@ -51,18 +51,18 @@ begin fore:=GetDlgItem(Dialog,IDC_FORE);
back:=GetDlgItem(Dialog,IDC_BACK);
- SendMessage(fore,CPM_SETCOLOUR,0,PopUpFore);
+ SendMessage(fore,CPM_SETCOLOUR,0,PopupFore);
SendMessage(fore,CPM_SETDEFAULTCOLOUR,0,GetSysColor(COLOR_BTNTEXT));
- SendMessage(back,CPM_SETCOLOUR,0,PopUpBack);
+ SendMessage(back,CPM_SETCOLOUR,0,PopupBack);
SendMessage(back,CPM_SETDEFAULTCOLOUR,0,GetSysColor(COLOR_BTNFACE));
- SetDlgItemInt(Dialog,IDC_FORE,PopUpFore,false);
- SetDlgItemInt(Dialog,IDC_BACK,PopUpBack,false);
- if PopUpColor<2 then
+ SetDlgItemInt(Dialog,IDC_FORE,PopupFore,false);
+ SetDlgItemInt(Dialog,IDC_BACK,PopupBack,false);
+ if PopupColor<2 then
begin
EnableWindow(fore,false);
EnableWindow(back,false);
end;
- case PopUpColor of
+ case PopupColor of
0: CheckDlgButton(Dialog,IDC_COLORDEF ,BST_CHECKED);
1: CheckDlgButton(Dialog,IDC_COLORWIN ,BST_CHECKED);
2: CheckDlgButton(Dialog,IDC_COLORCUST,BST_CHECKED);
@@ -130,46 +130,46 @@ begin PopTitle:=GetDlgText(Dialog,IDC_POPUP_TITLE);
PopText :=GetDlgText(Dialog,IDC_POPUP_TEXT);
- PopUpButtons:=IsDlgButtonChecked(Dialog,IDC_USEBUTTONS);
+ PopupButtons:=IsDlgButtonChecked(Dialog,IDC_USEBUTTONS);
- PopUpFile :=IsDlgButtonChecked(Dialog,IDC_SHOWFILE);
+ PopupFile :=IsDlgButtonChecked(Dialog,IDC_SHOWFILE);
PopRequest:=IsDlgButtonChecked(Dialog,IDC_REQUEST);
//color
if IsDlgButtonChecked(Dialog,IDC_COLORDEF)=BST_CHECKED then
- PopUpColor:=0
+ PopupColor:=0
else if IsDlgButtonChecked(Dialog,IDC_COLORWIN)=BST_CHECKED then
- PopUpColor:=1
+ PopupColor:=1
else
begin
- PopUpColor:=2;
- PopUpFore:=SendDlgItemMessage(Dialog,IDC_FORE,CPM_GETCOLOUR,0,0);
- PopUpBack:=SendDlgItemMessage(Dialog,IDC_BACK,CPM_GETCOLOUR,0,0);
+ PopupColor:=2;
+ PopupFore:=SendDlgItemMessage(Dialog,IDC_FORE,CPM_GETCOLOUR,0,0);
+ PopupBack:=SendDlgItemMessage(Dialog,IDC_BACK,CPM_GETCOLOUR,0,0);
end;
//pause
if IsDlgButtonChecked(Dialog,IDC_DELAYDEF)=BST_CHECKED then
- PopUpDelay:=0
+ PopupDelay:=0
else if IsDlgButtonChecked(Dialog,IDC_DELAYPERM)=BST_CHECKED then
- PopUpDelay:=-1
+ PopupDelay:=-1
else
begin
- PopUpDelay:=1;
- PopUpPause:=GetDlgItemInt(Dialog,IDC_DELAY,tmp,false);
+ PopupDelay:=1;
+ PopupPause:=GetDlgItemInt(Dialog,IDC_DELAY,tmp,false);
end;
//action
if IsDlgButtonChecked(Dialog,IDC_ACTLEFTINFO)=BST_CHECKED then
- PopUpAction:=1
+ PopupAction:=1
else if IsDlgButtonChecked(Dialog,IDC_ACTLEFTPLAYER)=BST_CHECKED then
- PopUpAction:=2
+ PopupAction:=2
else if IsDlgButtonChecked(Dialog,IDC_ACTLEFTNEXT)=BST_CHECKED then
- PopUpAction:=3
+ PopupAction:=3
else
- PopUpAction:=0;
+ PopupAction:=0;
if IsDlgButtonChecked(Dialog,IDC_ACTRIGHTINFO)=BST_CHECKED then
- inc(PopUpAction,$100)
+ inc(PopupAction,$100)
else if IsDlgButtonChecked(Dialog,IDC_ACTRIGHTPLAYER)=BST_CHECKED then
- inc(PopUpAction,$200)
+ inc(PopupAction,$200)
else if IsDlgButtonChecked(Dialog,IDC_ACTRIGHTNEXT)=BST_CHECKED then
- inc(PopUpAction,$300);
+ inc(PopupAction,$300);
savepopup;
end;
diff --git a/plugins/Watrack/popup/pop_opt.inc b/plugins/Watrack/popup/pop_opt.inc index 591063923e..0c01d097eb 100644 --- a/plugins/Watrack/popup/pop_opt.inc +++ b/plugins/Watrack/popup/pop_opt.inc @@ -8,17 +8,17 @@ const const
opt_ModStatus :PAnsiChar = 'module/popups';
- opt_PopUpFile :PAnsiChar = 'popup/file';
- opt_PopUpAction :PAnsiChar = 'popup/action';
- opt_PopUpFore :PAnsiChar = 'popup/fore';
- opt_PopUpBack :PAnsiChar = 'popup/back';
- opt_PopUpPause :PAnsiChar = 'popup/time';
- opt_PopUpDelay :PAnsiChar = 'popup/delay';
- opt_PopUpColor :PAnsiChar = 'popup/color';
+ opt_PopupFile :PAnsiChar = 'popup/file';
+ opt_PopupAction :PAnsiChar = 'popup/action';
+ opt_PopupFore :PAnsiChar = 'popup/fore';
+ opt_PopupBack :PAnsiChar = 'popup/back';
+ opt_PopupPause :PAnsiChar = 'popup/time';
+ opt_PopupDelay :PAnsiChar = 'popup/delay';
+ opt_PopupColor :PAnsiChar = 'popup/color';
opt_ByRequest :PAnsiChar = 'popup/byrequest';
opt_PopTitle :PAnsiChar = 'popup/poptitle';
opt_PopText :PAnsiChar = 'popup/poptext';
- opt_PopUpButtons:PAnsiChar = 'popup/usebuttons';
+ opt_PopupButtons:PAnsiChar = 'popup/usebuttons';
spref = 'strings/';
@@ -36,14 +36,14 @@ procedure loadpopup; var
def1,def2:pWideChar;
begin
- PopUpButtons:=DBReadByte (0,PluginShort,opt_PopUpButtons,BST_CHECKED);
- PopUpFile :=DBReadByte (0,PluginShort,opt_PopUpFile ,BST_CHECKED);
- PopUpPause :=DBReadByte (0,PluginShort,opt_PopUpPause ,0);
- PopUpDelay :=DBReadByte (0,PluginShort,opt_PopUpDelay ,0);
- PopUpAction :=DBReadWord (0,PluginShort,opt_PopUpAction ,0);
- PopUpColor :=DBReadByte (0,PluginShort,opt_PopUpColor ,0);
- PopUpFore :=DBReadDWord(0,PluginShort,opt_PopUpFore ,GetSysColor(COLOR_BTNTEXT));
- PopUpBack :=DBReadDWord(0,PluginShort,opt_PopUpBack ,GetSysColor(COLOR_BTNFACE));
+ PopupButtons:=DBReadByte (0,PluginShort,opt_PopupButtons,BST_CHECKED);
+ PopupFile :=DBReadByte (0,PluginShort,opt_PopupFile ,BST_CHECKED);
+ PopupPause :=DBReadByte (0,PluginShort,opt_PopupPause ,0);
+ PopupDelay :=DBReadByte (0,PluginShort,opt_PopupDelay ,0);
+ PopupAction :=DBReadWord (0,PluginShort,opt_PopupAction ,0);
+ PopupColor :=DBReadByte (0,PluginShort,opt_PopupColor ,0);
+ PopupFore :=DBReadDWord(0,PluginShort,opt_PopupFore ,GetSysColor(COLOR_BTNTEXT));
+ PopupBack :=DBReadDWord(0,PluginShort,opt_PopupBack ,GetSysColor(COLOR_BTNFACE));
PopRequest :=DBReadByte (0,PluginShort,opt_ByRequest ,BST_UNCHECKED);
if isVarsInstalled then
begin
@@ -61,14 +61,14 @@ end; procedure savepopup;
begin
- DBWriteByte (0,PluginShort,opt_PopUpButtons,PopUpButtons);
- DBWriteByte (0,PluginShort,opt_PopUpFile ,PopUpFile);
- DBWriteByte (0,PluginShort,opt_PopUpPause ,PopUpPause);
- DBWriteByte (0,PluginShort,opt_PopUpDelay ,PopUpDelay);
- DBWriteWord (0,PluginShort,opt_PopUpAction ,PopUpAction);
- DBWriteByte (0,PluginShort,opt_PopUpColor ,PopUpColor);
- DBWriteDWord (0,PluginShort,opt_PopUpFore ,PopUpFore);
- DBWriteDWord (0,PluginShort,opt_PopUpBack ,PopUpBack);
+ DBWriteByte (0,PluginShort,opt_PopupButtons,PopupButtons);
+ DBWriteByte (0,PluginShort,opt_PopupFile ,PopupFile);
+ DBWriteByte (0,PluginShort,opt_PopupPause ,PopupPause);
+ DBWriteByte (0,PluginShort,opt_PopupDelay ,PopupDelay);
+ DBWriteWord (0,PluginShort,opt_PopupAction ,PopupAction);
+ DBWriteByte (0,PluginShort,opt_PopupColor ,PopupColor);
+ DBWriteDWord (0,PluginShort,opt_PopupFore ,PopupFore);
+ DBWriteDWord (0,PluginShort,opt_PopupBack ,PopupBack);
DBWriteByte (0,PluginShort,opt_ByRequest ,PopRequest);
DBWriteUnicode(0,PluginShort,opt_PopTitle,PopTitle);
DBWriteUnicode(0,PluginShort,opt_PopText ,PopText);
diff --git a/plugins/Watrack/popup/pop_vars.inc b/plugins/Watrack/popup/pop_vars.inc index 0be12fd5e8..63048e7555 100644 --- a/plugins/Watrack/popup/pop_vars.inc +++ b/plugins/Watrack/popup/pop_vars.inc @@ -5,14 +5,14 @@ var PopTitle,
PopText:pWideChar;
PopRequest,
- PopUpFile:dword;
- PopUpColor:dword;
- PopUpFore,
- PopUpBack:cardinal;
- PopUpPause:cardinal;
- PopUpDelay:integer;
- PopUpAction:cardinal;
- PopUpButtons:cardinal;
+ PopupFile:dword;
+ PopupColor:dword;
+ PopupFore,
+ PopupBack:cardinal;
+ PopupPause:cardinal;
+ PopupDelay:integer;
+ PopupAction:cardinal;
+ PopupButtons:cardinal;
DisablePlugin:integer;
IsPopup2Present:boolean;
diff --git a/plugins/Watrack/popup/popups.pas b/plugins/Watrack/popup/popups.pas index 2d4ba8d08c..0fe52a5301 100644 --- a/plugins/Watrack/popup/popups.pas +++ b/plugins/Watrack/popup/popups.pas @@ -1,4 +1,4 @@ -{PopUp support}
+{Popup support}
unit Popups;
{$include compilers.inc}
interface
@@ -59,7 +59,7 @@ begin lvars[13]:=uint_ptr(txtver);
end;
StrCopyW(Tmpl,TranslateW(MainTmpl));
- if PopUpFile=BST_CHECKED then
+ if PopupFile=BST_CHECKED then
begin
lvars[14]:=uint_ptr(si^.mfile);
lvars[15]:=si^.fsize;
@@ -79,9 +79,9 @@ begin case msg of
WM_COMMAND,WM_CONTEXTMENU: begin
if msg=WM_CONTEXTMENU then
- wParam:=HiByte(PopUpAction)
+ wParam:=HiByte(PopupAction)
else
- wParam:=LoByte(PopUpAction);
+ wParam:=LoByte(PopupAction);
si:=pointer(CallService(MS_WAT_RETURNGLOBAL,0,0));
case wParam of
1: ShowMusicInfo(si);
@@ -124,7 +124,7 @@ type var
actions:^anacts;
begin
- if PopUpButtons<>BST_UNCHECKED then
+ if PopupButtons<>BST_UNCHECKED then
begin
mGetMem(actions,SizeOf(anacts));
result:=PPOPUPACTION(actions);
@@ -167,13 +167,13 @@ begin Icon:=si^.icon
else
Icon:=LoadSkinnedIcon(SKINICON_OTHER_MIRANDA);
- if PopUpDelay<0 then
+ if PopupDelay<0 then
sec:=-1
- else if PopUpDelay>0 then
- sec:=PopUpPause
+ else if PopupDelay>0 then
+ sec:=PopupPause
else
sec:=0;
- case PopUpColor of
+ case PopupColor of
0: begin
cb:=0;
ct:=0;
@@ -183,8 +183,8 @@ begin ct:=GetSysColor(COLOR_BTNTEXT);
end;
2: begin
- cb:=PopUpBack;
- ct:=PopUpFore;
+ cb:=PopupBack;
+ ct:=PopupFore;
end;
else
cb:=0;
@@ -287,14 +287,14 @@ begin end;
end;
-procedure ShowPopUp(si:pSongInfo);
+procedure ShowPopup(si:pSongInfo);
begin
mir_forkthread(@ThShowPopup,si);
end;
// --------------- Services and Hooks ----------------
-function OpenPopUp(wParam:WPARAM;lParam:LPARAM):int;cdecl;
+function OpenPopup(wParam:WPARAM;lParam:LPARAM):int;cdecl;
var
si:pSongInfo;
begin
@@ -304,7 +304,7 @@ begin if CallService(MS_WAT_GETMUSICINFO,0,tlparam(@si))=WAT_PLS_NORMAL then
begin
if PopupPresent then
- ShowPopUp(si)
+ ShowPopup(si)
else
ShowMusicInfo(si);
end;
@@ -340,7 +340,7 @@ begin case wParam of
WAT_EVENT_NEWTRACK: begin
if PopupPresent and (PopRequest=BST_UNCHECKED) then
- ShowPopUp(pSongInfo(lParam));
+ ShowPopup(pSongInfo(lParam));
end;
WAT_EVENT_PLUGINSTATUS: begin
DisablePlugin:=lParam;
@@ -391,9 +391,9 @@ begin odp.hInstance :=hInstance;
odp.szTitle.a :=PluginName;
- odp.szGroup.a :='PopUps';
+ odp.szGroup.a :='Popups';
odp.pszTemplate:=DLGPOPUP;
- odp.pfnDlgProc :=@DlgPopUpOpt;
+ odp.pfnDlgProc :=@DlgPopupOpt;
CallService(MS_OPT_ADDPAGE,wParam,tlparam(@odp));
result:=0;
end;
@@ -433,7 +433,7 @@ begin SetModStatus(1);
result:=1;
- CreateServiceFunction(MS_WAT_SHOWMUSICINFO,@OpenPopUp);
+ CreateServiceFunction(MS_WAT_SHOWMUSICINFO,@OpenPopup);
FillChar(sid,SizeOf(TSKINICONDESC),0);
sid.cbSize:=SizeOf(TSKINICONDESC);
@@ -515,7 +515,7 @@ begin Popup.Init :=@InitProc;
Popup.DeInit :=@DeInitProc;
Popup.AddOption :=nil;
- Popup.ModuleName:='PopUps';
+ Popup.ModuleName:='Popups';
ModuleLink :=@Popup;
end;
diff --git a/plugins/Weather/res/resource.rc b/plugins/Weather/res/resource.rc index 34690d8d71..29140efb2d 100644 --- a/plugins/Weather/res/resource.rc +++ b/plugins/Weather/res/resource.rc @@ -123,7 +123,7 @@ BEGIN CONTROL "Set as default station",IDC_DEFA,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,12,168,218,8
CONTROL "Disable automatic update for this station",IDC_DAutoUpdate,
"Button",BS_AUTOCHECKBOX | WS_TABSTOP,12,179,218,8
- CONTROL "Disable PopUp for this station",IDC_DPop,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,12,190,218,8
+ CONTROL "Disable Popup for this station",IDC_DPop,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,12,190,218,8
PUSHBUTTON "Change",IDC_CHANGE,57,207,46,14
DEFPUSHBUTTON "Cancel",IDCANCEL,136,207,46,14
CONTROL "",IDC_SVCINFO,"MButtonClass",WS_TABSTOP,217,35,13,12,WS_EX_NOACTIVATE | 0x10000000L
@@ -135,7 +135,7 @@ STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_CHILD EXSTYLE WS_EX_CONTROLPARENT
FONT 8, "MS Shell Dlg", 0, 0, 0x1
BEGIN
- GROUPBOX "PopUp Options",IDC_STATIC,4,5,158,54
+ GROUPBOX "Popup Options",IDC_STATIC,4,5,158,54
CONTROL "Enable popups",IDC_E,"Button",BS_AUTOCHECKBOX | BS_NOTIFY | WS_TABSTOP,15,15,143,9
CONTROL "Popup only when condition changes",IDC_CH,"Button",BS_AUTOCHECKBOX | BS_NOTIFY | WS_TABSTOP,15,44,140,10
GROUPBOX "Colours",IDC_STATIC,168,5,139,54
@@ -153,7 +153,7 @@ BEGIN CONTROL "Delay",IDC_PD3,"Button",BS_AUTORADIOBUTTON,177,74,53,8
EDITTEXT IDC_DELAY,233,73,36,12,ES_RIGHT | ES_AUTOHSCROLL | ES_NUMBER | NOT WS_BORDER,WS_EX_STATICEDGE
LTEXT "seconds",IDC_STATIC,272,73,34,10
- CONTROL "From PopUp plugin",IDC_PD1,"Button",BS_AUTORADIOBUTTON,177,85,110,8
+ CONTROL "From Popup plugin",IDC_PD1,"Button",BS_AUTORADIOBUTTON,177,85,110,8
CONTROL "Permanent",IDC_PD2,"Button",BS_AUTORADIOBUTTON,177,96,110,8
GROUPBOX "Popup Text",IDC_STATIC,3,112,305,121
LTEXT "Popup Title",IDC_STATIC,15,124,56,9
@@ -336,7 +336,7 @@ IDR_PMENU MENU BEGIN
POPUP "Menu"
BEGIN
- MENUITEM "Dismiss PopUp", IDM_M1
+ MENUITEM "Dismiss Popup", IDM_M1
MENUITEM "Open brief information", IDM_M2
MENUITEM "Open complete forecast", IDM_M3
MENUITEM "Open weather map", IDM_M4
diff --git a/plugins/WhoUsesMyFiles/res/resource.rc b/plugins/WhoUsesMyFiles/res/resource.rc index c244c87231..fe24192ffe 100644 --- a/plugins/WhoUsesMyFiles/res/resource.rc +++ b/plugins/WhoUsesMyFiles/res/resource.rc @@ -46,7 +46,7 @@ FONT 8, "MS Shell Dlg", 0, 0, 0x1 BEGIN
GROUPBOX "Popup delay settings",IDC_STATIC,9,9,153,93,WS_GROUP
EDITTEXT IDC_DELAY_SEC,17,23,20,12,ES_AUTOHSCROLL | ES_NUMBER
- LTEXT "PopUp Delay (seconds)",IDC_TX_DELAY_SEC,39,25,94,8
+ LTEXT "Popup Delay (seconds)",IDC_TX_DELAY_SEC,39,25,94,8
CONTROL "",IDC_COLOR_BACK,"ColourPicker",WS_TABSTOP,187,24,39,12
LTEXT "Background color",IDC_STATIC,231,26,76,8,SS_CENTERIMAGE |
NOT WS_GROUP
@@ -56,20 +56,20 @@ BEGIN PUSHBUTTON "Previe&w",IDC_PREVIEW,270,231,50,15
CONTROL "Show infinitely",IDC_DELAY_INF,"Button",
BS_AUTORADIOBUTTON | BS_NOTIFY | WS_TABSTOP,17,50,61,10
- CONTROL "Default PopUp delay",IDC_DELAY_DEF,"Button",
+ CONTROL "Default Popup delay",IDC_DELAY_DEF,"Button",
BS_AUTORADIOBUTTON | BS_NOTIFY | WS_TABSTOP,17,61,81,10
CONTROL "Choose delay time",IDC_DELAY_SET,"Button",
BS_AUTORADIOBUTTON | BS_NOTIFY | WS_TABSTOP,17,39,73,10
GROUPBOX "Popup color settings",IDC_STATIC,167,9,153,93,WS_GROUP
CONTROL "Use windows colors",IDC_COLOR_WIN,"Button",
BS_AUTORADIOBUTTON | BS_NOTIFY | WS_TABSTOP,187,63,79,10
- CONTROL "Use default PopUp colors",IDC_COLOR_DEF,"Button",
+ CONTROL "Use default Popup colors",IDC_COLOR_DEF,"Button",
BS_AUTORADIOBUTTON | BS_NOTIFY | WS_TABSTOP,187,74,97,10
CONTROL "Choose colors",IDC_COLOR_SET,"Button",
BS_AUTORADIOBUTTON | BS_NOTIFY | WS_TABSTOP,187,52,61,10
GROUPBOX "File access filter && logging settings",IDC_STATIC,9,
106,311,101
- CTEXT "Please note that this settings has effect only with PopUps Interoperability plugin version 1.0.1.9 or higher",
+ CTEXT "Please note that this settings has effect only with Popups Interoperability plugin version 1.0.1.9 or higher",
IDC_DELAY_NOTE,14,73,143,26,SS_SUNKEN | WS_DISABLED |
NOT WS_GROUP
EDITTEXT IDC_FILE,83,123,210,12,ES_AUTOHSCROLL,WS_EX_ACCEPTFILES
|