ADD: Patch [0000266] "Reload file using keyboard shortcut"

src/fviewer.lfm

@@ -911,9 +911,9 @@ object frmViewer: TfrmViewer
       object btnReload: TSpeedButton
         Left = 1
         Height = 46
-        Hint = 'Reload'
         Top = 1
         Width = 48
+        Action = actReload
         Align = alLeft
         BorderSpacing.Bottom = 2
         Glyph.Data = {
@@ -982,7 +982,7 @@ object frmViewer: TfrmViewer
           FF00FFFFFF00FFFFFF00
         }
         NumGlyphs = 0
-        OnClick = btnReloadClick
+        ShowCaption = False
       end
       object btnPaint: TSpeedButton
         Left = 462
@@ -1599,9 +1599,9 @@ object frmViewer: TfrmViewer
         AnchorSideBottom.Control = btnPrev1
         Left = 1
         Height = 28
-        Hint = 'Reload'
         Top = 1
         Width = 32
+        Action = actReload
         Align = alLeft
         Glyph.Data = {
           C6070000424DC607000000000000360000002800000016000000160000000100
@@ -1669,7 +1669,7 @@ object frmViewer: TfrmViewer
           FF00FFFFFF00FFFFFF00
         }
         NumGlyphs = 0
-        OnClick = btnReloadClick
+        ShowCaption = False
       end
       object btnPrev1: TSpeedButton
         Left = 33
@@ -2112,6 +2112,9 @@ object frmViewer: TfrmViewer
         ShortCut = 16464
         OnClick = miPrintClick
       end
+      object miReload: TMenuItem
+        Action = actReload
+      end
       object miSeparator: TMenuItem
         Caption = '-'
       end
@@ -2305,9 +2308,16 @@ object frmViewer: TfrmViewer
     left = 365
     top = 66
     object actAbout: TAction
+      Category = 'Help'
       Caption = 'About Viewer...'
       Hint = 'Displays the About message'
       OnExecute = miAbout2Click
     end
+    object actReload: TAction
+      Category = 'File'
+      Caption = 'Reload'
+      Hint = 'Reload current file'
+      OnExecute = actExecute
+    end
   end
 end

src/fviewer.lrt

@@ -19,7 +19,6 @@ TFRMVIEWER.BTNGIFTOBMP.CAPTION=S
 TFRMVIEWER.BTNNEXTGIFFRAME.CAPTION=||>
 TFRMVIEWER.BTNPREVGIFFRAME.CAPTION=<||
 TFRMVIEWER.BTNRESIZE.HINT=Resize
-TFRMVIEWER.BTNRELOAD.HINT=Reload
 TFRMVIEWER.BTNPAINT.HINT=Paint
 TFRMVIEWER.BTNFULLSCREEN.HINT=Full Screen
 TFRMVIEWER.GBOXSLIDESHOW.CAPTION=Slide Show
@@ -29,7 +28,6 @@ TFRMVIEWER.BTNNEXT.HINT=Next
 TFRMVIEWER.BTNCOPYFILE.HINT=Copy
 TFRMVIEWER.BTNMOVEFILE.HINT=Move
 TFRMVIEWER.BTNDELETEFILE.HINT=Delete
-TFRMVIEWER.BTNRELOAD1.HINT=Reload
 TFRMVIEWER.BTNPREV1.HINT=Previous
 TFRMVIEWER.BTNNEXT1.HINT=Next
 TFRMVIEWER.BTNCOPYFILE1.HINT=Copy
@@ -80,3 +78,5 @@ TFRMVIEWER.MIDIV5.CAPTION=-
 TFRMVIEWER.PMISELECTALL.CAPTION=Select All
 TFRMVIEWER.ACTABOUT.CAPTION=About Viewer...
 TFRMVIEWER.ACTABOUT.HINT=Displays the About message
+TFRMVIEWER.ACTRELOAD.CAPTION=Reload
+TFRMVIEWER.ACTRELOAD.HINT=Reload current file

src/fviewer.pas

@@ -48,6 +48,7 @@ type
 
   TfrmViewer = class(TForm, IFormCommands)
     actAbout: TAction;
