Thread: [Commits] [Tuxbox-GIT] Tuxbox-GIT: apps branch master updated. CVS-Final-26-gaeec2ae
Tuxbox Sources
Brought to you by:
dbt1
Menu
▾
▴
tuxbox-cvs-commits
|
From: Thilo G. <tux...@ne...> - 2012-12-21 22:19:57
|
Project "Tuxbox-GIT: apps":
The branch, master has been updated
via aeec2aea76430499e40c9c8a98e1b32d0df15379 (commit)
via 351fe6d6a0c8c8715887d02e07c9b80e0677f1f2 (commit)
via c663a48ec1c6d2a7969fa9a8c5d024c4d026e27b (commit)
via 498641dff82f450284ca9f5582819f786fcb1d22 (commit)
via 5586a6af552f2375953157fcf7e7d9cc90a7fd9a (commit)
via 2d58153e492108f094ba12b9a46d45e00265fd87 (commit)
via 60c7b6f76b8aa0481e9f15da00231cad79777deb (commit)
via f737b571bd8136a94ce62f69883f2f488d253e6d (commit)
via 8ea6e2018875e6d9e58b83843db0acc14243f804 (commit)
via 3c891e5df0021a7f57cb3400ecb2752c69ec25d4 (commit)
via 4c502095df0dadaeba0bcb6188ade38d2c538670 (commit)
via 16b5095c16dd1546274df02ea3bc04790178d0cd (commit)
via 4150b22fdf5045a9b2148011b94f4e5f902414c7 (commit)
via 77ce5765bedac2eb21564f5d70693250c641a8d4 (commit)
via 6083e4247a44c6be12848659e2954ebfb7c201aa (commit)
via 6c6ca237bd52ed267b83625f612fa0295bfaf240 (commit)
via 963122180bb56ef5dac9ceaef3be2a197405757b (commit)
via 42fe1e8052ff522647558b896a40ba7c519a2716 (commit)
via 590a1cc04629fd022ebdd16fddb10c881e597eb0 (commit)
via 4719e3de369e74e42923e3119029307a2da09018 (commit)
via d55167546097b02a1644f744464ac1209914bc43 (commit)
via 70be40cc91517c5936881d880372fe5569b5df02 (commit)
via 44eddc2ae98f0d4be0d9dd2210183a364a0cadc8 (commit)
via e1d6f210e46d330429f1470f465deced70dd6fcd (commit)
via cc93e6d3a54bbf18b9472c88311397bbd324f5ef (commit)
via d5c485e9704d890f9f1ef3b3fd794198ea93bf67 (commit)
from 26e9965a087d64ca79cff16edd50a6a382c4ce98 (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 aeec2aea76430499e40c9c8a98e1b32d0df15379
Author: Gaucho316 <Gau...@ho...>
Date: Wed Dec 19 19:22:46 2012 +0100
yWeb: close td tag in timer list
Signed-off-by: Gaucho316 <Gau...@ho...>
diff --git a/tuxbox/neutrino/daemons/nhttpd/web/Y_Timer_List.yhtm b/tuxbox/neutrino/daemons/nhttpd/web/Y_Timer_List.yhtm
index 0c86b68..fe51083 100644
--- a/tuxbox/neutrino/daemons/nhttpd/web/Y_Timer_List.yhtm
+++ b/tuxbox/neutrino/daemons/nhttpd/web/Y_Timer_List.yhtm
@@ -24,7 +24,7 @@
<td>%s</td>
<td>%s</td>
<td>%s</td>
- <td>%s<br/>
+ <td>%s</td>
<td>
<a href="/fb/timer.dbox2?action=remove&id=%d">
<img src="/images/remove.png" alt="Timer löschen"/></a>
commit 351fe6d6a0c8c8715887d02e07c9b80e0677f1f2
Author: Gaucho316 <Gau...@ho...>
Date: Wed Dec 19 19:22:34 2012 +0100
nhttpd: fix segfault if logging is on, ported from Coolstream Git
Signed-off-by: Gaucho316 <Gau...@ho...>
diff --git a/tuxbox/neutrino/daemons/nhttpd/yhttpd_core/ylogging.cpp b/tuxbox/neutrino/daemons/nhttpd/yhttpd_core/ylogging.cpp
index 1c5859a..9a98d65 100644
--- a/tuxbox/neutrino/daemons/nhttpd/yhttpd_core/ylogging.cpp
+++ b/tuxbox/neutrino/daemons/nhttpd/yhttpd_core/ylogging.cpp
@@ -85,7 +85,9 @@ void CLogging::printf ( const char *fmt, ... )
va_end(arglist);
pthread_mutex_lock( &Log_mutex );
- ::printf(buffer);
+ buffer[bufferlen - 1] = '\0';
+ ::printf("%s", buffer);
+ fflush(stdout);
if(LogToFile)
{
; //FIXME Logging to File
commit c663a48ec1c6d2a7969fa9a8c5d024c4d026e27b
Author: Gaucho316 <Gau...@ho...>
Date: Wed Dec 19 19:22:22 2012 +0100
Neutrino bouquet list: show selected list entry on LCD
Signed-off-by: Gaucho316 <Gau...@ho...>
diff --git a/tuxbox/neutrino/src/gui/bouquetlist.cpp b/tuxbox/neutrino/src/gui/bouquetlist.cpp
index b8b60f8..3f36106 100644
--- a/tuxbox/neutrino/src/gui/bouquetlist.cpp
+++ b/tuxbox/neutrino/src/gui/bouquetlist.cpp
@@ -181,6 +181,7 @@ int CBouquetList::show()
{
return res;
}
+ CLCD::getInstance()->setMode(CLCD::MODE_MENU_UTF8, g_Locale->getText(LOCALE_BOUQUETLIST_HEAD));
int digits = 1;
int i= Bouquets.size();
@@ -319,6 +320,9 @@ int CBouquetList::show()
};
}
hide();
+
+ CLCD::getInstance()->setMode(CLCD::MODE_TVRADIO);
+
if(zapOnExit)
{
return (selected);
@@ -363,6 +367,9 @@ void CBouquetList::paintItem(int pos)
char tmp[10];
sprintf((char*) tmp, "%d", liststart+pos+ 1);
+ if (liststart + pos == selected)
+ CLCD::getInstance()->showMenuText(0, bouq->channelList->getName(), -1, true); // UTF-8
+
int numpos = x+5+numwidth- g_Font[SNeutrinoSettings::FONT_TYPE_CHANNELLIST_NUMBER]->getRenderWidth(tmp);
g_Font[SNeutrinoSettings::FONT_TYPE_CHANNELLIST_NUMBER]->RenderString(numpos,ypos+fheight, numwidth+5, tmp, color, fheight);
commit 498641dff82f450284ca9f5582819f786fcb1d22
Author: Gaucho316 <Gau...@ho...>
Date: Wed Dec 19 19:22:10 2012 +0100
Neutrino plugin list: show selected list entry on LCD
Signed-off-by: Gaucho316 <Gau...@ho...>
diff --git a/tuxbox/neutrino/src/gui/pluginlist.cpp b/tuxbox/neutrino/src/gui/pluginlist.cpp
index dde2fb1..b4a6469 100644
--- a/tuxbox/neutrino/src/gui/pluginlist.cpp
+++ b/tuxbox/neutrino/src/gui/pluginlist.cpp
@@ -292,6 +292,12 @@ void CPluginList::paintItem(int pos)
pluginitem* actplugin = pluginlist[liststart+pos];
g_Font[SNeutrinoSettings::FONT_TYPE_GAMELIST_ITEMLARGE]->RenderString(x+10, ypos+fheight1+3, width-20, actplugin->name, color, 0, true); // UTF-8
g_Font[SNeutrinoSettings::FONT_TYPE_GAMELIST_ITEMSMALL]->RenderString(x+20, ypos+fheight, width-20, actplugin->desc, color, 0, true); // UTF-8
+
+ if(liststart+pos==selected)
+ {
+ CLCD::getInstance()->showMenuText(0, actplugin->name.c_str(), -1, true); // UTF-8
+ CLCD::getInstance()->showMenuText(1, actplugin->desc.c_str(), -1, true); // UTF-8
+ }
}
}
@@ -340,6 +346,8 @@ void CPluginList::paint()
liststart = (selected/listmaxshow)*listmaxshow;
+ CLCD::getInstance()->setMode(CLCD::MODE_MENU_UTF8, g_Locale->getText(name));
+
paintHead();
paintItems();
}
commit 5586a6af552f2375953157fcf7e7d9cc90a7fd9a
Author: Gaucho316 <Gau...@ho...>
Date: Wed Dec 19 19:21:55 2012 +0100
Neutrino moviebrowser: show message when deleting files, ported from Coolstream Git
Signed-off-by: Gaucho316 <Gau...@ho...>
diff --git a/tuxbox/neutrino/data/locale/deutsch.locale b/tuxbox/neutrino/data/locale/deutsch.locale
index 1132905..e6e7f9e 100644
--- a/tuxbox/neutrino/data/locale/deutsch.locale
+++ b/tuxbox/neutrino/data/locale/deutsch.locale
@@ -802,6 +802,7 @@ moviebrowser.browser_row_item Spalteninfo
moviebrowser.browser_row_nr Anzahl Spalten
moviebrowser.browser_row_width Spaltenbreite [Punkte]
moviebrowser.change_view Ansicht wechseln
+moviebrowser.delete_info Lösche Dateien, bitte warten...
moviebrowser.dir Pfad
moviebrowser.dir_head Zusätzliche Verzeichnisse
moviebrowser.edit_book Bookmark ändern
diff --git a/tuxbox/neutrino/data/locale/english.locale b/tuxbox/neutrino/data/locale/english.locale
index c4f7424..f634001 100644
--- a/tuxbox/neutrino/data/locale/english.locale
+++ b/tuxbox/neutrino/data/locale/english.locale
@@ -802,6 +802,7 @@ moviebrowser.browser_row_item Row item
moviebrowser.browser_row_nr Number of rows
moviebrowser.browser_row_width Row width
moviebrowser.change_view Change view
+moviebrowser.delete_info Delete files, please wait...
moviebrowser.dir Path
moviebrowser.dir_head Additional paths
moviebrowser.edit_book Bookmark change
diff --git a/tuxbox/neutrino/src/gui/moviebrowser.cpp b/tuxbox/neutrino/src/gui/moviebrowser.cpp
index 346a8ba..42a8510 100644
--- a/tuxbox/neutrino/src/gui/moviebrowser.cpp
+++ b/tuxbox/neutrino/src/gui/moviebrowser.cpp
@@ -2169,6 +2169,9 @@ void CMovieBrowser::onDeleteFile(MI_MOVIE_INFO& movieSelectionHandler)
msg += g_Locale->getText(LOCALE_FILEBROWSER_DODELETE2);
if (ShowMsgUTF(LOCALE_FILEBROWSER_DELETE, msg, CMessageBox::mbrNo, CMessageBox::mbYes|CMessageBox::mbNo)==CMessageBox::mbrYes)
{
+ CHintBox hintBox(LOCALE_MESSAGEBOX_INFO, g_Locale->getText(LOCALE_MOVIEBROWSER_DELETE_INFO));
+ hintBox.paint();
+
CFile file_xml = movieSelectionHandler.file;
if(m_movieInfo.convertTs2XmlName(&file_xml.Name) == true)
{
@@ -2177,6 +2180,9 @@ void CMovieBrowser::onDeleteFile(MI_MOVIE_INFO& movieSelectionHandler)
delFile(movieSelectionHandler.file);
+ hintBox.hide();
+ g_RCInput->clearRCMsg();
+
m_vMovieInfo.erase( (std::vector<MI_MOVIE_INFO>::iterator)&movieSelectionHandler);
updateSerienames();
refreshBrowserList();
diff --git a/tuxbox/neutrino/src/system/locals.h b/tuxbox/neutrino/src/system/locals.h
index bda245e..82672b9 100644
--- a/tuxbox/neutrino/src/system/locals.h
+++ b/tuxbox/neutrino/src/system/locals.h
@@ -829,6 +829,7 @@ typedef enum
LOCALE_MOVIEBROWSER_BROWSER_ROW_NR,
LOCALE_MOVIEBROWSER_BROWSER_ROW_WIDTH,
LOCALE_MOVIEBROWSER_CHANGE_VIEW,
+ LOCALE_MOVIEBROWSER_DELETE_INFO,
LOCALE_MOVIEBROWSER_DIR,
LOCALE_MOVIEBROWSER_DIR_HEAD,
LOCALE_MOVIEBROWSER_EDIT_BOOK,
diff --git a/tuxbox/neutrino/src/system/locals_intern.h b/tuxbox/neutrino/src/system/locals_intern.h
index 297d537..c982b1f 100644
--- a/tuxbox/neutrino/src/system/locals_intern.h
+++ b/tuxbox/neutrino/src/system/locals_intern.h
@@ -829,6 +829,7 @@ const char * locale_real_names[] =
"moviebrowser.browser_row_nr",
"moviebrowser.browser_row_width",
"moviebrowser.change_view",
+ "moviebrowser.delete_info",
"moviebrowser.dir",
"moviebrowser.dir_head",
"moviebrowser.edit_book",
commit 2d58153e492108f094ba12b9a46d45e00265fd87
Author: Gaucho316 <Gau...@ho...>
Date: Wed Dec 19 19:21:39 2012 +0100
Neutrino: add some special chars to CStringInputSMS
Signed-off-by: Gaucho316 <Gau...@ho...>
diff --git a/tuxbox/neutrino/src/gui/bedit/bouqueteditor_bouquets.cpp b/tuxbox/neutrino/src/gui/bedit/bouqueteditor_bouquets.cpp
index 575672a..1ec7a6e 100644
--- a/tuxbox/neutrino/src/gui/bedit/bouqueteditor_bouquets.cpp
+++ b/tuxbox/neutrino/src/gui/bedit/bouqueteditor_bouquets.cpp
@@ -514,7 +514,7 @@ std::string CBEBouquetWidget::inputName(const char * const defaultName, const ne
strncpy(Name, defaultName, 30);
- CStringInputSMS * nameInput = new CStringInputSMS(caption, Name, 29, NONEXISTANT_LOCALE, NONEXISTANT_LOCALE, "abcdefghijklmnopqrstuvwxyz\xE4\xF6\xFC\xDF""0123456789-.,:|!?/ ");
+ CStringInputSMS * nameInput = new CStringInputSMS(caption, Name, 29, NONEXISTANT_LOCALE, NONEXISTANT_LOCALE, "abcdefghijklmnopqrstuvwxyz\xE4\xF6\xFC\xDF""0123456789-_/()<>=.,:!?\\'\"& ");
nameInput->exec(this, "");
delete nameInput;
diff --git a/tuxbox/neutrino/src/gui/eventlist.cpp b/tuxbox/neutrino/src/gui/eventlist.cpp
index bae5e23..f4ea133 100644
--- a/tuxbox/neutrino/src/gui/eventlist.cpp
+++ b/tuxbox/neutrino/src/gui/eventlist.cpp
@@ -1166,7 +1166,7 @@ int CEventFinderMenu::showMenu(void)
m_search_channelname = "";
}
- CStringInputSMS stringInput(LOCALE_EVENTFINDER_KEYWORD, m_search_keyword, 20, false, NONEXISTANT_LOCALE, NONEXISTANT_LOCALE, "abcdefghijklmnopqrstuvwxyz\xE4\xF6\xFC\xDF""0123456789-.: ");
+ CStringInputSMS stringInput(LOCALE_EVENTFINDER_KEYWORD, m_search_keyword, 20, false, NONEXISTANT_LOCALE, NONEXISTANT_LOCALE, "abcdefghijklmnopqrstuvwxyz\xE4\xF6\xFC\xDF""0123456789-_/()<>=.,:!?\\'\"& ");
CMenuForwarder* mf0 = new CMenuForwarder(LOCALE_EVENTFINDER_KEYWORD, true, *m_search_keyword, &stringInput, NULL, CRCInput::RC_1, NEUTRINO_ICON_BUTTON_1);
CMenuOptionChooser* mo0 = new CMenuOptionChooser(LOCALE_EVENTFINDER_SEARCH_WITHIN_LIST, m_search_list, SEARCH_LIST_OPTIONS, SEARCH_LIST_OPTION_COUNT, true, this, CRCInput::RC_2, NEUTRINO_ICON_BUTTON_2);
diff --git a/tuxbox/neutrino/src/gui/moviebrowser.cpp b/tuxbox/neutrino/src/gui/moviebrowser.cpp
index 0c492f8..346a8ba 100644
--- a/tuxbox/neutrino/src/gui/moviebrowser.cpp
+++ b/tuxbox/neutrino/src/gui/moviebrowser.cpp
@@ -2978,7 +2978,7 @@ int CMovieBrowser::showMovieInfoMenu(MI_MOVIE_INFO* movie_info)
{
pBookItemMenuForwarderNotifier[i] = new CBookItemMenuForwarderNotifier();
- pBookNameInput[i] = new CStringInputSMS (LOCALE_MOVIEBROWSER_EDIT_BOOK, &movie_info->bookmarks.user[i].name, 20, true, LOCALE_MOVIEBROWSER_EDIT_BOOK_NAME_INFO1, LOCALE_MOVIEBROWSER_EDIT_BOOK_NAME_INFO2, "abcdefghijklmnopqrstuvwxyz\xE4\xF6\xFC\xDF""0123456789-.: ", pBookItemMenuForwarderNotifier[i]);
+ pBookNameInput[i] = new CStringInputSMS (LOCALE_MOVIEBROWSER_EDIT_BOOK, &movie_info->bookmarks.user[i].name, 20, true, LOCALE_MOVIEBROWSER_EDIT_BOOK_NAME_INFO1, LOCALE_MOVIEBROWSER_EDIT_BOOK_NAME_INFO2, "abcdefghijklmnopqrstuvwxyz\xE4\xF6\xFC\xDF""0123456789-_/()<>=.,:!?\\'\"& ", pBookItemMenuForwarderNotifier[i]);
pBookPosIntInput[i] = new CIntInput (LOCALE_MOVIEBROWSER_EDIT_BOOK, (long&) movie_info->bookmarks.user[i].pos, 20, LOCALE_MOVIEBROWSER_EDIT_BOOK_POS_INFO1, LOCALE_MOVIEBROWSER_EDIT_BOOK_POS_INFO2);
pBookTypeIntInput[i] = new CIntInput (LOCALE_MOVIEBROWSER_EDIT_BOOK, (long&) movie_info->bookmarks.user[i].length, 20, LOCALE_MOVIEBROWSER_EDIT_BOOK_TYPE_INFO1, LOCALE_MOVIEBROWSER_EDIT_BOOK_TYPE_INFO2);
@@ -2996,7 +2996,7 @@ int CMovieBrowser::showMovieInfoMenu(MI_MOVIE_INFO* movie_info)
/********************************************************************/
/** serie******************************************************/
- CStringInputSMS serieUserInput(LOCALE_MOVIEBROWSER_EDIT_SERIE, &movie_info->serieName, 20, true, LOCALE_GENERIC_EMPTY, LOCALE_GENERIC_EMPTY, "abcdefghijklmnopqrstuvwxyz\xE4\xF6\xFC\xDF""0123456789-.: ");
+ CStringInputSMS serieUserInput(LOCALE_MOVIEBROWSER_EDIT_SERIE, &movie_info->serieName, 20, true, LOCALE_GENERIC_EMPTY, LOCALE_GENERIC_EMPTY, "abcdefghijklmnopqrstuvwxyz\xE4\xF6\xFC\xDF""0123456789-_/()<>=.,:!?\\'\"& ");
CMenuWidget serieMenu(LOCALE_MOVIEBROWSER_INFO_HEAD, NEUTRINO_ICON_STREAMING);
serieMenu.addIntroItems(LOCALE_MOVIEBROWSER_SERIE_HEAD);
@@ -3040,13 +3040,13 @@ int CMovieBrowser::showMovieInfoMenu(MI_MOVIE_INFO* movie_info)
snprintf(size,BUFFER_SIZE,"%5llu",movie_info->file.Size>>20);
}
- CStringInputSMS titelUserInput(LOCALE_MOVIEBROWSER_INFO_TITLE, &movie_info->epgTitle, MAX_STRING, true, LOCALE_GENERIC_EMPTY, LOCALE_GENERIC_EMPTY, "abcdefghijklmnopqrstuvwxyz\xE4\xF6\xFC\xDF""0123456789-.: ");
- CStringInputSMS channelUserInput(LOCALE_MOVIEBROWSER_INFO_CHANNEL, &movie_info->epgChannel, MAX_STRING, true, LOCALE_GENERIC_EMPTY, LOCALE_GENERIC_EMPTY, "abcdefghijklmnopqrstuvwxyz\xE4\xF6\xFC\xDF""0123456789-.: ");
- CStringInputSMS epgUserInput(LOCALE_MOVIEBROWSER_INFO_INFO1, &movie_info->epgInfo1, MAX_STRING, true, LOCALE_GENERIC_EMPTY, LOCALE_GENERIC_EMPTY, "abcdefghijklmnopqrstuvwxyz\xE4\xF6\xFC\xDF""0123456789-.: ");
+ CStringInputSMS titelUserInput(LOCALE_MOVIEBROWSER_INFO_TITLE, &movie_info->epgTitle, MAX_STRING, true, LOCALE_GENERIC_EMPTY, LOCALE_GENERIC_EMPTY, "abcdefghijklmnopqrstuvwxyz\xE4\xF6\xFC\xDF""0123456789-_/()<>=.,:!?\\'\"& ");
+ CStringInputSMS channelUserInput(LOCALE_MOVIEBROWSER_INFO_CHANNEL, &movie_info->epgChannel, MAX_STRING, true, LOCALE_GENERIC_EMPTY, LOCALE_GENERIC_EMPTY, "abcdefghijklmnopqrstuvwxyz\xE4\xF6\xFC\xDF""0123456789-_/()<>=.,:!?\\'\"& ");
+ CStringInputSMS epgUserInput(LOCALE_MOVIEBROWSER_INFO_INFO1, &movie_info->epgInfo1, MAX_STRING, true, LOCALE_GENERIC_EMPTY, LOCALE_GENERIC_EMPTY, "abcdefghijklmnopqrstuvwxyz\xE4\xF6\xFC\xDF""0123456789-_/()<>=.,:!?\\'\"& ");
CDateInput dateUserDateInput(LOCALE_MOVIEBROWSER_INFO_LENGTH, &movie_info->dateOfLastPlay, LOCALE_GENERIC_EMPTY, LOCALE_GENERIC_EMPTY);
CDateInput recUserDateInput(LOCALE_MOVIEBROWSER_INFO_LENGTH, &movie_info->file.Time, LOCALE_GENERIC_EMPTY, LOCALE_GENERIC_EMPTY);
CIntInput lengthUserIntInput(LOCALE_MOVIEBROWSER_INFO_LENGTH, (long&)movie_info->length, 3, LOCALE_GENERIC_EMPTY, LOCALE_GENERIC_EMPTY);
- CStringInputSMS countryUserInput(LOCALE_MOVIEBROWSER_INFO_PRODCOUNTRY, &movie_info->productionCountry, 11, true, LOCALE_GENERIC_EMPTY, LOCALE_GENERIC_EMPTY, "abcdefghijklmnopqrstuvwxyz\xE4\xF6\xFC\xDF""0123456789-.: ");
+ CStringInputSMS countryUserInput(LOCALE_MOVIEBROWSER_INFO_PRODCOUNTRY, &movie_info->productionCountry, 11, true, LOCALE_GENERIC_EMPTY, LOCALE_GENERIC_EMPTY, "abcdefghijklmnopqrstuvwxyz\xE4\xF6\xFC\xDF""0123456789-_/()<>=.,:!?\\'\"& ");
CIntInput yearUserIntInput(LOCALE_MOVIEBROWSER_INFO_PRODYEAR, (long&)movie_info->productionDate, 4, LOCALE_GENERIC_EMPTY, LOCALE_GENERIC_EMPTY);
CMenuWidget movieInfoMenu(LOCALE_MOVIEBROWSER_MENU_MAIN_HEAD, NEUTRINO_ICON_STREAMING, m_cBoxFrame.iWidth);
diff --git a/tuxbox/neutrino/src/gui/widget/stringinput.cpp b/tuxbox/neutrino/src/gui/widget/stringinput.cpp
index 02a84de..b6a28dc 100644
--- a/tuxbox/neutrino/src/gui/widget/stringinput.cpp
+++ b/tuxbox/neutrino/src/gui/widget/stringinput.cpp
@@ -540,7 +540,7 @@ void CStringInputSMS::initSMS(const char * const Valid_Chars)
{
last_digit = -1; // no key pressed yet
const char CharList[10][11] = { "0 -_/()<>=", // 10 characters
- "1.,:!?\\",
+ "1.,:!?\\'\"&",
"abc2\xE4", // 0xE4 == ä
"def3",
"ghi4",
diff --git a/tuxbox/neutrino/src/gui/widget/stringinput.h b/tuxbox/neutrino/src/gui/widget/stringinput.h
index def8dc7..403cab4 100644
--- a/tuxbox/neutrino/src/gui/widget/stringinput.h
+++ b/tuxbox/neutrino/src/gui/widget/stringinput.h
@@ -100,7 +100,7 @@ class CStringInputSMS : public CStringInput
{
bool capsMode;
int arraySizes[10];
- char Chars[10][9]; // maximal 9 character in one CharList entry!
+ char Chars[10][10]; // maximal 10 characters in one CharList entry!
int keyCounter;
int last_digit;
commit 60c7b6f76b8aa0481e9f15da00231cad79777deb
Author: Gaucho316 <Gau...@ho...>
Date: Wed Dec 19 19:21:25 2012 +0100
Neutrino string input: avoid uninitialized access
Signed-off-by: Gaucho316 <Gau...@ho...>
diff --git a/tuxbox/neutrino/src/gui/widget/stringinput.cpp b/tuxbox/neutrino/src/gui/widget/stringinput.cpp
index 56bbdce..02a84de 100644
--- a/tuxbox/neutrino/src/gui/widget/stringinput.cpp
+++ b/tuxbox/neutrino/src/gui/widget/stringinput.cpp
@@ -298,6 +298,7 @@ int CStringInput::exec( CMenuTarget* parent, const std::string & )
for(int count=strlen(value)-1;count<size-1;count++)
strcat(value, " ");
strncpy(oldval, value, size);
+ dispval[0] = 0;
paint();
diff --git a/tuxbox/neutrino/src/gui/widget/stringinput_ext.cpp b/tuxbox/neutrino/src/gui/widget/stringinput_ext.cpp
index 279f13b..8394197 100644
--- a/tuxbox/neutrino/src/gui/widget/stringinput_ext.cpp
+++ b/tuxbox/neutrino/src/gui/widget/stringinput_ext.cpp
@@ -135,6 +135,8 @@ int CExtendedInput::exec( CMenuTarget* parent, const std::string & )
}
strcpy(oldval, value);
+ dispval[0] = 0;
+
paint();
unsigned long long timeoutEnd = CRCInput::calcTimeoutEnd(g_settings.timing[SNeutrinoSettings::TIMING_MENU]);
commit f737b571bd8136a94ce62f69883f2f488d253e6d
Author: Gaucho316 <Gau...@ho...>
Date: Wed Dec 19 19:21:10 2012 +0100
Neutrino: use appropriate icons in some menus
Signed-off-by: Gaucho316 <Gau...@ho...>
diff --git a/tuxbox/neutrino/src/gui/audio_setup.cpp b/tuxbox/neutrino/src/gui/audio_setup.cpp
index 49ce2b6..c58b978 100644
--- a/tuxbox/neutrino/src/gui/audio_setup.cpp
+++ b/tuxbox/neutrino/src/gui/audio_setup.cpp
@@ -126,7 +126,7 @@ int CAudioSetup::showAudioSetup()
CAudioSetupNotifier audioSetupNotifier;
//menue init
- CMenuWidget* audioSettings = new CMenuWidget(LOCALE_MAINSETTINGS_HEAD, NEUTRINO_ICON_SETTINGS, width);
+ CMenuWidget* audioSettings = new CMenuWidget(LOCALE_MAINSETTINGS_HEAD, NEUTRINO_ICON_AUDIO, width);
audioSettings->setPreselected(selected);
// intros
diff --git a/tuxbox/neutrino/src/gui/audioplayer_setup.cpp b/tuxbox/neutrino/src/gui/audioplayer_setup.cpp
index e3152ab..fd59d97 100644
--- a/tuxbox/neutrino/src/gui/audioplayer_setup.cpp
+++ b/tuxbox/neutrino/src/gui/audioplayer_setup.cpp
@@ -105,7 +105,7 @@ const CMenuOptionChooser::keyval AUDIOPLAYER_DISPLAY_ORDER_OPTIONS[AUDIOPLAYER_D
int CAudioPlayerSetup::showAudioPlayerSetup()
/*shows the audio setup menue*/
{
- CMenuWidget* audioplayerSetup = new CMenuWidget(LOCALE_MAINMENU_SETTINGS, NEUTRINO_ICON_SETTINGS, width);
+ CMenuWidget* audioplayerSetup = new CMenuWidget(LOCALE_MAINMENU_SETTINGS, NEUTRINO_ICON_AUDIO, width);
audioplayerSetup->setPreselected(selected);
// intros
diff --git a/tuxbox/neutrino/src/gui/epgplus.cpp b/tuxbox/neutrino/src/gui/epgplus.cpp
index 49a8fd6..f0f59f2 100644
--- a/tuxbox/neutrino/src/gui/epgplus.cpp
+++ b/tuxbox/neutrino/src/gui/epgplus.cpp
@@ -1712,7 +1712,7 @@ int EpgPlus::MenuTargetAddRecordTimer::exec(CMenuTarget*, const std::string&)
std::string recDir = g_settings.recording_dir[0];
if (g_settings.recording_choose_direct_rec_dir && g_settings.recording_type == RECORDING_FILE)
{
- CRecDirChooser recDirs(LOCALE_TIMERLIST_RECORDING_DIR, NEUTRINO_ICON_SETTINGS, NULL, &recDir);
+ CRecDirChooser recDirs(LOCALE_TIMERLIST_RECORDING_DIR, NEUTRINO_ICON_TIMER, NULL, &recDir);
epgPlus->hide();
recDirs.exec(NULL,"");
epgPlus->paint();
diff --git a/tuxbox/neutrino/src/gui/epgview.cpp b/tuxbox/neutrino/src/gui/epgview.cpp
index 1d9e550..2ce0600 100644
--- a/tuxbox/neutrino/src/gui/epgview.cpp
+++ b/tuxbox/neutrino/src/gui/epgview.cpp
@@ -695,7 +695,7 @@ int CEpgData::show(const t_channel_id channel_id, unsigned long long a_id, time_
std::string recDir = g_settings.recording_dir[0];
if (g_settings.recording_choose_direct_rec_dir && g_settings.recording_type == RECORDING_FILE)
{
- CRecDirChooser recDirs(LOCALE_TIMERLIST_RECORDING_DIR,NEUTRINO_ICON_SETTINGS,NULL,&recDir);
+ CRecDirChooser recDirs(LOCALE_TIMERLIST_RECORDING_DIR, NEUTRINO_ICON_TIMER, NULL, &recDir);
hide();
recDirs.exec(NULL,"");
show(channel_id,epgData.eventID,&epgData.epg_times.startzeit,false);
diff --git a/tuxbox/neutrino/src/gui/esd_setup.cpp b/tuxbox/neutrino/src/gui/esd_setup.cpp
index 8266705..fd3d6c9 100644
--- a/tuxbox/neutrino/src/gui/esd_setup.cpp
+++ b/tuxbox/neutrino/src/gui/esd_setup.cpp
@@ -79,7 +79,7 @@ int CEsdSetup::exec(CMenuTarget* parent, const std::string &/*actionKey*/)
int CEsdSetup::showEsdSetup()
/*shows the esd setup menue*/
{
- CMenuWidget* esdSetup = new CMenuWidget(LOCALE_MAINMENU_SETTINGS, NEUTRINO_ICON_SETTINGS, width);
+ CMenuWidget* esdSetup = new CMenuWidget(LOCALE_MAINMENU_SETTINGS, NEUTRINO_ICON_AUDIO, width);
esdSetup->setPreselected(selected);
// intros
diff --git a/tuxbox/neutrino/src/gui/eventlist.cpp b/tuxbox/neutrino/src/gui/eventlist.cpp
index 48a4363..bae5e23 100644
--- a/tuxbox/neutrino/src/gui/eventlist.cpp
+++ b/tuxbox/neutrino/src/gui/eventlist.cpp
@@ -426,7 +426,7 @@ int EventList::exec(const t_channel_id channel_id, const std::string& channelnam
std::string recDir = g_settings.recording_dir[0];
if (g_settings.recording_choose_direct_rec_dir && g_settings.recording_type == RECORDING_FILE)
{
- CRecDirChooser recDirs(LOCALE_TIMERLIST_RECORDING_DIR,NEUTRINO_ICON_SETTINGS,NULL,&recDir);
+ CRecDirChooser recDirs(LOCALE_TIMERLIST_RECORDING_DIR, NEUTRINO_ICON_TIMER, NULL, &recDir);
hide();
recDirs.exec(NULL,"");
paint();
diff --git a/tuxbox/neutrino/src/gui/keybind_setup.cpp b/tuxbox/neutrino/src/gui/keybind_setup.cpp
index 71049e2..deead84 100644
--- a/tuxbox/neutrino/src/gui/keybind_setup.cpp
+++ b/tuxbox/neutrino/src/gui/keybind_setup.cpp
@@ -172,7 +172,7 @@ int CKeybindSetup::showSetup()
CKeyChooser * keychooser[MAX_NUM_KEYNAMES];
for (int i = 0; i < MAX_NUM_KEYNAMES; i++)
- keychooser[i] = new CKeyChooser(keyvalue_p[i], keydescription_head[i], NEUTRINO_ICON_SETTINGS);
+ keychooser[i] = new CKeyChooser(keyvalue_p[i], keydescription_head[i], NEUTRINO_ICON_KEYBINDING);
//remote control
diff --git a/tuxbox/neutrino/src/gui/movieplayer_setup.cpp b/tuxbox/neutrino/src/gui/movieplayer_setup.cpp
index a0c899a..eeac047 100644
--- a/tuxbox/neutrino/src/gui/movieplayer_setup.cpp
+++ b/tuxbox/neutrino/src/gui/movieplayer_setup.cpp
@@ -138,10 +138,10 @@ const CMenuOptionChooser::keyval STREAMINGMENU_STOPSECTIONSD_OPTIONS[STREAMINGME
int CMoviePlayerSetup::showMoviePlayerSetup()
{
- CMenuWidget* mp_setup = new CMenuWidget(LOCALE_MAINMENU_SETTINGS, NEUTRINO_ICON_SETTINGS, width);
+ CMenuWidget* mp_setup = new CMenuWidget(LOCALE_MAINMENU_SETTINGS, NEUTRINO_ICON_STREAMING, width);
mp_setup->setPreselected(selected);
- CMenuWidget* mp_streaming_setup = new CMenuWidget(LOCALE_MAINSETTINGS_STREAMING, NEUTRINO_ICON_SETTINGS, width);
+ CMenuWidget* mp_streaming_setup = new CMenuWidget(LOCALE_MAINSETTINGS_STREAMING, NEUTRINO_ICON_STREAMING, width);
CMenuForwarder* mp_streaming_setup_mf = new CMenuForwarder(LOCALE_STREAMINGMENU_STREAMING_SETTINGS, true, NULL, mp_streaming_setup, NULL, CRCInput::RC_red, NEUTRINO_ICON_BUTTON_RED);
// intros
diff --git a/tuxbox/neutrino/src/gui/pictureviewer_setup.cpp b/tuxbox/neutrino/src/gui/pictureviewer_setup.cpp
index 00ddc13..9cf98e1 100644
--- a/tuxbox/neutrino/src/gui/pictureviewer_setup.cpp
+++ b/tuxbox/neutrino/src/gui/pictureviewer_setup.cpp
@@ -107,7 +107,7 @@ const CMenuOptionChooser::keyval PICTUREVIEWER_SCALING_OPTIONS[PICTUREVIEWER_SCA
int CPictureViewerSetup::showPictureViewerSetup()
/*shows the setup menue*/
{
- CMenuWidget* picviewsetup = new CMenuWidget(LOCALE_MAINMENU_SETTINGS, NEUTRINO_ICON_SETTINGS, width);
+ CMenuWidget* picviewsetup = new CMenuWidget(LOCALE_MAINMENU_SETTINGS, NEUTRINO_ICON_VIDEO, width);
picviewsetup->setPreselected(selected);
// intros: back ande save
diff --git a/tuxbox/neutrino/src/gui/record_setup.cpp b/tuxbox/neutrino/src/gui/record_setup.cpp
index 3ece707..58a8a9c 100644
--- a/tuxbox/neutrino/src/gui/record_setup.cpp
+++ b/tuxbox/neutrino/src/gui/record_setup.cpp
@@ -135,7 +135,7 @@ int CRecordSetup::showRecordSetup()
std::vector<CMenuTarget*> toDelete;
//menue init
- CMenuWidget* recordingSettings = new CMenuWidget(LOCALE_MAINSETTINGS_HEAD, NEUTRINO_ICON_SETTINGS, width);
+ CMenuWidget* recordingSettings = new CMenuWidget(LOCALE_MAINSETTINGS_HEAD, NEUTRINO_ICON_RECORDING, width);
recordingSettings->setPreselected(selected);
//prepare input record server ip
diff --git a/tuxbox/neutrino/src/gui/themes.cpp b/tuxbox/neutrino/src/gui/themes.cpp
index ee5f539..327f1fe 100644
--- a/tuxbox/neutrino/src/gui/themes.cpp
+++ b/tuxbox/neutrino/src/gui/themes.cpp
@@ -190,7 +190,7 @@ int CThemes::Show()
}
if (hasThemeChanged) {
- if (ShowLocalizedMessage(LOCALE_MESSAGEBOX_INFO, LOCALE_COLORTHEMEMENU_QUESTION, CMessageBox::mbrYes, CMessageBox::mbYes | CMessageBox::mbNo, NEUTRINO_ICON_SETTINGS) != CMessageBox::mbrYes)
+ if (ShowLocalizedMessage(LOCALE_MESSAGEBOX_INFO, LOCALE_COLORTHEMEMENU_QUESTION, CMessageBox::mbrYes, CMessageBox::mbYes | CMessageBox::mbNo, menue_icon.c_str()) != CMessageBox::mbrYes)
rememberOldTheme( false );
else
hasThemeChanged = false;
diff --git a/tuxbox/neutrino/src/gui/video_setup.cpp b/tuxbox/neutrino/src/gui/video_setup.cpp
index 3bc3c46..0a4f6b4 100644
--- a/tuxbox/neutrino/src/gui/video_setup.cpp
+++ b/tuxbox/neutrino/src/gui/video_setup.cpp
@@ -122,7 +122,7 @@ const CMenuOptionChooser::keyval VIDEOMENU_VIDEOFORMAT_OPTIONS[VIDEOMENU_VIDEOFO
int CVideoSetup::showVideoSetup()
{
//init
- CMenuWidget * videosetup = new CMenuWidget(LOCALE_MAINSETTINGS_HEAD, NEUTRINO_ICON_SETTINGS, width);
+ CMenuWidget * videosetup = new CMenuWidget(LOCALE_MAINSETTINGS_HEAD, NEUTRINO_ICON_VIDEO, width);
videosetup->setPreselected(selected);
//video signal type
diff --git a/tuxbox/neutrino/src/neutrino.cpp b/tuxbox/neutrino/src/neutrino.cpp
index 6ad952b..218702f 100644
--- a/tuxbox/neutrino/src/neutrino.cpp
+++ b/tuxbox/neutrino/src/neutrino.cpp
@@ -1810,7 +1810,7 @@ bool CNeutrinoApp::doGuiRecord(char * preselectedDir, bool addTimer, char * file
std::string recDir = (preselectedDir != NULL) ? preselectedDir : g_settings.recording_dir[0];
if( preselectedDir == NULL && g_settings.recording_choose_direct_rec_dir)
{
- CRecDirChooser recDirs(LOCALE_TIMERLIST_RECORDING_DIR,NEUTRINO_ICON_SETTINGS,NULL,&recDir);
+ CRecDirChooser recDirs(LOCALE_TIMERLIST_RECORDING_DIR, NEUTRINO_ICON_TIMER, NULL, &recDir);
recDirs.exec(NULL,"");
refreshGui = true;
recDir = recDirs.get_selected_dir();
commit 8ea6e2018875e6d9e58b83843db0acc14243f804
Author: Gaucho316 <Gau...@ho...>
Date: Wed Dec 19 19:20:50 2012 +0100
Neutrino timer list: use timer icon in menus
Signed-off-by: Gaucho316 <Gau...@ho...>
diff --git a/tuxbox/neutrino/src/gui/timerlist.cpp b/tuxbox/neutrino/src/gui/timerlist.cpp
index 3b2a24e..15fdcbc 100644
--- a/tuxbox/neutrino/src/gui/timerlist.cpp
+++ b/tuxbox/neutrino/src/gui/timerlist.cpp
@@ -954,7 +954,7 @@ const CMenuOptionChooser::keyval MESSAGEBOX_NO_YES_OPTIONS[MESSAGEBOX_NO_YES_OPT
int CTimerList::modifyTimer()
{
CTimerd::responseGetTimer* timer=&timerlist[selected];
- CMenuWidget timerSettings(LOCALE_TIMERLIST_MENUMODIFY, NEUTRINO_ICON_SETTINGS, width);
+ CMenuWidget timerSettings(LOCALE_TIMERLIST_MENUMODIFY, NEUTRINO_ICON_TIMER, width);
//main items
timerSettings.addIntroItems(NONEXISTANT_LOCALE, NONEXISTANT_LOCALE, CMenuWidget::BTN_TYPE_CANCEL);
timerSettings.addItem(new CMenuForwarder(LOCALE_TIMERLIST_SAVE, true, NULL, this, "modifytimer", CRCInput::RC_red, NEUTRINO_ICON_BUTTON_RED));
@@ -987,7 +987,7 @@ int CTimerList::modifyTimer()
CTimerListRepeatNotifier notifier((int *)&timer->eventRepeat, m4, m5, m_weekdaysStr);
CMenuOptionChooser* m3 = new CMenuOptionChooser(LOCALE_TIMERLIST_REPEAT, (int *)&timer->eventRepeat, TIMERLIST_REPEAT_OPTIONS, TIMERLIST_REPEAT_OPTION_COUNT, true, ¬ifier);
- CRecDirChooser recDirs(LOCALE_TIMERLIST_RECORDING_DIR,NEUTRINO_ICON_SETTINGS,NULL,timer->recordingDir);
+ CRecDirChooser recDirs(LOCALE_TIMERLIST_RECORDING_DIR, NEUTRINO_ICON_TIMER, NULL, timer->recordingDir);
bool recDirEnabled = (timer->eventType == CTimerd::TIMER_RECORD) && (g_settings.recording_type == RECORDING_FILE);
CMenuForwarder* m6 = new CMenuForwarder(LOC...
[truncated message content] |
Thanks for helping keep SourceForge clean.
X