added background color select option

Author: torum

.gitignore

@@ -0,0 +1,3 @@
+
+ImageViewer.lps
+files/PackageFiles/AppxManifest.xml

ImageViewer.lpr

@@ -36,10 +36,12 @@ procedure TranslateLCL;
   //Debug Output: 'Lang is jp_JP FallbackLang is jp'
   // What??? It supporsed to be "ja_JP"!!
 
+  //Lang := FallbackLang+'_'+Country;
+
   //LazGetShortLanguageID(Lang);
   //OutputDebugString(PChar(TrimRight( 'Lang is '+ Lang )));
   //Debug Output: 'Lang is jp'
-  // What?
+  // What? not ja?
 
   if (Lang = 'en') or (Lang = 'en_US') or (Lang = 'us')
   or (FallbackLang = 'us') or (FallbackLang = 'US') or (FallbackLang = 'en') then

languages/ImageViewer.en.po

@@ -137,6 +137,21 @@ msgctxt "umain.resstrstayontop"
 msgid "Stay on top"
 msgstr ""
 
+#: umain.resstrbackground
+msgctxt "umain.background"
+msgid "Background Color"
+msgstr ""
+
+#: umain.resstrbackgroundblack
+msgctxt "umain.backgroundblack"
+msgid "Black"
+msgstr ""
+
+#: umain.resstrbackgroundwhite
+msgctxt "umain.backgroundwhite"
+msgid "White"
+msgstr ""
+
 #: umain.resstrstopfullscreenslideshow
 msgctxt "umain.resstrstopfullscreenslideshow"
 msgid "&Stop Fullscreen Slideshow"

languages/ImageViewer.ja_JP.po

@@ -4,7 +4,7 @@ msgstr "Content-Type: text/plain; charset=UTF-8"
 #: umain.resstrabout
 msgctxt "umain.resstrabout"
 msgid "About"
-msgstr "詳細"
+msgstr "ImageViewerについて"
 
 #: umain.resstrclose
 msgctxt "umain.resstrclose"
@@ -137,6 +137,21 @@ msgctxt "umain.resstrstayontop"
 msgid "Stay on top"
 msgstr "最前面"
 
+#: umain.resstrbackground
+msgctxt "umain.background"
+msgid "Background Color"
+msgstr "背景色"
+
+#: umain.resstrbackgroundblack
+msgctxt "umain.backgroundblack"
+msgid "Black"
+msgstr "黒"
+
+#: umain.resstrbackgroundwhite
+msgctxt "umain.backgroundwhite"
+msgid "White"
+msgstr "白"
+
 #: umain.resstrstopfullscreenslideshow
 msgctxt "umain.resstrstopfullscreenslideshow"
 msgid "&Stop Fullscreen Slideshow"

uabout.lfm

@@ -1011,7 +1011,7 @@ object frmAbout: TfrmAbout
     Height = 21
     Top = 180
     Width = 351
-    Caption = 'https://github.com/torumyax/'
+    Caption = 'https://torum.github.io/Image-viewer/'
     OnClick = StaticTextWebSiteClick
     OnMouseEnter = StaticTextWebSiteMouseEnter
     OnMouseLeave = StaticTextWebSiteMouseLeave

uabout.pas

@@ -6,7 +6,7 @@ interface
 
 uses
   Classes, SysUtils, FileUtil, Forms, Controls, Graphics, Dialogs, ExtCtrls,
-  StdCtrls, lclintf;
+  StdCtrls, lclintf, Menus;
 
 type
 
@@ -42,6 +42,7 @@ implementation
 
 procedure TfrmAbout.StaticTextWebSiteClick(Sender: TObject);
 begin
+  // APPX MS STORE doesn't like shellexecute,but...
   OpenURL(StaticTextWebSite.Caption);
 end;
 

ufullscreen.lfm

@@ -1,7 +1,7 @@
 object frmFullscreen: TfrmFullscreen
-  Left = 921
+  Left = 1373
   Height = 301
-  Top = 411
+  Top = 501
   Width = 400
   Align = alClient
   AlphaBlend = True

ufullscreen.pas

@@ -62,8 +62,7 @@   TfrmFullscreen = class(TForm)
     procedure Image1DblClick(Sender: TObject);
     procedure Image1MouseDown(Sender: TObject; Button: TMouseButton;
       Shift: TShiftState; X, Y: Integer);
