From c3e76bccb24427db15499beaa84d6864f4c1b0e6 Mon Sep 17 00:00:00 2001 From: Nefomemes Date: Fri, 22 Oct 2021 10:13:14 +0700 Subject: [PATCH] feat: import menubar from app/mod.rs --- src/app/mod.rs | 39 +++++++++------------------------------ 1 file changed, 9 insertions(+), 30 deletions(-) diff --git a/src/app/mod.rs b/src/app/mod.rs index 56420dd..b98bcfb 100644 --- a/src/app/mod.rs +++ b/src/app/mod.rs @@ -3,51 +3,30 @@ * file, You can obtain one at https://mozilla.org/MPL/2.0/. */ pub mod imp; +pub mod menubar; pub mod workspace; - use glib::wrapper; - - wrapper! { pub struct EchidnaEditor(ObjectSubclass) @extends gio::Application, gtk::Application, @implements gio::ActionGroup, gio::ActionMap; } impl Default for EchidnaEditor { fn default() -> Self { - Self::new("land.echidna.editor") - + Self::new("land.echidna.editor") } - - } - impl EchidnaEditor { - - - pub fn new( - app_id: &'static str) -> Self { - - let object = glib::Object::new(&[ + pub fn new(app_id: &'static str) -> Self { + let object = glib::Object::new(&[ ("application-id", &app_id), - ("flags", &gio::ApplicationFlags::empty()) + ("flags", &gio::ApplicationFlags::empty()), ]); - match object { - Ok(o) => o, - Err(e) => panic!("Error in making EchidnaApplication {}", e), - } - - + match object { + Ok(o) => o, + Err(e) => panic!("Error in making EchidnaApplication {}", e), + } } - - - - - - - - } -