[tuxdroid-svn] r4744 - software_suite_v3/software/tool/tux_droid_browser/windows/trunk/tux_droid_browser

[jerome <c2m...@c2...>]

Author: jerome
Date: 2009-06-04 09:55:22 +0200 (Thu, 04 Jun 2009)
New Revision: 4744

Modified:
   software_suite_v3/software/tool/tux_droid_browser/windows/trunk/tux_droid_browser/TXmlThread.dcu
   software_suite_v3/software/tool/tux_droid_browser/windows/trunk/tux_droid_browser/TXmlThread.pas
   software_suite_v3/software/tool/tux_droid_browser/windows/trunk/tux_droid_browser/Unit1.dcu
   software_suite_v3/software/tool/tux_droid_browser/windows/trunk/tux_droid_browser/Unit1.dfm
   software_suite_v3/software/tool/tux_droid_browser/windows/trunk/tux_droid_browser/Unit1.pas
Log:
* Code cleanup.
* Removed unused object.

Modified: software_suite_v3/software/tool/tux_droid_browser/windows/trunk/tux_droid_browser/TXmlThread.dcu
===================================================================
(Binary files differ)

Modified: software_suite_v3/software/tool/tux_droid_browser/windows/trunk/tux_droid_browser/TXmlThread.pas
===================================================================
--- software_suite_v3/software/tool/tux_droid_browser/windows/trunk/tux_droid_browser/TXmlThread.pas	2009-06-04 07:24:04 UTC (rev 4743)
+++ software_suite_v3/software/tool/tux_droid_browser/windows/trunk/tux_droid_browser/TXmlThread.pas	2009-06-04 07:55:22 UTC (rev 4744)
@@ -31,7 +31,7 @@
   TXmlThreadObject = class(TThread)
 
   public
-    constructor create(scanner : TXmlScanner);
+    constructor create(var scanner : TXmlScanner);
     destructor  destroy; override;
     function getResult() : boolean;
 
@@ -51,7 +51,7 @@
 
 { TXmlThread }
 
-constructor TXmlThreadObject.create(scanner : TXmlScanner);
+constructor TXmlThreadObject.create(var scanner : TXmlScanner);
 begin
   inherited create(true);
   xmlScanner := scanner;
@@ -63,6 +63,7 @@
 destructor TXmlThreadObject.destroy;
 begin
   inherited;
+  //xmlScanner.Free;
 end;
 
 procedure TXmlThreadObject.Execute;

Modified: software_suite_v3/software/tool/tux_droid_browser/windows/trunk/tux_droid_browser/Unit1.dcu
===================================================================
(Binary files differ)

Modified: software_suite_v3/software/tool/tux_droid_browser/windows/trunk/tux_droid_browser/Unit1.dfm
===================================================================
--- software_suite_v3/software/tool/tux_droid_browser/windows/trunk/tux_droid_browser/Unit1.dfm	2009-06-04 07:24:04 UTC (rev 4743)
+++ software_suite_v3/software/tool/tux_droid_browser/windows/trunk/tux_droid_browser/Unit1.dfm	2009-06-04 07:55:22 UTC (rev 4744)
@@ -1123,14 +1123,9 @@
       C21FC21FC21FC21FFFFFFFFFFFFFFFFF00000000000000000000000000000000
       000000000000}
   end
-  object Timer1: TTimer
-    Interval = 3000
-    Left = 104
-    Top = 8
-  end
   object XmlScanner1: TXmlScanner
     Normalize = True
-    Left = 136
+    Left = 104
     Top = 8
   end
   object EwbControl1: TEwbControl

Modified: software_suite_v3/software/tool/tux_droid_browser/windows/trunk/tux_droid_browser/Unit1.pas
===================================================================
--- software_suite_v3/software/tool/tux_droid_browser/windows/trunk/tux_droid_browser/Unit1.pas	2009-06-04 07:24:04 UTC (rev 4743)
+++ software_suite_v3/software/tool/tux_droid_browser/windows/trunk/tux_droid_browser/Unit1.pas	2009-06-04 07:55:22 UTC (rev 4744)
@@ -44,7 +44,6 @@
     Quit1: TMenuItem;
     PngImageList1: TPngImageList;
     ImageList1: TImageList;
-    Timer1: TTimer;
     XmlScanner1: TXmlScanner;
     EwbControl1: TEwbControl;
 
@@ -343,6 +342,7 @@
     self.XmlScanner1.LoadFromFile(xmlFile);
 
     xmlThread := TXmlThreadObject.create(self.XmlScanner1);
+
     xmlThread.Resume;
 
     boolValue := xmlThread.getResult();
@@ -362,7 +362,21 @@
     ImageList1.GetIcon(3, AppIcon);
     Tray.hIcon := AppIcon.Handle;
     Shell_NotifyIcon(Nim_Modify, @tray);
+  end
+  else
+  begin
+    ImageList1.GetIcon(1, AppIcon);
+    Tray.hIcon := AppIcon.Handle;
+    Shell_NotifyIcon(Nim_Modify, @tray);
   end;
+
+  Try
+    TXmlThreadObject(sender).Free;
+    TXmlThreadObject(sender).destroy;
+  Except
+
+  end;
+
 end;
 
 end.