New upstream version 16.9.0~ds0

1 files changed, 35 insertions, 13 deletions

diff --git a/src/basegui.cpp b/src/basegui.cpp
index 5de6869..97fd2f2 100644
--- a/src/basegui.cpp
+++ b/src/basegui.cpp
@@ -1481,12 +1481,14 @@ void BaseGui::enableActionsOnPlaying() {
 	playAct->setEnabled(false);
 
 	// Screenshot option
+	/*
 	bool screenshots_enabled = ( (pref->use_screenshot) && 
                                  (!pref->screenshot_directory.isEmpty()) &&
                                  (QFileInfo(pref->screenshot_directory).isDir()) );
 
 	screenshotAct->setEnabled( screenshots_enabled );
 	screenshotsAct->setEnabled( screenshots_enabled );
+	*/
 
 #ifdef CAPTURE_STREAM
 	capturingAct->setEnabled(!pref->capture_directory.isEmpty() && QFileInfo(pref->capture_directory).isDir());
@@ -1567,8 +1569,10 @@ void BaseGui::enableActionsOnPlaying() {
 #ifndef Q_OS_WIN
 	// Disable video filters if using vdpau
 	if ((pref->vdpau.disable_video_filters) && (pref->vo.startsWith("vdpau"))) {
+		/*
 		screenshotAct->setEnabled(false);
 		screenshotsAct->setEnabled(false);
+		*/
 		flipAct->setEnabled(false);
 		mirrorAct->setEnabled(false);
 		stereo3dAct->setEnabled(false);
@@ -3116,6 +3120,7 @@ void BaseGui::applyNewPreferences() {
 	qDebug("BaseGui::applyNewPreferences");
 
 	bool need_update_language = false;
+	bool need_apply_styles = false;
 
 	PlayerID::Player old_player_type = PlayerID::player(pref->mplayer_bin);
 
@@ -3124,16 +3129,6 @@ void BaseGui::applyNewPreferences() {
 	// Setup proxy
 	setupNetworkProxy();
 
-	// Change application font
-	if (!pref->default_font.isEmpty()) {
-		QFont f;
-		f.fromString( pref->default_font );
-		if (QApplication::font() != f) {
-			qDebug("BaseGui::applyNewPreferences: setting new font: %s", pref->default_font.toLatin1().constData());
-			QApplication::setFont(f);
-		}
-	}
-
 	PrefGeneral *_general = pref_dialog->mod_general();
 	if (_general->fileSettingsMethodChanged()) {
 		core->changeFileSettingsMethod(pref->file_settings_method);
@@ -3149,10 +3144,12 @@ void BaseGui::applyNewPreferences() {
 		need_update_language = true;
 		// Stylesheet
 		#if ALLOW_CHANGE_STYLESHEET
-		if (!_interface->guiChanged()) applyStyles();
+		if (!_interface->guiChanged()) need_apply_styles = true;
 		#endif
 	}
 
+	if (_interface->fontChanged()) need_apply_styles = true;
+
 #ifndef MOUSE_GESTURES
 	mplayerwindow->activateMouseDragTracking(pref->drag_function == Preferences::MoveWindow);
 #endif
@@ -3213,11 +3210,13 @@ void BaseGui::applyNewPreferences() {
 
 #if STYLE_SWITCHING
 	if (_interface->styleChanged()) {
-		applyStyles();
+		need_apply_styles = true;
 	}
 #endif
 
-    // Restart the video if needed
+	if (need_apply_styles) applyStyles();
+
+	// Restart the video if needed
 	if (pref_dialog->requiresRestart())
 		core->restart();
 
@@ -5400,6 +5399,8 @@ void BaseGui::hidePanel() {
 	qDebug("BaseGui::hidePanel");
 
 	if (panel->isVisible()) {
+		if (isMaximized()) showNormal();
+
 		// Exit from fullscreen mode 
 		if (pref->fullscreen) { toggleFullscreen(false); update(); }
 
@@ -5627,6 +5628,15 @@ void BaseGui::changeStyleSheet(QString style) {
 		}
 	}
 
+	// Use the user specified font
+	if (!pref->default_font.isEmpty()) {
+		QFont f;
+		f.fromString( pref->default_font );
+		QString fstyle = QString("QWidget { font: %1 %2 %3pt %4; }")
+			.arg(f.bold() ? "bold" :"").arg(f.italic() ? "italic" : "")
+			.arg(f.pointSize()).arg(f.family());
+		stylesheet = fstyle + stylesheet;
+	}
 	//qDebug() << "BaseGui::changeStyleSheet: styleSheet:" << stylesheet;
 	qApp->setStyleSheet(stylesheet);
 }
@@ -5635,6 +5645,17 @@ void BaseGui::changeStyleSheet(QString style) {
 void BaseGui::applyStyles() {
 	qDebug("BaseGui::applyStyles");
 
+#if !ALLOW_CHANGE_STYLESHEET
+	if (!pref->default_font.isEmpty()) {
+		QFont f;
+		f.fromString( pref->default_font );
+		if (QApplication::font() != f) {
+			qDebug() << "BaseGui::applyStyles: setting new font:" << pref->default_font;
+			QApplication::setFont(f);
+		}
+	}
+#endif
+
 #if ALLOW_CHANGE_STYLESHEET
 	qDebug() << "BaseGui::applyStyles: stylesheet:" << pref->iconset;
 	changeStyleSheet(pref->iconset);
@@ -5651,6 +5672,7 @@ void BaseGui::applyStyles() {
 		#endif
 	}
 #endif
+
 }
 
 void BaseGui::setTabletMode(bool b) {