diff --git a/win-linux/res/styles/editor.qss b/win-linux/res/styles/editor.qss
new file mode 100755
index 000000000..8ae3a4097
--- /dev/null
+++ b/win-linux/res/styles/editor.qss
@@ -0,0 +1,100 @@
+#mainPanel {background-color: %1;}
+#box-title-tools {background-color: %1;}
+#box-title-tools QLabel {font-family: "Helvetica Neue",Helvetica,Arial,sans-serif;}
+#labelTitle {color: #444; font-weight: bold;}
+#iconuser {color: %1; background: #d9ffffff; font-size: 12px;}
+QPushButton[act=tool]:hover {background-color: rgba(0,0,0,20%);}
+QPushButton#toolButtonClose:hover {background-color: #d42b2b;}
+QPushButton#toolButtonClose:pressed {background-color: #d75050;}
+
+/* pretty */
+#mainPanel[window=pretty] QPushButton[act=tool]:hover
+{
+ background-color: rgba(255,255,255,20%);
+}
+#mainPanel[window=pretty] QPushButton#toolButtonMinimize
+{
+ image: url(:/minimize_light.svg);
+}
+#mainPanel[window=pretty] QPushButton#toolButtonClose
+{
+ image: url(:/close_light.svg);
+}
+#mainPanel[window=pretty] QPushButton#toolButtonClose:hover
+{
+ background-color: #d42b2b;
+}
+#mainPanel[window=pretty] QPushButton#toolButtonMaximize
+{
+ image: url(:/restore_light.svg);
+}
+#mainPanel[window=pretty] QPushButton#toolButtonMaximize[class=min] {
+ image: url(:/maximize_light.svg);
+}
+#mainPanel[window=pretty] #labelTitle
+{
+ color: #fff;
+ font-size: 12px;
+}
+
+/* 1.25x */
+#mainPanel[zoom="1.25x"] #toolButtonMinimize,
+#mainPanel[zoom="1.25x"] #toolButtonClose,
+#mainPanel[zoom="1.25x"] #toolButtonMaximize
+{
+ padding: 6px 15px 9px;
+}
+#mainPanel[zoom="1.25x"] #iconuser,
+#mainPanel[zoom="1.25x"] #labelTitle
+{
+ font-size: 15px;
+}
+
+/* 1.5x */
+#mainPanel[zoom="1.5x"] #toolButtonMinimize,
+#mainPanel[zoom="1.5x"] #toolButtonClose,
+#mainPanel[zoom="1.5x"] #toolButtonMaximize
+{
+ padding: 8px 18px 11px;
+}
+#mainPanel[zoom="1.5x"] #iconuser,
+#mainPanel[zoom="1.5x"] #labelTitle
+{
+ font-size: 18px;
+}
+
+/* 1.75x */
+#mainPanel[zoom="1.75x"] #toolButtonMinimize,
+#mainPanel[zoom="1.75x"] #toolButtonClose,
+#mainPanel[zoom="1.75x"] #toolButtonMaximize
+{
+ padding: 9px 21px 12px;
+}
+#mainPanel[zoom="1.75x"] #iconuser,
+#mainPanel[zoom="1.75x"] #labelTitle
+{
+ font-size: 21px;
+}
+
+/* 2x */
+#mainPanel[zoom="2x"] #toolButtonMinimize,
+#mainPanel[zoom="2x"] #toolButtonClose,
+#mainPanel[zoom="2x"] #toolButtonMaximize
+{
+ padding: 10px 24px 14px;
+}
+#mainPanel[zoom="2x"] #iconuser,
+#mainPanel[zoom="2x"] #labelTitle
+{
+ font-size: 24px;
+}
+
+/* dark style */
+#mainPanel[uitheme=theme-dark] #labelTitle
+{
+ color: rgba(255,255,255,80%);
+}
+#mainPanel[uitheme=theme-contrast-dark] #labelTitle
+{
+ color: #e8e8e8;
+}
diff --git a/win-linux/resources.qrc b/win-linux/resources.qrc
index d51f634c5..f165c5bcf 100644
--- a/win-linux/resources.qrc
+++ b/win-linux/resources.qrc
@@ -82,6 +82,7 @@
res/styles/styles.qss
+ res/styles/editor.qss
res/styles/message.qss
diff --git a/win-linux/src/windows/ceditorwindow_p.h b/win-linux/src/windows/ceditorwindow_p.h
index 172d0ecb7..7414808df 100644
--- a/win-linux/src/windows/ceditorwindow_p.h
+++ b/win-linux/src/windows/ceditorwindow_p.h
@@ -66,59 +66,6 @@
using namespace NSEditorApi;
-const QString g_css =
- "#mainPanel{background-color:%1;}"
- "#box-title-tools{background-color:%1;}"
- "QPushButton[act=tool]:hover{background-color:rgba(0,0,0,20%);}"
- "QPushButton#toolButtonClose:hover{background-color:#d42b2b;}"
- "QPushButton#toolButtonClose:pressed{background-color:#d75050;}"
-#ifdef Q_OS_LINUX
- "#box-title-tools QLabel{font-size:11px;font-family:\"Helvetica Neue\",Helvetica,Arial,sans-serif;}"
- "#labelTitle{color:#444;}"
-#else
- "#box-title-tools QLabel{font-family:\"Helvetica Neue\",Helvetica,Arial,sans-serif;font-weight:bold;}"
- "#labelTitle{color:#444;}"
- "#mainPanel[window=pretty] #labelTitle{font-size:12px;}"
-#endif
- "#iconuser{color:#fff;font-size:11px;}"
- "#mainPanel[window=pretty] QPushButton[act=tool]:hover{background-color:rgba(255,255,255,20%);}"
- "#mainPanel[window=pretty] QPushButton#toolButtonMinimize,"
- "#mainPanel[window=pretty] QPushButton#toolButtonClose {background-image:url(:/minclose_light.png);}"
- "#mainPanel[window=pretty] QPushButton#toolButtonClose:hover{background-color:#d42b2b;}"
- "#mainPanel[window=pretty] QPushButton#toolButtonMaximize{background-image:url(:/max_light.png);}"
- "#mainPanel[window=pretty] #labelTitle{color:#fff;}"
- "#mainPanel[zoom=\"1.25x\"] #toolButtonMinimize,#mainPanel[zoom=\"1.25x\"] #toolButtonClose,"
- "#mainPanel[zoom=\"1.25x\"] #toolButtonMaximize{padding: 6px 15px 9px;}"
- "#mainPanel[zoom=\"1.25x\"] #iconuser,"
- "#mainPanel[zoom=\"1.25x\"] #labelTitle{font-size:15px;}"
- "#mainPanel[zoom=\"1.25x\"][window=pretty] QPushButton#toolButtonMinimize,"
- "#mainPanel[zoom=\"1.25x\"][window=pretty] QPushButton#toolButtonClose {background-image:url(:/minclose_light_1.25x.png);}"
- "#mainPanel[zoom=\"1.25x\"][window=pretty] QPushButton#toolButtonMaximize{background-image:url(:/max_light_1.25x.png);}"
- "#mainPanel[zoom=\"1.5x\"] #toolButtonMinimize,#mainPanel[zoom=\"1.5x\"] #toolButtonClose,"
- "#mainPanel[zoom=\"1.5x\"] #toolButtonMaximize{padding: 8px 18px 11px;}"
- "#mainPanel[zoom=\"1.5x\"] #iconuser,"
- "#mainPanel[zoom=\"1.5x\"] #labelTitle{font-size:18px;}"
- "#mainPanel[zoom=\"1.5x\"][window=pretty] QPushButton#toolButtonMinimize,"
- "#mainPanel[zoom=\"1.5x\"][window=pretty] QPushButton#toolButtonClose {background-image:url(:/minclose_light_1.5x.png);}"
- "#mainPanel[zoom=\"1.5x\"][window=pretty] QPushButton#toolButtonMaximize{background-image:url(:/max_light_1.5x.png);}"
- "#mainPanel[zoom=\"1.75x\"] #toolButtonMinimize,#mainPanel[zoom=\"1.75x\"] #toolButtonClose,"
- "#mainPanel[zoom=\"1.75x\"] #toolButtonMaximize{padding: 9px 21px 12px;}"
- "#mainPanel[zoom=\"1.75x\"] #iconuser,"
- "#mainPanel[zoom=\"1.75x\"] #labelTitle{font-size:21px;}"
- "#mainPanel[zoom=\"1.75x\"][window=pretty] QPushButton#toolButtonMinimize,"
- "#mainPanel[zoom=\"1.75x\"][window=pretty] QPushButton#toolButtonClose {background-image:url(:/minclose_light_1.75x.png);}"
- "#mainPanel[zoom=\"1.75x\"][window=pretty] QPushButton#toolButtonMaximize{background-image:url(:/max_light_1.75x.png);}"
- "#mainPanel[zoom=\"2x\"] #toolButtonMinimize,#mainPanel[zoom=\"2x\"] #toolButtonClose,"
- "#mainPanel[zoom=\"2x\"] #toolButtonMaximize{padding: 10px 24px 14px;}"
- "#mainPanel[zoom=\"2x\"] #iconuser,"
- "#mainPanel[zoom=\"2x\"] #labelTitle{font-size:24px;}"
- "#mainPanel[zoom=\"2x\"][window=pretty] QPushButton#toolButtonMinimize,"
- "#mainPanel[zoom=\"2x\"][window=pretty] QPushButton#toolButtonClose {background-image:url(:/minclose_light_2x.png);}"
- "#mainPanel[zoom=\"2x\"][window=pretty] QPushButton#toolButtonMaximize{background-image:url(:/max_light_2x.png);}"
- "#mainPanel[uitheme=theme-dark] #iconuser,"
- "#mainPanel[uitheme=theme-dark] #labelTitle{color:rgba(255,255,255,80%);}"
- "#mainPanel[uitheme=theme-contrast-dark] #iconuser,"
- "#mainPanel[uitheme=theme-contrast-dark] #labelTitle{color:#e8e8e8;}";
auto prepare_editor_css(int type, const CTheme& theme) -> QString {
std::wstring c;
@@ -128,7 +75,7 @@ auto prepare_editor_css(int type, const CTheme& theme) -> QString {
case etPresentation: c = theme.value(CTheme::ColorRole::ecrTabSlideActive); break;
case etSpreadsheet: c = theme.value(CTheme::ColorRole::ecrTabCellActive); break;
}
-
+ QString g_css(Utils::readStylesheets(":/styles/editor.qss"));
return g_css.arg(QString::fromStdWString(c));
}
@@ -766,10 +713,8 @@ public:
{
iconuser->setFixedHeight(0.85 * TOOLBTN_HEIGHT * window->m_dpiRatio);
iconuser->setFixedWidth(iconuser->height());
- auto iconTextColor = editor_color(panel()->data()->contentType()).name();
- iconuser->setStyleSheet(QString("QLabel#iconuser "
- "{background: #d9ffffff; border-radius: %1px; color: %2;}")
- .arg(QString::number(iconuser->height()/2), iconTextColor));
+ iconuser->setStyleSheet(QString("#iconuser {border-radius: %1px;}")
+ .arg(QString::number(iconuser->height()/2)));
}
QLabel * iconCrypted()