From 2bf2e7faaf9f3e196f35f555a4e0a497ed19f3d4 Mon Sep 17 00:00:00 2001
From: Le Tan <tamlokveer@gmail.com>
Date: Sun, 10 Dec 2017 10:55:52 +0800
Subject: [PATCH] themes: support menu checkbox and radiobutton

---
 .../themes/v_pure/checkbox_checked.svg         |  4 ++--
 .../themes/v_pure/checkbox_unchecked.svg       |  2 +-
 src/resources/themes/v_pure/menu_checkbox.svg  |  6 ++++++
 .../themes/v_pure/menu_radiobutton.svg         |  6 ++++++
 .../themes/v_pure/radiobutton_checked.svg      |  4 ++--
 .../themes/v_pure/radiobutton_unchecked.svg    |  2 +-
 src/resources/themes/v_pure/v_pure.qss         | 18 +++++++++++++++++-
 .../themes/v_white/checkbox_checked.svg        |  4 ++--
 .../themes/v_white/checkbox_unchecked.svg      |  2 +-
 src/resources/themes/v_white/menu_checkbox.svg |  6 ++++++
 .../themes/v_white/menu_radiobutton.svg        |  6 ++++++
 .../themes/v_white/radiobutton_checked.svg     |  4 ++--
 .../themes/v_white/radiobutton_unchecked.svg   |  2 +-
 src/resources/themes/v_white/v_white.qss       | 16 ++++++++++++++++
 src/vnote.qrc                                  |  4 ++++
 15 files changed, 73 insertions(+), 13 deletions(-)
 create mode 100644 src/resources/themes/v_pure/menu_checkbox.svg
 create mode 100644 src/resources/themes/v_pure/menu_radiobutton.svg
 create mode 100644 src/resources/themes/v_white/menu_checkbox.svg
 create mode 100644 src/resources/themes/v_white/menu_radiobutton.svg

diff --git a/src/resources/themes/v_pure/checkbox_checked.svg b/src/resources/themes/v_pure/checkbox_checked.svg
index e9ae3b12..f017b5b4 100644
--- a/src/resources/themes/v_pure/checkbox_checked.svg
+++ b/src/resources/themes/v_pure/checkbox_checked.svg
@@ -1,7 +1,7 @@
 <svg width="512" height="512" xmlns="http://www.w3.org/2000/svg" xmlns:svg="http://www.w3.org/2000/svg">
  <g>
   <title>Layer 1</title>
-  <rect fill="#000000" stroke="#333333" stroke-width="30" stroke-dasharray="null" stroke-linejoin="null" stroke-linecap="null" x="106" y="141.5" width="299" height="299" fill-opacity="0" id="svg_6"/>
-  <path stroke="#000000" fill="#333333" stroke-width="5" d="m125.49193,290.33243l27.93756,-27.94743l76.53449,76.52461l127.58052,-127.54102l27.94743,27.92768l-155.52795,155.50821" id="svg_3" stroke-opacity="0"/>
+  <rect id="svg_6" fill-opacity="0" height="299" width="299" y="106.5" x="106.5" stroke-linecap="null" stroke-linejoin="null" stroke-dasharray="null" stroke-width="30" stroke="#333333" fill="#000000"/>
+  <path stroke-opacity="0" id="svg_3" d="m126,243.24589l27.93756,-27.94743l76.53449,76.52461l127.58052,-127.54102l27.94743,27.92768l-155.52795,155.50821" stroke-width="5" fill="#333333" stroke="#000000"/>
  </g>
 </svg>
diff --git a/src/resources/themes/v_pure/checkbox_unchecked.svg b/src/resources/themes/v_pure/checkbox_unchecked.svg
index 3ecf0f54..5167523e 100644
--- a/src/resources/themes/v_pure/checkbox_unchecked.svg
+++ b/src/resources/themes/v_pure/checkbox_unchecked.svg
@@ -1,6 +1,6 @@
 <svg width="512" height="512" xmlns="http://www.w3.org/2000/svg" xmlns:svg="http://www.w3.org/2000/svg">
  <g>
   <title>Layer 1</title>
-  <rect id="svg_6" fill-opacity="0" height="299" width="299" y="141.5" x="106" stroke-linecap="null" stroke-linejoin="null" stroke-dasharray="null" stroke-width="30" stroke="#333333" fill="#000000"/>
+  <rect id="svg_6" fill-opacity="0" height="299" width="299" y="106.5" x="106.5" stroke-linecap="null" stroke-linejoin="null" stroke-dasharray="null" stroke-width="30" stroke="#333333" fill="#000000"/>
  </g>
 </svg>
