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

4 files changed, 92 insertions, 92 deletions

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;