shaunrd0/clide
1
0
Fork 0
Code Issues 7 Pull Requests 1 Actions Packages Projects Releases Wiki Activity

Compare commits

base: shaunrd0:75889f202309179c6892af5d78844e99d5ae7da9
Branches Tags
shaunrd0:main
shaunrd0:gui
shaunrd0:app-context
shaunrd0:master
shaunrd0:ui
shaunrd0:ui-pass-cwd
..
compare: shaunrd0:2340fd7652765d5844ee5bba1cb3e86e1cf6b708
Branches Tags
shaunrd0:gui
shaunrd0:main
shaunrd0:app-context
shaunrd0:master
shaunrd0:ui
shaunrd0:ui-pass-cwd

No commits in common. "75889f202309179c6892af5d78844e99d5ae7da9" and "2340fd7652765d5844ee5bba1cb3e86e1cf6b708" have entirely different histories.
75889f2023 ... 2340fd7652

19 changed files with 15 additions and 169 deletions
Show Stats Expand all files Collapse all files

4
qml/ClideAboutWindow.qml
View File

@ -1,6 +1,4 @@
// SPDX-FileCopyrightText: 2026, Shaun Reed <shaunrd0@gmail.com>
//
// SPDX-License-Identifier: GNU General Public License v3.0 or later
// TODO: Header
import QtQuick
import QtQuick.Controls.Basic

4
qml/ClideEditor.qml
View File

@ -1,7 +1,3 @@
// SPDX-FileCopyrightText: 2026, Shaun Reed <shaunrd0@gmail.com>
//
// SPDX-License-Identifier: GNU General Public License v3.0 or later
import QtQuick
import QtQuick.Controls
import QtQuick.Layouts

4
qml/ClideMenuBar.qml
View File

@ -1,7 +1,3 @@
// SPDX-FileCopyrightText: 2026, Shaun Reed <shaunrd0@gmail.com>
//
// SPDX-License-Identifier: GNU General Public License v3.0 or later
import QtQuick
import QtQuick.Controls

4
qml/ClideProjectView.qml
View File

@ -1,7 +1,3 @@
// SPDX-FileCopyrightText: 2026, Shaun Reed <shaunrd0@gmail.com>
//
// SPDX-License-Identifier: GNU General Public License v3.0 or later
import QtQuick
import QtQuick.Controls
import QtQuick.Layouts

7
qml/ClideTreeView.qml
View File

