Compare commits

...

17 Commits

Author SHA1 Message Date
Nefo Fortressia 60fc36c852
chore: migrate issue and PR templates to Gitea format
Also add metadata to the issues and the PR template.

GitLab doesn't use file-based configuration for the PR template,
so the template is added here.

See https://docs.gitea.io/en-us/issue-pull-request-templates/
2021-12-28 10:31:15 +07:00
Nefo Fortressia 4a152416ff
feat: implement creating a new file
Merge branch 'feat/new-file' from
https://gitea.treehouse.systems/fortressia/echidna.git

See #20
2021-12-28 08:59:21 +07:00
Nefo Fortressia 319bc3914b
Merge branch 'main' into feat/new-file 2021-12-28 08:55:01 +07:00
Nefo Fortressia e077e690f2
fix: panic! expecting &str in editor/mod.rs
In Rust 2021, panic! automatically formats the message.
Because of this, the panic! macro complained about the argument not being &str
as format! returns a String instead.
2021-12-28 08:37:09 +07:00
Nefo Fortressia c6da158bb6
feat: implement saving file normally
Merge branch 'feat/save' of https://gitea.treehouse.systems/fortressia/echidna

See #21
2021-12-27 21:03:08 +07:00
Nefo Fortressia f785463540
refactor: refactor things with Clippy's help
Merge branch 'refactor/clippy' of https://gitea.treehouse.systems/fortressia/echidna

See #23
2021-12-27 20:59:09 +07:00
Nefo Fortressia fa128ca284
feat: enable GtkSourceView line numbers and line marks
Merge branch 'feat/editor-gutter' of https://gitea.treehouse.systems/fortressia/echidna

See: #22
2021-12-27 20:50:25 +07:00
Nefo Fortressia e0d353a10b
refactor: remove double pointer in setting a file's tab title
This is because the file name is an &OsStr converted to &str and thus already a pointer.
2021-12-18 17:34:27 +07:00
Nefo Fortressia b53915afa0
refactor: set unused parameters in TabLabel as unused 2021-12-18 17:30:28 +07:00
Nefo Fortressia 9b99932fdd
refactor: use match when processing EchidnaCoreEditor's initial file
Just like in 8e31be7.
2021-12-18 17:29:39 +07:00
Nefo Fortressia 8e31be7e47
refactor: don't unwrap tab label' childs and use match when prepending it
If statements are for booleans, matches are intended for Options like these.

See: https://rust-lang.github.io/rust-clippy/master/index.html#unnecessary_unwrap
2021-12-18 17:21:50 +07:00
Nefo Fortressia c8fd305d90
refactor: removed unused imports in closeable_tab.rs 2021-12-18 17:17:53 +07:00
Nefo Fortressia 10ae0cf783
feat: implement Default for EchidnaSidebar
EchidnaSidebar doesn't take any parameters, thus allowing Default to be easily implemented on it.
2021-12-18 17:17:15 +07:00
Nefo Fortressia 9e06e96fed
chore: remove clippy.toml
Clippy categories can only be configured trough parameters and clippy macros.

They can't be configured in config files.
2021-12-18 17:16:16 +07:00
Nefo Fortressia c3a0e5dcee
feat: enable GtkSourceView line numbers and line marks
See https://gitlab.com/EchidnaHQ/Echidna/-/issues/25
2021-12-17 09:22:57 +07:00
Nefo Fortressia 87fdfc8d9c
feat: implement win.new-file action 2021-11-14 10:29:51 +07:00
Nefo Fortressia 0bd8b34cfe
Merge branch 'refactor/exports' into feat/new-file 2021-11-14 10:05:59 +07:00
12 changed files with 112 additions and 45 deletions

View File

@ -0,0 +1,15 @@
# Description
Please write down a clear and concise description of this Merge Request.
# Closes
Please write down the issues that this MR closes.
# Implementation Insight
Please write down how did you implement this in a clear and concise manner.
# TO-DOs
A list of TO-DOs of things you have did before the MR is undrafted.

View File

@ -1,3 +1,15 @@
---
name: Bug Report
about: Report a bug affecting Echidna Code Editor
title: bug:
ref: main
labels:
- bug
- help needed
---
## Description
Please write a clear and concise description of the issue you are getting.

View File

@ -1,3 +1,15 @@
---
name: Feature Request
about: Request a new feature or support that can be implemented into Echidna.
title: "feat: "
ref: main
labels:
- enhancement
---
## Description
Please write a clear and concise description of the issue you are getting.

View File

@ -1 +0,0 @@
"clippy::style" = "deny"

View File

@ -15,10 +15,11 @@
<object class="GtkSourceView" id="sourceview">
<property name="vexpand">1</property>
<property name="hexpand">1</property>
<property name="show-line-numbers">1</property>
<property name="show-line-marks">1</property>
<property name="buffer">
<object class="GtkSourceBuffer"></object>
</property>
</object>
</child>
</object>

View File

