* ./include/config.h: fixed config directory name for windows

 * ./plugins/win32: the network dialog now respects the preferences settings

diff --git a/include/config.h b/include/config.h
index 4bba87df692e1b8bcc18d468f3b91830b4f70238..eaaba17f14f93b843d49fe83d68b932c04f93074 100644 (file)
--- a/include/config.h
+++ b/include/config.h
@@ -49,9 +49,11 @@
 
 /* The configuration file and directory */
 #ifdef SYS_BEOS
-#define CONFIG_DIR                      "config/settings"
+#  define CONFIG_DIR                    "config/settings"
+#elif defined( WIN32 )
+#  define CONFIG_DIR                   "videolan"
 #else
-#define CONFIG_DIR                      ".videolan"
+#  define CONFIG_DIR                    ".videolan"
 #endif
 #define CONFIG_FILE                     "vlcrc"
 

diff --git a/plugins/win32/network.cpp b/plugins/win32/network.cpp
index 094df14c014a52ebdc35510bbed0e52a5bd90206..3385f3af360cf6b4ef47db36bf4990cfd70b1315 100644 (file)
--- a/plugins/win32/network.cpp
+++ b/plugins/win32/network.cpp
@@ -46,6 +46,25 @@ extern struct intf_thread_s *p_intfGlobal;
 __fastcall TNetworkDlg::TNetworkDlg( TComponent* Owner )\r
         : TForm( Owner )\r
 {\r
+        char *psz_channel_server;\r
+\r
+        /* server port */\r
+        UpDownPort->Position = config_GetIntVariable( "server_port" );\r
+\r
+        /* channel server */\r
+        if( config_GetIntVariable( "network_channel" ) )\r
+        {\r
+            CheckBoxChannel->Checked = true;\r
+        }\r
+\r
+        psz_channel_server = config_GetPszVariable( "channel_server" );\r
+        if( psz_channel_server )\r
+        {\r
+            ComboBoxChannel->Text = psz_channel_server;\r
+            free( psz_channel_server );\r
+        }\r
+\r
+        UpDownPortCS->Position = config_GetIntVariable( "channel_port" );\r
 }\r
 //---------------------------------------------------------------------------\r
 void __fastcall TNetworkDlg::FormShow( TObject *Sender )\r

diff --git a/plugins/win32/network.dfm b/plugins/win32/network.dfm
index 44604142debaf13038141046f26fece5ec7c716d..07a19e643be59680beeb9b03870d01cd3d050e08 100644 (file)
--- a/plugins/win32/network.dfm
+++ b/plugins/win32/network.dfm
@@ -1,6 +1,6 @@
 object NetworkDlg: TNetworkDlg\r
-  Left = 368\r
-  Top = 266\r
+  Left = 419\r
+  Top = 281\r
   BorderStyle = bsDialog\r
   Caption = 'Open network'\r
   ClientHeight = 209\r
@@ -306,6 +306,8 @@ object NetworkDlg: TNetworkDlg
       ItemHeight = 13\r
       TabOrder = 2\r
       Text = '138.195.131.10'\r
+      Items.Strings = (\r
+        '138.195.131.10')\r
     end\r
     object ComboBoxBroadcast: TComboBox\r
       Left = 96\r
@@ -316,6 +318,8 @@ object NetworkDlg: TNetworkDlg
       ItemHeight = 13\r
       TabOrder = 3\r
       Text = '138.195.143.255'\r
+      Items.Strings = (\r
+        '138.195.143.255')\r
     end\r
     object UpDownPort: TUpDown\r
       Left = 241\r
@@ -364,6 +368,8 @@ object NetworkDlg: TNetworkDlg
       ItemHeight = 13\r
       TabOrder = 1\r
       Text = '138.195.156.232'\r
+      Items.Strings = (\r
+        '138.195.156.232')\r
     end\r
     object EditPortCS: TEdit\r
       Left = 296\r