feat: Keys to exit implemented

- The Escape key for all platforms - For Linux: Ctrl+Q - For Windows: Alt+X Closes: #16
gcarreno · Feb 3, 2021 · 8765a6f · 8765a6f
1 parent 1ccc197
commit 8765a6f
Show file tree

Hide file tree

Showing 8 changed files with 60 additions and 9 deletions.
diff --git a/src/application/ljv.application.version.pas b/src/application/ljv.application.version.pas
@@ -27,11 +27,11 @@
 interface
 
 const
-  cVersion = '0.1.7.30';
+  cVersion = '0.1.8.31';
   cVersionMajor = 0;
   cVersionMinor = 1;
-  cVersionRevision = 7;
-  cVersionBuild = 30;
+  cVersionRevision = 8;
+  cVersionBuild = 31;
 
 implementation
 

diff --git a/src/forms/ljv.forms.main.lfm b/src/forms/ljv.forms.main.lfm
@@ -11,7 +11,6 @@ object frmMain: TfrmMain
   OnDestroy = FormDestroy
   OnDropFiles = FormDropFiles
   SessionProperties = 'Top;Left;Height;Width;WindowState'
-  LCLVersion = '2.1.0.0'
   object psMain: TPairSplitter
     Cursor = crDefault
     Left = 224
@@ -39,7 +38,7 @@ object frmMain: TfrmMain
         Header.Columns = <        
           item
             Position = 0
-            Width = 400
+            Width = 398
           end>
         Header.Options = [hoAutoResize, hoColumnResize, hoDrag, hoShowSortGlyphs]
         TabOrder = 0
@@ -154,4 +153,13 @@ object frmMain: TfrmMain
     Left = 80
     Top = 464
   end
+  object alMain: TActionList
+    Left = 80
+    Top = 400
+    object actFileExit: TFileExit
+      Category = 'File'
+      Caption = 'E&xit'
+      Hint = 'Exit'
+    end
+  end
 end
diff --git a/src/forms/ljv.forms.main.lrj b/src/forms/ljv.forms.main.lrj
@@ -4,5 +4,7 @@
 {"hash":43075653,"name":"tfrmmain.lblname.caption","sourcebytes":[108,98,108,78,97,109,101],"value":"lblName"},
 {"hash":151678324,"name":"tfrmmain.lblcount.caption","sourcebytes":[108,98,108,67,111,117,110,116],"value":"lblCount"},
 {"hash":152863893,"name":"tfrmmain.lblvalue.caption","sourcebytes":[108,98,108,86,97,108,117,101],"value":"lblValue"},
-{"hash":43083992,"name":"tfrmmain.lblpath.caption","sourcebytes":[108,98,108,80,97,116,104],"value":"lblPath"}
+{"hash":43083992,"name":"tfrmmain.lblpath.caption","sourcebytes":[108,98,108,80,97,116,104],"value":"lblPath"},
+{"hash":4710148,"name":"tfrmmain.actfileexit.caption","sourcebytes":[69,38,120,105,116],"value":"E&xit"},
+{"hash":315140,"name":"tfrmmain.actfileexit.hint","sourcebytes":[69,120,105,116],"value":"Exit"}
 ]}
diff --git a/src/forms/ljv.forms.main.pas b/src/forms/ljv.forms.main.pas
@@ -35,7 +35,7 @@ interface
 , Dialogs
 , ExtCtrls
 , StdCtrls
-, PairSplitter, JSONPropStorage
+, PairSplitter, JSONPropStorage, ActnList, StdActns
 , fpjson
 , VirtualTrees
 ;
@@ -45,6 +45,8 @@ interface
   { TfrmMain }
 
   TfrmMain = class(TForm)
+    alMain: TActionList;
+    actFileExit: TFileExit;
     lblPath: TLabel;
     lblValue: TLabel;
     panPath: TPanel;
@@ -73,6 +75,8 @@   TfrmMain = class(TForm)
     FJSON: TJSONData;
     FFileList: Array of String;
 
+    procedure SetupShortcuts;
+
     procedure AddFile(const AFilename: String);
     procedure ClearTree;
     function FormatBytes(ABytes: Int64): String;
@@ -103,6 +107,7 @@ implementation
 uses
   StrUtils
 , DateUtils
+, LCLType
 , LJV.Application.Version
 , LJV.JSON.Utils
 , LJV.Tree.Nodes
@@ -163,6 +168,7 @@ implementation
 procedure TfrmMain.FormCreate(Sender: TObject);
 begin
   SetupPropStorage;
+  SetupShortcuts;
   Caption:= Format(rsFormCaption, [cVersion]);
   lblValue.Caption:= rsCaptionValue;
   ClearLabels;
@@ -487,6 +493,17 @@ procedure TfrmMain.vstJSONGetText(Sender: TBaseVirtualTree; Node: PVirtualNode;
   end;
 end;
 
+procedure TfrmMain.SetupShortcuts;
+begin
+  actFileExit.SecondaryShortCuts.Add('Esc');
+{$IFDEF LINUX}
+  actFileExit.ShortCut := KeyToShortCut(VK_Q, [ssCtrl]);
+{$ENDIF}
+{$IFDEF WINDOWS}
+  actFileExit.ShortCut := KeyToShortCut(VK_X, [ssAlt]);
+{$ENDIF}
+end;
+
 function TfrmMain.FormatBytes(ABytes: Int64): String;
 var
   dSize: Double;

diff --git a/src/i18n/lazJSONViewer.pot b/src/i18n/lazJSONViewer.pot
@@ -163,6 +163,14 @@ msgctxt "ljv.forms.main.rsvstunknown"
 msgid "Unknown"
 msgstr ""
 
+#: tfrmmain.actfileexit.caption
+msgid "E&xit"
+msgstr ""
+
+#: tfrmmain.actfileexit.hint
+msgid "Exit"
+msgstr ""
+
 #: tfrmmain.caption
 msgid "frmMain"
 msgstr ""

diff --git a/src/i18n/lazJSONViewer.pt.po b/src/i18n/lazJSONViewer.pt.po
@@ -164,6 +164,14 @@ msgctxt "ljv.forms.main.rsvstunknown"
 msgid "Unknown"
 msgstr "Desconhecido"
 
+#: tfrmmain.actfileexit.caption
+msgid "E&xit"
+msgstr "&Sair"
+
+#: tfrmmain.actfileexit.hint
+msgid "Exit"
+msgstr "Sair"
+
 #: tfrmmain.caption
 msgid "frmMain"
 msgstr "frmMain"

diff --git a/src/i18n/lazJSONViewer.pt_PT.po b/src/i18n/lazJSONViewer.pt_PT.po
@@ -164,6 +164,14 @@ msgctxt "ljv.forms.main.rsvstunknown"
 msgid "Unknown"
 msgstr "Desconhecido"
 
+#: tfrmmain.actfileexit.caption
+msgid "E&xit"
+msgstr "&Sair"
+
+#: tfrmmain.actfileexit.hint
+msgid "Exit"
+msgstr "Sair"
+
 #: tfrmmain.caption
 msgid "frmMain"
 msgstr "frmMain"

diff --git a/src/lazJSONViewer.lpi b/src/lazJSONViewer.lpi
@@ -23,8 +23,8 @@
     <VersionInfo>
       <UseVersionInfo Value="True"/>
       <MinorVersionNr Value="1"/>
-      <RevisionNr Value="7"/>
-      <BuildNr Value="30"/>
+      <RevisionNr Value="8"/>
+      <BuildNr Value="31"/>
       <Language Value="0809"/>
     </VersionInfo>
     <BuildModes Count="4">