-    procedure Image1MouseMove(Sender: TObject; Shift: TShiftState; X, Y: Integer
-      );
+    procedure Image1MouseMove(Sender: TObject; Shift: TShiftState; X, Y: Integer);
     procedure Image1MouseUp(Sender: TObject; Button: TMouseButton;
       Shift: TShiftState; X, Y: Integer);
     procedure MenuItemStartClick(Sender: TObject);

umain.lfm

@@ -1,7 +1,7 @@
 object frmMain: TfrmMain
-  Left = 954
+  Left = 1376
   Height = 301
-  Top = 203
+  Top = 464
   Width = 400
   AlphaBlend = True
   AlphaBlendValue = 0
@@ -19,7 +19,7 @@ object frmMain: TfrmMain
   OnShow = FormShow
   PopupMode = pmAuto
   Position = poScreenCenter
-  LCLVersion = '1.8.2.0'
+  LCLVersion = '1.8.4.0'
   object Image1: TImage
     Left = 0
     Height = 301
@@ -10185,6 +10185,17 @@ object frmMain: TfrmMain
       Caption = 'Stay on top'
       OnClick = MenuItemStayOnTopClick
     end
+    object MenuItemBackgroundColor: TMenuItem
+      Caption = 'Background Color'
+      object MenuItemBackgroundBlack: TMenuItem
+        Caption = 'Black'
+        OnClick = MenuItemBackgroundBlackClick
+      end
+      object MenuItemBackgroundWhite: TMenuItem
+        Caption = 'White'
+        OnClick = MenuItemBackgroundWhiteClick
+      end
+    end
     object MenuItemBo8: TMenuItem
       Caption = '-'
     end
@@ -10198,6 +10209,13 @@ object frmMain: TfrmMain
       ShortCut = 70
       OnClick = MenuItemSlideshowClick
     end
+    object MenuItem2: TMenuItem
+      Caption = '-'
+    end
+    object MenuItemAbout: TMenuItem
+      Caption = 'About'
+      OnClick = MenuItemAboutClick
+    end
     object MenuItemBo9: TMenuItem
       Caption = '-'
     end

umain.pas

