update theme checkboxes, remove novelty themes

resources/images.qrc

@@ -32,5 +32,13 @@
         <file>icons/collapse_all.ico</file>
         <file>icons/expand_all.ico</file>
         <file>images/blank_tileset.png</file>
+        <file>icons/ui/dark_checkbox_checked_disabled.png</file>
+        <file>icons/ui/dark_checkbox_checked.png</file>
+        <file>icons/ui/dark_checkbox_unchecked_disabled.png</file>
+        <file>icons/ui/dark_checkbox_unchecked.png</file>
+        <file>icons/ui/midnight_checkbox_checked_disabled.png</file>
+        <file>icons/ui/midnight_checkbox_checked.png</file>
+        <file>icons/ui/midnight_checkbox_unchecked_disabled.png</file>
+        <file>icons/ui/midnight_checkbox_unchecked.png</file>
     </qresource>
 </RCC>

resources/themes.qrc

@@ -1,9 +1,6 @@
 <RCC>
     <qresource prefix="/">
         <file>themes/dark.qss</file>
-        <file>themes/light.qss</file>
         <file>themes/midnight.qss</file>
-        <file>themes/pink-and-blue.qss</file>
-        <file>themes/emerald-green.qss</file>
     </qresource>
 </RCC>

resources/themes/dark.qss

@@ -31,6 +31,46 @@ QWidget::item:focus {
     border: none;
 }
 
