Windows hardcode fix

plugins/robots/common/twoDModel/src/engine/view/twoDModelWidget.cpp

@@ -223,6 +223,12 @@ void TwoDModelWidget::initWidget()
 	};
 	toggleRulers();
 
+	mUi->speedUpButton->setIcon(AbstractItem::loadTextColorIcon(":/icons/2d_plus.svg"));
+	mUi->speedDownButton->setIcon(AbstractItem::loadTextColorIcon(":/icons/2d_minus.svg"));
+	mUi->initialStateButton->setIcon(AbstractItem::loadTextColorIcon(":/icons/2d_robot_back.png"));
+	mUi->trainingModeButton->setIcon(AbstractItem::loadTextColorIcon(":/icons/2d_training.svg"));
+	mUi->toggleDetailsButton->setIcon(AbstractItem::loadTextColorIcon(":/icons/2d_left.png"));
+
 	connect(mUi->gridParametersBox, &twoDModel::view::GridParameters::parametersChanged
 			, &*mScene, [&]() { mScene->update(); });
 	connect(mUi->gridParametersBox, &GridParameters::parametersChanged, this, toggleRulers);

qrgui/brandManager/styles.h

@@ -37,60 +37,60 @@ class Styles
 	/// Returns json stylesheet for start tab background
 	virtual QString startTabBackgroundStyle() const
 	{
-		return placeStyle(utils::InFile::readAll(startTabBackgroundStylePath()));	
+		return loadSystemPallete(utils::InFile::readAll(startTabBackgroundStylePath()));
 	}
 
 	/// Returns json stylesheet for start tab substrate background
 	virtual QString startTabSubstrateBackgroundStyle() const
 	{
-		return placeStyle(utils::InFile::readAll(startTabSubstrateBackgroundStylePath()));
+		return loadSystemPallete(utils::InFile::readAll(startTabSubstrateBackgroundStylePath()));
 	}
 
 	/// Returns json stylesheet for start tab header background
 	virtual QString startTabHeaderBackgroundStyle() const
 	{
-		return placeStyle(utils::InFile::readAll(startTabHeaderBackgroundStylePath()));
+		return loadSystemPallete(utils::InFile::readAll(startTabHeaderBackgroundStylePath()));
 	}
 
 	/// Returns json stylesheet for recent projects section background on start tab
 	virtual QString startTabRecentProjectsBackgroundStyle() const
 	{
-		return placeStyle(utils::InFile::readAll(startTabRecentProjectsBackgroundStylePath()));
+		return loadSystemPallete(utils::InFile::readAll(startTabRecentProjectsBackgroundStylePath()));
 	}
 
 	/// Returns json stylesheet for projects management section background on start tab
 	virtual QString startTabProjectsManagementBackgroundStyle() const
 	{
-		return placeStyle(utils::InFile::readAll(startTabProjectsManagementBackgroundStylePath()));
+		return loadSystemPallete(utils::InFile::readAll(startTabProjectsManagementBackgroundStylePath()));
 	}
 
 	/// Returns json stylesheet for command buttons on start tab
 	virtual QString startTabButtonStyle() const
 	{
-		return placeStyle(utils::InFile::readAll(startTabButtonStylePath()));
+		return loadSystemPallete(utils::InFile::readAll(startTabButtonStylePath()));
 	}
 
 	/// Returns json stylesheet for styled text on start tab  of level 1 heading
 	virtual QString startTabLabelLevel1Style() const
 	{
-		return placeStyle(utils::InFile::readAll(startTabLabelLevel1StylePath()));
+		return loadSystemPallete(utils::InFile::readAll(startTabLabelLevel1StylePath()));
 	}
 
 	/// Returns json stylesheet for styled text on start tab of level 2 heading
 	virtual QString startTabLabelLevel2Style() const
 	{
-		return placeStyle(utils::InFile::readAll(startTabLabelLevel2StylePath()));
+		return loadSystemPallete(utils::InFile::readAll(startTabLabelLevel2StylePath()));
 	}
 
 	virtual QString splashscreenStyle() const
 	{
-		return placeStyle(utils::InFile::readAll(splashscreenStylePath()));
+		return loadSystemPallete(utils::InFile::readAll(splashscreenStylePath()));
 	}
 
 protected:
 
 	/// 
