prehistoric-systems/beeref
1
0
Fork 0
mirror of https://github.com/rbreu/beeref.git synced 2026-03-11 08:54:28 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix ghost of 'Recent Files' showing up on Welcome Screen when empty

Browse source
This commit is contained in:
Rebecca Breu 2023-12-08 21:46:14 +01:00
parent 4ae153b7d7
commit b176e79a44
2 changed files with 30 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
beeref/widgets/welcome_overlay.py
View file

@ -47,15 +47,16 @@ class RecentFilesModel(QtCore.QAbstractListModel):
class RecentFilesView(QtWidgets.QListView):
def __init__(self, parent, files=None):
def __init__(self, parent, view, files=None):
super().__init__(parent)
self.view = view
self.files = files or []
self.clicked.connect(self.on_clicked)
self.setModel(RecentFilesModel(self.files))
self.setMouseTracking(True)
def on_clicked(self, index):
self.parent().parent().open_from_file(self.files[index.row()])
self.view.open_from_file(self.files[index.row()])
def update_files(self, files):
self.files = files
@ -96,13 +97,16 @@ class WelcomeOverlay(MainControlsMixin, QtWidgets.QWidget):
self.init_main_controls(main_window=parent.parent)
# Recent files
self.files_layout = QtWidgets.QVBoxLayout()
self.files_layout.addStretch(50)
self.files_layout.addWidget(
self.files_widget = QtWidgets.QWidget(self)
files_layout = QtWidgets.QVBoxLayout()
files_layout.addStretch(50)
files_layout.addWidget(
QtWidgets.QLabel('<h3>Recent Files</h3>', self))
self.files_view = RecentFilesView(self)
self.files_layout.addWidget(self.files_view)
self.files_layout.addStretch(50)
self.files_view = RecentFilesView(self, parent)
files_layout.addWidget(self.files_view)
files_layout.addStretch(50)
self.files_widget.setLayout(files_layout)
self.files_widget.hide()
# Help text
self.label = QtWidgets.QLabel(self.txt, self)
@ -117,8 +121,9 @@ class WelcomeOverlay(MainControlsMixin, QtWidgets.QWidget):
def show(self):
files = BeeSettings().get_recent_files(existing_only=True)
self.files_view.update_files(files)
if files and self.layout.indexOf(self.files_layout) < 0:
self.layout.insertLayout(0, self.files_layout)
if files and self.layout.indexOf(self.files_widget) < 0:
self.layout.insertWidget(0, self.files_widget)
self.files_widget.show()
super().show()
def disable_mouse_events(self):

18
tests/widgets/test_welcome_overlay.py
View file

@ -37,12 +37,12 @@ def test_welcome_overlay_when_no_recent_files(qapp):
view = BeeGraphicsView(qapp, parent)
overlay = WelcomeOverlay(view)
overlay.show()
assert overlay.layout.indexOf(overlay.files_layout) < 0
assert overlay.layout.indexOf(overlay.files_widget) < 0
def test_recent_files_view_size_hint(qapp):
parent = QtWidgets.QMainWindow()
files_view = RecentFilesView(parent)
files_view = RecentFilesView(parent, None)
files_view.sizeHintForRow = lambda i: 10 + i
files_view.sizeHintForColumn = lambda i: 50 + i
@ -50,6 +50,18 @@ def test_recent_files_view_size_hint(qapp):
assert files_view.sizeHint() == QtCore.QSize(53, 25)
def test_recent_files_view_on_click(qapp):
parent = QtWidgets.QMainWindow()
view = BeeGraphicsView(qapp, parent)
view.open_from_file = MagicMock()
overlay = WelcomeOverlay(view)
overlay.files_view.update_files(['foo.bee', 'bar.bee'])
overlay.files_view.on_clicked(
RecentFilesModel(
['foo.bee', 'bar.bee']).createIndex(1, 0))
view.open_from_file.assert_called_once_with('bar.bee')
@patch('beeref.widgets.welcome_overlay.BeeSettings.get_recent_files',
return_value=['foo.bee', 'bar.bee'])
def test_welcome_overlay_when_recent_files(qapp):
@ -57,7 +69,7 @@ def test_welcome_overlay_when_recent_files(qapp):
view = BeeGraphicsView(qapp, parent)
overlay = WelcomeOverlay(view)
overlay.show()
assert overlay.layout.indexOf(overlay.files_layout) == 0
assert overlay.layout.indexOf(overlay.files_widget) == 0
@patch('PyQt6.QtWidgets.QGraphicsView.mousePressEvent')