Changeset 12 for trunk

Timestamp:

Feb 11, 2008, 11:37:07 AM (17 years ago)

Author:

george

Message:

Aktualizace: Vyměněna jednotka UWaitingDialog za novější UJobProgressView.
Opraveno: Chyba při vytváření souboru Error.txt.

Location:

trunk

Files:

• . (modified) (1 prop)
• SunriseChat.dpr (modified) (2 diffs)
• SunriseChatCoreUnit.pas (modified) (1 diff)
• UJobProgressView.dfm (added)
• UJobProgressView.pas (added)
• UMainWindow.dfm (modified) (11 diffs)
• UMainWindow.pas (modified) (4 diffs)
• UNetworkTest.pas (modified) (1 diff)
• UOptionsWindow.pas (modified) (2 diffs)
• UWaitingDialog.dfm (deleted)
• UWaitingDialog.pas (deleted)

trunk

@@ -5 +5 @@
 *.~dsk
 Network.cfg
+Error.txt

@@ -5 +5 @@
 *.~dsk
 Network.cfg
+Error.txt

trunk/SunriseChat.dpr

@@ -16 +16 @@
   ULocalization in 'ULocalization.pas' {Localization: TDataModule},
   UTextFileStream in 'UTextFileStream.pas',
-  UWaitingDialog in 'UWaitingDialog.pas' {WaitingDialog};
+  UJobProgressView in 'UJobProgressView.pas' {JobProgressView};
 
 {$R *.res}
@@ -26 +26 @@
   Application.CreateForm(TMainWindow, MainWindow);
   Application.CreateForm(TLogExceptions, LogExceptions);
+  Application.CreateForm(TJobProgressView, JobProgressView);
   LogExceptions.AppVersion := ClientVersion;
   LogExceptions.AppReleaseDate := ClientReleaseDate;
-  Application.CreateForm(TWaitingDialog, WaitingDialog);
   if not MainWindow.StopProgram then begin
     Application.CreateForm(TNewRoom, NewRoom);

trunk/SunriseChatCoreUnit.pas

@@ -114 +114 @@
   TAddMessageMethod = procedure(EventType: TAppEventType; Room: TRoom;
     const Args: array of const; RoomLine: TRoomLine) of object;
-
-  TSunriseChatProtocol = class
-  public
-    Version: Integer;
-    SourceId: TClientIdentification;
-    DestinationId: TClientIdentification;
-    SequenceNumber: Integer;
-    Command: TSystemCommand;
-
-  end;
 
   TSunriseChatCore = class(TComponent)

trunk/UMainWindow.dfm

@@ -33 +33 @@
     FullRepaint = False
     TabOrder = 0
-    ExplicitWidth = 470
-    ExplicitHeight = 331
     object Splitter3: TSplitter
       Left = 323
@@ -53 +51 @@
       FullRepaint = False
       TabOrder = 0
-      ExplicitTop = 301
-      ExplicitWidth = 470
       DesignSize = (
         471
@@ -68 +64 @@
         TabOrder = 0
         OnClick = Button1Click
-        ExplicitLeft = 412
       end
       object ComboBox1: TComboBox
@@ -88 +83 @@
         Items.Strings = (
           '')
-        ExplicitWidth = 401
       end
     end
@@ -99 +93 @@
       BevelOuter = bvNone
       TabOrder = 1
-      ExplicitLeft = 324
-      ExplicitHeight = 301
       object ToolBar1: TToolBar
         Left = 0
@@ -114 +106 @@
         TabOrder = 0
         Transparent = False
-        ExplicitTop = 143
         object ToolButton1: TToolButton
           Left = 0
@@ -192 +183 @@
       FullRepaint = False
       TabOrder = 2
-      ExplicitLeft = 350
-      ExplicitHeight = 301
       DesignSize = (
         120
@@ -234 +223 @@
       FullRepaint = False
       TabOrder = 3
-      ExplicitWidth = 322
-      ExplicitHeight = 301
       DesignSize = (
         323
@@ -272 +259 @@
         TabOrder = 1
         OnChange = TabControl1Change
-        ExplicitWidth = 316
-        ExplicitHeight = 209
         object TabSheet1: TTabSheet
           Caption = 'TabSheet1'
@@ -283 +268 @@
           ImageIndex = 1
           ParentFont = False
-          ExplicitWidth = 308
-          ExplicitHeight = 180
         end
       end
@@ -307 +290 @@
           Columns = <>
           TabOrder = 1
-          ExplicitWidth = 316
-          ExplicitHeight = 260
         end
         object RichView1: TRichView

trunk/UMainWindow.pas

@@ -251 +251 @@
     { Private declarations }
   public
-    SunriseChatNetworkCore1: TSunriseChatNEtworkCore;
+    SunriseChatNetworkCore1: TSunriseChatNetworkCore;
     UserEventsImagesEnabled: Boolean;
     FirstStart: Boolean;
@@ -331 +331 @@
 
 uses UInfoWindow, UAboutWindow, UOptionsWindow, UNetworkTest, UNewRoom,
-  DateUtils, ULocalization, UWaitingDialog, MMSystem;
+  DateUtils, ULocalization, UJobProgressView, MMSystem;
 
 {$R *.dfm}
@@ -1406 +1406 @@
     if I<Length(AppUserEvents) then AppUserEventsOptions[I].SaveToRegistry;
     //AppUserEventsOptions[I].Free;
-    if Assigned(WaitingDialog) then WaitingDialog.Pozice := I/Max*100;
+    if Assigned(JobProgressView) then JobProgressView.Progress := I/Max;
   end;
   //SetLength(AppUserEventsOptions,0);
@@ -1487 +1487 @@
       LoadFromRegistry;
     end;
-    if Assigned(WaitingDialog) then WaitingDialog.Pozice := I/AppUserEventsCount*100;
+    if Assigned(JobProgressView) then JobProgressView.Progress := I / AppUserEventsCount;
   end;
 end;

trunk/UNetworkTest.pas

@@ -82 +82 @@
     ChDir(ExtractFileDir(Application.ExeName));
     AssignFile(Soubor, NetworkFileName);
-    if FileExists(NetworkFileName) then Reset(Soubor) else Rewrite(Soubor);
+    if FileExists(NetworkFileName) then Reset(Soubor) else begin
+      Rewrite(Soubor);
+      CloseFile(Soubor);
+      AssignFile(Soubor, NetworkFileName);
+      Reset(Soubor);
+    end;
     SetLength(Devices, 1);
     while not Eof(Soubor) do begin

trunk/UOptionsWindow.pas

@@ -233 +233 @@
 
 uses
-  ULocalization, DateUtils, UWaitingDialog, SunriseChatNetworkCoreUnit,
+  ULocalization, DateUtils, UJobProgressView, SunriseChatNetworkCoreUnit,
   SunriseChatCoreUnit;
 
@@ -350 +350 @@
       MainWindow.AppUserEventsCount := Length(AppUserEvents);
 
-      WaitingDialog.PridejUlohu('Načtení z registrů', SaveUserEvents);
-      WaitingDialog.PridejUlohu('Uložení do registrů', MainWindow.SaveAppUserEventsToRegistry);
-      WaitingDialog.Start;
+      JobProgressView.AddJob('Načtení z registrů', SaveUserEvents);
+      JobProgressView.AddJob('Uložení do registrů', MainWindow.SaveAppUserEventsToRegistry);
+      JobProgressView.Start;
       ReloadImages;
     end;

@@ -5 +5 @@
 *.~dsk
 Network.cfg
+Error.txt