[*] move log to another form, closes #26

forms/fmconnect.pas

@@ -1,6 +1,6 @@
 unit fmConnect;
 
-{$MODE Delphi}
+{$mode objfpc}{$H+}
 
 interface
 
@@ -39,9 +39,6 @@   TfmConnect = class(TForm)
 
 function EditDatabase(ADatabase: TPQConnection): boolean;
 
-var
-  fmConnect: TfmConnect;
-
 implementation
 
 {$R *.lfm}

forms/fmlog.lfm

@@ -0,0 +1,28 @@
+object fmLog: TfmLog
+  Left = 554
+  Height = 856
+  Top = 176
+  Width = 935
+  Caption = 'Log'
+  ClientHeight = 856
+  ClientWidth = 935
+  DesignTimePPI = 144
+  LCLVersion = '2.0.12.0'
+  object mmLog: TMemo
+    Left = 4
+    Height = 848
+    Top = 4
+    Width = 927
+    Align = alClient
+    BorderSpacing.Left = 2
+    BorderSpacing.Top = 2
+    BorderSpacing.Right = 2
+    BorderSpacing.Bottom = 2
+    BorderSpacing.Around = 2
+    BorderSpacing.InnerBorder = 2
+    Font.Name = 'Consolas'
+    ParentFont = False
+    ScrollBars = ssVertical
+    TabOrder = 0
+  end
+end

forms/fmlog.pas

@@ -0,0 +1,30 @@
+unit fmLog;
+
+{$mode objfpc}{$H+}
+
+interface
+
+uses
+  Classes, SysUtils, Forms, Controls, Graphics, Dialogs, StdCtrls;
+
+type
+
+  { TfmLog }
+
+  TfmLog = class(TForm)
+    mmLog: TMemo;
+  private
+
+  public
+
+  end;
+
+var
+  LogForm: TfmLog;
+
+implementation
+
+{$R *.lfm}
+
+end.
+

forms/fmmain.lfm

@@ -23,7 +23,7 @@ object fmMain: TfmMain
     TabOrder = 1
     object gridTasks: TDBGrid
       Left = 2
-      Height = 222
+      Height = 531
       Top = 42
       Width = 1508
       Align = alClient
@@ -107,25 +107,6 @@ object fmMain: TfmMain
       OnDrawColumnCell = gridTasksDrawColumnCell
       OnSelectEditor = gridTasksSelectEditor
     end
-    object splitDetails: TSplitter
-      Cursor = crVSplit
-      Left = 2
-      Height = 9
-      Top = 264
-      Width = 1508
-      Align = alBottom
-      ResizeAnchor = akBottom
-    end
-    object mmLog: TMemo
-      Left = 2
-      Height = 300
-      Top = 273
-      Width = 1508
-      Align = alBottom
-      ParentFont = False
-      ScrollBars = ssAutoVertical
-      TabOrder = 2
-    end
     object toolbarTasks: TToolBar
       Left = 2
       Height = 40
@@ -139,7 +120,7 @@ object fmMain: TfmMain
       Images = imglToolbars
       ParentShowHint = False
       ShowHint = True
-      TabOrder = 3
+      TabOrder = 1
       object btnTaskMoveUp: TToolButton
         Left = 1
         Top = 0
@@ -758,6 +739,14 @@ object fmMain: TfmMain
         OnClick = miCloseClick
       end
     end
+    object miView: TMenuItem
+      Caption = 'View'
+      object miLog: TMenuItem
+        AutoCheck = True
+        Caption = 'Log'
+        OnClick = miLogClick
+      end
+    end
     object miHelp: TMenuItem
       Caption = 'Help'
       object miAbout: TMenuItem

forms/fmmain.pas

@@ -35,8 +35,9 @@   TfmMain = class(TForm)
     imglToolbarsDisabled: TImageList;
     imglToolbars: TImageList;
     imglGrids: TImageList;
+    miLog: TMenuItem;
+    miView: TMenuItem;
     miConnect: TMenuItem;
-    mmLog: TMemo;
     menuMain: TMainMenu;
     miFile: TMenuItem;
     miClose: TMenuItem;
@@ -46,7 +47,6 @@   TfmMain = class(TForm)
     pnlChains: TPanel;
     pnlDetails: TPanel;
     splitChain: TSplitter;
-    splitDetails: TSplitter;
     toolbarChains: TToolBar;
     toolbarMain: TToolBar;
     btnConnect: TToolButton;
@@ -90,6 +90,7 @@   TfmMain = class(TForm)
     procedure gridTasksSelectEditor(Sender: TObject; Column: TColumn;
       var Editor: TWinControl);
     procedure miCloseClick(Sender: TObject);
+    procedure miLogClick(Sender: TObject);
   private
     FLastColumn: TColumn; //last sorted grid column
   public
