Changeset 69
- Timestamp:
- Aug 1, 2016, 12:43:49 PM (8 years ago)
- Location:
- trunk
- Files:
-
- 14 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/Example acronyms.adp
r66 r69 36623 36623 <Category> 36624 36624 <Id>4</Id> 36625 </Category> 36626 </Categories> 36627 </Meaning> 36628 </Meanings> 36629 </Acronym> 36630 <Acronym> 36631 <Name>n0rp</Name> 36632 <Meanings> 36633 <Meaning> 36634 <Name>Alternate form of pr0n, intentional misspelling of porn</Name> 36635 <Description/> 36636 <Language/> 36637 <Categories> 36638 <Category> 36639 <Id>6</Id> 36640 </Category> 36641 </Categories> 36642 </Meaning> 36643 </Meanings> 36644 </Acronym> 36645 <Acronym> 36646 <Name>namewaster</Name> 36647 <Meanings> 36648 <Meaning> 36649 <Name>person who abandons an account shortly after its creation</Name> 36650 <Description/> 36651 <Language/> 36652 <Categories> 36653 <Category> 36654 <Id>6</Id> 36625 36655 </Category> 36626 36656 </Categories> … … 37161 37191 <Enabled>-1</Enabled> 37162 37192 <ItemCount>150</ItemCount> 37163 <LastImportTime>2016-0 7-28T11:17:50.848+02:00</LastImportTime>37193 <LastImportTime>2016-08-01T12:38:42.584+02:00</LastImportTime> 37164 37194 <UserName/> 37165 37195 <Categories> … … 37175 37205 <Enabled>-1</Enabled> 37176 37206 <ItemCount>74</ItemCount> 37177 <LastImportTime>2016-0 7-28T11:17:52.362+02:00</LastImportTime>37207 <LastImportTime>2016-08-01T12:38:45.016+02:00</LastImportTime> 37178 37208 <UserName/> 37179 37209 <Categories> … … 37189 37219 <Enabled>-1</Enabled> 37190 37220 <ItemCount>733</ItemCount> 37191 <LastImportTime>2016-0 7-28T11:17:54.015+02:00</LastImportTime>37221 <LastImportTime>2016-08-01T12:38:46.946+02:00</LastImportTime> 37192 37222 <UserName/> 37193 37223 <Categories> … … 37203 37233 <Enabled>-1</Enabled> 37204 37234 <ItemCount>1336</ItemCount> 37205 <LastImportTime>2016-0 7-28T11:17:55.794+02:00</LastImportTime>37235 <LastImportTime>2016-08-01T12:38:49.197+02:00</LastImportTime> 37206 37236 <UserName/> 37207 37237 <Categories> … … 37216 37246 <ImportFormat>4</ImportFormat> 37217 37247 <Enabled>-1</Enabled> 37218 <ItemCount>29 3</ItemCount>37219 <LastImportTime>2016-0 7-28T11:17:57.120+02:00</LastImportTime>37248 <ItemCount>294</ItemCount> 37249 <LastImportTime>2016-08-01T12:38:50.701+02:00</LastImportTime> 37220 37250 <UserName/> 37221 37251 <Categories> -
trunk/Forms/UFormAbout.lfm
r65 r69 9 9 OnCreate = FormCreate 10 10 OnShow = FormShow 11 Position = poScreenCenter 11 12 LCLVersion = '1.6.0.4' 12 13 object LabelAppName: TLabel -
trunk/Forms/UFormAcronym.lfm
r55 r69 10 10 OnKeyUp = FormKeyUp 11 11 OnShow = FormShow 12 Position = poScreenCenter 12 13 LCLVersion = '1.6.0.4' 13 14 object Label1: TLabel -
trunk/Forms/UFormAcronyms.lfm
r55 r69 9 9 OnCreate = FormCreate 10 10 OnShow = FormShow 11 Position = poScreenCenter 11 12 LCLVersion = '1.6.0.4' 12 13 object ListViewAcronyms: TListView -
trunk/Forms/UFormCategories.lfm
r51 r69 9 9 OnCreate = FormCreate 10 10 OnShow = FormShow 11 Position = poScreenCenter 11 12 LCLVersion = '1.6.0.4' 12 13 object ListViewCategories: TListView -
trunk/Forms/UFormCategorySelect.lfm
r55 r69 1 1 object FormCategorySelect: TFormCategorySelect 2 Left = 7862 Left = 500 3 3 Height = 602 4 Top = 3704 Top = 253 5 5 Width = 794 6 6 Caption = 'Select categories' … … 8 8 ClientWidth = 794 9 9 OnShow = FormShow 10 Position = poScreenCenter 10 11 LCLVersion = '1.6.0.4' 11 12 object ListBox1: TListBox -
trunk/Forms/UFormImportFormat.lfm
r55 r69 9 9 OnCreate = FormCreate 10 10 OnShow = FormShow 11 Position = poScreenCenter 11 12 LCLVersion = '1.6.0.4' 12 13 object ButtonOk: TButton -
trunk/Forms/UFormImportFormats.lfm
r51 r69 9 9 OnCreate = FormCreate 10 10 OnShow = FormShow 11 Position = poScreenCenter 11 12 LCLVersion = '1.6.0.4' 12 13 object ListView1: TListView -
trunk/Forms/UFormImportPattern.lfm
r55 r69 9 9 OnCreate = FormCreate 10 10 OnShow = FormShow 11 Position = poScreenCenter 11 12 LCLVersion = '1.6.0.4' 12 13 object Label8: TLabel -
trunk/Forms/UFormImportSource.lfm
r55 r69 8 8 ClientWidth = 604 9 9 OnShow = FormShow 10 Position = poScreenCenter 10 11 LCLVersion = '1.6.0.4' 11 12 object EditName: TEdit -
trunk/Forms/UFormImportSources.lfm
r52 r69 9 9 OnCreate = FormCreate 10 10 OnShow = FormShow 11 Position = poScreenCenter 11 12 LCLVersion = '1.6.0.4' 12 13 object ListView1: TListView -
trunk/Forms/UFormMain.pas
r64 r69 124 124 ProjectClosed: Boolean; 125 125 ImportTotalItemCount: Integer; 126 procedure ProjectOpen(FileName: string); 126 127 procedure Initialize; 127 128 procedure ProcessImportsJob(Job: TJob); … … 244 245 OpenDialog1.FileName := AcronymDb.FileName; 245 246 if OpenDialog1.Execute then begin 246 AFileClose.Execute; 247 if ProjectClosed then begin 248 AFileNew.Execute; 249 AcronymDb.LoadFromFile(OpenDialog1.FileName); 250 LastOpenedList1.AddItem(OpenDialog1.FileName); 251 UpdateAcronymsList; 252 UpdateInterface; 253 end; 247 ProjectOpen(OpenDialog1.FileName); 254 248 end; 255 249 end; … … 441 435 end; 442 436 437 procedure TFormMain.ProjectOpen(FileName: string); 438 begin 439 AFileClose.Execute; 440 if ProjectClosed then begin 441 try 442 AFileNew.Execute; 443 AcronymDb.LoadFromFile(FileName); 444 LastOpenedList1.AddItem(FileName); 445 finally 446 UpdateAcronymsList; 447 UpdateInterface; 448 end; 449 end; 450 end; 451 443 452 procedure TFormMain.Initialize; 444 453 begin … … 448 457 449 458 if ParamCount > 0 then begin 459 // Open file specified as command line parameter 450 460 AcronymDB.LoadFromFile(ParamStr(1)); 451 461 LastOpenedList1.AddItem(OpenDialog1.FileName); 452 462 end else 453 if (LastOpenedList1.Items.Count > 0) and FileExists(LastOpenedList1.Items[0]) then 454 AcronymDB.LoadFromFile(LastOpenedList1.Items[0]); 463 if (LastOpenedList1.Items.Count > 0) and FileExists(LastOpenedList1.Items[0]) then begin 464 // Open last opened file 465 AcronymDB.LoadFromFile(LastOpenedList1.Items[0]) 466 end else begin 467 // Open default database with examples if no item is in recent openned history 468 ProjectOpen(ExtractFileDir(Application.ExeName) + DirectorySeparator + 'Example Acronyms.adp'); 469 end; 455 470 UpdateAcronymsList; 456 471 ListViewFilter1.UpdateFromListView(ListViewAcronyms); … … 564 579 RegistryContext := RegContext(HKEY_CURRENT_USER, DefaultRegKey); 565 580 PersistentForm1.RegistryContext := RegistryContext; 581 RegistryContext := RegContext(HKEY_CURRENT_USER, DefaultRegKey + '\RecentFiles'); 566 582 LastOpenedList1.LoadFromRegistry(RegistryContext); 567 583 … … 583 599 procedure TFormMain.SaveConfig; 584 600 begin 601 RegistryContext := RegContext(HKEY_CURRENT_USER, DefaultRegKey + '\RecentFiles'); 585 602 LastOpenedList1.SaveToRegistry(RegistryContext); 586 603 -
trunk/Forms/UFormSettings.lfm
r55 r69 8 8 ClientWidth = 689 9 9 OnShow = FormShow 10 Position = poScreenCenter 10 11 LCLVersion = '1.6.0.4' 11 12 object ComboBoxLanguage: TComboBox -
trunk/UAcronym.pas
r67 r69 430 430 AddedAcronym: TAcronymMeaning; 431 431 begin 432 ItemCount := 0;433 432 NewAcronym := TAcronymEntry.Create; 434 433 try … … 550 549 procedure TImportSource.Process; 551 550 begin 551 ItemCount := 0; 552 552 case Format.Kind of 553 553 ifkParseURL: ProcessTextParseURL;
Note:
See TracChangeset
for help on using the changeset viewer.