From 4c9ee56044a587f6b406083f637726d3e013c31c Mon Sep 17 00:00:00 2001 From: Gabriele Musco Date: Tue, 6 Aug 2024 11:41:33 +0200 Subject: [PATCH] chore: rename gtk4 to gtk and libadwaita to adw --- Cargo.toml | 4 +-- src/ui/cmdline_opts.rs | 2 +- src/ui/libsurvive_setup_window.rs | 2 +- src/ui/term_widget.rs | 47 +++++++++++++++---------------- src/ui/util.rs | 42 +++++++++++++-------------- src/ui/wivrn_conf_editor.rs | 2 +- 6 files changed, 49 insertions(+), 50 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index 13dee92..de2067a 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -9,9 +9,9 @@ edition = "2021" anyhow = "1.0.86" gettext-rs = { version = "0.7.0", features = ["gettext-system"] } git2 = "0.19.0" -gtk4 = { version = "0.9.0", features = ["v4_10"] } +gtk = { package = "gtk4", version = "0.9.0", features = ["v4_10"] } lazy_static = "1.5.0" -libadwaita = { version = "0.7.0", features = ["v1_5"] } +adw = { package = "libadwaita", version = "0.7.0", features = ["v1_5"] } libmonado-rs = { git = "https://github.com/technobaboo/libmonado-rs", rev = "a495f6d162fce47ae5aafeb7ec38e774cb731c29" } rusb = "0.9.4" nix = { version = "0.29.0", features = ["fs", "signal"] } diff --git a/src/ui/cmdline_opts.rs b/src/ui/cmdline_opts.rs index 0833b76..589e4a4 100644 --- a/src/ui/cmdline_opts.rs +++ b/src/ui/cmdline_opts.rs @@ -1,5 +1,5 @@ use crate::config::Config; -use gtk4::{ +use gtk::{ gio::{ prelude::{ApplicationCommandLineExt, ApplicationExt}, Application, ApplicationCommandLine, diff --git a/src/ui/libsurvive_setup_window.rs b/src/ui/libsurvive_setup_window.rs index c028d5b..813e826 100644 --- a/src/ui/libsurvive_setup_window.rs +++ b/src/ui/libsurvive_setup_window.rs @@ -497,7 +497,7 @@ impl SimpleComponent for LibsurviveSetupWindow { calibration_done_page: None, calibration_cancelled_page: None, steam_lighthouse_path: NO_FILE_MSG.into(), - filefilter_listmodel: gtk4::gio::ListStore::builder() + filefilter_listmodel: gtk::gio::ListStore::builder() .item_type(gtk::FileFilter::static_type()) .build(), profile: None, diff --git a/src/ui/term_widget.rs b/src/ui/term_widget.rs index cfae375..ad4333c 100644 --- a/src/ui/term_widget.rs +++ b/src/ui/term_widget.rs @@ -1,5 +1,4 @@ -use gtk4::{gdk, glib::clone, prelude::*}; -use relm4::adw; +use gtk::{gdk, glib::clone, prelude::*}; use vte4::{prelude::*, Terminal}; use super::util::copy_text; @@ -8,9 +7,9 @@ const MAX_SCROLLBACK: u32 = 2000; #[derive(Debug, Clone)] pub struct TermWidget { - pub container: gtk4::Box, + pub container: gtk::Box, pub term: Terminal, - popover_menu: gtk4::PopoverMenu, + popover_menu: gtk::PopoverMenu, } const ADW_LIGHT_FG: &str = "#000000"; @@ -31,9 +30,9 @@ impl TermWidget { .build(); term.set_clear_background(false); term.search_set_wrap_around(true); - let container = gtk4::Box::builder().hexpand(true).vexpand(true).build(); + let container = gtk::Box::builder().hexpand(true).vexpand(true).build(); - let sw = gtk4::ScrolledWindow::builder() + let sw = gtk::ScrolledWindow::builder() .hexpand(true) .vexpand(true) .child(&term) @@ -41,8 +40,8 @@ impl TermWidget { container.append(&sw); - let action_grp = gtk4::gio::SimpleActionGroup::new(); - let selectall_action = gtk4::gio::SimpleAction::new("selectall", None); + let action_grp = gtk::gio::SimpleActionGroup::new(); + let selectall_action = gtk::gio::SimpleAction::new("selectall", None); selectall_action.connect_activate(clone!( #[strong] term, @@ -51,7 +50,7 @@ impl TermWidget { } )); action_grp.add_action(&selectall_action); - let copy_action = gtk4::gio::SimpleAction::new("copy", None); + let copy_action = gtk::gio::SimpleAction::new("copy", None); copy_action.connect_activate(clone!( #[strong] term, @@ -63,11 +62,11 @@ impl TermWidget { container.insert_action_group("term", Some(&action_grp)); - let menu = gtk4::gio::Menu::new(); + let menu = gtk::gio::Menu::new(); menu.append(Some("Select all"), Some("term.selectall")); menu.append(Some("Copy"), Some("term.copy")); - let popover_menu = gtk4::PopoverMenu::builder() + let popover_menu = gtk::PopoverMenu::builder() .pointing_to(&term.allocation()) .autohide(true) .menu_model(&menu) @@ -88,15 +87,15 @@ impl TermWidget { } fn setup_rightclick_gesture(&self) { - let gesture = gtk4::GestureClick::builder() - .button(gtk4::gdk::BUTTON_SECONDARY) + let gesture = gtk::GestureClick::builder() + .button(gtk::gdk::BUTTON_SECONDARY) .build(); gesture.connect_pressed(clone!( #[strong(rename_to=popover)] self.popover_menu, move |gesture, _, x, y| { - gesture.set_state(gtk4::EventSequenceState::Claimed); - popover.set_pointing_to(Some(>k4::gdk::Rectangle::new(x as i32, y as i32, 1, 1))); + gesture.set_state(gtk::EventSequenceState::Claimed); + popover.set_pointing_to(Some(>k::gdk::Rectangle::new(x as i32, y as i32, 1, 1))); popover.popup(); } )); @@ -110,18 +109,18 @@ impl TermWidget { } fn setup_shortcuts(&self) { - let sc = gtk4::ShortcutController::new(); + let sc = gtk::ShortcutController::new(); ["c", "c"] .iter() .for_each(|combo| { - sc.add_shortcut(gtk4::Shortcut::new( - gtk4::ShortcutTrigger::parse_string(combo), - Some(gtk4::CallbackAction::new(clone!( + sc.add_shortcut(gtk::Shortcut::new( + gtk::ShortcutTrigger::parse_string(combo), + Some(gtk::CallbackAction::new(clone!( #[strong(rename_to = term)] self.term, move |_, _| { Self::copy_selected(&term); - gtk4::glib::Propagation::Proceed + gtk::glib::Propagation::Proceed } ))), )); @@ -129,14 +128,14 @@ impl TermWidget { ["a", "a"] .iter() .for_each(|combo| { - sc.add_shortcut(gtk4::Shortcut::new( - gtk4::ShortcutTrigger::parse_string(combo), - Some(gtk4::CallbackAction::new(clone!( + sc.add_shortcut(gtk::Shortcut::new( + gtk::ShortcutTrigger::parse_string(combo), + Some(gtk::CallbackAction::new(clone!( #[strong(rename_to = term)] self.term, move |_, _| { term.select_all(); - gtk4::glib::Propagation::Proceed + gtk::glib::Propagation::Proceed } ))), )); diff --git a/src/ui/util.rs b/src/ui/util.rs index abdf25d..16383c8 100644 --- a/src/ui/util.rs +++ b/src/ui/util.rs @@ -1,6 +1,6 @@ -use gtk4::{gdk, gio, glib::clone, prelude::*}; +use gtk::{gdk, gio, glib::clone, prelude::*}; -pub fn limit_dropdown_width(dd: >k4::DropDown) { +pub fn limit_dropdown_width(dd: >k::DropDown) { let mut dd_child = dd .first_child() .unwrap() @@ -13,29 +13,29 @@ pub fn limit_dropdown_width(dd: >k4::DropDown) { if dd_child.is_none() { break; } - if let Ok(label) = dd_child.clone().unwrap().downcast::() { - label.set_ellipsize(gtk4::pango::EllipsizeMode::End); + if let Ok(label) = dd_child.clone().unwrap().downcast::() { + label.set_ellipsize(gtk::pango::EllipsizeMode::End); } let nc = dd_child.unwrap().first_child().clone(); dd_child = nc; } } -pub fn warning_heading() -> gtk4::Box { - let b = gtk4::Box::builder() - .orientation(gtk4::Orientation::Horizontal) +pub fn warning_heading() -> gtk::Box { + let b = gtk::Box::builder() + .orientation(gtk::Orientation::Horizontal) .spacing(12) .hexpand(true) .build(); b.append( - >k4::Image::builder() + >k::Image::builder() .css_classes(["warning"]) .icon_name("dialog-warning-symbolic") .build(), ); b.append( - >k4::Label::builder() + >k::Label::builder() .css_classes(["warning", "heading"]) .label("Warning") .build(), @@ -69,19 +69,19 @@ pub fn bits_from_mbits(mbits: u32) -> Option { mbits.checked_mul(1000000) } -pub fn copiable_code_snippet(code: &str) -> gtk4::Widget { - let container = gtk4::Box::builder() - .orientation(gtk4::Orientation::Horizontal) +pub fn copiable_code_snippet(code: &str) -> gtk::Widget { + let container = gtk::Box::builder() + .orientation(gtk::Orientation::Horizontal) .spacing(6) .build(); - let btn = gtk4::Button::builder() + let btn = gtk::Button::builder() .css_classes(["flat", "circular"]) .tooltip_text("Copy") .icon_name("edit-copy-symbolic") .vexpand(false) .hexpand(false) - .valign(gtk4::Align::Center) - .halign(gtk4::Align::Center) + .valign(gtk::Align::Center) + .halign(gtk::Align::Center) .build(); btn.connect_clicked(clone!( #[to_owned] @@ -89,13 +89,13 @@ pub fn copiable_code_snippet(code: &str) -> gtk4::Widget { move |_| copy_text(&code) )); container.append( - >k4::ScrolledWindow::builder() - .vscrollbar_policy(gtk4::PolicyType::Never) - .hscrollbar_policy(gtk4::PolicyType::Automatic) + >k::ScrolledWindow::builder() + .vscrollbar_policy(gtk::PolicyType::Never) + .hscrollbar_policy(gtk::PolicyType::Automatic) .css_classes(["card"]) - .overflow(gtk4::Overflow::Hidden) + .overflow(gtk::Overflow::Hidden) .child( - >k4::TextView::builder() + >k::TextView::builder() .hexpand(true) .vexpand(false) .monospace(true) @@ -105,7 +105,7 @@ pub fn copiable_code_snippet(code: &str) -> gtk4::Widget { .top_margin(6) .bottom_margin(18) .buffer( - >k4::TextBuffer::builder() + >k::TextBuffer::builder() .text(code) .enable_undo(false) .build(), diff --git a/src/ui/wivrn_conf_editor.rs b/src/ui/wivrn_conf_editor.rs index 6704221..ffb5e30 100644 --- a/src/ui/wivrn_conf_editor.rs +++ b/src/ui/wivrn_conf_editor.rs @@ -19,7 +19,7 @@ use crate::{ }, }; use adw::prelude::*; -use gtk4::glib::clone; +use gtk::glib::clone; use relm4::{factory::AsyncFactoryVecDeque, prelude::*}; #[tracker::track]