themes: set default theme instead static colors, but hold fallback

Origin commit data
------------------
Branch: ni/coolstream
Commit: 8498f29202
Author: Thilo Graf <dbt@novatux.de>
Date: 2018-04-11 (Wed, 11 Apr 2018)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
This commit is contained in:
2018-04-11 23:58:15 +02:00
committed by vanhofen
parent 61fb43e8fd
commit ce84961da2
4 changed files with 43 additions and 13 deletions

View File

@@ -363,8 +363,8 @@ int CNeutrinoApp::loadSetup(const char * fname)
parentallocked = !access(NEUTRINO_PARENTALLOCKED_FILE, R_OK);
//theme/color options
CThemes::getTheme(configfile);
g_settings.theme_name = configfile.getString("theme_name","");
CThemes::getInstance()->getTheme(configfile);
//NI
g_settings.inetradio_autostart = configfile.getInt32("inetradio_autostart" , 0);
@@ -1234,8 +1234,8 @@ void CNeutrinoApp::saveSetup(const char * fname)
}
//theme/color options
configfile.getString( "theme_name",g_settings.theme_name );
CThemes::setTheme(configfile);
CThemes::getInstance()->setTheme(configfile);
configfile.setString( "theme_name", g_settings.theme_name );
//NI
configfile.setInt32("inetradio_autostart" , g_settings.inetradio_autostart);