diff --git a/beeref/view.py b/beeref/view.py index df77912..cf3e52b 100644 --- a/beeref/view.py +++ b/beeref/view.py @@ -26,7 +26,7 @@ from beeref import commands from beeref.config import CommandlineArgs, BeeSettings from beeref import constants from beeref import fileio -from beeref import gui +from beeref import widgets from beeref.items import BeePixmapItem, BeeTextItem from beeref.main_controls import MainControlsMixin from beeref.scene import BeeGraphicsScene @@ -45,7 +45,7 @@ class BeeGraphicsView(MainControlsMixin, self.app = app self.parent = parent self.settings = BeeSettings() - self.welcome_overlay = gui.WelcomeOverlay(self) + self.welcome_overlay = widgets.WelcomeOverlay(self) self.setBackgroundBrush( QtGui.QBrush(QtGui.QColor(*constants.COLORS['Scene:Canvas']))) @@ -309,7 +309,7 @@ class BeeGraphicsView(MainControlsMixin, fileio.load_bee, filename, self.scene) self.worker.progress.connect(self.on_items_loaded) self.worker.finished.connect(self.on_loading_finished) - self.progress = gui.BeeProgressDialog( + self.progress = widgets.BeeProgressDialog( 'Loading %s' % filename, worker=self.worker, parent=self) @@ -342,7 +342,7 @@ class BeeGraphicsView(MainControlsMixin, self.worker = fileio.ThreadedIO( fileio.save_bee, filename, self.scene, create_new=create_new) self.worker.finished.connect(self.on_saving_finished) - self.progress = gui.BeeProgressDialog( + self.progress = widgets.BeeProgressDialog( 'Saving %s' % filename, worker=self.worker, parent=self) @@ -367,7 +367,7 @@ class BeeGraphicsView(MainControlsMixin, self.app.quit() def on_action_help(self): - gui.HelpDialog(self) + widgets.HelpDialog(self) def on_action_about(self): QtWidgets.QMessageBox.about( @@ -380,7 +380,7 @@ class BeeGraphicsView(MainControlsMixin, f'Visit the {constants.APPNAME} website

')) def on_action_debuglog(self): - gui.DebugLogDialog(self) + widgets.DebugLogDialog(self) def on_insert_images_finished(self, new_scene, filename, errors): """Callback for when loading of images is finished. @@ -422,7 +422,7 @@ class BeeGraphicsView(MainControlsMixin, self.worker.finished.connect( partial(self.on_insert_images_finished, not self.scene.items())) - self.progress = gui.BeeProgressDialog( + self.progress = widgets.BeeProgressDialog( 'Loading images', worker=self.worker, parent=self) diff --git a/beeref/gui.py b/beeref/widgets.py similarity index 100% rename from beeref/gui.py rename to beeref/widgets.py diff --git a/tests/test_view.py b/tests/test_view.py index 31732c0..abe1fba 100644 --- a/tests/test_view.py +++ b/tests/test_view.py @@ -39,7 +39,7 @@ def test_init_with_filename(open_file_mock, view, qapp, commandline_args): del view -@patch('beeref.gui.WelcomeOverlay.hide') +@patch('beeref.widgets.WelcomeOverlay.hide') def test_on_scene_changed_when_items(hide_mock, view): item = BeePixmapItem(QtGui.QImage()) view.scene.addItem(item) @@ -51,7 +51,7 @@ def test_on_scene_changed_when_items(hide_mock, view): assert view.get_scale() == 2 -@patch('beeref.gui.WelcomeOverlay.show') +@patch('beeref.widgets.WelcomeOverlay.show') def test_on_scene_changed_when_no_items(show_mock, view): view.scale(2, 2) with patch('beeref.view.BeeGraphicsView.recalc_scene_rect') as r: @@ -275,13 +275,13 @@ def test_on_action_save_when_no_filename(save_as_mock, view, imgfilename3x3): save_as_mock.assert_called_once_with() -@patch('beeref.gui.HelpDialog.show') +@patch('beeref.widgets.HelpDialog.show') def test_on_action_help(show_mock, view): view.on_action_help() show_mock.assert_called_once() -@patch('beeref.gui.DebugLogDialog.show') +@patch('beeref.widgets.DebugLogDialog.show') def test_on_action_debuglog(show_mock, view): with patch('builtins.open', mock_open(read_data='log')) as open_mock: view.on_action_debuglog() diff --git a/tests/test_gui.py b/tests/test_widgets.py similarity index 95% rename from tests/test_gui.py rename to tests/test_widgets.py index 3cd72c7..bcd4b3e 100644 --- a/tests/test_gui.py +++ b/tests/test_widgets.py @@ -4,7 +4,7 @@ from PyQt6 import QtCore, QtWidgets from PyQt6.QtCore import Qt from beeref.config import logfile_name -from beeref.gui import DebugLogDialog, RecentFilesModel +from beeref.widgets import DebugLogDialog, RecentFilesModel def test_debug_log_dialog(qtbot, settings, view):