From 78c84355a6ee5491c877c62c3285224d6f8e9175 Mon Sep 17 00:00:00 2001 From: Dr Maxim Orlovsky Date: Tue, 12 Sep 2023 20:44:40 +0200 Subject: [PATCH] remove manual window icon --- res/applogo-big.png | Bin 5685 -> 0 bytes res/applogo.png | Bin 2513 -> 0 bytes src/view/about/widget.rs | 7 +------ src/view/launch/widget.rs | 7 +------ src/view/mod.rs | 2 -- src/view/psbt/widget.rs | 8 ++------ src/view/wallet/widget.rs | 6 +----- 7 files changed, 5 insertions(+), 25 deletions(-) delete mode 100644 res/applogo-big.png delete mode 100644 res/applogo.png diff --git a/res/applogo-big.png b/res/applogo-big.png deleted file mode 100644 index 7d08601682d193fa04f37b1236fe3098fc683e05..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 5685 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 LYbhZVtRwyhE~{L& diff --git a/res/applogo.png b/res/applogo.png deleted file mode 100644 index 9ab41299f5bf2014336ea4ba28e8899e0c0be38c..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2513 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 I?66PV-@><5(f|Me diff --git a/src/view/about/widget.rs b/src/view/about/widget.rs index e4589f2..6c09352 100644 --- a/src/view/about/widget.rs +++ b/src/view/about/widget.rs @@ -10,13 +10,11 @@ // . use gladis::Gladis; -use gtk::gdk_pixbuf::Pixbuf; use gtk::prelude::*; use gtk::{gdk, Dialog, Entry, Image}; use relm::Relm; use super::{Msg, ViewModel}; -use crate::view::APP_ICON; // Create the structure that holds the widgets used in the view. #[derive(Clone, Gladis)] @@ -27,10 +25,7 @@ pub struct Widgets { } impl Widgets { - pub fn init_ui(&self, _model: &ViewModel) { - let icon = Pixbuf::from_read(APP_ICON).expect("small app icon is missed"); - self.logo_img.set_pixbuf(Some(&icon)); - } + pub fn init_ui(&self, _model: &ViewModel) {} pub fn show(&self) { self.dialog.show() } pub fn hide(&self) { self.dialog.hide() } diff --git a/src/view/launch/widget.rs b/src/view/launch/widget.rs index bae54a1..77fd9d0 100644 --- a/src/view/launch/widget.rs +++ b/src/view/launch/widget.rs @@ -14,7 +14,6 @@ use std::path::PathBuf; use bpro::{Requirement, WalletTemplate}; use gladis::Gladis; -use gtk::gdk_pixbuf::Pixbuf; use gtk::prelude::*; use gtk::{ Adjustment, ApplicationWindow, Button, InfoBar, ListBox, ListBoxRow, Notebook, @@ -25,7 +24,6 @@ use wallet::descriptors::DescriptorClass; use wallet::onchain::PublicNetwork; use super::{Msg, Page}; -use crate::view::APP_ICON; #[derive(Clone, Gladis)] pub struct Widgets { @@ -64,10 +62,7 @@ impl Widgets { pub fn to_root(&self) -> ApplicationWindow { self.window.clone() } pub fn as_root(&self) -> &ApplicationWindow { &self.window } - pub fn init_ui(&self) { - let icon = Pixbuf::from_read(APP_ICON).expect("app icon is missed"); - self.window.set_icon(Some(&icon)); - } + pub fn init_ui(&self) {} fn is_taproot(&self) -> bool { self.taproot_swch.is_active() } diff --git a/src/view/mod.rs b/src/view/mod.rs index 61b2005..4d28db6 100644 --- a/src/view/mod.rs +++ b/src/view/mod.rs @@ -16,8 +16,6 @@ pub mod psbt; pub mod settings; pub mod wallet; -pub const APP_ICON: &[u8] = include_bytes!("../../res/applogo-big.png"); - use std::path::PathBuf; use gtk::prelude::*; diff --git a/src/view/psbt/widget.rs b/src/view/psbt/widget.rs index b2ba057..c9300ec 100644 --- a/src/view/psbt/widget.rs +++ b/src/view/psbt/widget.rs @@ -17,7 +17,6 @@ use bitcoin::blockdata::constants::WITNESS_SCALE_FACTOR; use bitcoin::Address; use bitcoin_scripts::address::AddressFormat; use gladis::Gladis; -use gtk::gdk_pixbuf::Pixbuf; use gtk::prelude::*; use gtk::{ gdk, ApplicationWindow, Button, Dialog, Entry, Expander, HeaderBar, Label, LevelBar, ListBox, @@ -28,10 +27,10 @@ use relm::Relm; use wallet::onchain::PublicNetwork; use super::{Msg, ViewModel}; +use crate::view::launch; use crate::view::launch::Page; use crate::view::psbt::sign_row; use crate::view::psbt::sign_row::SigningModel; -use crate::view::{launch, APP_ICON}; // Create the structure that holds the widgets used in the view. #[derive(Clone, Gladis)] @@ -76,10 +75,7 @@ pub struct Widgets { } impl Widgets { - pub fn init_ui(&self) { - let icon = Pixbuf::from_read(APP_ICON).expect("app icon is missed"); - self.window.set_icon(Some(&icon)); - } + pub fn init_ui(&self) {} pub fn update_ui(&self, model: &ViewModel) { let psbt: &Psbt = model.psbt(); diff --git a/src/view/wallet/widget.rs b/src/view/wallet/widget.rs index 9c69aa1..0f3445a 100644 --- a/src/view/wallet/widget.rs +++ b/src/view/wallet/widget.rs @@ -22,7 +22,6 @@ use bpro::{ use chrono::{DateTime, NaiveDateTime, Utc}; use electrum_client::HeaderNotification; use gladis::Gladis; -use gtk::gdk_pixbuf::Pixbuf; use gtk::prelude::*; use gtk::{ gdk, Adjustment, ApplicationWindow, Button, CellRendererText, CheckButton, HeaderBar, Image, @@ -34,8 +33,8 @@ use wallet::hd::SegmentIndexes; use super::{ElectrumState, Msg, ViewModel}; use crate::model::{display_accounting_amount, FormatDate, UI as UIColorTrait}; +use crate::view::launch; use crate::view::wallet::pay; -use crate::view::{launch, APP_ICON}; use crate::worker::exchange::{Exchange, Fiat}; trait UI { @@ -387,9 +386,6 @@ impl Widgets { pub fn init_ui(&mut self, model: &mut ViewModel) { let settings = model.as_settings(); - let icon = Pixbuf::from_read(APP_ICON).expect("app icon is missed"); - self.window.set_icon(Some(&icon)); - self.header_bar .set_title(model.path().file_name().and_then(OsStr::to_str)); self.header_bar