#89 [UI] High DPI displays fix + System scaling factor

CMakeLists.txt

@@ -7,7 +7,7 @@ option(EASY_PROFILER_NO_GUI "Build easy_profiler without the GUI application (re
 
 set(EASY_PROGRAM_VERSION_MAJOR 2)
 set(EASY_PROGRAM_VERSION_MINOR 0)
-set(EASY_PROGRAM_VERSION_PATCH 0)
+set(EASY_PROGRAM_VERSION_PATCH 1)
 set(EASY_PRODUCT_VERSION_STRING "${EASY_PROGRAM_VERSION_MAJOR}.${EASY_PROGRAM_VERSION_MINOR}.${EASY_PROGRAM_VERSION_PATCH}")
 
 set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/bin)

profiler_gui/images/attribution.txt

@@ -36,9 +36,11 @@ default/minimize-white.svg         - Icon made by Freepik from www.flaticon.com
 default/minimize-white-pressed.svg - Icon made by Freepik from www.flaticon.com
 default/arrow-down.svg             - Icon made by Freepik from www.flaticon.com
 default/arrow-down-hover.svg       - Icon made by Freepik from www.flaticon.com
+default/arrow-down-pressed.svg     - Icon made by Freepik from www.flaticon.com
 default/arrow-down-disabled.svg    - Icon made by Freepik from www.flaticon.com
 default/arrow-up.svg               - Icon made by Freepik from www.flaticon.com
 default/arrow-up-hover.svg         - Icon made by Freepik from www.flaticon.com
+default/arrow-up-pressed.svg       - Icon made by Freepik from www.flaticon.com
 default/arrow-up-disabled.svg      - Icon made by Freepik from www.flaticon.com
 default/arrow-left.svg             - Icon made by Freepik from www.flaticon.com
 default/arrow-right.svg            - Icon made by Freepik from www.flaticon.com

profiler_gui/images/default/arrow-down-disabled.svg

@@ -5,7 +5,7 @@
 	 width="451.847px" height="451.847px" viewBox="0 0 451.847 451.847" style="enable-background:new 0 0 451.847 451.847;"
 	 xml:space="preserve">
 <g>
-	<path fill="#cccccc" d="M225.923,354.706c-8.098,0-16.195-3.092-22.369-9.263L9.27,151.157c-12.359-12.359-12.359-32.397,0-44.751
+	<path fill="#c4c4c4" d="M225.923,354.706c-8.098,0-16.195-3.092-22.369-9.263L9.27,151.157c-12.359-12.359-12.359-32.397,0-44.751
 		c12.354-12.354,32.388-12.354,44.748,0l171.905,171.915l171.906-171.909c12.359-12.354,32.391-12.354,44.744,0
 		c12.365,12.354,12.365,32.392,0,44.751L248.292,345.449C242.115,351.621,234.018,354.706,225.923,354.706z"/>
 </g>

profiler_gui/images/default/arrow-down-hover.svg

@@ -5,7 +5,7 @@
 	 width="451.847px" height="451.847px" viewBox="0 0 451.847 451.847" style="enable-background:new 0 0 451.847 451.847;"
 	 xml:space="preserve">
 <g>
-	<path fill="#302020" d="M225.923,354.706c-8.098,0-16.195-3.092-22.369-9.263L9.27,151.157c-12.359-12.359-12.359-32.397,0-44.751
+	<path fill="#807070" d="M225.923,354.706c-8.098,0-16.195-3.092-22.369-9.263L9.27,151.157c-12.359-12.359-12.359-32.397,0-44.751
 		c12.354-12.354,32.388-12.354,44.748,0l171.905,171.915l171.906-171.909c12.359-12.354,32.391-12.354,44.744,0
 		c12.365,12.354,12.365,32.392,0,44.751L248.292,345.449C242.115,351.621,234.018,354.706,225.923,354.706z"/>
 </g>

profiler_gui/images/default/arrow-down-pressed.svg

@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="iso-8859-1"?>
+<!-- Generator: Adobe Illustrator 16.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+<svg version="1.1" id="Capa_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 width="451.847px" height="451.847px" viewBox="0 0 451.847 451.847" style="enable-background:new 0 0 451.847 451.847;"
+	 xml:space="preserve">
+<g>
+	<path fill="#201010" d="M225.923,354.706c-8.098,0-16.195-3.092-22.369-9.263L9.27,151.157c-12.359-12.359-12.359-32.397,0-44.751
+		c12.354-12.354,32.388-12.354,44.748,0l171.905,171.915l171.906-171.909c12.359-12.354,32.391-12.354,44.744,0
+		c12.365,12.354,12.365,32.392,0,44.751L248.292,345.449C242.115,351.621,234.018,354.706,225.923,354.706z"/>
+</g>
+</svg>

profiler_gui/images/default/arrow-up-disabled.svg

@@ -5,7 +5,7 @@
 	 width="451.847px" height="451.846px" viewBox="0 0 451.847 451.846" style="enable-background:new 0 0 451.847 451.846;"
 	 xml:space="preserve">
 <g>
-	<path fill="#cccccc" d="M248.292,106.406l194.281,194.29c12.365,12.359,12.365,32.391,0,44.744c-12.354,12.354-32.391,12.354-44.744,0
+	<path fill="#c4c4c4" d="M248.292,106.406l194.281,194.29c12.365,12.359,12.365,32.391,0,44.744c-12.354,12.354-32.391,12.354-44.744,0
 		L225.923,173.529L54.018,345.44c-12.36,12.354-32.395,12.354-44.748,0c-12.359-12.354-12.359-32.391,0-44.75L203.554,106.4
 		c6.18-6.174,14.271-9.259,22.369-9.259C234.018,97.141,242.115,100.232,248.292,106.406z"/>
 </g>

profiler_gui/images/default/arrow-up-hover.svg

@@ -5,7 +5,7 @@
 	 width="451.847px" height="451.846px" viewBox="0 0 451.847 451.846" style="enable-background:new 0 0 451.847 451.846;"
 	 xml:space="preserve">
 <g>
-	<path fill="#302020" d="M248.292,106.406l194.281,194.29c12.365,12.359,12.365,32.391,0,44.744c-12.354,12.354-32.391,12.354-44.744,0
+	<path fill="#807070" d="M248.292,106.406l194.281,194.29c12.365,12.359,12.365,32.391,0,44.744c-12.354,12.354-32.391,12.354-44.744,0
 		L225.923,173.529L54.018,345.44c-12.36,12.354-32.395,12.354-44.748,0c-12.359-12.354-12.359-32.391,0-44.75L203.554,106.4
 		c6.18-6.174,14.271-9.259,22.369-9.259C234.018,97.141,242.115,100.232,248.292,106.406z"/>
 </g>

profiler_gui/images/default/arrow-up-pressed.svg

