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/cst-next'

Browse Source 
Conflicts:
	src/daemonc/remotecontrol.cpp
	src/gui/luainstance.cpp
	src/gui/movieplayer.cpp
	src/gui/videosettings.cpp
	src/neutrino.cpp
	src/system/setting_helpers.cpp
	src/zapit/src/zapit.cpp
This commit is contained in:
Stefan Seyfried
2014-12-28 12:32:12 +01:00
parent 44451c7575 9b78e49d0e
commit d37b3c0f9a
112 changed files with 2783 additions and 928 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/gui/audioplayer.cpp
View File

@@ -65,6 +65,7 @@
#include <gui/widget/hintbox.h>
#include <gui/widget/stringinput.h>
#include <gui/widget/stringinput_ext.h>
#include <gui/widget/keyboard_input.h>
#include "gui/pictureviewer.h"
extern CPictureViewer * g_PicViewer;
@@ -2607,7 +2608,7 @@ void CAudioPlayerGui::savePlaylist()
absPlaylistDir += file->getFileName();
const int filenamesize = 30;
std::string filename;
std::string filename = "playlist";
if (file->getType() == CFile::FILE_PLAYLIST)
{
@@ -2624,12 +2625,7 @@ void CAudioPlayerGui::savePlaylist()
{
// query for filename
this->hide();
CStringInputSMS filenameInput(LOCALE_AUDIOPLAYER_PLAYLIST_NAME,
&filename,
filenamesize - 1,
LOCALE_AUDIOPLAYER_PLAYLIST_NAME_HINT1,
LOCALE_AUDIOPLAYER_PLAYLIST_NAME_HINT2,
"abcdefghijklmnopqrstuvwxyz0123456789-.,:!?/ ");
CKeyboardInput filenameInput(LOCALE_AUDIOPLAYER_PLAYLIST_NAME, &filename, filenamesize - 1, NULL, NULL, LOCALE_AUDIOPLAYER_PLAYLIST_NAME_HINT1, LOCALE_AUDIOPLAYER_PLAYLIST_NAME_HINT2);
filenameInput.exec(NULL, "");
// refresh view
this->paint();