v1.2.12

Author: torum

ImageViewer.lpr

@@ -12,6 +12,9 @@
 
 {$R *.res}
 
+var
+  ShowHelp:boolean;
+
 procedure TranslateLCL;
 var
   Lang,FallbackLang: String;
@@ -59,18 +62,27 @@ procedure TranslateLCL;
 
 end;
 
-
+procedure CheckAppParam;
 begin
-
-  if (Application.ParamCount > 0) then
+  if (ParamCount > 0) then
   begin
-    if ((Application.Params[0] = '-h') or (Application.Params[0] = '--help') or (Application.Params[0] = '/?')) then
+    if ((ParamStr(1) = '-h') or (ParamStr(1) = '--help') or (ParamStr(1) = '/?')) then
     begin
+       ShowHelp := true;
+    end;
+  end;
+end;
+
 
+begin
+  CheckAppParam;
+
+  if (ShowHelp) then
+  begin
       // This creates a NEW console window.
       // In order to write to original cosole is to compile as a console application
       // using ($APPTYPE CONSOLE) or -WG compile/linking option.
-      // However, if you do, you get a console window with a normal form window when execute...
+      // However, if you do, you get a console window WITH a normal form window ...
       {$ifdef windows}
       AllocConsole;      // in Windows unit
       {$endif}
@@ -102,17 +114,17 @@ procedure TranslateLCL;
       Application.ShowMainForm := False;
       Application.Run;
 
-    end;
-
   end else
   begin
+
     TranslateLCL;
     Application.Scaled:=True;
     RequireDerivedFormResource:=True;
     Application.Initialize;
     Application.ShowMainForm := False;
     Application.CreateForm(TfrmMain, frmMain);
     Application.Run;
+
   end;
 
 end.

umain.pas

@@ -16,10 +16,10 @@
  macOS 10.11.6 (64bit) El Capitan: Lazarus 1.9.0 carbon trunk, FPC 3.0.4
 
 TODO:
+ preLoading image for slideshow.
  load playlist.
  more Command line options.
  file drop handling(win).
- preLoading image for slideshow.
  OS's power-save event aware.
  Modal dialog with options and playlist edit tab (drag & drop files).
 
@@ -41,7 +41,7 @@ interface
 uses
   Classes, SysUtils, FileUtil, Forms, Controls, Graphics, Dialogs, ExtCtrls,
   LclType, LclProc, LclIntf, Menus, StdCtrls, ExtDlgs,
-  strutils, Types, XMLConf{$ifdef windows}, Windows{$endif};
+  strutils, Types, XMLConf{$ifdef windows}, windirs, Windows{$endif};
 
 type
 
@@ -145,6 +145,7 @@   TfrmMain = class(TForm)
     FiCurrentFileIndex:integer;
     FstrAppVer:string;
     FstrInitialSelectedImageFile:string;
+    FstrInitialDir:string;
     procedure ShowFullScreen(blnOn: boolean);
     procedure SetFullScreen_Universal(blnOn: boolean);
     procedure SetFullScreen_Win32(blnOn: boolean);
@@ -245,7 +246,7 @@ procedure TfrmMain.FormCreate(Sender: TObject);
   folderfiles:TStringlist;
   fileSearchMask,fileFolder:string;
 begin
-  FstrAppVer:='1.2.10';
+  FstrAppVer:='1.2.12';
 
   // Init Main form properties.
   self.Caption:=ReplaceStr(ExtractFileName(ParamStr(0)),ExtractFileExt(ParamStr(0)),'');
@@ -269,7 +270,7 @@ procedure TfrmMain.FormCreate(Sender: TObject);
   FOptIntervalIntSeconds:=4;
   FOptRandom:=true;
   FOptRepeat:=true;
-  FOptFileExts:='.jpg;.jpeg;.png;.gif'; //'.jpg;.jpeg;.jpe;.png;.gif';
+  FOptFileExts:='.jpg;.jpeg;.jpe;.png;.gif'; //'.jpg;.jpeg;.jpe;.png;.gif';
   FOptPlaylistExts:='.m3u;.xspf';
   FOptIncludeSubFolders:=true;
   // Be carefull when settings this. If the size is too large, the list will be empty.
@@ -294,6 +295,13 @@ procedure TfrmMain.FormCreate(Sender: TObject);
 
   FstrInitialSelectedImageFile :='';
 
+  {$ifdef windows}
+  FstrInitialDir := GetWindowsSpecialDir(CSIDL_MYPICTURES);
+  {$else}
+  // TODO:
+  FstrInitialDir := '';
+  {$endif}
+
   // i18n
   MenuItemNext.Caption := resstrPlaybackNext;
   MenuItemBack.Caption := resstrPlaybackPrevious;
@@ -314,7 +322,6 @@ procedure TfrmMain.FormCreate(Sender: TObject);
   MenuItemBackgroundBlack.Caption:=resstrBackgroundBlack;
   MenuItemBackgroundWhite.Caption:=resstrBackgroundWhite;
 
-
   // Load settings
   if ForceDirectories(GetAppConfigDir(false)) then
   begin
