New upstream version 16.11.0~ds0

1 files changed, 23 insertions, 5 deletions

diff --git a/src/basegui.cpp b/src/basegui.cpp
index 97fd2f2..8625104 100644
--- a/src/basegui.cpp
+++ b/src/basegui.cpp
@@ -1067,7 +1067,7 @@ void BaseGui::createActions() {
 	connect( nextWheelFunctionAct, SIGNAL(triggered()),
 			 core, SLOT(nextWheelFunction()) );
 
-	showFilenameAct = new MyAction(Qt::SHIFT | Qt::Key_I, this, "show_filename");
+	showFilenameAct = new MyAction(Qt::SHIFT | Qt::Key_I, this, "show_info_osd");
 	connect( showFilenameAct, SIGNAL(triggered()), core, SLOT(showFilenameOnOSD()) );
 
 	showTimeAct = new MyAction(Qt::Key_I, this, "show_time");
@@ -1902,8 +1902,9 @@ void BaseGui::retranslateStrings() {
 	nextAspectAct->change( Images::icon("next_aspect"), tr("Next aspect ratio") );
 	nextWheelFunctionAct->change( Images::icon("next_wheel_function"), tr("Next wheel function") );
 
-	showFilenameAct->change( tr("Show filename on OSD") );
+	showFilenameAct->change( tr("Show &info on OSD") );
 	showTimeAct->change( tr("Show playback time on OSD") );
+
 	toggleDeinterlaceAct->change( tr("Toggle deinterlacing") );
 
 
@@ -2439,9 +2440,8 @@ void BaseGui::createPlaylist() {
 
 	connect(playlist, SIGNAL(requestToAddCurrentFile()), this, SLOT(addToPlaylistCurrentFile()));
 
-	if (playlist->automaticallyPlayNext()) {
-		connect( core, SIGNAL(mediaFinished()), playlist, SLOT(playNext()), Qt::QueuedConnection );
-	}
+	connect( core, SIGNAL(mediaFinished()), playlist, SLOT(playNextAuto()), Qt::QueuedConnection );
+
 	connect( core, SIGNAL(mplayerFailed(QProcess::ProcessError)), playlist, SLOT(playerFailed(QProcess::ProcessError)) );
 	connect( core, SIGNAL(mplayerFinishedWithError(int)), playlist, SLOT(playerFinishedWithError(int)) );
 	connect(core, SIGNAL(mediaDataReceived(const MediaData &)), playlist, SLOT(getMediaInfo(const MediaData &)));
@@ -2700,6 +2700,8 @@ void BaseGui::createMenus() {
 	osd_menu->menuAction()->setObjectName("osd_menu");
 	osd_menu->addActions(osdGroup->actions());
 	osd_menu->addSeparator();
+	osd_menu->addAction(showFilenameAct);
+	osd_menu->addSeparator();
 	osd_menu->addAction(decOSDScaleAct);
 	osd_menu->addAction(incOSDScaleAct);
 
@@ -3110,7 +3112,11 @@ void BaseGui::showPreferencesDialog() {
 	pl->setAutoGetInfo(playlist->autoGetInfo());
 	pl->setSavePlaylistOnExit(playlist->savePlaylistOnExit());
 	pl->setPlayFilesFromStart(playlist->playFilesFromStart());
+	pl->setPlayOnLoad(playlist->startPlayOnLoad());
+	pl->setPlayNextAutomatically(playlist->automaticallyPlayNext());
 	pl->setIgnorePlayerErrors(playlist->ignorePlayerErrors());
+	pl->setAutoSort(playlist->autoSort());
+	pl->setFilterCaseSensitive(playlist->filterCaseSensitive());
 
 	pref_dialog->show();
 }
@@ -3195,7 +3201,11 @@ void BaseGui::applyNewPreferences() {
 	playlist->setAutoGetInfo(pl->autoGetInfo());
 	playlist->setSavePlaylistOnExit(pl->savePlaylistOnExit());
 	playlist->setPlayFilesFromStart(pl->playFilesFromStart());
+	playlist->setStartPlayOnLoad(pl->playOnLoad());
+	playlist->setAutomaticallyPlayNext(pl->playNextAutomatically());
 	playlist->setIgnorePlayerErrors(pl->ignorePlayerErrors());
+	playlist->setAutoSort(pl->autoSort());
+	playlist->setFilterCaseSensitive(pl->filterCaseSensitive());
 
 #ifdef PLAYLIST_DOWNLOAD
 	playlist->setMaxItemsUrlHistory( pref->history_urls->maxItems() );
@@ -4090,6 +4100,11 @@ void BaseGui::openFiles(QStringList files) {
 void BaseGui::openFavorite(QString file) {
 	qDebug("BaseGui::openFavorite");
 
+	QUrl url(file);
+	if (url.isValid() && url.scheme().toLower() == "file") {
+		file = url.toLocalFile();
+	}
+
 	openFiles(QStringList() << file);
 }
 
@@ -4650,12 +4665,14 @@ void BaseGui::toggleFullscreen(bool b) {
 
 	updateWidgets();
 
+#ifdef ADD_BLACKBORDERS_FS
 	if ((pref->add_blackborders_on_fullscreen) && 
         (!core->mset.add_letterbox)) 
 	{
 		core->changeLetterboxOnFullscreen(b);
 		/* core->restart(); */
 	}
+#endif
 
 	setFocus(); // Fixes bug #2493415
 }
@@ -5220,6 +5237,7 @@ void BaseGui::addToPlaylistCurrentFile() {
 	qDebug("BaseGui::addToPlaylistCurrentFile");
 	if (!core->mdat.filename.isEmpty()) {
 		playlist->addItem(core->mdat.filename, "", 0);
+		playlist->setModified(true);
 		playlist->getMediaInfo(core->mdat);
 	}
 }