diff --git a/src/components/window/reset_window.rs b/src/components/window/reset_window.rs index fa39a91..9ac8b90 100644 --- a/src/components/window/reset_window.rs +++ b/src/components/window/reset_window.rs @@ -21,6 +21,7 @@ use crate::components::utils::get_capabilities; use crate::components::window::handle_sidebar_click::*; use crate::components::window::reset_window_impl; use crate::components::window::sidebar_entry::SidebarEntry; +use crate::VERSION; use super::consts::{ AUDIO_SIDEBAR, BLUETOOTH_SIDEBAR, CONNECTIVITY_SIDEBAR, SINK_SIDEBAR, SOURCE_SIDEBAR, @@ -316,7 +317,7 @@ impl ReSetWindow { .license_type(gtk::License::Gpl30) .website("https://github.com/Xetibo/ReSet") .issue_url("https://github.com/Xetibo/ReSet/issues") - .version("1.0.0") + .version(VERSION) .transient_for(window) .modal(true) .copyright("© 2022-2023 Xetibo") diff --git a/src/main.rs b/src/main.rs index 3cd3b0e..156b953 100644 --- a/src/main.rs +++ b/src/main.rs @@ -15,6 +15,10 @@ mod tests; const APP_ID: &str = "org.Xetibo.ReSet"; +/// Version of the current package. +/// Use this to avoid version mismatch conflicts. +pub const VERSION: &str = env!("CARGO_PKG_VERSION"); + #[tokio::main] async fn main() { tokio::task::spawn(daemon_check()); diff --git a/src/resources/resetMainWindow.ui b/src/resources/resetMainWindow.ui index 2325aaf..6f2f2b4 100644 --- a/src/resources/resetMainWindow.ui +++ b/src/resources/resetMainWindow.ui @@ -39,6 +39,7 @@ True True open-menu-symbolic + main_menu end True diff --git a/src/resources/resetUI.cmb b/src/resources/resetUI.cmb index 7b89980..168868b 100644 --- a/src/resources/resetUI.cmb +++ b/src/resources/resetUI.cmb @@ -347,7 +347,7 @@ (3,33,"GtkMenuButton","can-shrink","True",None,None,None,None,None,None,None,None,None), (3,33,"GtkMenuButton","has-frame","False",None,None,None,None,None,None,None,None,None), (3,33,"GtkMenuButton","icon-name","open-menu-symbolic",None,None,None,None,None,None,None,None,None), - (3,33,"GtkMenuButton","menu-model",None,None,None,None,None,None,None,None,None,None), + (3,33,"GtkMenuButton","menu-model","54",None,None,None,None,None,None,None,None,None), (3,33,"GtkWidget","halign","end",None,None,None,None,None,None,None,None,None), (3,33,"GtkWidget","hexpand","True",None,None,None,None,None,None,None,None,None), (3,33,"GtkWidget","hexpand-set","True",None,None,None,None,None,None,None,None,None),