CodeMirror/Rare
1
0
Fork 0
mirror of synced 2024-06-22 04:20:25 +12:00
Code Issues Projects Releases Wiki Activity

Use QFrame for WrapperWidget and fix add_wrapper layout bug

Browse source
This commit is contained in:
Dummerle 2022-03-01 22:20:45 +01:00
parent 58c9e69231
commit 53e4281774
No known key found for this signature in database
GPG key ID: AB68CC59CA39F2F1
1 changed files with 17 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
rare/components/tabs/settings/settings_widgets/wrapper.py
View file

@ -3,7 +3,7 @@ from logging import getLogger
from typing import Dict
from PyQt5.QtCore import pyqtSignal
from PyQt5.QtWidgets import QGroupBox, QHBoxLayout, QLabel, QPushButton, QInputDialog, QFrame, QWidget
from PyQt5.QtWidgets import QGroupBox, QHBoxLayout, QLabel, QPushButton, QInputDialog, QFrame, QMessageBox, QSizePolicy
from rare import shared
from rare.ui.components.tabs.settings.wrapper import Ui_WrapperSettings
@ -19,7 +19,7 @@ extra_wrapper_regex = {
}
class WrapperWidget(QGroupBox):
class WrapperWidget(QFrame):
delete_wrapper = pyqtSignal(str)
def __init__(self, text: str):
@ -27,6 +27,7 @@ class WrapperWidget(QGroupBox):
self.setLayout(QHBoxLayout())
self.text = text
self.layout().addWidget(QLabel(text))
self.setProperty("frameShape", 6)
self.delete_button = QPushButton(icon("ei.remove"), "")
self.layout().addWidget(self.delete_button)
@ -64,14 +65,23 @@ class WrapperSettings(QGroupBox, Ui_WrapperSettings):
self.extra_wrappers[key] = text
self.save()
return
if self.wrappers.get(text):
QMessageBox.warning(self, "Warning", self.tr("Wrapper is already in the list"))
return
self.widget_stack.setCurrentIndex(0)
widget = WrapperWidget(text)
self.widgets.layout().addWidget(widget)
widget.delete_wrapper.connect(self.delete_wrapper)
self.widgets.layout().addWidget(widget)
self.wrappers[text] = widget
self.widget_stack.setCurrentIndex(0)
# flow layout bug
self.widgets.update()
# flow layout bug: Workaround
lbl = QLabel("")
self.widgets.layout().addWidget(lbl)
lbl.deleteLater()
self.save()
def delete_wrapper(self, text: str):
@ -82,8 +92,9 @@ class WrapperSettings(QGroupBox, Ui_WrapperSettings):
widget.deleteLater()
self.wrappers.pop(text)
if self.wrappers:
if not self.wrappers:
self.widget_stack.setCurrentIndex(1)
self.save()
def save(self):