diff --git a/data/gtk/image_view.ui b/data/gtk/image_view.ui index ea6fa55..f6e7400 100644 --- a/data/gtk/image_view.ui +++ b/data/gtk/image_view.ui @@ -58,6 +58,7 @@ False + image_menu @@ -84,4 +85,28 @@ + +
+ + _Open With… + win.open-with + + + + _Print… + win.print + + + + _Set As Wallpaper + win.set-wallpaper + +
+
diff --git a/data/gtk/window.ui b/data/gtk/window.ui index 4ce22e3..5e8b291 100644 --- a/data/gtk/window.ui +++ b/data/gtk/window.ui @@ -13,7 +13,6 @@ false - titlebar @@ -48,9 +47,7 @@ - - image_menu - + @@ -104,28 +101,4 @@ - -
- - _Open With… - win.open-with - - - - _Print… - win.print - - - - _Set As Wallpaper - win.set-wallpaper - -
-
diff --git a/src/widgets/image_view.rs b/src/widgets/image_view.rs index 1609159..0ba50ea 100644 --- a/src/widgets/image_view.rs +++ b/src/widgets/image_view.rs @@ -91,13 +91,6 @@ mod imp { fn properties() -> &'static [glib::ParamSpec] { static PROPERTIES: Lazy> = Lazy::new(|| { vec![ - glib::ParamSpec::new_object( - "popover-menu-model", - "Popover Menu Model", - "The menu model for the menu button", - gio::MenuModel::static_type(), - glib::ParamFlags::READWRITE, - ), glib::ParamSpec::new_string( "filename", "Filename", @@ -140,30 +133,12 @@ mod imp { fn property(&self, _obj: &Self::Type, _id: usize, psec: &glib::ParamSpec) -> glib::Value { match psec.name() { - "popover-menu-model" => self.popover_menu_model.borrow().to_value(), "filename" => self.filename.borrow().to_value(), "controls" => self.controls.to_value(), _ => unimplemented!(), } } - fn set_property( - &self, - _obj: &Self::Type, - _id: usize, - value: &glib::Value, - psec: &glib::ParamSpec, - ) { - match psec.name() { - "popover-menu-model" => { - let model: Option = value.get().unwrap(); - self.popover.set_menu_model(model.as_ref()); - *self.popover_menu_model.borrow_mut() = model; - } - _ => unimplemented!(), - } - } - fn constructed(&self, obj: &Self::Type) { self.parent_constructed(obj);