mirror of
https://github.com/Astatin3/unshell.git
synced 2026-06-09 06:47:59 -06:00
Start work on server
This commit is contained in:
Michael Mikovsky
+42
-49
@@ -1,12 +1,16 @@
|
||||
use egui::Frame;
|
||||
use egui_tiles::Tree;
|
||||
|
||||
use crate::app::{AppState, windows::WindowWrapper};
|
||||
use crate::{
|
||||
app::{AppState, windows::WindowWrapper},
|
||||
auth::Auth,
|
||||
};
|
||||
|
||||
/// We derive Deserialize/Serialize so we can persist app state on shutdown.
|
||||
#[derive(serde::Deserialize, serde::Serialize)]
|
||||
#[serde(default)] // if we add new fields, give them default values when deserializing old state
|
||||
pub struct TemplateApp {
|
||||
auth: Auth,
|
||||
// tab: Tab,
|
||||
state: AppState,
|
||||
tree: Tree<WindowWrapper>,
|
||||
@@ -14,22 +18,8 @@ pub struct TemplateApp {
|
||||
|
||||
impl Default for TemplateApp {
|
||||
fn default() -> Self {
|
||||
// let mut tiles = egui_tiles::Tiles::default();
|
||||
|
||||
// let invis_1 = tiles.insert_pane(WindowWrapper {
|
||||
// nr: 0,
|
||||
// window: AppWindow::None,
|
||||
// });
|
||||
// let invis_2 = tiles.insert_pane(WindowWrapper {
|
||||
// nr: 0,
|
||||
// window: AppWindow::None,
|
||||
// });
|
||||
|
||||
// tiles.set_visible(invis_1, false);
|
||||
// tiles.set_visible(invis_2, false);
|
||||
// let root = tiles.insert_horizontal_tile(vec![invis_1]);
|
||||
|
||||
Self {
|
||||
auth: Auth::default(),
|
||||
state: AppState::default(),
|
||||
tree: egui_tiles::Tree::new_horizontal("tree_root", Vec::new()),
|
||||
}
|
||||
@@ -38,17 +28,17 @@ impl Default for TemplateApp {
|
||||
|
||||
impl TemplateApp {
|
||||
/// Called once before the first frame.
|
||||
pub fn new(_cc: &eframe::CreationContext<'_>) -> Self {
|
||||
pub fn new(cc: &eframe::CreationContext<'_>) -> Self {
|
||||
// This is also where you can customize the look and feel of egui using
|
||||
// `cc.egui_ctx.set_visuals` and `cc.egui_ctx.set_fonts`.
|
||||
|
||||
// Load previous app state (if any).
|
||||
// Note that you must enable the `persistence` feature for this to work.
|
||||
// if let Some(storage) = cc.storage {
|
||||
// eframe::get_value(storage, eframe::APP_KEY).unwrap_or_default()
|
||||
// } else {
|
||||
Default::default()
|
||||
// }
|
||||
if let Some(storage) = cc.storage {
|
||||
eframe::get_value(storage, eframe::APP_KEY).unwrap_or_default()
|
||||
} else {
|
||||
Default::default()
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -60,40 +50,43 @@ impl eframe::App for TemplateApp {
|
||||
|
||||
/// Called each time the UI needs repainting, which may be many times per second.
|
||||
fn update(&mut self, ctx: &egui::Context, _frame: &mut eframe::Frame) {
|
||||
// Put your widgets into a `SidePanel`, `TopBottomPanel`, `CentralPanel`, `Window` or `Area`.
|
||||
// For inspiration and more examples, go to https://emilk.github.io/egui
|
||||
if !self.auth.logged_in() {
|
||||
egui::CentralPanel::default()
|
||||
.frame(Frame::central_panel(&ctx.style()).inner_margin(0))
|
||||
.show(ctx, |ui| self.auth.update(ui));
|
||||
} else {
|
||||
egui::TopBottomPanel::top("tab_panel").show(ctx, |ui| {
|
||||
// The top panel is often a good place for a menu bar:
|
||||
|
||||
egui::TopBottomPanel::top("tab_panel").show(ctx, |ui| {
|
||||
// The top panel is often a good place for a menu bar:
|
||||
egui::MenuBar::new().ui(ui, |ui| {
|
||||
ui.menu_button("File", |ui| {
|
||||
ui.label("File");
|
||||
});
|
||||
|
||||
egui::MenuBar::new().ui(ui, |ui| {
|
||||
ui.menu_button("File", |ui| {
|
||||
ui.label("File");
|
||||
});
|
||||
|
||||
ui.menu_button("View", |ui| {
|
||||
ui.label("View");
|
||||
|
||||
self.state.labels(&mut self.tree, ui);
|
||||
ui.menu_button("View", |ui| {
|
||||
ui.label("View");
|
||||
|
||||
self.state.labels(&mut self.tree, ui);
|
||||
});
|
||||
|
||||
ui.with_layout(egui::Layout::right_to_left(egui::Align::Center), |ui| {
|
||||
egui::widgets::global_theme_preference_switch(ui);
|
||||
});
|
||||
|
||||
// ui.style
|
||||
});
|
||||
});
|
||||
|
||||
egui::TopBottomPanel::bottom("tab_panel").show(ctx, |ui| {
|
||||
ui.with_layout(egui::Layout::right_to_left(egui::Align::Center), |ui| {
|
||||
egui::widgets::global_theme_preference_switch(ui);
|
||||
ui.label(format!("UnShell UI {}", env!("CARGO_PKG_VERSION")));
|
||||
egui::warn_if_debug_build(ui);
|
||||
});
|
||||
|
||||
// ui.style
|
||||
});
|
||||
});
|
||||
|
||||
egui::TopBottomPanel::bottom("tab_panel").show(ctx, |ui| {
|
||||
ui.with_layout(egui::Layout::right_to_left(egui::Align::Center), |ui| {
|
||||
ui.label(format!("UnShell UI {}", env!("CARGO_PKG_VERSION")));
|
||||
egui::warn_if_debug_build(ui);
|
||||
});
|
||||
});
|
||||
|
||||
egui::CentralPanel::default()
|
||||
.frame(Frame::central_panel(&ctx.style()).inner_margin(0))
|
||||
.show(ctx, |ui| self.tree.ui(&mut self.state, ui));
|
||||
egui::CentralPanel::default()
|
||||
.frame(Frame::central_panel(&ctx.style()).inner_margin(0))
|
||||
.show(ctx, |ui| self.tree.ui(&mut self.state, ui));
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
+28
-74
@@ -3,11 +3,9 @@ mod windows;
|
||||
|
||||
use std::collections::HashMap;
|
||||
|
||||
use crate::{app::windows::WindowWrapper, config::Config, flowchart::FlowChart};
|
||||
pub use app::TemplateApp;
|
||||
use egui_tiles::{TileId, Tree};
|
||||
use log::info;
|
||||
|
||||
use crate::{app::windows::WindowWrapper, config::Config, flowchart::FlowChart};
|
||||
|
||||
#[derive(Default, serde::Deserialize, serde::Serialize)]
|
||||
struct AppState {
|
||||
@@ -29,87 +27,44 @@ impl AppState {
|
||||
let enabled = self.open_windows.contains_key(&key);
|
||||
|
||||
if ui.selectable_label(enabled, *name).clicked() {
|
||||
// if enabled {
|
||||
// let tid = *self.open_windows.get(&key).unwrap();
|
||||
// tree.remove_recursively(tid);
|
||||
// tree.tiles.remove(tid);
|
||||
// self.open_windows.remove(&key);
|
||||
if enabled {
|
||||
let tid = *self.open_windows.get(&key).unwrap();
|
||||
tree.remove_recursively(tid);
|
||||
tree.tiles.remove(tid);
|
||||
self.open_windows.remove(&key);
|
||||
|
||||
// // if self.open_windows.is_empty()
|
||||
// } else {
|
||||
let tid = tree.tiles.insert_pane(WindowWrapper {
|
||||
nr: i + 1,
|
||||
window: *key,
|
||||
});
|
||||
// if self.open_windows.is_empty()
|
||||
} else {
|
||||
let tid = tree.tiles.insert_pane(WindowWrapper {
|
||||
nr: i + 1,
|
||||
window: *key,
|
||||
});
|
||||
|
||||
match self.open_windows.len() {
|
||||
0 => {
|
||||
tree.root = Some(tid);
|
||||
}
|
||||
1 => {
|
||||
let old_root = tree.root.unwrap();
|
||||
let tab_id = tree.tiles.insert_tab_tile(vec![old_root, tid]);
|
||||
tree.root = Some(tab_id);
|
||||
}
|
||||
_ => {
|
||||
let pid = tree.tiles.insert_tab_tile(vec![tid]);
|
||||
tree.move_tile_to_container(pid, tree.root.unwrap().clone(), 0, true);
|
||||
match self.open_windows.len() {
|
||||
0 => {
|
||||
tree.root = Some(tid);
|
||||
}
|
||||
1 => {
|
||||
let old_root = tree.root.unwrap();
|
||||
let tab_id = tree.tiles.insert_tab_tile(vec![old_root, tid]);
|
||||
tree.root = Some(tab_id);
|
||||
tree.make_active(|t, _| t == tid);
|
||||
}
|
||||
_ => {
|
||||
let root = tree.root().unwrap();
|
||||
let n = tree.tiles.get_container(root).unwrap().num_children();
|
||||
tree.move_tile_to_container(tid, tree.root.unwrap().clone(), n, true);
|
||||
}
|
||||
}
|
||||
self.open_windows.insert(key.clone(), tid);
|
||||
}
|
||||
|
||||
self.open_windows.insert(key.clone(), tid);
|
||||
}
|
||||
}
|
||||
|
||||
// if ui
|
||||
// .selectable_label(
|
||||
// self.open_windows.contains_key(&AppWindow::Flowchart),
|
||||
// "Network",
|
||||
// )
|
||||
// .clicked()
|
||||
// {
|
||||
// // self.open_windows. = Tab::Flowchart;
|
||||
// }
|
||||
|
||||
// if ui
|
||||
// .selectable_label(self.open_windows.contains_key(&AppWindow::Config), "Config")
|
||||
// .clicked()
|
||||
// {
|
||||
// // self.open_windows. = Tab::Flowchart;
|
||||
// }
|
||||
|
||||
// if ui
|
||||
// .selectable_label(self.tab == Tab::Test, self.config.title())
|
||||
// .clicked()
|
||||
// {
|
||||
// self.tab = Tab::Test;
|
||||
// }
|
||||
}
|
||||
|
||||
// fn contains(&self, key: &AppWindow)
|
||||
|
||||
// fn toggle(&mut self, key: &AppWindow) {
|
||||
// if self.
|
||||
// }
|
||||
}
|
||||
|
||||
// impl Default for AppState {
|
||||
// fn default() -> Self {
|
||||
// Self {
|
||||
// open_windows: HashMap::from([
|
||||
// (AppWindow::Flowchart, false),
|
||||
// (AppWindow::Config, false),
|
||||
// ]),
|
||||
|
||||
// flowchart: Default::default(),
|
||||
// config: Default::default(),
|
||||
// }
|
||||
// }
|
||||
// }
|
||||
|
||||
#[derive(Clone, Copy, serde::Deserialize, serde::Serialize, PartialEq, Eq, Hash)]
|
||||
enum AppWindow {
|
||||
None,
|
||||
Flowchart,
|
||||
Config,
|
||||
}
|
||||
@@ -117,7 +72,6 @@ enum AppWindow {
|
||||
impl AppWindow {
|
||||
fn update(&self, state: &mut AppState, ui: &mut egui::Ui) {
|
||||
match self {
|
||||
AppWindow::None => {}
|
||||
AppWindow::Flowchart => state.flowchart.paint(ui),
|
||||
AppWindow::Config => state.config.update(ui),
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user