mirrors/envision
0
0
Fork 0
mirror of https://gitlab.com/gabmus/envision.git synced 2025-08-08 09:08:47 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

feat: replace relm icons with standard gnome/gtk icons

Browse source
This commit is contained in:
Gabriele Musco 2023-06-25 17:50:19 +02:00
commit 8be432df8d
No known key found for this signature in database
GPG key ID: 1068D795C80E51DE
7 changed files with 8 additions and 177 deletions
Download patch file Download diff file Expand all files Collapse all files

159
Cargo.lock generated
View file

@ -2,12 +2,6 @@
# It is not intended for manual editing.
version = 3
[[package]]
name = "adler"
version = "1.0.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe"
[[package]]
name = "aho-corasick"
version = "1.0.2"
@ -70,12 +64,6 @@ version = "3.13.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "a3e2c3daef883ecc1b5d58c15adae93470a91d425f3532ba1695849656af3fc1"
[[package]]
name = "byteorder"
version = "1.4.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "14c189c53d098945499cdfa7ecc63567cf3886b3332b312a5b4585d8d3a6a610"
[[package]]
name = "bytes"
version = "1.4.0"
@ -201,15 +189,6 @@ dependencies = [
"libc",
]
[[package]]
name = "crc32fast"
version = "1.3.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "b540bd8bc810d3885c6ea91e2018302f68baba2129ab3e88f32389ee9370880d"
dependencies = [
"cfg-if",
]
[[package]]
name = "cty"
version = "0.2.2"
@ -301,16 +280,6 @@ dependencies = [
"rustc_version",
]
[[package]]
name = "flate2"
version = "1.0.26"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "3b9429470923de8e8cbd4d2dc513535400b4b3fef0319fb5c4e1f520a7bef743"
dependencies = [
"crc32fast",
"miniz_oxide",
]
[[package]]
name = "flume"
version = "0.10.14"
@ -745,24 +714,6 @@ dependencies = [
"system-deps",
]
[[package]]
name = "gvdb"
version = "0.4.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "00421b382029e13501f36b7243dd05c3e7caa92d252790c3492e5fc7caca165b"
dependencies = [
"byteorder",
"flate2",
"lazy_static",
"memmap2",
"quick-xml",
"safe-transmute",
"serde",
"serde_json",
"walkdir",
"zvariant",
]
[[package]]
name = "h2"
version = "0.3.19"
@ -1036,15 +987,6 @@ version = "2.5.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "2dffe52ecf27772e601905b7522cb4ef790d2cc203488bbd0e2fe85fcb74566d"
[[package]]
name = "memmap2"
version = "0.5.10"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "83faa42c0a078c393f6b29d5db232d8be22776a891f8f56e5284faee4a20b327"
dependencies = [
"libc",
]
[[package]]
name = "memoffset"
version = "0.7.1"
@ -1069,15 +1011,6 @@ version = "0.3.17"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "6877bb514081ee2a7ff5ef9de3281f14a4dd4bceac4c09388074a6b5df8a139a"
[[package]]
name = "miniz_oxide"
version = "0.7.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "e7810e0be55b428ada41041c41f32c9f1a42817901b4ccf45fa3d4b6561e74c7"
dependencies = [
"adler",
]
[[package]]
name = "mio"
version = "0.8.8"
@ -1400,16 +1333,6 @@ dependencies = [
"unicode-ident",
]
[[package]]
name = "quick-xml"
version = "0.27.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "ffc053f057dd768a56f62cd7e434c42c831d296968997e9ac1f76ea7c2d14c41"
dependencies = [
"memchr",
"serde",
]
[[package]]
name = "quote"
version = "1.0.28"
@ -1533,16 +1456,6 @@ dependencies = [
"tracker",
]
[[package]]
name = "relm4-icons"
version = "0.6.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "6e28bcc718a587bcfa31b034e0b8f4efe5b70e945b7de9d7d154b45357a0dadc"
dependencies = [
"gtk4",
"gvdb",
]
[[package]]
name = "relm4-macros"
version = "0.6.0"
@ -1604,7 +1517,6 @@ dependencies = [
"phf_macros",
"relm4",
"relm4-components",
"relm4-icons",
"reqwest",
"serde",
"serde_json",
@ -1641,21 +1553,6 @@ version = "1.0.13"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "f91339c0467de62360649f8d3e185ca8de4224ff281f66000de5eb2a77a79041"
[[package]]
name = "safe-transmute"
version = "0.11.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "98a01dab6acf992653be49205bdd549f32f17cb2803e8eacf1560bf97259aae8"
[[package]]
name = "same-file"
version = "1.0.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "93fc1dc3aaa9bfed95e02e6eadabb4baf7e3078b0bd1b4d7b6b0b68378900502"
dependencies = [
"winapi-util",
]
[[package]]
name = "schannel"
version = "0.1.21"
@ -2092,16 +1989,6 @@ version = "0.9.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f"
[[package]]
name = "walkdir"
version = "2.3.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "36df944cda56c7d8d8b7496af378e6b16de9284591917d307c9b4d313c44e698"
dependencies = [
"same-file",
"winapi-util",
]
[[package]]
name = "want"
version = "0.3.1"
@ -2230,15 +2117,6 @@ version = "0.4.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6"
[[package]]
name = "winapi-util"
version = "0.1.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "70ec6ce85bb158151cae5e5c87f95a8e97d2c0c4b001223f33a334e3ce5de178"
dependencies = [
"winapi",
]
[[package]]
name = "winapi-x86_64-pc-windows-gnu"
version = "0.4.0"
@ -2385,40 +2263,3 @@ checksum = "80d0f4e272c85def139476380b12f9ac60926689dd2e01d4923222f40580869d"
dependencies = [
"winapi",
]
[[package]]
name = "zvariant"
version = "3.14.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "622cc473f10cef1b0d73b7b34a266be30ebdcfaea40ec297dd8cbda088f9f93c"
dependencies = [
"byteorder",
"libc",
"serde",
"static_assertions",
"zvariant_derive",
]
[[package]]
name = "zvariant_derive"
version = "3.14.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "5d9c1b57352c25b778257c661f3c4744b7cefb7fc09dd46909a153cce7773da2"
dependencies = [
"proc-macro-crate",
"proc-macro2",
"quote",
"syn 1.0.109",
"zvariant_utils",
]
[[package]]
name = "zvariant_utils"
version = "1.0.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "7234f0d811589db492d16893e3f21e8e2fd282e6d01b0cddee310322062cc200"
dependencies = [
"proc-macro2",
"quote",
"syn 1.0.109",
]

3
Cargo.toml
View file

@ -22,9 +22,6 @@ relm4 = { version = "0.6.0", features = [
"libadwaita"
] }
relm4-components = "0.6.0"
relm4-icons = { version = "0.6.0", features = [
"menu", "loupe", "copy", "edit", "plus"
] }
reqwest = { version = "0.11.18", features = [
"blocking"
] }

1
src/main.rs
View file

@ -50,7 +50,6 @@ fn main() -> Result<()> {
}
gtk::Window::set_default_icon_name(APP_ID);
relm4_icons::initialize_icons();
let main_app = adw::Application::builder()
.application_id(APP_ID)
.flags(gio::ApplicationFlags::empty())

8
src/ui/debug_view.rs
View file

@ -1,11 +1,9 @@
use std::fmt::Display;
use std::slice::Iter;
use expect_dialog::ExpectDialog;
use gtk::prelude::*;
use relm4::prelude::*;
use relm4::{ComponentSender, SimpleComponent};
use relm4_icons::icon_name;
use std::fmt::Display;
use std::slice::Iter;
#[derive(Debug, PartialEq, Eq, Clone, Copy)]
pub enum LogLevel {
@ -104,7 +102,7 @@ impl SimpleComponent for DebugView {
add_css_class: "title",
},
pack_end: search_toggle = &gtk::ToggleButton {
set_icon_name: icon_name::LOUPE,
set_icon_name: "edit-find-symbolic",
set_tooltip_text: Some("Filter Log"),
},
pack_start: log_level_dropdown = &gtk::DropDown::from_strings(

5
src/ui/main_view.rs
View file

@ -16,7 +16,6 @@ use relm4::adw::traits::MessageDialogExt;
use relm4::adw::ResponseAppearance;
use relm4::prelude::*;
use relm4::{ComponentParts, ComponentSender, SimpleComponent};
use relm4_icons::icon_name;
#[tracker::track]
pub struct MainView {
@ -108,7 +107,7 @@ impl SimpleComponent for MainView {
add_css_class: "title",
},
pack_end: menu_btn = &gtk::MenuButton {
set_icon_name: icon_name::MENU,
set_icon_name: "open-menu-symbolic",
set_menu_model: Some(&app_menu),
},
#[track = "model.changed(Self::enable_debug_view())"]
@ -172,7 +171,7 @@ impl SimpleComponent for MainView {
},
},
gtk::Button {
set_icon_name: icon_name::EDIT,
set_icon_name: "edit-symbolic",
set_tooltip_text: Some("Edit Profile"),
connect_clicked[sender] => move |_| {
sender.input(Self::Input::EditProfile);

3
src/ui/profile_editor.rs
View file

@ -11,7 +11,6 @@ use crate::{
use adw::prelude::*;
use gtk::prelude::*;
use relm4::{factory::FactoryVecDeque, prelude::*};
use relm4_icons::icon_name;
#[tracker::track]
pub struct ProfileEditor {
@ -380,7 +379,7 @@ impl SimpleComponent for ProfileEditor {
add_env_popover.set_child(Some(&add_env_popover_box));
let add_env_var_btn = gtk::MenuButton::builder()
.icon_name(icon_name::PLUS)
.icon_name("list-add-symbolic")
.tooltip_text("Add Environment Variable")
.css_classes(["flat"])
.popover(&add_env_popover)

6
src/ui/steam_launch_options_box.rs
View file

@ -1,9 +1,7 @@
use crate::{constants::APP_NAME, profile::Profile};
use expect_dialog::ExpectDialog;
use gtk::prelude::*;
use relm4::prelude::*;
use relm4_icons::icon_name;
use crate::{constants::APP_NAME, profile::Profile};
#[tracker::track]
pub struct SteamLaunchOptionsBox {
@ -88,7 +86,7 @@ impl SimpleComponent for SteamLaunchOptionsBox {
add_css_class: "flat",
add_css_class: "circular",
set_tooltip_text: Some("Copy"),
set_icon_name: icon_name::COPY,
set_icon_name: "edit-copy-symbolic",
set_vexpand: false,
set_valign: gtk::Align::Center,
connect_clicked[sender] => move |_| {