mirrors/neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-neutrino/neutrino.git synced 2025-08-29 08:21:12 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'check/next-cc'

Browse Source 
compiles, nothing else.

Conflicts:
	configure.ac
	src/Makefile.am
	src/gui/Makefile.am
	src/gui/luainstance.cpp
	src/gui/luainstance.h
	src/gui/plugins.cpp
	src/gui/plugins.h
	src/gui/scan_setup.cpp
	src/gui/start_wizard.cpp
	src/gui/test_menu.cpp
	src/gui/user_menue.cpp
	src/gui/widget/hintboxext.cpp
	src/gui/widget/menue.cpp
	src/gui/widget/messagebox.cpp
	src/gui/widget/stringinput.cpp
This commit is contained in:
Stefan Seyfried
2014-01-23 14:08:37 +01:00
parent 7d3843847a 3ad7175c45
commit b414474323
92 changed files with 2474 additions and 1428 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/gui/audioplayer.cpp
View File

@@ -600,7 +600,7 @@ int CAudioPlayerGui::show()
// is no stream, so we do not have to test for this case
int seconds=0;
CIntInput secondsInput(LOCALE_AUDIOPLAYER_JUMP_DIALOG_TITLE,
seconds,
&seconds,
5,
LOCALE_AUDIOPLAYER_JUMP_DIALOG_HINT1,
LOCALE_AUDIOPLAYER_JUMP_DIALOG_HINT2);
@@ -707,7 +707,7 @@ int CAudioPlayerGui::show()
// is no stream, so we do not have to test for this case
int seconds=0;
CIntInput secondsInput(LOCALE_AUDIOPLAYER_JUMP_DIALOG_TITLE,
seconds,
&seconds,
5,
LOCALE_AUDIOPLAYER_JUMP_DIALOG_HINT1,
LOCALE_AUDIOPLAYER_JUMP_DIALOG_HINT2);
@@ -2606,7 +2606,7 @@ void CAudioPlayerGui::savePlaylist()
absPlaylistDir += file->getFileName();
const int filenamesize = 30;
char filename[filenamesize + 1] = "";
std::string filename;
if (file->getType() == CFile::FILE_PLAYLIST)
{
@@ -2617,15 +2617,14 @@ void CAudioPlayerGui::savePlaylist()
bool overwrite = askToOverwriteFile(name);
if (!overwrite)
return;
snprintf(filename, name.size(), "%s", name.c_str());
filename = name;
}
else if (file->getType() == CFile::FILE_DIR)
{
// query for filename
this->hide();
CStringInputSMS filenameInput(LOCALE_AUDIOPLAYER_PLAYLIST_NAME,
filename,
&filename,
filenamesize - 1,
LOCALE_AUDIOPLAYER_PLAYLIST_NAME_HINT1,
LOCALE_AUDIOPLAYER_PLAYLIST_NAME_HINT2,
@@ -2704,7 +2703,7 @@ bool CAudioPlayerGui::askToOverwriteFile(const std::string& filename)
"%s\n%s",
g_Locale->getText(LOCALE_AUDIOPLAYER_PLAYLIST_FILEOVERWRITE_MSG),
filename.c_str());
bool res = (ShowMsgUTF(LOCALE_AUDIOPLAYER_PLAYLIST_FILEOVERWRITE_TITLE,
bool res = (ShowMsg(LOCALE_AUDIOPLAYER_PLAYLIST_FILEOVERWRITE_TITLE,
msg,CMessageBox::mbrYes, CMessageBox::mbYes | CMessageBox::mbNo)
== CMessageBox::mbrYes);
this->paint();