qml/ClideEditor.qml

@@ -153,13 +153,12 @@ SplitView {
         id: areaConsole
 
         height: 100
-        width: parent.width
+        placeholderText: qsTr("Placeholder for bash terminal.")
-        placeholderText: qsTr("shaun@pc:~/Code/clide$ ")
         placeholderTextColor: "white"
         readOnly: true
         wrapMode: TextArea.Wrap
         background: Rectangle {
-            color: RustColors.terminal_background
+            color: RustColors.editor_background
             implicitHeight: 100
             // border.color: control.enabled ? RustColors.active : RustColors.inactive
         }

qml/ClideProjectView.qml

@@ -45,40 +45,31 @@ SplitView {
 
         ColumnLayout {
             spacing: 2
-            // TODO: Make a ClideBreadCrumb element to support select parent paths as root
             Rectangle {
                 width: navigationView.width
-                height: 25
+                height: breadCrumb.height + 5
-                color: RustColors.explorer_background
+
+                color: RustColors.explorer_text
                 Text {
                     id: breadCrumb
-                    anchors.fill: parent
                     text: clideTreeView.rootDirectory
-                    color: RustColors.explorer_text
                     elide: Text.ElideLeft
                     horizontalAlignment: Text.AlignHCenter
-                    verticalAlignment: Text.AlignVCenter
                 }
             }
 
             ClideTreeView {
                 id: clideTreeView
-                onFileClicked: path => clideEditor.filePath = path
+                onFileClicked: path => root.projectDir = path
                 width: navigationView.width
                 height: navigationView.height
 
                 // Path to the directory opened in the file explorer.
-                originalRootDirectory: root.projectDir
                 rootDirectory: root.projectDir
-                onRootDirectoryChanged: {
-                    console.log(clideTreeView.rootDirectory)
-                    breadCrumb.text = clideTreeView.rootDirectory
-                }
             }
         }
     }
     ClideEditor {
-        id: clideEditor
         SplitView.fillWidth: true
 
         // Provide a path to the file currently open in the text editor.

qml/ClideTreeView.qml

@@ -14,21 +14,25 @@ TreeView {
 
     property int lastIndex: -1
 
-    required property string originalRootDirectory
+    required property string rootDirectory
-    property string rootDirectory
 
     signal fileClicked(string filePath)
 
-    rootIndex: FileSystem.setDirectory(fileSystemTreeView.rootDirectory)
+
+    rootIndex: FileSystem.rootIndex
     leftMargin: 5
     boundsBehavior: Flickable.StopAtBounds
     boundsMovement: Flickable.StopAtBounds
     clip: true
 
+    Component.onCompleted: {
+        FileSystem.rootIndex = FileSystem.setDirectory(fileSystemTreeView.rootDirectory)
+    }
+
     // The delegate represents a single entry in the filesystem.
     delegate: TreeViewDelegate {
         id: treeDelegate
-        indentation: 8
+        indentation: 6
         implicitWidth: fileSystemTreeView.width > 0 ? fileSystemTreeView.width : 250
         implicitHeight: 25
 
@@ -115,13 +119,15 @@ TreeView {
                 switch (button) {
                     case Qt.LeftButton:
                         fileSystemTreeView.toggleExpanded(treeDelegate.row)
+                        fileSystemTreeView.lastIndex = treeDelegate.index
                         // If this model item doesn't have children, it means it's
                         // representing a file.
                         if (!treeDelegate.hasChildren)
-                            fileSystemTreeView.fileClicked(treeDelegate.filePath)
+                            root.fileClicked(treeDelegate.filePath)
                         break;
                     case Qt.RightButton:
-                        contextMenu.popup();
+                        if (treeDelegate.hasChildren)
+                            contextMenu.popup();
                         break;
                 }
             }
@@ -131,17 +137,16 @@ TreeView {
             id: contextMenu
             Action {
                 text: qsTr("Set as root index")
-                enabled: treeDelegate.hasChildren
                 onTriggered: {
-                    console.log("Setting new root directory: " + treeDelegate.filePath)
+                    console.log("Setting directory: " + treeDelegate.filePath)
-                    fileSystemTreeView.rootDirectory = treeDelegate.filePath
+                    FileSystem.rootIndex = FileSystem.setDirectory(treeDelegate.filePath)
                 }
             }
             Action {
                 text: qsTr("Reset root index")
                 onTriggered: {
-                    console.log("Resetting root directory: " + fileSystemTreeView.originalRootDirectory)
+                    console.log("Reset root index")
-                    fileSystemTreeView.rootDirectory = fileSystemTreeView.originalRootDirectory
+                    FileSystem.rootIndex = FileSystem.setDirectory(fileSystemTreeView.rootDirectory)
                 }
             }
         }

src/gui/colors.rs

@@ -36,7 +36,6 @@ pub mod qobject {
         #[qproperty(QColor, explorer_background)]
         #[qproperty(QColor, explorer_folder)]
         #[qproperty(QColor, explorer_folder_open)]
-        #[qproperty(QColor, terminal_background)]
         type RustColors = super::RustColorsImpl;
     }
 }
@@ -66,7 +65,6 @@ pub struct RustColorsImpl {
     explorer_background: QColor,
     explorer_folder: QColor,
     explorer_folder_open: QColor,
-    terminal_background: QColor,
 }
 
 impl Default for RustColorsImpl {
@@ -89,12 +87,11 @@ impl Default for RustColorsImpl {
             editor_highlight: QColor::try_from("#ccced3").unwrap(),
             gutter: QColor::try_from("#1e1f22").unwrap(),
             explorer_hovered: QColor::try_from("#4c5053").unwrap(),
-            explorer_text: QColor::try_from("#FFF").unwrap(),
+            explorer_text: QColor::try_from("#3b3b3b").unwrap(),
             explorer_text_selected: QColor::try_from("#262626").unwrap(),
             explorer_background: QColor::try_from("#1E1F22").unwrap(),
             explorer_folder: QColor::try_from("#54585b").unwrap(),
             explorer_folder_open: QColor::try_from("#2b2b2b").unwrap(),
-            terminal_background: QColor::try_from("#2C2E32").unwrap(),
         }
     }
 }

src/gui/filesystem.rs

@@ -2,19 +2,6 @@
 //
 // SPDX-License-Identifier: GNU General Public License v3.0 or later
 
-use cxx_qt_lib::{QModelIndex, QString};
-use dirs;
-use log::warn;
-use std::fs;
-use std::path::Path;
-use syntect::easy::HighlightLines;
-use syntect::highlighting::ThemeSet;
-use syntect::html::{
-    IncludeBackground, append_highlighted_html_for_styled_line, start_highlighted_html_snippet,
-};
-use syntect::parsing::SyntaxSet;
-use syntect::util::LinesWithEndings;
-
 #[cxx_qt::bridge]
 pub mod qobject {
     unsafe extern "C++" {
@@ -34,6 +21,7 @@ pub mod qobject {
         #[qml_element]
         #[qml_singleton]
         #[qproperty(QString, file_path, cxx_name = "filePath")]
+        #[qproperty(QModelIndex, root_index, cxx_name = "rootIndex")]
         type FileSystem = super::FileSystemImpl;
 
         #[inherit]
@@ -55,9 +43,22 @@ pub mod qobject {
     }
 }
 
-// TODO: Implement a provider for QFileSystemModel::setIconProvider for icons.
+use cxx_qt_lib::{QModelIndex, QString};
+use dirs;
+use log::warn;
+use std::fs;
+use std::io::BufRead;
+use syntect::easy::HighlightFile;
+use syntect::highlighting::ThemeSet;
+use syntect::html::{
+    IncludeBackground, append_highlighted_html_for_styled_line, start_highlighted_html_snippet,
+};
+use syntect::parsing::SyntaxSet;
+
+// TODO: Impleent a provider for QFileSystemModel::setIconProvider for icons.
 pub struct FileSystemImpl {
     file_path: QString,
+    root_index: QModelIndex,
 }
 
 // Default is explicit to make the editor open this source file initially.
@@ -65,6 +66,7 @@ impl Default for FileSystemImpl {
     fn default() -> Self {
         Self {
             file_path: QString::from(file!()),
+            root_index: Default::default(),
         }
     }
 }
@@ -74,46 +76,42 @@ impl qobject::FileSystem {
         if path.is_empty() {
             return QString::default();
         }
-        let meta = fs::metadata(path.to_string())
+        if !fs::metadata(path.to_string())
-            .expect(format!("Failed to get file metadata {path:?}").as_str());
+            .expect(format!("Failed to get file metadata {path:?}").as_str())
-        if !meta.is_file() {
+            .is_file()
+        {
             warn!(target:"FileSystem", "Attempted to open file {path:?} that is not a valid file");
             return QString::default();
         }
-        let path_str = path.to_string();
+        let ss = SyntaxSet::load_defaults_nonewlines();
-        if let Ok(lines) = fs::read_to_string(path_str.as_str()) {
+        let ts = ThemeSet::load_defaults();
-            let ss = SyntaxSet::load_defaults_nonewlines();
+        let theme = &ts.themes["base16-ocean.dark"];
-            let ts = ThemeSet::load_defaults();
-            let theme = &ts.themes["base16-ocean.dark"];
-            let lang = ss
-                .find_syntax_by_extension(
-                    Path::new(path_str.as_str())
-                        .extension()
-                        .map(|s| s.to_str())
-                        .unwrap_or_else(|| Some("md"))
-                        .expect("Failed to get file extension"),
-                )
-                .unwrap_or_else(|| ss.find_syntax_plain_text());
-            let mut highlighter = HighlightLines::new(lang, theme);
-            let (mut output, _bg) = start_highlighted_html_snippet(theme);
-            for line in LinesWithEndings::from(lines.as_str()) {
-                let regions = highlighter
-                    .highlight_line(line, &ss)
-                    .expect("Failed to highlight");
 
-                append_highlighted_html_for_styled_line(
+        let mut highlighter =
-                    &regions[..],
+            HighlightFile::new(path.to_string(), &ss, theme).expect("Failed to create highlighter");
-                    IncludeBackground::Yes,
+        let (mut output, _bg) = start_highlighted_html_snippet(theme);
-                    &mut output,
+        let mut line = String::new();
-                )
+        while highlighter
-                .expect("Failed to insert highlighted html");
+            .reader
-            }
+            .read_line(&mut line)
+            .expect("Failed to read file.")
+            > 0
+        {
+            let regions = highlighter
+                .highlight_lines
+                .highlight_line(&line, &ss)
+                .expect("Failed to highlight");
 
-            output.push_str("</pre>\n");
+            append_highlighted_html_for_styled_line(
-            QString::from(output)
+                &regions[..],
-        } else {
+                IncludeBackground::Yes,
-            return QString::default();
+                &mut output,
+            )
+            .expect("Failed to insert highlighted html");
+            line.clear();
         }
+        output.push_str("</pre>\n");
+        QString::from(output)
     }
 
     // There will never be more than one column.
@@ -130,13 +128,14 @@ impl qobject::FileSystem {
             self.set_root_path(path)
         } else {
             // If the initial directory can't be opened, attempt to find the home directory.
-            let homedir = dirs::home_dir()
+            self.set_root_path(&QString::from(
-                .expect("Failed to get home directory")
+                dirs::home_dir()
-                .as_path()
+                    .expect("Failed to get home directory")
-                .to_str()
+                    .as_path()
-                .unwrap()
+                    .to_str()
-                .to_string();
+                    .unwrap()
-            self.set_root_path(&QString::from(homedir))
+                    .to_string(),
+            ))
         }
     }
 }