Changeset 13

Timestamp:

Mar 16, 2013, 12:05:33 AM (11 years ago)

Author:

chronos

Message:

• Přidáno: Načtení stavu účtů při startu aplikace.
• Opraveno: Při ukládání do registrů nepoužívat UTF-8.

Location:

trunk

Files:

• Forms/UFormMain.pas (modified) (2 diffs)
• UCore.pas (modified) (8 diffs)

trunk/Forms/UFormMain.pas

@@ -81 +81 @@
     Core.CurrentAccount := TAccount(Core.Accounts[ComboBoxAccounts.ItemIndex])
     else Core.CurrentAccount := nil;
+  LoadInterface;
 end;
 
@@ -121 +122 @@
   ButtonMonthly.Enabled := Assigned(Core.CurrentAccount);
   ButtonNew.Enabled := Assigned(Core.CurrentAccount);
+  if ComboBoxAccounts.ItemIndex <> -1 then begin
+    LabelBalance.Caption := FloatToStr(TAccount(ComboBoxAccounts.Items.Objects[
+      ComboBoxAccounts.ItemIndex]).Balance) + ' Kč';
+  end else begin
+    LabelBalance.Caption := '? Kč';
+  end;
 end;
 

trunk/UCore.pas

@@ -119 +119 @@
     RootKey := Context.RootKey;
     OpenKey(Context.Key, True);
-    Name := ReadStringWithDefault('Name', '');
+    Name := UTF8Encode(ReadStringWithDefault('Name', UTF8Decode('Učet')));
     Time := ReadDateTimeWithDefault('Time', 0);
-    Token := ReadStringWithDefault('Token', '');
+    Token :=UTF8Encode( ReadStringWithDefault('Token', ''));
     Balance := ReadFloatWithDefault('Balance', 0);
-    Number := ReadStringWithDefault('Number', '');
+    Number := UTF8Encode(ReadStringWithDefault('Number', ''));
   finally
     Free;
@@ -135 +135 @@
     RootKey := Context.RootKey;
     OpenKey(Context.Key, True);
-    WriteString('Number', Number);
-    WriteString('Name', Name);
+    WriteString('Number', UTF8Decode(Number));
+    WriteString('Name', UTF8Decode(Name));
     WriteDateTime('Time', Time);
-    WriteString('Token', Token);
+    WriteString('Token', UTF8Decode(Token));
     WriteFloat('Balance', Balance);
   finally
@@ -189 +189 @@
   while Strings.Count > Count do
     Strings.Delete(Strings.Count - 1);
-  for I := 0 to Count - 1 do
-    Strings.Strings[I] := TAccount(Items[I]).Name;
+  for I := 0 to Count - 1 do begin
+    Strings.Strings[I] := TAccount(Items[I]).Name + ' (' + TAccount(Items[I]).Number + ')';
+    Strings.Objects[I] := Items[I];
+  end;
 end;
 
@@ -218 +220 @@
     ApplicationInfo1.RegistryKey);
   LoadFromRegistry(RegistryContext);
-  //LoadAccounts;
+  LoadAccounts;
 end;
 
@@ -235 +237 @@
   Mem: TMemoryStream;
   RootNode: TDOMNode;
+  Node: TDOMNode;
+  Node2: TDOMNode;
 begin
   FioAPI := TFioAPI.Create;
@@ -246 +250 @@
     if FioAPI.DownloadInterval(Now, Now, List) then begin
       List.SaveToStream(Mem);
+      Mem.Position := 0;
       ReadXMLFile(XMLDocument, Mem);
       RootNode := XMLDocument.DocumentElement;
-      ShowMessage(RootNode.NodeName);
+      Node := RootNode.FindNode('Info');
+      Node2 := Node.FindNode('accountId');
+      if Assigned(Node2) then
+        Account.Number := UTF8Encode(Node2.TextContent);
+      Node2 := Node.FindNode('bankId');
+      if Assigned(Node2) then
+        Account.Number := Account.Number + '/' + UTF8Encode(Node2.TextContent);
+      Node2 := Node.FindNode('closingBalance');
+      if Assigned(Node2) then
+        Account.Balance := StrToFloat(Node2.TextContent);
     end else begin
       Account.Number := '';
@@ -281 +295 @@
     RootKey := Context.RootKey;
     OpenKey(Context.Key, True);
-    WriteString('TargetDir', TargetDirectory);
+    WriteString('TargetDir', UTF8Decode(TargetDirectory));
     WriteInteger('DataFormat', Integer(DataFormat));
     WriteDate('ReportTimeFrom', ReportTimeFrom);
@@ -300 +314 @@
     RootKey := Context.RootKey;
     OpenKey(Context.Key, True);
-    TargetDirectory := ReadStringWithDefault('TargetDir', ExtractFileDir(Application.ExeName));
+    TargetDirectory := UTF8Encode(ReadStringWithDefault('TargetDir', UTF8Decode(ExtractFileDir(Application.ExeName))));
     DataFormat := TFioDataFormat(ReadIntegerWithDefault('DataFormat', Integer(dfXML)));
     ReportTimeFrom := ReadDateTimeWithDefault('ReportTimeFrom', Now);