@ -24,47 +24,47 @@ impl EchidnaCoreEditor {
// Without cloning it, for some reasons the Rust compiler complains about &this.to_imp().sourceview not being IsA<sourceview::View>
this_imp.minimap.set_view(&this_imp.sourceview.clone());
if file.is_some() {
let file = file.unwrap();
let file_location = file
.location()
.expect("file is required to have a location");
match file {
Some(file) => {
let file_location = file
.location()
.expect("file is required to have a location");
this.set_property("file", &file)
.expect("Could not set the 'file' property of EchidnaCoreEditor");
this.set_property("file", &file)
.expect("Could not set the 'file' property of EchidnaCoreEditor");
let cancellable = gio::Cancellable::new();
let filepath = file_location.path().expect("No filepath");
let info = file_location
.query_info("*", gio::FileQueryInfoFlags::NONE, Some(&cancellable))
.expect("Could not query the info for file");
let cancellable = gio::Cancellable::new();
let filepath = file_location.path().expect("No filepath");
let info = file_location
.query_info("*", gio::FileQueryInfoFlags::NONE, Some(&cancellable))
.expect("Could not query the info for file");
let content_type = info
.content_type()
.expect(format!("It does not seem like {:?} has a type", filepath).as_str());
{
println!(
"Opened {} and found its content type is {}.",
"file",
content_type.to_string()
);
let buffer = this_imp.sourceview.buffer().downcast::<Buffer>().expect("Cannot downcast the sourceview's buffer. Maybe the sourceview's buffer is not IsA<sourceview::Buffer>.");
let language_manager = LanguageManager::new();
let language = language_manager.guess_language(
Some(&info.name().to_str().expect(
"Could not open the file because its name is not supported by Unicode.",
)),
None,
);
let content_type = info
.content_type()
.expect(format!("It does not seem like {:?} has a type", filepath).as_str());
{
println!(
"Opened {} and found its content type is {}.",
"file",
content_type.to_string()
);
let buffer = this_imp.sourceview.buffer().downcast::<Buffer>().expect("Cannot downcast the sourceview's buffer. Maybe the sourceview's buffer is not IsA<sourceview::Buffer>.");
let language_manager = LanguageManager::new();
let language = language_manager.guess_language(
Some(&info.name().to_str().expect(
"Could not open the file because its name is not supported by Unicode.",
)),
None,
);
match language {
Some(lang) => buffer.set_language(Some(&lang)),
None => {}
}
match language {
Some(lang) => buffer.set_language(Some(&lang)),
None => {}
}
let file_loader: FileLoader = FileLoader::new(&buffer, &file);
let file_loader: FileLoader = FileLoader::new(&buffer, &file);
file_loader.load_async(
file_loader.load_async(
glib::Priority::default(),
Some(&cancellable),
|_, _| {},
@ -74,7 +74,9 @@ impl EchidnaCoreEditor {
}
},
);
}
}
None => {}
}
this
}
@ -118,10 +120,10 @@ impl EchidnaCoreEditor {
|_, _| {},
|result| {
if result.is_err() {
panic!(format!(
panic!(
"Found an error while saving the file:\n{}",
result.err().expect("No error")
))
)
}
},
);

View File

@ -15,3 +15,9 @@ impl EchidnaSidebar {
glib::Object::new(&[]).expect("Failed to create 'EchidnaSidebar' component.")
}
}
impl Default for EchidnaSidebar {
fn default() -> Self {
Self::new()
}
}

View File

@ -36,9 +36,9 @@ impl BuildableImpl for TabLabel {
fn add_child(
&self,
buildable: &Self::Type,
builder: &gtk::Builder,
_builder: &gtk::Builder,
child: &glib::Object,
type_: Option<&str>,
_type_: Option<&str>,
) {
buildable.prepend(child.downcast_ref::<gtk::Widget>().unwrap());
}

View File

@ -17,8 +17,9 @@ impl TabLabel {
pub fn new<U: IsA<gtk::Widget>>(tab_label: Option<&U>) -> Self {
let this: Self = glib::Object::new(&[]).expect("Failed to create 'TabLabel' component.");
if tab_label.is_some() {
this.prepend(tab_label.unwrap());
match tab_label {
Some(tab_label) => this.prepend(tab_label),
None => {}
}
this
}

View File

@ -14,6 +14,7 @@ pub trait FileImplementedEditor {
fn action_open_file(&self);
fn open_file(notebook: &gtk::Notebook, file: gio::File);
fn action_save_file_as(&self);
fn action_new_file(&self);
fn action_save_file(&self);
}
@ -66,7 +67,7 @@ impl FileImplementedEditor for super::EchidnaWindow {
notebook.prepend_closable_page(
&editor_page,
Some(&Label::new(Some(
&file_location
file_location
.path()
.expect("The file's path is missing")
.file_name()
@ -102,6 +103,14 @@ impl FileImplementedEditor for super::EchidnaWindow {
}));
}
fn action_new_file(&self) {
let editor_page = EchidnaCoreEditor::new(None);
self.to_imp()
.notebook
.prepend_closable_page(&editor_page, Some(&gtk::Label::new(Some(&"Untitled"))));
}
fn action_save_file(&self) {
let page: EchidnaCoreEditor = self
.get_current_tab()

View File

@ -122,6 +122,16 @@ impl MenubarImplementedEditor for EchidnaWindow {
window.action_save_file_as();
}));
}
{
let action_new_file = SimpleAction::new("new-file", None);
self.add_action(&action_new_file);
action_new_file.connect_activate(clone!(@weak self as window =>
move |_action, _variant| {
window.action_new_file();
}));
}
{
let action_save = SimpleAction::new("save", None);

View File

@ -4,7 +4,7 @@
use crate::components::tab_label::TabLabel;
use glib::IsA;
use gtk::{prelude::*, Box, Button, Widget};
use gtk::{prelude::*, Widget};
pub trait ClosableTabImplementedNotebook {
fn prepend_closable_page<T: IsA<Widget>, U: IsA<Widget>>(