V0.2.4.0: Added help button to config form

git-svn-id: https://svn.code.sf.net/p/lazarus-ccr/svn@5626 8e941d3f-bd1b-0410-a28a-d453659cc2b4
2017-01-11 10:19:36 +00:00 · 2017-01-11 10:19:36 +00:00 · 190c16306a
commit 190c16306a
parent 3687b06875
7 changed files with 124 additions and 93 deletions
--- a/applications/foobot/monitor/foobotmonitor.lps
+++ b/applications/foobot/monitor/foobotmonitor.lps
@ -3,14 +3,15 @@
  <ProjectSession>
    <PathDelim Value="\"/>
    <Version Value="10"/>
-    <BuildModes Active="linux64"/>
-    <Units Count="31">
+    <BuildModes Active="win64"/>
+    <Units Count="32">
      <Unit0>
        <Filename Value="foobotmonitor.lpr"/>
        <IsPartOfProject Value="True"/>
        <IsVisibleTab Value="True"/>
-        <EditorIndex Value="17"/>
-        <CursorPos X="36" Y="31"/>
+        <EditorIndex Value="18"/>
+        <TopLine Value="13"/>
+        <CursorPos Y="66"/>
        <UsageCount Value="196"/>
        <Loaded Value="True"/>
      </Unit0>
@ -20,7 +21,8 @@
        <ComponentName Value="mainform"/>
        <HasResources Value="True"/>
        <ResourceBaseClass Value="Form"/>
-        <CursorPos Y="23"/>
+        <TopLine Value="22"/>
+        <CursorPos X="73" Y="56"/>
        <UsageCount Value="196"/>
        <Loaded Value="True"/>
        <LoadedDesigner Value="True"/>
@ -31,9 +33,9 @@
        <ComponentName Value="configform"/>
        <HasResources Value="True"/>
        <ResourceBaseClass Value="Form"/>
-        <EditorIndex Value="11"/>
-        <TopLine Value="33"/>
-        <CursorPos X="41" Y="45"/>
+        <EditorIndex Value="12"/>
+        <TopLine Value="14"/>
+        <CursorPos X="65" Y="44"/>
        <UsageCount Value="186"/>
        <Loaded Value="True"/>
        <LoadedDesigner Value="True"/>
@ -41,7 +43,7 @@
      <Unit3>
        <Filename Value="..\foobot_httpclient.pas"/>
        <IsPartOfProject Value="True"/>
-        <EditorIndex Value="5"/>
+        <EditorIndex Value="6"/>
        <TopLine Value="13"/>
        <CursorPos X="49" Y="20"/>
        <UsageCount Value="178"/>
@ -59,7 +61,7 @@
      <Unit5>
        <Filename Value="..\foobot_utility.pas"/>
        <IsPartOfProject Value="True"/>
-        <EditorIndex Value="13"/>
+        <EditorIndex Value="14"/>
        <TopLine Value="199"/>
        <CursorPos X="22" Y="214"/>
        <UsageCount Value="196"/>
@ -88,7 +90,7 @@
        <ComponentName Value="splashform"/>
        <HasResources Value="True"/>
        <ResourceBaseClass Value="Form"/>
-        <EditorIndex Value="7"/>
+        <EditorIndex Value="8"/>
        <CursorPos X="48" Y="37"/>
        <UsageCount Value="125"/>
        <Loaded Value="True"/>
@ -100,7 +102,7 @@
        <ComponentName Value="triggersform"/>
        <HasResources Value="True"/>
        <ResourceBaseClass Value="Form"/>
-        <EditorIndex Value="6"/>
+        <EditorIndex Value="7"/>
        <TopLine Value="382"/>
        <CursorPos X="26" Y="21"/>
        <UsageCount Value="116"/>
@ -109,7 +111,7 @@
      </Unit9>
      <Unit10>
        <Filename Value="..\latest_stable\foobot_httpclient.pas"/>
-        <EditorIndex Value="12"/>
+        <EditorIndex Value="13"/>
        <TopLine Value="43"/>
        <CursorPos X="47" Y="13"/>
        <UsageCount Value="110"/>
@ -117,7 +119,7 @@
      </Unit10>
      <Unit11>
        <Filename Value="..\latest_stable\foobot_objects.pas"/>
