Changeset 138 for trunk

Timestamp:

Dec 2, 2016, 12:41:40 PM (8 years ago)

Author:

chronos

Message:

• Modified: Use more precise term "Same length" rather then "Exact match" for acronym text filtering.
• Fixed: Application directory location for Windows installer script.

Location:

trunk

Files:

• Forms/UFormMain.lfm (modified) (7 diffs)
• Forms/UFormMain.lrt (modified) (2 diffs)
• Forms/UFormMain.pas (modified) (7 diffs)
• Install/win/AcronymDecoder.iss (modified) (1 diff)
• Languages/AcronymDecoder.cs.po (modified) (3 diffs)
• Languages/AcronymDecoder.po (modified) (2 diffs)

trunk/Forms/UFormMain.lfm

@@ -1 +1 @@
 object FormMain: TFormMain
-  Left = 675
+  Left = 526
   Height = 447
-  Top = 668
+  Top = 394
   Width = 782
   Caption = 'Acronym Decoder'
-  ClientHeight = 417
+  ClientHeight = 422
   ClientWidth = 782
   Menu = MainMenu1
@@ -14 +14 @@
   OnHide = FormHide
   OnShow = FormShow
-  LCLVersion = '1.6.0.4'
+  LCLVersion = '1.6.2.0'
   object PanelMain: TPanel
     Left = 0
-    Height = 361
+    Height = 366
     Top = 56
     Width = 782
     Align = alClient
     BevelOuter = bvNone
-    ClientHeight = 361
+    ClientHeight = 366
     ClientWidth = 782
     TabOrder = 1
@@ -35 +35 @@
     object ListViewAcronyms: TListView
       Left = 8
-      Height = 319
+      Height = 324
       Top = 35
       Width = 767
@@ -148 +148 @@
       Left = 258
       Top = 2
-      Action = AFilterExactMatch
+      Action = AFilterSameLength
       Style = tbsCheck
     end
@@ -154 +154 @@
       Left = 281
       Top = 2
-      Action = AFilterCaseSensitive
+      Action = AFilterSameLetterCase
       Style = tbsCheck
     end
@@ -168 +168 @@
     ClientWidth = 782
     TabOrder = 2
-    object CheckBoxExactMatch: TCheckBox
+    object CheckBoxExactLength: TCheckBox
       Left = 8
-      Height = 29
+      Height = 24
       Top = 3
-      Width = 124
-      Action = AFilterExactMatch
+      Width = 107
+      Action = AFilterSameLength
       TabOrder = 0
     end
     object CheckBoxCaseSensitive: TCheckBox
-      Left = 216
-      Height = 29
+      Left = 160
+      Height = 24
       Top = 3
-      Width = 139
-      Action = AFilterCaseSensitive
+      Width = 133
+      Action = AFilterSameLetterCase
       TabOrder = 1
     end
@@ -280 +280 @@
       OnExecute = AExportExecute
     end
-    object AFilterExactMatch: TAction
+    object AFilterSameLength: TAction
       AutoCheck = True
-      Caption = 'Exact match'
+      Caption = 'Same length'
       ImageIndex = 18
-      OnExecute = AFilterExactMatchExecute
-    end
-    object AFilterCaseSensitive: TAction
+      OnExecute = AFilterSameLengthExecute
+    end
+    object AFilterSameLetterCase: TAction
       AutoCheck = True
-      Caption = 'Case sensitive'
+      Caption = 'Same letter case'
       ImageIndex = 17
-      OnExecute = AFilterCaseSensitiveExecute
+      OnExecute = AFilterSameLetterCaseExecute
     end
   end

trunk/Forms/UFormMain.lrt

@@ -4 +4 @@
 TFORMMAIN.LISTVIEWACRONYMS.COLUMNS[2].CAPTION=Categories
 TFORMMAIN.TOOLBAR1.CAPTION=ToolBar1
-TFORMMAIN.TOOLBUTTON8.CAPTION=ToolButton8
-TFORMMAIN.TOOLBUTTON10.CAPTION=ToolButton10
 TFORMMAIN.AEXIT.CAPTION=Exit
 TFORMMAIN.ASHOW.CAPTION=Show
@@ -23 +21 @@
 TFORMMAIN.APROCESSIMPORTS.CAPTION=Process imports
 TFORMMAIN.AEXPORT.CAPTION=Export
-TFORMMAIN.AFILTEREXACTMATCH.CAPTION=Exact match
-TFORMMAIN.AFILTERCASESENSITIVE.CAPTION=Case sensitive
+TFORMMAIN.AFILTERSAMELENGTH.CAPTION=Same length
+TFORMMAIN.AFILTERSAMELETTERCASE.CAPTION=Same letter case
 TFORMMAIN.MENUITEM8.CAPTION=File
 TFORMMAIN.MENUITEMOPENRECENT.CAPTION=Open recent

trunk/Forms/UFormMain.pas

@@ -16 +16 @@
 
   TFormMain = class(TForm)
-    AFilterCaseSensitive: TAction;
-    AFilterExactMatch: TAction;
+    AFilterSameLetterCase: TAction;
+    AFilterSameLength: TAction;
     AHide: TAction;
     AExport: TAction;
@@ -36 +36 @@
     AExit: TAction;
     ActionList1: TActionList;
-    CheckBoxExactMatch: TCheckBox;
+    CheckBoxExactLength: TCheckBox;
     CheckBoxCaseSensitive: TCheckBox;
     LastOpenedList1: TLastOpenedList;
@@ -95 +95 @@
     procedure AFileSaveAsExecute(Sender: TObject);
     procedure AFileSaveExecute(Sender: TObject);
