summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBlaine2020-06-11 14:42:51 +0530
committerBlaine2020-06-11 14:42:51 +0530
commite9953e044a93837c62d55546d479b287302fa989 (patch)
treeb3242f0843ee2404f8885c313aa51a05e0d99242
parent2fe2f269edd9c07a1329b35e072672808ef1d4d3 (diff)
downloadChemical-PFD-e9953e044a93837c62d55546d479b287302fa989.tar.gz
Chemical-PFD-e9953e044a93837c62d55546d479b287302fa989.tar.bz2
Chemical-PFD-e9953e044a93837c62d55546d479b287302fa989.zip
new raster close button
-rw-r--r--src/main/python/utils/fileWindow.py1
-rw-r--r--src/main/resources/base/app.qss11
-rw-r--r--src/main/resources/base/ui/close.pngbin0 -> 255 bytes
-rw-r--r--src/main/resources/base/ui/close.svg60
4 files changed, 8 insertions, 64 deletions
diff --git a/src/main/python/utils/fileWindow.py b/src/main/python/utils/fileWindow.py
index 5dcf62e..28a576e 100644
--- a/src/main/python/utils/fileWindow.py
+++ b/src/main/python/utils/fileWindow.py
@@ -61,6 +61,7 @@ class fileWindow(QMdiSubWindow):
self.sideView = customView(parent = self)
self.sideView.setInteractive(False)
self.sideViewCloseButton = QPushButton('×', self.sideView)
+ self.sideViewCloseButton.setObjectName("sideViewCloseButton")
self.sideViewCloseButton.setFlat(True)
self.sideViewCloseButton.setFixedSize(20, 20)
self.moveSideViewCloseButton()
diff --git a/src/main/resources/base/app.qss b/src/main/resources/base/app.qss
index 2a51903..3e9f370 100644
--- a/src/main/resources/base/app.qss
+++ b/src/main/resources/base/app.qss
@@ -52,7 +52,7 @@ tabBarPlus::close-button {
padding: 0px;
margin: 0px;
border-radius: 2px;
- background-image: url("src/main/resources/base/ui/close.svg");
+ background-image: url("src/main/resources/base/ui/close.png");
background-position: center center;
background-repeat: none;
}
@@ -142,6 +142,9 @@ QMainWindow {
background-color: white;
}
+QDockWidget#Title {
+ background-color: #7cabf9;
+}
QDockWidget#Toolbar{
background-color: white;
border: 1px solid #e6e6e6;
@@ -224,7 +227,8 @@ sectionLabel:first{
}
customView QPushButton{
- background: rgba(214, 54, 40, 50%);
+ background-color: rgba(214, 54, 40, 50%);
+ background-image: url("src/main/resources/base/ui/close.svg");
border: 1px groove white;
border-radius: 2px;
font-size: 18px;
@@ -233,8 +237,7 @@ customView QPushButton{
color: rgba(255, 255, 255, 50%);
}
customView QPushButton:Hover{
- background: rgba(214, 54, 40, 90%);
- color: rgba(255, 255, 255, 90%);
+ background-color: rgba(214, 54, 40, 90%);
}
customTabWidget QPushButton{
diff --git a/src/main/resources/base/ui/close.png b/src/main/resources/base/ui/close.png
new file mode 100644
index 0000000..8771a0b
--- /dev/null
+++ b/src/main/resources/base/ui/close.png
Binary files differ
diff --git a/src/main/resources/base/ui/close.svg b/src/main/resources/base/ui/close.svg
deleted file mode 100644
index cb1c174..0000000
--- a/src/main/resources/base/ui/close.svg
+++ /dev/null
@@ -1,60 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg
- xmlns:dc="http://purl.org/dc/elements/1.1/"
- xmlns:cc="http://creativecommons.org/ns#"
- xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
- xmlns:svg="http://www.w3.org/2000/svg"
- xmlns="http://www.w3.org/2000/svg"
- xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
- xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
- inkscape:version="1.0 (4035a4fb49, 2020-05-01)"
- sodipodi:docname="close.svg"
- id="svg4"
- version="1.1"
- viewBox="0 0 10 10"><metadata
- id="metadata10">
- <rdf:RDF>
- <cc:Work
- rdf:about="">
- <dc:format>image/svg+xml</dc:format>
- <dc:type
- rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
- </cc:Work>
- </rdf:RDF>
-</metadata>
-<defs
- id="defs8" />
-<sodipodi:namedview
- inkscape:current-layer="svg4"
- inkscape:window-maximized="1"
- inkscape:window-y="-9"
- inkscape:window-x="-9"
- inkscape:cy="7.585194"
- inkscape:cx="2.5623729"
- inkscape:zoom="42.1"
- showgrid="false"
- id="namedview6"
- inkscape:window-height="1013"
- inkscape:window-width="1920"
- inkscape:pageshadow="2"
- inkscape:pageopacity="0"
- guidetolerance="10"
- gridtolerance="10"
- objecttolerance="10"
- borderopacity="1"
- bordercolor="#666666"
- pagecolor="#ffffff" />
-<text
- id="text2" />
-2 y=8&gt;×<text
- id="text837"
- y="11.016971"
- x="-2.6576188"
- style="font-style:normal;font-weight:normal;font-size:18.834px;line-height:1.25;font-family:sans-serif;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.470852"
- xml:space="preserve"><tspan
- style="stroke-width:0.470852"
- y="11.016971"
- x="-2.6576188"
- id="tspan835"
- sodipodi:role="line">×</tspan></text>
-</svg>