+    actReload: TAction;
     actionList: TActionList;
     btnCopyFile1: TSpeedButton;
     btnDeleteFile1: TSpeedButton;
@@ -64,6 +65,7 @@ type
     gboxView: TGroupBox;
     gboxSlideShow: TGroupBox;
     GifAnim: TGifAnim;
+    miReload: TMenuItem;
     miLookBook: TMenuItem;
     miDiv4: TMenuItem;
     miPreview: TMenuItem;
@@ -148,6 +150,7 @@ type
     miCopyToClipboard: TMenuItem;
     TimerViewer: TTimer;
     ViewerControl: TViewerControl;
+    procedure actExecute(Sender: TObject);
     procedure btnCopyMoveFileClick(Sender: TObject);
     procedure btnCutTuImageClick(Sender: TObject);
     procedure btnDeleteFileClick(Sender: TObject);
@@ -159,7 +162,6 @@ type
     procedure btnPrevClick(Sender: TObject);
     procedure btnPrevGifFrameClick(Sender: TObject);
     procedure btnRedEyeClick(Sender: TObject);
-    procedure btnReloadClick(Sender: TObject);
     procedure btnResizeClick(Sender: TObject);
     procedure btnUndoClick(Sender: TObject);
     procedure DrawPreviewDrawCell(Sender: TObject; aCol, aRow: Integer;
@@ -261,9 +263,7 @@ type
     procedure SaveImageAs (Var sExt: String; senderSave: boolean; Quality: integer);
     procedure CreatePreview(FullPathToFile:string; index:integer; delete: boolean = false);
 
-    {$IF FPC_FULLVERSION >= 020501}
-    property Commands: TFormCommands read FCommands implements IFormCommands;
-    {$ENDIF}
+    property Commands: TFormCommands read FCommands{$IF FPC_FULLVERSION >= 020501} implements IFormCommands{$ENDIF};
 
   public
     constructor Create(TheOwner: TComponent; aFileSource: IFileSource); overload;
@@ -284,6 +284,7 @@ type
     property QuickView: Boolean read bQuickView write bQuickView;
   published
     procedure cm_About(Param: String='');
+    procedure cm_Reload(Param: String='');
   end;
 
 procedure ShowViewer(const FilesToView:TStringList; const aFileSource: IFileSource = nil);
@@ -1026,6 +1027,11 @@ begin
   miAbout2Click(Self);
 end;
 
+procedure TfrmViewer.cm_Reload(Param: String);
+begin
+  LoadFile(iActiveFile);
+end;
+
 procedure TfrmViewer.miPluginsClick(Sender: TObject);
 begin
   bPlugin:= CheckPlugins(FileList.Strings[iActiveFile], True);
@@ -1536,6 +1542,15 @@ begin
      Exit;
 end;
 
+procedure TfrmViewer.actExecute(Sender: TObject);
+var
+  cmd: string;
+begin
+  cmd := (Sender as TAction).Name;
+  cmd := 'cm_' + Copy(cmd, 4, Length(cmd) - 3);
+  Commands.ExecuteCommand(cmd, '');
+end;
+
 procedure TfrmViewer.btnFullScreenClick(Sender: TObject);
 begin
   miFullScreenClick(Sender);
@@ -1629,11 +1644,6 @@ begin
   RedEyes;
 end;
 
-procedure TfrmViewer.btnReloadClick(Sender: TObject);
-begin
-   LoadFile (iActiveFile);
-end;
-
 procedure TfrmViewer.btnResizeClick(Sender: TObject);
 begin
   if not Assigned(FModSizeDialog) then

src/uglobs.pas

@@ -82,7 +82,7 @@ type
 
 const
   { Default hotkey list version number }
-  hkVersion     = 5;
+  hkVersion     = 6;
 
   // Previously existing names if reused must check for ConfigVersion >= X.
   // History:
@@ -440,8 +440,8 @@ begin
   HMForm := HotMan.Forms.FindOrCreate('Viewer');
   with HMForm.Hotkeys do
     begin
-      AddIfNotExists('F1','cm_Viewer_About','');
-      AddIfNotExists('F1','cm_Viewer_DeleteFile','');
+      AddIfNotExists('F1','cm_About','');
+      AddIfNotExists('F2','cm_Reload','');
     end;
 end;