diff --git a/neveko-gui/src/apps/address_book.rs b/neveko-gui/src/apps/address_book.rs index 9e8943e..d655721 100644 --- a/neveko-gui/src/apps/address_book.rs +++ b/neveko-gui/src/apps/address_book.rs @@ -204,10 +204,12 @@ impl eframe::App for AddressBookApp { // Compose window //----------------------------------------------------------------------------------- let mut is_composing = self.is_composing; - egui::Window::new("Compose Message") + egui::Window::new("compose") .open(&mut is_composing) + .title_bar(false) .vscroll(true) .show(&ctx, |ui| { + ui.heading("Compose Message"); if self.is_loading { ui.add(egui::Spinner::new()); ui.label("sending message..."); @@ -245,10 +247,12 @@ impl eframe::App for AddressBookApp { let address = self.s_invoice.address.clone(); let amount = self.s_invoice.pay_threshold; let expire = self.s_invoice.conf_threshold; - egui::Window::new("Approve Payment for JWP") + egui::Window::new("approve payment") .open(&mut is_approving_payment) + .title_bar(false) .vscroll(true) .show(&ctx, |ui| { + ui.heading("Approve Payment for JWP"); if self.is_loading { ui.add(egui::Spinner::new()); ui.label("creating jwp. please wait..."); @@ -290,12 +294,14 @@ impl eframe::App for AddressBookApp { // Contact status window //----------------------------------------------------------------------------------- let mut is_showing_status = self.showing_status; - egui::Window::new(&self.status.i2p) + egui::Window::new("contact status") .open(&mut is_showing_status) + .title_bar(false) .vscroll(true) .title_bar(false) .id(egui::Id::new(self.status.i2p.clone())) .show(&ctx, |ui| { + ui.heading(&self.status.i2p); if self.is_pinging || self.is_loading { let spinner_text = if self.is_loading { "retrying payment proof... " @@ -409,10 +415,12 @@ impl eframe::App for AddressBookApp { // Contact added confirmation screen //----------------------------------------------------------------------------------- - egui::Window::new("Added contact") + egui::Window::new("added contact") .open(&mut is_added) + .title_bar(false) .vscroll(true) .show(ctx, |ui| { + ui.heading("Added contact"); ui.label(format!("i2p address: {}", self.s_added_contact.i2p_address)); if ui.button("Exit").clicked() { self.added = false; @@ -428,10 +436,12 @@ impl eframe::App for AddressBookApp { // Contact approval screen //----------------------------------------------------------------------------------- - egui::Window::new("Approve Contact") + egui::Window::new("approve contact") .open(&mut is_approved) + .title_bar(false) .vscroll(true) .show(ctx, |ui| { + ui.heading("Approve Contact"); if is_loading { ui.add(egui::Spinner::new()); ui.label("adding contact..."); diff --git a/neveko-gui/src/apps/home.rs b/neveko-gui/src/apps/home.rs index b3952ee..3f4e496 100644 --- a/neveko-gui/src/apps/home.rs +++ b/neveko-gui/src/apps/home.rs @@ -175,8 +175,9 @@ impl eframe::App for HomeApp { // I2P Address QR //----------------------------------------------------------------------------------- let mut is_showing_qr = self.is_showing_qr; - egui::Window::new("") + egui::Window::new("i2p qr") .open(&mut is_showing_qr) + .title_bar(false) .vscroll(true) .show(ctx, |ui| { let mut i2p_address = i2p::get_destination(None); @@ -207,8 +208,9 @@ impl eframe::App for HomeApp { // Installation Error window //----------------------------------------------------------------------------------- let mut has_install_failed = self.has_install_failed; - egui::Window::new("Error") + egui::Window::new("error") .open(&mut has_install_failed) + .title_bar(false) .vscroll(false) .show(&ctx, |ui| { ui.heading("Installation Failure"); @@ -222,10 +224,12 @@ impl eframe::App for HomeApp { // Connection Manager window //----------------------------------------------------------------------------------- let mut is_editing_connections = self.is_editing_connections; - egui::Window::new("Connection Manager") + egui::Window::new("connection") .open(&mut is_editing_connections) + .title_bar(false) .vscroll(true) .show(&ctx, |ui| { + ui.heading("Connection Manager"); ui.horizontal(|ui| { let cm_daemon_label = ui.label("daemon host:\t"); ui.text_edit_singleline(&mut self.connections.daemon_host) @@ -321,10 +325,12 @@ impl eframe::App for HomeApp { // Installation Manager window //----------------------------------------------------------------------------------- let mut is_installing = self.is_installing; - egui::Window::new("Installation Manager") + egui::Window::new("installation") .open(&mut is_installing) + .title_bar(false) .vscroll(true) .show(&ctx, |ui| { + ui.heading("Installation Manager"); let mut wants_i2p_zero = self.installations.i2p_zero; let mut wants_xmr = self.installations.xmr; if ui.checkbox(&mut wants_i2p_zero, "i2p-zero").changed() { diff --git a/neveko-gui/src/apps/mailbox.rs b/neveko-gui/src/apps/mailbox.rs index 7dcfeee..09ef267 100644 --- a/neveko-gui/src/apps/mailbox.rs +++ b/neveko-gui/src/apps/mailbox.rs @@ -46,10 +46,12 @@ impl eframe::App for MailBoxApp { // Compose window //----------------------------------------------------------------------------------- let mut is_showing_decryption = self.is_showing_decryption; - egui::Window::new("Decrypted Message") + egui::Window::new("decrypted message") .open(&mut is_showing_decryption) + .title_bar(false) .vscroll(true) .show(&ctx, |ui| { + ui.heading("Decrypted Message"); ui.label(format!("{}", self.decrypted_message)); ui.label("\n"); if ui.button("Exit").clicked() { diff --git a/neveko-gui/src/apps/market.rs b/neveko-gui/src/apps/market.rs index 4e3711a..fd17ec0 100644 --- a/neveko-gui/src/apps/market.rs +++ b/neveko-gui/src/apps/market.rs @@ -194,10 +194,10 @@ impl eframe::App for MarketApp { // Vendor status window //----------------------------------------------------------------------------------- let mut is_showing_vendor_status = self.is_showing_vendor_status; - egui::Window::new(&self.vendor_status.i2p) + egui::Window::new("vendor status") + .title_bar(false) .open(&mut is_showing_vendor_status) .vscroll(true) - .title_bar(false) .id(egui::Id::new(self.vendor_status.i2p.clone())) .show(&ctx, |ui| { if self.is_pinging { @@ -229,8 +229,9 @@ impl eframe::App for MarketApp { // Product image window //----------------------------------------------------------------------------------- let mut is_showing_product_image = self.is_showing_product_image; - egui::Window::new("") + egui::Window::new("product image") .open(&mut is_showing_product_image) + .title_bar(false) .vscroll(true) .show(ctx, |ui| { self.product_image.show(ui); @@ -247,10 +248,12 @@ impl eframe::App for MarketApp { // Multisig Management window //----------------------------------------------------------------------------------- let mut is_managing_multisig = self.is_managing_multisig; - egui::Window::new("Multisig Management") + egui::Window::new("msig") .open(&mut is_managing_multisig) + .title_bar(false) .vscroll(true) .show(ctx, |ui| { + ui.heading("Multisig Management"); // TODO(c2m): interactive multisig checklist if ui.button("Exit").clicked() { self.is_managing_multisig = false; @@ -261,10 +264,12 @@ impl eframe::App for MarketApp { // View orders - Customer Order Flow Management //----------------------------------------------------------------------------------- let mut is_customer_viewing_orders = self.is_customer_viewing_orders; - egui::Window::new("View Orders") + egui::Window::new("view orders") .open(&mut is_customer_viewing_orders) + .title_bar(false) .vscroll(true) .show(&ctx, |ui| { + ui.heading("View Orders"); use egui_extras::{ Column, TableBuilder, @@ -318,6 +323,7 @@ impl eframe::App for MarketApp { row.col(|ui| { if ui.button("MSIG").clicked() { // dynamically generate buttons for multisig wallet ops + self.is_managing_multisig = true; } }); row.col(|ui| { @@ -340,10 +346,12 @@ impl eframe::App for MarketApp { // Customer Order Form //----------------------------------------------------------------------------------- let mut is_ordering = self.is_ordering; - egui::Window::new("Order Form") + egui::Window::new("order form") .open(&mut is_ordering) + .title_bar(false) .vscroll(true) .show(&ctx, |ui| { + ui.heading("Order Form"); if self.is_loading { ui.add(egui::Spinner::new()); ui.label("loading..."); @@ -410,10 +418,12 @@ impl eframe::App for MarketApp { // View vendors //----------------------------------------------------------------------------------- let mut is_showing_vendors = self.is_showing_vendors; - egui::Window::new("Vendors") + egui::Window::new("vendors") .open(&mut is_showing_vendors) + .title_bar(false) .vscroll(true) .show(&ctx, |ui| { + ui.heading("Vendors"); // Vendor filter //----------------------------------------------------------------------------------- ui.heading("\nFind Vendor"); @@ -561,9 +571,9 @@ impl eframe::App for MarketApp { //----------------------------------------------------------------------------------- let mut is_showing_vendor_status = self.is_showing_vendor_status; egui::Window::new(&self.vendor_status.i2p) + .title_bar(false) .open(&mut is_showing_vendor_status) .vscroll(true) - .title_bar(false) .id(egui::Id::new(self.vendor_status.i2p.clone())) .show(&ctx, |ui| { if self.is_pinging { @@ -595,8 +605,9 @@ impl eframe::App for MarketApp { // Product image window //----------------------------------------------------------------------------------- let mut is_showing_product_image = self.is_showing_product_image; - egui::Window::new("") + egui::Window::new("product image") .open(&mut is_showing_product_image) + .title_bar(false) .vscroll(true) .show(ctx, |ui| { self.product_image.show(ui); @@ -613,10 +624,12 @@ impl eframe::App for MarketApp { // Products Management window //----------------------------------------------------------------------------------- let mut is_showing_products = self.is_showing_products; - egui::Window::new("Products") + egui::Window::new("product management") .open(&mut is_showing_products) + .title_bar(false) .vscroll(true) .show(&ctx, |ui| { + ui.heading("Products"); use egui_extras::{ Column, TableBuilder, @@ -765,10 +778,12 @@ impl eframe::App for MarketApp { // Update Product window //----------------------------------------------------------------------------------- let mut is_showing_product_update = self.is_showing_product_update; - egui::Window::new(format!("Update Product - {}", self.new_product_name)) + egui::Window::new("update product") .open(&mut is_showing_product_update) + .title_bar(false) .vscroll(true) .show(ctx, |ui| { + ui.heading(format!("Update Product - {}", self.new_product_name)); ui.label( "____________________________________________________________________________\n", ); @@ -843,10 +858,12 @@ impl eframe::App for MarketApp { // Vendor Orders window //----------------------------------------------------------------------------------- let mut is_showing_orders = self.is_showing_orders; - egui::Window::new("Manage Orders") + egui::Window::new("manage orders") .open(&mut is_showing_orders) + .title_bar(false) .vscroll(true) .show(&ctx, |ui| { + ui.heading("Manage Orders"); use egui_extras::{ Column, TableBuilder, diff --git a/neveko-gui/src/apps/wallet.rs b/neveko-gui/src/apps/wallet.rs index ccaa4f4..bf09b14 100644 --- a/neveko-gui/src/apps/wallet.rs +++ b/neveko-gui/src/apps/wallet.rs @@ -61,10 +61,12 @@ impl eframe::App for WalletApp { // Sweep Result //----------------------------------------------------------------------------------- let mut is_showing_sweep_result = self.is_showing_sweep_result; - egui::Window::new("Sweep Result") + egui::Window::new("sweep result") .open(&mut is_showing_sweep_result) + .title_bar(false) .vscroll(true) .show(ctx, |ui| { + ui.heading("Sweep Result"); if self.is_loading { ui.add(egui::Spinner::new()); ui.label("sweeping..."); @@ -78,8 +80,9 @@ impl eframe::App for WalletApp { // QR //----------------------------------------------------------------------------------- let mut is_showing_qr = self.is_showing_qr; - egui::Window::new("") + egui::Window::new("wallet qr") .open(&mut is_showing_qr) + .title_bar(false) .vscroll(true) .show(ctx, |ui| { if !self.is_qr_set && self.s_xmr_address != utils::empty_string() {