Changeset 7 for trunk/Forms/UFormMain.pas

Timestamp:

Mar 14, 2013, 10:21:42 PM (11 years ago)

Author:

chronos

Message:

• Přidáno: Okno s informacemi o aplikaci.
• Přidáno: Datový modul TCore do něhož byly odděleny obecné části přímo nesouvisející s hlavním oknem.

Location:

trunk

Files:

• . (modified) (1 prop)
• Forms/UFormMain.pas (moved) (moved from trunk/UFormMain.pas ) (5 diffs)

trunk

@@ -3 +3 @@
 FioInfo.lps
 FioInfo.exe
+FioInfo.dbg

@@ -3 +3 @@
 FioInfo.lps
 FioInfo.exe
+FioInfo.dbg

trunk/Forms/UFormMain.pas

@@ -15 +15 @@
 
   TFormMain = class(TForm)
-    ADownloadInterval: TAction;
-    ADownloadMonthly: TAction;
-    ASettings: TAction;
-    ADownloadNew: TAction;
-    AExit: TAction;
-    AShow: TAction;
-    ActionList1: TActionList;
-    Button1: TButton;
-    Button2: TButton;
-    Button3: TButton;
-    Button4: TButton;
-    Button5: TButton;
+    ButtonNew: TButton;
+    ButtonSettings: TButton;
+    ButtonInterval: TButton;
+    ButtonMonthly: TButton;
+    ButtonExit: TButton;
+    ButtonAbout: TButton;
     DateEditStart: TDateEdit;
     DateEditTo: TDateEdit;
@@ -32 +26 @@
     GroupBox2: TGroupBox;
     GroupBox3: TGroupBox;
-    ImageList1: TImageList;
     Label1: TLabel;
     Label2: TLabel;
     Label3: TLabel;
     Label4: TLabel;
-    MenuItem1: TMenuItem;
-    MenuItem2: TMenuItem;
-    PopupMenuTray: TPopupMenu;
     SpinEditYear: TSpinEdit;
     SpinEditId: TSpinEdit;
-    TrayIcon1: TTrayIcon;
-    procedure ADownloadIntervalExecute(Sender: TObject);
-    procedure ADownloadMonthlyExecute(Sender: TObject);
-    procedure ADownloadNewExecute(Sender: TObject);
-    procedure AExitExecute(Sender: TObject);
-    procedure ASettingsExecute(Sender: TObject);
-    procedure AShowExecute(Sender: TObject);
+    procedure ButtonIntervalClick(Sender: TObject);
+    procedure ButtonMonthlyClick(Sender: TObject);
+    procedure ButtonNewClick(Sender: TObject);
     procedure FormClose(Sender: TObject; var CloseAction: TCloseAction);
     procedure FormCreate(Sender: TObject);
@@ -54 +40 @@
     { private declarations }
   public
-    RegistryContext: TRegistryContext;
-    Token: string;
-    Format: TFioDataFormat;
-    TargetDirectory: string;
-    ReportYear: Integer;
-    ReportId: Integer;
-    ReportTimeFrom: TDateTime;
-    ReportTimeTo: TDateTime;
     procedure LoadInterface;
     procedure SaveInterface;
-    procedure SaveToRegistry(Context: TRegistryContext);
-    procedure LoadFromRegistry(Context: TRegistryContext);
   end;
 
@@ -76 +52 @@
 
 uses
-  UFormSettings;
-
-resourcestring
-  SDownloadNotSuccess = 'StaÅŸení nebylo úspěšné';
-
+  UCore;
 
 { TFormMain }
-
-procedure TFormMain.AShowExecute(Sender: TObject);
-begin
-  Application.Restore;
-end;
 
 procedure TFormMain.FormClose(Sender: TObject; var CloseAction: TCloseAction);
 begin
   SaveInterface;
-  SaveToRegistry(RegistryContext);
+end;
+
+procedure TFormMain.ButtonNewClick(Sender: TObject);
+begin
+  SaveInterface;
+  Core.ADownloadNew.Execute;
+end;
+
+procedure TFormMain.ButtonIntervalClick(Sender: TObject);
+begin
+  SaveInterface;
+  Core.ADownloadInterval.Execute;
+end;
+
+procedure TFormMain.ButtonMonthlyClick(Sender: TObject);
+begin
+  SaveInterface;
+  Core.ADownloadMonthly.Execute;
 end;
 
 procedure TFormMain.FormCreate(Sender: TObject);
 begin
-  RegistryContext := RegContext(HKEY_CURRENT_USER, '\Software\Chronosoft\FioInfo');
-  LoadFromRegistry(RegistryContext);
   LoadInterface;
 end;
@@ -104 +86 @@
 procedure TFormMain.LoadInterface;
 begin
-  DateEditStart.Date := ReportTimeFrom;
-  DateEditTo.Date := ReportTimeTo;
-  SpinEditYear.Value := ReportYear;
-  SpinEditId.Value := ReportId;
+  DateEditStart.Date := Core.ReportTimeFrom;
+  DateEditTo.Date := Core.ReportTimeTo;
+  SpinEditYear.Value := Core.ReportYear;
+  SpinEditId.Value := Core.ReportId;
 end;
 
 procedure TFormMain.SaveInterface;
 begin
