Minor improvements

tests/test_fs_explorer.py

@@ -52,6 +52,17 @@ def test_line_edited(self, tmp_path, qtbot):
         assert fse.root == root
         assert fse.pathBar.text() == text
 
+    def test_goto_parent_directory(self, tmp_path, qtbot):
+        """Make sure the root can be set."""
+        fse = fs_explorer.FSExplorer()
+        qtbot.addWidget(fse)
+
+        path = tmp_path / "test_path"
+        path.mkdir()
+        fse.set_root(str(path))
+        fse.goto_parent_directory()
+        assert fse.root == str(tmp_path)
+
     def test_new_file(self, tmp_path, qtbot, caplog, monkeypatch):
         """Make sure a new file behaves correctly."""
         fse = fs_explorer.FSExplorer()

typstwriter/editor.py

@@ -101,7 +101,7 @@ def open_file(self, path):
     def open_file_dialog(self):
         """Open a dialog to open an existing file."""
         filters = "Typst Files (*.typ);;Any File (*)"
-        path, cd = QtWidgets.QFileDialog.getOpenFileName(self, "Open File", QtCore.QDir.homePath(), filters)
+        path, cd = QtWidgets.QFileDialog.getOpenFileName(self, "Open File", state.working_directory.Value, filters)
         if path:
             self.open_file(path)
 
@@ -205,10 +205,12 @@ def childsavedstate_changed(self, savestate):
 
     @QtCore.Slot(str)
     def childpath_changed(self, path):
-        """Update tab name based on new path."""
+        """Update tab name and icon based on new path."""
         i = self.TabWidget.indexOf(self.sender())
         name = os.path.relpath(path, start=state.working_directory.Value)
+        icon = util.FileIconProvider().icon(QtCore.QFileInfo(path))
         self.TabWidget.tabBar().setTabText(i, name)
+        self.TabWidget.tabBar().setTabIcon(i, icon)
 
     @QtCore.Slot()
     def update_tab_names(self):

typstwriter/fs_explorer.py

@@ -32,6 +32,7 @@ def __init__(self, parent):
         self.context_path = None
 
         self.action_open = QtWidgets.QAction("Open", triggered=self.handle_open)
+        self.action_open_external = QtWidgets.QAction("Open with external program", triggered=self.handle_open_external)
         self.action_new_file = QtWidgets.QAction("New file", triggered=self.handle_new_file)
         self.action_new_folder = QtWidgets.QAction("New folder", triggered=self.handle_new_folder)
         self.action_rename = QtWidgets.QAction("Rename", triggered=self.handle_rename)
@@ -44,6 +45,10 @@ def handle_open(self):
         """Trigger opening a file."""
         self.parent().open_file.emit(self.context_path)
 
+    def handle_open_external(self):
+        """Trigger opening a file."""
+        util.open_with_external_program(self.context_path)
+
     def handle_new_file(self):
         """Trigger creating a new file."""
         self.parent().new_file_in_dir(self.context_path)
@@ -92,6 +97,7 @@ def __init__(self, parent):
         FSContextMenu.__init__(self, parent)
 
         self.addAction(self.action_open)
+        self.addAction(self.action_open_external)
         self.addAction(self.action_rename)
         self.addAction(self.action_delete)
         self.addAction(self.action_copy_path)
@@ -130,12 +136,19 @@ def __init__(self):
         self.pathBar = QtWidgets.QLineEdit(self)
         self.pathBar.setText("")
         self.pathBar.editingFinished.connect(self.line_edited)
+
         self.folderAction = QtWidgets.QAction(
             QtGui.QIcon.fromTheme(QtGui.QIcon.FolderOpen, QtGui.QIcon(util.icon_path("folder.svg"))), "open"
         )
         self.folderAction.triggered.connect(self.open_directory_dialog)
         self.pathBar.addAction(self.folderAction, QtWidgets.QLineEdit.LeadingPosition)
 
+        self.parentAction = QtWidgets.QAction(
+            QtGui.QIcon.fromTheme(QtGui.QIcon.GoUp, QtGui.QIcon(util.icon_path("parent_dir.svg"))), "up"
+        )
+        self.parentAction.triggered.connect(self.goto_parent_directory)
+        self.pathBar.addAction(self.parentAction, QtWidgets.QLineEdit.TrailingPosition)
+
         self.tree_view = QtWidgets.QTreeView()
         self.filesystem_model = QtWidgets.QFileSystemModel(self.tree_view)
         self.filesystem_model.setIconProvider(util.FileIconProvider())
@@ -172,7 +185,7 @@ def __init__(self):
         root_dir = os.path.expanduser(config.get("General", "working_directory"))
         if not os.path.exists(root_dir):
             root_dir = os.path.expanduser("~/")
-        self.set_root(root_dir)
+        self.set_root(os.path.normpath(root_dir))
 
     def open_directory_dialog(self):
         """Open a dialog to select root path and open said path."""
@@ -221,6 +234,12 @@ def doubleclicked(self, index):
         if os.path.isdir(path):
             self.set_root(path)
 
+    @QtCore.Slot()
+    def goto_parent_directory(self):
+        """Set the parent of the current directory as root."""
+        path = os.path.dirname(self.root)
+        self.set_root(path)
+
     def rightclicked(self, event):
         """Handle right click."""
         index = self.tree_view.indexAt(event)

typstwriter/mainwindow.py

@@ -211,8 +211,8 @@ def set_compiler_output_visibility(self, visibility):
 
     def open_config(self):
         """Open config file."""
-        util.open_with_external_program(config.writepath)
         config.write()
+        util.open_with_external_program(config.writepath)
 
     def closeEvent(self, event):  # noqa: N802
         """Handle close event."""