diff --git a/Plugins/org.blueberry.ui.qt/resources/dark/checkbox-checked-disabled.svg b/Plugins/org.blueberry.ui.qt/resources/dark/checkbox-checked-disabled.svg new file mode 100644 index 0000000000..98e9e84ddc --- /dev/null +++ b/Plugins/org.blueberry.ui.qt/resources/dark/checkbox-checked-disabled.svg @@ -0,0 +1,73 @@ + + + + + + + + + + image/svg+xml + + + + + + + + + + diff --git a/Plugins/org.blueberry.ui.qt/resources/dark/checkbox-checked-hover.svg b/Plugins/org.blueberry.ui.qt/resources/dark/checkbox-checked-hover.svg new file mode 100644 index 0000000000..4a1b7e8b85 --- /dev/null +++ b/Plugins/org.blueberry.ui.qt/resources/dark/checkbox-checked-hover.svg @@ -0,0 +1,73 @@ + + + + + + + + + + image/svg+xml + + + + + + + + + + diff --git a/Plugins/org.blueberry.ui.qt/resources/dark/checkbox-checked.svg b/Plugins/org.blueberry.ui.qt/resources/dark/checkbox-checked.svg new file mode 100644 index 0000000000..27e196fdf1 --- /dev/null +++ b/Plugins/org.blueberry.ui.qt/resources/dark/checkbox-checked.svg @@ -0,0 +1,73 @@ + + + + + + + + + + image/svg+xml + + + + + + + + + + diff --git a/Plugins/org.blueberry.ui.qt/resources/dark/checkbox-unchecked-disabled.svg b/Plugins/org.blueberry.ui.qt/resources/dark/checkbox-unchecked-disabled.svg new file mode 100644 index 0000000000..d11ac819ea --- /dev/null +++ b/Plugins/org.blueberry.ui.qt/resources/dark/checkbox-unchecked-disabled.svg @@ -0,0 +1,66 @@ + + + + + + + + + + image/svg+xml + + + + + + + + + diff --git a/Plugins/org.blueberry.ui.qt/resources/dark/checkbox-unchecked-hover.svg b/Plugins/org.blueberry.ui.qt/resources/dark/checkbox-unchecked-hover.svg new file mode 100644 index 0000000000..d7f5f29136 --- /dev/null +++ b/Plugins/org.blueberry.ui.qt/resources/dark/checkbox-unchecked-hover.svg @@ -0,0 +1,66 @@ + + + + + + + + + + image/svg+xml + + + + + + + + + diff --git a/Plugins/org.blueberry.ui.qt/resources/dark/checkbox-unchecked.svg b/Plugins/org.blueberry.ui.qt/resources/dark/checkbox-unchecked.svg new file mode 100644 index 0000000000..1043e7d738 --- /dev/null +++ b/Plugins/org.blueberry.ui.qt/resources/dark/checkbox-unchecked.svg @@ -0,0 +1,66 @@ + + + + + + + + + + image/svg+xml + + + + + + + + + diff --git a/Plugins/org.blueberry.ui.qt/resources/dark/checkbox_big_checked.png b/Plugins/org.blueberry.ui.qt/resources/dark/checkbox_big_checked.png deleted file mode 100644 index 09d90bf70c..0000000000 Binary files a/Plugins/org.blueberry.ui.qt/resources/dark/checkbox_big_checked.png and /dev/null differ diff --git a/Plugins/org.blueberry.ui.qt/resources/dark/checkbox_big_checked_disabled.png b/Plugins/org.blueberry.ui.qt/resources/dark/checkbox_big_checked_disabled.png deleted file mode 100644 index 2ab8693c08..0000000000 Binary files a/Plugins/org.blueberry.ui.qt/resources/dark/checkbox_big_checked_disabled.png and /dev/null differ diff --git a/Plugins/org.blueberry.ui.qt/resources/dark/checkbox_big_unchecked.png b/Plugins/org.blueberry.ui.qt/resources/dark/checkbox_big_unchecked.png deleted file mode 100644 index 073c4a6543..0000000000 Binary files a/Plugins/org.blueberry.ui.qt/resources/dark/checkbox_big_unchecked.png and /dev/null differ diff --git a/Plugins/org.blueberry.ui.qt/resources/dark/checkbox_big_unchecked_disabled.png b/Plugins/org.blueberry.ui.qt/resources/dark/checkbox_big_unchecked_disabled.png deleted file mode 100644 index c4fa06c6e3..0000000000 Binary files a/Plugins/org.blueberry.ui.qt/resources/dark/checkbox_big_unchecked_disabled.png and /dev/null differ diff --git a/Plugins/org.blueberry.ui.qt/resources/dark/checkbox_checked.png b/Plugins/org.blueberry.ui.qt/resources/dark/checkbox_checked.png deleted file mode 100644 index 31e3ea9f18..0000000000 Binary files a/Plugins/org.blueberry.ui.qt/resources/dark/checkbox_checked.png and /dev/null differ diff --git a/Plugins/org.blueberry.ui.qt/resources/dark/checkbox_checked_disabled.png b/Plugins/org.blueberry.ui.qt/resources/dark/checkbox_checked_disabled.png deleted file mode 100644 index 0658f46961..0000000000 Binary files a/Plugins/org.blueberry.ui.qt/resources/dark/checkbox_checked_disabled.png and /dev/null differ diff --git a/Plugins/org.blueberry.ui.qt/resources/dark/checkbox_checked_focus.png b/Plugins/org.blueberry.ui.qt/resources/dark/checkbox_checked_focus.png deleted file mode 100644 index d7279dd4d4..0000000000 Binary files a/Plugins/org.blueberry.ui.qt/resources/dark/checkbox_checked_focus.png and /dev/null differ diff --git a/Plugins/org.blueberry.ui.qt/resources/dark/checkbox_indeterminate.png b/Plugins/org.blueberry.ui.qt/resources/dark/checkbox_indeterminate.png deleted file mode 100644 index e53980442d..0000000000 Binary files a/Plugins/org.blueberry.ui.qt/resources/dark/checkbox_indeterminate.png and /dev/null differ diff --git a/Plugins/org.blueberry.ui.qt/resources/dark/checkbox_indeterminate_disabled.png b/Plugins/org.blueberry.ui.qt/resources/dark/checkbox_indeterminate_disabled.png deleted file mode 100644 index b7ac500eb5..0000000000 Binary files a/Plugins/org.blueberry.ui.qt/resources/dark/checkbox_indeterminate_disabled.png and /dev/null differ diff --git a/Plugins/org.blueberry.ui.qt/resources/dark/checkbox_indeterminate_focus.png b/Plugins/org.blueberry.ui.qt/resources/dark/checkbox_indeterminate_focus.png deleted file mode 100644 index 0bf39f8013..0000000000 Binary files a/Plugins/org.blueberry.ui.qt/resources/dark/checkbox_indeterminate_focus.png and /dev/null differ diff --git a/Plugins/org.blueberry.ui.qt/resources/dark/checkbox_unchecked.png b/Plugins/org.blueberry.ui.qt/resources/dark/checkbox_unchecked.png deleted file mode 100644 index e138b2c791..0000000000 Binary files a/Plugins/org.blueberry.ui.qt/resources/dark/checkbox_unchecked.png and /dev/null differ diff --git a/Plugins/org.blueberry.ui.qt/resources/dark/checkbox_unchecked_disabled.png b/Plugins/org.blueberry.ui.qt/resources/dark/checkbox_unchecked_disabled.png deleted file mode 100644 index 3e252c9cec..0000000000 Binary files a/Plugins/org.blueberry.ui.qt/resources/dark/checkbox_unchecked_disabled.png and /dev/null differ diff --git a/Plugins/org.blueberry.ui.qt/resources/dark/checkbox_unchecked_focus.png b/Plugins/org.blueberry.ui.qt/resources/dark/checkbox_unchecked_focus.png deleted file mode 100644 index 34b967e461..0000000000 Binary files a/Plugins/org.blueberry.ui.qt/resources/dark/checkbox_unchecked_focus.png and /dev/null differ diff --git a/Plugins/org.blueberry.ui.qt/resources/darkstyle.qss b/Plugins/org.blueberry.ui.qt/resources/darkstyle.qss index dc5f26f44a..4856df60a1 100644 --- a/Plugins/org.blueberry.ui.qt/resources/darkstyle.qss +++ b/Plugins/org.blueberry.ui.qt/resources/darkstyle.qss @@ -1,238 +1,331 @@ /*=================================================================== BlueBerry Platform Copyright (c) German Cancer Research Center, Division of Medical and Biological Informatics. All rights reserved. This software is distributed WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See LICENSE.txt or http://www.mitk.org for details. ===================================================================*/ /* iconColor = #c7c7c7 <- This line is parsed by MITK iconAccentColor = #d4821e <- This line is parsed by MITK */ QWidget { background-color: #2d2d30; border: none; color: #f1f1f1; } +QWidget:disabled { + background-color: #2d2d30; + border-color: #434346; + color: #656565; +} + +QAbstractButton:hover, QComboBox:hover, QLineEdit:hover { + background-color: #3f3f46; +} + +QAbstractButton:pressed { + background-color: #434346; +} + +QAbstractItemView { + alternate-background-color: #1b1b1c; + background-color: #252526; +} + +QGroupBox { + border: 1px solid #434346; + margin-top: 8px; + padding-top: 8px; +} + +QGroupBox::title { + padding: 0 4px; + subcontrol-origin: margin; + subcontrol-position: top center; +} + QComboBox, QLineEdit { background-color: #333337; border: 1px solid #434346; } QComboBox QAbstractItemView { border: 1px solid #333337; selection-background-color: #3f3f46; } QComboBox::drop-down { image: url(":/org.blueberry.ui.qt/dark/down-arrow.svg"); subcontrol-origin: margin; subcontrol-position: right; width: 12px; } QComboBox::drop-down:hover { background-color: #1f1f20; border-left: 1px solid #007acc; image: url(":/org.blueberry.ui.qt/dark/down-arrow-pressed.svg"); } +QCheckBox { + background-color: none; +} + +QCheckBox:hover { + background-color: none; +} + +QCheckBox::indicator { + height: 13px; + width: 13px; +} + +QCheckBox::indicator:unchecked { + image: url(":/org.blueberry.ui.qt/dark/checkbox-unchecked.svg"); +} + +QCheckBox::indicator:unchecked:hover { + image: url(":/org.blueberry.ui.qt/dark/checkbox-unchecked-hover.svg"); +} + +QCheckBox::indicator:unchecked:disabled { + image: url(":/org.blueberry.ui.qt/dark/checkbox-unchecked-disabled.svg"); +} + +QCheckBox::indicator:checked { + image: url(":/org.blueberry.ui.qt/dark/checkbox-checked.svg"); +} + +QCheckBox::indicator:checked:hover { + image: url(":/org.blueberry.ui.qt/dark/checkbox-checked-hover.svg"); +} + +QCheckBox::indicator:checked:disabled { + image: url(":/org.blueberry.ui.qt/dark/checkbox-checked-disabled.svg"); +} + QSlider::groove { background-color: #686868; } QSlider::groove:hover { background-color: #9e9e9e; } QSlider::groove:horizontal { height: 3px; } QSlider::groove:vertical { width: 3px; } QSlider::handle { background-color: #686868; } QSlider::handle:hover { background-color: #1c97ea; } QSlider::handle:pressed { background-color: #007acc; } QSlider::handle:horizontal { margin: -8px 0; width: 8px; } QSlider::handle::vertical { margin: 0 -8px; height: 8px; } -QAbstractButton:hover, QComboBox:hover, QLineEdit:hover { - background-color: #3f3f46; +QPushButton { + border: 1px solid #3f3f46; + padding: 4px 8px; +} + +QPushButton:pressed { + border: 1px solid #434346; } QLineEdit:hover { border: 1px solid #2b7de1; } QLabel { background-color: none; } -QAbstractItemView { - alternate-background-color: #1b1b1c; - background-color: #252526; +QMenu { + border: 1px solid #3e3e40; +} + +QMenu QWidget { + background-color: #1b1b1c; +} + +QMenu::item { + background-color: #1b1b1c; +} + +QMenu::item:selected { + background-color: #333334; +} + +QMenu::separator { + height: 1px; + background-color: #3e3e40; +} + +QMenuBar::item:selected { + background-color: #3e3e40; } QScrollBar { background-color: #3e3e42; } QScrollBar:horizontal { height: 18px; margin: 0 18px 0 18px; } QScrollBar:vertical { width: 18px; margin: 18px 0 18px 0; } QScrollBar::handle { background-color: #686868; } QScrollBar::handle:hover { background-color: #9e9e9e; } QScrollBar::handle:pressed { background-color: #efebef; } QScrollBar::handle:horizontal { min-width: 18px; margin: 4px 0 5px 0; } QScrollBar::handle:vertical { min-height: 18px; margin: 0 5px 0 4px; } QScrollBar::add-page, QScrollBar::sub-page { background-color: none; } QScrollBar::add-line, QScrollBar::sub-line { background-color: #3e3e42; subcontrol-origin: margin; } QScrollBar::add-line:horizontal { subcontrol-position: right; width: 18px; } QScrollBar::sub-line:horizontal { subcontrol-position: left; width: 18px; } QScrollBar::add-line:vertical { subcontrol-position: bottom; height: 18px; } QScrollBar::sub-line:vertical { subcontrol-position: top; height: 18px; } QScrollBar::up-arrow, QScrollBar::right-arrow, QScrollBar:down-arrow, QScrollBar:left-arrow { width: 18px; height: 18px; } QScrollBar::down-arrow { image: url(":/org.blueberry.ui.qt/dark/down-arrow.svg"); } QScrollBar::down-arrow:disabled { image: url(":/org.blueberry.ui.qt/dark/down-arrow-disabled.svg"); } QScrollBar::down-arrow:hover { image: url(":/org.blueberry.ui.qt/dark/down-arrow-hover.svg"); } QScrollBar::down-arrow:pressed { image: url(":/org.blueberry.ui.qt/dark/down-arrow-pressed.svg"); } QScrollBar::left-arrow { image: url(":/org.blueberry.ui.qt/dark/left-arrow.svg"); } QScrollBar::left-arrow:disabled { image: url(":/org.blueberry.ui.qt/dark/left-arrow-disabled.svg"); } QScrollBar::left-arrow:hover { image: url(":/org.blueberry.ui.qt/dark/left-arrow-hover.svg"); } QScrollBar::left-arrow:pressed { image: url(":/org.blueberry.ui.qt/dark/left-arrow-pressed.svg"); } QScrollBar::right-arrow { image: url(":/org.blueberry.ui.qt/dark/right-arrow.svg"); } QScrollBar::right-arrow:disabled { image: url(":/org.blueberry.ui.qt/dark/right-arrow-disabled.svg"); } QScrollBar::right-arrow:hover { image: url(":/org.blueberry.ui.qt/dark/right-arrow-hover.svg"); } QScrollBar::right-arrow:pressed { image: url(":/org.blueberry.ui.qt/dark/right-arrow-pressed.svg"); } QScrollBar::up-arrow { image: url(":/org.blueberry.ui.qt/dark/up-arrow.svg"); } QScrollBar::up-arrow:disabled { image: url(":/org.blueberry.ui.qt/dark/up-arrow-disabled.svg"); } QScrollBar::up-arrow:hover { image: url(":/org.blueberry.ui.qt/dark/up-arrow-hover.svg"); } QScrollBar::up-arrow:pressed { image: url(":/org.blueberry.ui.qt/dark/up-arrow-pressed.svg"); } diff --git a/Plugins/org.blueberry.ui.qt/resources/org_blueberry_ui_qt.qrc b/Plugins/org.blueberry.ui.qt/resources/org_blueberry_ui_qt.qrc index 5f129145c4..fd80075bc3 100755 --- a/Plugins/org.blueberry.ui.qt/resources/org_blueberry_ui_qt.qrc +++ b/Plugins/org.blueberry.ui.qt/resources/org_blueberry_ui_qt.qrc @@ -1,82 +1,76 @@ cursor_bottom.xpm cursor_center.xpm cursor_left.xpm cursor_offscreen.xpm cursor_right.xpm cursor_top.xpm dialog-error.svg icon_missing.png tab_close_grey.svg tab_close_grey_active.svg lightstyle.qss lightstyle-activetab.qss lightstyle-tab.qss dark/Hmovetoolbar.png dark/stylesheet-branch-end.png dark/branch_closed-on.png dark/stylesheet-vline.png dark/branch_closed.png dark/branch_open-on.png dark/transparent.png dark/right_arrows.svg dark/sizegrip.png dark/tab_close_grey.svg dark/tab_close_grey_active.svg dark/Vmovetoolbar.png dark/stylesheet-branch-more.png dark/Hsepartoolbar.png dark/branch_open.png dark/Vsepartoolbar.png dark/undock.png - dark/checkbox_checked_disabled.png - dark/checkbox_checked_focus.png - dark/checkbox_checked.png - dark/checkbox_indeterminate_disabled.png - dark/checkbox_indeterminate_focus.png - dark/checkbox_indeterminate.png - dark/checkbox_unchecked_disabled.png - dark/checkbox_unchecked_focus.png - dark/checkbox_unchecked.png - dark/checkbox_big_checked_disabled.png - dark/checkbox_big_checked.png - dark/checkbox_big_unchecked_disabled.png - dark/checkbox_big_unchecked.png dark/radio_checked_disabled.png dark/radio_checked_focus.png dark/radio_checked.png dark/radio_unchecked_disabled.png dark/radio_unchecked_focus.png dark/radio_unchecked.png dark/down-arrow.svg dark/down-arrow-disabled.svg dark/down-arrow-hover.svg dark/down-arrow-pressed.svg dark/left-arrow.svg dark/left-arrow-disabled.svg dark/left-arrow-hover.svg dark/left-arrow-pressed.svg dark/right-arrow.svg dark/right-arrow-disabled.svg dark/right-arrow-hover.svg dark/right-arrow-pressed.svg dark/up-arrow.svg dark/up-arrow-disabled.svg dark/up-arrow-hover.svg dark/up-arrow-pressed.svg + dark/checkbox-unchecked.svg + dark/checkbox-unchecked-hover.svg + dark/checkbox-unchecked-disabled.svg + dark/checkbox-checked.svg + dark/checkbox-checked-hover.svg + dark/checkbox-checked-disabled.svg + darkstyle.qss darkstyle-tab.qss darkstyle-activetab.qss fonts/FiraSans/FiraSans.ttf fonts/LightFiraSans/LightFiraSans.ttf fonts/Roboto/Roboto.ttf fonts/OpenSans/OpenSans-Regular.ttf fonts/xkcd/xkcd.ttf