Commit ad14a89d authored by Olivier Teulière's avatar Olivier Teulière

 * ./include/config.h: fixed config directory name for windows
 * ./plugins/win32: the network dialog now respects the preferences settings
parent 75824aaf
......@@ -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"
......
......@@ -46,6 +46,25 @@ extern struct intf_thread_s *p_intfGlobal;
__fastcall TNetworkDlg::TNetworkDlg( TComponent* Owner )
: TForm( Owner )
{
char *psz_channel_server;
/* server port */
UpDownPort->Position = config_GetIntVariable( "server_port" );
/* channel server */
if( config_GetIntVariable( "network_channel" ) )
{
CheckBoxChannel->Checked = true;
}
psz_channel_server = config_GetPszVariable( "channel_server" );
if( psz_channel_server )
{
ComboBoxChannel->Text = psz_channel_server;
free( psz_channel_server );
}
UpDownPortCS->Position = config_GetIntVariable( "channel_port" );
}
//---------------------------------------------------------------------------
void __fastcall TNetworkDlg::FormShow( TObject *Sender )
......
object NetworkDlg: TNetworkDlg
Left = 368
Top = 266
Left = 419
Top = 281
BorderStyle = bsDialog
Caption = 'Open network'
ClientHeight = 209
......@@ -306,6 +306,8 @@ object NetworkDlg: TNetworkDlg
ItemHeight = 13
TabOrder = 2
Text = '138.195.131.10'
Items.Strings = (
'138.195.131.10')
end
object ComboBoxBroadcast: TComboBox
Left = 96
......@@ -316,6 +318,8 @@ object NetworkDlg: TNetworkDlg
ItemHeight = 13
TabOrder = 3
Text = '138.195.143.255'
Items.Strings = (
'138.195.143.255')
end
object UpDownPort: TUpDown
Left = 241
......@@ -364,6 +368,8 @@ object NetworkDlg: TNetworkDlg
ItemHeight = 13
TabOrder = 1
Text = '138.195.156.232'
Items.Strings = (
'138.195.156.232')
end
object EditPortCS: TEdit
Left = 296
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment