New upstream version 17.5.0~ds0

1 files changed, 41 insertions, 6 deletions

diff --git a/src/basegui.cpp b/src/basegui.cpp
index 009c980..3451493 100644
--- a/src/basegui.cpp
+++ b/src/basegui.cpp
@@ -940,6 +940,11 @@ void BaseGui::createActions() {
 	decOSDScaleAct = new MyAction(Qt::SHIFT | Qt::Key_Y, this, "dec_osd_scale");
 	connect(decOSDScaleAct, SIGNAL(triggered()), core, SLOT(decOSDScale()));
 
+#ifdef MPV_SUPPORT
+	OSDFractionsAct = new MyAction(this, "osd_fractions");
+	OSDFractionsAct->setCheckable(true);
+	connect(OSDFractionsAct, SIGNAL(toggled(bool)), core, SLOT(setOSDFractions(bool)));
+#endif
 
 	// Playlist
 	playNextAct = new MyAction(Qt::Key_Greater, this, "play_next");
@@ -1862,6 +1867,10 @@ void BaseGui::retranslateStrings() {
 	incOSDScaleAct->change(tr("Size &+"));
 	decOSDScaleAct->change(tr("Size &-"));
 
+#ifdef MPV_SUPPORT
+	OSDFractionsAct->change(tr("Show times with &milliseconds"));
+#endif
+
 	// Playlist
 	playNextAct->change( tr("&Next") );
 	playPrevAct->change( tr("Pre&vious") );
@@ -2707,7 +2716,10 @@ void BaseGui::createMenus() {
 	osd_menu->addSeparator();
 	osd_menu->addAction(decOSDScaleAct);
 	osd_menu->addAction(incOSDScaleAct);
-
+#ifdef MPV_SUPPORT
+	osd_menu->addSeparator();
+	osd_menu->addAction(OSDFractionsAct);
+#endif
 
 	// Share submenu
 	#ifdef SHARE_MENU
@@ -3814,6 +3826,10 @@ void BaseGui::updateWidgets() {
 	// OSD
 	osdGroup->setChecked( pref->osd );
 
+#ifdef MPV_SUPPORT
+	OSDFractionsAct->setChecked(pref->osd_fractions);
+#endif
+
 	// Titles
 	titleGroup->setChecked( core->mset.current_title_id );
 
@@ -3961,6 +3977,7 @@ void BaseGui::updateWidgets() {
 	if (PlayerID::player(pref->mplayer_bin) == PlayerID::MPLAYER) {
 		secondary_subtitles_track_menu->setEnabled(false);
 		frameBackStepAct->setEnabled(false);
+		OSDFractionsAct->setEnabled(false);
 	} else {
 		karaokeAct->setEnabled(false);
 	}
@@ -5160,6 +5177,13 @@ void BaseGui::dropEvent( QDropEvent *e ) {
 	qDebug() << "BaseGui::dropEvent: list of files:" << file_list;
 	qDebug() << "BaseGui::dropEvent: subtitle file:" << sub_file;
 
+	/* If only one file is dropped and it's not a folder nor a subtitle,
+       open it with openFile so that it remembers the position */
+	if (dir_list.isEmpty() && sub_file.isEmpty() && file_list.count() == 1 && QFile::exists(file_list[0])) {
+		openFile(file_list[0]);
+		return;
+	}
+
 	if (!sub_file.isEmpty()) {
 		core->loadSub(sub_file);
 		return;
@@ -5650,10 +5674,10 @@ QString BaseGui::loadQss(QString filename) {
 	file.open(QFile::ReadOnly);
 	QString stylesheet = QLatin1String(file.readAll());
 
+	QString path;
 #ifdef USE_RESOURCES
 	Images::setTheme(pref->iconset);
-	QString path;
-	if (Images::has_rcc) {
+	if (Images::has_rcc || Images::is_internal) {
 		path = ":/" + pref->iconset;
 	} else {
 		QDir current = QDir::current();
@@ -5661,9 +5685,13 @@ QString BaseGui::loadQss(QString filename) {
 		path = current.relativeFilePath(td);
 	}
 #else
-	QDir current = QDir::current();
-	QString td = Images::themesDirectory();
-	QString path = current.relativeFilePath(td);
+	if (Images::is_internal) {
+		path = ":/" + pref->iconset;
+	} else {
+		QDir current = QDir::current();
+		QString td = Images::themesDirectory();
+		path = current.relativeFilePath(td);
+	}
 #endif
 	stylesheet.replace(QRegExp("url\\s*\\(\\s*([^\\);]+)\\s*\\)", Qt::CaseSensitive, QRegExp::RegExp2),
 						QString("url(%1\\1)").arg(path + "/"));
@@ -5686,6 +5714,13 @@ void BaseGui::changeStyleSheet(QString style) {
 
 		// Check style.qss
 		if (!QFile::exists(qss_file)) {
+			QString ifile = ":/" + pref->iconset + "/style.qss";
+			if (QFile::exists(ifile)) {
+				qss_file = ifile;
+			}
+		}
+
+		if (!QFile::exists(qss_file)) {
 			qss_file = Paths::configPath() + "/themes/" + pref->iconset + "/style.qss";
 			if (!QFile::exists(qss_file)) {
 				qss_file = Paths::themesPath() +"/"+ pref->iconset + "/style.qss";