Changeset 14 for trunk/Forms

Timestamp:

Mar 19, 2013, 8:38:28 PM (11 years ago)

Author:

chronos

Message:

• Přidáno: Možnost nastavit si formát jména výstupního souboru.
• Opraveno: Omezení nastavení časového intervalu na povolené hodnoty.

Location:

trunk/Forms

Files:

• UFormAccounts.pas (modified) (5 diffs)
• UFormMain.lfm (modified) (2 diffs)
• UFormMain.pas (modified) (3 diffs)
• UFormSettings.lfm (modified) (6 diffs)
• UFormSettings.lrt (modified) (1 diff)
• UFormSettings.pas (modified) (3 diffs)

trunk/Forms/UFormAccounts.pas

@@ -31 +31 @@
       Selected: Boolean);
   private
-    { private declarations }
+    DisableEditUpdate: Boolean;
   public
     Accounts: TListObject;
@@ -66 +66 @@
   Selected: Boolean);
 begin
+  if Assigned(ListView1.Selected) then begin
+    DisableEditUpdate := True;
+    LabeledEditToken.Text := TAccount(ListView1.Selected.Data).Token;
+    LabeledEditName.Text := TAccount(ListView1.Selected.Data).Name;
+    DisableEditUpdate := False;
+  end;
   UpdateInterface;
 end;
@@ -77 +83 @@
 procedure TFormAccounts.LabeledEditTokenChange(Sender: TObject);
 begin
-  if Assigned(ListView1.Selected) then begin
-    TAccount(ListView1.Selected.Data).Token := LabeledEditToken.Text;
-    TAccount(ListView1.Selected.Data).Name := LabeledEditName.Text;
+  if not DisableEditUpdate then begin
+    if Assigned(ListView1.Selected) then begin
+      TAccount(ListView1.Selected.Data).Token := LabeledEditToken.Text;
+      TAccount(ListView1.Selected.Data).Name := LabeledEditName.Text;
+    end;
+    Reload;
   end;
-  Reload;
 end;
 
@@ -111 +119 @@
   ListView1.Items.Count := Accounts.Count;
   ListView1.Refresh;
+  UpdateInterface;
 end;
 
@@ -116 +125 @@
 begin
   ButtonRemove.Enabled := Assigned(ListView1.Selected);
-  if Assigned(ListView1.Selected) then begin
-    LabeledEditToken.Text := TAccount(ListView1.Selected.Data).Token;
-    LabeledEditName.Text := TAccount(ListView1.Selected.Data).Name;
-  end;
+  LabeledEditToken.Enabled := Assigned(ListView1.Selected);
+  LabeledEditName.Enabled := Assigned(ListView1.Selected);
 end;
 

trunk/Forms/UFormMain.lfm

@@ -66 +66 @@
       Width = 80
       CalendarDisplaySettings = [dsShowHeadings, dsShowDayNames]
+      OnAcceptDate = DateEditStartAcceptDate
       OKCaption = 'OK'
       CancelCaption = 'Cancel'
@@ -81 +82 @@
       Width = 80
       CalendarDisplaySettings = [dsShowHeadings, dsShowDayNames]
+      OnAcceptDate = DateEditToAcceptDate
       OKCaption = 'OK'
       CancelCaption = 'Cancel'

trunk/Forms/UFormMain.pas

@@ -43 +43 @@
     procedure ButtonNewClick(Sender: TObject);
     procedure ComboBoxAccountsChange(Sender: TObject);
+    procedure DateEditStartAcceptDate(Sender: TObject; var ADate: TDateTime;
+      var AcceptDate: Boolean);
+    procedure DateEditToAcceptDate(Sender: TObject; var ADate: TDateTime;
+      var AcceptDate: Boolean);
     procedure FormClose(Sender: TObject; var CloseAction: TCloseAction);
     procedure FormCreate(Sender: TObject);
@@ -82 +86 @@
     else Core.CurrentAccount := nil;
   LoadInterface;
+  Core.SelectedAccountIndex := ComboBoxAccounts.ItemIndex;
+end;
+
+procedure TFormMain.DateEditStartAcceptDate(Sender: TObject;
+  var ADate: TDateTime; var AcceptDate: Boolean);
+begin
+  AcceptDate := (ADate <= Now) and (ADate <= DateEditTo.Date);
+end;
+
+procedure TFormMain.DateEditToAcceptDate(Sender: TObject; var ADate: TDateTime;
+  var AcceptDate: Boolean);
+begin
+  AcceptDate := (ADate <= Now) and (ADate >= DateEditStart.Date);
 end;
 
@@ -115 +132 @@
 begin
   Core.Accounts.LoadToStrings(ComboBoxAccounts.Items);
+  if (Core.SelectedAccountIndex >= 0) and
+    (Core.SelectedAccountIndex < ComboBoxAccounts.Items.Count) then
+    ComboBoxAccounts.ItemIndex := Core.SelectedAccountIndex;
   DateEditStart.Date := Core.ReportTimeFrom;
   DateEditTo.Date := Core.ReportTimeTo;
   SpinEditYear.Value := Core.ReportYear;
