New upstream version 16.11.0~ds0

1 files changed, 28 insertions, 0 deletions

diff --git a/src/prefgeneral.cpp b/src/prefgeneral.cpp
index bb4839f..d2e9ea0 100644
--- a/src/prefgeneral.cpp
+++ b/src/prefgeneral.cpp
@@ -93,6 +93,12 @@ PrefGeneral::PrefGeneral(QWidget * parent, Qt::WindowFlags f)
 	shutdown_widget->hide();
 #endif
 
+#ifndef ADD_BLACKBORDERS_FS
+	blackborders_on_fs_check->hide();
+#else
+	blackborders_check->hide();
+#endif
+
 #ifdef MPV_SUPPORT
 	screenshot_format_combo->addItems(QStringList() << "png" << "ppm" << "pgm" << "pgmyuv" << "tga" << "jpg" << "jpeg");
 #else
@@ -247,7 +253,13 @@ void PrefGeneral::setData(Preferences * pref) {
 	setDoubleBuffer( pref->use_double_buffer );
 	setUseSlices( pref->use_slices );
 	setStartInFullscreen( pref->start_in_fullscreen );
+
+#ifdef ADD_BLACKBORDERS_FS
 	setBlackbordersOnFullscreen( pref->add_blackborders_on_fullscreen );
+#else
+	blackborders_check->setChecked(pref->initial_blackborders);
+#endif
+
 	setAutoq( pref->autoq );
 
 #ifdef Q_OS_WIN
@@ -340,10 +352,16 @@ void PrefGeneral::getData(Preferences * pref) {
 	TEST_AND_SET(pref->use_double_buffer, doubleBuffer());
 	TEST_AND_SET(pref->use_slices, useSlices());
 	pref->start_in_fullscreen = startInFullscreen();
+
+#ifdef ADD_BLACKBORDERS_FS
 	if (pref->add_blackborders_on_fullscreen != blackbordersOnFullscreen()) {
 		pref->add_blackborders_on_fullscreen = blackbordersOnFullscreen();
 		if (pref->fullscreen) requires_restart = true;
 	}
+#else
+	pref->initial_blackborders = blackborders_check->isChecked();
+#endif
+
 	TEST_AND_SET(pref->autoq, autoq());
 
 #ifdef Q_OS_WIN
@@ -873,6 +891,7 @@ bool PrefGeneral::disableScreensaver() {
 }
 #endif
 
+#ifdef ADD_BLACKBORDERS_FS
 void PrefGeneral::setBlackbordersOnFullscreen(bool b) {
 	blackborders_on_fs_check->setChecked(b);
 }
@@ -880,6 +899,7 @@ void PrefGeneral::setBlackbordersOnFullscreen(bool b) {
 bool PrefGeneral::blackbordersOnFullscreen() {
 	return blackborders_on_fs_check->isChecked();
 }
+#endif
 
 void PrefGeneral::setAutoq(int n) {
 	autoq_spin->setValue(n);
@@ -1068,6 +1088,12 @@ void PrefGeneral::createHelp() {
            "videos opened.") +" "+ 
         tr("<b>Note:</b> This option won't be used for TV channels.") );
 
+#ifndef ADD_BLACKBORDERS_FS
+	setWhatsThis(blackborders_check, tr("Add black borders for subtitles by default"),
+		tr("If this option is enabled, black borders will be added to the image "
+           "by default on new opened files."));
+#endif
+
 	setWhatsThis(zoom_spin, tr("Default zoom"),
 		tr("This option sets the default zoom which will be used for "
            "new videos.") );
@@ -1098,6 +1124,7 @@ void PrefGeneral::createHelp() {
 		tr("If this option is checked, all videos will start to play in "
            "fullscreen mode.") );
 
+#ifdef ADD_BLACKBORDERS_FS
 	setWhatsThis(blackborders_on_fs_check, tr("Add black borders on fullscreen"),
 		tr("If this option is enabled, black borders will be added to the "
            "image in fullscreen mode. This allows subtitles to be displayed "
@@ -1105,6 +1132,7 @@ void PrefGeneral::createHelp() {
  		tr("This option will be ignored if MPlayer uses its own window, as "
            "some video drivers (like gl) are already able to display the "
            "subtitles automatically in the black borders.") */ );
+#endif
 
 #ifdef Q_OS_WIN
 	#ifdef SCREENSAVER_OFF