CodeMirror/manuskript
1
0
Fork 0
mirror of https://github.com/olivierkes/manuskript.git synced 2024-05-19 04:12:29 +12:00
Code Issues Projects Releases Wiki Activity

Adds icons to view splitter

Browse source
This commit is contained in:
Olivier Keshavjee 2016-04-10 22:04:31 +02:00
parent 373b36406a
commit 59ec08c3b3
4 changed files with 141 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

58
icons/NumixMsk/256x256/actions/split-close.svg Normal file
View file

@ -0,0 +1,58 @@
<?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"
width="256"
height="256"
viewBox="0 0 256 256"
id="svg2"
version="1.1"
inkscape:version="0.48.4 r9939"
sodipodi:docname="split-close.svg">
<metadata
id="metadata14">
<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="defs12" />
<sodipodi:namedview
pagecolor="#ffffff"
bordercolor="#666666"
borderopacity="1"
objecttolerance="10"
gridtolerance="10"
guidetolerance="10"
inkscape:pageopacity="0"
inkscape:pageshadow="2"
inkscape:window-width="1366"
inkscape:window-height="721"
id="namedview10"
showgrid="false"
inkscape:zoom="0.921875"
inkscape:cx="128"
inkscape:cy="128"
inkscape:window-x="-2"
inkscape:window-y="-3"
inkscape:window-maximized="1"
inkscape:current-layer="g4" />
<g
style="fill:#268bd2"
id="g4">
<path
d="m 16,16 224,0 0,224 -224,0 z"
id="path6"
inkscape:connector-curvature="0" />
</g>
</svg>
Side by side

After

Width:  |  Height:  |  Size: 1.6 KiB

63
icons/NumixMsk/256x256/actions/split-horizontal.svg Normal file
View file

@ -0,0 +1,63 @@
<?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"
width="256"
height="256"
viewBox="0 0 256 256"
id="svg2"
version="1.1"
inkscape:version="0.48.4 r9939"
sodipodi:docname="split-horizontal.svg">
<metadata
id="metadata14">
<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="defs12" />
<sodipodi:namedview
pagecolor="#ffffff"
bordercolor="#666666"
borderopacity="1"
objecttolerance="10"
gridtolerance="10"
guidetolerance="10"
inkscape:pageopacity="0"
inkscape:pageshadow="2"
inkscape:window-width="1366"
inkscape:window-height="721"
id="namedview10"
showgrid="false"
inkscape:zoom="0.921875"
inkscape:cx="128"
inkscape:cy="128"
inkscape:window-x="-2"
inkscape:window-y="-3"
inkscape:window-maximized="1"
inkscape:current-layer="svg2" />
<g
style="fill:#268bd2"
id="g4"
transform="matrix(0,1,-1,0,256,0)">
<path
d="m 16,16 96,0 0,224 -96,0 z"
id="path6"
inkscape:connector-curvature="0" />
<path
d="m 144,16 96,0 0,224 -96,0 z"
id="path8"
inkscape:connector-curvature="0" />
</g>
</svg>
Side by side

After

Width:  |  Height:  |  Size: 1.7 KiB

6
icons/NumixMsk/256x256/actions/split-vertical.svg Normal file
View file

@ -0,0 +1,6 @@
<svg width="256" xmlns="http://www.w3.org/2000/svg" height="256" viewBox="0 0 256 256" xmlns:xlink="http://www.w3.org/1999/xlink">
<g style="fill:#268bd2">
<path d="M 16 16 L 112 16 L 112 240 L 16 240 Z "/>
<path d="M 144 16 L 240 16 L 240 240 L 144 240 Z "/>
</g>
</svg>
Side by side

After

Width:  |  Height:  |  Size: 272 B

22
manuskript/ui/editors/tabSplitter.py
View file

@ -2,9 +2,8 @@
# --!-- coding: utf8 --!--
import locale
from PyQt5.QtCore import QModelIndex, QRect, QPoint
from PyQt5.QtCore import Qt, QObject, QSize
from PyQt5.QtGui import QPixmap, QPainter
from PyQt5.QtCore import QModelIndex, QRect, QPoint, Qt, QObject, QSize
from PyQt5.QtGui import QIcon
from PyQt5.QtWidgets import QWidget, QPushButton, qApp
from manuskript.functions import mainWindow
@ -28,11 +27,11 @@ class tabSplitter(QWidget, Ui_tabSplitter):
self.btmSplit = QPushButton()
self.btnSplit = QPushButton("S", self)
self.btnSplit = QPushButton(self)
self.btnSplit.setGeometry(QRect(0, 0, 24, 24))
self.btnSplit.setMinimumSize(QSize(24, 24))
self.btnSplit.setMaximumSize(QSize(24, 24))
self.btnSplit.setCheckable(True)
# self.btnSplit.setCheckable(True)
self.btnSplit.setFlat(True)
self.btnSplit.setObjectName("btnSplit")
@ -42,6 +41,7 @@ class tabSplitter(QWidget, Ui_tabSplitter):
self.secondTab = None
self.splitState = 0
self.focusTab = 1
self.closeSplit()
self.tab.tabCloseRequested.connect(self.closeTab)
self.tab.currentChanged.connect(self.mainEditor.tabChanged)
@ -103,7 +103,9 @@ class tabSplitter(QWidget, Ui_tabSplitter):
self.splitState = 1
self.splitter.setOrientation(Qt.Horizontal)
self.btnSplit.setChecked(True)
# self.btnSplit.setChecked(True)
self.btnSplit.setIcon(QIcon.fromTheme("split-vertical"))
self.btnSplit.setToolTip(self.tr("Split horizontally"))
elif state is None and self.splitState == 1 or state == 2:
if self.secondTab is None:
@ -111,7 +113,9 @@ class tabSplitter(QWidget, Ui_tabSplitter):
self.splitter.setOrientation(Qt.Vertical)
self.splitState = 2
self.btnSplit.setChecked(True)
# self.btnSplit.setChecked(True)
self.btnSplit.setIcon(QIcon.fromTheme("split-horizontal"))
self.btnSplit.setToolTip(self.tr("Close split"))
else:
self.closeSplit()
@ -134,8 +138,10 @@ class tabSplitter(QWidget, Ui_tabSplitter):
qApp.focusChanged.disconnect(self.secondTab.focusChanged)
self.focusTab = 1
self.secondTab = None
self.btnSplit.setChecked(False)
# self.btnSplit.setChecked(False)
self.splitState = 0
self.btnSplit.setIcon(QIcon.fromTheme("split-close"))
self.btnSplit.setToolTip(self.tr("Split vertically"))
# def resizeEvent(self, event):
# r = self.geometry()