fortressia
/
echidna
1
1
Fork 0
Code Issues 15 Pull Requests 2 Projects Releases Wiki Activity

refactor: split action declarations into separate brackets 

Add more readability to the code.
merge-requests/8/head
Nefo Fortressia 2021-10-31 15:33:45 +07:00
parent 5945c06ed8
commit 1296157638
1 changed files with 69 additions and 60 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

129
src/components/window/menubar.rs
View File

@ -18,89 +18,98 @@ impl MenubarImplementedEditor for EchidnaWindow {
let app = self let app = self
.application() .application()
.expect("self does not have an application set."); .expect("self does not have an application set.");
let menubuilder = gtk::Builder::from_string(include_str!("../../../ui/menu.ui")); let menubuilder = gtk::Builder::from_string(include_str!("./menu.ui"));
let menubar: MenuModel = menubuilder let menubar: MenuModel = menubuilder
.object("menu") .object("menu")
.expect("Could not get object 'menu' from builder."); .expect("Could not get object 'menu' from builder.");
app.set_menubar(Some(&menubar)); app.set_menubar(Some(&menubar));
self.set_show_menubar(true); self.set_show_menubar(true);
let act_exit: SimpleAction = SimpleAction::new("exit", None);
app.add_action(&act_exit);
act_exit.connect_activate(clone!(@weak app => {
move |_action, _value| { let act_exit: SimpleAction = SimpleAction::new("exit", None);
app.quit(); app.add_action(&act_exit);
}
));
let act_about: SimpleAction = SimpleAction::new("about", None); act_exit.connect_activate(clone!(@weak app =>
app.add_action(&act_about); move |_action, _value| {
act_about.connect_activate(|_action, _value| { app.quit();
let about_dialog: AboutDialog = AboutDialog::new(); }
));
}
{
let act_about: SimpleAction = SimpleAction::new("about", None);
app.add_action(&act_about);
act_about.connect_activate(|_action, _value| {
let about_dialog: AboutDialog = AboutDialog::new();
about_dialog.set_license_type(gtk::License::Mpl20); about_dialog.set_license_type(gtk::License::Mpl20);
about_dialog.set_program_name(Some("Echidna Code Editor")); about_dialog.set_program_name(Some("Echidna Code Editor"));
about_dialog.set_website(Some("https://gitlab.com/EchidnaHQ/Echidna")); about_dialog.set_website(Some("https://gitlab.com/EchidnaHQ/Echidna"));
about_dialog.set_authors(&["FortressValkriye"]); about_dialog.set_authors(&["FortressValkriye"]);
about_dialog.set_copyright(Some("Made with by ❤️ Echidna contributors")); about_dialog.set_copyright(Some("Made with by ❤️ Echidna contributors"));
about_dialog.set_visible(true); about_dialog.set_visible(true);
}); });
}
{
//app.notebook = Some(Rc::new(RefCell::new(notebook)));
let act_exit: SimpleAction = SimpleAction::new("exit", None);
app.add_action(&act_exit);
//app.notebook = Some(Rc::new(RefCell::new(notebook))); act_exit.connect_activate(clone!(@weak app =>
let act_exit: SimpleAction = SimpleAction::new("exit", None); move |_action, _value| {
app.add_action(&act_exit); app.quit();
}
));
}
{
let act_about: SimpleAction = SimpleAction::new("about", None);
app.add_action(&act_about);
act_about.connect_activate(|_action, _value| {
let about_dialog: AboutDialog = AboutDialog::new();
act_exit.connect_activate(clone!(@weak app => about_dialog.set_license_type(gtk::License::Mpl20);
move |_action, _value| { about_dialog.set_program_name(Some("Echidna Code Editor"));
app.quit(); about_dialog.set_website(Some("https://github.com/EchidnaHQ/Echidna"));
} about_dialog.set_authors(&["FortressValkriye"]);
)); about_dialog.set_copyright(Some("Made with by ❤️ Echidna contributors"));
about_dialog.set_visible(true);
});
}
{
let act_report_issue = SimpleAction::new("report-issue", None);
let act_about: SimpleAction = SimpleAction::new("about", None); app.add_action(&act_report_issue);
app.add_action(&act_about);
act_about.connect_activate(|_action, _value| {
let about_dialog: AboutDialog = AboutDialog::new();
about_dialog.set_license_type(gtk::License::Mpl20); act_report_issue.connect_activate(|_action, _variant| {
about_dialog.set_program_name(Some("Echidna Code Editor")); webbrowser::open("https://github.com/EchidnaHQ/Echidna/issues/new");
about_dialog.set_website(Some("https://github.com/EchidnaHQ/Echidna")); });
about_dialog.set_authors(&["FortressValkriye"]); }
about_dialog.set_copyright(Some("Made with by ❤️ Echidna contributors")); {
about_dialog.set_visible(true); let act_search_feature_requests = SimpleAction::new("search-feature-requests", None);
});
let act_report_issue = SimpleAction::new("report-issue", None); app.add_action(&act_search_feature_requests);
app.add_action(&act_report_issue); act_search_feature_requests.connect_activate(|_action, _variant| {
act_report_issue.connect_activate(|_action, _variant| {
webbrowser::open("https://github.com/EchidnaHQ/Echidna/issues/new");
});
let act_search_feature_requests = SimpleAction::new("search-feature-requests", None);
app.add_action(&act_search_feature_requests);
act_search_feature_requests.connect_activate(|_action, _variant| {
webbrowser::open("https://github.com/EchidnaHQ/Echidna/issues?q=is%3Aopen+is%3Aissue+label%3Aenhancement"); webbrowser::open("https://github.com/EchidnaHQ/Echidna/issues?q=is%3Aopen+is%3Aissue+label%3Aenhancement");
}); });
}
let act_window_close = SimpleAction::new("close", None);
self.add_action(&act_window_close);
{ {
let act_window_close = SimpleAction::new("close", None);
self.add_action(&act_window_close);
let window = self.clone(); let window = self.clone();
act_window_close.connect_activate(move |_action, _variant| { act_window_close.connect_activate(move |_action, _variant| {
window.close(); window.close();
}); });
} }
{
let action_open_file: SimpleAction = SimpleAction::new("open-file", None);
let action_open_file: SimpleAction = SimpleAction::new("open-file", None); self.add_action(&action_open_file);
action_open_file.connect_activate(clone!(@weak self as window =>
self.add_action(&action_open_file); move |_action, _variant| {
action_open_file.connect_activate(clone!(@weak self as window => window.action_open_file();
move |_action, _variant| { }));
window.action_open_file(); }
}));
} }
} }