diff --git a/src/resources/themes/v_pure/menu_checkbox.svg b/src/resources/themes/v_pure/menu_checkbox.svg
new file mode 100644
index 00000000..0aeb35a1
--- /dev/null
+++ b/src/resources/themes/v_pure/menu_checkbox.svg
@@ -0,0 +1,6 @@
+<svg width="512" height="512" xmlns="http://www.w3.org/2000/svg" xmlns:svg="http://www.w3.org/2000/svg">
+ <g>
+  <title>Layer 1</title>
+  <path stroke-opacity="0" id="svg_3" d="m126,243.24589l27.93756,-27.94743l76.53449,76.52461l127.58052,-127.54102l27.94743,27.92768l-155.52795,155.50821" stroke-width="5" fill="#333333" stroke="#000000"/>
+ </g>
+</svg>
diff --git a/src/resources/themes/v_pure/menu_radiobutton.svg b/src/resources/themes/v_pure/menu_radiobutton.svg
new file mode 100644
index 00000000..aafaa309
--- /dev/null
+++ b/src/resources/themes/v_pure/menu_radiobutton.svg
@@ -0,0 +1,6 @@
+<svg width="512" height="512" xmlns="http://www.w3.org/2000/svg" xmlns:svg="http://www.w3.org/2000/svg">
+ <g>
+  <title>Layer 1</title>
+  <circle fill="#333333" stroke="#000000" stroke-width="20" stroke-dasharray="null" stroke-linejoin="null" stroke-linecap="null" stroke-opacity="0" cx="257.00002" cy="256" r="83.2406" id="svg_11"/>
+ </g>
+</svg>
diff --git a/src/resources/themes/v_pure/radiobutton_checked.svg b/src/resources/themes/v_pure/radiobutton_checked.svg
index 33d62fbb..c9834cc5 100644
--- a/src/resources/themes/v_pure/radiobutton_checked.svg
+++ b/src/resources/themes/v_pure/radiobutton_checked.svg
@@ -1,7 +1,7 @@
 <svg width="512" height="512" xmlns="http://www.w3.org/2000/svg" xmlns:svg="http://www.w3.org/2000/svg">
  <g>
   <title>Layer 1</title>
-  <circle stroke="#333333" id="svg_9" r="142.96561" cy="291.50001" cx="255.49999" fill-opacity="0" stroke-linecap="null" stroke-linejoin="null" stroke-dasharray="null" stroke-width="30" fill="#000000"/>
-  <circle id="svg_11" r="83.2406" cy="290" cx="255" stroke-opacity="0" stroke-linecap="null" stroke-linejoin="null" stroke-dasharray="null" stroke-width="20" stroke="#000000" fill="#333333"/>
+  <circle fill="#000000" stroke-width="30" stroke-dasharray="null" stroke-linejoin="null" stroke-linecap="null" fill-opacity="0" cx="256.00001" cy="256.00001" r="142.96561" id="svg_9" stroke="#333333"/>
+  <circle fill="#333333" stroke="#000000" stroke-width="20" stroke-dasharray="null" stroke-linejoin="null" stroke-linecap="null" stroke-opacity="0" cx="256.00002" cy="256" r="83.2406" id="svg_11"/>
  </g>
 </svg>
diff --git a/src/resources/themes/v_pure/radiobutton_unchecked.svg b/src/resources/themes/v_pure/radiobutton_unchecked.svg
index 700ccea2..7cd0863a 100644
--- a/src/resources/themes/v_pure/radiobutton_unchecked.svg
+++ b/src/resources/themes/v_pure/radiobutton_unchecked.svg
@@ -1,6 +1,6 @@
 <svg width="512" height="512" xmlns="http://www.w3.org/2000/svg" xmlns:svg="http://www.w3.org/2000/svg">
  <g>
   <title>Layer 1</title>
-  <circle stroke="#333333" id="svg_9" r="142.96561" cy="291.50001" cx="255.49999" fill-opacity="0" stroke-linecap="null" stroke-linejoin="null" stroke-dasharray="null" stroke-width="30" fill="#000000"/>
+  <circle fill="#000000" stroke-width="30" stroke-dasharray="null" stroke-linejoin="null" stroke-linecap="null" fill-opacity="0" cx="256.00001" cy="256.00001" r="142.96561" id="svg_9" stroke="#333333"/>
  </g>
 </svg>
diff --git a/src/resources/themes/v_pure/v_pure.qss b/src/resources/themes/v_pure/v_pure.qss
index 028a4f07..ef4d8ace 100644
--- a/src/resources/themes/v_pure/v_pure.qss
+++ b/src/resources/themes/v_pure/v_pure.qss
@@ -84,6 +84,22 @@ QMenu::indicator {
     width: 20px;
     height: 20px;
 }
