Merge branch '1.17'

CMakeLists.txt

@@ -40,6 +40,7 @@ set(CMAKE_AUTOMOC ON)
 set(CMAKE_AUTORCC ON)
 
 if (WIN32)
+	set (SIELO_LIBS ${SIELO_LIBS} d3d9)
     add_executable(sielo-browser WIN32 ${SOURCE_FILES} ic_sielo.rc)
 elseif(APPLE)
     add_executable(sielo-browser MACOSX_BUNDLE ${SOURCE_FILES} ${ICON_PATH})

Core/Application.cpp

@@ -89,7 +89,7 @@
 
 namespace Sn
 {
-QString Application::currentVersion = QString("1.17.10");
+QString Application::currentVersion = QString("1.17.11");
 
 // Static member
 Application *Application::instance()
@@ -224,7 +224,7 @@ Application::Application(int& argc, char** argv) :
 {
 	// Setting up settings environment
 	QCoreApplication::setApplicationName(QLatin1String("Sielo"));
-	QCoreApplication::setApplicationVersion(QLatin1String("1.17.10"));
+	QCoreApplication::setApplicationVersion(QLatin1String("1.17.11"));
 
 	setAttribute(Qt::AA_DontCreateNativeWidgetSiblings);
 	setAttribute(Qt::AA_EnableHighDpiScaling);

Core/Widgets/Preferences/Appearance.cpp

@@ -553,6 +553,13 @@ void AppearancePage::setupUI()
 	m_advancedPageLayout->addLayout(m_blurFilterLayout);
 	m_advancedPageLayout->addItem(m_spacer);
 
+#ifdef Q_OS_WIN
+	if (QCoreApplication::testAttribute(Qt::AA_UseSoftwareOpenGL)) {
+		m_oldChipsetInfoLabel = new QLabel(tr("You are using an old chipset that doesn't have a correct OpenGL port. To improve user experience, the hardware acceleration is disabled."), this);
+		m_advancedPageLayout->addWidget(m_oldChipsetInfoLabel);
+	}
+#endif
+
 	m_tabs->addTab(m_themePage, tr("Themes"));
 	m_tabs->addTab(m_advancedPage, tr("Advanced"));
 

Core/Widgets/Preferences/Appearance.hpp

@@ -143,6 +143,9 @@ private slots:
 	QLabel* m_backgroundLabel{nullptr};
 	QLineEdit* m_backgroundLocationEdit{nullptr};
 	QPushButton* m_backgroundLocationButton{nullptr};
+#ifdef Q_OS_WIN
+	QLabel* m_oldChipsetInfoLabel{nullptr};
+#endif
 	QSpacerItem* m_spacer{nullptr};
 
 	bool m_colorsChanged{false};

Core/Widgets/Preferences/GeneralPage.cpp

@@ -377,7 +377,7 @@ void GeneralPage::setupUIObjects()
 	m_layoutProfileControl = new QHBoxLayout(m_profileControlFrame);
 
 	m_descCantDeleteActiveProfile = new QLabel(tr("Note: You cannot delete active profile."), m_profileControlFrame);
-	m_descCantDeleteActiveProfile->setAlignment(Qt::AlignRight | Qt::AlignTrailing | Qt::AlignVCenter);
+	m_descCantDeleteActiveProfile->setAlignment(/*Qt::AlignRight | Qt::AlignTrailing | */Qt::AlignVCenter);
 
 	m_btnCreateNewProfile = new QPushButton(tr("Create New"), m_profileControlFrame);
 	m_btnDeleteProfile = new QPushButton(tr("Delete"), m_profileControlFrame);

Main.cpp

@@ -33,12 +33,49 @@
 
 #include "Core/BrowserWindow.hpp"
 
+#ifdef Q_OS_WIN
+#include <d3d9.h>
+#endif
+
 int main(int argc, char** argv)
 {
 	qputenv("QTWEBENGINE_REMOTE_DEBUGGING", "9000");
 	qputenv("QT_XCB_FORCE_SOFTWARE_OPENGL", "1");
 	qputenv("QT_AUTO_SCREEN_SCALE_FACTOR", "1");
 
+#ifdef Q_OS_WIN
+	// Dirty but quick fix for Old Intel HD Graphic Card
+	if (QSysInfo::windowsVersion() == QSysInfo::WV_WINDOWS10) {
+		IDirect3D9* ctx = Direct3DCreate9(D3D_SDK_VERSION);
+
+		if (ctx != nullptr) {
+			D3DADAPTER_IDENTIFIER9 id;
+			if (ctx->GetAdapterIdentifier(D3DADAPTER_DEFAULT, 0, &id) == D3D_OK) {
+				const QString DeviceDescription( id.Description );
+				const QString FindedDeviceName = "Intel(R) HD Graphics";
+				QString DeviceVersion = "";
+
+				if (DeviceDescription.length() > FindedDeviceName.length()) {
+					bool cool = true;
+					int i = 0;
+					while (i < FindedDeviceName.length()) {
+						if (DeviceDescription[i] != FindedDeviceName[i]) cool = false;
+						i++;
+					}
+					i++;
+					for (int j = i; j < DeviceDescription.length(); j++) {
+						DeviceVersion += DeviceDescription[j];
+					}
+
+					if (DeviceVersion.toInt() > 900 && DeviceVersion.toInt() < 5000) {
+						QCoreApplication::setAttribute(Qt::AA_UseSoftwareOpenGL);
+					}
+				}
+			}
+		}
+	}
+#endif
+
 	Sn::Application app(argc, argv);
 
 	if (app.isClosing())

user-config.cmake

@@ -21,7 +21,7 @@
 #-------------------------------------------------------#
 #                      macOS                            #
 #-------------------------------------------------------#
-set (CMAKE_PREFIX_PATH "/Users/feldrise/Qt/5.11.2/clang_64/") # <Set Path to Qt>
+# set (CMAKE_PREFIX_PATH "/Users/feldrise/Qt/5.11.2/clang_64/") # <Set Path to Qt>
 # set (OPENSSL_DIR "path to openssl") # <OTIONAL : Set the past to custom OpenSSL version>
 
 #-------------------------------------------------------#