MOdified the Watches dialog and added the lfm and lrs files for it and the insert watch dialog.

Shane

git-svn-id: trunk@500 -

.gitattributes

@@ -119,6 +119,7 @@ ide/include/freebsd/lazconf.inc svneol=native#text/pascal
 ide/include/ide.inc svneol=native#text/pascal
 ide/include/linux/lazconf.inc svneol=native#text/pascal
 ide/include/win32/lazconf.inc svneol=native#text/pascal
+ide/insertwatch.lrs svneol=native#text/pascal
 ide/keymapping.pp svneol=native#text/pascal
 ide/lazarus.bmp -text svneol=native#image/bmp
 ide/lazarus.ico -text svneol=native#image/x-icon
@@ -136,13 +137,16 @@ ide/projectopts.lrs svneol=native#text/pascal
 ide/projectopts.pp svneol=native#text/pascal
 ide/runparamsopts.pas svneol=native#text/pascal
 ide/splash.pp svneol=native#text/pascal
+ide/tinsertwatch.lfm svneol=native#text/plain
 ide/transfermacros.pp svneol=native#text/pascal
+ide/twatchesdlg.lfm svneol=native#text/plain
 ide/uniteditor.pp svneol=native#text/pascal
 ide/unitinfodlg.pp svneol=native#text/pascal
 ide/viewforms1.lrs svneol=native#text/pascal
 ide/viewunit_dlg.lfm svneol=native#text/plain
 ide/viewunit_dlg.pp svneol=native#text/pascal
 ide/viewunits1.lrs svneol=native#text/pascal
+ide/watches_dlg.lrs svneol=native#text/pascal
 ide/watchesdlg.pp svneol=native#text/pascal
 ide/wordcompletion.pp svneol=native#text/pascal
 images/bookmark.lrs svneol=native#text/pascal

ide/insertwatch.lrs

@@ -0,0 +1,28 @@
+  LazarusResources.Add('TINSERTWATCH','FORMDATA',
+    'TPF0'#12'TINSERTWATCH'#0#7'CAPTION'#6#16'Watch Properties'#5'COLOR'#4#15#0
+    +#0#128#12'CLIENTHEIGHT'#3#200#0#11'CLIENTWIDTH'#3#164#1#8'POSITION'#7#14
+    +'poscreencenter'#6'HEIGHT'#3#200#0#5'WIDTH'#3#164#1#0#6'TLABEL'#13'lblExp'
+    +'ression'#7'CAPTION'#6#11'Expression:'#10'FONT.COLOR'#4#8#0#0#128#4'LEFT'
+    +#2#15#6'HEIGHT'#2#17#3'TOP'#2#20#5'WIDTH'#2'A'#0#0#5'TEDIT'#13'edtExpress'
+    +'ion'#4'LEFT'#2'i'#3'TOP'#2#17#5'WIDTH'#3','#1#0#0#6'TLABEL'#11'lblRepCou'
+    +'nt'#7'CAPTION'#6#13'Repeat Count:'#10'FONT.COLOR'#4#8#0#0#128#4'LEFT'#2
+    +#15#6'HEIGHT'#2#17#3'TOP'#2'-'#5'WIDTH'#2'P'#0#0#5'TEDIT'#11'edtRepCount'
+    +#4'TEXT'#6#1'0'#4'LEFT'#2'i'#3'TOP'#2'*'#5'WIDTH'#2'<'#0#0#6'TLABEL'#9'lb'
+    +'lDigits'#7'CAPTION'#6#7'Digits:'#10'FONT.COLOR'#4#8#0#0#128#4'LEFT'#3#175
+    +#0#6'HEIGHT'#2#17#3'TOP'#2'-'#5'WIDTH'#2'('#0#0#5'TEDIT'#9'edtDigits'#4'T'
+    +'EXT'#6#1'0'#4'LEFT'#3#225#0#3'TOP'#2'-'#5'WIDTH'#3#180#0#0#0#9'TCHECKBOX'
+    +#9'cbEnabled'#7'CAPTION'#6#7'Enabled'#5'STATE'#7#9'cbchecked'#10'DRAGCURS'
+    +'OR'#2#0#8'TABORDER'#2#0#4'LEFT'#2#15#3'TOP'#2'A'#5'WIDTH'#2'<'#0#0#9'TCH'
+    +'ECKBOX'#11'cbAllowFunc'#7'CAPTION'#6#20'Allow Function Calls'#10'DRAGCUR'
+    +'SOR'#2#0#8'TABORDER'#2#0#4'LEFT'#2'i'#3'TOP'#2'A'#0#0#11'TRADIOGROUP'#5
+    +'Style'#7'CAPTION'#6#5'Style'#9'ITEMINDEX'#2#7#13'ITEMS.Strings'#1#6#9'Ch'
+    +'aracter'#6#6'String'#6#7'Decimal'#6#11'Hexadecimal'#6#14'Floating Point'
+    +#6#7'Pointer'#6#16'Record/Structure'#6#7'Default'#6#11'Memory Dump'#0#7'C'
+    +'OLUMNS'#2#3#4'LEFT'#2#15#6'HEIGHT'#2'F'#3'TOP'#2'Z'#5'WIDTH'#3#134#1#0#0
+    +#7'TBUTTON'#0#11'MODALRESULT'#2#1#7'CAPTION'#6#2'OK'#10'FONT.COLOR'#4#8#0
+    +#0#128#4'LEFT'#3#170#0#6'HEIGHT'#2#25#3'TOP'#3#170#0#5'WIDTH'#2'K'#0#0#7
+    +'TBUTTON'#0#11'MODALRESULT'#2#2#7'CAPTION'#6#6'Cancel'#10'FONT.COLOR'#4#8
+    +#0#0#128#4'LEFT'#3#250#0#6'HEIGHT'#2#25#3'TOP'#3#170#0#5'WIDTH'#2'K'#0#0#7
+    +'TBUTTON'#0#7'CAPTION'#6#4'Help'#10'FONT.COLOR'#4#8#0#0#128#4'LEFT'#3'J'#1
+    +#6'HEIGHT'#2#25#3'TOP'#3#170#0#5'WIDTH'#2'K'#0#0#0
+  );

