* Fixed a stupid bug in the Network dialog.

diff --git a/plugins/win32/network.cpp b/plugins/win32/network.cpp
index c8ac852c768d2e1469f21188db6f80f4f9f7ff42..6b6cc414a9f92f2e2177c497bc41270e7345906c 100644 (file)
--- a/plugins/win32/network.cpp
+++ b/plugins/win32/network.cpp
@@ -48,6 +48,8 @@ __fastcall TNetworkDlg::TNetworkDlg( TComponent* Owner )
 {\r
         char *psz_channel_server;\r
 \r
+        OldRadioValue = 0;\r
+\r
         /* server port */\r
         UpDownUDPPort->Position = config_GetIntVariable( "server-port" );\r
         UpDownMulticastPort->Position = config_GetIntVariable( "server-port" );\r
@@ -56,6 +58,7 @@ __fastcall TNetworkDlg::TNetworkDlg( TComponent* Owner )
         if( config_GetIntVariable( "network-channel" ) )\r
         {\r
             RadioButtonCS->Checked = true;\r
+            RadioButtonCSEnter( RadioButtonCS );\r
         }\r
 \r
         psz_channel_server = config_GetPszVariable( "channel-server" );\r
@@ -66,8 +69,6 @@ __fastcall TNetworkDlg::TNetworkDlg( TComponent* Owner )
         }\r
 \r
         UpDownCSPort->Position = config_GetIntVariable( "channel-port" );\r
-\r
-        OldRadioValue = 0;\r
 }\r
 //---------------------------------------------------------------------------\r
 void __fastcall TNetworkDlg::FormShow( TObject *Sender )\r
@@ -203,28 +204,28 @@ void __fastcall TNetworkDlg::ChangeEnabled( int i_selected )
     }\r
 }\r
 //---------------------------------------------------------------------------\r
-void __fastcall TNetworkDlg::RadioButtonUDPClick( TObject *Sender )\r
+void __fastcall TNetworkDlg::RadioButtonUDPEnter( TObject *Sender )\r
 {\r
     ChangeEnabled( OldRadioValue );\r
     OldRadioValue = 0;\r
     ChangeEnabled( OldRadioValue );\r
 }\r
 //---------------------------------------------------------------------------\r
-void __fastcall TNetworkDlg::RadioButtonMulticastClick( TObject *Sender )\r
+void __fastcall TNetworkDlg::RadioButtonMulticastEnter( TObject *Sender )\r
 {\r
     ChangeEnabled( OldRadioValue );\r
     OldRadioValue = 1;\r
     ChangeEnabled( OldRadioValue );\r
 }\r
 //---------------------------------------------------------------------------\r
-void __fastcall TNetworkDlg::RadioButtonCSClick( TObject *Sender )\r
+void __fastcall TNetworkDlg::RadioButtonCSEnter( TObject *Sender )\r
 {\r
     ChangeEnabled( OldRadioValue );\r
     OldRadioValue = 2;\r
     ChangeEnabled( OldRadioValue );\r
 }\r
 //---------------------------------------------------------------------------\r