@@ -101,7 +102,7 @@   TfmMain = class(TForm)
 
 implementation
 
-uses uDataModule, SQLDB, LCLType, RegExpr;
+uses uDataModule, SQLDB, LCLType, RegExpr, fmLog;
 
 {$R *.lfm}
 
@@ -214,6 +215,11 @@ procedure TfmMain.miCloseClick(Sender: TObject);
   Close();
 end;
 
+procedure TfmMain.miLogClick(Sender: TObject);
+begin
+  fmLog.LogForm.Visible := not fmLog.LogForm.Visible;
+end;
+
 procedure TfmMain.UpdateSortIndication(ACol: TColumn);
 begin
   // Remove the sort arrow from the previous column we sorted
@@ -352,7 +358,7 @@ procedure TfmMain.acConnectClick(Sender: TObject);
       dmPgEngine.Connect;
     except
       on EAbort do
-        mmLog.Lines.Append('Connection cancelled by the user');
+        fmLog.LogForm.mmLog.Lines.Append('Connection cancelled by the user');
       on E: Exception do
         MessageDlg('PostgreSQL Error', E.Message, mtError, [mbOK], 0);
     end

pg_timetable_gui.lpi

@@ -103,18 +103,21 @@
       <FormatVersion Value="2"/>
       <Modes Count="0"/>
     </RunParams>
-    <RequiredPackages Count="3">
+    <RequiredPackages Count="4">
       <Item1>
-        <PackageName Value="LazControls"/>
+        <PackageName Value="SynEdit"/>
       </Item1>
       <Item2>
-        <PackageName Value="FCL"/>
+        <PackageName Value="LazControls"/>
       </Item2>
       <Item3>
-        <PackageName Value="LCL"/>
+        <PackageName Value="FCL"/>
       </Item3>
+      <Item4>
+        <PackageName Value="LCL"/>
+      </Item4>
     </RequiredPackages>
-    <Units Count="8">
+    <Units Count="9">
       <Unit0>
         <Filename Value="pg_timetable_gui.lpr"/>
         <IsPartOfProject Value="True"/>
@@ -160,6 +163,14 @@
         <ResourceBaseClass Value="Form"/>
         <UnitName Value="fmConnect"/>
       </Unit7>
+      <Unit8>
+        <Filename Value="forms\fmlog.pas"/>
+        <IsPartOfProject Value="True"/>
+        <ComponentName Value="fmLog"/>
+        <HasResources Value="True"/>
+        <ResourceBaseClass Value="Form"/>
+        <UnitName Value="fmLog"/>
+      </Unit8>
     </Units>
   </ProjectOptions>
   <CompilerOptions>

pg_timetable_gui.lpr

@@ -8,7 +8,7 @@
   lazcontrols,
   fmMain, fmConnect,
   uDataModule,
-  uObjects;
+  uObjects, fmLog;
 
 {$R *.res}
 
@@ -18,5 +18,6 @@
   Application.Initialize;
   Application.CreateForm(TfmMain, MainForm);
   Application.CreateForm(TdmPgEngine, dmPgEngine);
+  Application.CreateForm(TfmLog, LogForm);
   Application.Run;
 end.

udatamodule.lfm

@@ -20,7 +20,7 @@ object dmPgEngine: TdmPgEngine
     Transaction = transChains
     UserName = 'scheduler'
     OnLog = PQConnLog
-    LogEvents = [detParamValue, detActualSQL]
+    LogEvents = [detPrepare, detExecute, detCommit, detParamValue, detActualSQL]
     Left = 105
     Top = 312
   end

udatamodule.pas

@@ -47,17 +47,21 @@   TdmPgEngine = class(TDataModule)
 
 implementation
 
-uses uObjects, fmMain, fmConnect, Dialogs, UITypes;
+uses uObjects, fmMain, fmConnect, Dialogs, UITypes, fmLog;
 
 {$R *.lfm}
 
 { TdmPgEngine }
 
 procedure TdmPgEngine.PQConnLog(Sender: TSQLConnection;
   EventType: TDBEventType; const Msg: String);
+const et: array[TDBEventType] of string = ('detCustom', 'detPrepare', 'detExecute',
+'detFetch', 'detCommit', 'detRollBack', 'detParamValue', 'detActualSQL');
 begin
-  fmMain.MainForm.mmLog.Lines.Append(Msg);
-  fmMain.MainForm.mmLog.Lines.Append('----------------------------------------------------');
+  with fmLog.LogForm.mmLog.Lines do
+  begin
+    Append(Format('[%s:] %s' + LineEnding, [et[EventType], Msg]))
+  end;
 end;
 
 procedure TdmPgEngine.PQConnLogin(Sender: TObject; Username, Password: string);