Changeset 138


Ignore:
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:
6 edited

Legend:

Unmodified
Added
Removed
  • trunk/Forms/UFormMain.lfm

    r134 r138  
    11object FormMain: TFormMain
    2   Left = 675
     2  Left = 526
    33  Height = 447
    4   Top = 668
     4  Top = 394
    55  Width = 782
    66  Caption = 'Acronym Decoder'
    7   ClientHeight = 417
     7  ClientHeight = 422
    88  ClientWidth = 782
    99  Menu = MainMenu1
     
    1414  OnHide = FormHide
    1515  OnShow = FormShow
    16   LCLVersion = '1.6.0.4'
     16  LCLVersion = '1.6.2.0'
    1717  object PanelMain: TPanel
    1818    Left = 0
    19     Height = 361
     19    Height = 366
    2020    Top = 56
    2121    Width = 782
    2222    Align = alClient
    2323    BevelOuter = bvNone
    24     ClientHeight = 361
     24    ClientHeight = 366
    2525    ClientWidth = 782
    2626    TabOrder = 1
     
    3535    object ListViewAcronyms: TListView
    3636      Left = 8
    37       Height = 319
     37      Height = 324
    3838      Top = 35
    3939      Width = 767
     
    148148      Left = 258
    149149      Top = 2
    150       Action = AFilterExactMatch
     150      Action = AFilterSameLength
    151151      Style = tbsCheck
    152152    end
     
    154154      Left = 281
    155155      Top = 2
    156       Action = AFilterCaseSensitive
     156      Action = AFilterSameLetterCase
    157157      Style = tbsCheck
    158158    end
     
    168168    ClientWidth = 782
    169169    TabOrder = 2
    170     object CheckBoxExactMatch: TCheckBox
     170    object CheckBoxExactLength: TCheckBox
    171171      Left = 8
    172       Height = 29
     172      Height = 24
    173173      Top = 3
    174       Width = 124
    175       Action = AFilterExactMatch
     174      Width = 107
     175      Action = AFilterSameLength
    176176      TabOrder = 0
    177177    end
    178178    object CheckBoxCaseSensitive: TCheckBox
    179       Left = 216
    180       Height = 29
     179      Left = 160
     180      Height = 24
    181181      Top = 3
    182       Width = 139
    183       Action = AFilterCaseSensitive
     182      Width = 133
     183      Action = AFilterSameLetterCase
    184184      TabOrder = 1
    185185    end
     
    280280      OnExecute = AExportExecute
    281281    end
    282     object AFilterExactMatch: TAction
     282    object AFilterSameLength: TAction
    283283      AutoCheck = True
    284       Caption = 'Exact match'
     284      Caption = 'Same length'
    285285      ImageIndex = 18
    286       OnExecute = AFilterExactMatchExecute
    287     end
    288     object AFilterCaseSensitive: TAction
     286      OnExecute = AFilterSameLengthExecute
     287    end
     288    object AFilterSameLetterCase: TAction
    289289      AutoCheck = True
    290       Caption = 'Case sensitive'
     290      Caption = 'Same letter case'
    291291      ImageIndex = 17
    292       OnExecute = AFilterCaseSensitiveExecute
     292      OnExecute = AFilterSameLetterCaseExecute
    293293    end
    294294  end
  • trunk/Forms/UFormMain.lrt

    r122 r138  
    44TFORMMAIN.LISTVIEWACRONYMS.COLUMNS[2].CAPTION=Categories
    55TFORMMAIN.TOOLBAR1.CAPTION=ToolBar1
    6 TFORMMAIN.TOOLBUTTON8.CAPTION=ToolButton8
    7 TFORMMAIN.TOOLBUTTON10.CAPTION=ToolButton10
    86TFORMMAIN.AEXIT.CAPTION=Exit
    97TFORMMAIN.ASHOW.CAPTION=Show
     
    2321TFORMMAIN.APROCESSIMPORTS.CAPTION=Process imports
    2422TFORMMAIN.AEXPORT.CAPTION=Export
    25 TFORMMAIN.AFILTEREXACTMATCH.CAPTION=Exact match
    26 TFORMMAIN.AFILTERCASESENSITIVE.CAPTION=Case sensitive
     23TFORMMAIN.AFILTERSAMELENGTH.CAPTION=Same length
     24TFORMMAIN.AFILTERSAMELETTERCASE.CAPTION=Same letter case
    2725TFORMMAIN.MENUITEM8.CAPTION=File
    2826TFORMMAIN.MENUITEMOPENRECENT.CAPTION=Open recent
  • trunk/Forms/UFormMain.pas

    r124 r138  
    1616
    1717  TFormMain = class(TForm)
    18     AFilterCaseSensitive: TAction;
    19     AFilterExactMatch: TAction;
     18    AFilterSameLetterCase: TAction;
     19    AFilterSameLength: TAction;
    2020    AHide: TAction;
    2121    AExport: TAction;
     
    3636    AExit: TAction;
    3737    ActionList1: TActionList;
    38     CheckBoxExactMatch: TCheckBox;
     38    CheckBoxExactLength: TCheckBox;
    3939    CheckBoxCaseSensitive: TCheckBox;
    4040    LastOpenedList1: TLastOpenedList;
     
    9595    procedure AFileSaveAsExecute(Sender: TObject);
    9696    procedure AFileSaveExecute(Sender: TObject);
    97     procedure AFilterCaseSensitiveExecute(Sender: TObject);
    98     procedure AFilterExactMatchExecute(Sender: TObject);
     97    procedure AFilterSameLetterCaseExecute(Sender: TObject);
     98    procedure AFilterSameLengthExecute(Sender: TObject);
    9999    procedure AHideExecute(Sender: TObject);
    100100    procedure AImportExecute(Sender: TObject);
     
    286286end;
    287287
    288 procedure TFormMain.AFilterCaseSensitiveExecute(Sender: TObject);
     288procedure TFormMain.AFilterSameLetterCaseExecute(Sender: TObject);
    289289begin
    290290  UpdateAcronymsList;
    291291end;
    292292
    293 procedure TFormMain.AFilterExactMatchExecute(Sender: TObject);
     293procedure TFormMain.AFilterSameLengthExecute(Sender: TObject);
    294294begin
    295295  UpdateAcronymsList;
     
    509509function TFormMain.FilterCell(Text1, Text2: string): Boolean;
    510510begin
    511   if not AFilterCaseSensitive.Checked then begin
     511  if not AFilterSameLetterCase.Checked then begin
    512512    Text1 := UTF8LowerCase(Text1);
    513513    Text2 := UTF8LowerCase(Text2);
    514514  end;
    515   if AFilterExactMatch.Checked then
     515  if AFilterSameLength.Checked then
    516516    Result := Text1 = Text2
    517517    else Result := Pos(Text1, Text2) > 0;
     
    650650    Core.AlwaysOnTop := ReadBoolWithDefault('AlwaysOnTop', False);
    651651    Core.StartMinimizedToTray := ReadBoolWithDefault('StartMinimizedToTray', False);
    652     AFilterExactMatch.Checked := ReadBoolWithDefault('ExactMatch', False);
    653     AFilterCaseSensitive.Checked := ReadBoolWithDefault('CaseSensitive', False);
     652    AFilterSameLength.Checked := ReadBoolWithDefault('SameLength', False);
     653    AFilterSameLetterCase.Checked := ReadBoolWithDefault('SameLetterCase', False);
    654654    MenuItemToolbar.Checked := ReadBoolWithDefault('ToolBarVisible', True);
    655655    MenuItemParam.Checked := ReadBoolWithDefault('FilterParamVisible', True);
     
    682682    WriteBool('AlwaysOnTop', Core.AlwaysOnTop);
    683683    WriteBool('StartMinimizedToTray', Core.StartMinimizedToTray);
    684     WriteBool('ExactMatch', AFilterExactMatch.Checked);
    685     WriteBool('CaseSensitive', AFilterCaseSensitive.Checked);
     684    WriteBool('SameLength', AFilterSameLength.Checked);
     685    WriteBool('SameLetterCase', AFilterSameLetterCase.Checked);
    686686    WriteBool('ToolBarVisible', MenuItemToolbar.Checked);
    687687    WriteBool('FilterParamVisible', MenuItemParam.Checked);
  • trunk/Install/win/AcronymDecoder.iss

    r137 r138  
    1010#define MyAppExeName "AcronymDecoder.exe"
    1111#define MyAppDebugName "AcronymDecoder.dbg"
    12 #define MyAppSubDir ".."
     12#define MyAppSubDir "../.."
    1313
    1414[Setup]
  • trunk/Languages/AcronymDecoder.cs.po

    r122 r138  
    1010"Content-Transfer-Encoding: 8bit\n"
    1111"Language: cs\n"
    12 "X-Generator: Poedit 1.8.9\n"
     12"X-Generator: Poedit 1.8.8\n"
    1313
    1414#: tformabout.buttonclose.caption
     
    527527msgstr "Uložit jako..."
    528528
    529 #: tformmain.afiltercasesensitive.caption
    530 msgctxt "tformmain.afiltercasesensitive.caption"
    531 msgid "Case sensitive"
    532 msgstr "Velikosti písmen"
    533 
    534 #: tformmain.afilterexactmatch.caption
    535 msgctxt "tformmain.afilterexactmatch.caption"
    536 msgid "Exact match"
    537 msgstr "Odpovídá přesně"
     529#: tformmain.afiltersamelength.caption
     530msgid "Same length"
     531msgstr "Stejná délka"
     532
     533#: tformmain.afiltersamelettercase.caption
     534msgid "Same letter case"
     535msgstr "Stejná velikost písmen"
    538536
    539537#: tformmain.ahide.caption
     
    647645msgstr "ToolBar1"
    648646
    649 #: tformmain.toolbutton10.caption
    650 msgid "ToolButton10"
    651 msgstr "ToolButton10"
    652 
    653 #: tformmain.toolbutton8.caption
    654 msgid "ToolButton8"
    655 msgstr "ToolButton8"
    656 
    657647#: tformsettings.buttoncancel.caption
    658648msgctxt "tformsettings.buttoncancel.caption"
  • trunk/Languages/AcronymDecoder.po

    r122 r138  
    517517msgstr ""
    518518
    519 #: tformmain.afiltercasesensitive.caption
    520 msgctxt "TFORMMAIN.AFILTERCASESENSITIVE.CAPTION"
    521 msgid "Case sensitive"
    522 msgstr ""
    523 
    524 #: tformmain.afilterexactmatch.caption
    525 msgctxt "TFORMMAIN.AFILTEREXACTMATCH.CAPTION"
    526 msgid "Exact match"
     519#: tformmain.afiltersamelength.caption
     520msgid "Same length"
     521msgstr ""
     522
     523#: tformmain.afiltersamelettercase.caption
     524msgid "Same letter case"
    527525msgstr ""
    528526
     
    637635msgstr ""
    638636
    639 #: tformmain.toolbutton10.caption
    640 msgid "ToolButton10"
    641 msgstr ""
    642 
    643 #: tformmain.toolbutton8.caption
    644 msgid "ToolButton8"
    645 msgstr ""
    646 
    647637#: tformsettings.buttoncancel.caption
    648638msgctxt "tformsettings.buttoncancel.caption"
Note: See TracChangeset for help on using the changeset viewer.