chore: version 7.12.1

Bionus · May 12, 2024 · b61de7e · b61de7e
2 parents e6582a6 + 2a15d0f
commit b61de7e
Show file tree

Hide file tree

Showing 8 changed files with 26 additions and 6 deletions.
diff --git a/docs/blog/posts/2024-05-12-grabber-7-12-1-released.md b/docs/blog/posts/2024-05-12-grabber-7-12-1-released.md
@@ -0,0 +1,13 @@
+---
+date: 2024-05-12 22:45:00 +2:00
+categories: [Release]
+authors: [Bionus]
+---
+
+
+# Grabber 7.12.1 released
+
+Grabber 7.12.1 has been released.
+
+The list of changes and download links can be found on GitHub:  
+<https://github.com/Bionus/imgbrd-grabber/releases/tag/v7.12.1>
diff --git a/scripts/windows-setup/setup.iss b/scripts/windows-setup/setup.iss
@@ -22,7 +22,7 @@
 #endif
 
 #ifndef MyAppVersion
-# define MyAppVersion "7.12.0"
+# define MyAppVersion "7.12.1"
 #endif
 
 #define PlatformNamePrefix ""

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
@@ -40,7 +40,7 @@ endif()
 set(QT_SILENCE_MISSING_DEPENDENCY_TARGET_WARNING ON)
 
 if((NOT DEFINED VERSION) OR ((DEFINED NIGHTLY) AND (NIGHTLY MATCHES "1")))
-	set(VERSION "7.12.0")
+	set(VERSION "7.12.1")
 else()
 	string(REGEX REPLACE "^v" "" VERSION "${VERSION}")
 endif()

diff --git a/src/dist/linux/org.bionus.Grabber.metainfo.xml b/src/dist/linux/org.bionus.Grabber.metainfo.xml
@@ -43,6 +43,7 @@
 	<url type="contribute">https://github.com/Bionus/imgbrd-grabber/blob/master/CONTRIBUTING.md</url>
 
 	<releases>
+		<release version="7.12.1" date="2024-05-12" />
 		<release version="7.12.0" date="2024-05-12" />
 		<release version="7.11.2" date="2023-07-23" />
 		<release version="7.11.1" date="2023-06-25" />

diff --git a/src/gui/src/main-window.cpp b/src/gui/src/main-window.cpp
@@ -82,7 +82,7 @@ void MainWindow::init(const QStringList &args, const QMap<QString, QString> &par
 	m_themeLoader = new ThemeLoader(savePath("themes/", true, false), m_settings, this);
 	m_themeLoader->setTheme(m_settings->value("theme", "Default").toString());
 	const QStringList baseStyles = QStyleFactory::keys();
-	const QString defaultStyle = !baseStyles.isEmpty() ? baseStyles.first() : "";
+	const QString defaultStyle = !baseStyles.isEmpty() ? (baseStyles.contains("windowsvista") ? "windowsvista" : baseStyles.first()) : "";
 	qApp->setStyle(m_settings->value("baseStyle", defaultStyle).toString());
 	ui->setupUi(this);
 

diff --git a/src/gui/src/settings/options-window.cpp b/src/gui/src/settings/options-window.cpp
@@ -386,7 +386,7 @@ OptionsWindow::OptionsWindow(Profile *profile, ThemeLoader *themeLoader, QWidget
 	}
 	ui->comboTheme->setCurrentText(settings->value("theme", "Default").toString());
 	const QStringList baseStyles = QStyleFactory::keys();
-	const QString defaultStyle = !baseStyles.isEmpty() ? baseStyles.first() : "";
+	const QString defaultStyle = !baseStyles.isEmpty() ? (baseStyles.contains("windowsvista") ? "windowsvista" : baseStyles.first()) : "";
 	for (const QString &style : baseStyles) {
 		ui->comboBaseStyle->addItem(style, style);
 	}

diff --git a/src/lib/src/downloader/image-downloader.cpp b/src/lib/src/downloader/image-downloader.cpp
@@ -81,7 +81,8 @@ void ImageDownloader::save()
 	// Try to build a path first if we don't need tags for the filename, to check for the "same dir" MD5 setting
 	const int filenameTagLevel = m_filename.needExactTags(m_image->parentSite(), m_profile->getSettings());
 	const bool filenameNeedExactTags = filenameTagLevel == 2 || (filenameTagLevel == 1 && m_image->hasUnknownTag());
-	const QString md5Path = !filenameNeedExactTags ? m_image->paths(m_filename, m_path, m_count).first() : QString();
+	const QStringList paths = m_image->paths(m_filename, m_path, m_count);
+	const QString md5Path = !filenameNeedExactTags && !paths.isEmpty() ? paths.first() : QString();
 
 	// We don't need to load the image details of files already in the MD5 list and that should be skipped
 	const QString md5action = m_profile->md5Action(m_image->md5(), md5Path).first;

diff --git a/src/lib/src/models/site.cpp b/src/lib/src/models/site.cpp
@@ -164,7 +164,12 @@ void Site::loadConfig()
 	m_userAgent = m_settings->value("Headers/User-Agent").toString();
 	if (m_userAgent.isEmpty()) {
 		const QString globalUserAgent = pSettings->value("userAgent", QStringLiteral("Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:108.0) Gecko/20100101 Firefox/108.0")).toString();
-		if (pSettings->value("useQtUserAgent", true).toBool()) {
+		#if defined(USE_WEBENGINE)
+			const bool defaultUseQtUserAgent = true;
+		#else
+			const bool defaultUseQtUserAgent = false;
+		#endif
+		if (pSettings->value("useQtUserAgent", defaultUseQtUserAgent).toBool()) {
 			#if defined(USE_WEBENGINE)
 				m_userAgent = QWebEngineProfile::defaultProfile()->httpUserAgent();
 			#else