ide/main.pp

@@ -5074,6 +5074,8 @@ end;
 procedure TMainIDE.mnuViewWatchesClick(Sender : TObject);
 begin
   Watches_dlg.Show;
+//  CreateLFM(Watches_Dlg);
+  CreateLFM(Insertwatch);
 end;
 
 //-----------------------------------------------------------------------------
@@ -5090,6 +5092,11 @@ end.
 { =============================================================================
 
   $Log$
+  Revision 1.167  2001/12/10 14:32:57  lazarus
+  MOdified the Watches dialog and added the lfm and lrs files for it and the insert watch dialog.
+
+  Shane
+
   Revision 1.166  2001/12/10 08:44:23  lazarus
   MG: added search for compiler, if not set
 

ide/tinsertwatch.lfm

@@ -0,0 +1,112 @@
+object TINSERTWATCH
+  CAPTION = 'Watch Properties'
+  COLOR = -2147483633
+  CLIENTHEIGHT = 200
+  CLIENTWIDTH = 420
+  POSITION = poscreencenter
+  HEIGHT = 200
+  WIDTH = 420
+  object lblExpression: TLABEL
+    CAPTION = 'Expression:'
+    FONT.COLOR = -2147483640
+    LEFT = 15
+    HEIGHT = 17
+    TOP = 20
+    WIDTH = 65
+  end
+  object edtExpression: TEDIT
+    LEFT = 105
+    TOP = 17
+    WIDTH = 300
+  end
+  object lblRepCount: TLABEL
+    CAPTION = 'Repeat Count:'
+    FONT.COLOR = -2147483640
+    LEFT = 15
+    HEIGHT = 17
+    TOP = 45
+    WIDTH = 80
+  end
+  object edtRepCount: TEDIT
+    TEXT = '0'
+    LEFT = 105
+    TOP = 42
+    WIDTH = 60
+  end
+  object lblDigits: TLABEL
+    CAPTION = 'Digits:'
+    FONT.COLOR = -2147483640
+    LEFT = 175
+    HEIGHT = 17
+    TOP = 45
+    WIDTH = 40
+  end
+  object edtDigits: TEDIT
+    TEXT = '0'
+    LEFT = 225
+    TOP = 45
+    WIDTH = 180
+  end
+  object cbEnabled: TCHECKBOX
+    CAPTION = 'Enabled'
+    STATE = cbchecked
+    DRAGCURSOR = 0
+    TABORDER = 0
+    LEFT = 15
+    TOP = 65
+    WIDTH = 60
+  end
+  object cbAllowFunc: TCHECKBOX
+    CAPTION = 'Allow Function Calls'
+    DRAGCURSOR = 0
+    TABORDER = 0
+    LEFT = 105
+    TOP = 65
+  end
+  object Style: TRADIOGROUP
+    CAPTION = 'Style'
+    ITEMINDEX = 7
+    ITEMS.Strings = (
+      'Character'
+      'String'
+      'Decimal'
+      'Hexadecimal'
+      'Floating Point'
+      'Pointer'
+      'Record/Structure'
+      'Default'
+      'Memory Dump'
+    )
+    COLUMNS = 3
+    LEFT = 15
+    HEIGHT = 70
+    TOP = 90
+    WIDTH = 390
+  end
+  object TBUTTON
+    MODALRESULT = 1
+    CAPTION = 'OK'
+    FONT.COLOR = -2147483640
+    LEFT = 170
+    HEIGHT = 25
+    TOP = 170
+    WIDTH = 75
+  end
+  object TBUTTON
+    MODALRESULT = 2
+    CAPTION = 'Cancel'
+    FONT.COLOR = -2147483640
+    LEFT = 250
+    HEIGHT = 25
+    TOP = 170
+    WIDTH = 75
+  end
+  object TBUTTON
+    CAPTION = 'Help'
+    FONT.COLOR = -2147483640
+    LEFT = 330
+    HEIGHT = 25
+    TOP = 170
+    WIDTH = 75
+  end
+end

ide/twatchesdlg.lfm

@@ -0,0 +1,21 @@
+object WatchesDlg: TWATCHESDLG
+  CAPTION = 'Watches'
+  COLOR = -2147483633
+  CLIENTHEIGHT = 100
+  CLIENTWIDTH = 250
+  POSITION = poscreencenter
+  LEFT = 515
+  HEIGHT = 100
+  TOP = 462
+  WIDTH = 250
+  object ListBox1: TLISTBOX
+    ALIGN = alclient
+    BORDERSTYLE = bssingle
+    ONKEYPRESS = nil
+    ONKEYDOWN = nil
+    LEFT = 1
+    HEIGHT = 25
+    TOP = 1
+    WIDTH = 100
+  end
+end

ide/watches_dlg.lrs

@@ -0,0 +1,8 @@
+  LazarusResources.Add('TWATCHESDLG','FORMDATA',
+    'TPF0'#11'TWATCHESDLG'#10'WatchesDlg'#7'CAPTION'#6#7'Watches'#5'COLOR'#4#15
+    +#0#0#128#12'CLIENTHEIGHT'#2'd'#11'CLIENTWIDTH'#3#250#0#8'POSITION'#7#14'p'
+    +'oscreencenter'#4'LEFT'#3#3#2#6'HEIGHT'#2'd'#3'TOP'#3#206#1#5'WIDTH'#3#250
+    +#0#0#8'TLISTBOX'#8'ListBox1'#5'ALIGN'#7#8'alclient'#11'BORDERSTYLE'#7#8'b'
+    +'ssingle'#10'ONKEYPRESS'#13#9'ONKEYDOWN'#13#4'LEFT'#2#1#6'HEIGHT'#2#25#3
+    +'TOP'#2#1#5'WIDTH'#2'd'#0#0#0
+  );

ide/watchesdlg.pp

@@ -51,6 +51,8 @@ implementation
 constructor TWatchesdlg.Create(AOwner : TComponent);
 Begin
   inherited;
+  if LazarusResources.Find(Classname)=nil then
+  begin
   Listbox1 := TListbox.Create(self);
   with Listbox1 do
     Begin
@@ -70,6 +72,13 @@ Begin
   //TListBox currently does NOT fire keypress, keyDown, KeyUp events.  This is a fix for now.
   OnKeyDown := @ListBox1KeyDown;
   Position := poScreenCenter;
+  end;
+  
+  //unitl events are saved in the lfm
+  Listbox1.OnKeyPress := @Listbox1KeyPress;
+  Listbox1.OnKeyDown := @Listbox1KeyDown;
+  //until the listbox events actually fire...
+  OnKeyDown := @ListBox1KeyDown;
 
   InsertWatch := TInsertWatch.Create(nil);
 End;
@@ -122,6 +131,8 @@ end;
 constructor TInsertWatch.Create(AOwner : TComponent);
 Begin
   inherited;
+  if LazarusResources.Find(Classname)=nil then
+  begin
   Width := 420;
   Height := 200;
   Position := poScreenCenter;
@@ -254,7 +265,7 @@ Begin
       Begin
         Parent := self;
         caption := 'OK';
-        Left := (self.width div 2) -25;
+        Left := (self.width div 2) -25 -15;
         Top := Self.Height-30;
         ModalResult := mrOK;
         Visible := TRue;
@@ -265,7 +276,7 @@ Begin
       Begin
         Parent := self;
         caption := 'Cancel';
-        Left := (self.width div 2) -25+Width+5;
+        Left := (self.width div 2) -25+Width+5 -15;
         Top := Self.Height-30;
         ModalResult := mrCancel;
         Visible := TRue;
@@ -276,12 +287,13 @@ Begin
       Begin
         Parent := self;
         caption := 'Help';
-        Left := (self.width div 2) -25+(2*width)+10;
+        Left := (self.width div 2) -25+(2*width)+10 -15;
         Top := Self.Height-30;
 //        ModalResult := mrHelp;
         Enabled := FAlse;
         Visible := TRue;
       end;
+   end;
    
   
 end;
@@ -291,6 +303,11 @@ begin
   inherited;
 end;
 
+initialization
+{$I watches_dlg.lrs}
+{$I insertwatch.lrs}
+
+
 
 end.