From 8872dab55b06a7754e12b73fcae8d12815e3abd5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?St=C3=A9phane=20Cerveau?= Date: Mon, 13 Feb 2023 21:46:23 +0100 Subject: [PATCH] app: update and fix for gtk4-rs 0.6.1 --- src/gps/pad.rs | 1 - src/ui/about.rs | 8 ++++---- src/ui/elements.rs | 2 +- src/ui/logger.rs | 2 +- src/ui/properties.rs | 4 ++-- 5 files changed, 8 insertions(+), 9 deletions(-) diff --git a/src/gps/pad.rs b/src/gps/pad.rs index ffbf52a..fe85b78 100644 --- a/src/gps/pad.rs +++ b/src/gps/pad.rs @@ -43,7 +43,6 @@ impl PadInfo { gst::PadPresence::Always => PortPresence::Always, gst::PadPresence::Sometimes => PortPresence::Sometimes, gst::PadPresence::Request => PortPresence::Sometimes, - _ => PortPresence::Unknown, } } diff --git a/src/ui/about.rs b/src/ui/about.rs index a7db067..3be1e57 100644 --- a/src/ui/about.rs +++ b/src/ui/about.rs @@ -10,8 +10,8 @@ use crate::app::GPSApp; use crate::config; use crate::gps as GPS; use gettextrs::gettext; -use gtk::builders::AboutDialogBuilder; use gtk::prelude::*; +use gtk::AboutDialog; use gtk::ApplicationWindow; @@ -20,11 +20,11 @@ pub fn display_about_dialog(app: &GPSApp) { .builder .object("mainwindow") .expect("Couldn't get window"); - let about_dialog = AboutDialogBuilder::new() + let about_dialog = AboutDialog::builder() .modal(true) .program_name("GstPipelineStudio") .version(config::VERSION) - .comments(&format!( + .comments(format!( "{}\n\n{}", &gettext("Draw your own GStreamer pipeline"), GPS::Player::get_version() @@ -32,7 +32,7 @@ pub fn display_about_dialog(app: &GPSApp) { .website("https://gitlab.freedesktop.org/dabrain34/GstPipelineStudio") .authors(vec!["Stéphane Cerveau".to_string()]) .artists(vec!["Stéphane Cerveau".to_string()]) - .translator_credits(&gettext("translator-credits")) + .translator_credits(gettext("translator-credits")) .logo_icon_name(config::APP_ID) .license_type(gtk::License::Gpl30) .transient_for(&window) diff --git a/src/ui/elements.rs b/src/ui/elements.rs index 4e60408..8620189 100644 --- a/src/ui/elements.rs +++ b/src/ui/elements.rs @@ -84,7 +84,7 @@ pub fn setup_favorite_list(app: &GPSApp) { } }), ); - favorite_list.add_controller(&gesture); + favorite_list.add_controller(gesture); } pub fn add_to_favorite_list(app: &GPSApp, element_name: String) { diff --git a/src/ui/logger.rs b/src/ui/logger.rs index 8379fee..b7c9ba9 100644 --- a/src/ui/logger.rs +++ b/src/ui/logger.rs @@ -56,7 +56,7 @@ pub fn setup_logger_list(app: &GPSApp) { } }), ); - logger_list.add_controller(&gesture); + logger_list.add_controller(gesture); } pub fn add_to_logger_list(app: &GPSApp, log_entry: &str) { diff --git a/src/ui/properties.rs b/src/ui/properties.rs index 4c07ff9..feaa490 100644 --- a/src/ui/properties.rs +++ b/src/ui/properties.rs @@ -313,7 +313,7 @@ pub fn display_pipeline_details(app: &GPSApp) { if let Some(elements) = app.player.borrow().pipeline_elements() { let elements_list = elements.join(" "); let label = gtk::Label::builder() - .label(&format!("{} elements:", elements.len())) + .label(format!("{} elements:", elements.len())) .hexpand(true) .halign(gtk::Align::Start) .valign(gtk::Align::Start) @@ -321,7 +321,7 @@ pub fn display_pipeline_details(app: &GPSApp) { .build(); let value = gtk::Label::builder() - .label(&elements_list) + .label(elements_list) .hexpand(true) .halign(gtk::Align::Start) .margin_start(4)