+
+QMenu::indicator:non-exclusive:unchecked {
+    image: none;
+}
+
+QMenu::indicator:non-exclusive:checked {
+    image: url(menu_checkbox.svg);
+}
+
+QMenu::indicator:exclusive:unchecked {
+    image: none;
+}
+
+QMenu::indicator:exclusive:checked {
+    image: url(menu_radiobutton.svg);
+}
 /* End QMenu */
 
 QToolBar {
@@ -595,7 +611,7 @@ QTabBar::tab {
 QTabBar::tab:selected {
     color: @tabbar_selected_fg;
     background: @tabbar_selected_bg;
-    border-bottom: 3px solid @master_bg;
+    border-top: 3px solid @master_bg;
 }
 
 QTabBar::tab:hover {
diff --git a/src/resources/themes/v_white/checkbox_checked.svg b/src/resources/themes/v_white/checkbox_checked.svg
index e9ae3b12..f017b5b4 100644
--- a/src/resources/themes/v_white/checkbox_checked.svg
+++ b/src/resources/themes/v_white/checkbox_checked.svg
@@ -1,7 +1,7 @@
 <svg width="512" height="512" xmlns="http://www.w3.org/2000/svg" xmlns:svg="http://www.w3.org/2000/svg">
  <g>
   <title>Layer 1</title>
-  <rect fill="#000000" stroke="#333333" stroke-width="30" stroke-dasharray="null" stroke-linejoin="null" stroke-linecap="null" x="106" y="141.5" width="299" height="299" fill-opacity="0" id="svg_6"/>
-  <path stroke="#000000" fill="#333333" stroke-width="5" d="m125.49193,290.33243l27.93756,-27.94743l76.53449,76.52461l127.58052,-127.54102l27.94743,27.92768l-155.52795,155.50821" id="svg_3" stroke-opacity="0"/>
+  <rect id="svg_6" fill-opacity="0" height="299" width="299" y="106.5" x="106.5" stroke-linecap="null" stroke-linejoin="null" stroke-dasharray="null" stroke-width="30" stroke="#333333" fill="#000000"/>
+  <path stroke-opacity="0" id="svg_3" d="m126,243.24589l27.93756,-27.94743l76.53449,76.52461l127.58052,-127.54102l27.94743,27.92768l-155.52795,155.50821" stroke-width="5" fill="#333333" stroke="#000000"/>
  </g>
 </svg>
diff --git a/src/resources/themes/v_white/checkbox_unchecked.svg b/src/resources/themes/v_white/checkbox_unchecked.svg
index 3ecf0f54..5167523e 100644
--- a/src/resources/themes/v_white/checkbox_unchecked.svg
+++ b/src/resources/themes/v_white/checkbox_unchecked.svg
@@ -1,6 +1,6 @@
 <svg width="512" height="512" xmlns="http://www.w3.org/2000/svg" xmlns:svg="http://www.w3.org/2000/svg">
  <g>
   <title>Layer 1</title>
-  <rect id="svg_6" fill-opacity="0" height="299" width="299" y="141.5" x="106" stroke-linecap="null" stroke-linejoin="null" stroke-dasharray="null" stroke-width="30" stroke="#333333" fill="#000000"/>
+  <rect id="svg_6" fill-opacity="0" height="299" width="299" y="106.5" x="106.5" stroke-linecap="null" stroke-linejoin="null" stroke-dasharray="null" stroke-width="30" stroke="#333333" fill="#000000"/>
  </g>
 </svg>
diff --git a/src/resources/themes/v_white/menu_checkbox.svg b/src/resources/themes/v_white/menu_checkbox.svg
new file mode 100644
index 00000000..0aeb35a1
--- /dev/null
+++ b/src/resources/themes/v_white/menu_checkbox.svg
@@ -0,0 +1,6 @@
+<svg width="512" height="512" xmlns="http://www.w3.org/2000/svg" xmlns:svg="http://www.w3.org/2000/svg">
+ <g>
+  <title>Layer 1</title>
+  <path stroke-opacity="0" id="svg_3" d="m126,243.24589l27.93756,-27.94743l76.53449,76.52461l127.58052,-127.54102l27.94743,27.92768l-155.52795,155.50821" stroke-width="5" fill="#333333" stroke="#000000"/>
+ </g>
+</svg>
diff --git a/src/resources/themes/v_white/menu_radiobutton.svg b/src/resources/themes/v_white/menu_radiobutton.svg
new file mode 100644
index 00000000..aafaa309
--- /dev/null
+++ b/src/resources/themes/v_white/menu_radiobutton.svg
@@ -0,0 +1,6 @@
+<svg width="512" height="512" xmlns="http://www.w3.org/2000/svg" xmlns:svg="http://www.w3.org/2000/svg">
+ <g>
+  <title>Layer 1</title>
+  <circle fill="#333333" stroke="#000000" stroke-width="20" stroke-dasharray="null" stroke-linejoin="null" stroke-linecap="null" stroke-opacity="0" cx="257.00002" cy="256" r="83.2406" id="svg_11"/>
+ </g>
+</svg>
diff --git a/src/resources/themes/v_white/radiobutton_checked.svg b/src/resources/themes/v_white/radiobutton_checked.svg
index 33d62fbb..c9834cc5 100644
--- a/src/resources/themes/v_white/radiobutton_checked.svg
+++ b/src/resources/themes/v_white/radiobutton_checked.svg
@@ -1,7 +1,7 @@
 <svg width="512" height="512" xmlns="http://www.w3.org/2000/svg" xmlns:svg="http://www.w3.org/2000/svg">
  <g>
   <title>Layer 1</title>
-  <circle stroke="#333333" id="svg_9" r="142.96561" cy="291.50001" cx="255.49999" fill-opacity="0" stroke-linecap="null" stroke-linejoin="null" stroke-dasharray="null" stroke-width="30" fill="#000000"/>
-  <circle id="svg_11" r="83.2406" cy="290" cx="255" stroke-opacity="0" stroke-linecap="null" stroke-linejoin="null" stroke-dasharray="null" stroke-width="20" stroke="#000000" fill="#333333"/>
+  <circle fill="#000000" stroke-width="30" stroke-dasharray="null" stroke-linejoin="null" stroke-linecap="null" fill-opacity="0" cx="256.00001" cy="256.00001" r="142.96561" id="svg_9" stroke="#333333"/>
+  <circle fill="#333333" stroke="#000000" stroke-width="20" stroke-dasharray="null" stroke-linejoin="null" stroke-linecap="null" stroke-opacity="0" cx="256.00002" cy="256" r="83.2406" id="svg_11"/>
  </g>
 </svg>
diff --git a/src/resources/themes/v_white/radiobutton_unchecked.svg b/src/resources/themes/v_white/radiobutton_unchecked.svg
index 700ccea2..7cd0863a 100644
--- a/src/resources/themes/v_white/radiobutton_unchecked.svg
+++ b/src/resources/themes/v_white/radiobutton_unchecked.svg
@@ -1,6 +1,6 @@
 <svg width="512" height="512" xmlns="http://www.w3.org/2000/svg" xmlns:svg="http://www.w3.org/2000/svg">
  <g>
   <title>Layer 1</title>
-  <circle stroke="#333333" id="svg_9" r="142.96561" cy="291.50001" cx="255.49999" fill-opacity="0" stroke-linecap="null" stroke-linejoin="null" stroke-dasharray="null" stroke-width="30" fill="#000000"/>
+  <circle fill="#000000" stroke-width="30" stroke-dasharray="null" stroke-linejoin="null" stroke-linecap="null" fill-opacity="0" cx="256.00001" cy="256.00001" r="142.96561" id="svg_9" stroke="#333333"/>
  </g>
 </svg>
diff --git a/src/resources/themes/v_white/v_white.qss b/src/resources/themes/v_white/v_white.qss
index 416e414b..b0e0bfff 100644
--- a/src/resources/themes/v_white/v_white.qss
+++ b/src/resources/themes/v_white/v_white.qss
@@ -83,6 +83,22 @@ QMenu::indicator {
     width: 20px;
     height: 20px;
 }
+
+QMenu::indicator:non-exclusive:unchecked {
+    image: none;
+}
+
+QMenu::indicator:non-exclusive:checked {
+    image: url(menu_checkbox.svg);
+}
+
+QMenu::indicator:exclusive:unchecked {
+    image: none;
+}
+
+QMenu::indicator:exclusive:checked {
+    image: url(menu_radiobutton.svg);
+}
 /* End QMenu */
 
 QToolBar {
diff --git a/src/vnote.qrc b/src/vnote.qrc
index 583672e2..6d14ff01 100644
--- a/src/vnote.qrc
+++ b/src/vnote.qrc
@@ -186,5 +186,9 @@
         <file>resources/themes/v_pure/up_disabled.svg</file>
         <file>resources/themes/v_pure/v_pure.palette</file>
         <file>resources/themes/v_pure/v_pure.qss</file>
+        <file>resources/themes/v_white/menu_checkbox.svg</file>
+        <file>resources/themes/v_white/menu_radiobutton.svg</file>
+        <file>resources/themes/v_pure/menu_checkbox.svg</file>
+        <file>resources/themes/v_pure/menu_radiobutton.svg</file>
     </qresource>
 </RCC>