[Cose-svnmail] SF.net SVN: cose:[1848] trunk/editor

[<nf...@us...>]

Revision: 1848
          http://cose.svn.sourceforge.net/cose/?rev=1848&view=rev
Author:   nfz_
Date:     2010-11-11 00:31:26 +0000 (Thu, 11 Nov 2010)

Log Message:
-----------
Main:
- NNProcSettingsFrm is now auto created at startup and never dies till shutdown.  Solves the bug where the form could be saved with the neural form which would prevent it from being loaded later on.

Modified Paths:
--------------
    trunk/editor/Main.lfm
    trunk/editor/Main.pas

Modified: trunk/editor/Main.lfm
===================================================================
--- trunk/editor/Main.lfm	2010-11-11 00:29:58 UTC (rev 1847)
+++ trunk/editor/Main.lfm	2010-11-11 00:31:26 UTC (rev 1848)
@@ -43,7 +43,6 @@
       Hint = 'Open|'
       Top = 1
       Width = 28
-      Color = clBtnFace
       Glyph.Data = {
         76060000424D7606000000000000360000002800000028000000140000000100
         1000000000004006000000000000000000000000000000000000E03DE03DE03D
@@ -107,7 +106,6 @@
       Hint = 'Save|'
       Top = 1
       Width = 28
-      Color = clBtnFace
       Glyph.Data = {
         76060000424D7606000000000000360000002800000028000000140000000100
         1000000000004006000000000000000000000000000000000000E03DE03DE03D
@@ -659,7 +657,6 @@
         Hint = 'Bring to front'
         Top = 24
         Width = 20
-        Color = clBtnFace
         Glyph.Data = {
           66010000424D6601000000000000760000002800000014000000140000000100
           040000000000F000000000000000000000001000000000000000000000000000
@@ -684,7 +681,6 @@
         Hint = 'Send to back'
         Top = 2
         Width = 20
-        Color = clBtnFace
         Glyph.Data = {
           66010000424D6601000000000000760000002800000014000000140000000100
           040000000000F000000000000000000000001000000000000000000000000000
@@ -719,7 +715,6 @@
         ColorDialog = ColorDialog
         Constraints.MaxHeight = 20
         Caption = 'Font color'
-        Color = clBtnFace
         OnColorChanged = FontColourButtonClick
       end
       object FontComboBox: TComboBox
@@ -848,7 +843,6 @@
         Hint = 'Text Label'
         Top = 2
         Width = 28
-        Color = clBtnFace
         Glyph.Data = {
           96010000424D9601000000000000760000002800000018000000180000000100
           0400000000002001000000000000000000001000000000000000000000000000
@@ -874,7 +868,6 @@
         Hint = 'I/O Number'
         Top = 2
         Width = 28
-        Color = clBtnFace
         Glyph.Data = {
           96010000424D9601000000000000760000002800000018000000180000000100
           0400000000002001000000000000000000001000000000000000000000000000
@@ -901,7 +894,6 @@
         Hint = 'Check Box'
         Top = 2
         Width = 28
-        Color = clBtnFace
         Glyph.Data = {
           96010000424D9601000000000000760000002800000018000000180000000100
           0400000000002001000000000000000000001000000000000000000000000000
@@ -927,7 +919,6 @@
         Hint = 'Radio Button'
         Top = 2
         Width = 28
-        Color = clBtnFace
         Glyph.Data = {
           96010000424D9601000000000000760000002800000018000000180000000100
           0400000000002001000000000000000000001000000000000000000000000000
@@ -953,7 +944,6 @@
         Hint = 'Panel'
         Top = 2
         Width = 28
-        Color = clBtnFace
         Glyph.Data = {
           96010000424D9601000000000000760000002800000018000000180000000100
           0400000000002001000000000000000000001000000000000000000000000000
@@ -979,7 +969,6 @@
         Hint = 'Bevel'
         Top = 2
         Width = 28
-        Color = clBtnFace
         Glyph.Data = {
           96010000424D9601000000000000760000002800000018000000180000000100
           0400000000002001000000000000000000001000000000000000000000000000
@@ -1005,7 +994,6 @@
         Hint = 'I/O Neuron'
         Top = 2
         Width = 28
-        Color = clBtnFace
         Glyph.Data = {
           96010000424D9601000000000000760000002800000018000000180000000100
           0400000000002001000000000000000000001000000000000000000000000000
@@ -1031,7 +1019,6 @@
         Hint = 'Neuron'
         Top = 2
         Width = 28
-        Color = clBtnFace
         Glyph.Data = {
           96010000424D9601000000000000760000002800000018000000180000000100
           0400000000002001000000000000000000001000000000000000000000000000
@@ -1056,7 +1043,6 @@
         Hint = 'Tab Control'
         Top = 2
         Width = 28
-        Color = clBtnFace
         Glyph.Data = {
           96010000424D9601000000000000760000002800000018000000180000000100
           0400000000002001000000000000000000001000000000000000000000000000
@@ -1082,7 +1068,6 @@
         Hint = 'I/O Number and I/O Neuron'
         Top = 2
         Width = 28
-        Color = clBtnFace
         Glyph.Data = {
           96010000424D9601000000000000760000002800000018000000180000000100
           0400000000002001000000000000000000001000000000000000000000000000
@@ -1108,7 +1093,6 @@
         Hint = 'Memo'
         Top = 2
         Width = 28
-        Color = clBtnFace
         Glyph.Data = {
           96010000424D9601000000000000760000002800000018000000180000000100
           0400000000002001000000000000000000001000000000000000000000000000
@@ -1134,7 +1118,6 @@
         Hint = 'Draw Control'
         Top = 2
         Width = 28
-        Color = clBtnFace
         Glyph.Data = {
           96010000424D9601000000000000760000002800000018000000180000000100
           0400000000002001000000000000000000001000000000000000000000000000
@@ -1160,7 +1143,6 @@
         Hint = 'Draw Neuron'
         Top = 2
         Width = 28
-        Color = clBtnFace
         Glyph.Data = {
           96010000424D9601000000000000760000002800000018000000180000000100
           0400000000002001000000000000000000001000000000000000000000000000
@@ -1186,7 +1168,6 @@
         Hint = 'Combo Box'
         Top = 2
         Width = 28
-        Color = clBtnFace
         Glyph.Data = {
           96010000424D9601000000000000760000002800000018000000180000000100
           0400000000002001000000000000000000001000000000000000000000000000
@@ -1212,7 +1193,6 @@
         Hint = 'Dial Gauge'
         Top = 2
         Width = 28
-        Color = clBtnFace
         Glyph.Data = {
           96010000424D9601000000000000760000002800000018000000180000000100
           04000000000020010000130B0000130B00001000000010000000000000000000

Modified: trunk/editor/Main.pas
===================================================================
--- trunk/editor/Main.pas	2010-11-11 00:29:58 UTC (rev 1847)
+++ trunk/editor/Main.pas	2010-11-11 00:31:26 UTC (rev 1848)
@@ -553,6 +553,7 @@
     ActiveNeuralPages := NeuralPage;
     // if there is no page to edit then turn off designer
     UpdateEditMenus;
+    NNProcSettingsFrm.SetNeuralPage(ActiveNeuralPages);
   end;
 end;
 
@@ -641,8 +642,9 @@
 begin
   if assigned(ActiveNeuralPages) then
   begin
-    TNNProcSettingsFrm.Create(ActiveNeuralPages);
-  end;
+    NNProcSettingsFrm.Show;
+  end
+  else NNProcSettingsFrm.SetNeuralPage(Nil);
 end;
 
 procedure TMainForm.AboutNFClick(Sender: TObject);


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.