+/* Menus */
+
+QMenu::indicator {
+    width: 12px;
+    height: 12px;
+    padding-left: 6px;
+}
+
+QMenu::indicator:non-exclusive:unchecked {
+    image: url(":/icons/ui/dark_checkbox_unchecked.png");
+}
+
+QMenu::indicator:non-exclusive:unchecked:selected {
+    image: url(":/icons/ui/dark_checkbox_unchecked_disabled.png");
+}
+
+QMenu::indicator:non-exclusive:checked {
+    image: url(":/icons/ui/dark_checkbox_checked.png");
+}
+
+QMenu::indicator:non-exclusive:checked:selected {
+    image: url(":/icons/ui/dark_checkbox_checked_disabled.png");
+}
+
+QMenu::indicator:exclusive:unchecked {
+    image: url(":/icons/ui/dark_checkbox_unchecked.png");
+}
+
+QMenu::indicator:exclusive:unchecked:selected {
+    image: url(":/icons/ui/dark_checkbox_unchecked_disabled.png");
+}
+
+QMenu::indicator:exclusive:checked {
+    image: url(":/icons/ui/dark_checkbox_checked.png");
+}
+
+QMenu::indicator:exclusive:checked:selected {
+    image: url(":/icons/ui/dark_checkbox_checked_disabled.png");
+}
+
 /* Combo Boxes */
 
 QComboBox {
@@ -40,10 +80,17 @@ QComboBox {
 
 QComboBox QAbstractItemView {
     background: #232629;
-    color: #505F69;
+    color: #EFF0F1;
     selection-background-color: #18465D;
 }
 
+QComboBox::indicator {
+    background-color: transparent;
+    selection-background-color: transparent;
+    color: transparent;
+    selection-color: transparent;
+}
+
 /* Spin Boxes */
 
 QSpinBox {
@@ -67,27 +114,52 @@ QLineEdit {
 
 /* Checkboxes */
 
-QCheckBox, QRadioButton {
+QCheckBox {
+    background-color: #19232D;
+    color: #F0F0F0;
+    spacing: 4px;
+    outline: none;
+    padding-top: 4px;
+    padding-bottom: 4px;
+}
+
+QCheckBox:focus {
     border: none;
 }
 
+QCheckBox QWidget:disabled {
+    background-color: #19232D;
+    color: #787878;
+}
+
+QCheckBox::indicator {
+    margin-left: 4px;
+    height: 16px;
+    width: 16px;
+}
+
 QRadioButton::indicator::unchecked, QCheckBox::indicator::unchecked {
-    border: 1px solid #18465D;
-    background: none;
+    image: url(:/icons/ui/dark_checkbox_unchecked.png)
 }
 
 QRadioButton::indicator:unchecked:hover, QCheckBox::indicator:unchecked:hover {
-    border: 1px solid #EFF0F1;
+
+}
+
+QCheckBox::indicator:unchecked:disabled {
+    image: url(":/icons/ui/dark_checkbox_unchecked_disabled.png");
 }
 
 QRadioButton::indicator::checked, QCheckBox::indicator::checked {
-    border: 1px solid #18465D;
-    background: #18465D;
+    image: url(":/icons/ui/dark_checkbox_checked.png");
 }
 
 QRadioButton::indicator:checked:hover, QCheckBox::indicator:checked:hover {
-    border: 1px solid #EFF0F1;
-    background: #EFF0F1;
+
+}
+
+QCheckBox::indicator:checked:disabled {
+    image: url(":/icons/ui/dark_checkbox_checked_disabled.png");
 }
 
 /* Map List View */

resources/themes/emerald-green.qss

@@ -1,169 +0,0 @@
-/* EMERALD GREEN theme for porymap */
-
-/*
-
-    Background #2d8f4e
-    Font       #B9E9C9
-    Highlight  #50C878
-    Accent     #226C3B
-
-*/
-
-/* General Widgets */
-
-QWidget {
-    background: #2d8f4e;
-    color: #B9E9C9;
-}
-
-QWidget::disabled {
-    background: #2d8f4e;
-    color: #AAAAAA;
-}
-
-QWidget::item:selected {
-    background: #50C878;
-}
-
-QWidget::item:focus {
-    background: #50C878;
-    border: none;
-}
-
-/* Combo Boxes */
-
-QComboBox {
-    background: #226C3B;
-    color: #B9E9C9;
-}
-
-QComboBox QAbstractItemView {
-    background: #2d8f4e;
-    color: #B9E9C9;
-    selection-background-color: #50C878;
-}
-
-/* Spin Boxes */
-
-QSpinBox {
-    background: #226C3B;
-    color: #B9E9C9;
-}
-
-/* Line Edits */
-
-QLineEdit {
-    background: #226C3B;
-    color: #B9E9C9;
-}
-
-/* Frames, Labels */
-
-#label_spritePixmap {
-    background: #226C3B;
-    color: #B9E9C9;
-}
-
-/* Checkboxes */
-
-QCheckBox, QRadioButton {
-    border: none;
-}
-
-QRadioButton::indicator::unchecked, QCheckBox::indicator::unchecked {
-    border: 1px solid #50C878;
-    background: none;
-}
-
-QRadioButton::indicator:unchecked:hover, QCheckBox::indicator:unchecked:hover {
-    border: 1px solid #B9E9C9;
-}
-
-QRadioButton::indicator::checked, QCheckBox::indicator::checked {
-    border: 1px solid #50C878;
-    background: #50C878;
-}
-
-QRadioButton::indicator:checked:hover, QCheckBox::indicator:checked:hover {
-    border: 1px solid #B9E9C9;
-    background: #B9E9C9;
-}
-
-/* Map List View */
-
-QTreeView {
-    background: #226C3B;
-}
-
-QTreeView::item:hover {
-    background: #50C878;
-}
-
-QTreeView::item:selected {
-    background: #50C878;
-    color: #B9E9C9;
-}
-
-QTreeView::branch {
-    background: #226C3B;
-}
-
-/* Scroll Bar */
-
-QScrollBar::vertical {
-    background-color: #2d8f4e;
-}
-
-QScrollBar::horizontal {
-    background-color: #2d8f4e;
-}
-
-QScrollBar::handle:horizontal {
-    background-color: #226C3B;
-    border: 1px solid #2d8f4e;
-}
-
-QScrollBar::handle:vertical {
-    background-color: #226C3B;
-    border: 1px solid #2d8f4e;
-}
-
-QScrollBar::add-line:horizontal {
-    border: none;
-    background: none;
-    color: none;
-}
-
-QScrollBar::add-line:vertical {
-    border: none;
-    background: none;
-    color: none;
-}
-
-QScrollBar::sub-line:horizontal {
-    border: none;
-    background: none;
-    color: none;
-}
-
-QScrollBar::sub-line:vertical {
-    border: none;
-    background: none;
-    color: none;
-}
-
-QScrollBar::up-arrow:horizontal, QScrollBar::down-arrow:horizontal {
-  background: none;
-}
-
-QScrollBar::up-arrow:vertical, QScrollBar::down-arrow:vertical {
-  background: none;
-}
-
-QScrollBar::add-page:horizontal, QScrollBar::sub-page:horizontal {
-  background: none;
-}
-
-QScrollBar::add-page:vertical, QScrollBar::sub-page:vertical {
-  background: none;
-}

resources/themes/light.qss

@@ -1,95 +0,0 @@
-/* LIGHT theme for porymap */
-
-/* General Widgets */
-
-QWidget {
-    background: #F5F5F5;
-    color: #3C3C3C;
-}
-
-QWidget::item:selected {
-    background: #CACACA;
-}
-
-QWidget::item:focus {
-    background: #CACACA;
-    border: none;
-}
-
-/* Combo Boxes */
-
-QComboBox {
-    background: #F5F5F5;
-    color: #3C3C3C;
-}
-
-QComboBox QAbstractItemView {
-    background: #F5F5F5;
-    color: #898989;
-    selection-background-color: #707070;
-}
-
-/* Spin Boxes */
-
-QSpinBox {
-    background: #F5F5F5;
-    color: #3C3C3C;
-}
-
-/* Line Edits */
-
-QLineEdit {
-    background: #F5F5F5;
-    color: #3C3C3C;
-}
-
-/* Frames, Labels */
-
-#label_spritePixmap {
-    background: #F5F5F5;
-    color: #3C3C3C;
-}
-
-/* Checkboxes */
-
-QCheckBox, QRadioButton {
-    border: none;
-}
-
-QRadioButton::indicator::unchecked, QCheckBox::indicator::unchecked {
-    border: 1px solid #CACACA;
-    background: none;
-}
-
-QRadioButton::indicator:unchecked:hover, QCheckBox::indicator:unchecked:hover {
-    border: 1px solid #3C3C3C;
-}
-
-QRadioButton::indicator::checked, QCheckBox::indicator::checked {
-    border: 1px solid #CACACA;
-    background: #CACACA;
-}
-
-QRadioButton::indicator:checked:hover, QCheckBox::indicator:checked:hover {
-    border: 1px solid #3C3C3C;
-    background: #3C3C3C;
-}
-
-/* Map List View */
-
-QTreeView {
-    background: #F5F5F5;
-}
-
-QTreeView::item:hover {
-    background: #CACACA;
-}
-
-QTreeView::item:selected {
-    background: #CACACA;
-    color: #3C3C3C;
-}
-
-QTreeView::branch {
-    background: #F5F5F5;
-}

resources/themes/midnight.qss

@@ -30,6 +30,46 @@ QWidget::item:focus {
     border: none;
 }
 
+/* Menus */
+
+QMenu::indicator {
+    width: 12px;
+    height: 12px;
+    padding-left: 6px;
+}
+
+QMenu::indicator:non-exclusive:unchecked {
+    image: url(":/icons/ui/midnight_checkbox_unchecked.png");
+}
+
+QMenu::indicator:non-exclusive:unchecked:selected {
+    image: url(":/icons/ui/midnight_checkbox_unchecked_disabled.png");
+}
+
+QMenu::indicator:non-exclusive:checked {
+    image: url(":/icons/ui/midnight_checkbox_checked.png");
+}
+
+QMenu::indicator:non-exclusive:checked:selected {
+    image: url(":/icons/ui/midnight_checkbox_checked_disabled.png");
+}
+
+QMenu::indicator:exclusive:unchecked {
+    image: url(":/icons/ui/midnight_checkbox_unchecked.png");
+}
+
+QMenu::indicator:exclusive:unchecked:selected {
+    image: url(":/icons/ui/midnight_checkbox_unchecked_disabled.png");
+}
+
+QMenu::indicator:exclusive:checked {
+    image: url(":/icons/ui/midnight_checkbox_checked.png");
+}
+
+QMenu::indicator:exclusive:checked:selected {
+    image: url(":/icons/ui/midnight_checkbox_checked_disabled.png");
+}
+
 /* Combo Boxes */
 
 QComboBox {
@@ -43,6 +83,13 @@ QComboBox QAbstractItemView {
     selection-background-color: #49483E;
 }
 
+QComboBox::indicator {
+    background-color: transparent;
+    selection-background-color: transparent;
+    color: transparent;
+    selection-color: transparent;
+}
+
 /* Spin Boxes */
 
 QSpinBox {
@@ -65,7 +112,7 @@ QLineEdit {
 }
 
 /* Checkboxes */
-
+/*
 QCheckBox, QRadioButton {
     border: none;
 }
@@ -88,6 +135,56 @@ QRadioButton::indicator:checked:hover, QCheckBox::indicator:checked:hover {
     border: 1px solid #F8F8F2;
     background: #F8F8F2;
 }
+*/
+/* *********** */
+
+QCheckBox {
+    background-color: #31332b;
+    color: #F8F8F2;
+    spacing: 4px;
+    outline: none;
+    padding-top: 4px;
+    padding-bottom: 4px;
+}
+
+QCheckBox:focus {
+    border: none;
+}
+
+QCheckBox QWidget:disabled {
+    background-color: #49483E;
+    color: #F8F8F2;
+}
+
+QCheckBox::indicator {
+    margin-left: 4px;
+    height: 16px;
+    width: 16px;
+}
+
+QRadioButton::indicator::unchecked, QCheckBox::indicator::unchecked {
+    image: url(:/icons/ui/midnight_checkbox_unchecked.png)
+}
+
+QRadioButton::indicator:unchecked:hover, QCheckBox::indicator:unchecked:hover {
+
+}
+
+QCheckBox::indicator:unchecked:disabled {
+    image: url(":/icons/ui/midnight_checkbox_unchecked_disabled.png");
+}
+
+QRadioButton::indicator::checked, QCheckBox::indicator::checked {
+    image: url(":/icons/ui/midnight_checkbox_checked.png");
+}
+
+QRadioButton::indicator:checked:hover, QCheckBox::indicator:checked:hover {
+
+}
+
+QCheckBox::indicator:checked:disabled {
+    image: url(":/icons/ui/midnight_checkbox_checked_disabled.png");
+}
 
 /* Map List View */
 

resources/themes/pink-and-blue.qss

@@ -1,170 +0,0 @@
-/* PINK AND BLUE theme for porymap */
-
-/*
-
-    Background #31739C
-    Font       #FFFFFF
-    Highlight  #EF5A63
-    Accent     #FF94B5
-    Disabled   #4A9CD6
-
-*/
-
-/* General Widgets */
-
-QWidget {
-    background: #31739C;
-    color: #FFFFFF;
-}
-
-QWidget::disabled {
-    background: #31739C;
-    color: #BBBBBB;
-}
-
-QWidget::item:selected {
-    background: #FF94B5;
-}
-
-QWidget::item:focus {
-    background: #FF94B5;
-    border: none;
-}
-
-/* Combo Boxes */
-
-QComboBox {
-    background: #EF5A63;
-    color: #FFFFFF;
-}
-
-QComboBox QAbstractItemView {
-    background: #31739C;
-    color: #4A9CD6;
-    selection-background-color: #FF94B5;
-}
-
-/* Spin Boxes */
-
-QSpinBox {
-    background: #EF5A63;
-    color: #FFFFFF;
-}
-
-/* Line Edits */
-
-QLineEdit {
-    background: #EF5A63;
-    color: #FFFFFF;
-}
-
-/* Frames, Labels */
-
-#label_spritePixmap {
-    background: #EF5A63;
-    color: #FFFFFF;
-}
-
-/* Checkboxes */
-
-QCheckBox, QRadioButton {
-    border: none;
-}
-
-QRadioButton::indicator::unchecked, QCheckBox::indicator::unchecked {
-    border: 1px solid #FF94B5;
-    background: none;
-}
-
-QRadioButton::indicator:unchecked:hover, QCheckBox::indicator:unchecked:hover {
-    border: 1px solid #FFFFFF;
-}
-
-QRadioButton::indicator::checked, QCheckBox::indicator::checked {
-    border: 1px solid #FF94B5;
-    background: #FF94B5;
-}
-
-QRadioButton::indicator:checked:hover, QCheckBox::indicator:checked:hover {
-    border: 1px solid #FFFFFF;
-    background: #FFFFFF;
-}
-
-/* Map List View */
-
-QTreeView {
-    background: #EF5A63;
-}
-
-QTreeView::item:hover {
-    background: #FF94B5;
-}
-
-QTreeView::item:selected {
-    background: #FF94B5;
-    color: #FFFFFF;
-}
-
-QTreeView::branch {
-    background: #EF5A63;
-}
-
-/* Scroll Bar */
-
-QScrollBar::vertical {
-    background-color: #EF5A63;
-}
-
-QScrollBar::horizontal {
-    background-color: #EF5A63;
-}
-
-QScrollBar::handle:horizontal {
-    background-color: #4A9CD6;
-    border: 1px solid #31739C;
-}
-
-QScrollBar::handle:vertical {
-    background-color: #4A9CD6;
-    border: 1px solid #31739C;
-}
-
-QScrollBar::add-line:horizontal {
-    border: none;
-    background: none;
-    color: none;
-}
-
-QScrollBar::add-line:vertical {
-    border: none;
-    background: none;
-    color: none;
-}
-
-QScrollBar::sub-line:horizontal {
-    border: none;
-    background: none;
-    color: none;
-}
-
-QScrollBar::sub-line:vertical {
-    border: none;
-    background: none;
-    color: none;
-}
-
-QScrollBar::up-arrow:horizontal, QScrollBar::down-arrow:horizontal {
-  background: none;
-}
-
-QScrollBar::up-arrow:vertical, QScrollBar::down-arrow:vertical {
-  background: none;
-}
-
-QScrollBar::add-page:horizontal, QScrollBar::sub-page:horizontal {
-  background: none;
-}
-
-QScrollBar::add-page:vertical, QScrollBar::sub-page:vertical {
-  background: none;
-}