@ -1,7 +1,3 @@
// SPDX-FileCopyrightText: 2026, Shaun Reed <shaunrd0@gmail.com>
//
// SPDX-License-Identifier: GNU General Public License v3.0 or later
import QtQuick
import QtQuick.Controls
import QtQuick.Layouts
@ -16,14 +12,13 @@ Rectangle {
signal fileClicked(string filePath)
// https://doc.qt.io/qt-6/qml-qtquick-treeview.html
TreeView {
id: fileSystemTreeView
anchors.margins: 15
property int lastIndex: -1
model: FileSystemSortProxyModel
model: FileSystem
anchors.fill: parent
boundsBehavior: Flickable.StopAtBounds
boundsMovement: Flickable.StopAtBounds

4
qml/main.qml
View File

@ -1,7 +1,3 @@
// SPDX-FileCopyrightText: 2026, Shaun Reed <shaunrd0@gmail.com>
//
// SPDX-License-Identifier: GNU General Public License v3.0 or later
import QtQuick
import QtQuick.Controls
import QtQuick.Layouts

4
src/gui.rs
View File

@ -1,7 +1,3 @@
// SPDX-FileCopyrightText: 2026, Shaun Reed <shaunrd0@gmail.com>
//
// SPDX-License-Identifier: GNU General Public License v3.0 or later
use crate::AppContext;
use anyhow::Result;
use cxx_qt_lib::{QMapPair, QMapPair_QString_QVariant, QString, QVariant};

5
src/gui/colors.rs
View File

@ -1,9 +1,4 @@
// SPDX-FileCopyrightText: 2026, Shaun Reed <shaunrd0@gmail.com>
//
// SPDX-License-Identifier: GNU General Public License v3.0 or later
#[cxx_qt::bridge]
pub mod qobject {
unsafe extern "C++" {
include!("cxx-qt-lib/qcolor.h");

108
src/gui/filesystem.rs
View File

@ -1,47 +1,17 @@
// SPDX-FileCopyrightText: 2026, Shaun Reed <shaunrd0@gmail.com>
//
// SPDX-License-Identifier: GNU General Public License v3.0 or later
use crate::gui::filesystem::qobject::{QAbstractItemModel};
use cxx_qt_lib::{QModelIndex, QString};
use dirs;
use log::warn;
use std::io::BufRead;
use std::{fs};
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;
#[cxx_qt::bridge]
pub mod qobject {
// Import Qt Types from C++
unsafe extern "C++" {
// Import Qt Types from C++
include!("cxx-qt-lib/qstring.h");
type QString = cxx_qt_lib::QString;
include!("cxx-qt-lib/qmodelindex.h");
type QModelIndex = cxx_qt_lib::QModelIndex;
include!(<QtGui/QFileSystemModel>);
type QFileSystemModel;
include!(<QSortFilterProxyModel>);
type QSortFilterProxyModel;
include!(<QAbstractItemModel>);
type QAbstractItemModel;
}
// Export QML classes from Rust
unsafe extern "RustQt" {
#[qobject]
#[qml_element]
#[base = QSortFilterProxyModel]
#[qproperty(*mut FileSystem, inner)]
type FileSystemSortProxyModel = super::FileSystemSortProxyModelImpl;
// Export QML Types from Rust
#[qobject]
#[base = QFileSystemModel]
#[qml_element]
@ -49,40 +19,6 @@ pub mod qobject {
#[qproperty(QString, file_path, cxx_name = "filePath")]
#[qproperty(QModelIndex, root_index, cxx_name = "rootIndex")]
type FileSystem = super::FileSystemImpl;
}
// Export QSortFilterProxyModel functions from Rust
// https://doc.qt.io/qt-6/qsortfilterproxymodel.html
unsafe extern "RustQt" {
#[inherit]
#[cxx_name = "setSourceModel"]
unsafe fn set_source_model(
self: Pin<&mut FileSystemSortProxyModel>,
source: *mut QAbstractItemModel,
);
#[cxx_override]
#[cxx_name = "filterAcceptsRow"]
const fn filter_accepts_row(
self: &FileSystemSortProxyModel,
source_row: i32,
source_parent: &QModelIndex,
) -> bool;
}
// Custom initialization logic.
impl cxx_qt::Initialize for FileSystemSortProxyModel {}
// Export QFileSystemModel functions from Rust
// https://doc.qt.io/qt-6/qfilesystemmodel.html
unsafe extern "RustQt" {
#[inherit]
fn index(
self: Pin<&mut FileSystem>,
row: i32,
col: i32,
parent: &QModelIndex,
) -> QModelIndex;
#[inherit]
#[cxx_name = "setRootPath"]
@ -103,35 +39,17 @@ pub mod qobject {
}
}
pub struct FileSystemSortProxyModelImpl {
inner: *mut qobject::FileSystem,
}
impl Default for FileSystemSortProxyModelImpl {
fn default() -> Self {
let model = Self {
inner: std::ptr::null_mut(),
};
model
}
}
impl qobject::FileSystemSortProxyModel {
pub const fn filter_accepts_row(&self, _source_row: i32, _source_parent: &QModelIndex) -> bool {
true
}
}
impl cxx_qt::Initialize for qobject::FileSystemSortProxyModel {
fn initialize(self: core::pin::Pin<&mut Self>) {
let mut fs = FileSystemImpl::default();
unsafe {
let model: *mut FileSystemImpl = std::ptr::from_mut(&mut fs);
let m: *mut QAbstractItemModel = model as *mut QAbstractItemModel;
self.set_source_model(m);
}
}
}
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 {

4
src/main.rs
View File

@ -1,7 +1,3 @@
// SPDX-FileCopyrightText: 2026, Shaun Reed <shaunrd0@gmail.com>
//
// SPDX-License-Identifier: GNU General Public License v3.0 or later
use anyhow::{Context, Result, anyhow};
use clap::Parser;
use log::{info, trace};

4
src/tui.rs
View File

@ -1,7 +1,3 @@
// SPDX-FileCopyrightText: 2026, Shaun Reed <shaunrd0@gmail.com>
//
// SPDX-License-Identifier: GNU General Public License v3.0 or later
mod about;
mod app;
mod component;

4
src/tui/about.rs
View File

@ -1,7 +1,3 @@
// SPDX-FileCopyrightText: 2026, Shaun Reed <shaunrd0@gmail.com>
//
// SPDX-License-Identifier: GNU General Public License v3.0 or later
use ratatui::buffer::Buffer;
use ratatui::layout::{Constraint, Direction, Layout, Rect};
use ratatui::text::{Line, Span};

4
src/tui/app.rs
View File

@ -1,7 +1,3 @@
// SPDX-FileCopyrightText: 2026, Shaun Reed <shaunrd0@gmail.com>
//
// SPDX-License-Identifier: GNU General Public License v3.0 or later
use crate::tui::about::About;
use crate::tui::app::AppComponent::{AppEditor, AppExplorer, AppLogger};
use crate::tui::component::{Action, Component, Focus, FocusState, Visibility, VisibleState};

4
src/tui/component.rs
View File

@ -1,7 +1,3 @@
// SPDX-FileCopyrightText: 2026, Shaun Reed <shaunrd0@gmail.com>
//
// SPDX-License-Identifier: GNU General Public License v3.0 or later
#![allow(dead_code, unused_variables)]
use crate::tui::component::Focus::Inactive;

4
src/tui/editor.rs
View File

@ -1,7 +1,3 @@
// SPDX-FileCopyrightText: 2026, Shaun Reed <shaunrd0@gmail.com>
//
// SPDX-License-Identifier: GNU General Public License v3.0 or later
use crate::tui::component::{Action, Component, ComponentState, Focus, FocusState};
use anyhow::{Context, Result, bail};
use edtui::{

4
src/tui/editor_tab.rs
View File

@ -1,7 +1,3 @@
// SPDX-FileCopyrightText: 2026, Shaun Reed <shaunrd0@gmail.com>
//
// SPDX-License-Identifier: GNU General Public License v3.0 or later
use crate::tui::component::{Action, Component, Focus, FocusState};
use crate::tui::editor::Editor;
use anyhow::{Context, Result, anyhow};

4
src/tui/explorer.rs
View File

@ -1,7 +1,3 @@
// SPDX-FileCopyrightText: 2026, Shaun Reed <shaunrd0@gmail.com>
//
// SPDX-License-Identifier: GNU General Public License v3.0 or later
use crate::tui::component::{Action, Component, ComponentState, Focus, FocusState};
use anyhow::{Context, Result, bail};
use log::trace;

4
src/tui/logger.rs
View File

@ -1,7 +1,3 @@
// SPDX-FileCopyrightText: 2026, Shaun Reed <shaunrd0@gmail.com>
//
// SPDX-License-Identifier: GNU General Public License v3.0 or later
use crate::tui::component::{Action, Component, ComponentState, Focus, FocusState};
use log::{LevelFilter, trace};
use ratatui::buffer::Buffer;

4
src/tui/menu_bar.rs
View File

@ -1,7 +1,3 @@
// SPDX-FileCopyrightText: 2026, Shaun Reed <shaunrd0@gmail.com>
//
// SPDX-License-Identifier: GNU General Public License v3.0 or later
use crate::tui::component::{Action, Component, ComponentState, FocusState};
use crate::tui::menu_bar::MenuBarItemOption::{
About, CloseTab, Exit, Reload, Save, ShowHideExplorer, ShowHideLogger,