Skip to content

Commit 46d08cf

Browse files
fix: inactive colors bind
1 parent 5c51f4c commit 46d08cf

File tree

3 files changed

+9
-5
lines changed

3 files changed

+9
-5
lines changed

qrgui/brandManager/styles.cpp

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,11 @@ QPalette Styles::loadPalette(const QString& pathToPalette) const {
5050
QStringList rgb = settings.value(QString(group) + "/" + it.key()).toStringList();
5151
if (!rgb.isEmpty()) {
5252
QColor color(rgb[0].toInt(), rgb[1].toInt(), rgb[2].toInt());
53-
palette.setColor(colorGroup, it.value(), color);
53+
if (colorGroup == QPalette::Disabled) {
54+
palette.setColor(colorGroup, it.value(), color);
55+
} else {
56+
palette.setColor(it.value(), color);
57+
}
5458
}
5559
}
5660
}

qrtranslations/fr/qrgui_mainWindow_fr.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -729,7 +729,7 @@ WARNING: The settings will be restored after application restart</source>
729729
<translation type="unfinished"></translation>
730730
</message>
731731
<message>
732-
<location line="+709"/>
732+
<location line="+704"/>
733733
<location line="+11"/>
734734
<source>Error</source>
735735
<translation>Erreur</translation>

qrtranslations/ru/qrgui_mainWindow_ru.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -735,7 +735,7 @@
735735
<translation type="vanished">О QReal</translation>
736736
</message>
737737
<message>
738-
<location filename="../../qrgui/mainWindow/mainWindow.cpp" line="+907"/>
738+
<location filename="../../qrgui/mainWindow/mainWindow.cpp" line="+902"/>
739739
<location line="+11"/>
740740
<source>Error</source>
741741
<translation>Ошибка</translation>
@@ -788,7 +788,7 @@
788788
<translation>Создать диаграмму</translation>
789789
</message>
790790
<message>
791-
<location line="-1083"/>
791+
<location line="-1078"/>
792792
<source>Restore default settings</source>
793793
<translation>Восстановить настройки по-умолчанию</translation>
794794
</message>
@@ -807,7 +807,7 @@ WARNING: The settings will be restored after application restart</source>
807807
<translation>Не удалось сохранить файл, попробуйте сохранить его в другое место</translation>
808808
</message>
809809
<message>
810-
<location line="+666"/>
810+
<location line="+661"/>
811811
<source>Undo</source>
812812
<translation>Отменить</translation>
813813
</message>

0 commit comments

Comments
 (0)