-        <EditorIndex Value="16"/>
+        <EditorIndex Value="17"/>
        <TopLine Value="141"/>
        <CursorPos X="31" Y="148"/>
        <UsageCount Value="110"/>
@ -154,7 +156,7 @@
      <Unit16>
        <Filename Value="C:\trunklatest\lazarus\ide\lazarus.pp"/>
        <UnitName Value="Lazarus"/>
-        <EditorIndex Value="9"/>
+        <EditorIndex Value="10"/>
        <TopLine Value="101"/>
        <CursorPos Y="154"/>
        <UsageCount Value="63"/>
@ -162,7 +164,7 @@
      </Unit16>
      <Unit17>
        <Filename Value="C:\trunklatest\fpc\packages\rtl-objpas\src\inc\dateutil.inc"/>
-        <EditorIndex Value="15"/>
+        <EditorIndex Value="16"/>
        <TopLine Value="381"/>
        <CursorPos X="13" Y="384"/>
        <UsageCount Value="81"/>
@ -170,7 +172,7 @@
      </Unit17>
      <Unit18>
        <Filename Value="..\latest_stable\udataform.pas"/>
-        <EditorIndex Value="10"/>
+        <EditorIndex Value="11"/>
        <TopLine Value="70"/>
        <UsageCount Value="81"/>
        <Loaded Value="True"/>
@ -200,7 +202,7 @@
      <Unit22>
        <Filename Value="C:\trunklatest\lazarus\lcl\graphics.pp"/>
        <UnitName Value="Graphics"/>
-        <EditorIndex Value="8"/>
+        <EditorIndex Value="9"/>
        <TopLine Value="1811"/>
        <CursorPos X="13" Y="1834"/>
        <UsageCount Value="59"/>
@ -216,14 +218,14 @@
      </Unit23>
      <Unit24>
        <Filename Value="..\..\json_packager\umain.pas"/>
-        <EditorIndex Value="4"/>
+        <EditorIndex Value="5"/>
        <CursorPos X="29" Y="1445"/>
        <UsageCount Value="29"/>
        <Loaded Value="True"/>
      </Unit24>
      <Unit25>
        <Filename Value="C:\trunklatest\fpc\rtl\objpas\classes\classesh.inc"/>
-        <EditorIndex Value="2"/>
+        <EditorIndex Value="3"/>
        <TopLine Value="664"/>
        <CursorPos X="25" Y="697"/>
        <UsageCount Value="28"/>
@ -231,7 +233,7 @@
      </Unit25>
      <Unit26>
        <Filename Value="C:\trunklatest\fpc\rtl\objpas\sysutils\osutilsh.inc"/>
-        <EditorIndex Value="1"/>
+        <EditorIndex Value="2"/>
        <TopLine Value="16"/>
        <CursorPos X="26" Y="44"/>
        <UsageCount Value="28"/>
@ -247,7 +249,7 @@
      <Unit28>
        <Filename Value="C:\trunklatest\fpc\packages\fcl-base\src\inifiles.pp"/>
        <UnitName Value="IniFiles"/>
-        <EditorIndex Value="14"/>
+        <EditorIndex Value="15"/>
        <TopLine Value="1272"/>
        <CursorPos X="23" Y="1276"/>
        <UsageCount Value="12"/>
@ -255,7 +257,7 @@
      </Unit28>
      <Unit29>
        <Filename Value="C:\trunklatest\fpc\rtl\objpas\classes\stringl.inc"/>
-        <EditorIndex Value="3"/>
+        <EditorIndex Value="4"/>
        <TopLine Value="1116"/>
        <CursorPos X="3" Y="1121"/>
        <UsageCount Value="12"/>
@ -269,127 +271,136 @@
        <CursorPos X="3" Y="730"/>
        <UsageCount Value="10"/>
      </Unit30>
+      <Unit31>
+        <Filename Value="C:\trunklatest\lazarus\lcl\lclintf.pas"/>
+        <UnitName Value="LCLIntf"/>
+        <EditorIndex Value="1"/>
+        <TopLine Value="54"/>
+        <CursorPos X="10" Y="81"/>
+        <UsageCount Value="10"/>
+        <Loaded Value="True"/>
+      </Unit31>
    </Units>
    <JumpHistory Count="30" HistoryIndex="29">
      <Position1>
        <Filename Value="umainform.pas"/>