@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="iso-8859-1"?>
+<!-- Generator: Adobe Illustrator 16.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+<svg version="1.1" id="Capa_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 width="451.847px" height="451.846px" viewBox="0 0 451.847 451.846" style="enable-background:new 0 0 451.847 451.846;"
+	 xml:space="preserve">
+<g>
+	<path fill="#201010" d="M248.292,106.406l194.281,194.29c12.365,12.359,12.365,32.391,0,44.744c-12.354,12.354-32.391,12.354-44.744,0
+		L225.923,173.529L54.018,345.44c-12.36,12.354-32.395,12.354-44.748,0c-12.359-12.354-12.359-32.391,0-44.75L203.554,106.4
+		c6.18-6.174,14.271-9.259,22.369-9.259C234.018,97.141,242.115,100.232,248.292,106.406z"/>
+</g>
+</svg>

profiler_gui/main_window.cpp

@@ -63,38 +63,41 @@
 
 #include <QApplication>
 #include <QCoreApplication>
-#include <QStatusBar>
-#include <QFileDialog>
-#include <QAction>
-#include <QMenu>
-#include <QMenuBar>
-#include <QPushButton>
-#include <QCloseEvent>
-#include <QSettings>
-#include <QTextCodec>
-#include <QFont>
-#include <QFontMetricsF>
-#include <QProgressDialog>
-#include <QSignalBlocker>
 #include <QDebug>
-#include <QToolBar>
+
-#include <QToolButton>
+#include <QAction>
-#include <QWidgetAction>
+#include <QCloseEvent>
-#include <QSpinBox>
+#include <QDateTime>
-#include <QMessageBox>
-#include <QLineEdit>
-#include <QLabel>
 #include <QDialog>
-#include <QVBoxLayout>
-#include <QFile>
-#include <QFileInfo>
-#include <QTextStream>
 #include <QDragEnterEvent>
 #include <QDragMoveEvent>
 #include <QDragLeaveEvent>
 #include <QDropEvent>
+#include <QFile>
+#include <QFileDialog>
+#include <QFileInfo>
+#include <QFont>
+#include <QFontMetrics>
+#include <QFontMetricsF>
+#include <QMenu>
+#include <QMenuBar>
+#include <QMessageBox>
 #include <QMimeData>
-#include <QDateTime>
+#include <QLabel>
+#include <QLineEdit>
+#include <QPushButton>
+#include <QProgressDialog>
+#include <QTextCodec>
+#include <QTextStream>
+#include <QToolBar>
+#include <QToolButton>
+#include <QSet>
+#include <QSettings>
+#include <QSignalBlocker>
+#include <QSpinBox>
+#include <QStatusBar>
+#include <QVBoxLayout>
+#include <QWidgetAction>
 
 #include "main_window.h"
 #include "arbitrary_value_inspector.h"
@@ -156,6 +159,42 @@ inline void loadTheme(const QString& _theme)
         QString style = in.readAll();
         if (!style.isEmpty())
         {
+            // Find font family
+            const auto fontFamilyString = QRegularExpression("font-family:.*;").match(style).captured();
+
+            // Calculate point size using current font
+            auto dummy = new QWidget();
+            dummy->setStyleSheet(QString("QWidget { %1\nfont-size: 100pt; }").arg(fontFamilyString));
+            dummy->show(); // actual font become valid only after widget showEvent
+            const auto pointSizeF = QFontMetricsF(dummy->font()).height() * 1e-2;
+            delete dummy;
+
+            //QMessageBox::information(nullptr, "asfdasf", QString("100pt = %1 = %2").arg(pointSizeF * 1e2).arg((int)(pointSizeF * 1e2 + 0.5)));
+
+            // Find and convert all sizes from points to pixels
+            QRegularExpression re("(\\d+\\.?\\d*)ex");
+            auto it = re.globalMatch(style);
+
+            QSet<QString> matchedTexts;
+            std::vector<QStringList> all;
+            while (it.hasNext())
+            {
+                const auto match = it.next();
+                if (!matchedTexts.contains(match.captured()))
+                {
+                    matchedTexts.insert(match.captured());
+                    all.emplace_back(match.capturedTexts());
+                }
+            }
+
+            for (const auto& match : all)
+            {
+                const auto pt = match.back().toDouble();
+                const int pixels = static_cast<int>(pointSizeF * pt + 0.5);
+                //QMessageBox::information(nullptr, "bbb", QString("Replacing %1\nwith\n%2\n\npt = %3").arg(match.front()).arg(QString("%1px").arg(pixels)).arg(pt));
+                style.replace(match.front(), QString("%1px").arg(pixels));
+            }
+
             qApp->setStyleSheet(style);
         }
     }
@@ -228,10 +267,12 @@ void MainWindow::configureSizes()
 
     const auto fontFamily = w.font().family();
     const auto pixelSize = w.font().pixelSize();
-    const auto updateFont = [&fontFamily, pixelSize] (QFont& font)
+    const auto pointSize = w.font().pointSize();
+    const auto updateFont = [&] (QFont& font)
     {
         font.setFamily(fontFamily);
         font.setPixelSize(pixelSize);
+        font.setPointSize(pointSize);
     };
 
     auto& fonts = EASY_GLOBALS.font;
@@ -892,7 +933,12 @@ void MainWindow::onThemeChange(bool)
     if (m_theme != newTheme)
     {
         m_theme = std::move(newTheme);
-        QMessageBox::information(this, "Theme", "You should restart the application to apply the theme.");
+
+        QMessageBox::information(this, "UI theme changed", "You may need to restart the application\nto apply the theme correctly.");
+
+        loadTheme(m_theme);
+        validateLineEdits();
+        configureSizes();
     }
 }
 
@@ -1358,6 +1404,22 @@ void MainWindow::onDescTreeDialogClose(int)
 
 //////////////////////////////////////////////////////////////////////////
 
+void MainWindow::validateLineEdits()
+{
+    m_addressEdit->setFixedWidth((m_addressEdit->fontMetrics().width(QString("255.255.255.255")) * 3) / 2);
+    m_portEdit->setFixedWidth(m_portEdit->fontMetrics().width(QString("000000")) + 10);
+    m_frameTimeEdit->setFixedWidth(m_frameTimeEdit->fontMetrics().width(QString("000000")));
+}
+
+//////////////////////////////////////////////////////////////////////////
+
+void MainWindow::showEvent(QShowEvent* show_event)
+{
+    Parent::showEvent(show_event);
+    validateLineEdits();
+    configureSizes();
+}
+
 void MainWindow::closeEvent(QCloseEvent* close_event)
 {
     if (m_bNetworkFileRegime)

profiler_gui/main_window.h

@@ -303,6 +303,7 @@ public:
 
     // Public virtual methods
 
+    void showEvent(QShowEvent* event) override;
     void closeEvent(QCloseEvent* close_event) override;
     void dragEnterEvent(QDragEnterEvent* drag_event) override;
     void dragMoveEvent(QDragMoveEvent* drag_event) override;
@@ -384,6 +385,8 @@ private:
     void destroyProgressDialog();
     void createProgressDialog(const QString& text);
 
+    void validateLineEdits();
+
 }; // END of class MainWindow.
 
 //////////////////////////////////////////////////////////////////////////

