|
From: Emilien K. <cur...@us...> - 2005-08-06 16:12:49
|
Update of /cvsroot/wxdevcenter/wxDevCenter/src/unix In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv15026/src/unix Modified Files: Config.cpp Log Message: Change default paths to include install path. Index: Config.cpp =================================================================== RCS file: /cvsroot/wxdevcenter/wxDevCenter/src/unix/Config.cpp,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** Config.cpp 5 Aug 2005 18:59:12 -0000 1.7 --- Config.cpp 6 Aug 2005 16:12:37 -0000 1.8 *************** *** 55,63 **** m_pConfig = new wxConfig(WXDC_SETUP_APPIDENT, WXDC_SETUP_VENDOR); ! m_strInstallPath = ReadConfig(WXDC_CONF_KEYNAME_INSTALLDIR , wxT("/usr")); ! m_strDataPath = ReadConfig(WXDC_CONF_KEYNAME_DATADIR , wxString(wxT("/usr/shared/")) + WXDC_SETUP_APPIDENT + wxT("/data")); ! m_strFeaturesPath = ReadConfig(WXDC_CONF_KEYNAME_FEATURESDIR , wxString(wxT("/usr/lib/")) + WXDC_SETUP_APPIDENT + wxT("/features")); ! m_strPluginsPath = ReadConfig(WXDC_CONF_KEYNAME_PLUGINSDIR , wxString(wxT("/usr/lib/")) + WXDC_SETUP_APPIDENT + wxT("/plugins")); ! m_strConfPath = ReadConfig(WXDC_CONF_KEYNAME_CONFDIR , wxString(wxT("/usr/shared/")) + WXDC_SETUP_APPIDENT + wxT("/conf")); m_strUserConfPath = ReadConfig(WXDC_CONF_KEYNAME_USERCONFDIR , wxGetHomeDir() + wxT("/.") + WXDC_SETUP_APPIDENT + wxT("/conf")); --- 55,63 ---- m_pConfig = new wxConfig(WXDC_SETUP_APPIDENT, WXDC_SETUP_VENDOR); ! m_strInstallPath = ReadConfig(WXDC_CONF_KEYNAME_INSTALLDIR , wxT(wxDC_INSTALL_TARGET)); ! m_strDataPath = ReadConfig(WXDC_CONF_KEYNAME_DATADIR , wxString(wxDC_INSTALL_TARGET) + wxString(wxT("/share/")) + WXDC_SETUP_APPIDENT + wxT("/data")); ! m_strFeaturesPath = ReadConfig(WXDC_CONF_KEYNAME_FEATURESDIR , wxString(wxDC_INSTALL_TARGET) + wxString(wxT("/lib/")) + WXDC_SETUP_APPIDENT + wxT("/features")); ! m_strPluginsPath = ReadConfig(WXDC_CONF_KEYNAME_PLUGINSDIR , wxString(wxDC_INSTALL_TARGET) + wxString(wxT("/lib/")) + WXDC_SETUP_APPIDENT + wxT("/plugins")); ! m_strConfPath = ReadConfig(WXDC_CONF_KEYNAME_CONFDIR , wxString(wxDC_INSTALL_TARGET) + wxString(wxT("/share/")) + WXDC_SETUP_APPIDENT + wxT("/conf")); m_strUserConfPath = ReadConfig(WXDC_CONF_KEYNAME_USERCONFDIR , wxGetHomeDir() + wxT("/.") + WXDC_SETUP_APPIDENT + wxT("/conf")); |