@@ -4,7 +4,7 @@
 
 {
 Source:
- https://github.com/torumyax/Image-viewer
+ https://github.com/torum/Image-viewer
 
 No extra components required.
 
@@ -44,7 +44,7 @@ interface
 
 uses
   Classes, SysUtils, FileUtil, Forms, Controls, Graphics, Dialogs, ExtCtrls,
-  LclType, LclProc, LclIntf, Menus, StdCtrls, ExtDlgs, //LCLTranslator,//DefaultTranslator,
+  LclType, LclProc, LclIntf, Menus, StdCtrls, ExtDlgs,
   strutils, Types, XMLConf{$ifdef windows}, Windows{$endif};
 
 type
@@ -54,6 +54,11 @@ interface
   TfrmMain = class(TForm)
     ApplicationProperties1: TApplicationProperties;
     Image1: TImage;
+    MenuItemAbout: TMenuItem;
+    MenuItem2: TMenuItem;
+    MenuItemBackgroundBlack: TMenuItem;
+    MenuItemBackgroundWhite: TMenuItem;
+    MenuItemBackgroundColor: TMenuItem;
     MenuItemBo8: TMenuItem;
     MenuItemSysAbout: TMenuItem;
     MenuItemSysBo: TMenuItem;
@@ -90,6 +95,9 @@   TfrmMain = class(TForm)
     procedure Image1MouseWheelUp(Sender: TObject; Shift: TShiftState;
       MousePos: TPoint; var Handled: Boolean);
     procedure Image1Resize(Sender: TObject);
+    procedure MenuItemAboutClick(Sender: TObject);
+    procedure MenuItemBackgroundBlackClick(Sender: TObject);
+    procedure MenuItemBackgroundWhiteClick(Sender: TObject);
     procedure MenuItemNextClick(Sender: TObject);
     procedure MenuItemBackClick(Sender: TObject);
     procedure MenuItemQuitClick(Sender: TObject);
@@ -122,6 +130,7 @@   TfrmMain = class(TForm)
     FOptRepeat:boolean;
     FOptRandom:boolean;
     FoptStayOnTop:boolean;
+    FoptBackgroundBlack:boolean;
     FOptFileExts:string;
     FOptPlaylistExts:string;
     FOptIncludeSubFolders:boolean;
@@ -222,6 +231,10 @@   TfrmMain = class(TForm)
 
   resstrOpenPictures = 'Open picture(s)';
 
+  resstrBackground = 'Background Color';
+  resstrBackgroundBlack = 'White';
+  resstrBackgroundWhite = 'Black';
+
 implementation
 
 uses UFullscreen, UAbout;
@@ -237,13 +250,15 @@ procedure TfrmMain.FormCreate(Sender: TObject);
   folderfiles:TStringlist;
   fileSearchMask,fileFolder:string;
 begin
-  FstrAppVer:='0.1.2';
+  FstrAppVer:='1.2.2';
   // Init Main form properties.
   self.Caption:=ReplaceStr(ExtractFileName(ParamStr(0)),ExtractFileExt(ParamStr(0)),'');
   self.Visible:=false;
   self.AlphaBlend:=true;
   self.AlphaBlendValue:=255;
 
+  self.Color:=clBlack;
+
   TimerEffectStart.Enabled:=false;
 
   // Init main lists.
@@ -295,11 +310,14 @@ procedure TfrmMain.FormCreate(Sender: TObject);
   MenuItemSlideshow.Caption := resstrFullscreenSlideshow;
   MenuItemQuit.Caption := resstrQuit;
   MenuItemSysAbout.Caption := resstrAbout;
+  MenuItemAbout.Caption := resstrAbout;
   MenuItemSysQuit.Caption := resstrQuit;
 
   OpenPictureDialog1.Title:=resstrOpenPictures;
 
-
+  MenuItemBackgroundColor.Caption:=resstrBackground;
+  MenuItemBackgroundBlack.Caption:=resstrBackgroundBlack;
+  MenuItemBackgroundWhite.Caption:=resstrBackgroundWhite;
 
 
   // Load settings
@@ -329,6 +347,7 @@ procedure TfrmMain.FormCreate(Sender: TObject);
   // Don't load FOptMinimulFileSizeKiloByte...  If the size is too large, the list will be empty.
   //FOptMinimulFileSizeKiloByte := XMLConfig.GetValue('/Opts/MinimulFileSizeKiloByte',FOptMinimulFileSizeKiloByte);
   FoptStayOnTop := XMLConfig.GetValue('/Opts/StayOnTop',FoptStayOnTop);
+  FoptBackgroundBlack := XMLConfig.GetValue('/Opts/BackgroundBlack',FoptBackgroundBlack);
   FOptIncludeSubFolders := XMLConfig.GetValue('/Opts/IncludeSubFolders',FOptIncludeSubFolders);
   FOptFileExts := string(XMLConfig.GetValue('/Opts/FileExts',widestring(FOptFileExts)));
   FOptPlaylistExts := string(XMLConfig.GetValue('/Opts/PlaylistExts',widestring(FOptPlaylistExts)));
@@ -341,8 +360,8 @@ procedure TfrmMain.FormCreate(Sender: TObject);
     frmAbout := TfrmAbout.Create(self);
     frmAbout.Caption:=' '+ReplaceStr(ExtractFileName(ParamStr(0)),ExtractFileExt(ParamStr(0)),'');
     frmAbout.StaticTextAppsVer.Caption := 'Image Viewer' + ' - ' + FstrAppVer;
-    frmAbout.StaticTextWho.Caption := 'by torumyax';
-    frmAbout.StaticTextWebSite.Caption:='https://github.com/torumyax/Image-viewer';
+    frmAbout.StaticTextWho.Caption := 'by torum';
+    frmAbout.StaticTextWebSite.Caption:='https://torum.github.io/Image-viewer/';
     frmAbout.ShowModal;
     Halt;
   end;
@@ -684,6 +703,17 @@ procedure TfrmMain.FormCreate(Sender: TObject);
     exit;
   end;
 
+  if FoptBackgroundBlack then
+  begin
+       self.Color:=clBlack;
+       MenuItemBackgroundBlack.Checked:=true;
+       MenuItemBackgroundWhite.Checked:=false;
+  end else
+  begin
+       self.color:=clWhite;  
+       MenuItemBackgroundBlack.Checked:=false;
+       MenuItemBackgroundWhite.Checked:=true;
+  end;
 
   {$ifdef windows}
   // System TrayIcon
@@ -800,6 +830,7 @@ procedure TfrmMain.FormActivate(Sender: TObject);
     begin
 
       frmFullscreen := TfrmFullscreen.create(self);
+      frmFullscreen.Color := self.color;
       frmFullscreen.ShowModal;
 
       // When returned (frmFullscreen is closed), self close.
@@ -842,6 +873,7 @@ procedure TfrmMain.FormCloseQuery(Sender: TObject; var CanClose: boolean);
     XMLConfig.SetValue('/Opts/Moniter',FOptIntMoniter);
     XMLConfig.SetValue('/Opts/MinimulFileSizeKiloByte',FOptMinimulFileSizeKiloByte);
     XMLConfig.SetValue('/Opts/StayOnTop',FoptStayOnTop);
+    XMLConfig.SetValue('/Opts/BackgroundBlack',FoptBackgroundBlack);
     XMLConfig.SetValue('/Opts/IncludeSubFolders',FOptIncludeSubFolders);
     XMLConfig.SetValue('/Opts/FileExts',widestring(FOptFileExts));
     XMLConfig.SetValue('/Opts/PlaylistExts',widestring(FOptPlaylistExts));
@@ -885,6 +917,7 @@ procedure TfrmMain.TimerEffectStartTimer(Sender: TObject);
 
     frmFullscreen := TfrmFullscreen.create(self);
     frmFullScreen.StartWith:=FiCurrentFileIndex;
+    frmFullscreen.Color := self.color;
     // Show full screen.
     frmFullscreen.ShowModal;
 
@@ -1016,6 +1049,31 @@ procedure TfrmMain.Image1Resize(Sender: TObject);
     end;
 end;
 
+procedure TfrmMain.MenuItemAboutClick(Sender: TObject);
+begin
+  MenuItemSysAboutClick(Sender);
+end;
+
+procedure TfrmMain.MenuItemBackgroundBlackClick(Sender: TObject);
+begin
+
+  FoptBackgroundBlack:=true;
+  self.Color:=clBlack;
+  MenuItemBackgroundBlack.Checked:=true;
+  MenuItemBackgroundWhite.Checked:=false;
+
+end;
+
+procedure TfrmMain.MenuItemBackgroundWhiteClick(Sender: TObject);
+begin
+                                        
+  FoptBackgroundBlack:=false;
+  self.Color:=clWhite;
+  MenuItemBackgroundBlack.Checked:=false;
+  MenuItemBackgroundWhite.Checked:=true;
+
+end;
+
 procedure TfrmMain.Image1DblClick(Sender: TObject);
 begin
   if FisInFrame then
@@ -1065,6 +1123,7 @@ procedure TfrmMain.MenuItemSlideshowClick(Sender: TObject);
 
       frmFullscreen := TfrmFullscreen.create(self);
       frmFullScreen.StartWith:=FiCurrentFileIndex;
+      frmFullscreen.Color := self.color;
       frmFullscreen.ShowModal;
 
       // DoneFullscreen will be called here.
@@ -1209,6 +1268,7 @@ procedure TfrmMain.MenuItemSlideshowInFrameClick(Sender: TObject);
     Image1.Visible:=false;
     frmFullscreen := TfrmFullscreen.create(self);
     frmFullScreen.StartWith:=FiCurrentFileIndex;
+    frmFullscreen.Color := self.color;
     frmFullscreen.Parent := self;
     // Set main form popup.
     self.PopupMenu:= frmFullscreen.PopupMenu;
@@ -1487,8 +1547,8 @@ procedure TfrmMain.MenuItemSysAboutClick(Sender: TObject);
     frmAbout.Caption:=' '+ReplaceStr(ExtractFileName(ParamStr(0)),ExtractFileExt(ParamStr(0)),'');
 
     frmAbout.StaticTextAppsVer.Caption := 'Image Viewer' + ' - ' + FstrAppVer;
-    frmAbout.StaticTextWho.Caption := 'by torumyax';
-    frmAbout.StaticTextWebSite.Caption:='https://github.com/torumyax/Image-viewer';
+    frmAbout.StaticTextWho.Caption := 'by torum';
+    frmAbout.StaticTextWebSite.Caption:='https://torum.github.io/Image-viewer/';
 
     frmAbout.ShowModal;
     // No need to free. closeAction caFree.