profiler_gui/resources.qrc

@@ -46,9 +46,11 @@
         <file alias="dock-close-white-pressed">images/default/close-white-pressed.svg</file>
         <file alias="arrow-up">images/default/arrow-up.svg</file>
         <file alias="arrow-up-hover">images/default/arrow-up-hover.svg</file>
+        <file alias="arrow-up-pressed">images/default/arrow-up-pressed.svg</file>
         <file alias="arrow-up-disabled">images/default/arrow-up-disabled.svg</file>
         <file alias="arrow-down">images/default/arrow-down.svg</file>
         <file alias="arrow-down-hover">images/default/arrow-down-hover.svg</file>
+        <file alias="arrow-down-pressed">images/default/arrow-down-pressed.svg</file>
         <file alias="arrow-down-disabled">images/default/arrow-down-disabled.svg</file>
         <file alias="arrow-right">images/default/arrow-right.svg</file>
         <file alias="yx-chart">images/default/yx.svg</file>

profiler_gui/themes/default.css

@@ -6,404 +6,478 @@
 *  default.scss by pysassc tool   *
 *                                 *
 ***********************************/
-/* ****************************************************************************************************************** */
-/* Functions */
-/* ****************************************************************************************************************** */
-/* Constants */
-/* ****************************************************************************************************************** */
-/* StyleSheet */
 * {
-  font-family: "DejaVu Sans";
+	font-family: "DejaVu Sans";
-  font-size: 13px;
+	font-size: 10pt;
-  color: #504040; }
+	color: #504040;
+}
 
 *:disabled {
-  color: #a08888; }
+	color: #c4c4c4;
+}
+
+RoundProgressIndicator {
+	qproperty-color: #3297FD;
+	qproperty-background: #c4c4c4;
+	background: transparent;
+}
 
 MainWindow, QToolBar, QDialog {
-  background-color: #f8f2f2; }
+	background-color: #f8f2f2;
+}
 
 QToolTip {
-  background-color: #ffeccc;
+	background-color: #ffeccc;
-  border: 1px solid #c4c4c4;
+	border: 1px solid #c4c4c4;
-  color: #504040; }
+	color: #504040;
+}
 
 ArbitraryValueToolTip {
-  margin: 0;
+	margin: 0;
-  border: none;
+	border: none;
-  background-color: #ffeccc; }
+	background-color: #ffeccc;
-  ArbitraryValueToolTip QWidget#cnt {
+}
-    border: 1px solid #c4c4c4;
+
-    background-color: transparent;
+ArbitraryValueToolTip QWidget#cnt {
-    margin: 0; }
+	border: 1px solid #c4c4c4;
-  ArbitraryValueToolTip QLabel {
+	background-color: transparent;
-    background-color: transparent;
+	margin: 0;
-    border: none;
+}
-    color: #504040; }
+
-  ArbitraryValueToolTip QTextEdit {
+ArbitraryValueToolTip QLabel {
-    background-color: transparent;
+	background-color: transparent;
-    border: none;
+	border: none;
-    color: #504040;
+	color: #504040;
-    selection-color: #504040;
+}
-    selection-background-color: rgba(152, 222, 152, 0.5); }
+
+ArbitraryValueToolTip QTextEdit {
+	background-color: transparent;
+	border: none;
+	color: #504040;
+	selection-color: white;
+	selection-background-color: #3297FD;
+}
 
 QWidget#DiagramPopup, QWidget#ThreadsPopup {
-  background-color: #ffeccc;
+	background-color: #ffeccc;
-  border: 1px solid #c4c4c4; }
+	border: 1px solid #c4c4c4;
+}
 
 QGraphicsView {
-  border: 1px solid #c4c4c4; }
+	border: 1px solid #c4c4c4;
+}
 
 QSplitter::handle:hover {
-  background-color: rgba(244, 67, 54, 0.5); }
+	background-color: #3297FD;
+}
 
 QSplitter::handle:pressed {
-  background-color: #f44336; }
+	background-color: #0264c7;
+}
+
+QLabel#BlocksTreeWidget_HintLabel {
+	color: gray;
+	font-size: 13pt;
+}
 
 /* ****************************************************************************************************************** */
