mirrors/neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-neutrino/neutrino.git synced 2025-09-15 09:23:43 +02:00
Code Issues Packages Projects Releases Wiki Activity

neutrino: fix file locations. use the predetermined CONFIGDIR instead of hardcoding paths.

Browse Source
This commit is contained in:
[CST] Bas
2013-01-25 10:33:40 +08:00
parent 05bc38eac5
commit 8dfa226920
12 changed files with 16 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/gui/keybind_setup.cpp
View File

@@ -91,7 +91,7 @@ int CKeybindSetup::exec(CMenuTarget* parent, const std::string &actionKey)
CFileFilter fileFilter;
fileFilter.addFilter("conf");
fileBrowser.Filter = &fileFilter;
if (fileBrowser.exec("/var/tuxbox/config") == true) {
if (fileBrowser.exec(CONFIGDIR "") == true) {
CNeutrinoApp::getInstance()->loadKeys(fileBrowser.getSelectedFile()->Name.c_str());
printf("[neutrino keybind_setup] new keys: %s\n", fileBrowser.getSelectedFile()->Name.c_str());
}

2
src/gui/osdlang_setup.cpp
View File

@@ -163,7 +163,7 @@ void COsdLangSetup::showLanguageSetup(CMenuWidget *osdl_setup)
struct dirent **namelist;
int n;
// printf("scanning locale dir now....(perhaps)\n");
char *pfad[] = {(char *) DATADIR "/neutrino/locale",(char *) "/var/tuxbox/config/locale"};
char *pfad[] = {(char *) DATADIR "/neutrino/locale",(char *) CONFIGDIR "/locale"};
osdl_setup->addIntroItems();

2
src/gui/settings_manager.cpp
View File

@@ -71,7 +71,7 @@ int CSettingsManager::exec(CMenuTarget* parent, const std::string &actionKey)
{
fileFilter.addFilter("conf");
fileBrowser.Filter = &fileFilter;
if (fileBrowser.exec("/var/tuxbox/config") == true)
if (fileBrowser.exec(CONFIGDIR "") == true)
{
CNeutrinoApp::getInstance()->loadSetup(fileBrowser.getSelectedFile()->Name.c_str());
CColorSetupNotifier *colorSetupNotifier = new CColorSetupNotifier;

2
src/gui/start_wizard.cpp
View File

@@ -101,7 +101,7 @@ int CStartUpWizard::exec(CMenuTarget* parent, const string & /*actionKey*/)
}
bool init_settings = false;
if (CFEManager::getInstance()->haveSat())
init_settings = file_exists("/var/tuxbox/config/initial/");
init_settings = file_exists(CONFIGDIR "/initial/");
if(init_settings && (res != menu_return::RETURN_EXIT_ALL))
{