Compare commits
17 Commits
Author | SHA1 | Date |
---|---|---|
|
60fc36c852 | |
|
4a152416ff | |
|
319bc3914b | |
|
e077e690f2 | |
|
c6da158bb6 | |
|
f785463540 | |
|
fa128ca284 | |
|
e0d353a10b | |
|
b53915afa0 | |
|
9b99932fdd | |
|
8e31be7e47 | |
|
c8fd305d90 | |
|
10ae0cf783 | |
|
9e06e96fed | |
|
c3a0e5dcee | |
|
87fdfc8d9c | |
|
0bd8b34cfe |
|
@ -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.
|
|
@ -1,3 +1,15 @@
|
||||||
|
---
|
||||||
|
|
||||||
|
name: Bug Report
|
||||||
|
about: Report a bug affecting Echidna Code Editor
|
||||||
|
title: bug:
|
||||||
|
ref: main
|
||||||
|
labels:
|
||||||
|
|
||||||
|
- bug
|
||||||
|
- help needed
|
||||||
|
---
|
||||||
|
|
||||||
## Description
|
## Description
|
||||||
|
|
||||||
Please write a clear and concise description of the issue you are getting.
|
Please write a clear and concise description of the issue you are getting.
|
|
@ -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
|
## Description
|
||||||
|
|
||||||
Please write a clear and concise description of the issue you are getting.
|
Please write a clear and concise description of the issue you are getting.
|
|
@ -1 +0,0 @@
|
||||||
"clippy::style" = "deny"
|
|
|
@ -15,10 +15,11 @@
|
||||||
<object class="GtkSourceView" id="sourceview">
|
<object class="GtkSourceView" id="sourceview">
|
||||||
<property name="vexpand">1</property>
|
<property name="vexpand">1</property>
|
||||||
<property name="hexpand">1</property>
|
<property name="hexpand">1</property>
|
||||||
|
<property name="show-line-numbers">1</property>
|
||||||
|
<property name="show-line-marks">1</property>
|
||||||
<property name="buffer">
|
<property name="buffer">
|
||||||
<object class="GtkSourceBuffer"></object>
|
<object class="GtkSourceBuffer"></object>
|
||||||
</property>
|
</property>
|
||||||
|
|
||||||
</object>
|
</object>
|
||||||
</child>
|
</child>
|
||||||
</object>
|
</object>
|
||||||
|
|
|
@ -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>
|
// 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());
|
this_imp.minimap.set_view(&this_imp.sourceview.clone());
|
||||||
|
|
||||||
if file.is_some() {
|
match file {
|
||||||
let file = file.unwrap();
|
Some(file) => {
|
||||||
let file_location = file
|
let file_location = file
|
||||||
.location()
|
.location()
|
||||||
.expect("file is required to have a location");
|
.expect("file is required to have a location");
|
||||||
|
|
||||||
this.set_property("file", &file)
|
this.set_property("file", &file)
|
||||||
.expect("Could not set the 'file' property of EchidnaCoreEditor");
|
.expect("Could not set the 'file' property of EchidnaCoreEditor");
|
||||||
|
|
||||||
let cancellable = gio::Cancellable::new();
|
let cancellable = gio::Cancellable::new();
|
||||||
let filepath = file_location.path().expect("No filepath");
|
let filepath = file_location.path().expect("No filepath");
|
||||||
let info = file_location
|
let info = file_location
|
||||||
.query_info("*", gio::FileQueryInfoFlags::NONE, Some(&cancellable))
|
.query_info("*", gio::FileQueryInfoFlags::NONE, Some(&cancellable))
|
||||||
.expect("Could not query the info for file");
|
.expect("Could not query the info for file");
|
||||||
|
|
||||||
let content_type = info
|
let content_type = info
|
||||||
.content_type()
|
.content_type()
|
||||||
.expect(format!("It does not seem like {:?} has a type", filepath).as_str());
|
.expect(format!("It does not seem like {:?} has a type", filepath).as_str());
|
||||||
{
|
{
|
||||||
println!(
|
println!(
|
||||||
"Opened {} and found its content type is {}.",
|
"Opened {} and found its content type is {}.",
|
||||||
"file",
|
"file",
|
||||||
content_type.to_string()
|
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 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_manager = LanguageManager::new();
|
||||||
let language = language_manager.guess_language(
|
let language = language_manager.guess_language(
|
||||||
Some(&info.name().to_str().expect(
|
Some(&info.name().to_str().expect(
|
||||||
"Could not open the file because its name is not supported by Unicode.",
|
"Could not open the file because its name is not supported by Unicode.",
|
||||||
)),
|
)),
|
||||||
None,
|
None,
|
||||||
);
|
);
|
||||||
|
|
||||||
match language {
|
match language {
|
||||||
Some(lang) => buffer.set_language(Some(&lang)),
|
Some(lang) => buffer.set_language(Some(&lang)),
|
||||||
None => {}
|
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(),
|
glib::Priority::default(),
|
||||||
Some(&cancellable),
|
Some(&cancellable),
|
||||||
|_, _| {},
|
|_, _| {},
|
||||||
|
@ -74,7 +74,9 @@ impl EchidnaCoreEditor {
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
);
|
);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
None => {}
|
||||||
}
|
}
|
||||||
this
|
this
|
||||||
}
|
}
|
||||||
|
@ -118,10 +120,10 @@ impl EchidnaCoreEditor {
|
||||||
|_, _| {},
|
|_, _| {},
|
||||||
|result| {
|
|result| {
|
||||||
if result.is_err() {
|
if result.is_err() {
|
||||||
panic!(format!(
|
panic!(
|
||||||
"Found an error while saving the file:\n{}",
|
"Found an error while saving the file:\n{}",
|
||||||
result.err().expect("No error")
|
result.err().expect("No error")
|
||||||
))
|
)
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
);
|
);
|
||||||
|
|
|
@ -15,3 +15,9 @@ impl EchidnaSidebar {
|
||||||
glib::Object::new(&[]).expect("Failed to create 'EchidnaSidebar' component.")
|
glib::Object::new(&[]).expect("Failed to create 'EchidnaSidebar' component.")
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
impl Default for EchidnaSidebar {
|
||||||
|
fn default() -> Self {
|
||||||
|
Self::new()
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
|
@ -36,9 +36,9 @@ impl BuildableImpl for TabLabel {
|
||||||
fn add_child(
|
fn add_child(
|
||||||
&self,
|
&self,
|
||||||
buildable: &Self::Type,
|
buildable: &Self::Type,
|
||||||
builder: >k::Builder,
|
_builder: >k::Builder,
|
||||||
child: &glib::Object,
|
child: &glib::Object,
|
||||||
type_: Option<&str>,
|
_type_: Option<&str>,
|
||||||
) {
|
) {
|
||||||
buildable.prepend(child.downcast_ref::<gtk::Widget>().unwrap());
|
buildable.prepend(child.downcast_ref::<gtk::Widget>().unwrap());
|
||||||
}
|
}
|
||||||
|
|
|
@ -17,8 +17,9 @@ impl TabLabel {
|
||||||
pub fn new<U: IsA<gtk::Widget>>(tab_label: Option<&U>) -> Self {
|
pub fn new<U: IsA<gtk::Widget>>(tab_label: Option<&U>) -> Self {
|
||||||
let this: Self = glib::Object::new(&[]).expect("Failed to create 'TabLabel' component.");
|
let this: Self = glib::Object::new(&[]).expect("Failed to create 'TabLabel' component.");
|
||||||
|
|
||||||
if tab_label.is_some() {
|
match tab_label {
|
||||||
this.prepend(tab_label.unwrap());
|
Some(tab_label) => this.prepend(tab_label),
|
||||||
|
None => {}
|
||||||
}
|
}
|
||||||
this
|
this
|
||||||
}
|
}
|
||||||
|
|
|
@ -14,6 +14,7 @@ pub trait FileImplementedEditor {
|
||||||
fn action_open_file(&self);
|
fn action_open_file(&self);
|
||||||
fn open_file(notebook: >k::Notebook, file: gio::File);
|
fn open_file(notebook: >k::Notebook, file: gio::File);
|
||||||
fn action_save_file_as(&self);
|
fn action_save_file_as(&self);
|
||||||
|
fn action_new_file(&self);
|
||||||
fn action_save_file(&self);
|
fn action_save_file(&self);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -66,7 +67,7 @@ impl FileImplementedEditor for super::EchidnaWindow {
|
||||||
notebook.prepend_closable_page(
|
notebook.prepend_closable_page(
|
||||||
&editor_page,
|
&editor_page,
|
||||||
Some(&Label::new(Some(
|
Some(&Label::new(Some(
|
||||||
&file_location
|
file_location
|
||||||
.path()
|
.path()
|
||||||
.expect("The file's path is missing")
|
.expect("The file's path is missing")
|
||||||
.file_name()
|
.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(>k::Label::new(Some(&"Untitled"))));
|
||||||
|
}
|
||||||
|
|
||||||
fn action_save_file(&self) {
|
fn action_save_file(&self) {
|
||||||
let page: EchidnaCoreEditor = self
|
let page: EchidnaCoreEditor = self
|
||||||
.get_current_tab()
|
.get_current_tab()
|
||||||
|
|
|
@ -122,6 +122,16 @@ impl MenubarImplementedEditor for EchidnaWindow {
|
||||||
window.action_save_file_as();
|
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);
|
let action_save = SimpleAction::new("save", None);
|
||||||
|
|
||||||
|
|
|
@ -4,7 +4,7 @@
|
||||||
|
|
||||||
use crate::components::tab_label::TabLabel;
|
use crate::components::tab_label::TabLabel;
|
||||||
use glib::IsA;
|
use glib::IsA;
|
||||||
use gtk::{prelude::*, Box, Button, Widget};
|
use gtk::{prelude::*, Widget};
|
||||||
|
|
||||||
pub trait ClosableTabImplementedNotebook {
|
pub trait ClosableTabImplementedNotebook {
|
||||||
fn prepend_closable_page<T: IsA<Widget>, U: IsA<Widget>>(
|
fn prepend_closable_page<T: IsA<Widget>, U: IsA<Widget>>(
|
||||||
|
|
Loading…
Reference in New Issue