-QLineEdit, QComboBox, QSpinBox {
+QLineEdit, QSpinBox {
-  height: 24px;
+	border: 1px solid #c4c4c4;
-  border: 1px solid #c4c4c4;
+	background-color: white;
-  background-color: white;
+	selection-background-color: #3297FD;
-  selection-background-color: rgba(152, 222, 152, 0.5);
+	selection-color: white;
-  selection-color: #504040; }
+	height: 15ex;
+}
+
+QComboBox {
+	border: 1px solid #c4c4c4;
+	background-color: white;
+	selection-background-color: #B4D5FE;
+	selection-color: #504040;
+	height: 15ex;
+    padding-right: 11ex;
+}
 
 QLineEdit:disabled, QComboBox:disabled, QSpinBox:disabled {
-  background-color: #f0f0f0;
+	background-color: #f0f0f0;
-  color: #a08888;
+	color: #c4c4c4;
-  selection-background-color: rgba(152, 222, 152, 0.5);
+	selection-background-color: #B4D5FE;
-  selection-color: #a08888; }
+	selection-color: #c4c4c4;
+}
 
 QLineEdit:focus {
-  border: 1px solid #ffbcbc; }
+	border: 1px solid #3297FD;
+}
 
 /* ****************************************************************************************************************** */
 QComboBox::drop-down {
-  subcontrol-origin: padding;
+	subcontrol-origin: border;
-  subcontrol-position: top right;
+	subcontrol-position: center right;
-  width: 24px;
+	border: none;
-  border: none;
+	width: 10ex;
-  margin-left: 0; }
+}
 
 QComboBox::down-arrow {
-  image: url(":/images/default/arrow-down");
+	image: url(":/images/default/arrow-down");
-  height: 8px;
+	width: 5ex;
-  width: 8px; }
+	height: 5ex;
+}
 
 QComboBox::down-arrow:hover {
-  image: url(":/images/default/arrow-down-hover"); }
+	image: url(":/images/default/arrow-down-hover");
+}
 
 QComboBox::down-arrow:disabled {
-  image: url(":/images/default/arrow-down-disabled"); }
+	image: url(":/images/default/arrow-down-disabled");
+}
 
 /* ****************************************************************************************************************** */
 QSpinBox::up-button {
-  subcontrol-origin: padding;
+	subcontrol-origin: padding;
-  subcontrol-position: top right;
+	subcontrol-position: top right;
-  margin-left: 5px;
+	border: none;
-  width: 24px;
+	width: 10ex;
-  border-left: 1px solid #c4c4c4;
+}
-  border-bottom: 1px solid #c4c4c4; }
 
 QSpinBox::down-button {
-  subcontrol-origin: padding;
+	subcontrol-origin: padding;
-  subcontrol-position: bottom right;
+	subcontrol-position: bottom right;
-  margin-left: 5px;
+	border: none;
-  width: 24px;
+	width: 10ex;
-  border-left: 1px solid #c4c4c4; }
+}
-
-QSpinBox::up-button:pressed, QSpinBox::down-button:pressed {
-  background-color: #eaeaea; }
-
-QSpinBox::up-button:!pressed:hover, QSpinBox::down-button:!pressed:hover {
-  background-color: #fafafa; }
 
 QSpinBox::up-arrow {
-  image: url(":/images/default/arrow-up");
+	image: url(":/images/default/arrow-up");
-  height: 8px;
+	width: 5ex;
-  width: 8px; }
+	height: 5ex;
+}
 
 QSpinBox::up-arrow:hover {
-  image: url(":/images/default/arrow-up-hover"); }
+	image: url(":/images/default/arrow-up-hover");
+}
+
+QSpinBox::up-arrow:pressed {
+	image: url(":/images/default/arrow-up-pressed");
+}
 
 QSpinBox::up-arrow:disabled {
-  image: url(":/images/default/arrow-up-disabled"); }
+	image: url(":/images/default/arrow-up-disabled");
+}
 
 QSpinBox::down-arrow {
-  image: url(":/images/default/arrow-down");
+	image: url(":/images/default/arrow-down");
-  height: 8px;
+	width: 5ex;
-  width: 8px; }
+	height: 5ex;
+}
 
 QSpinBox::down-arrow:hover {
-  image: url(":/images/default/arrow-down-hover"); }
+	image: url(":/images/default/arrow-down-hover");
+}
+
+QSpinBox::down-arrow:pressed {
+	image: url(":/images/default/arrow-down-pressed");
+}
 
 QSpinBox::down-arrow:disabled {
-  image: url(":/images/default/arrow-down-disabled"); }
+	image: url(":/images/default/arrow-down-disabled");
+}
 
 /* ****************************************************************************************************************** */
 QPushButton {
-  height: 24px;
+	height: 15ex;
-  min-width: 50px;
+	min-width: 30ex;
-  border: 1px solid #c4c4c4;
+	border: 1px solid #c4c4c4;
-  background-color: white;
+	background-color: white;
-  padding: 0 5px 0 5px; }
+}
 
 QPushButton:disabled {
-  background-color: #f0f0f0;
+	background-color: #f0f0f0;
-  color: #a08888; }
+	color: #c4c4c4;
+}
 
 QPushButton:hover {
-  border: 1px solid #ffbcbc;
+	border: 1px solid #3297FD;
-  color: #922c2c; }
+	color: #3297FD;
+}
 
 QPushButton:pressed {
-  border: 1px solid #922c2c;
+	border: 1px solid #3297FD;
-  color: #370400; }
+	color: #0264c7;
+}
 
 /* ****************************************************************************************************************** */
 QListView {
-  background-color: white;
+	background-color: white;
-  border: 1px solid #c4c4c4; }
+	border: 1px solid #c4c4c4;
+}
 
 QListView, QTableView, QTreeView {
-  alternate-background-color: #e4e4ec;
+	alternate-background-color: #e4e4ec;
-  selection-background-color: rgba(152, 222, 152, 0.8);
+	selection-background-color: #B4D5FE;
-  selection-color: #504040; }
+	selection-color: #504040;
+}
 
 QTreeView::branch {
-  selection-background-color: rgba(152, 222, 152, 0.8);
+	padding: 5ex 0 5ex 0;
-  border-bottom: 1px solid #c4c4c4; }
+	selection-background-color: #B4D5FE;
+	border-bottom: 1px solid #c4c4c4;
+}
 
 QTreeView::branch:selected {
-  background-color: rgba(152, 222, 152, 0.8); }
+	background-color: #B4D5FE;
+}
 
 QTreeView::branch:open:has-children {
-  padding: 9px 0 9px 0;
+	border-image: none;
-  border-image: none;
+	image: url(":/images/default/arrow-down");
-  image: url(":/images/default/arrow-down"); }
+}
 
 QTreeView::branch:closed:has-children {
-  padding: 9px 0 9px 0;
+	border-image: none;
-  border-image: none;
+	image: url(":/images/default/arrow-right");
-  image: url(":/images/default/arrow-right"); }
+}
 
 QListView::item, QTableView::item, QTreeView::item {
-  height: 26px;
+	height: 15ex;
-  border-bottom: 1px solid #c4c4c4; }
+	border-bottom: 1px solid #c4c4c4;
+}
 
 QListView::item:selected, QTableView::item:selected, QTreeView::item:selected {
-  background-color: rgba(152, 222, 152, 0.8); }
+	background-color: #B4D5FE;
+}
 
 QTreeView::indicator {
-  width: 14px;
+	width: 9ex;
-  height: 14px;
+	height: 9ex;
-  background-color: transparent;
+	background-color: transparent;
-  border: 1px solid transparent;
+	border: 1px solid transparent;
-  padding: 1px;
+	padding: 1px;
-  margin: 0; }
+	margin: 0;
+}
 
 QTreeView::indicator:hover, QTreeView::indicator:checked, QTreeView::indicator:indeterminate {
-  background-color: white;
+	background-color: white;
-  border: 1px solid #c4c4c4; }
+	border: 1px solid #c4c4c4;
+}
 
 QTreeView::indicator:checked {
-  image: url(":/images/default/check"); }
+	image: url(":/images/default/check");
+}
 
 QTreeView::indicator:checked:disabled {
-  image: url(":/images/default/check-disabled"); }
+	image: url(":/images/default/check-disabled");
+}
 
 QTreeView::indicator:indeterminate {
-  image: url(":/images/default/partial-check"); }
+	image: url(":/images/default/partial-check");
+}
 
 QTreeView::indicator:indeterminate:disabled {
-  image: url(":/images/default/partial-check-disabled"); }
+	image: url(":/images/default/partial-check-disabled");
+}
 
 /* ****************************************************************************************************************** */
 QMenu {
-  background-color: white;
+	background-color: white;
-  border: 1px solid #c4c4c4;
+	border: 1px solid #c4c4c4;
-  padding-top: 4px;
+	padding: 2ex 1ex 2ex 1ex;
-  padding-bottom: 4px; }
+}
 
 QMenu::item {
-  height: 24px;
+	height: 15ex;
-  padding: 0 16px 0 25px;
+	padding-left: 15ex;
-  border: 1px solid transparent;
+	padding-right: 5ex;
-  /* reserve space for selection border */ }
+	border: 1px solid transparent;
+  /* reserve space for selection border */;
+}
 
 QMenu::item:selected {
-  border: 1px solid rgba(152, 222, 152, 0.5);
+	border: 1px solid transparent;
-  background-color: rgba(152, 222, 152, 0.5); }
+	background-color: #B4D5FE;
+	color: #504040;
+}
 
 QMenu::icon {
-  width: 14px;
+	width: 8ex;
-  height: 14px;
+	height: 8ex;
-  background: none;
+	background: none;
-  border: 1px inset transparent;
+	border: 1px inset transparent;
-  padding: 1px;
+	padding: 1px;
-  margin-left: 2px; }
+	margin: 0 0 0 2ex;
+}
 
 QMenu::icon:checked {
   /* appearance of a 'checked' icon */
-  background-color: #dddddd;
+	background-color: #dddddd;
-  border: 1px inset #aaaaaa; }
+	border: 1px inset #aaaaaa;
+}
 
 QMenu::separator {
-  height: 1px;
+	height: 1px;
-  background: #c4c4c4;
+	background: #c4c4c4;
-  margin-left: 5px;
+	margin-left: 4ex;
-  margin-right: 5px; }
+	margin-right: 4ex;
+}
 
 QMenu::indicator {
-  width: 14px;
+	width: 9ex;
-  height: 14px;
+	height: 9ex;
-  background-color: white;
+	background-color: white;
-  border: 1px solid #c4c4c4;
+	border: 1px solid #c4c4c4;
-  margin-left: 2px;
+	padding: 1px;
-  padding: 1px; }
+	margin: 0 0 0 2ex;
+}
 
 QMenu::indicator:non-exclusive:checked {
-  image: url(":/images/default/check"); }
+	image: url(":/images/default/check");
+}
 
 QMenu::indicator:non-exclusive:checked:disabled {
-  image: url(":/images/default/check-disabled"); }
+	image: url(":/images/default/check-disabled");
+}
 
 QMenu::indicator:exclusive {
-  border-radius: 8px; }
+	border-radius: 5ex;
+}
 
 QMenu::indicator:exclusive:checked {
-  image: url(":/images/default/radio-check"); }
+	image: url(":/images/default/radio-check");
+}
 
 QMenu::indicator:exclusive:checked:disabled {
-  image: url(":/images/default/radio-check-disabled"); }
+	image: url(":/images/default/radio-check-disabled");
-
-/* ****************************************************************************************************************** */
-/*QToolButton {
-    border: 1px solid transparent;
-    background: none;
-    padding: 2px;
 }
 
-QToolButton:hover {
-    border: 1px solid $BorderColor;
-}
-
-QToolButton[popupMode="1"] {
-    padding-right: 13px;
-}
-
-QToolButton:pressed {
-    background-color: #808080;
-}
-
-QToolButton::menu-button {
-    border: none;
-    border-left: 1px solid transparent;
-    width: 12px;
-}
-
-QToolButton::menu-button:hover {
-    border-left: 1px solid $BorderColor;
-    background-color: #bbbbbb;
-}
-
-QToolButton::menu-button:pressed {
-    border-left: 1px solid $BorderColor;
-    background-color: #808080;
-}*/
 /* ****************************************************************************************************************** */
 QHeaderView::section {
-  height: 28px;
+	height: 15.3ex;
-  width: 96px;
+	width: 60ex;
-  min-width: 64px;
+	min-width: 40ex;
-  background: #eeeeee; }
+	background: #eeeeee;
+}
 
 /* ****************************************************************************************************************** */
 DockWidget QWidget#EasyDockWidgetTitle {
