From 504b9b20146dcc25d57c26d877b153be87762b12 Mon Sep 17 00:00:00 2001
From: TriKriSta <Trikrista13@gmail.com>
Date: Fri, 19 Apr 2019 01:17:43 +0300
Subject: [PATCH] style: edit style for QSplitter

---
 src/mainwindow.ui                             | 296 +-----------------
 src/widget/contentlayout.cpp                  |   1 +
 themes/dark/contentDialog/contentDialog.css   |  15 +-
 themes/dark/window/general.css                |   6 +
 .../default/contentDialog/contentDialog.css   |  11 -
 themes/default/window/general.css             |  11 +
 6 files changed, 22 insertions(+), 318 deletions(-)

diff --git a/src/mainwindow.ui b/src/mainwindow.ui
index d09c67691..b3577163c 100644
--- a/src/mainwindow.ui
+++ b/src/mainwindow.ui
@@ -51,286 +51,6 @@
         <height>16777215</height>
        </size>
       </property>
-      <property name="palette">
-       <palette>
-        <active>
-         <colorrole role="WindowText">
-          <brush brushstyle="SolidPattern">
-           <color alpha="255">
-            <red>255</red>
-            <green>255</green>
-            <blue>255</blue>
-           </color>
-          </brush>
-         </colorrole>
-         <colorrole role="Button">
-          <brush brushstyle="SolidPattern">
-           <color alpha="255">
-            <red>255</red>
-            <green>255</green>
-            <blue>255</blue>
-           </color>
-          </brush>
-         </colorrole>
-         <colorrole role="Midlight">
-          <brush brushstyle="SolidPattern">
-           <color alpha="255">
-            <red>255</red>
-            <green>255</green>
-            <blue>255</blue>
-           </color>
-          </brush>
-         </colorrole>
-         <colorrole role="Text">
-          <brush brushstyle="SolidPattern">
-           <color alpha="255">
-            <red>255</red>
-            <green>255</green>
-            <blue>255</blue>
-           </color>
-          </brush>
-         </colorrole>
-         <colorrole role="ButtonText">
-          <brush brushstyle="SolidPattern">
-           <color alpha="255">
-            <red>255</red>
-            <green>255</green>
-            <blue>255</blue>
-           </color>
-          </brush>
-         </colorrole>
-         <colorrole role="Base">
-          <brush brushstyle="SolidPattern">
-           <color alpha="255">
-            <red>255</red>
-            <green>255</green>
-            <blue>255</blue>
-           </color>
-          </brush>
-         </colorrole>
-         <colorrole role="Window">
-          <brush brushstyle="SolidPattern">
-           <color alpha="255">
-            <red>255</red>
-            <green>255</green>
-            <blue>255</blue>
-           </color>
-          </brush>
-         </colorrole>
-         <colorrole role="Highlight">
-          <brush brushstyle="SolidPattern">
-           <color alpha="255">
-            <red>255</red>
-            <green>255</green>
-            <blue>255</blue>
-           </color>
-          </brush>
-         </colorrole>
-         <colorrole role="HighlightedText">
-          <brush brushstyle="SolidPattern">
-           <color alpha="255">
-            <red>255</red>
-            <green>255</green>
-            <blue>255</blue>
-           </color>
-          </brush>
-         </colorrole>
-         <colorrole role="AlternateBase">
-          <brush brushstyle="SolidPattern">
-           <color alpha="255">
-            <red>255</red>
-            <green>255</green>
-            <blue>255</blue>
-           </color>
-          </brush>
-         </colorrole>
-        </active>
-        <inactive>
-         <colorrole role="WindowText">
-          <brush brushstyle="SolidPattern">
-           <color alpha="255">
-            <red>255</red>
-            <green>255</green>
-            <blue>255</blue>
-           </color>
-          </brush>
-         </colorrole>
-         <colorrole role="Button">
-          <brush brushstyle="SolidPattern">
-           <color alpha="255">
-            <red>255</red>
-            <green>255</green>
-            <blue>255</blue>
-           </color>
-          </brush>
-         </colorrole>
-         <colorrole role="Midlight">
-          <brush brushstyle="SolidPattern">
-           <color alpha="255">
-            <red>255</red>
-            <green>255</green>
-            <blue>255</blue>
-           </color>
-          </brush>
-         </colorrole>
-         <colorrole role="Text">
-          <brush brushstyle="SolidPattern">
-           <color alpha="255">
-            <red>255</red>
-            <green>255</green>
-            <blue>255</blue>
-           </color>
-          </brush>
-         </colorrole>
-         <colorrole role="ButtonText">
-          <brush brushstyle="SolidPattern">
-           <color alpha="255">
-            <red>255</red>
-            <green>255</green>
-            <blue>255</blue>
-           </color>
-          </brush>
-         </colorrole>
-         <colorrole role="Base">
-          <brush brushstyle="SolidPattern">
-           <color alpha="255">
-            <red>255</red>
-            <green>255</green>
-            <blue>255</blue>
-           </color>
-          </brush>
-         </colorrole>
-         <colorrole role="Window">
-          <brush brushstyle="SolidPattern">
-           <color alpha="255">
-            <red>255</red>
-            <green>255</green>
-            <blue>255</blue>
-           </color>
-          </brush>
-         </colorrole>
-         <colorrole role="Highlight">
-          <brush brushstyle="SolidPattern">
-           <color alpha="255">
-            <red>255</red>
-            <green>255</green>
-            <blue>255</blue>
-           </color>
-          </brush>
-         </colorrole>
-         <colorrole role="HighlightedText">
-          <brush brushstyle="SolidPattern">
-           <color alpha="255">
-            <red>255</red>
-            <green>255</green>
-            <blue>255</blue>
-           </color>
-          </brush>
-         </colorrole>
-         <colorrole role="AlternateBase">
-          <brush brushstyle="SolidPattern">
-           <color alpha="255">
-            <red>255</red>
-            <green>255</green>
-            <blue>255</blue>
-           </color>
-          </brush>
-         </colorrole>
-        </inactive>
-        <disabled>
-         <colorrole role="WindowText">
-          <brush brushstyle="SolidPattern">
-           <color alpha="255">
-            <red>255</red>
-            <green>255</green>
-            <blue>255</blue>
-           </color>
-          </brush>
-         </colorrole>
-         <colorrole role="Button">
-          <brush brushstyle="SolidPattern">
-           <color alpha="255">
-            <red>255</red>
-            <green>255</green>
-            <blue>255</blue>
-           </color>
-          </brush>
-         </colorrole>
-         <colorrole role="Midlight">
-          <brush brushstyle="SolidPattern">
-           <color alpha="255">
-            <red>255</red>
-            <green>255</green>
-            <blue>255</blue>
-           </color>
-          </brush>
-         </colorrole>
-         <colorrole role="Text">
-          <brush brushstyle="SolidPattern">
-           <color alpha="255">
-            <red>255</red>
-            <green>255</green>
-            <blue>255</blue>
-           </color>
-          </brush>
-         </colorrole>
-         <colorrole role="ButtonText">
-          <brush brushstyle="SolidPattern">
-           <color alpha="255">
-            <red>255</red>
-            <green>255</green>
-            <blue>255</blue>
-           </color>
-          </brush>
-         </colorrole>
-         <colorrole role="Base">
-          <brush brushstyle="SolidPattern">
-           <color alpha="255">
-            <red>255</red>
-            <green>255</green>
-            <blue>255</blue>
-           </color>
-          </brush>
-         </colorrole>
-         <colorrole role="Window">
-          <brush brushstyle="SolidPattern">
-           <color alpha="255">
-            <red>255</red>
-            <green>255</green>
-            <blue>255</blue>
-           </color>
-          </brush>
-         </colorrole>
-         <colorrole role="Highlight">
-          <brush brushstyle="SolidPattern">
-           <color alpha="255">
-            <red>255</red>
-            <green>255</green>
-            <blue>255</blue>
-           </color>
-          </brush>
-         </colorrole>
-         <colorrole role="HighlightedText">
-          <brush brushstyle="SolidPattern">
-           <color alpha="255">
-            <red>255</red>
-            <green>255</green>
-            <blue>255</blue>
-           </color>
-          </brush>
-         </colorrole>
-         <colorrole role="AlternateBase">
-          <brush brushstyle="SolidPattern">
-           <color alpha="255">
-            <red>255</red>
-            <green>255</green>
-            <blue>255</blue>
-           </color>
-          </brush>
-         </colorrole>
-        </disabled>
-       </palette>
-      </property>
       <property name="mouseTracking">
        <bool>true</bool>
       </property>