-        <Caret Line="762" Column="33" TopLine="760"/>
+        <Caret Line="1350" Column="63" TopLine="1299"/>
      </Position1>
      <Position2>
        <Filename Value="umainform.pas"/>
-        <Caret Line="763" Column="5" TopLine="735"/>
+        <Caret Line="1340" Column="54" TopLine="1298"/>
      </Position2>
      <Position3>
        <Filename Value="umainform.pas"/>
-        <Caret Line="222" Column="18" TopLine="215"/>
+        <Caret Line="327" Column="47" TopLine="325"/>
      </Position3>
      <Position4>
-        <Filename Value="umainform.pas"/>
-        <Caret Line="1333" Column="6" TopLine="1297"/>
-      </Position4>
-      <Position5>
-        <Filename Value="umainform.pas"/>
-        <Caret Line="1337" Column="60" TopLine="1296"/>
-      </Position5>
-      <Position6>
-        <Filename Value="umainform.pas"/>
-        <Caret Line="1332" Column="37" TopLine="1296"/>
-      </Position6>
-      <Position7>
-        <Filename Value="umainform.pas"/>
-        <Caret Line="1350" Column="63" TopLine="1299"/>
-      </Position7>
-      <Position8>
-        <Filename Value="umainform.pas"/>
-        <Caret Line="1340" Column="54" TopLine="1298"/>
-      </Position8>
-      <Position9>
-        <Filename Value="umainform.pas"/>
-        <Caret Line="327" Column="47" TopLine="325"/>
-      </Position9>
-      <Position10>
        <Filename Value="..\foobot_utility.pas"/>
        <Caret Line="214" Column="22" TopLine="199"/>
+      </Position4>
+      <Position5>
+        <Filename Value="C:\trunklatest\fpc\packages\fcl-base\src\inifiles.pp"/>
+        <Caret Line="121" Column="16" TopLine="109"/>
+      </Position5>
+      <Position6>
+        <Filename Value="C:\trunklatest\fpc\packages\fcl-base\src\inifiles.pp"/>
+        <Caret Line="164" Column="16" TopLine="117"/>
+      </Position6>
+      <Position7>
+        <Filename Value="C:\trunklatest\fpc\packages\fcl-base\src\inifiles.pp"/>
+        <Caret Line="165" Column="16" TopLine="118"/>
+      </Position7>
+      <Position8>
+        <Filename Value="C:\trunklatest\fpc\packages\fcl-base\src\inifiles.pp"/>
+        <Caret Line="221" Column="16" TopLine="174"/>
+      </Position8>
+      <Position9>
+        <Filename Value="C:\trunklatest\fpc\packages\fcl-base\src\inifiles.pp"/>
+        <Caret Line="222" Column="16" TopLine="175"/>
+      </Position9>
+      <Position10>
+        <Filename Value="C:\trunklatest\fpc\packages\fcl-base\src\inifiles.pp"/>
+        <Caret Line="223" Column="16" TopLine="176"/>
      </Position10>
      <Position11>
        <Filename Value="C:\trunklatest\fpc\packages\fcl-base\src\inifiles.pp"/>
-        <Caret Line="121" Column="16" TopLine="109"/>
+        <Caret Line="240" Column="16" TopLine="193"/>
      </Position11>
      <Position12>
        <Filename Value="C:\trunklatest\fpc\packages\fcl-base\src\inifiles.pp"/>
-        <Caret Line="164" Column="16" TopLine="117"/>
+        <Caret Line="280" Column="12" TopLine="233"/>
      </Position12>
      <Position13>
        <Filename Value="C:\trunklatest\fpc\packages\fcl-base\src\inifiles.pp"/>
-        <Caret Line="165" Column="16" TopLine="118"/>
+        <Caret Line="415" Column="12" TopLine="368"/>
      </Position13>
      <Position14>
        <Filename Value="C:\trunklatest\fpc\packages\fcl-base\src\inifiles.pp"/>
