Changeset 50
- Timestamp:
- Jul 25, 2016, 5:07:25 PM (8 years ago)
- Location:
- trunk
- Files:
-
- 11 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/Forms/UFormAbout.lfm
r43 r50 1 1 object FormAbout: TFormAbout 2 Left = 56 12 Left = 562 3 3 Height = 397 4 Top = 27 64 Top = 277 5 5 Width = 473 6 6 Caption = 'About' -
trunk/Forms/UFormAcronyms.lfm
r45 r50 1 1 object FormAcronyms: TFormAcronyms 2 Left = 42 42 Left = 426 3 3 Height = 558 4 Top = 3104 Top = 184 5 5 Width = 740 6 6 Caption = 'Acronyms' … … 8 8 ClientWidth = 740 9 9 OnShow = FormShow 10 LCLVersion = '1. 7'10 LCLVersion = '1.6.0.4' 11 11 object ListViewAcronyms: TListView 12 12 Left = 8 … … 21 21 end 22 22 item 23 Caption = ' Meaning'23 Caption = 'Description' 24 24 Width = 300 25 25 end -
trunk/Forms/UFormAcronyms.lrt
r45 r50 1 1 TFORMACRONYMS.CAPTION=Acronyms 2 2 TFORMACRONYMS.LISTVIEWACRONYMS.COLUMNS[0].CAPTION=Name 3 TFORMACRONYMS.LISTVIEWACRONYMS.COLUMNS[1].CAPTION= Meaning3 TFORMACRONYMS.LISTVIEWACRONYMS.COLUMNS[1].CAPTION=Description 4 4 TFORMACRONYMS.LISTVIEWACRONYMS.COLUMNS[2].CAPTION=Categories 5 5 TFORMACRONYMS.AADD.CAPTION=Add -
trunk/Forms/UFormImportFormat.lfm
r47 r50 1 1 object FormImportFormat: TFormImportFormat 2 Left = 46 12 Left = 462 3 3 Height = 433 4 Top = 32 14 Top = 322 5 5 Width = 664 6 6 Caption = 'Import format' -
trunk/Forms/UFormImportSource.lfm
r46 r50 1 1 object FormImportSource: TFormImportSource 2 Left = 49 22 Left = 493 3 3 Height = 444 4 Top = 31 34 Top = 315 5 5 Width = 604 6 6 Caption = 'Import source' -
trunk/Forms/UFormImportSources.lfm
r39 r50 1 1 object FormImportSources: TFormImportSources 2 Left = 47 32 Left = 475 3 3 Height = 414 4 Top = 32 74 Top = 329 5 5 Width = 812 6 6 Caption = 'Import sources' -
trunk/Forms/UFormMain.lfm
r45 r50 1 1 object FormMain: TFormMain 2 Left = 42 72 Left = 429 3 3 Height = 446 4 Top = 4234 Top = 342 5 5 Width = 631 6 6 Caption = 'Acronym Decoder' 7 ClientHeight = 4 147 ClientHeight = 421 8 8 ClientWidth = 631 9 9 Menu = MainMenu1 … … 13 13 OnDestroy = FormDestroy 14 14 OnShow = FormShow 15 LCLVersion = '1. 7'15 LCLVersion = '1.6.0.4' 16 16 object Panel1: TPanel 17 17 Left = 0 18 Height = 3 8818 Height = 395 19 19 Top = 26 20 20 Width = 631 21 21 Align = alClient 22 22 BevelOuter = bvNone 23 ClientHeight = 3 8823 ClientHeight = 395 24 24 ClientWidth = 631 25 25 TabOrder = 0 26 26 object CheckBoxExactMath: TCheckBox 27 27 Left = 8 28 Height = 2 828 Height = 24 29 29 Top = 3 30 Width = 1 2930 Width = 104 31 31 Caption = 'Exact match' 32 32 OnChange = CheckBoxExactMathChange … … 43 43 object ListViewAcronyms: TListView 44 44 Left = 8 45 Height = 3 1645 Height = 323 46 46 Top = 64 47 47 Width = 616 -
trunk/Forms/UFormMain.pas
r45 r50 139 139 resourcestring 140 140 SAddedCount = 'Imported %d acronyms'; 141 SProcessImportSources = 'Process import sources'; 141 142 142 143 … … 274 275 begin 275 276 ImportTotalItemCount := 0; 276 JobProgressView1.AddJob( 'Process import sources', ProcessImportsJob);277 JobProgressView1.AddJob(SProcessImportSources, ProcessImportsJob); 277 278 JobProgressView1.Start; 278 279 ShowMessage(Format(SAddedCount, [ImportTotalItemCount])); -
trunk/Languages/AcronymDecoder.cs.po
r46 r50 10 10 "Content-Transfer-Encoding: 8bit\n" 11 11 "Language: cs\n" 12 "X-Generator: Poedit 1.8. 7.1\n"12 "X-Generator: Poedit 1.8.8\n" 13 13 14 14 #: tformabout.buttonclose.caption … … 115 115 #: tformacronyms.listviewacronyms.columns[1].caption 116 116 msgctxt "tformacronyms.listviewacronyms.columns[1].caption" 117 msgid " Meaning"118 msgstr " Význam"117 msgid "Description" 118 msgstr "Popis" 119 119 120 120 #: tformacronyms.listviewacronyms.columns[2].caption … … 608 608 msgstr "Žádný" 609 609 610 #: uacronym.sremoveonstart 611 msgid "Remove on start" 612 msgstr "Odebrat při startu" 613 610 614 #: uacronym.sskip 611 615 msgid "Skip" 612 616 msgstr "Přeskočit" 617 618 #: uacronym.sunsupportedauthmethod 619 msgid "Unsupported HTTP authorization method" 620 msgstr "Nepodporovaná metoda HTTP autorizace" 613 621 614 622 #: uacronym.sunsupportedimportformat … … 766 774 msgstr "upraveno" 767 775 776 #: uformmain.sprocessimportsources 777 msgid "Process import sources" 778 msgstr "Zpracovat zdroje importu" -
trunk/Languages/AcronymDecoder.po
r46 r50 105 105 #: tformacronyms.listviewacronyms.columns[1].caption 106 106 msgctxt "TFORMACRONYMS.LISTVIEWACRONYMS.COLUMNS[1].CAPTION" 107 msgid " Meaning"107 msgid "Description" 108 108 msgstr "" 109 109 … … 598 598 msgstr "" 599 599 600 #: uacronym.sremoveonstart 601 msgid "Remove on start" 602 msgstr "" 603 600 604 #: uacronym.sskip 601 605 msgid "Skip" 606 msgstr "" 607 608 #: uacronym.sunsupportedauthmethod 609 msgid "Unsupported HTTP authorization method" 602 610 msgstr "" 603 611 … … 756 764 msgstr "" 757 765 766 #: uformmain.sprocessimportsources 767 msgid "Process import sources" 768 msgstr "" 769 -
trunk/UAcronym.pas
r47 r50 115 115 end; 116 116 117 TImportPatternFlag = (ipfNone, ipfNewItem, ipfSkip );117 TImportPatternFlag = (ipfNone, ipfNewItem, ipfSkip, ipfRemove); 118 118 TImportVariable = (ivNone, ivAcronym, ivMeaning, ivDescription); 119 119 … … 247 247 SNewItem = 'New item'; 248 248 SSkip = 'Skip'; 249 SRemoveOnStart = 'Remove on start'; 250 SUnsupportedAuthMethod = 'Unsupported HTTP authorization method'; 249 251 250 252 … … 258 260 ImportPatternFlagString[ipfNewItem] := SNewItem; 259 261 ImportPatternFlagString[ipfSkip] := SSkip; 262 ImportPatternFlagString[ipfRemove] := SRemoveOnStart; 260 263 end; 261 264 … … 393 396 var 394 397 H: string; 395 P: Integer;396 398 begin 397 399 with TFPHttpClient(Sender) do begin … … 400 402 401 403 if H <> 'Basic' then 402 raise Exception.Create( 'Unsupported HTTP authorization method');404 raise Exception.Create(SUnsupportedAuthMethod); 403 405 404 406 if (Self.UserName <> '') and (UserName = '') then begin … … 440 442 441 443 // Remove unneeded items 442 {repeat444 repeat 443 445 LastLength := Length(S); 444 446 for I := 0 to Format.ItemPatterns.Count - 1 do 445 447 with TImportPattern(Format.ItemPatterns[I]) do 446 if Flag = ipf Skipthen begin448 if Flag = ipfRemove then begin 447 449 P := Pos(StartString, S); 448 450 if P > 0 then begin … … 455 457 end; 456 458 until Length(S) = LastLength; 457 } 459 458 460 // Find items 459 461 repeat … … 462 464 while I < Format.ItemPatterns.Count do 463 465 with TImportPattern(Format.ItemPatterns[I]) do begin 464 if Flag <> ipf Skipthen begin466 if Flag <> ipfRemove then begin 465 467 if Length(StartString) > 0 then begin 466 468 P := Pos(StartString, S); … … 470 472 if ((Length(StartString) > 0) and (P > 0)) or (Length(StartString) = 0) then begin 471 473 P := Pos(EndString, S); 472 T := StripHTML(Copy(S, 1, P - 1)); 473 T := StringReplace(T, '"', '"', [rfReplaceAll]); 474 T := StringReplace(T, '™', 'TM', [rfReplaceAll]); 475 T := StringReplace(T, '&', '&', [rfReplaceAll]); 476 T := StringReplace(T, ' ', ' ', [rfReplaceAll]); // No break space 477 T := Trim(T); 478 case Variable of 479 ivAcronym: NewAcronym.Name := T; 480 ivMeaning: NewAcronym.Meaning := T; 481 ivDescription: NewAcronym.Description := T; 474 T := Copy(S, 1, P - 1); 475 if Flag <> ipfSkip then begin 476 T := StripHTML(T); 477 T := StringReplace(T, '"', '"', [rfReplaceAll]); 478 T := StringReplace(T, '™', 'TM', [rfReplaceAll]); 479 T := StringReplace(T, '&', '&', [rfReplaceAll]); 480 T := StringReplace(T, ' ', ' ', [rfReplaceAll]); // No break space 481 T := Trim(T); 482 case Variable of 483 ivAcronym: NewAcronym.Name := T; 484 ivMeaning: NewAcronym.Meaning := T; 485 ivDescription: NewAcronym.Description := T; 486 end; 482 487 end; 483 488 Delete(S, 1, P + Length(EndString) - 1);
Note:
See TracChangeset
for help on using the changeset viewer.