Skip to content

Commit

Permalink
remove icon from launcher window
Browse files Browse the repository at this point in the history
  • Loading branch information
dr-orlovsky committed Sep 12, 2023
1 parent ae9e95d commit 830abc9
Show file tree
Hide file tree
Showing 4 changed files with 5 additions and 20 deletions.
6 changes: 0 additions & 6 deletions src/view/launch/launch.glade
Original file line number Diff line number Diff line change
Expand Up @@ -1207,12 +1207,6 @@
<property name="title" translatable="yes">MyCitadel</property>
<property name="subtitle" translatable="yes">Bitcoin, Lightning &amp; RGB wallets</property>
<property name="show-close-button">True</property>
<child>
<object class="GtkImage" id="logo_img">
<property name="visible">True</property>
<property name="can-focus">False</property>
</object>
</child>
</object>
</child>
</object>
Expand Down
8 changes: 2 additions & 6 deletions src/view/launch/widget.rs
Original file line number Diff line number Diff line change
Expand Up @@ -17,20 +17,19 @@ use gladis::Gladis;
use gtk::gdk_pixbuf::Pixbuf;
use gtk::prelude::*;
use gtk::{
Adjustment, ApplicationWindow, Button, Image, InfoBar, ListBox, ListBoxRow, Notebook,
Adjustment, ApplicationWindow, Button, InfoBar, ListBox, ListBoxRow, Notebook,
RecentChooserWidget, ResponseType, Switch,
};
use relm::Relm;
use wallet::descriptors::DescriptorClass;
use wallet::onchain::PublicNetwork;

use super::{Msg, Page};
use crate::view::{APP_ICON, APP_ICON_TOOL};
use crate::view::APP_ICON;

#[derive(Clone, Gladis)]
pub struct Widgets {
window: ApplicationWindow,
logo_img: Image,
info_bar: InfoBar,
about_btn: Button,
pages: Notebook,
Expand Down Expand Up @@ -68,9 +67,6 @@ 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));

let img = Pixbuf::from_read(APP_ICON_TOOL).expect("small app icon is missed");
self.logo_img.set_pixbuf(Some(&img));
}

fn is_taproot(&self) -> bool { self.taproot_swch.is_active() }
Expand Down
1 change: 0 additions & 1 deletion src/view/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@ pub mod settings;
pub mod wallet;

pub const APP_ICON: &[u8] = include_bytes!("../../res/applogo-big.png");
pub const APP_ICON_TOOL: &[u8] = include_bytes!("../../res/applogo.png");

use std::path::PathBuf;

Expand Down
10 changes: 3 additions & 7 deletions src/view/psbt/widget.rs
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,8 @@ use gladis::Gladis;
use gtk::gdk_pixbuf::Pixbuf;
use gtk::prelude::*;
use gtk::{
gdk, ApplicationWindow, Button, Dialog, Entry, Expander, HeaderBar, Image, Label, LevelBar,
ListBox, ListStore, MenuItem, RadioMenuItem, TextView, TreeView,
gdk, ApplicationWindow, Button, Dialog, Entry, Expander, HeaderBar, Label, LevelBar, ListBox,
ListStore, MenuItem, RadioMenuItem, TextView, TreeView,
};
use miniscript::{Legacy, Miniscript, Segwitv0};
use relm::Relm;
Expand All @@ -31,15 +31,14 @@ use super::{Msg, ViewModel};
use crate::view::launch::Page;
use crate::view::psbt::sign_row;
use crate::view::psbt::sign_row::SigningModel;
use crate::view::{launch, APP_ICON, APP_ICON_TOOL};
use crate::view::{launch, APP_ICON};

// Create the structure that holds the widgets used in the view.
#[derive(Clone, Gladis)]
pub struct Widgets {
window: ApplicationWindow,

header_bar: HeaderBar,
logo_img: Image,
save_btn: Button,
publish_btn: Button,

Expand Down Expand Up @@ -80,9 +79,6 @@ 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));

let img = Pixbuf::from_read(APP_ICON_TOOL).expect("small app icon is missed");
self.logo_img.set_pixbuf(Some(&img));
}

pub fn update_ui(&self, model: &ViewModel) {
Expand Down

0 comments on commit 830abc9

Please sign in to comment.