@@ -348,6 +355,8 @@ procedure TfrmMain.FormCreate(Sender: TObject);
   FOptPlaylistExts := string(XMLConfig.GetValue('/Opts/PlaylistExts',widestring(FOptPlaylistExts)));
   FOptIntervalIntSeconds := XMLConfig.GetValue('/Opts/IntervalSeconds',FOptIntervalIntSeconds);
 
+  FstrInitialDir := string(XMLConfig.GetValue('/InitDir/Path',widestring(FstrInitialDir)));
+
   // Command line parameters
   if Application.HasOption('h', 'help') then
   begin
@@ -551,7 +560,7 @@ procedure TfrmMain.FormCreate(Sender: TObject);
         begin
           f:= FileSize(ParamStr(I));
           // Check file size.
-          if f >= (FOptMinimulFileSizeKiloByte * 1024) then
+          if f >= (FOptMinimulFileSizeKiloByte) then
           begin
             FstFileList.Add(ParamStr(I));
             //
@@ -603,7 +612,7 @@ procedure TfrmMain.FormCreate(Sender: TObject);
           begin
             f:= FileSize(folderfiles[j]);
             // Check file size.
-            if f >= (FOptMinimulFileSizeKiloByte * 1024) then
+            if f >= (FOptMinimulFileSizeKiloByte) then
             begin
               FstFileList.Add(folderfiles[j]);
             end;
@@ -623,7 +632,12 @@ procedure TfrmMain.FormCreate(Sender: TObject);
   if ((FstFileList.Count < 1) and (FstrInitialSelectedImageFile = '')) then
   begin
     // No files are provided in the parameter string, so open "file open" dialog.
+
+    // Sets default dir
+    OpenPictureDialog1.InitialDir:=FstrInitialDir;
+    // Sets title
     OpenPictureDialog1.Title:=ReplaceStr(ExtractFileName(ParamStr(0)),ExtractFileExt(ParamStr(0)),'')+' - ' + resstrOpenPictures;
+    // Open dialog
     if OpenPictureDialog1.Execute then
     begin
       for i:=0 to OpenPictureDialog1.Files.Count -1 do
@@ -635,12 +649,14 @@ procedure TfrmMain.FormCreate(Sender: TObject);
           begin
             f:= FileSize(OpenPictureDialog1.Files[i]);
             // Check file size.
-            if f >= (FOptMinimulFileSizeKiloByte * 1024) then
+            if f >= (FOptMinimulFileSizeKiloByte) then
             begin
               //FstFileList.Add(OpenPictureDialog1.Files[i]);
               if (i=0) then
               begin
                 FstrInitialSelectedImageFile:=OpenPictureDialog1.Files[i];
+                // sets init dir for next time.
+                FstrInitialDir := ExtractFilePath(OpenPictureDialog1.Files[i]);
               end;
               FstFileList.Add(OpenPictureDialog1.Files[i]);
             end;
@@ -665,6 +681,10 @@ procedure TfrmMain.FormCreate(Sender: TObject);
   begin
     fileFolder:=ReplaceStr(FstFileList[0],ExtractFileName(FstFileList[0]),'');
     //fileFolder:=ReplaceStr(FstrInitialSelectedImageFile,ExtractFileName(FstrInitialSelectedImageFile),'');
+
+    // sets init dir for next time.
+    FstrInitialDir := ExtractFilePath(FstFileList[0]);
+
     // Create search mask
     fileSearchMask:='';
     for i:=0 to FstFileExtList.Count-1 do
@@ -688,7 +708,7 @@ procedure TfrmMain.FormCreate(Sender: TObject);
           begin
             f:= FileSize(folderfiles[j]);
             // Check file size.
-            if f >= (FOptMinimulFileSizeKiloByte * 1024) then
+            if f >= (FOptMinimulFileSizeKiloByte) then
             begin
               FstFileList.Add(folderfiles[j]);
             end;
@@ -902,6 +922,9 @@ procedure TfrmMain.FormCloseQuery(Sender: TObject; var CanClose: boolean);
     XMLConfig.SetValue('/Opts/FileExts',widestring(FOptFileExts));
     XMLConfig.SetValue('/Opts/PlaylistExts',widestring(FOptPlaylistExts));
     XMLConfig.SetValue('/Opts/IntervalSeconds',FOptIntervalIntSeconds);
+
+    XMLConfig.SetValue('/InitDir/Path',widestring(FstrInitialDir));
+
   end;
 end;
 
@@ -1288,7 +1311,7 @@ procedure TfrmMain.MenuItemSlideshowInFrameClick(Sender: TObject);
     FOrigBounds:= BoundsRect;
     self.BorderStyle:=bsNone;
     BoundsRect := FOrigBounds;
-    titlebarheight:=GetSystemMetrics(SM_CYCAPTION);
+    titlebarheight:=GetSystemMetrics(SM_CYCAPTION) + 9;
     self.height := self.height + titlebarheight;
     {$else}
       // https://forum.lazarus.freepascal.org/index.php?topic=38675.0