fix for another Watrack option pages

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

23 files changed, 70 insertions, 40 deletions

diff --git a/plugins/Watrack/kolframe/frm.rc b/plugins/Watrack/kolframe/frm.rc
index 50180b4b53..7989823829 100644
--- a/plugins/Watrack/kolframe/frm.rc
+++ b/plugins/Watrack/kolframe/frm.rc
@@ -1,9 +1,10 @@
 #include "frm_rc.inc"

+#include "resource.inc"

 

 LANGUAGE 0,0

 

-FRAME DIALOGEX 0, 0, 304, 226, 0

-STYLE DS_SETFONT | WS_CHILD | WS_VISIBLE

+IDD_OPT_FRAME DIALOGEX 0, 0, 304, 226, 0

+STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD

 EXSTYLE WS_EX_CONTROLPARENT

 FONT 8, "MS Shell Dlg", 0, 0

 {

@@ -53,8 +54,8 @@ FONT 8, "MS Shell Dlg", 0, 0
  AUTOCHECKBOX "Use cover instead of picture", IDC_USECOVER, 155, 196, 142, 16, BS_VCENTER | BS_MULTILINE | BS_NOTIFY

 }

 

-FRAME2 DIALOGEX 0, 0, 304, 226, 0

-STYLE DS_SETFONT | WS_CHILD | WS_VISIBLE

+IDD_OPT_FRAME2 DIALOGEX 0, 0, 304, 226, 0

+STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD

 EXSTYLE WS_EX_CONTROLPARENT

 FONT 8, "MS Shell Dlg", 0, 0

 {

diff --git a/plugins/Watrack/kolframe/frm.res b/plugins/Watrack/kolframe/frm.res
index b978cdb07e..fee3a6aad6 100644
--- a/plugins/Watrack/kolframe/frm.res
+++ b/plugins/Watrack/kolframe/frm.res
diff --git a/plugins/Watrack/kolframe/kolframe.pas b/plugins/Watrack/kolframe/kolframe.pas
index 49a541a206..20acfa9ffb 100644
--- a/plugins/Watrack/kolframe/kolframe.pas
+++ b/plugins/Watrack/kolframe/kolframe.pas
@@ -9,6 +9,8 @@ uses windows,kol,commdlg,messages,common,commctrl, KOLCCtrls,
      wat_api,wrapper,global,m_api,dbsettings,waticons,mirutils,

      icobuttons,textblock,kolsizer;

 

+{$include resource.inc}

+

 {$R frm.res}

 

 {$include frm_data.inc}

@@ -298,13 +300,13 @@ begin
     count:=2;

   if count=2 then

   begin

-    tmpl:='FRAME';

+    tmpl:=PAnsiChar(IDD_OPTION_FRAME);

     proc:=@FrameViewDlg;

     name:='Frame (main)';

   end

   else

   begin

-    tmpl:='FRAME2';

+    tmpl:=PAnsiChar(IDD_OPTION_FRAME2);

     proc:=@FrameTextDlg;

     name:='Frame (text)';

   end;

diff --git a/plugins/Watrack/lastfm/lastfm.pas b/plugins/Watrack/lastfm/lastfm.pas
index 0d47afebb4..c5ccd796cc 100644
--- a/plugins/Watrack/lastfm/lastfm.pas
+++ b/plugins/Watrack/lastfm/lastfm.pas
@@ -9,6 +9,8 @@ uses windows, messages, commctrl,
   m_api,dbsettings,wrapper,mirutils, datetime,

   wat_api,global;

 

+{$include resource.inc}

+

 const

   opt_ModStatus:PAnsiChar = 'module/lastfm';

 const

@@ -217,7 +219,7 @@ end;
 

 function AddOptionsPage(var tmpl:pAnsiChar;var proc:pointer;var name:PAnsiChar):integer;

 begin

-  tmpl:='LASTFM';

+  tmpl:=PAnsiChar(IDD_OPT_LASTFM);

   proc:=@DlgProcOptions;

   name:='LastFM';

   result:=0;

diff --git a/plugins/Watrack/lastfm/lastfm.rc b/plugins/Watrack/lastfm/lastfm.rc
index 320eebe8cc..0b92e214b2 100644
--- a/plugins/Watrack/lastfm/lastfm.rc
+++ b/plugins/Watrack/lastfm/lastfm.rc
@@ -1,9 +1,10 @@
 #include "i_const.inc"

+#include "resource.inc"

 

 LANGUAGE 0,0

 

-LASTFM DIALOGEX 0, 0, 304, 226, 0

-STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_VISIBLE

+IDD_OPT_LASTFM DIALOGEX 0, 0, 304, 226, 0

+STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD

 EXSTYLE WS_EX_CONTROLPARENT

 FONT 8, "MS Shell Dlg", 0, 0

 {

diff --git a/plugins/Watrack/lastfm/lastfm.res b/plugins/Watrack/lastfm/lastfm.res
index 376d6b6088..14d7fc9763 100644
--- a/plugins/Watrack/lastfm/lastfm.res
+++ b/plugins/Watrack/lastfm/lastfm.res
diff --git a/plugins/Watrack/make.bat b/plugins/Watrack/make.bat
index 504991c712..4314ed0ac4 100644
--- a/plugins/Watrack/make.bat
+++ b/plugins/Watrack/make.bat
@@ -15,16 +15,16 @@ set PROJECT=Watrack
 if not exist %OUTDIR% mkdir %OUTDIR%

 md tmp

 

-rem brcc32.exe res\watrack.rc         -fores\watrack.res

-rem brcc32.exe lastfm\lastfm.rc       -folastfm\lastfm.res

-rem brcc32.exe myshows\myshows.rc     -fomyshows\myshows.res

-rem brcc32.exe players\mradio.rc      -foplayers\mradio.res

-rem brcc32.exe kolframe\frm.rc        -fokolframe\frm.res

-rem brcc32.exe popup\popup.rc         -fopopup\popup.res

-rem brcc32.exe proto\proto.rc         -foproto\proto.res

-rem brcc32.exe stat\stat.rc           -fostat\stat.res

-rem brcc32.exe status\status.rc       -fostatus\status.res

-rem brcc32.exe templates\templates.rc -fotemplates\templates.res

+brcc32.exe res\watrack.rc         -fores\watrack.res

+brcc32.exe lastfm\lastfm.rc       -folastfm\lastfm.res

+brcc32.exe myshows\myshows.rc     -fomyshows\myshows.res

+brcc32.exe players\mradio.rc      -foplayers\mradio.res

+brcc32.exe kolframe\frm.rc        -fokolframe\frm.res

+brcc32.exe popup\popup.rc         -fopopup\popup.res

+brcc32.exe proto\proto.rc         -foproto\proto.res

+brcc32.exe stat\stat.rc           -fostat\stat.res

+brcc32.exe status\status.rc       -fostatus\status.res

+brcc32.exe templates\templates.rc -fotemplates\templates.res

 

 %FPCBIN% @..\Utils.pas\fpc.cfg %PROJECT%.dpr %3 %4 %5 %6 %7 %8 %9

 if errorlevel 1 exit /b 1

diff --git a/plugins/Watrack/myshows/myshows.pas b/plugins/Watrack/myshows/myshows.pas
index 09263726bb..f4fce5bc5a 100644
--- a/plugins/Watrack/myshows/myshows.pas
+++ b/plugins/Watrack/myshows/myshows.pas
@@ -9,6 +9,8 @@ uses windows, messages, commctrl,
   m_api,dbsettings,wrapper, mirutils,

   wat_api,global;

 

+{$include resource.inc}

+

 const

   DefTimerValue = 10*60*1000; // 10 minutes

 const

@@ -250,7 +252,7 @@ end;
 

 function AddOptionsPage(var tmpl:pAnsiChar;var proc:pointer;var name:PAnsiChar):integer;

 begin

-  tmpl:='MYSHOWS';

+  tmpl:=PAnsiChar(IDD_OPT_MYSHOWS);

   proc:=@DlgProcOptions;

   name:='MyShows';

   result:=0;

diff --git a/plugins/Watrack/myshows/myshows.rc b/plugins/Watrack/myshows/myshows.rc
index adc05a23b7..4b2b1a5cca 100644
--- a/plugins/Watrack/myshows/myshows.rc
+++ b/plugins/Watrack/myshows/myshows.rc
@@ -1,9 +1,10 @@
 #include "i_const.inc"

+#include "resource.inc"

 

 LANGUAGE 0,0

 

-MYSHOWS DIALOGEX 0, 0, 304, 226, 0

-STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_VISIBLE

+IDD_OPT_MYSHOWS DIALOGEX 0, 0, 304, 226, 0

+STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD

 EXSTYLE WS_EX_CONTROLPARENT

 FONT 8, "MS Shell Dlg", 0, 0

 {

diff --git a/plugins/Watrack/myshows/myshows.res b/plugins/Watrack/myshows/myshows.res
index 1b888d6762..0f137a8dd4 100644
--- a/plugins/Watrack/myshows/myshows.res
+++ b/plugins/Watrack/myshows/myshows.res
diff --git a/plugins/Watrack/proto/proto.pas b/plugins/Watrack/proto/proto.pas
index 60ea40031c..7dcc2e68d8 100644
--- a/plugins/Watrack/proto/proto.pas
+++ b/plugins/Watrack/proto/proto.pas
@@ -10,6 +10,7 @@ uses
   common,m_api,mirutils,mircontacts,dbsettings,wrapper,

   global,wat_api;

 

+{$include resource.inc}

 {$include i_proto_rc.inc}

 

 const

@@ -537,7 +538,7 @@ end;
 

 function AddOptionsPage(var tmpl:pAnsiChar;var proc:pointer;var name:PAnsiChar):integer;

 begin

-  tmpl:='MISC';

+  tmpl:=PAnsiChar(IDD_OPT_MISC);

   proc:=@DlgProcOptions;

   name:='Misc';

   result:=0;

diff --git a/plugins/Watrack/proto/proto.rc b/plugins/Watrack/proto/proto.rc
index dcf5be2faa..90f758b986 100644
--- a/plugins/Watrack/proto/proto.rc
+++ b/plugins/Watrack/proto/proto.rc
@@ -1,9 +1,10 @@
 #include "i_proto_rc.inc"

+#include "resource.inc"

 

 LANGUAGE 0,0

 

-MISC DIALOGEX 0, 0, 304, 226, 0

-STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_VISIBLE

+IDD_OPT_MISC DIALOGEX 0, 0, 304, 226, 0

+STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD

 EXSTYLE WS_EX_CONTROLPARENT

 FONT 8, "MS Shell Dlg", 0, 0

 {

diff --git a/plugins/Watrack/proto/proto.res b/plugins/Watrack/proto/proto.res
index 7560c9412f..8ce47812a8 100644
--- a/plugins/Watrack/proto/proto.res
+++ b/plugins/Watrack/proto/proto.res
diff --git a/plugins/Watrack/resource.inc b/plugins/Watrack/resource.inc
index 19fd5492c2..3c17a6ceed 100644
--- a/plugins/Watrack/resource.inc
+++ b/plugins/Watrack/resource.inc
@@ -2,3 +2,14 @@ const
   IDD_OPT_BASIC = 201;

   IDD_OPT_PARTS = 202;

   IDD_OPT_POPUP = 203;

+  IDD_OPT_FRAME = 204;

+  IDD_OPT_FRAME2 = 205;

+  IDD_OPT_LASTFM = 206;

+  IDD_OPT_MYSHOWS = 207;

+  IDD_OPT_MISC = 208;

+  IDD_OPT_STATS = 209;

+  IDD_OPT_COMMON = 210;

+  IDD_OPT_TEMPLATE11 = 211;

+  IDD_OPT_TEMPLATE12 = 212;

+  IDD_OPT_FORMAT = 213;

+

diff --git a/plugins/Watrack/stat/stat.rc b/plugins/Watrack/stat/stat.rc
index 9bedcabf3d..a4ae3229a3 100644
--- a/plugins/Watrack/stat/stat.rc
+++ b/plugins/Watrack/stat/stat.rc
@@ -1,9 +1,10 @@
 #include "stat_rc.inc"

+#include "resource.inc"

 

 LANGUAGE 0,0

 

-STATS DIALOGEX 0, 0, 304, 226, 0

-STYLE DS_SETFONT | WS_CHILD | WS_VISIBLE

+IDD_OPT_STATS DIALOGEX 0, 0, 304, 226, 0

+STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD

 EXSTYLE WS_EX_CONTROLPARENT

 FONT 8, "MS Shell Dlg", 0, 0

 {

diff --git a/plugins/Watrack/stat/stat.res b/plugins/Watrack/stat/stat.res
index ca13e174b9..bf909f862b 100644
--- a/plugins/Watrack/stat/stat.res
+++ b/plugins/Watrack/stat/stat.res
diff --git a/plugins/Watrack/stat/statlog.pas b/plugins/Watrack/stat/statlog.pas
index f2064f42c2..50da1cc2ff 100644
--- a/plugins/Watrack/stat/statlog.pas
+++ b/plugins/Watrack/stat/statlog.pas
@@ -8,6 +8,7 @@ implementation
 uses windows,messages,shellapi,commctrl

      ,wrapper,io,wat_api,common,global,m_api,dbsettings,mirutils;

 

+{$include resource.inc}

 {$include stat_data.inc}

 {$include stat_vars.inc}

 {$include stat_opt.inc}

@@ -626,7 +627,7 @@ end;
 

 function AddOptionsPage(var tmpl:pAnsiChar;var proc:pointer;var name:PAnsiChar):integer;

 begin

-  tmpl:='STATS';

+  tmpl:=PAnsiChar(IDD_OPT_STATS);

   proc:=@DlgProcOptions;

   name:='Statistics';

   result:=0;

diff --git a/plugins/Watrack/status/status.pas b/plugins/Watrack/status/status.pas
index 7eef03bb14..cc52e6e1d1 100644
--- a/plugins/Watrack/status/status.pas
+++ b/plugins/Watrack/status/status.pas
@@ -10,6 +10,8 @@ uses
   common,m_api,mirutils,mircontacts,protocols,dbsettings,wrapper,

   global,wat_api,hlpdlg,CBEx,myRTF,Tmpl;

 

+{$include resource.inc}

+

 const

   HKN_INSERT:PansiChar = 'WAT_Insert';

 

@@ -103,19 +105,19 @@ begin
     count:=2;

   case count of

     2: begin

-      tmpl:='COMMON';

+      tmpl:=PAnsiChar(IDD_OPT_COMMON);

       proc:=@DlgProcOptions3;

       name:='Status (common)';

     end;

     1: begin

       if SimpleMode=BST_UNCHECKED then

       begin

-        tmpl:='TEMPLATE11';

+        tmpl:=PAnsiChar(IDD_OPT_TEMPLATE11);

         proc:=@DlgProcOptions11;

       end

       else

       begin

-        tmpl:='TEMPLATE12';

+        tmpl:=PAnsiChar(IDD_OPT_TEMPLATE12);

         proc:=@DlgProcOptions12;

       end;

       name:='Status (templates)';

diff --git a/plugins/Watrack/status/status.rc b/plugins/Watrack/status/status.rc
index 3b95cd8913..838c12201a 100644
--- a/plugins/Watrack/status/status.rc
+++ b/plugins/Watrack/status/status.rc
@@ -1,9 +1,10 @@
 #include "i_st_rc.inc"

+#include "resource.inc"

 

 LANGUAGE 0,0

 

-COMMON DIALOGEX 0, 0, 304, 226, 0

-STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_VISIBLE

+IDD_OPT_COMMON DIALOGEX 0, 0, 304, 226, 0

+STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD

 EXSTYLE WS_EX_CONTROLPARENT

 FONT 8, "MS Shell Dlg", 0, 0

 {

@@ -24,8 +25,8 @@ FONT 8, "MS Shell Dlg", 0, 0
  COMBOBOX IDC_SETXSTATUS, 14, 166, 174, 96, CBS_DROPDOWNLIST | WS_VSCROLL

 }

 

-TEMPLATE11 DIALOGEX 0, 0, 304, 226, 0

-STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_VISIBLE

+IDD_OPT_TEMPLATE11 DIALOGEX 0, 0, 304, 226, 0

+STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD

 EXSTYLE WS_EX_CONTROLPARENT

 FONT 8, "MS Shell Dlg", 0, 0

 {

@@ -64,8 +65,8 @@ FONT 8, "MS Shell Dlg", 0, 0
                  WS_GROUP | WS_TABSTOP | WS_VSCROLL | CBS_AUTOHSCROLL | CBS_DROPDOWNLIST, 186, 88, 112, 100

 }

 

-TEMPLATE12 DIALOGEX 0, 0, 304, 226, 0

-STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_VISIBLE

+IDD_OPT_TEMPLATE12 DIALOGEX 0, 0, 304, 226, 0

+STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD

 EXSTYLE WS_EX_CONTROLPARENT

 FONT 8, "MS Shell Dlg", 0, 0

 {

diff --git a/plugins/Watrack/status/status.res b/plugins/Watrack/status/status.res
index c070e2e1d4..a32546637a 100644
--- a/plugins/Watrack/status/status.res
+++ b/plugins/Watrack/status/status.res
diff --git a/plugins/Watrack/templates/templates.pas b/plugins/Watrack/templates/templates.pas
index 62de1f825e..45aa980a67 100644
--- a/plugins/Watrack/templates/templates.pas
+++ b/plugins/Watrack/templates/templates.pas
@@ -10,6 +10,8 @@ uses
   m_api,dbsettings,mirutils,

   wat_api,global,macros;

 

+{$include resource.inc}

+

 const

   splStopped:PWideChar = 'stopped';

   splPlaying:PWideChar = 'playing';

@@ -63,7 +65,7 @@ end;
 

 function AddOptionsPage(var tmpl:pAnsiChar;var proc:pointer;var name:PAnsiChar):integer;

 begin

-  tmpl:='FORMAT';

+  tmpl:=PAnsiChar(IDD_OPT_FORMAT);

   proc:=@DlgProcOptions;

   name:='Templates';

   result:=0;

diff --git a/plugins/Watrack/templates/templates.rc b/plugins/Watrack/templates/templates.rc
index f7e8ff1f20..47090f361e 100644
--- a/plugins/Watrack/templates/templates.rc
+++ b/plugins/Watrack/templates/templates.rc
@@ -1,9 +1,10 @@
 #include "i_tmpl_rc.inc"

+#include "resource.inc"

 

 LANGUAGE 0,0

 

-FORMAT DIALOGEX 0, 0, 304, 226, 0

-STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_VISIBLE

+IDD_OPT_FORMAT DIALOGEX 0, 0, 304, 226, 0

+STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD

 EXSTYLE WS_EX_CONTROLPARENT

 FONT 8, "MS Shell Dlg", 0, 0

 {

diff --git a/plugins/Watrack/templates/templates.res b/plugins/Watrack/templates/templates.res
index d23e804915..cb2ee5eb7e 100644
--- a/plugins/Watrack/templates/templates.res
+++ b/plugins/Watrack/templates/templates.res