-        <Caret Line="221" Column="16" TopLine="174"/>
+        <Caret Line="486" Column="12" TopLine="439"/>
      </Position14>
      <Position15>
        <Filename Value="C:\trunklatest\fpc\packages\fcl-base\src\inifiles.pp"/>
-        <Caret Line="222" Column="16" TopLine="175"/>
+        <Caret Line="557" Column="107" TopLine="510"/>
      </Position15>
      <Position16>
        <Filename Value="C:\trunklatest\fpc\packages\fcl-base\src\inifiles.pp"/>
-        <Caret Line="223" Column="16" TopLine="176"/>
+        <Caret Line="571" Column="89" TopLine="524"/>
      </Position16>
      <Position17>
        <Filename Value="C:\trunklatest\fpc\packages\fcl-base\src\inifiles.pp"/>
-        <Caret Line="240" Column="16" TopLine="193"/>
+        <Caret Line="575" Column="12" TopLine="540"/>
      </Position17>
      <Position18>
        <Filename Value="C:\trunklatest\fpc\packages\fcl-base\src\inifiles.pp"/>
-        <Caret Line="280" Column="12" TopLine="233"/>
+        <Caret Line="593" Column="12" TopLine="558"/>
      </Position18>
      <Position19>
        <Filename Value="C:\trunklatest\fpc\packages\fcl-base\src\inifiles.pp"/>
-        <Caret Line="415" Column="12" TopLine="368"/>
+        <Caret Line="1276" Column="23" TopLine="1272"/>
      </Position19>
      <Position20>
-        <Filename Value="C:\trunklatest\fpc\packages\fcl-base\src\inifiles.pp"/>
-        <Caret Line="486" Column="12" TopLine="439"/>
-      </Position20>
-      <Position21>
-        <Filename Value="C:\trunklatest\fpc\packages\fcl-base\src\inifiles.pp"/>
-        <Caret Line="557" Column="107" TopLine="510"/>
-      </Position21>
-      <Position22>
-        <Filename Value="C:\trunklatest\fpc\packages\fcl-base\src\inifiles.pp"/>
-        <Caret Line="571" Column="89" TopLine="524"/>
-      </Position22>
-      <Position23>
-        <Filename Value="C:\trunklatest\fpc\packages\fcl-base\src\inifiles.pp"/>
-        <Caret Line="575" Column="12" TopLine="540"/>
-      </Position23>
-      <Position24>
-        <Filename Value="C:\trunklatest\fpc\packages\fcl-base\src\inifiles.pp"/>
-        <Caret Line="593" Column="12" TopLine="558"/>
-      </Position24>
-      <Position25>
-        <Filename Value="C:\trunklatest\fpc\packages\fcl-base\src\inifiles.pp"/>
-        <Caret Line="1276" Column="23" TopLine="1272"/>
-      </Position25>
-      <Position26>
        <Filename Value="umainform.pas"/>
        <Caret Line="1341" TopLine="1299"/>
+      </Position20>
+      <Position21>
+        <Filename Value="umainform.pas"/>
+        <Caret Line="1332" Column="47" TopLine="1299"/>
+      </Position21>
+      <Position22>
+        <Filename Value="umainform.pas"/>
+        <Caret Line="1333" Column="44" TopLine="1298"/>
+      </Position22>
+      <Position23>
+        <Filename Value="umainform.pas"/>
+        <Caret Line="1341" Column="50" TopLine="1300"/>
+      </Position23>
+      <Position24>
+        <Filename Value="umainform.pas"/>
+        <Caret Line="1335" Column="31" TopLine="1301"/>
+      </Position24>
+      <Position25>
+        <Filename Value="uconfigform.pas"/>
+        <Caret Line="45" Column="41" TopLine="33"/>
+      </Position25>
+      <Position26>
+        <Filename Value="uconfigform.pas"/>
+        <Caret Line="47" Column="41" TopLine="33"/>
      </Position26>
      <Position27>
        <Filename Value="umainform.pas"/>
-        <Caret Line="1332" Column="47" TopLine="1299"/>
+        <Caret Line="23"/>
      </Position27>
      <Position28>
        <Filename Value="umainform.pas"/>
