Changeset 178

Timestamp:

Mar 27, 2018, 11:07:44 AM (6 years ago)

Author:

chronos

Message:

• Modified: Examples moved to subdirectory Examples.
• Added: Support for override of default project file opened on first application start.
• Modified: Fixed displaying of command line help.

Location:

trunk

Files:

• Examples (added)
• Examples/Example acronyms.adp (moved) (moved from trunk/Example acronyms.adp )
• Install/deb/debian/rules (modified) (1 diff)
• Install/win (modified) (1 prop)
• Install/win/AcronymDecoder.iss (modified) (1 diff)
• Languages/AcronymDecoder.cs.po (modified) (1 diff)
• Languages/AcronymDecoder.po (modified) (1 diff)
• UCore.pas (modified) (6 diffs)

trunk/Install/deb/debian/rules

@@ -22 +22 @@
         install -m 755 Languages/UJobProgressView.cs.po $(ROOT)/usr/share/AcronymDecoder/languages
         install -d -m 755 $(ROOT)/usr/share/AcronymDecoder/Examples
-        install -m 755 "Example acronyms.adp" $(ROOT)/usr/share/AcronymDecoder/Examples
+        @install -D -m 644 Examples/* $(ROOT)/usr/share/AcronymDecoder/Examples || true
         install -d -m 755 $(ROOT)/usr/share/applications
         install -m 755 Install/deb/AcronymDecoder.desktop $(ROOT)/usr/share/applications

trunk/Install/win/AcronymDecoder.iss

@@ -74 +74 @@
 Source: "{#MyAppSubDir}\libeay32.dll"; DestDir: "{app}"; Flags: ignoreversion
 Source: "{#MyAppSubDir}\ssleay32.dll"; DestDir: "{app}"; Flags: ignoreversion
-Source: "{#MyAppSubDir}\Example acronyms.adp"; DestDir: "{app}"; Flags: ignoreversion
+Source: "{#MyAppSubDir}\Examples"; DestDir: "{app}\Examples"; Flags: ignoreversion
 Source: "{#MyAppSubDir}\Release notes.txt"; DestDir: "{app}"; Flags: ignoreversion
 Source: "{#MyAppSubDir}\Languages\*.po"; DestDir: "{app}\Languages"; Flags: ignoreversion

trunk/Languages/AcronymDecoder.cs.po

@@ -752 +752 @@
 msgstr "Špatný formát souboru"
 
+#: ucore.soptions
+msgid "options"
+msgstr "volby"
+
+#: ucore.sprojectfile
+msgid "project file"
+msgstr "projektový soubor"
+
+#: ucore.sshowthishelp
+msgid "Show this help"
+msgstr "Ukázat tuto nápovědu"
+
+#: ucore.sstartminimizedintray
+msgid "Start minimized in system tray"
+msgstr "Startovat zmenšený do oznamovací oblasti"
+
 #: uformabout.slicense
 msgid "License"

trunk/Languages/AcronymDecoder.po

@@ -742 +742 @@
 msgstr ""
 
+#: ucore.soptions
+msgid "options"
+msgstr ""
+
+#: ucore.sprojectfile
+msgid "project file"
+msgstr ""
+
+#: ucore.sshowthishelp
+msgid "Show this help"
+msgstr ""
+
+#: ucore.sstartminimizedintray
+msgid "Start minimized in system tray"
+msgstr ""
+
 #: uformabout.slicense
 msgid "License"

trunk/UCore.pas

@@ -40 +40 @@
     procedure SetAlwaysOnTop(AValue: Boolean);
     function FindFirstNonOption: string;
+    procedure WriteLnConsole(Text: string);
   public
     AcronymDb: TAcronymDb;
@@ -69 +70 @@
 const
   ExampleFile = 'Example acronyms.adp';
+  DefaultOverrideFile = 'Default.txt';
+
+resourcestring
+  SStartMinimizedInTray = 'Start minimized in system tray';
+  SShowThisHelp = 'Show this help';
+  SOptions = 'options';
+  SProjectFile = 'project file';
 
 
@@ -108 +116 @@
 end;
 
+procedure TCore.WriteLnConsole(Text: string);
+begin
+  {$IFDEF WINDOWS}
+  if not IsConsole then begin
+    IsConsole := True;
+    SysInitStdIO;
+  end;
+  {$ENDIF}
+  WriteLn(Text);
+end;
+
 procedure TCore.Initialize;
 var
   FileNameOption: string;
   ExampleFileName: string;
+  DefaultOverrideFileName: string;
+  ExamplesDir: string;
+  Lines: TStringList;
+  Output: string;
 begin
   if not InitializeStarted then begin
@@ -117 +140 @@
     LoadConfig;
 
-    {$IFDEF 0}
     if Application.HasOption('h', 'help') then begin
-      WriteLn('AcronymDecoder <project file>');
-      WriteLn('  -t    --tray   Start minimized in system tray');
-      WriteLn('  -h    --help  Show this help');
+      Output := 'AcronymDecoder [' + SOptions + '] <' + SProjectFile + '>' + LineEnding;
+      Output := Output + '  -t    --tray   ' + SStartMinimizedInTray + LineEnding;
+      Output := Output + '  -h    --help   ' + SShowThisHelp + LineEnding;
+      WriteLnConsole(Output);
       Application.Terminate;
       Exit;
     end;
-    {$ENDIF}
 
     if Application.HasOption('t', 'tray') then begin
@@ -131 +153 @@
     end;
 
-    ExampleFileName := ExtractFileDir(Application.ExeName) + DirectorySeparator + ExampleFile;
+    ExamplesDir := ExtractFileDir(Application.ExeName) + DirectorySeparator +
+      'Examples';
+    {$IFDEF Linux}
+    // If installed in Linux system then use installation directory for po files
+    if Application.ExeName = '/usr/bin/' + ExtractFileNameOnly(Application.ExeName) then
+      ExamplesDir := '/usr/share/' + ExtractFileNameOnly(Application.ExeName) +
+        DirectorySeparator + 'Examples';
+    {$ENDIF}
+    ExampleFileName := ExamplesDir + DirectorySeparator + ExampleFile;
+
+    // To override default project file put new project name to default file
+    DefaultOverrideFileName := ExamplesDir + DirectorySeparator + DefaultOverrideFile;
+    if FileExists(DefaultOverrideFileName) then begin
+      Lines := TStringList.Create;
+      Lines.LoadFromFile(DefaultOverrideFileName);
+      if Lines.Count > 0 then
+        ExampleFileName := ExamplesDir + DirectorySeparator + Lines[0];
+      Lines.Free;
+    end;
+
     FileNameOption := FindFirstNonOption;
     if FileNameOption <> '' then begin
@@ -144 +185 @@
     if FileExists(ExampleFileName) then begin
       // Open default database with examples if no item is in recent openned history
-      FileNameOption := ExtractFileDir(Application.ExeName) + DirectorySeparator + ExampleFile;
-      {$IFDEF Linux}
-      // If installed in Linux system then use installation directory for po files
-      if Application.ExeName = '/usr/bin/' + ExtractFileNameOnly(Application.ExeName) then
-        FileNameOption := '/usr/share/' + ExtractFileNameOnly(Application.ExeName) + '/Examples/' + ExampleFile;
-      {$ENDIF}
-      FormMain.ProjectOpen(FileNameOption);
+      FormMain.ProjectOpen(ExampleFileName);
     end else begin
       // Create empty file