Changeset 28 for trunk/Forms


Ignore:
Timestamp:
Jul 12, 2016, 4:28:22 PM (9 years ago)
Author:
chronos
Message:
  • Added: Import format items can be repetitive.
  • Added: Show total count of imported items.
  • Added: Button for direct open of import format definition from import source window.
Location:
trunk/Forms
Files:
12 edited

Legend:

Unmodified
Added
Removed

  • trunk/Forms/UFormAbout.lfm

    r23 r28  
    11object FormAbout: TFormAbout
    2   Left = 866
     2  Left = 561
    33  Height = 397
    4   Top = 623
     4  Top = 276
    55  Width = 473
    66  Caption = 'About'
    … …  
    1212  object LabelAppName: TLabel
    1313    Left = 20
    14     Height = 55
     14    Height = 54
    1515    Top = 20
    1616    Width = 433
    … …  
    2424  object LabelDescription: TLabel
    2525    Left = 20
    26     Height = 48
    27     Top = 95
     26    Height = 40
     27    Top = 94
    2828    Width = 433
    2929    Align = alTop
    … …  
    4545  object LabelContent: TLabel
    4646    Left = 20
    47     Height = 24
    48     Top = 163
     47    Height = 20
     48    Top = 154
    4949    Width = 433
    5050    Align = alTop
    … …  
    7373    EmailContact = 'robie@centrum.cz'
    7474    AppName = 'Acronym Decoder'
    75     ReleaseDate = 42494
     75    ReleaseDate = 42563
    7676    RegistryKey = '\Software\'
    7777    RegistryRoot = rrKeyCurrentUser

  • trunk/Forms/UFormImportFormat.lfm

    r27 r28  
    11object FormImportFormat: TFormImportFormat
    2   Left = 514
     2  Left = 461
    33  Height = 433
    4   Top = 316
     4  Top = 321
    55  Width = 664
    66  Caption = 'Import format'
    77  ClientHeight = 433
    88  ClientWidth = 664
     9  OnCreate = FormCreate
    910  OnShow = FormShow
    1011  LCLVersion = '1.6.0.4'
    … …  
    99100        Caption = 'Variable'
    100101        Width = 100
     102      end   
     103      item
     104        Caption = 'Repetition'
     105        Width = 100
    101106      end>
    102107    OwnerData = True

  • trunk/Forms/UFormImportFormat.lrt

    r27 r28  
    99TFORMIMPORTFORMAT.LISTVIEWITEMRULES.COLUMNS[2].CAPTION=Action
    1010TFORMIMPORTFORMAT.LISTVIEWITEMRULES.COLUMNS[3].CAPTION=Variable
     11TFORMIMPORTFORMAT.LISTVIEWITEMRULES.COLUMNS[4].CAPTION=Repetition
    1112TFORMIMPORTFORMAT.LABEL2.CAPTION=Item rules:
    1213TFORMIMPORTFORMAT.AADD.CAPTION=Add

  • trunk/Forms/UFormImportFormat.pas

    r27 r28  
    4141    procedure AMoveUpExecute(Sender: TObject);
    4242    procedure ARemoveExecute(Sender: TObject);
     43    procedure FormCreate(Sender: TObject);
    4344    procedure FormShow(Sender: TObject);
    4445    procedure ListViewItemRulesData(Sender: TObject; Item: TListItem);
    … …  
    5455var
    5556  FormImportFormat: TFormImportFormat;
     57  YesNoString: array[Boolean] of string;
    5658
    5759
    … …  
    6668  SRemoveImportPattern = 'Remove import pattern';
    6769  SRemoveImportPatternQuery = 'Do you really want to remove selected import patterns?';
     70  SYes = 'Yes';
     71  SNo = 'No';
    6872
    6973
    … …  
    135139end;
    136140
     141procedure TFormImportFormat.FormCreate(Sender: TObject);
     142begin
     143  YesNoString[False] := SNo;
     144  YesNoString[True] := SYes;
     145end;
     146
    137147procedure TFormImportFormat.FormShow(Sender: TObject);
    138148begin
    … …  
    149159    Item.SubItems.Add(ImportPatternFlagString[Flag]);
    150160    Item.SubItems.Add(ImportVariableString[Variable]);
     161    Item.SubItems.Add(YesNoString[Repetition]);
    151162    Item.Data := ImportFormat.ItemPatterns[Item.Index];
    152163  end;

  • trunk/Forms/UFormImportPattern.lfm

    r27 r28  
    4747    Top = 384
    4848    Width = 75
     49    Anchors = [akRight, akBottom]
    4950    Caption = 'Cancel'
    5051    ModalResult = 2
    … …  
    5657    Top = 384
    5758    Width = 75
     59    Anchors = [akRight, akBottom]
    5860    Caption = 'Ok'
    5961    ModalResult = 1
    … …  
    99101    TabOrder = 5
    100102  end
     103  object CheckBoxRepetition: TCheckBox
     104    Left = 24
     105    Height = 24
     106    Top = 160
     107    Width = 93
     108    Caption = 'Repetition'
     109    TabOrder = 6
     110  end
    101111end

  • trunk/Forms/UFormImportPattern.lrt

    r27 r28  
    66TFORMIMPORTPATTERN.LABEL10.CAPTION=Action:
    77TFORMIMPORTPATTERN.LABEL11.CAPTION=Variable:
     8TFORMIMPORTPATTERN.CHECKBOXREPETITION.CAPTION=Repetition

  • trunk/Forms/UFormImportPattern.pas

    r27 r28  
    1616    ButtonCancel: TButton;
    1717    ButtonOk: TButton;
     18    CheckBoxRepetition: TCheckBox;
    1819    ComboBoxAction: TComboBox;
    1920    ComboBoxVariable: TComboBox;
    … …  
    7879  Pattern.Variable := TImportVariable(ComboBoxVariable.ItemIndex);
    7980  Pattern.Flag := TImportPatternFlag(ComboBoxAction.ItemIndex);
     81  Pattern.Repetition := CheckBoxRepetition.Checked;
    8082end;
    8183
    … …  
    8688  ComboBoxVariable.ItemIndex := Integer(Pattern.Variable);
    8789  ComboBoxAction.ItemIndex := Integer(Pattern.Flag);
     90  CheckBoxRepetition.Checked := Pattern.Repetition;
    8891end;
    8992

  • trunk/Forms/UFormImportSource.lfm

    r22 r28  
    1010  object EditName: TEdit
    1111    Left = 160
    12     Height = 34
     12    Height = 28
    1313    Top = 10
    1414    Width = 432
    … …  
    1818  object Label1: TLabel
    1919    Left = 10
    20     Height = 24
     20    Height = 20
    2121    Top = 9
    22     Width = 56
     22    Width = 43
    2323    Caption = 'Name:'
    2424    ParentColor = False
    … …  
    2626  object Label2: TLabel
    2727    Left = 8
    28     Height = 24
     28    Height = 20
    2929    Top = 48
    30     Width = 101
     30    Width = 78
    3131    Caption = 'Source URL:'
    3232    ParentColor = False
    … …  
    3434  object EditURL: TEdit
    3535    Left = 160
    36     Height = 34
     36    Height = 28
    3737    Top = 49
    3838    Width = 432
    … …  
    6262  object Label3: TLabel
    6363    Left = 11
    64     Height = 24
     64    Height = 20
    6565    Top = 96
    66     Width = 108
     66    Width = 84
    6767    Caption = 'Data format:'
    6868    ParentColor = False
    … …  
    7070  object ComboBox1: TComboBox
    7171    Left = 160
    72     Height = 36
     72    Height = 28
    7373    Top = 91
    74     Width = 432
     74    Width = 304
    7575    Anchors = [akTop, akLeft, akRight]
    76     ItemHeight = 0
     76    ItemHeight = 20
    7777    Style = csDropDownList
    7878    TabOrder = 4
    7979  end
     80  object ButtonShowFormat: TButton
     81    Left = 472
     82    Height = 25
     83    Top = 91
     84    Width = 120
     85    Anchors = [akTop, akRight]
     86    Caption = 'Configure'
     87    OnClick = ButtonShowFormatClick
     88    TabOrder = 5
     89  end
    8090end

  • trunk/Forms/UFormImportSource.lrt

    r22 r28  
    55TFORMIMPORTSOURCE.BUTTONCANCEL.CAPTION=Cancel
    66TFORMIMPORTSOURCE.LABEL3.CAPTION=Data format:
     7TFORMIMPORTSOURCE.BUTTONSHOWFORMAT.CAPTION=Configure

  • trunk/Forms/UFormImportSource.pas

    r22 r28  
    1414
    1515  TFormImportSource = class(TForm)
     16    ButtonShowFormat: TButton;
    1617    ButtonOk: TButton;
    1718    ButtonCancel: TButton;
    … …  
    2223    Label2: TLabel;
    2324    Label3: TLabel;
     25    procedure ButtonShowFormatClick(Sender: TObject);
    2426  private
    2527    { private declarations }
    … …  
    3739
    3840uses
    39   UFormMain;
     41  UFormMain, UFormImportFormat;
    4042
    4143{ TFormImportSource }
     44
     45procedure TFormImportSource.ButtonShowFormatClick(Sender: TObject);
     46var
     47  NewImportFormat: TImportFormat;
     48begin
     49  if ComboBox1.ItemIndex <> -1 then begin
     50    NewImportFormat := TImportFormat.Create;
     51    NewImportFormat.Assign(TImportFormat(ComboBox1.Items.Objects[ComboBox1.ItemIndex]));
     52    FormImportFormat.Load(NewImportFormat);
     53    if FormImportFormat.ShowModal = mrOk then begin
     54      FormImportFormat.Save(NewImportFormat);
     55      TImportFormat(ComboBox1.Items.Objects[ComboBox1.ItemIndex]).Assign(NewImportFormat);
     56      FormMain.AcronymDb.Modified := True;
     57      ComboBox1.Items.Strings[ComboBox1.ItemIndex] := NewImportFormat.Name;
     58    end;
     59    if Assigned(NewImportFormat) then NewImportFormat.Free;
     60  end;
     61end;
    4262
    4363procedure TFormImportSource.Load(ImportSource: TImportSource);

  • trunk/Forms/UFormImportSources.pas

    r22 r28  
    146146procedure TFormImportSources.AProcessExecute(Sender: TObject);
    147147begin
    148   if Assigned(ListView1.Selected) then
     148  if Assigned(ListView1.Selected) then begin
    149149    TImportSource(ListView1.Selected.Data).Process;
     150    ShowMessage(Format(SAddedCount, [TImportSource(ListView1.Selected.Data).ItemCount]));
     151  end;
    150152end;
    151153

  • trunk/Forms/UFormMain.pas

    r27 r28  
    119119  FormMain: TFormMain;
    120120
     121resourcestring
     122  SAddedCount = 'Imported %d acronyms';
     123
     124
    121125implementation
    122126
    … …  
    252256var
    253257  I: Integer;
    254 begin
    255   for I := 0 to AcronymDb.ImportSources.Count - 1 do
     258  TotalItemCount: Integer;
     259begin
     260  TotalItemCount := 0;
     261  for I := 0 to AcronymDb.ImportSources.Count - 1 do begin
    256262    TImportSource(AcronymDb.ImportSources[I]).Process;
     263    TotalItemCount := TotalItemCount + TImportSource(AcronymDb.ImportSources[I]).ItemCount;
     264  end;
     265  ShowMessage(Format(SAddedCount, [TotalItemCount]));
    257266  UpdateAcronymsList;
    258267  UpdateInterface;
Note: See TracChangeset for help on using the changeset viewer.