diff --git a/wxbox_client/src/lib.rs b/wxbox_client/src/lib.rs index bf1bbe7..ef6b896 100644 --- a/wxbox_client/src/lib.rs +++ b/wxbox_client/src/lib.rs @@ -115,19 +115,30 @@ impl eframe::App for WxboxApp { .show(ui.ctx(), |ui| { ui.horizontal(|ui| { ui.hyperlink_to(attribution.text, attribution.url); - }) + }); + ui.horizontal(|ui| { + ui.label("wxbox is made with <3 by "); + ui.hyperlink_to("core", "https://coredoes.dev"); + ui.label(" and "); + ui.hyperlink_to("tm85", "https://u8.lc"); + }); }); Window::new("wxbox") .resizable(false) .show(ui.ctx(), |ui| { - ui.label("Welcome to wxbox!") + ui.heading("Welcome to wxbox!"); + ui.label("We're glad you're here; Open up the Datasource panel to get started."); + ui.label("If you're using a mouse, you can click and drag to move around and Ctrl+Scroll to zoom."); + ui.label("On a touch-based device like a trackpad or touchscreen, you can tap/click and drag to move around and two-finger pinch to zoom."); + ui.label("You can close this window by clicking the arrow to the left of it's title."); }); let mut need_to_reset_for_next_frame = false; Window::new("Datasource") .resizable(false) + .default_open(false) .show(ui.ctx(), |ui| { ui.collapsing("NOAA", |ui| { ui.collapsing("Multi-Radar Multi-Sensor", |ui| { @@ -150,43 +161,36 @@ impl eframe::App for WxboxApp { } }); }); - }); - - Window::new("Datasource Settings") - .resizable(false) - .show(ui.ctx(), |ui| { - let mut ui_builder = UiBuilder::new(); - ui.scope_builder(ui_builder, |ui| { - egui::Grid::new("dsconfig_grid") - .num_columns(2) - .spacing([40.0, 4.0]) - .striped(true) - .show(ui, |ui| { - ui.label("Data opacity"); - if ui.add(egui::Slider::new(&mut tile_request_options.data_transparency, 0.0..=1.0).suffix("%").custom_formatter( - |u, v| { - egui::emath::format_with_decimals_in_range(u * 100.0, v) - } - )).changed() { - need_to_reset_for_next_frame = true; + ui.separator(); + egui::Grid::new("dsconfig_grid") + .num_columns(2) + .spacing([40.0, 4.0]) + .striped(true) + .show(ui, |ui| { + ui.label("Data opacity"); + if ui.add(egui::Slider::new(&mut tile_request_options.data_transparency, 0.0..=1.0).suffix("%").custom_formatter( + |u, v| { + egui::emath::format_with_decimals_in_range(u * 100.0, v) } - ui.end_row(); + )).changed() { + need_to_reset_for_next_frame = true; + } + ui.end_row(); - ui.label("Show range folded areas"); - if ui.add(toggle(&mut tile_request_options.show_range_folded)).changed() { - need_to_reset_for_next_frame = true; - } - ui.end_row(); + ui.label("Show range folded areas"); + if ui.add(toggle(&mut tile_request_options.show_range_folded)).changed() { + need_to_reset_for_next_frame = true; + } + ui.end_row(); - ui.label("Range folded color"); - if ui.color_edit_button_srgba(rf_color).changed() { - let color = rf_color.to_array(); - let single_number = u32::from_be_bytes(color); - tile_request_options.range_folded_color = single_number; - need_to_reset_for_next_frame = true; - } - }) - }) + ui.label("Range folded color"); + if ui.color_edit_button_srgba(rf_color).changed() { + let color = rf_color.to_array(); + let single_number = u32::from_be_bytes(color); + tile_request_options.range_folded_color = single_number; + need_to_reset_for_next_frame = true; + } + }) }); if need_to_reset_for_next_frame {