-  ReportTimeFrom := DateEditStart.Date;
-  ReportTimeTo := DateEditTo.Date;
-  ReportYear := SpinEditYear.Value;
-  ReportId := SpinEditId.Value;
-end;
-
-procedure TFormMain.SaveToRegistry(Context: TRegistryContext);
-begin
-  with TRegistryEx.Create do
-  try
-    RootKey := Context.RootKey;
-    OpenKey(Context.Key, True);
-    WriteString('TargetDir', TargetDirectory);
-    WriteInteger('DataFormat', Integer(Format));
-    WriteString('Token', Token);
-    WriteDate('ReportTimeFrom', ReportTimeFrom);
-    WriteDateTime('ReportTimeTo', ReportTimeTo);
-    WriteInteger('ReportYear', ReportYear);
-    WriteInteger('ReportId', ReportId);
-  finally
-    Free;
-  end;
-end;
-
-procedure TFormMain.LoadFromRegistry(Context: TRegistryContext);
-begin
-  with TRegistryEx.Create do
-  try
-    RootKey := Context.RootKey;
-    OpenKey(Context.Key, True);
-    TargetDirectory := ReadStringWithDefault('TargetDir', ExtractFileDir(Application.ExeName));
-    Format := TFioDataFormat(ReadIntegerWithDefault('DataFormat', Integer(dfXML)));
-    Token := ReadStringWithDefault('Token', '');
-    ReportTimeFrom := ReadDateTimeWithDefault('ReportTimeFrom', Now);
-    ReportTimeTo := ReadDateTimeWithDefault('ReportTimeTo', Now);
-    ReportYear := ReadIntegerWithDefault('ReportYear', YearOf(Now));
-    ReportId := ReadIntegerWithDefault('ReportId', MonthOf(Now));
-  finally
-    Free;
-  end;
-end;
-
-procedure TFormMain.AExitExecute(Sender: TObject);
-begin
-  Close;
-end;
-
-procedure TFormMain.ASettingsExecute(Sender: TObject);
-begin
-  FormSettings.Load;
-  if FormSettings.ShowModal = mrOk then begin
-    FormSettings.Save;
-    SaveToRegistry(RegistryContext);
-  end;
-end;
-
-procedure TFormMain.ADownloadNewExecute(Sender: TObject);
-var
-  FioAPI: TFioAPI;
-  List: TStringList;
-begin
-  FioAPI := TFioAPI.Create;
-  List := TStringList.Create;
-  try
-    FioAPI.Format := Format;
-    FioAPI.Token := Token;
-    if FioAPI.DownloadLast(List) then begin
-      List.SaveToFile('VÃœpis ' + FormatDateTime('yyyy-mm-dd hh-nn-ss', Now) +
-        ExtensionSeparator + DataFormatURL[FioAPI.Format]);
-    end else ShowMessage(SDownloadNotSuccess);
-  finally
-    FioAPI.Free;
-    List.Free;
-  end;
-end;
-
-procedure TFormMain.ADownloadMonthlyExecute(Sender: TObject);
-var
-  FioAPI: TFioAPI;
-  List: TStringList;
-begin
-  FioAPI := TFioAPI.Create;
-  List := TStringList.Create;
-  try
-    FioAPI.Format := Format;
-    FioAPI.Token := Token;
-    if FioAPI.DownloadMonthly(SpinEditYear.Value, SpinEditId.Value, List) then begin
-      List.SaveToFile('VÃœpis měsíční ' + IntToStr(SpinEditYear.Value) +
-        '-' + IntToStr(SpinEditId.Value) +
-        ExtensionSeparator + DataFormatURL[FioAPI.Format]);
-    end else ShowMessage(SDownloadNotSuccess);
-  finally
-    FioAPI.Free;
-    List.Free;
-  end;
-end;
-
-procedure TFormMain.ADownloadIntervalExecute(Sender: TObject);
-var
-  FioAPI: TFioAPI;
-  List: TStringList;
-begin
-  FioAPI := TFioAPI.Create;
-  List := TStringList.Create;
-  try
-    FioAPI.Format := Format;
-    FioAPI.Token := Token;
-    if FioAPI.DownloadInterval(DateEditStart.Date, DateEditTo.Date, List) then begin
-      List.SaveToFile('VÃœpis ' + FormatDateTime('yyyy-mm-dd', DateEditStart.Date) +
-        ' ' + FormatDateTime('yyyy-mm-dd', DateEditTo.Date) +
-        ExtensionSeparator + DataFormatURL[FioAPI.Format]);
-    end else ShowMessage(SDownloadNotSuccess);
-  finally
-    FioAPI.Free;
-    List.Free;
-  end;
+  Core.ReportTimeFrom := DateEditStart.Date;
+  Core.ReportTimeTo := DateEditTo.Date;
+  Core.ReportYear := SpinEditYear.Value;
+  Core.ReportId := SpinEditId.Value;
 end;
 

@@ -3 +3 @@
 FioInfo.lps
 FioInfo.exe
+FioInfo.dbg