-  background-color: #686464; }
+	background-color: #686464;
-  DockWidget QWidget#EasyDockWidgetTitle QLabel {
+}
-    color: white;
+
-    margin-left: 4px; }
+DockWidget QWidget#EasyDockWidgetTitle QLabel {
-  DockWidget QWidget#EasyDockWidgetTitle QPushButton {
+	color: white;
-    background: none;
+	margin-left: 4px;
-    border: none;
+}
-    max-height: 12px;
+
-    min-width: 12px;
+DockWidget QWidget#EasyDockWidgetTitle QPushButton {
-    max-width: 12px;
+	background: none;
-    margin-right: 4px;
+	border: none;
-    padding: 0; }
+	max-height: 8ex;
-  DockWidget QWidget#EasyDockWidgetTitle QPushButton#EasyDockWidgetFloatButton {
+	min-width: 8ex;
-    image: url(":/images/default/dock-maximize-white"); }
+	max-width: 8ex;
-  DockWidget QWidget#EasyDockWidgetTitle QPushButton#EasyDockWidgetFloatButton:hover {
+	margin-right: 3ex;
-    image: url(":/images/default/dock-maximize-white-hover"); }
+	padding: 0;
-  DockWidget QWidget#EasyDockWidgetTitle QPushButton#EasyDockWidgetFloatButton:pressed {
+}
-    image: url(":/images/default/dock-maximize-white-pressed"); }
+
-  DockWidget QWidget#EasyDockWidgetTitle QPushButton#EasyDockWidgetFloatButton[floating=true] {
+DockWidget QWidget#EasyDockWidgetTitle QPushButton#EasyDockWidgetFloatButton {
-    image: url(":/images/default/dock-minimize-white"); }
+	image: url(":/images/default/dock-maximize-white");
-  DockWidget QWidget#EasyDockWidgetTitle QPushButton#EasyDockWidgetFloatButton[floating=true]:hover {
+}
-    image: url(":/images/default/dock-minimize-white-hover"); }
+
-  DockWidget QWidget#EasyDockWidgetTitle QPushButton#EasyDockWidgetFloatButton[floating=true]:pressed {
+DockWidget QWidget#EasyDockWidgetTitle QPushButton#EasyDockWidgetFloatButton:hover {
-    image: url(":/images/default/dock-minimize-white-pressed"); }
+	image: url(":/images/default/dock-maximize-white-hover");
-  DockWidget QWidget#EasyDockWidgetTitle QPushButton#EasyDockWidgetCloseButton {
+}
-    image: url(":/images/default/dock-close-white"); }
+
-  DockWidget QWidget#EasyDockWidgetTitle QPushButton#EasyDockWidgetCloseButton:hover {
+DockWidget QWidget#EasyDockWidgetTitle QPushButton#EasyDockWidgetFloatButton:pressed {
-    image: url(":/images/default/dock-close-white-hover"); }
+	image: url(":/images/default/dock-maximize-white-pressed");
-  DockWidget QWidget#EasyDockWidgetTitle QPushButton#EasyDockWidgetCloseButton:pressed {
+}
-    image: url(":/images/default/dock-close-white-pressed"); }
+
+DockWidget QWidget#EasyDockWidgetTitle QPushButton#EasyDockWidgetFloatButton[floating=true] {
+	image: url(":/images/default/dock-minimize-white");
+}
+
+DockWidget QWidget#EasyDockWidgetTitle QPushButton#EasyDockWidgetFloatButton[floating=true]:hover {
+	image: url(":/images/default/dock-minimize-white-hover");
+}
+
+DockWidget QWidget#EasyDockWidgetTitle QPushButton#EasyDockWidgetFloatButton[floating=true]:pressed {
+	image: url(":/images/default/dock-minimize-white-pressed");
+}
+
+DockWidget QWidget#EasyDockWidgetTitle QPushButton#EasyDockWidgetCloseButton {
+	image: url(":/images/default/dock-close-white");
+}
+
+DockWidget QWidget#EasyDockWidgetTitle QPushButton#EasyDockWidgetCloseButton:hover {
+	image: url(":/images/default/dock-close-white-hover");
+}
+
+DockWidget QWidget#EasyDockWidgetTitle QPushButton#EasyDockWidgetCloseButton:pressed {
+	image: url(":/images/default/dock-close-white-pressed");
+}
 
 /* ****************************************************************************************************************** */
 QProgressBar {
-  height: 24px;
+	background-color: #a4a4b4;
-  background-color: white;
+	border: none;
-  border: 1px solid #c4c4c4;
+	color: white;
-  color: #0B530B;
+	text-align: center;
-  text-align: center; }
+	height: 14ex;
+}
 
 QProgressBar::chunk {
-  background-color: #98DE98;
+	background-color: #3297FD;
-  width: 2px;
+	width: 2px;
-  margin: 0; }
+	margin: 0;
+}
 
 /* ****************************************************************************************************************** */
 QScrollBar {
-  background-color: transparent;
+	background-color: transparent;
-  border: none;
+	border: none;
-  padding: 0; }
+	padding: 0;
+}
 
 QScrollBar:hover {
-  background-color: rgba(0, 0, 0, 0.1); }
+	background-color: rgba(0, 0, 0, 0.1);
+}
 
 QScrollBar:horizontal {
-  margin: 0;
+	margin: 0;
-  height: 8px; }
+	height: 5ex;
+}
 
 QScrollBar:vertical {
-  margin: 0;
+	margin: 0;
-  width: 8px; }
+	width: 5ex;
+}
 
 QScrollBar::handle {
-  background-color: rgba(0, 0, 0, 0.4);
+	background-color: rgba(0, 0, 0, 0.4);
-  border: none;
+	border: none;
-  margin: 0;
+	margin: 0;
-  padding: 0; }
+	padding: 0;
+}
 
 QScrollBar::handle:pressed {
-  background-color: rgba(0, 0, 0, 0.6); }
+	background-color: rgba(0, 0, 0, 0.6);
+}
 
 QScrollBar::handle:vertical {
-  min-height: 30px;
+	min-height: 20ex;
-  margin-left: 4px; }
+	margin-left: 3ex;
+}
 
 QScrollBar::handle:vertical:hover, QScrollBar::handle:vertical:pressed {
-  margin-left: 0; }
+	margin-left: 0;
+}
 
 QScrollBar::handle:horizontal {
-  min-width: 30px;
+	min-width: 20ex;
-  margin-top: 4px; }
+	margin-top: 3ex;
+}
 
 QScrollBar::handle:horizontal:hover, QScrollBar::handle:horizontal:pressed {
-  margin-top: 0; }
+	margin-top: 0;
+}
 
 QScrollBar::add-line, QScrollBar::sub-line {
-  background: none;
+	background: none;
-  border: none; }
+	border: none;
+}

