* modules/gui/skins2/*: s/skin_last/skins2-last s/skin_config/skins2-config and fixed saving of skins2 configuration.
* skin_main.cpp
*****************************************************************************
* Copyright (C) 2003 VideoLAN
- * $Id: skin_main.cpp,v 1.5 2004/01/25 23:04:06 asmax Exp $
+ * $Id: skin_main.cpp,v 1.6 2004/02/08 11:23:17 gbazin Exp $
*
* Authors: Cyril Deguet <asmax@via.ecp.fr>
* Olivier Teulière <ipkiss@via.ecp.fr>
{
// Load a theme
ThemeLoader *pLoader = new ThemeLoader( p_intf );
- char *skin_last = config_GetPsz( p_intf, "skin_last" );
+ char *skin_last = config_GetPsz( p_intf, "skins2-last" );
if( skin_last == NULL || !pLoader->load( skin_last ) )
{
#define SKIN_CONFIG_LONG N_("Config of last used skin.")
vlc_module_begin();
- add_string( "skin_last", "", NULL, DEFAULT_SKIN, DEFAULT_SKIN_LONG,
+ add_string( "skins2-last", "", NULL, DEFAULT_SKIN, DEFAULT_SKIN_LONG,
VLC_TRUE );
- add_string( "skin_config", "", NULL, SKIN_CONFIG, SKIN_CONFIG_LONG,
+ add_string( "skins2-config", "", NULL, SKIN_CONFIG, SKIN_CONFIG_LONG,
VLC_TRUE );
set_description( _("Skinnable Interface") );
set_capability( "interface", 30 );
set_callbacks( Open, Close );
- set_program( "svlc" );
+ set_program( "s2vlc" );
vlc_module_end();
-
* theme.cpp
*****************************************************************************
* Copyright (C) 2003 VideoLAN
- * $Id: theme.cpp,v 1.2 2004/01/25 23:04:06 asmax Exp $
+ * $Id: theme.cpp,v 1.3 2004/02/08 11:23:17 gbazin Exp $
*
* Authors: Cyril Deguet <asmax@via.ecp.fr>
* Olivier Teulière <ipkiss@via.ecp.fr>
msg_Dbg( getIntf(), "Loading theme configuration");
// Get config from vlcrc file
- char *save = config_GetPsz( getIntf(), "skin_config" );
+ char *save = config_GetPsz( getIntf(), "skins2-config" );
if( save == NULL )
return;
}
// Save config to file
- config_PutPsz( getIntf(), "skin_config", save );
- config_SaveConfigFile( getIntf(), "skins" );
+ config_PutPsz( getIntf(), "skins2-config", save );
+ config_SaveConfigFile( getIntf(), "skins2" );
// Free memory
delete[] save;
* theme_loader.cpp
*****************************************************************************
* Copyright (C) 2003 VideoLAN
- * $Id: theme_loader.cpp,v 1.8 2004/01/25 23:04:06 asmax Exp $
+ * $Id: theme_loader.cpp,v 1.9 2004/02/08 11:23:17 gbazin Exp $
*
* Authors: Cyril Deguet <asmax@via.ecp.fr>
* Olivier Teulière <ipkiss@via.ecp.fr>
}
// Check if the skin to load is in the config file, to load its config
- char *skin_last = config_GetPsz( getIntf(), "skin_last" );
+ char *skin_last = config_GetPsz( getIntf(), "skins2-last" );
if( skin_last != NULL && fileName == (string)skin_last )
{
// Used to anchor the windows at the beginning
}
else
{
- config_PutPsz( getIntf(), "skin_last", fileName.c_str() );
+ config_PutPsz( getIntf(), "skins2-last", fileName.c_str() );
// Show the windows
pNewTheme->getWindowManager().showAll();
}
* interface, such as command line.
*****************************************************************************
* Copyright (C) 1998-2004 VideoLAN
- * $Id: interface.c,v 1.112 2004/01/25 17:16:06 zorglub Exp $
+ * $Id: interface.c,v 1.113 2004/02/08 11:23:17 gbazin Exp $
*
* Authors: Vincent Seguin <seguin@via.ecp.fr>
*
val.psz_string = "skins"; text.psz_string = "Skins";
var_Change( p_intf, "intf-switch", VLC_VAR_ADDCHOICE, &val, &text );
+ val.psz_string = "skins2"; text.psz_string = "Skins 2";
+ var_Change( p_intf, "intf-switch", VLC_VAR_ADDCHOICE, &val, &text );
val.psz_string = "wxwin"; text.psz_string = "wxWindows";
var_Change( p_intf, "intf-switch", VLC_VAR_ADDCHOICE, &val, &text );