From a62fa463a646c346a9ad7e666b28ea0c59a2a007 Mon Sep 17 00:00:00 2001 From: Jan Grewe Date: Tue, 5 Jan 2021 12:06:25 +0100 Subject: [PATCH] [stylesheet] trust the automatically selected l&f --- central_widget.py | 35 ++++++++++++++++++----------------- main_window.py | 7 ++++--- 2 files changed, 22 insertions(+), 20 deletions(-) diff --git a/central_widget.py b/central_widget.py index 873503f..8e2dd8f 100644 --- a/central_widget.py +++ b/central_widget.py @@ -1,6 +1,5 @@ import os -from PyQt5 import QtWidgets -from PyQt5.QtWidgets import QFrame, QGroupBox, QLabel, QListWidget, QListWidgetItem, QSplitter, QStackedLayout, QAbstractItemView, QVBoxLayout, QWidget, QGridLayout, QSpacerItem, QSizePolicy, QTreeView, QHeaderView +from PyQt5.QtWidgets import QFrame, QGroupBox, QLabel, QLayout, QListWidget, QListWidgetItem, QSplitter, QStackedLayout, QAbstractItemView, QVBoxLayout, QWidget, QGridLayout, QTreeView, QHeaderView from PyQt5.QtGui import QPixmap from PyQt5.QtCore import QItemSelectionModel, Qt, QSettings, QSize, pyqtSignal @@ -24,7 +23,6 @@ class CentralWidget(QWidget): self._stack.addWidget(self._file_view) self._stack.addWidget(self._plot_screen) self.setLayout(self._stack) - #self.setStyleSheet("background-color: white;") def show_file_content(self): self._stack.setCurrentIndex(1) @@ -51,7 +49,7 @@ class FileView(QWidget): vbox = QVBoxLayout() self.setLayout(vbox) - splitter = QSplitter(Qt.Vertical) + splitter = QSplitter(Qt.Horizontal) self._mdata_tree = QTreeView(self) self._mdata_tree.expanded.connect(self.metadataTreeResize) @@ -68,6 +66,7 @@ class FileView(QWidget): mdata_group = QGroupBox("Metadata") mdata_group.setLayout(QVBoxLayout()) + mdata_group.layout().setContentsMargins(2, 10, 2, 2) mdata_group.layout().addWidget(self._mdata_tree) self._data_tree = QTreeView(self) @@ -87,6 +86,7 @@ class FileView(QWidget): data_group = QGroupBox("Data") data_vbox = QVBoxLayout() + data_vbox.setContentsMargins(2, 10, 2, 2) data_vbox.addWidget(self._data_tree) data_group.setLayout(data_vbox) @@ -121,31 +121,32 @@ class FileView(QWidget): def reset(self): pass + class SplashScreen(QWidget): keyPressed = pyqtSignal(int) def __init__(self, parent=None) -> None: super().__init__(parent=parent) + #self.setStyleSheet("background-color: white;") + layout = QGridLayout() + layout.setColumnStretch(0, 1) + layout.setColumnStretch(1, 0) + layout.setColumnStretch(2, 1) + layout.setRowStretch(0, 1) + layout.setRowStretch(2, 1) self.setLayout(layout) - self.setStyleSheet("background-color: white;") + label = QLabel() - label.setPixmap(QPixmap("./icons/nixview256.png")) - label.setAlignment(Qt.AlignCenter) + label.setPixmap(QPixmap("./icons/nixview_transparent.png")) + label.setMaximumWidth(300) + label.setAlignment(Qt.AlignCenter) layout.addWidget(label, 1, 1) - verticalSpacer = QSpacerItem(20, 40, QSizePolicy.Minimum, QSizePolicy.Expanding) - verticalSpacer2 = QSpacerItem(20, 40, QSizePolicy.Minimum, QSizePolicy.Expanding) - hSpacer = QSpacerItem(400, 20, QSizePolicy.Maximum, QSizePolicy.Expanding) - hSpacer2 = QSpacerItem(400, 20, QSizePolicy.Maximum, QSizePolicy.Expanding) - layout.addItem(verticalSpacer, 0, 1) - layout.addItem(verticalSpacer2, 2, 1) - layout.addItem(hSpacer, 1, 0) - layout.addItem(hSpacer2, 1, 2) + frame = QFrame() l = QVBoxLayout() l.addWidget(QLabel("Recently opened files:")) - self._file_list = QListWidget(self) self._file_list.setSelectionMode(QAbstractItemView.SingleSelection) self._file_list.itemClicked.connect(self._on_file_clicked) @@ -197,5 +198,5 @@ class SplashScreen(QWidget): def _on_key_pressed(self, key): item = self._file_list.currentItem() print(item) - if item is not None and key == Qt.Key_Return: + if item is not None and key == Qt.Key_Return: comm.communicator.open_recent.emit(self._file_map[item.text()]) diff --git a/main_window.py b/main_window.py index 2d8703f..1ff3454 100644 --- a/main_window.py +++ b/main_window.py @@ -1,8 +1,7 @@ import sys from PyQt5.QtWidgets import QFileDialog, QMainWindow, QMenuBar, QToolBar, QAction, QStatusBar from PyQt5.QtGui import QIcon, QKeySequence -from PyQt5.QtCore import QSize, QSettings -from numpy import unique, array +from PyQt5.QtCore import QSize, QSettings, Qt from file_handler import FileHandler, NodeType import constants as cnst @@ -71,6 +70,8 @@ class NixView(QMainWindow): def create_toolbar(self): self._toolbar = QToolBar("My main toolbar") + #self._toolbar.setStyleSheet("QToolButton:!hover {background-color:none}") + self._toolbar.setAllowedAreas(Qt.LeftToolBarArea | Qt.TopToolBarArea) self._toolbar.setIconSize(QSize(32, 32)) self._toolbar.addAction(self._file_open_action) @@ -79,7 +80,7 @@ class NixView(QMainWindow): self._toolbar.addSeparator() self._toolbar.addAction(self._plot_action) self._toolbar.addAction(self._table_action) - self.addToolBar(self._toolbar) + self.addToolBar(Qt.LeftToolBarArea, self._toolbar) def create_menu(self): menu = self.menuBar()