diff --git a/main.py b/main.py index 95c0265..beb1feb 100644 --- a/main.py +++ b/main.py @@ -53,10 +53,6 @@ class MainWindow(QMainWindow): self.settings.font_size(int(font_size)) self.tabs.update() - def on_follow_file_changed(self, e): - print(e) - - def create_menu_bar(self) -> QMenuBar: menu_bar = QMenuBar() @@ -66,7 +62,7 @@ class MainWindow(QMainWindow): open_file.triggered.connect(self._open_file) close_action = QAction(self.tr("Close", "menu item to close the application"), self) - close_action.triggered.connect(self.close) + close_action.triggered.connect(self.destruct) file_menu.addAction(open_file) file_menu.addAction(close_action) @@ -80,6 +76,9 @@ class MainWindow(QMainWindow): (selected_file, _filter) = dialog.getOpenFileName(caption=self.tr("Open File")) self.tabs.create_tab(selected_file) + def destruct(self): + self.tabs.destruct() + self.close() if __name__ == "__main__": diff --git a/tabs.py b/tabs.py index aa0c273..3654022 100644 --- a/tabs.py +++ b/tabs.py @@ -10,8 +10,8 @@ from fulltabwidget import FullTabWidget from logFileModel import LogFileModel from settings import Settings -class Tabs(QWidget): +class Tabs(QWidget): tabs_by_index = {} tabs_by_filename = {} @@ -42,7 +42,7 @@ class Tabs(QWidget): if model.get_file() in self.tabs_by_filename: for tab_index in range(0, self.tabs.count()): - widget : FullTabWidget = self.tabs.widget(tab_index) + widget: FullTabWidget = self.tabs.widget(tab_index) if widget.get_file() == model.get_file(): self.tabs.setCurrentIndex(tab_index) break @@ -57,4 +57,6 @@ class Tabs(QWidget): del self.tabs_by_filename[full_tab.file_view.get_file()] self.tabs.removeTab(tab_index) - + def destruct(self): + while self.tabs.count() > 0: + self._close_tab(0)