fix: restore only the directory at startup and load tabs on request
This commit is contained in:
+44
-46
@@ -143,7 +143,6 @@ class MainWindow(QMainWindow):
|
||||
self._startup_prompt = prompt_for_project
|
||||
self.settings = QSettings("MDHelper", "MDHelper")
|
||||
self.workspaces = WorkspaceStore(self.settings)
|
||||
self._workspace_restored = False
|
||||
self._restoring_workspace = False
|
||||
self.configurations = ConfigurationStore(self.settings)
|
||||
self.documents = DocumentStore()
|
||||
@@ -401,10 +400,8 @@ class MainWindow(QMainWindow):
|
||||
file_menu.addSeparator()
|
||||
file_menu.addAction(self.clear_recent_action)
|
||||
|
||||
self.restore_workspace_action = QAction("启动时恢复工作现场", self)
|
||||
self.restore_workspace_action.setCheckable(True)
|
||||
self.restore_workspace_action.setChecked(self.settings.value("workspace/restore", True, type=bool))
|
||||
self.restore_workspace_action.toggled.connect(lambda enabled: self.settings.setValue("workspace/restore", enabled))
|
||||
self.restore_workspace_action = QAction("恢复上次打开的标签", self)
|
||||
self.restore_workspace_action.triggered.connect(self._restore_workspace)
|
||||
file_menu.addAction(self.restore_workspace_action)
|
||||
|
||||
self.exit_action = QAction("退出", self)
|
||||
@@ -844,19 +841,9 @@ class MainWindow(QMainWindow):
|
||||
LOGGER.debug("Reader prewarm requested")
|
||||
|
||||
def prepare_reader_before_show(self, timeout_ms: int = 8000) -> None:
|
||||
# Preparing a fixed reader host prevents startup flicker; it must not
|
||||
# open historical documents. Tab restoration is an explicit menu action.
|
||||
self._prepare_reader_before_show(timeout_ms)
|
||||
if not self.isVisible() and not self._workspace_restored and self._startup_initial_path is None:
|
||||
self._restore_workspace()
|
||||
editor = self.tabs.currentWidget()
|
||||
if isinstance(editor, RichMarkdownEditorDialog) and editor.preview.page().isLoading():
|
||||
loop, deadline = QEventLoop(self), QTimer(self)
|
||||
deadline.setSingleShot(True)
|
||||
deadline.timeout.connect(loop.quit)
|
||||
editor.preview.loadFinished.connect(loop.quit)
|
||||
deadline.start(timeout_ms)
|
||||
loop.exec()
|
||||
deadline.stop()
|
||||
editor.preview.loadFinished.disconnect(loop.quit)
|
||||
|
||||
def _prepare_reader_before_show(self, timeout_ms: int = 8000) -> None:
|
||||
if self.isVisible():
|
||||
@@ -1955,7 +1942,7 @@ class MainWindow(QMainWindow):
|
||||
if not self._close_all_tabs(show_welcome=False):
|
||||
return
|
||||
|
||||
if self.has_project:
|
||||
if self.has_project and snapshot[0]:
|
||||
self.workspaces.save(self.project_root, *snapshot)
|
||||
|
||||
self._save_preferences()
|
||||
@@ -2014,7 +2001,7 @@ class MainWindow(QMainWindow):
|
||||
snapshot = self._workspace_snapshot() if root_changed else None
|
||||
if root_changed and not self._close_all_tabs(show_welcome=False):
|
||||
return False
|
||||
if snapshot is not None:
|
||||
if snapshot is not None and snapshot[0]:
|
||||
self.workspaces.save(self.project_root, *snapshot)
|
||||
|
||||
if root_changed or not self.has_project:
|
||||
@@ -4002,6 +3989,7 @@ class MainWindow(QMainWindow):
|
||||
editor.setFocus()
|
||||
|
||||
def _update_actions(self) -> None:
|
||||
self.restore_workspace_action.setEnabled(self.has_project and not self._has_open_content_tabs())
|
||||
history = self._current_history()
|
||||
self.back_action.setEnabled(history.can_go_back)
|
||||
self.forward_action.setEnabled(history.can_go_forward)
|
||||
@@ -4450,7 +4438,9 @@ class MainWindow(QMainWindow):
|
||||
event.ignore()
|
||||
return
|
||||
if self.has_project and not self._restoring_workspace:
|
||||
self.workspaces.save(self.project_root, *self._workspace_snapshot())
|
||||
snapshot = self._workspace_snapshot()
|
||||
# Simply opening a directory must not erase its saved tab history.
|
||||
if snapshot[0]: self.workspaces.save(self.project_root, *snapshot)
|
||||
self.exports.cancel_all()
|
||||
batch_dialog = getattr(self, "_batch_export_dialog", None)
|
||||
if batch_dialog is not None:
|
||||
@@ -4500,11 +4490,13 @@ class MainWindow(QMainWindow):
|
||||
return states, active
|
||||
|
||||
def _restore_workspace(self) -> bool:
|
||||
self._workspace_restored = True
|
||||
if not self.has_project or not self.settings.value("workspace/restore", True, type=bool):
|
||||
if not self.has_project:
|
||||
return False
|
||||
states, active = self.workspaces.load(self.project_root)
|
||||
if not states or self._has_open_content_tabs():
|
||||
if self._has_open_content_tabs():
|
||||
return False
|
||||
if not states:
|
||||
self.status_label.setText("此文件夹没有可恢复的历史标签")
|
||||
return False
|
||||
seed = self.tabs.currentWidget()
|
||||
if not isinstance(seed, ReaderTabHost):
|
||||
@@ -4534,29 +4526,35 @@ class MainWindow(QMainWindow):
|
||||
if not path.is_file():
|
||||
host.welcome_view.setPlainText(f"文件已不存在:\n{path}")
|
||||
return
|
||||
host.workspace_state = None
|
||||
if host.reader_view is None:
|
||||
host.set_reader_view(self._create_reader_view())
|
||||
self._standby_reader_view = None
|
||||
host.reader_view.setProperty("is_reader_standby", False)
|
||||
self.current_file = path
|
||||
if path.suffix.lower() in {".md", ".markdown"} or is_code_document(path):
|
||||
self.open_document(path, add_history=False, scroll_y=state.scroll)
|
||||
elif path.suffix.lower() in {".html", ".htm", ".xhtml"}:
|
||||
self._open_webpage_file_now(path)
|
||||
else:
|
||||
self._open_preview_file_now(path)
|
||||
if state.editing:
|
||||
self.edit_current_markdown()
|
||||
editor = self.tabs.currentWidget()
|
||||
if isinstance(editor, RichMarkdownEditorDialog):
|
||||
editor.sync_scroll_checkbox.setChecked(state.sync)
|
||||
editor.view_mode_box.setCurrentIndex(editor.view_mode_box.findData(state.view))
|
||||
editor.splitter.setSizes(state.sizes)
|
||||
cursor = editor.editor.textCursor()
|
||||
cursor.setPosition(min(state.cursor, editor.editor.document().characterCount() - 1))
|
||||
editor.editor.setTextCursor(cursor)
|
||||
QTimer.singleShot(0, editor, lambda: editor.editor.verticalScrollBar().setValue(state.source_scroll))
|
||||
# Replacing a restored reader with its editor must not activate and
|
||||
# load the neighbouring background tab during the intermediate removal.
|
||||
with QSignalBlocker(self.tabs):
|
||||
host.workspace_state = None
|
||||
if host.reader_view is None:
|
||||
host.set_reader_view(self._create_reader_view())
|
||||
self._standby_reader_view = None
|
||||
host.reader_view.setProperty("is_reader_standby", False)
|
||||
host.begin_reader_load()
|
||||
self.current_file = path
|
||||
if path.suffix.lower() in {".md", ".markdown"} or is_code_document(path):
|
||||
self.open_document(path, add_history=False, scroll_y=state.scroll)
|
||||
elif path.suffix.lower() in {".html", ".htm", ".xhtml"}:
|
||||
self._open_webpage_file_now(path)
|
||||
else:
|
||||
self._open_preview_file_now(path)
|
||||
if state.editing:
|
||||
self.edit_current_markdown()
|
||||
editor = self.tabs.currentWidget()
|
||||
if isinstance(editor, RichMarkdownEditorDialog):
|
||||
editor.sync_scroll_checkbox.setChecked(state.sync)
|
||||
editor.view_mode_box.setCurrentIndex(editor.view_mode_box.findData(state.view))
|
||||
editor.splitter.setSizes(state.sizes)
|
||||
cursor = editor.editor.textCursor()
|
||||
cursor.setPosition(min(state.cursor, editor.editor.document().characterCount() - 1))
|
||||
editor.editor.setTextCursor(cursor)
|
||||
QTimer.singleShot(0, editor, lambda: editor.editor.verticalScrollBar().setValue(state.source_scroll))
|
||||
self._on_tab_changed(self.tabs.currentIndex())
|
||||
|
||||
|
||||
@property
|
||||
def editor_drafts(self) -> dict:
|
||||
|
||||
Reference in New Issue
Block a user