Changeset 4 for trunk

Timestamp:

Dec 3, 2009, 9:09:58 AM (15 years ago)

Author:

george

Message:

• Modified: Minor changes.

Location:

trunk

Files:

• UMainForm.dfm (modified) (7 diffs)
• UMainForm.pas (modified) (2 diffs)
• URouterOS.pas (modified) (3 diffs)

trunk/UMainForm.dfm

@@ -12 +12 @@
   Font.Style = []
   OldCreateOrder = False
+  OnClose = FormClose
   OnCreate = FormCreate
   OnDestroy = FormDestroy
@@ -30 +31 @@
       'ddress]." comment=".[get $i comment]." network=".[get $i network' +
       '])}}'
-    ExplicitTop = 327
-    ExplicitWidth = 432
   end
   object Button1: TButton
@@ -42 +41 @@
     TabOrder = 1
     OnClick = Button1Click
-    ExplicitLeft = 454
-    ExplicitTop = 327
   end
   object PageControl1: TPageControl
@@ -55 +52 @@
     object TabSheet1: TTabSheet
       Caption = 'TabSheet1'
-      ExplicitWidth = 531
-      ExplicitHeight = 303
       object Memo1: TMemo
         Left = 0
@@ -71 +66 @@
         ScrollBars = ssBoth
         TabOrder = 0
-        ExplicitLeft = 8
-        ExplicitTop = 8
-        ExplicitWidth = 544
-        ExplicitHeight = 323
       end
     end
@@ -80 +71 @@
       Caption = 'TabSheet2'
       ImageIndex = 1
-      ExplicitWidth = 531
-      ExplicitHeight = 303
       object Memo2: TMemo
         Left = 0
@@ -96 +85 @@
         ScrollBars = ssBoth
         TabOrder = 0
-        ExplicitLeft = 8
-        ExplicitTop = 8
-        ExplicitWidth = 544
-        ExplicitHeight = 323
       end
     end

trunk/UMainForm.pas

@@ -19 +19 @@
     procedure FormDestroy(Sender: TObject);
     procedure Button1Click(Sender: TObject);
+    procedure FormClose(Sender: TObject; var Action: TCloseAction);
   private
     procedure DoLineRecieve(Line: string);
@@ -61 +62 @@
 end;
 
+procedure TMainForm.FormClose(Sender: TObject; var Action: TCloseAction);
+begin
+  LoaderForm.Close;
+end;
+
 procedure TMainForm.FormCreate(Sender: TObject);
 begin

trunk/URouterOS.pas

@@ -84 +84 @@
 var
   I: Integer;
+  Temp: string;
 begin
   I := 1;
@@ -115 +116 @@
   until I >= Length(Buffer);
 
+  Temp := Trim(Line);
   if Line <> '' then
   case FConnectionState of
@@ -131 +133 @@
     csConnectedCommandProcessing: begin
       if Line[1] = '[' then begin
-        if not FirstResponseBracket then FirstResponseBracket := True
-        else ChangeState(csConnectedReady)
+        //if not FirstResponseBracket then FirstResponseBracket := True
+        //else ChangeState(csConnectedReady)
+        if (Line[1] = '[') and (Temp[Length(Temp)] = '>') then
+          ChangeState(csConnectedReady);
       end else CommandResponse.Add(Line);
     end;
   end;
 end;
-
 
 destructor TRouterOS.Destroy;