-	QString placeStyle(QString style) const {
+	QString loadSystemPallete(QString style) const {
 		auto systemPalette(QApplication::palette());
 		return style
 		.replace("@@Window@@", systemPalette.color(QPalette::Window).name())

qrgui/editor/edgeElement.cpp

@@ -17,6 +17,7 @@
 #include <QtWidgets/QStyle>
 #include <QtGui/QTextDocument>
 #include <QtWidgets/QMenu>
+#include <QApplication>
 
 #include <math.h>
 #include <qrkernel/logging.h>

qrgui/editor/labels/label.cpp

@@ -58,7 +58,6 @@ void Label::init()
 	QGraphicsTextItem::setFlags(ItemIsSelectable);
 	QGraphicsTextItem::setDefaultTextColor(Qt::black);
 	connect(document(), &QTextDocument::contentsChanged, this, &Label::saveToRepo);
-
 	reinitFont();
 	setRotation(mProperties->rotation());
 	if (!mProperties->isStatic()) {

qrgui/mainWindow/mainWindow.cpp

@@ -34,6 +34,7 @@
 #include <QtPrintSupport/QPrinter>
 #include <QtPrintSupport/QPrintDialog>
 #include <QtSvg/QSvgGenerator>
+#include <QOperatingSystemVersion>
 
 #include <qrkernel/settingsManager.h>
 #include <qrkernel/settingsListener.h>
@@ -115,6 +116,7 @@ MainWindow::MainWindow(const QString &fileToOpen)
 	, mInitialFileToOpen(fileToOpen)
 {
 	QLOG_INFO() << "MainWindow: screen DPI is" << logicalDpiX();
+	initPalette();
 	mUi->setupUi(this);
 	mUi->paletteTree->initMainWindow(this);
 	setWindowTitle("QReal");
@@ -643,6 +645,58 @@ void MainWindow::setReference(const QStringList &data, const QPersistentModelInd
 	}
 }
 
+bool MainWindow::windowsDarkThemeAvailiable()
+{
+	if ( QOperatingSystemVersion::current().majorVersion() == 10 )
+	{
+		return QOperatingSystemVersion::current().microVersion() >= 17763;
+	}
+	else if ( QOperatingSystemVersion::current().majorVersion() > 10 )
+	{
+		return true;
+	}
+	else
+	{
+		return false;
+	}
+}
+
+bool MainWindow::windowsIsInDarkTheme()
+{
+	QSettings settings( 
+		"HKEY_CURRENT_USER\\Software\\Microsoft\\Windows\\CurrentVersion\\Themes\\Personalize"
+		, QSettings::NativeFormat );
+	return settings.value( "AppsUseLightTheme", 1 ).toInt() == 0;
+}
+
+void MainWindow::initPalette() {
+	if (QSysInfo::productType() != "windows") return ;
+	if (windowsDarkThemeAvailiable() && windowsIsInDarkTheme()) {
+		auto palette = QApplication::palette();
+		palette.setColor(QPalette::Window,QColor(53,53,53));
+		palette.setColor(QPalette::WindowText,Qt::white);
+		palette.setColor(QPalette::Disabled,QPalette::WindowText,QColor(127,127,127));
+		palette.setColor(QPalette::Base,QColor(42,42,42));
+		palette.setColor(QPalette::AlternateBase,QColor(66,66,66));
+		palette.setColor(QPalette::ToolTipBase,Qt::white);
+		palette.setColor(QPalette::ToolTipText,Qt::white);
+		palette.setColor(QPalette::Text,Qt::white);
+		palette.setColor(QPalette::Disabled,QPalette::Text,QColor(127,127,127));
+		palette.setColor(QPalette::Dark,QColor(35,35,35));
+		palette.setColor(QPalette::Shadow,QColor(20,20,20));
+		palette.setColor(QPalette::Button,QColor(53,53,53));
+		palette.setColor(QPalette::ButtonText,Qt::white);
+		palette.setColor(QPalette::Disabled,QPalette::ButtonText,QColor(127,127,127));
+		palette.setColor(QPalette::BrightText,Qt::red);
+		palette.setColor(QPalette::Link,QColor(42,130,218));
+		palette.setColor(QPalette::Highlight,QColor(42,130,218));
+		palette.setColor(QPalette::Disabled,QPalette::Highlight,QColor(80,80,80));
+		palette.setColor(QPalette::HighlightedText,Qt::white);
+		palette.setColor(QPalette::Disabled,QPalette::HighlightedText,QColor(127,127,127));
+		QApplication::setPalette(palette);
+	}
+}
+
 void MainWindow::setData(const QString &data, const QPersistentModelIndex &index, const int &role)
 {
 	// const_cast here is ok, since we need to set data in a correct model, and

qrgui/mainWindow/mainWindow.h

@@ -306,6 +306,10 @@ private slots:
 	void switchToTab(int index);
 	int getTabIndex(const QModelIndex &index);
 
+	bool windowsDarkThemeAvailiable();
+	bool windowsIsInDarkTheme();
+	void initPalette();
+
 	void initGridProperties();
 	void clickErrorListWidget();
 

qrtranslations/fr/plugins/robots/twoDModel_fr.ts

@@ -728,7 +728,7 @@
 <context>
     <name>twoDModel::view::TwoDModelWidget</name>
     <message>
-        <location filename="../../../../plugins/robots/common/twoDModel/src/engine/view/twoDModelWidget.cpp" line="+323"/>
+        <location filename="../../../../plugins/robots/common/twoDModel/src/engine/view/twoDModelWidget.cpp" line="+329"/>
         <source>Warning</source>
         <translation>Attention</translation>
     </message>

qrtranslations/fr/qrgui_editor_fr.ts

@@ -163,7 +163,7 @@
 <context>
     <name>qReal::gui::editor::EdgeElement</name>
     <message>
-        <location filename="../../qrgui/editor/edgeElement.cpp" line="+61"/>
+        <location filename="../../qrgui/editor/edgeElement.cpp" line="+62"/>
         <source>Reverse</source>
         <translation type="unfinished">Retourner</translation>
     </message>

qrtranslations/fr/qrgui_mainWindow_fr.ts

@@ -708,7 +708,7 @@
 <context>
     <name>qReal::MainWindow</name>
     <message>
-        <location filename="../../qrgui/mainWindow/mainWindow.cpp" line="+620"/>
+        <location filename="../../qrgui/mainWindow/mainWindow.cpp" line="+622"/>
         <source>Could not save file, try to save it to another place</source>
         <translation type="unfinished"></translation>
     </message>
@@ -729,7 +729,7 @@ WARNING: The settings will be restored after application restart</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+673"/>
+        <location line="+725"/>
         <location line="+11"/>
         <source>Error</source>
         <translation>Erreur</translation>

qrtranslations/fr/qrutils_fr.ts

@@ -88,7 +88,7 @@
         <translation>Division entière par zéro</translation>
     </message>
     <message>
-        <location filename="../../qrutils/graphicsUtils/abstractItem.cpp" line="+594"/>
+        <location filename="../../qrutils/graphicsUtils/abstractItem.cpp" line="+595"/>
         <source>Remove</source>
         <translation>Supprimer</translation>
     </message>

qrtranslations/ru/plugins/robots/twoDModel_ru.ts

@@ -1071,7 +1071,7 @@
 <context>
     <name>twoDModel::view::TwoDModelWidget</name>
     <message>
-        <location filename="../../../../plugins/robots/common/twoDModel/src/engine/view/twoDModelWidget.cpp" line="+323"/>
+        <location filename="../../../../plugins/robots/common/twoDModel/src/engine/view/twoDModelWidget.cpp" line="+329"/>
         <source>Warning</source>
         <translation>Предупреждение</translation>
     </message>

qrtranslations/ru/qrgui_editor_ru.ts

@@ -167,7 +167,7 @@
 <context>
     <name>qReal::gui::editor::EdgeElement</name>
     <message>
-        <location filename="../../qrgui/editor/edgeElement.cpp" line="+61"/>
+        <location filename="../../qrgui/editor/edgeElement.cpp" line="+62"/>
         <source>Reverse</source>
         <translation>Развернуть</translation>
     </message>

qrtranslations/ru/qrgui_mainWindow_ru.ts

@@ -735,7 +735,7 @@
         <translation type="vanished">О QReal</translation>
     </message>
     <message>
-        <location filename="../../qrgui/mainWindow/mainWindow.cpp" line="+869"/>
+        <location filename="../../qrgui/mainWindow/mainWindow.cpp" line="+923"/>
         <location line="+11"/>
         <source>Error</source>
         <translation>Ошибка</translation>
@@ -788,7 +788,7 @@
         <translation>Создать диаграмму</translation>
     </message>
     <message>
-        <location line="-1047"/>
+        <location line="-1099"/>
         <source>Restore default settings</source>
         <translation>Восстановить настройки по-умолчанию</translation>
     </message>
@@ -807,7 +807,7 @@ WARNING: The settings will be restored after application restart</source>
         <translation>Не удалось сохранить файл, попробуйте сохранить его в другое место</translation>
     </message>
     <message>
-        <location line="+630"/>
+        <location line="+682"/>
         <source>Undo</source>
         <translation>Отменить</translation>
     </message>

qrtranslations/ru/qrutils_ru.ts

@@ -92,7 +92,7 @@
         <translation>Целичисленное деление на ноль</translation>
     </message>
     <message>
-        <location filename="../../qrutils/graphicsUtils/abstractItem.cpp" line="+594"/>
+        <location filename="../../qrutils/graphicsUtils/abstractItem.cpp" line="+595"/>
         <source>Remove</source>
         <translation>Удалить</translation>
     </message>

qrutils/graphicsUtils/abstractItem.cpp

@@ -21,6 +21,7 @@
 #include <QtWidgets/QGraphicsScene>
 #include <QtWidgets/QStyleOptionGraphicsItem>
 #include <QtWidgets/QGraphicsSceneMouseEvent>
+#include <QApplication>
 
 using namespace graphicsUtils;