-    procedure AFilterCaseSensitiveExecute(Sender: TObject);
-    procedure AFilterExactMatchExecute(Sender: TObject);
+    procedure AFilterSameLetterCaseExecute(Sender: TObject);
+    procedure AFilterSameLengthExecute(Sender: TObject);
     procedure AHideExecute(Sender: TObject);
     procedure AImportExecute(Sender: TObject);
@@ -286 +286 @@
 end;
 
-procedure TFormMain.AFilterCaseSensitiveExecute(Sender: TObject);
+procedure TFormMain.AFilterSameLetterCaseExecute(Sender: TObject);
 begin
   UpdateAcronymsList;
 end;
 
-procedure TFormMain.AFilterExactMatchExecute(Sender: TObject);
+procedure TFormMain.AFilterSameLengthExecute(Sender: TObject);
 begin
   UpdateAcronymsList;
@@ -509 +509 @@
 function TFormMain.FilterCell(Text1, Text2: string): Boolean;
 begin
-  if not AFilterCaseSensitive.Checked then begin
+  if not AFilterSameLetterCase.Checked then begin
     Text1 := UTF8LowerCase(Text1);
     Text2 := UTF8LowerCase(Text2);
   end;
-  if AFilterExactMatch.Checked then
+  if AFilterSameLength.Checked then
     Result := Text1 = Text2
     else Result := Pos(Text1, Text2) > 0;
@@ -650 +650 @@
     Core.AlwaysOnTop := ReadBoolWithDefault('AlwaysOnTop', False);
     Core.StartMinimizedToTray := ReadBoolWithDefault('StartMinimizedToTray', False);
-    AFilterExactMatch.Checked := ReadBoolWithDefault('ExactMatch', False);
-    AFilterCaseSensitive.Checked := ReadBoolWithDefault('CaseSensitive', False);
+    AFilterSameLength.Checked := ReadBoolWithDefault('SameLength', False);
+    AFilterSameLetterCase.Checked := ReadBoolWithDefault('SameLetterCase', False);
     MenuItemToolbar.Checked := ReadBoolWithDefault('ToolBarVisible', True);
     MenuItemParam.Checked := ReadBoolWithDefault('FilterParamVisible', True);
@@ -682 +682 @@
     WriteBool('AlwaysOnTop', Core.AlwaysOnTop);
     WriteBool('StartMinimizedToTray', Core.StartMinimizedToTray);
-    WriteBool('ExactMatch', AFilterExactMatch.Checked);
-    WriteBool('CaseSensitive', AFilterCaseSensitive.Checked);
+    WriteBool('SameLength', AFilterSameLength.Checked);
+    WriteBool('SameLetterCase', AFilterSameLetterCase.Checked);
     WriteBool('ToolBarVisible', MenuItemToolbar.Checked);
     WriteBool('FilterParamVisible', MenuItemParam.Checked);

trunk/Install/win/AcronymDecoder.iss

@@ -10 +10 @@
 #define MyAppExeName "AcronymDecoder.exe"
 #define MyAppDebugName "AcronymDecoder.dbg"
-#define MyAppSubDir ".."
+#define MyAppSubDir "../.."
 
 [Setup]

trunk/Languages/AcronymDecoder.cs.po

@@ -10 +10 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Language: cs\n"
-"X-Generator: Poedit 1.8.9\n"
+"X-Generator: Poedit 1.8.8\n"
 
 #: tformabout.buttonclose.caption
@@ -527 +527 @@
 msgstr "Uložit jako..."
 
-#: tformmain.afiltercasesensitive.caption
-msgctxt "tformmain.afiltercasesensitive.caption"
-msgid "Case sensitive"
-msgstr "Velikosti písmen"
-
-#: tformmain.afilterexactmatch.caption
-msgctxt "tformmain.afilterexactmatch.caption"
-msgid "Exact match"
-msgstr "Odpovídá přesně"
+#: tformmain.afiltersamelength.caption
+msgid "Same length"
+msgstr "Stejná délka"
+
+#: tformmain.afiltersamelettercase.caption
+msgid "Same letter case"
+msgstr "Stejná velikost písmen"
 
 #: tformmain.ahide.caption
@@ -647 +645 @@
 msgstr "ToolBar1"
 
-#: tformmain.toolbutton10.caption
-msgid "ToolButton10"
-msgstr "ToolButton10"
-
-#: tformmain.toolbutton8.caption
-msgid "ToolButton8"
-msgstr "ToolButton8"
-
 #: tformsettings.buttoncancel.caption
 msgctxt "tformsettings.buttoncancel.caption"

trunk/Languages/AcronymDecoder.po

@@ -517 +517 @@
 msgstr ""
 
-#: tformmain.afiltercasesensitive.caption
-msgctxt "TFORMMAIN.AFILTERCASESENSITIVE.CAPTION"
-msgid "Case sensitive"
-msgstr ""
-
-#: tformmain.afilterexactmatch.caption
-msgctxt "TFORMMAIN.AFILTEREXACTMATCH.CAPTION"
-msgid "Exact match"
+#: tformmain.afiltersamelength.caption
+msgid "Same length"
+msgstr ""
+
+#: tformmain.afiltersamelettercase.caption
+msgid "Same letter case"
 msgstr ""
 
@@ -637 +635 @@
 msgstr ""
 
-#: tformmain.toolbutton10.caption
-msgid "ToolButton10"
-msgstr ""
-
-#: tformmain.toolbutton8.caption
-msgid "ToolButton8"
-msgstr ""
-
 #: tformsettings.buttoncancel.caption
 msgctxt "tformsettings.buttoncancel.caption"