Thread: [Commits] : Tuxbox-GIT: apps branch master updated. CVS-Final-418-ga06c2c6
Tuxbox Sources
Brought to you by:
dbt1
Menu
▾
▴
tuxbox-cvs-commits
|
From: Thilo G. <tux...@ne...> - 2014-10-03 17:19:55
|
Project "Tuxbox-GIT: apps":
The branch, master has been updated
via a06c2c6403315904a2f803ab6417c4c554d072bf (commit)
via e732447ca2f05d66a4f62104f3c2ff2f3b5c3629 (commit)
via 57f9c8b8f10d219e7f8e654939e15f63a194b2a0 (commit)
via 8e0aa4c0b9a0cb55c6b5da795cf2cb66414ab811 (commit)
via 703d44902bdd72a8490aaf90c765997992d87767 (commit)
via 43294adfaa570486a5dd118ffa3d55569e47bcf6 (commit)
via bf71299a4d1a9939273cbd178dc7a2b6c1d9cee2 (commit)
via 11f4071bcc45888c9edad68b3bf0a9e84ea0359d (commit)
via c91f0f579924a2cce9d74f87fadbdf411e2d1aeb (commit)
from d6b9cf22da9ab7ae02fdcf366fee87f396c6015c (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit a06c2c6403315904a2f803ab6417c4c554d072bf
Author: GetAway <get...@t-...>
Date: Sun Sep 28 19:37:57 2014 +0200
input: add utf8_to_latin1 encoding version bump 1.40
Signed-off-by: GetAway <get...@t-...>
Signed-off-by: Thilo Graf <db...@no...>
diff --git a/tuxbox/tools/input/input.c b/tuxbox/tools/input/input.c
index 2e227ce..23d518f 100644
--- a/tuxbox/tools/input/input.c
+++ b/tuxbox/tools/input/input.c
@@ -36,7 +36,7 @@
#define NCF_FILE "/var/tuxbox/config/neutrino.conf"
#define ECF_FILE "/var/tuxbox/config/engima/config"
#define BUFSIZE 1024
-#define I_VERSION 1.39
+#define I_VERSION 1.40
#define FONT "/share/fonts/pakenham.ttf"
diff --git a/tuxbox/tools/input/text.c b/tuxbox/tools/input/text.c
index 5cabd92..cde98c8 100644
--- a/tuxbox/tools/input/text.c
+++ b/tuxbox/tools/input/text.c
@@ -155,8 +155,8 @@ int stringlen = 0;
int RenderString(char *string, int sx, int sy, int maxwidth, int layout, int size, int color)
{
- int stringlen, ex, charwidth,i,found;
- char rstr[256], *rptr=rstr, rc;
+ int stringlen = 0, ex = 0, charwidth = 0, i = 0, found = 0;
+ char rstr[256]={0}, *rptr=rstr, rc=' ';
int varcolor=color;
//set size
@@ -232,6 +232,50 @@ int RenderString(char *string, int sx, int sy, int maxwidth, int layout, int siz
}
else
{
+ int uml = 0;
+ switch(*rptr) /* skip Umlauts */
+ {
+ case '\xc4':
+ case '\xd6':
+ case '\xdc':
+ case '\xe4':
+ case '\xf6':
+ case '\xfc':
+ case '\xdf': uml=1; break;
+ }
+ if (uml == 0)
+ {
+ // UTF8_to_Latin1 encoding
+ if (((*rptr) & 0xf0) == 0xf0) /* skip (can't be encoded in Latin1) */
+ {
+ rptr++;
+ if ((*rptr) == 0)
+ *rptr='\x3f'; // ? question mark
+ rptr++;
+ if ((*rptr) == 0)
+ *rptr='\x3f';
+ rptr++;
+ if ((*rptr) == 0)
+ *rptr='\x3f';
+ }
+ else if (((*rptr) & 0xe0) == 0xe0) /* skip (can't be encoded in Latin1) */
+ {
+ rptr++;
+ if ((*rptr) == 0)
+ *rptr='\x3f';
+ rptr++;
+ if ((*rptr) == 0)
+ *rptr='\x3f';
+ }
+ else if (((*rptr) & 0xc0) == 0xc0)
+ {
+ char c = (((*rptr) & 3) << 6);
+ rptr++;
+ if ((*rptr) == 0)
+ *rptr='\x3f';
+ *rptr = (c | ((*rptr) & 0x3f));
+ }
+ }
if((charwidth = RenderChar(*rptr, sx, sy, ex, varcolor)) == -1) return sx; /* string > maxwidth */
sx += charwidth;
}
commit e732447ca2f05d66a4f62104f3c2ff2f3b5c3629
Author: Christian Schuett <Gau...@ho...>
Date: Fri Sep 12 23:20:57 2014 +0200
Neutrino: move theme loading to class CThemes
this avoids keeping default theme data multiple times and removes
duplicate code in classes CNeutrinoApp and CThemes
based on patches by martii <m4...@gm...> in Neutrino-MP Git and
[CST] Focus <foc...@gm...> in Coolstream Git
Signed-off-by: Christian Schuett <Gau...@ho...>
Signed-off-by: Thilo Graf <db...@no...>
diff --git a/tuxbox/neutrino/src/gui/themes.cpp b/tuxbox/neutrino/src/gui/themes.cpp
index 4981d07..000d152 100644
--- a/tuxbox/neutrino/src/gui/themes.cpp
+++ b/tuxbox/neutrino/src/gui/themes.cpp
@@ -46,7 +46,7 @@
#define THEMEDIR THEMESDIR "/"
#define USERDIR "/var" THEMEDIR
-#define FILE_PREFIX ".theme"
+#define FILE_SUFFIX ".theme"
CThemes::CThemes(const neutrino_locale_t title, const char * const IconName)
: themefile('\t')
@@ -84,10 +84,10 @@ int CThemes::exec(CMenuTarget* parent, const std::string & actionKey)
if ( strstr(themeFile.c_str(), "{U}") != 0 )
{
themeFile.erase(0, 3);
- readFile((char*)((std::string)USERDIR + themeFile + FILE_PREFIX).c_str());
+ readFile((char*)((std::string)USERDIR + themeFile + FILE_SUFFIX).c_str());
}
else
- readFile((char*)((std::string)THEMEDIR + themeFile + FILE_PREFIX).c_str());
+ readFile((char*)((std::string)THEMEDIR + themeFile + FILE_SUFFIX).c_str());
}
return res;
}
@@ -185,8 +185,8 @@ int CThemes::Show()
int res = themes.exec(NULL, "");
selected = themes.getSelected();
- if (file_name.length() > 1) {
- saveFile((char*)((std::string)USERDIR + file_name + FILE_PREFIX).c_str());
+ if (file_name.length() > 0) {
+ saveFile((char*)((std::string)USERDIR + file_name + FILE_SUFFIX).c_str());
}
if (hasThemeChanged) {
@@ -293,47 +293,7 @@ void CThemes::readFile(char* themename)
{
if(themefile.loadConfig(themename))
{
- g_settings.menu_Head_alpha = themefile.getInt32( "menu_Head_alpha", 0x00 );
- g_settings.menu_Head_red = themefile.getInt32( "menu_Head_red", 0x00 );
- g_settings.menu_Head_green = themefile.getInt32( "menu_Head_green", 0x0A );
- g_settings.menu_Head_blue = themefile.getInt32( "menu_Head_blue", 0x19 );
- g_settings.menu_Head_Text_alpha = themefile.getInt32( "menu_Head_Text_alpha", 0x00 );
- g_settings.menu_Head_Text_red = themefile.getInt32( "menu_Head_Text_red", 0x5f );
- g_settings.menu_Head_Text_green = themefile.getInt32( "menu_Head_Text_green", 0x46 );
- g_settings.menu_Head_Text_blue = themefile.getInt32( "menu_Head_Text_blue", 0x00 );
- g_settings.menu_Content_alpha = themefile.getInt32( "menu_Content_alpha", 0x14 );
- g_settings.menu_Content_red = themefile.getInt32( "menu_Content_red", 0x00 );
- g_settings.menu_Content_green = themefile.getInt32( "menu_Content_green", 0x0f );
- g_settings.menu_Content_blue = themefile.getInt32( "menu_Content_blue", 0x23 );
- g_settings.menu_Content_Text_alpha = themefile.getInt32( "menu_Content_Text_alpha", 0x00 );
- g_settings.menu_Content_Text_red = themefile.getInt32( "menu_Content_Text_red", 0x64 );
- g_settings.menu_Content_Text_green = themefile.getInt32( "menu_Content_Text_green", 0x64 );
- g_settings.menu_Content_Text_blue = themefile.getInt32( "menu_Content_Text_blue", 0x64 );
- g_settings.menu_Content_Selected_alpha = themefile.getInt32( "menu_Content_Selected_alpha", 0x14 );
- g_settings.menu_Content_Selected_red = themefile.getInt32( "menu_Content_Selected_red", 0x19 );
- g_settings.menu_Content_Selected_green = themefile.getInt32( "menu_Content_Selected_green", 0x37 );
- g_settings.menu_Content_Selected_blue = themefile.getInt32( "menu_Content_Selected_blue", 0x64 );
- g_settings.menu_Content_Selected_Text_alpha = themefile.getInt32( "menu_Content_Selected_Text_alpha", 0x00 );
- g_settings.menu_Content_Selected_Text_red = themefile.getInt32( "menu_Content_Selected_Text_red", 0x00 );
- g_settings.menu_Content_Selected_Text_green = themefile.getInt32( "menu_Content_Selected_Text_green", 0x00 );
- g_settings.menu_Content_Selected_Text_blue = themefile.getInt32( "menu_Content_Selected_Text_blue", 0x00 );
- g_settings.menu_Content_inactive_alpha = themefile.getInt32( "menu_Content_inactive_alpha", 0x14 );
- g_settings.menu_Content_inactive_red = themefile.getInt32( "menu_Content_inactive_red", 0x00 );
- g_settings.menu_Content_inactive_green = themefile.getInt32( "menu_Content_inactive_green", 0x0f );
- g_settings.menu_Content_inactive_blue = themefile.getInt32( "menu_Content_inactive_blue", 0x23 );
- g_settings.menu_Content_inactive_Text_alpha = themefile.getInt32( "menu_Content_inactive_Text_alpha", 0x00 );
- g_settings.menu_Content_inactive_Text_red = themefile.getInt32( "menu_Content_inactive_Text_red", 55 );
- g_settings.menu_Content_inactive_Text_green = themefile.getInt32( "menu_Content_inactive_Text_green", 70 );
- g_settings.menu_Content_inactive_Text_blue = themefile.getInt32( "menu_Content_inactive_Text_blue", 85 );
- g_settings.infobar_alpha = themefile.getInt32( "infobar_alpha", 0x14 );
- g_settings.infobar_red = themefile.getInt32( "infobar_red", 0x00 );
- g_settings.infobar_green = themefile.getInt32( "infobar_green", 0x0e );
- g_settings.infobar_blue = themefile.getInt32( "infobar_blue", 0x23 );
- g_settings.infobar_Text_alpha = themefile.getInt32( "infobar_Text_alpha", 0x00 );
- g_settings.infobar_Text_red = themefile.getInt32( "infobar_Text_red", 0x64 );
- g_settings.infobar_Text_green = themefile.getInt32( "infobar_Text_green", 0x64 );
- g_settings.infobar_Text_blue = themefile.getInt32( "infobar_Text_blue", 0x64 );
-
+ getColors(themefile);
colorSetupNotifier->changeNotify(NONEXISTANT_LOCALE, NULL);
hasThemeChanged = true;
}
@@ -343,105 +303,104 @@ void CThemes::readFile(char* themename)
void CThemes::saveFile(char * themename)
{
- themefile.setInt32( "menu_Head_alpha", g_settings.menu_Head_alpha );
- themefile.setInt32( "menu_Head_red", g_settings.menu_Head_red );
- themefile.setInt32( "menu_Head_green", g_settings.menu_Head_green );
- themefile.setInt32( "menu_Head_blue", g_settings.menu_Head_blue );
- themefile.setInt32( "menu_Head_Text_alpha", g_settings.menu_Head_Text_alpha );
- themefile.setInt32( "menu_Head_Text_red", g_settings.menu_Head_Text_red );
- themefile.setInt32( "menu_Head_Text_green", g_settings.menu_Head_Text_green );
- themefile.setInt32( "menu_Head_Text_blue", g_settings.menu_Head_Text_blue );
- themefile.setInt32( "menu_Content_alpha", g_settings.menu_Content_alpha );
- themefile.setInt32( "menu_Content_red", g_settings.menu_Content_red );
- themefile.setInt32( "menu_Content_green", g_settings.menu_Content_green );
- themefile.setInt32( "menu_Content_blue", g_settings.menu_Content_blue );
- themefile.setInt32( "menu_Content_Text_alpha", g_settings.menu_Content_Text_alpha );
- themefile.setInt32( "menu_Content_Text_red", g_settings.menu_Content_Text_red );
- themefile.setInt32( "menu_Content_Text_green", g_settings.menu_Content_Text_green );
- themefile.setInt32( "menu_Content_Text_blue", g_settings.menu_Content_Text_blue );
- themefile.setInt32( "menu_Content_Selected_alpha", g_settings.menu_Content_Selected_alpha );
- themefile.setInt32( "menu_Content_Selected_red", g_settings.menu_Content_Selected_red );
- themefile.setInt32( "menu_Content_Selected_green", g_settings.menu_Content_Selected_green );
- themefile.setInt32( "menu_Content_Selected_blue", g_settings.menu_Content_Selected_blue );
- themefile.setInt32( "menu_Content_Selected_Text_alpha", g_settings.menu_Content_Selected_Text_alpha );
- themefile.setInt32( "menu_Content_Selected_Text_red", g_settings.menu_Content_Selected_Text_red );
- themefile.setInt32( "menu_Content_Selected_Text_green", g_settings.menu_Content_Selected_Text_green );
- themefile.setInt32( "menu_Content_Selected_Text_blue", g_settings.menu_Content_Selected_Text_blue );
- themefile.setInt32( "menu_Content_inactive_alpha", g_settings.menu_Content_inactive_alpha );
- themefile.setInt32( "menu_Content_inactive_red", g_settings.menu_Content_inactive_red );
- themefile.setInt32( "menu_Content_inactive_green", g_settings.menu_Content_inactive_green );
- themefile.setInt32( "menu_Content_inactive_blue", g_settings.menu_Content_inactive_blue );
- themefile.setInt32( "menu_Content_inactive_Text_alpha", g_settings.menu_Content_inactive_Text_alpha );
- themefile.setInt32( "menu_Content_inactive_Text_red", g_settings.menu_Content_inactive_Text_red );
- themefile.setInt32( "menu_Content_inactive_Text_green", g_settings.menu_Content_inactive_Text_green );
- themefile.setInt32( "menu_Content_inactive_Text_blue", g_settings.menu_Content_inactive_Text_blue );
- themefile.setInt32( "infobar_alpha", g_settings.infobar_alpha );
- themefile.setInt32( "infobar_red", g_settings.infobar_red );
- themefile.setInt32( "infobar_green", g_settings.infobar_green );
- themefile.setInt32( "infobar_blue", g_settings.infobar_blue );
- themefile.setInt32( "infobar_Text_alpha", g_settings.infobar_Text_alpha );
- themefile.setInt32( "infobar_Text_red", g_settings.infobar_Text_red );
- themefile.setInt32( "infobar_Text_green", g_settings.infobar_Text_green );
- themefile.setInt32( "infobar_Text_blue", g_settings.infobar_Text_blue );
-
+ setColors(themefile);
if (!themefile.saveConfig(themename))
printf("[neutrino theme] %s write error\n", themename);
}
-
-
// setup default Color Sheme (Neutrino)
void CThemes::setupDefaultColors()
{
- g_settings.menu_Head_alpha = 0x00;
- g_settings.menu_Head_red = 0x00;
- g_settings.menu_Head_green = 0x0A;
- g_settings.menu_Head_blue = 0x19;
-
- g_settings.menu_Head_Text_alpha = 0x00;
- g_settings.menu_Head_Text_red = 0x5f;
- g_settings.menu_Head_Text_green = 0x46;
- g_settings.menu_Head_Text_blue = 0x00;
-
- g_settings.menu_Content_alpha = 0x14;
- g_settings.menu_Content_red = 0x00;
- g_settings.menu_Content_green = 0x0f;
- g_settings.menu_Content_blue = 0x23;
-
- g_settings.menu_Content_Text_alpha = 0x00;
- g_settings.menu_Content_Text_red = 0x64;
- g_settings.menu_Content_Text_green = 0x64;
- g_settings.menu_Content_Text_blue = 0x64;
-
- g_settings.menu_Content_Selected_alpha = 0x14;
- g_settings.menu_Content_Selected_red = 0x19;
- g_settings.menu_Content_Selected_green = 0x37;
- g_settings.menu_Content_Selected_blue = 0x64;
-
- g_settings.menu_Content_Selected_Text_alpha = 0x00;
- g_settings.menu_Content_Selected_Text_red = 0x00;
- g_settings.menu_Content_Selected_Text_green = 0x00;
- g_settings.menu_Content_Selected_Text_blue = 0x00;
-
- g_settings.menu_Content_inactive_alpha = 0x14;
- g_settings.menu_Content_inactive_red = 0x00;
- g_settings.menu_Content_inactive_green = 0x0f;
- g_settings.menu_Content_inactive_blue = 0x23;
-
- g_settings.menu_Content_inactive_Text_alpha = 0x00;
- g_settings.menu_Content_inactive_Text_red = 55;
- g_settings.menu_Content_inactive_Text_green = 70;
- g_settings.menu_Content_inactive_Text_blue = 85;
-
- g_settings.infobar_alpha = 0x14;
- g_settings.infobar_red = 0x00;
- g_settings.infobar_green = 0x0e;
- g_settings.infobar_blue = 0x23;
-
- g_settings.infobar_Text_alpha = 0x00;
- g_settings.infobar_Text_red = 0x64;
- g_settings.infobar_Text_green = 0x64;
- g_settings.infobar_Text_blue = 0x64;
+ CConfigFile empty(':');
+ getColors(empty);
+}
+
+void CThemes::getColors(CConfigFile &configfile)
+{
+ g_settings.menu_Head_alpha = configfile.getInt32( "menu_Head_alpha", 0x00 );
+ g_settings.menu_Head_red = configfile.getInt32( "menu_Head_red", 0x00 );
+ g_settings.menu_Head_green = configfile.getInt32( "menu_Head_green", 0x0A );
+ g_settings.menu_Head_blue = configfile.getInt32( "menu_Head_blue", 0x19 );
+ g_settings.menu_Head_Text_alpha = configfile.getInt32( "menu_Head_Text_alpha", 0x00 );
+ g_settings.menu_Head_Text_red = configfile.getInt32( "menu_Head_Text_red", 0x5f );
+ g_settings.menu_Head_Text_green = configfile.getInt32( "menu_Head_Text_green", 0x46 );
+ g_settings.menu_Head_Text_blue = configfile.getInt32( "menu_Head_Text_blue", 0x00 );
+ g_settings.menu_Content_alpha = configfile.getInt32( "menu_Content_alpha", 0x14 );
+ g_settings.menu_Content_red = configfile.getInt32( "menu_Content_red", 0x00 );
+ g_settings.menu_Content_green = configfile.getInt32( "menu_Content_green", 0x0f );
+ g_settings.menu_Content_blue = configfile.getInt32( "menu_Content_blue", 0x23 );
+ g_settings.menu_Content_Text_alpha = configfile.getInt32( "menu_Content_Text_alpha", 0x00 );
+ g_settings.menu_Content_Text_red = configfile.getInt32( "menu_Content_Text_red", 0x64 );
+ g_settings.menu_Content_Text_green = configfile.getInt32( "menu_Content_Text_green", 0x64 );
+ g_settings.menu_Content_Text_blue = configfile.getInt32( "menu_Content_Text_blue", 0x64 );
+ g_settings.menu_Content_Selected_alpha = configfile.getInt32( "menu_Content_Selected_alpha", 0x14 );
+ g_settings.menu_Content_Selected_red = configfile.getInt32( "menu_Content_Selected_red", 0x19 );
+ g_settings.menu_Content_Selected_green = configfile.getInt32( "menu_Content_Selected_green", 0x37 );
+ g_settings.menu_Content_Selected_blue = configfile.getInt32( "menu_Content_Selected_blue", 0x64 );
+ g_settings.menu_Content_Selected_Text_alpha = configfile.getInt32( "menu_Content_Selected_Text_alpha", 0x00 );
+ g_settings.menu_Content_Selected_Text_red = configfile.getInt32( "menu_Content_Selected_Text_red", 0x00 );
+ g_settings.menu_Content_Selected_Text_green = configfile.getInt32( "menu_Content_Selected_Text_green", 0x00 );
+ g_settings.menu_Content_Selected_Text_blue = configfile.getInt32( "menu_Content_Selected_Text_blue", 0x00 );
+ g_settings.menu_Content_inactive_alpha = configfile.getInt32( "menu_Content_inactive_alpha", 0x14 );
+ g_settings.menu_Content_inactive_red = configfile.getInt32( "menu_Content_inactive_red", 0x00 );
+ g_settings.menu_Content_inactive_green = configfile.getInt32( "menu_Content_inactive_green", 0x0f );
+ g_settings.menu_Content_inactive_blue = configfile.getInt32( "menu_Content_inactive_blue", 0x23 );
+ g_settings.menu_Content_inactive_Text_alpha = configfile.getInt32( "menu_Content_inactive_Text_alpha", 0x00 );
+ g_settings.menu_Content_inactive_Text_red = configfile.getInt32( "menu_Content_inactive_Text_red", 55 );
+ g_settings.menu_Content_inactive_Text_green = configfile.getInt32( "menu_Content_inactive_Text_green", 70 );
+ g_settings.menu_Content_inactive_Text_blue = configfile.getInt32( "menu_Content_inactive_Text_blue", 85 );
+ g_settings.infobar_alpha = configfile.getInt32( "infobar_alpha", 0x14 );
+ g_settings.infobar_red = configfile.getInt32( "infobar_red", 0x00 );
+ g_settings.infobar_green = configfile.getInt32( "infobar_green", 0x0e );
+ g_settings.infobar_blue = configfile.getInt32( "infobar_blue", 0x23 );
+ g_settings.infobar_Text_alpha = configfile.getInt32( "infobar_Text_alpha", 0x00 );
+ g_settings.infobar_Text_red = configfile.getInt32( "infobar_Text_red", 0x64 );
+ g_settings.infobar_Text_green = configfile.getInt32( "infobar_Text_green", 0x64 );
+ g_settings.infobar_Text_blue = configfile.getInt32( "infobar_Text_blue", 0x64 );
+}
+
+void CThemes::setColors(CConfigFile &configfile)
+{
+ configfile.setInt32( "menu_Head_alpha", g_settings.menu_Head_alpha );
+ configfile.setInt32( "menu_Head_red", g_settings.menu_Head_red );
+ configfile.setInt32( "menu_Head_green", g_settings.menu_Head_green );
+ configfile.setInt32( "menu_Head_blue", g_settings.menu_Head_blue );
+ configfile.setInt32( "menu_Head_Text_alpha", g_settings.menu_Head_Text_alpha );
+ configfile.setInt32( "menu_Head_Text_red", g_settings.menu_Head_Text_red );
+ configfile.setInt32( "menu_Head_Text_green", g_settings.menu_Head_Text_green );
+ configfile.setInt32( "menu_Head_Text_blue", g_settings.menu_Head_Text_blue );
+ configfile.setInt32( "menu_Content_alpha", g_settings.menu_Content_alpha );
+ configfile.setInt32( "menu_Content_red", g_settings.menu_Content_red );
+ configfile.setInt32( "menu_Content_green", g_settings.menu_Content_green );
+ configfile.setInt32( "menu_Content_blue", g_settings.menu_Content_blue );
+ configfile.setInt32( "menu_Content_Text_alpha", g_settings.menu_Content_Text_alpha );
+ configfile.setInt32( "menu_Content_Text_red", g_settings.menu_Content_Text_red );
+ configfile.setInt32( "menu_Content_Text_green", g_settings.menu_Content_Text_green );
+ configfile.setInt32( "menu_Content_Text_blue", g_settings.menu_Content_Text_blue );
+ configfile.setInt32( "menu_Content_Selected_alpha", g_settings.menu_Content_Selected_alpha );
+ configfile.setInt32( "menu_Content_Selected_red", g_settings.menu_Content_Selected_red );
+ configfile.setInt32( "menu_Content_Selected_green", g_settings.menu_Content_Selected_green );
+ configfile.setInt32( "menu_Content_Selected_blue", g_settings.menu_Content_Selected_blue );
+ configfile.setInt32( "menu_Content_Selected_Text_alpha", g_settings.menu_Content_Selected_Text_alpha );
+ configfile.setInt32( "menu_Content_Selected_Text_red", g_settings.menu_Content_Selected_Text_red );
+ configfile.setInt32( "menu_Content_Selected_Text_green", g_settings.menu_Content_Selected_Text_green );
+ configfile.setInt32( "menu_Content_Selected_Text_blue", g_settings.menu_Content_Selected_Text_blue );
+ configfile.setInt32( "menu_Content_inactive_alpha", g_settings.menu_Content_inactive_alpha );
+ configfile.setInt32( "menu_Content_inactive_red", g_settings.menu_Content_inactive_red );
+ configfile.setInt32( "menu_Content_inactive_green", g_settings.menu_Content_inactive_green );
+ configfile.setInt32( "menu_Content_inactive_blue", g_settings.menu_Content_inactive_blue );
+ configfile.setInt32( "menu_Content_inactive_Text_alpha", g_settings.menu_Content_inactive_Text_alpha );
+ configfile.setInt32( "menu_Content_inactive_Text_red", g_settings.menu_Content_inactive_Text_red );
+ configfile.setInt32( "menu_Content_inactive_Text_green", g_settings.menu_Content_inactive_Text_green );
+ configfile.setInt32( "menu_Content_inactive_Text_blue", g_settings.menu_Content_inactive_Text_blue );
+ configfile.setInt32( "infobar_alpha", g_settings.infobar_alpha );
+ configfile.setInt32( "infobar_red", g_settings.infobar_red );
+ configfile.setInt32( "infobar_green", g_settings.infobar_green );
+ configfile.setInt32( "infobar_blue", g_settings.infobar_blue );
+ configfile.setInt32( "infobar_Text_alpha", g_settings.infobar_Text_alpha );
+ configfile.setInt32( "infobar_Text_red", g_settings.infobar_Text_red );
+ configfile.setInt32( "infobar_Text_green", g_settings.infobar_Text_green );
+ configfile.setInt32( "infobar_Text_blue", g_settings.infobar_Text_blue );
}
bool CColorSetupNotifier::changeNotify(const neutrino_locale_t, void *)
diff --git a/tuxbox/neutrino/src/gui/themes.h b/tuxbox/neutrino/src/gui/themes.h
index f82015f..2148dcc 100644
--- a/tuxbox/neutrino/src/gui/themes.h
+++ b/tuxbox/neutrino/src/gui/themes.h
@@ -52,12 +52,15 @@ class CThemes : public CMenuTarget
void saveFile(char* themename);
void readThemes(CMenuWidget &);
void rememberOldTheme(bool remember);
+ void setupDefaultColors();
public:
CThemes(const neutrino_locale_t title = LOCALE_COLORTHEMEMENU_HEAD2, const char * const IconName = NEUTRINO_ICON_COLORS);
~CThemes();
- void setupDefaultColors();
int exec(CMenuTarget* parent, const std::string & actionKey);
+
+ static void getColors(CConfigFile &configfile);
+ static void setColors(CConfigFile &configfile);
};
#endif
diff --git a/tuxbox/neutrino/src/neutrino.cpp b/tuxbox/neutrino/src/neutrino.cpp
index ec360d9..6a1ebcb 100644
--- a/tuxbox/neutrino/src/neutrino.cpp
+++ b/tuxbox/neutrino/src/neutrino.cpp
@@ -107,6 +107,7 @@
#endif
#include "gui/rc_lock.h"
#include "gui/update.h"
+#include "gui/themes.h"
#include <system/setting_helpers.h>
#include <system/settings.h>
@@ -452,57 +453,9 @@ int CNeutrinoApp::loadSetup()
//widget settings
g_settings.widget_fade = configfile.getBool("widget_fade" , true );
- //colors (neutrino defaultcolors)
- g_settings.menu_Head_alpha = configfile.getInt32( "menu_Head_alpha", 0x00 );
- g_settings.menu_Head_red = configfile.getInt32( "menu_Head_red", 0x00 );
- g_settings.menu_Head_green = configfile.getInt32( "menu_Head_green", 0x0A );
- g_settings.menu_Head_blue = configfile.getInt32( "menu_Head_blue", 0x19 );
-
- g_settings.menu_Head_Text_alpha = configfile.getInt32( "menu_Head_Text_alpha", 0x00 );
- g_settings.menu_Head_Text_red = configfile.getInt32( "menu_Head_Text_red", 0x5f );
- g_settings.menu_Head_Text_green = configfile.getInt32( "menu_Head_Text_green", 0x46 );
- g_settings.menu_Head_Text_blue = configfile.getInt32( "menu_Head_Text_blue", 0x00 );
-
- g_settings.menu_Content_alpha = configfile.getInt32( "menu_Content_alpha", 0x14 );
- g_settings.menu_Content_red = configfile.getInt32( "menu_Content_red", 0x00 );
- g_settings.menu_Content_green = configfile.getInt32( "menu_Content_green", 0x0f );
- g_settings.menu_Content_blue = configfile.getInt32( "menu_Content_blue", 0x23 );
-
- g_settings.menu_Content_Text_alpha = configfile.getInt32( "menu_Content_Text_alpha", 0x00 );
- g_settings.menu_Content_Text_red = configfile.getInt32( "menu_Content_Text_red", 0x64 );
- g_settings.menu_Content_Text_green = configfile.getInt32( "menu_Content_Text_green", 0x64 );
- g_settings.menu_Content_Text_blue = configfile.getInt32( "menu_Content_Text_blue", 0x64 );
-
- g_settings.menu_Content_Selected_alpha = configfile.getInt32( "menu_Content_Selected_alpha", 0x14 );
- g_settings.menu_Content_Selected_red = configfile.getInt32( "menu_Content_Selected_red", 0x19 );
- g_settings.menu_Content_Selected_green = configfile.getInt32( "menu_Content_Selected_green", 0x37 );
- g_settings.menu_Content_Selected_blue = configfile.getInt32( "menu_Content_Selected_blue", 0x64 );
-
- g_settings.menu_Content_Selected_Text_alpha = configfile.getInt32( "menu_Content_Selected_Text_alpha", 0x00 );
- g_settings.menu_Content_Selected_Text_red = configfile.getInt32( "menu_Content_Selected_Text_red", 0x00 );
- g_settings.menu_Content_Selected_Text_green = configfile.getInt32( "menu_Content_Selected_Text_green", 0x00 );
- g_settings.menu_Content_Selected_Text_blue = configfile.getInt32( "menu_Content_Selected_Text_blue", 0x00 );
-
- g_settings.menu_Content_inactive_alpha = configfile.getInt32( "menu_Content_inactive_alpha", 0x14 );
- g_settings.menu_Content_inactive_red = configfile.getInt32( "menu_Content_inactive_red", 0x00 );
- g_settings.menu_Content_inactive_green = configfile.getInt32( "menu_Content_inactive_green", 0x0f );
- g_settings.menu_Content_inactive_blue = configfile.getInt32( "menu_Content_inactive_blue", 0x23 );
-
- g_settings.menu_Content_inactive_Text_alpha = configfile.getInt32( "menu_Content_inactive_Text_alpha", 0x00 );
- g_settings.menu_Content_inactive_Text_red = configfile.getInt32( "menu_Content_inactive_Text_red", 55 );
- g_settings.menu_Content_inactive_Text_green = configfile.getInt32( "menu_Content_inactive_Text_green", 70 );
- g_settings.menu_Content_inactive_Text_blue = configfile.getInt32( "menu_Content_inactive_Text_blue", 85 );
-
- g_settings.infobar_alpha = configfile.getInt32( "infobar_alpha", 0x14 );
- g_settings.infobar_red = configfile.getInt32( "infobar_red", 0x00 );
- g_settings.infobar_green = configfile.getInt32( "infobar_green", 0x0e );
- g_settings.infobar_blue = configfile.getInt32( "infobar_blue", 0x23 );
-
- g_settings.infobar_Text_alpha = configfile.getInt32( "infobar_Text_alpha", 0x00 );
- g_settings.infobar_Text_red = configfile.getInt32( "infobar_Text_red", 0x64 );
- g_settings.infobar_Text_green = configfile.getInt32( "infobar_Text_green", 0x64 );
- g_settings.infobar_Text_blue = configfile.getInt32( "infobar_Text_blue", 0x64 );
-
+ //colors
+ CThemes::getColors(configfile);
+
//corners
g_settings.rounded_corners = configfile.getBool("rounded_corners", true);
@@ -1040,56 +993,8 @@ void CNeutrinoApp::saveSetup()
configfile.setBool("widget_fade" , g_settings.widget_fade);
//colors
- configfile.setInt32( "menu_Head_alpha", g_settings.menu_Head_alpha );
- configfile.setInt32( "menu_Head_red", g_settings.menu_Head_red );
- configfile.setInt32( "menu_Head_green", g_settings.menu_Head_green );
- configfile.setInt32( "menu_Head_blue", g_settings.menu_Head_blue );
-
- configfile.setInt32( "menu_Head_Text_alpha", g_settings.menu_Head_Text_alpha );
- configfile.setInt32( "menu_Head_Text_red", g_settings.menu_Head_Text_red );
- configfile.setInt32( "menu_Head_Text_green", g_settings.menu_Head_Text_green );
- configfile.setInt32( "menu_Head_Text_blue", g_settings.menu_Head_Text_blue );
-
- configfile.setInt32( "menu_Content_alpha", g_settings.menu_Content_alpha );
- configfile.setInt32( "menu_Content_red", g_settings.menu_Content_red );
- configfile.setInt32( "menu_Content_green", g_settings.menu_Content_green );
- configfile.setInt32( "menu_Content_blue", g_settings.menu_Content_blue );
-
- configfile.setInt32( "menu_Content_Text_alpha", g_settings.menu_Content_Text_alpha );
- configfile.setInt32( "menu_Content_Text_red", g_settings.menu_Content_Text_red );
- configfile.setInt32( "menu_Content_Text_green", g_settings.menu_Content_Text_green );
- configfile.setInt32( "menu_Content_Text_blue", g_settings.menu_Content_Text_blue );
-
- configfile.setInt32( "menu_Content_Selected_alpha", g_settings.menu_Content_Selected_alpha );
- configfile.setInt32( "menu_Content_Selected_red", g_settings.menu_Content_Selected_red );
- configfile.setInt32( "menu_Content_Selected_green", g_settings.menu_Content_Selected_green );
- configfile.setInt32( "menu_Content_Selected_blue", g_settings.menu_Content_Selected_blue );
-
- configfile.setInt32( "menu_Content_Selected_Text_alpha", g_settings.menu_Content_Selected_Text_alpha );
- configfile.setInt32( "menu_Content_Selected_Text_red", g_settings.menu_Content_Selected_Text_red );
- configfile.setInt32( "menu_Content_Selected_Text_green", g_settings.menu_Content_Selected_Text_green );
- configfile.setInt32( "menu_Content_Selected_Text_blue", g_settings.menu_Content_Selected_Text_blue );
-
- configfile.setInt32( "menu_Content_inactive_alpha", g_settings.menu_Content_inactive_alpha );
- configfile.setInt32( "menu_Content_inactive_red", g_settings.menu_Content_inactive_red );
- configfile.setInt32( "menu_Content_inactive_green", g_settings.menu_Content_inactive_green );
- configfile.setInt32( "menu_Content_inactive_blue", g_settings.menu_Content_inactive_blue );
-
- configfile.setInt32( "menu_Content_inactive_Text_alpha", g_settings.menu_Content_inactive_Text_alpha );
- configfile.setInt32( "menu_Content_inactive_Text_red", g_settings.menu_Content_inactive_Text_red );
- configfile.setInt32( "menu_Content_inactive_Text_green", g_settings.menu_Content_inactive_Text_green );
- configfile.setInt32( "menu_Content_inactive_Text_blue", g_settings.menu_Content_inactive_Text_blue );
-
- configfile.setInt32( "infobar_alpha", g_settings.infobar_alpha );
- configfile.setInt32( "infobar_red", g_settings.infobar_red );...
[truncated message content] |
Thanks for helping keep SourceForge clean.
X