-void __fastcall TNetworkDlg::RadioButtonHTTPClick( TObject *Sender )\r
+void __fastcall TNetworkDlg::RadioButtonHTTPEnter( TObject *Sender )\r
 {\r
     ChangeEnabled( OldRadioValue );\r
     OldRadioValue = 3;\r

diff --git a/plugins/win32/network.dfm b/plugins/win32/network.dfm
index 6a67e75d49258776e929cac199cfddf9c378d09a..7e3d5e4c83012996fbe9cc2fd83d9791e3096c16 100644 (file)
--- a/plugins/win32/network.dfm
+++ b/plugins/win32/network.dfm
@@ -328,7 +328,7 @@ object NetworkDlg: TNetworkDlg
       Checked = True\r
       TabOrder = 0\r
       TabStop = True\r
-      OnClick = RadioButtonUDPClick\r
+      OnEnter = RadioButtonUDPEnter\r
     end\r
     object RadioButtonMulticast: TRadioButton\r
       Left = 16\r
@@ -337,7 +337,7 @@ object NetworkDlg: TNetworkDlg
       Height = 17\r
       Caption = 'UDP Multicast'\r
       TabOrder = 1\r
-      OnClick = RadioButtonMulticastClick\r
+      OnEnter = RadioButtonMulticastEnter\r
     end\r
     object RadioButtonCS: TRadioButton\r
       Left = 16\r
@@ -346,7 +346,7 @@ object NetworkDlg: TNetworkDlg
       Height = 17\r
       Caption = 'Channel Server'\r
       TabOrder = 2\r
-      OnClick = RadioButtonCSClick\r
+      OnEnter = RadioButtonCSEnter\r
     end\r
     object RadioButtonHTTP: TRadioButton\r
       Left = 16\r
@@ -355,7 +355,7 @@ object NetworkDlg: TNetworkDlg
       Height = 17\r
       Caption = 'HTTP'\r
       TabOrder = 3\r
-      OnClick = RadioButtonHTTPClick\r
+      OnEnter = RadioButtonHTTPEnter\r
     end\r
     object EditUDPPort: TEdit\r
       Left = 184\r
@@ -384,7 +384,7 @@ object NetworkDlg: TNetworkDlg
       Width = 41\r
       Height = 21\r
       Enabled = False\r
-      TabOrder = 6\r
+      TabOrder = 7\r
       Text = '1234'\r
     end\r
     object UpDownMulticastPort: TUpDown\r
@@ -397,7 +397,7 @@ object NetworkDlg: TNetworkDlg
       Min = 0\r
       Max = 32767\r
       Position = 1234\r
-      TabOrder = 7\r
+      TabOrder = 8\r
       Thousands = False\r
       Wrap = False\r
     end\r
@@ -407,7 +407,7 @@ object NetworkDlg: TNetworkDlg
       Width = 41\r
       Height = 21\r
       Enabled = False\r
-      TabOrder = 8\r
+      TabOrder = 10\r
       Text = '6010'\r
     end\r
     object UpDownCSPort: TUpDown\r
@@ -420,7 +420,7 @@ object NetworkDlg: TNetworkDlg
       Min = 0\r
       Max = 32767\r
       Position = 6010\r
-      TabOrder = 9\r
+      TabOrder = 11\r
       Thousands = False\r
       Wrap = False\r
     end\r
@@ -431,7 +431,7 @@ object NetworkDlg: TNetworkDlg
       Height = 21\r
       Enabled = False\r
       ItemHeight = 13\r
-      TabOrder = 10\r
+      TabOrder = 6\r
     end\r
     object ComboBoxCSAddress: TComboBox\r
       Left = 184\r
@@ -440,7 +440,7 @@ object NetworkDlg: TNetworkDlg
       Height = 21\r
       Enabled = False\r
       ItemHeight = 13\r
-      TabOrder = 11\r
+      TabOrder = 9\r
       Text = '138.195.156.230'\r
       Items.Strings = (\r
         '138.195.159.230')\r

diff --git a/plugins/win32/network.h b/plugins/win32/network.h
index c572f92e0c39c4ecf39351a7a43f60c1aaa138a1..2ccf4d69309d6bebfad9fd58089a07cb2e91d3ce 100644 (file)
--- a/plugins/win32/network.h
+++ b/plugins/win32/network.h
@@ -63,10 +63,10 @@ __published:        // IDE-managed Components
     void __fastcall FormHide( TObject *Sender );\r
     void __fastcall BitBtnCancelClick( TObject *Sender );\r
     void __fastcall BitBtnOkClick( TObject *Sender );\r
-    void __fastcall RadioButtonUDPClick( TObject *Sender );\r
-    void __fastcall RadioButtonMulticastClick( TObject *Sender );\r
-    void __fastcall RadioButtonCSClick( TObject *Sender );\r
-    void __fastcall RadioButtonHTTPClick( TObject *Sender );\r
+    void __fastcall RadioButtonUDPEnter( TObject *Sender );\r
+    void __fastcall RadioButtonMulticastEnter( TObject *Sender );\r
+    void __fastcall RadioButtonCSEnter( TObject *Sender );\r
+    void __fastcall RadioButtonHTTPEnter( TObject *Sender );\r
 private:       // User declarations\r
     int OldRadioValue;\r
     void __fastcall ChangeEnabled( int i_selected );\r