profiler_gui/themes/default.scss

@@ -7,35 +7,45 @@
 *                                 *
 ***********************************/
 
-/* ****************************************************************************************************************** */
-/* Functions */
 @function rgb_a($color, $opacity) {
     @return fade_out($color, 1.0 - $opacity);
 }
 
-/* ****************************************************************************************************************** */
+// CONSTANTS ----------------------------------------------
-/* Constants */
+$FontSize: 10pt;
+
 $TextColor: #504040;
-$DisabledTextColor: #a08888;
+$DisabledTextColor: #c4c4c4;
+$SelectedTextColor: $TextColor;
+$DarkSelectedTextColor: white;
+$DisabledSelectedTextColor: $DisabledTextColor;
+
 $BorderColor: #c4c4c4;
 $MainColor: #f44336;
-$HoveredMenuRowColor: rgb_a(#98DE98, 0.5);
+
+$DarkSelectionColor: #3297FD;
+
+$SelectionBorderColor: transparent;
+$SelectionColor: #B4D5FE;
+$DisabledSelectionColor: #B4D5FE;
+$TreeViewSelectionColor: $SelectionColor;
+$TreeViewSelectionTextColor: $TextColor;
+
 $BackgroundColor: white;
 $DisabledBackgroundColor: #f0f0f0;
-$ButtonHoverColor: #922c2c;//#d77d7d;
+
-$ButtonPressedColor: #370400;//#922c2c;
+$ButtonHoverColor: $DarkSelectionColor;//#922c2c;
-$FocusBorderColor: #ffbcbc;
+$ButtonPressedColor: darken($DarkSelectionColor, 20%);//#370400;
+
+$FocusBorderColor: $DarkSelectionColor;//#ffbcbc;
 $TooltipColor: #ffeccc;
-$DefaultHeight: 24px;
-$ComboBoxArrowSize: 8px;
-$SpinBoxArrowSize: 8px;
 
-/* ****************************************************************************************************************** */
+$InputHeight: 15ex;
-/* StyleSheet */
 
+// STYLES -------------------------------------------------
 * {
     font-family: "DejaVu Sans";
-    font-size: 13px;
+    font-size: $FontSize;
     color: $TextColor;
 }
 
@@ -43,6 +53,12 @@ $SpinBoxArrowSize: 8px;
     color: $DisabledTextColor;
 }
 
+RoundProgressIndicator {
+    qproperty-color: $DarkSelectionColor;
+    qproperty-background: $BorderColor;
+    background: transparent;
+}
+
 MainWindow, QToolBar, QDialog {
     background-color: #f8f2f2;
 }
@@ -57,22 +73,25 @@ ArbitraryValueToolTip {
     margin: 0;
     border: none;
     background-color: $TooltipColor;
+
     QWidget#cnt {
         border: 1px solid $BorderColor;
         background-color: transparent;
         margin: 0;
     }
+
     QLabel {
         background-color: transparent;
         border: none;
         color: $TextColor;
     }
+
     QTextEdit {
         background-color: transparent;
         border: none;
         color: $TextColor;
-        selection-color: $TextColor;
+        selection-color: $DarkSelectedTextColor;
-        selection-background-color: $HoveredMenuRowColor;
+        selection-background-color: $DarkSelectionColor;
     }
 }
 
@@ -86,85 +105,124 @@ QGraphicsView {
 }
 
 QSplitter::handle:hover {
-    background-color: rgb_a($MainColor, 0.5);
+    background-color: $FocusBorderColor;
 }
 
 QSplitter::handle:pressed {
-    background-color: $MainColor;
+    background-color: darken($FocusBorderColor, 20%);
+}
+
+QLabel#BlocksTreeWidget_HintLabel {
+    color: gray;
+    font-size: 13pt;
 }
 
 /* ****************************************************************************************************************** */