-        <Caret Line="1333" Column="44" TopLine="1298"/>
+        <Caret Line="791" Column="74" TopLine="34"/>
      </Position28>
      <Position29>
        <Filename Value="umainform.pas"/>
-        <Caret Line="1341" Column="50" TopLine="1300"/>
+        <Caret Line="781" Column="12" TopLine="777"/>
      </Position29>
      <Position30>
-        <Filename Value="umainform.pas"/>
-        <Caret Line="1335" Column="31" TopLine="1301"/>
+        <Filename Value="uconfigform.pas"/>
+        <Caret Line="44" Column="65" TopLine="14"/>
      </Position30>
    </JumpHistory>
  </ProjectSession>
--- a/applications/foobot/monitor/foobotmonitor.res
+++ b/applications/foobot/monitor/foobotmonitor.res
--- a/applications/foobot/monitor/foobotmonitorhelp.htm
+++ b/applications/foobot/monitor/foobotmonitorhelp.htm
@ -40,7 +40,7 @@ In Linux it is usually located in your home directory/-conf/foobotmonitor.cfg
 there are two ways of doing it:</li>
 </ul>
 <ol>
-	<li>Delete the cfg file, and resart&nbsp; Foobot Monitor.&nbsp; You will be 
+	<li>Delete the cfg file, and restart&nbsp; Foobot Monitor.&nbsp; You will be 
 	prompted with the login dialog as before.&nbsp; As a consequence you will 
 	lose any saved settings you had before.</li>
 	<li>
--- a/applications/foobot/monitor/innosetup/setup_foobotmonitor.exe
+++ b/applications/foobot/monitor/innosetup/setup_foobotmonitor.exe
--- a/applications/foobot/monitor/uconfigform.lfm
+++ b/applications/foobot/monitor/uconfigform.lfm
@ -87,4 +87,14 @@ object configform: Tconfigform
    ModalResult = 11
    TabOrder = 2
  end
+  object cmd_help: TBitBtn
+    Left = 432
+    Height = 30
+    Top = 160
+    Width = 75
+    DefaultCaption = True
+    Kind = bkHelp
+    OnClick = cmd_helpClick
+    TabOrder = 3
+  end
 end
--- a/applications/foobot/monitor/uconfigform.pas
+++ b/applications/foobot/monitor/uconfigform.pas
@ -23,8 +23,8 @@ unit uconfigform;
 interface

 uses
-  Classes, SysUtils, FileUtil, Forms, Controls, Graphics, Dialogs, StdCtrls,
-  ExtCtrls, Buttons;
+  Classes, SysUtils, Forms, Controls, Dialogs, StdCtrls,
+  ExtCtrls, Buttons,lclIntf;

 type

@ -33,10 +33,12 @@ type
  Tconfigform = class(TForm)
    BitBtn1: TBitBtn;
    BitBtn2: TBitBtn;
+    cmd_help: TBitBtn;
    grp_main: TGroupBox;
    edt_username: TLabeledEdit;
    Label1: TLabel;
    Memo1: TMemo;
+    procedure cmd_helpClick(Sender: TObject);
    procedure edt_usernameEditingDone(Sender: TObject);
    procedure FormCloseQuery(Sender: TObject; var CanClose: boolean);
    procedure FormCreate(Sender: TObject);
@ -122,6 +124,14 @@ begin
  end;
 end;

+procedure Tconfigform.cmd_helpClick(Sender: TObject);
+begin
+  If FileExists(sHelpFilePath) then
+    OpenURL('file://' + sHelpFilePath)
+  else ShowMessageFmt('Sorry, the help file %s is missing',[sHelpFilePath]);
+
+end;
+
 procedure Tconfigform.FormCloseQuery(Sender: TObject; var CanClose: boolean);
 begin
  If ( bDoneUsername=FALSE) OR (bDoneSecretKey=FALSE) then
--- a/applications/foobot/monitor/umainform.lfm
+++ b/applications/foobot/monitor/umainform.lfm
@ -1,7 +1,7 @@
 object mainform: Tmainform
-  Left = 589
+  Left = 1116
  Height = 504
-  Top = 145
+  Top = 269
  Width = 784
  BorderIcons = [biSystemMenu, biMinimize]
  BorderStyle = bsSingle