+  SpinEditYear.MaxValue := YearOf(Now);
   SpinEditId.Value := Core.ReportId;
   ButtonInterval.Enabled := Assigned(Core.CurrentAccount);
   ButtonMonthly.Enabled := Assigned(Core.CurrentAccount);
   ButtonNew.Enabled := Assigned(Core.CurrentAccount);
+  Core.ADownloadInterval.Enabled := Assigned(Core.CurrentAccount);
+  Core.ADownloadMonthly.Enabled := Assigned(Core.CurrentAccount);
+  Core.ADownloadNew.Enabled := Assigned(Core.CurrentAccount);
   if ComboBoxAccounts.ItemIndex <> -1 then begin
     LabelBalance.Caption := FloatToStr(TAccount(ComboBoxAccounts.Items.Objects[

trunk/Forms/UFormSettings.lfm

@@ -1 +1 @@
 object FormSettings: TFormSettings
   Left = 420
-  Height = 273
+  Height = 281
   Top = 127
-  Width = 550
+  Width = 558
   Caption = 'Settings'
-  ClientHeight = 273
-  ClientWidth = 550
+  ClientHeight = 281
+  ClientWidth = 558
   OnCreate = FormCreate
   Position = poScreenCenter
   LCLVersion = '1.1'
   object ButtonCancel: TButton
-    Left = 376
+    Left = 384
     Height = 25
-    Top = 242
+    Top = 250
     Width = 75
     Anchors = [akRight, akBottom]
@@ -21 +21 @@
   end
   object ButtonOk: TButton
-    Left = 464
+    Left = 472
     Height = 25
-    Top = 242
+    Top = 249
     Width = 75
     Anchors = [akRight]
@@ -52 +52 @@
     Height = 27
     Top = 88
-    Width = 440
+    Width = 448
     Anchors = [akTop, akLeft, akRight]
     EditLabel.AnchorSideLeft.Control = LabeledEditFolder
@@ -61 +61 @@
     EditLabel.Height = 17
     EditLabel.Top = 68
-    EditLabel.Width = 440
+    EditLabel.Width = 448
     EditLabel.Caption = 'Destination folder:'
     EditLabel.ParentColor = False
@@ -67 +67 @@
   end
   object Button1: TButton
-    Left = 464
+    Left = 472
     Height = 25
     Top = 88
@@ -76 +76 @@
     TabOrder = 4
   end
+  object LabeledEditFileNameFormat: TLabeledEdit
+    Left = 11
+    Height = 27
+    Top = 144
+    Width = 448
+    Anchors = [akTop, akLeft, akRight]
+    EditLabel.AnchorSideLeft.Control = LabeledEditFileNameFormat
+    EditLabel.AnchorSideRight.Control = LabeledEditFileNameFormat
+    EditLabel.AnchorSideRight.Side = asrBottom
+    EditLabel.AnchorSideBottom.Control = LabeledEditFileNameFormat
+    EditLabel.Left = 11
+    EditLabel.Height = 17
+    EditLabel.Top = 124
+    EditLabel.Width = 448
+    EditLabel.Caption = 'Output file name format:'
+    EditLabel.ParentColor = False
+    TabOrder = 5
+  end
+  object Label2: TLabel
+    Left = 11
+    Height = 38
+    Top = 176
+    Width = 532
+    Anchors = [akTop, akLeft, akRight]
+    Caption = '%f - data format, %d - date, %t - time, %a - account number, %n - account name, %% - percent symbol'
+    ParentColor = False
+    WordWrap = True
+  end
 end

trunk/Forms/UFormSettings.lrt

@@ -5 +5 @@
 TFORMSETTINGS.LABELEDEDITFOLDER.EDITLABEL.CAPTION=Destination folder:
 TFORMSETTINGS.BUTTON1.CAPTION=Select
+TFORMSETTINGS.LABELEDEDITFILENAMEFORMAT.EDITLABEL.CAPTION=Output file name format:
+TFORMSETTINGS.LABEL2.CAPTION=%f - data format, %d - date, %t - time, %a - account number, %n - account name, %% - percent symbol

trunk/Forms/UFormSettings.pas

@@ -19 +19 @@
     ComboBox1: TComboBox;
     Label1: TLabel;
+    Label2: TLabel;
     LabeledEditFolder: TLabeledEdit;
+    LabeledEditFileNameFormat: TLabeledEdit;
     procedure Button1Click(Sender: TObject);
     procedure FormCreate(Sender: TObject);
@@ -66 +68 @@
 procedure TFormSettings.Load;
 begin
+  LabeledEditFileNameFormat.Text := Core.OutputFormat;
   ComboBox1.ItemIndex := Integer(Core.DataFormat);
   LabeledEditFolder.Text := Core.TargetDirectory;
@@ -72 +75 @@
 procedure TFormSettings.Save;
 begin
+  Core.OutputFormat := LabeledEditFileNameFormat.Text;
   Core.DataFormat := TFioDataFormat(ComboBox1.ItemIndex);
   Core.TargetDirectory := LabeledEditFolder.Text;