@@ -338,19 +58,7 @@
        <bool>false</bool>
       </property>
       <property name="styleSheet">
-       <string notr="true">QSplitter{
-	color: rgb(255, 255, 255);
-	background-color: rgb(255, 255, 255);
-	alternate-background-color: rgb(255, 255, 255);
-	border-color: rgb(255, 255, 255);
-	gridline-color: rgb(255, 255, 255);
-	selection-color: rgb(255, 255, 255);
-	selection-background-color: rgb(255, 255, 255);
-}
-QSplitter:handle{
-	color: rgb(255, 255, 255);
-	background-color: rgb(255, 255, 255);
-}</string>
+       <string notr="true"/>
       </property>
       <property name="orientation">
        <enum>Qt::Horizontal</enum>
@@ -1124,7 +832,7 @@ QSplitter:handle{
              <x>0</x>
              <y>0</y>
              <width>775</width>
-             <height>285</height>
+             <height>283</height>
             </rect>
            </property>
            <layout class="QVBoxLayout" name="verticalLayout_5"/>
diff --git a/src/widget/contentlayout.cpp b/src/widget/contentlayout.cpp
index d05907d2a..8f3406f28 100644
--- a/src/widget/contentlayout.cpp
+++ b/src/widget/contentlayout.cpp
@@ -120,6 +120,7 @@ void ContentLayout::init()
 
     reloadTheme();
 
+    mainHLineLayout.addSpacing(4);
     mainHLineLayout.addWidget(&mainHLine);
     mainHLineLayout.addSpacing(5);
 
diff --git a/themes/dark/contentDialog/contentDialog.css b/themes/dark/contentDialog/contentDialog.css
index 7429d756d..3f8611b00 100644
--- a/themes/dark/contentDialog/contentDialog.css
+++ b/themes/dark/contentDialog/contentDialog.css
@@ -1,18 +1,7 @@
-QSplitter
-{
-    color: @groundExtra;
-    background-color: @groundExtra;
-    alternate-background-color: @groundExtra;
-    border-color: @groundExtra;
-    gridline-color: @groundExtra;
-    selection-color: @groundExtra;
-    selection-background-color: @groundExtra;
-}
-
 QSplitter:handle
 {
-    color: @groundExtra;
-    background-color: @groundExtra;
+    color: @groundBase;
+    background-color: @groundBase;
 }
 
 QWidget
diff --git a/themes/dark/window/general.css b/themes/dark/window/general.css
index 78375d646..d09451dba 100644
--- a/themes/dark/window/general.css
+++ b/themes/dark/window/general.css
@@ -296,3 +296,9 @@ QPushButton
     background: #323030;
     color: @mainText;
 }
+
+QSplitter:handle
+{
+    color: @groundBase;
+    background-color: @groundBase;
+}
diff --git a/themes/default/contentDialog/contentDialog.css b/themes/default/contentDialog/contentDialog.css
index eea4adecf..343aebb32 100644
--- a/themes/default/contentDialog/contentDialog.css
+++ b/themes/default/contentDialog/contentDialog.css
@@ -1,14 +1,3 @@
-QSplitter
-{
-    color: white;
-    background-color: white;
-    alternate-background-color: white;
-    border-color: white;
-    gridline-color: white;
-    selection-color: white;
-    selection-background-color: white;
-}
-
 QSplitter:handle
 {
     color: white;
diff --git a/themes/default/window/general.css b/themes/default/window/general.css
index a59ab6ce4..11c375d40 100644
--- a/themes/default/window/general.css
+++ b/themes/default/window/general.css
@@ -11,6 +11,11 @@ QDialog
     background: white;
 }
 
+QWidget#contentWidget
+{
+    background: white;
+}
+
 QTabWidget
 {
     background-color: white;
@@ -266,3 +271,9 @@ QPushButton
     background: #ebebeb;
     color: @mainText;
 }
+
+QSplitter:handle
+{
+    color: white;
+    background-color: white;
+}