From edaf1fba8937eb16dbbde38b1ab1f2f9fcb09dc7 Mon Sep 17 00:00:00 2001 From: Klaus Basan Date: Mon, 24 Nov 2014 23:53:47 +0100 Subject: [PATCH] refs #347, renamed property to frameless --- src/blackgui/dockwidgetinfobar.cpp | 2 +- src/blackgui/qss/infobar.qss | 4 ++-- src/blackgui/qss/mainwindow.qss | 4 ++-- src/blackgui/qss/texture.test/infobar.qss | 4 ++-- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/blackgui/dockwidgetinfobar.cpp b/src/blackgui/dockwidgetinfobar.cpp index 4547d5760..1febd9f11 100644 --- a/src/blackgui/dockwidgetinfobar.cpp +++ b/src/blackgui/dockwidgetinfobar.cpp @@ -22,7 +22,7 @@ namespace BlackGui { CDockWidgetInfoBar::CDockWidgetInfoBar(QWidget *parent) : CDockWidget(parent) { - this->setProperty("mainframeless", CGuiUtility::isMainWindowFrameless()); + this->setProperty("frameless", CGuiUtility::isMainWindowFrameless()); this->setMarginsWhenDocked(0, 0, 0, -1); this->setWindowTitle("Info bar"); this->setWindowIcon(CIcons::swift24()); diff --git a/src/blackgui/qss/infobar.qss b/src/blackgui/qss/infobar.qss index 05b3437ac..41333f53c 100644 --- a/src/blackgui/qss/infobar.qss +++ b/src/blackgui/qss/infobar.qss @@ -5,7 +5,7 @@ QFrame { padding-bottom: 0px; } -/** mainframeless is dynamic property**/ -QDockWidget[mainframeless="true"] QFrame { +/** frameless is dynamic property**/ +QDockWidget[frameless="true"] QFrame { background-color: darkslategray; } diff --git a/src/blackgui/qss/mainwindow.qss b/src/blackgui/qss/mainwindow.qss index a5f61aaed..e4586220b 100644 --- a/src/blackgui/qss/mainwindow.qss +++ b/src/blackgui/qss/mainwindow.qss @@ -8,7 +8,7 @@ there is no opacity with background image, so we need semitransparent images use -- instead of :: for namespaces Used dynamic properties -mainframeless (infobar.qss) +frameless (infobar.qss) **/ /** Main window **/ @@ -53,7 +53,7 @@ QAbstractScrollArea #pg_StatusPageConsole { background-color: black; } border: 0px; } -#wi_CentralWidgetOutside[mainframeless="true"] { +#wi_CentralWidgetOutside[frameless="true"] { background-image: url(:/textures/icons/textures/texture-outer.jpg); background-color: darkslategray; margin: 0px; diff --git a/src/blackgui/qss/texture.test/infobar.qss b/src/blackgui/qss/texture.test/infobar.qss index ff4abb6b4..2daac5a36 100644 --- a/src/blackgui/qss/texture.test/infobar.qss +++ b/src/blackgui/qss/texture.test/infobar.qss @@ -5,7 +5,7 @@ QFrame { padding-bottom: 0px; } -/** mainframeless dynamic property**/ -QDockWidget[mainframeless="true"] QFrame { +/** frameless dynamic property**/ +QDockWidget[frameless="true"] QFrame { background-color: darkslategray; } \ No newline at end of file