-QLineEdit, QComboBox, QSpinBox {
+QLineEdit, QSpinBox {
-    height: $DefaultHeight;
     border: 1px solid $BorderColor;
     background-color: $BackgroundColor;
-    selection-background-color: $HoveredMenuRowColor;
+    selection-background-color: $DarkSelectionColor;
-    selection-color: $TextColor;
+    selection-color: $DarkSelectedTextColor;
+    height: $InputHeight;
+}
+
+QComboBox {
+    border: 1px solid $BorderColor;
+    background-color: $BackgroundColor;
+    selection-background-color: $SelectionColor;
+    selection-color: $SelectedTextColor;
+    height: $InputHeight;
+    padding-right: 11ex;
 }
 
 QLineEdit:disabled, QComboBox:disabled, QSpinBox:disabled {
     background-color: $DisabledBackgroundColor;
     color: $DisabledTextColor;
-    selection-background-color: $HoveredMenuRowColor;
+    selection-background-color: $DisabledSelectionColor;
-    selection-color: $DisabledTextColor;
+    selection-color: $DisabledSelectedTextColor;
 }
 
 QLineEdit:focus { border: 1px solid $FocusBorderColor; }
 
 /* ****************************************************************************************************************** */
 QComboBox::drop-down {
-    subcontrol-origin: padding;
+    subcontrol-origin: border;
-    subcontrol-position: top right;
+    subcontrol-position: center right;
-    width: $DefaultHeight;
     border: none;
-    margin-left: 0;
+    width: 10ex;
 }
 
-QComboBox::down-arrow { image: url(":/images/default/arrow-down"); height: $ComboBoxArrowSize; width: $ComboBoxArrowSize; }
+QComboBox::down-arrow {
-QComboBox::down-arrow:hover { image: url(":/images/default/arrow-down-hover"); }
+    image: url(":/images/default/arrow-down");
-QComboBox::down-arrow:disabled { image: url(":/images/default/arrow-down-disabled"); }
+    width: 5ex;
+    height: 5ex;
+}
+
+QComboBox::down-arrow:hover {
+    image: url(":/images/default/arrow-down-hover");
+}
+
+QComboBox::down-arrow:disabled {
+    image: url(":/images/default/arrow-down-disabled");
+}
 
 /* ****************************************************************************************************************** */
 QSpinBox::up-button {
     subcontrol-origin: padding;
     subcontrol-position: top right;
-    margin-left: 5px;
+    border: none;
-    width: $DefaultHeight;
+    width: 10ex;
-    border-left: 1px solid $BorderColor;
-    border-bottom: 1px solid $BorderColor;
 }
 
 QSpinBox::down-button {
     subcontrol-origin: padding;
     subcontrol-position: bottom right;
-    margin-left: 5px;
+    border: none;
-    width: $DefaultHeight;
+    width: 10ex;
-    border-left: 1px solid $BorderColor;
 }
 
-QSpinBox::up-button:pressed, QSpinBox::down-button:pressed {
+QSpinBox::up-arrow {
-    background-color: #eaeaea;
+    image: url(":/images/default/arrow-up");
+    width: 5ex;
+    height: 5ex;
 }
 
-QSpinBox::up-button:!pressed:hover, QSpinBox::down-button:!pressed:hover {
+QSpinBox::up-arrow:hover {
-    background-color: #fafafa;
+    image: url(":/images/default/arrow-up-hover");
 }
 
-QSpinBox::up-arrow { image: url(":/images/default/arrow-up"); height: $SpinBoxArrowSize; width: $SpinBoxArrowSize; }
+QSpinBox::up-arrow:pressed {
-QSpinBox::up-arrow:hover { image: url(":/images/default/arrow-up-hover"); }
+    image: url(":/images/default/arrow-up-pressed");
-QSpinBox::up-arrow:disabled { image: url(":/images/default/arrow-up-disabled"); }
+}
 
-QSpinBox::down-arrow { image: url(":/images/default/arrow-down"); height: $SpinBoxArrowSize; width: $SpinBoxArrowSize; }
+QSpinBox::up-arrow:disabled {
-QSpinBox::down-arrow:hover { image: url(":/images/default/arrow-down-hover"); }
+    image: url(":/images/default/arrow-up-disabled");
-QSpinBox::down-arrow:disabled { image: url(":/images/default/arrow-down-disabled"); }
+}
+
+QSpinBox::down-arrow {
+    image: url(":/images/default/arrow-down");
+    width: 5ex;
+    height: 5ex;
+}
+
+QSpinBox::down-arrow:hover {
+    image: url(":/images/default/arrow-down-hover");
+}
+
+QSpinBox::down-arrow:pressed {
+    image: url(":/images/default/arrow-down-pressed");
+}
+
+QSpinBox::down-arrow:disabled {
+    image: url(":/images/default/arrow-down-disabled");
+}
 
 /* ****************************************************************************************************************** */
 QPushButton {
-    height: $DefaultHeight;
+    height: $InputHeight;
-    min-width: 50px;
+    min-width: 30ex;
     border: 1px solid $BorderColor;
     background-color: $BackgroundColor;
-    padding: 0 5px 0 5px;
 }
 
 QPushButton:disabled {
@@ -190,44 +248,43 @@ QListView {
 
 QListView, QTableView, QTreeView {
     alternate-background-color: #e4e4ec;
-    selection-background-color: rgb_a(#98DE98, 0.8);
+    selection-background-color: $TreeViewSelectionColor;
-    selection-color: $TextColor;
+    selection-color: $TreeViewSelectionTextColor;
 }
 
 QTreeView::branch {
-    selection-background-color: rgb_a(#98DE98, 0.8);
+    padding: 5ex 0 5ex 0;
+    selection-background-color: $TreeViewSelectionColor;
     border-bottom: 1px solid $BorderColor;
 }
 
 QTreeView::branch:selected {
-    background-color: rgb_a(#98DE98, 0.8);
+    background-color: $TreeViewSelectionColor;
 }
 
 QTreeView::branch:open:has-children {
-    padding: 9px 0 9px 0;
     border-image: none;
     image: url(":/images/default/arrow-down");
 }
 
 QTreeView::branch:closed:has-children {
-    padding: 9px 0 9px 0;
     border-image: none;
     image: url(":/images/default/arrow-right");
 }
 
 QListView::item, QTableView::item, QTreeView::item {
-    height: $DefaultHeight + 2px;
+    height: $InputHeight;
     border-bottom: 1px solid $BorderColor;
 }
 
 QListView::item:selected, QTableView::item:selected, QTreeView::item:selected {
-    background-color: rgb_a(#98DE98, 0.8);
+    background-color: $TreeViewSelectionColor;
 }
 
 
 QTreeView::indicator {
-    width: 14px;
+    width: 9ex;
-    height: 14px;
+    height: 9ex;
     background-color: transparent;
     border: 1px solid transparent;
     padding: 1px;
@@ -239,38 +296,49 @@ QTreeView::indicator:hover, QTreeView::indicator:checked, QTreeView::indicator:i
     border: 1px solid $BorderColor;
 }
 
-QTreeView::indicator:checked { image: url(":/images/default/check"); }
+QTreeView::indicator:checked {
-QTreeView::indicator:checked:disabled { image: url(":/images/default/check-disabled"); }
+    image: url(":/images/default/check");
+}
 
-QTreeView::indicator:indeterminate { image: url(":/images/default/partial-check"); }
+QTreeView::indicator:checked:disabled {
-QTreeView::indicator:indeterminate:disabled { image: url(":/images/default/partial-check-disabled"); }
+    image: url(":/images/default/check-disabled");
+}
+
+QTreeView::indicator:indeterminate {
+    image: url(":/images/default/partial-check");
+}
+
+QTreeView::indicator:indeterminate:disabled {
+    image: url(":/images/default/partial-check-disabled");
+}
 
 /* ****************************************************************************************************************** */
 QMenu {
     background-color: $BackgroundColor;
     border: 1px solid $BorderColor;
-    padding-top: 4px;
+    padding: 2ex 1ex 2ex 1ex;
-    padding-bottom: 4px;
 }
 
 QMenu::item {
-    height: $DefaultHeight;
+    height: $InputHeight;
-    padding: 0 16px 0 25px;
+    padding-left: $InputHeight;
+    padding-right: 5ex;
     border: 1px solid transparent; /* reserve space for selection border */
 }
 
 QMenu::item:selected {
-    border: 1px solid $HoveredMenuRowColor;
+    border: 1px solid $SelectionBorderColor;
-    background-color: $HoveredMenuRowColor;
+    background-color: $SelectionColor;
+    color: $SelectedTextColor;
 }
 
 QMenu::icon {
-    width: 14px;
+    width: 8ex;
-    height: 14px;
+    height: 8ex;
     background: none;
     border: 1px inset transparent;
     padding: 1px;
-    margin-left: 2px;
+    margin: 0 0 0 2ex;
 }
 
 QMenu::icon:checked { /* appearance of a 'checked' icon */
@@ -281,81 +349,47 @@ QMenu::icon:checked { /* appearance of a 'checked' icon */
 QMenu::separator {
     height: 1px;
     background: $BorderColor;
-    margin-left: 5px;
+    margin-left: 4ex;
-    margin-right: 5px;
+    margin-right: 4ex;
 }
 
 QMenu::indicator {
-    width: 14px;
+    width: 9ex;
-    height: 14px;
+    height: 9ex;
     background-color: $BackgroundColor;
     border: 1px solid $BorderColor;
-    margin-left: 2px;
     padding: 1px;
+    margin: 0 0 0 2ex;
 }
 
-QMenu::indicator:non-exclusive:checked { image: url(":/images/default/check"); }
+QMenu::indicator:non-exclusive:checked {
-QMenu::indicator:non-exclusive:checked:disabled { image: url(":/images/default/check-disabled"); }
+    image: url(":/images/default/check");
-
-QMenu::indicator:exclusive { border-radius: 8px; }
-QMenu::indicator:exclusive:checked { image: url(":/images/default/radio-check"); }
-QMenu::indicator:exclusive:checked:disabled { image: url(":/images/default/radio-check-disabled"); }
-
-
-
-
-/* ****************************************************************************************************************** */
-/*QToolButton {
-    border: 1px solid transparent;
-    background: none;
-    padding: 2px;
 }
 
-QToolButton:hover {
+QMenu::indicator:non-exclusive:checked:disabled {
-    border: 1px solid $BorderColor;
+    image: url(":/images/default/check-disabled");
 }
 
-QToolButton[popupMode="1"] {
+QMenu::indicator:exclusive {
-    padding-right: 13px;
+    border-radius: 5ex;
 }
 
-QToolButton:pressed {
+QMenu::indicator:exclusive:checked {
-    background-color: #808080;
+    image: url(":/images/default/radio-check");
 }
 
-QToolButton::menu-button {
+QMenu::indicator:exclusive:checked:disabled {
-    border: none;
+    image: url(":/images/default/radio-check-disabled");
-    border-left: 1px solid transparent;
-    width: 12px;
 }
 
-QToolButton::menu-button:hover {
-    border-left: 1px solid $BorderColor;
-    background-color: #bbbbbb;
-}
-
-QToolButton::menu-button:pressed {
-    border-left: 1px solid $BorderColor;
-    background-color: #808080;
-}*/
-
-
-
-
-
-
 /* ****************************************************************************************************************** */
 QHeaderView::section {
-    height: 28px;
+    height: 15.3ex;
-    width: 96px;
+    width: 60ex;
-    min-width: 64px;
+    min-width: 40ex;
     background: #eeeeee;
 }
 
-
-
-
-
 /* ****************************************************************************************************************** */
 DockWidget
 {
@@ -371,10 +405,10 @@ DockWidget
         QPushButton {
             background: none;
             border: none;
-            max-height: 12px;
+            max-height: 8ex;
-            min-width: 12px;
+            min-width: 8ex;
-            max-width: 12px;
+            max-width: 8ex;
-            margin-right: 4px;
+            margin-right: 3ex;
             padding: 0;
         }
 
@@ -394,15 +428,15 @@ DockWidget
 
 /* ****************************************************************************************************************** */
 QProgressBar {
-    height: $DefaultHeight;
+    background-color: #a4a4b4;
-    background-color: $BackgroundColor;
+    border: none;
-    border: 1px solid $BorderColor;//#64BC64;
+    color: white;
-    color: #0B530B;
     text-align: center;
+    height: 14ex;
 }
 
 QProgressBar::chunk {
-    background-color: #98DE98;
+    background-color: $DarkSelectionColor;
     width: 2px;
     margin: 0;
 }
@@ -420,12 +454,12 @@ QScrollBar:hover {
 
 QScrollBar:horizontal {
     margin: 0;
-    height: 8px;
+    height: 5ex;
 }
 
 QScrollBar:vertical {
     margin: 0;
-    width: 8px;
+    width: 5ex;
 }
 
 QScrollBar::handle {
@@ -439,10 +473,10 @@ QScrollBar::handle:pressed {
     background-color: rgb_a(#000000, 0.6);
 }
 
-QScrollBar::handle:vertical { min-height: 30px; margin-left: 4px; }
+QScrollBar::handle:vertical { min-height: 20ex; margin-left: 3ex; }
 QScrollBar::handle:vertical:hover, QScrollBar::handle:vertical:pressed { margin-left: 0; }
 
-QScrollBar::handle:horizontal { min-width: 30px; margin-top: 4px; }
+QScrollBar::handle:horizontal { min-width: 20ex; margin-top: 3ex; }
 QScrollBar::handle:horizontal:hover, QScrollBar::handle:horizontal:pressed { margin-top: 0; }
 
 QScrollBar::add-line, QScrollBar::sub-line {