Missing buttons functionality

data/src/synchronized/mod.rs

@@ -76,6 +76,11 @@ impl<A: Address + Hash + Eq> ServersGuiCtx for _Impl<'_, A> {
         unsafe { self.get_unprotected() }.remove_server(addr);
     }
 
+    fn edit_memo(&mut self, addr: &Self::Address, new_memo: String) {
+        let r_lock_scope = self.data.mutex.read();
+        unsafe { self.get_unprotected() }.edit_memo(addr, new_memo);
+    }
+
     fn iter_servers(
         &self,
     ) -> impl Iterator<Item = (&Self::Address, &str, impl Iterator<Item = Option<u128>>)> {

data/src/unprotected.rs

@@ -49,7 +49,7 @@ impl<A: Address + Hash + Eq> ServersGuiCtx for ServersStorage<A> {
 
     fn add_server(&mut self, addr: Self::Address, memo: String) {
         if self.map.get(&addr).is_some() {
-            todo!()
+            // todo сделать что-нибудь умное
         };
 
         self.map
@@ -60,6 +60,12 @@ impl<A: Address + Hash + Eq> ServersGuiCtx for ServersStorage<A> {
         self.map.remove(addr);
     }
 
+    fn edit_memo(&mut self, addr: &Self::Address, new_memo: String) {
+        if let Some((s, _)) = self.map.get_mut(addr) {
+            *s = new_memo;
+        }
+    }
+
     fn iter_servers(
         &self,
     ) -> impl Iterator<Item = (&Self::Address, &str, impl Iterator<Item = Option<u128>>)> {

gui/abstract/src/lib.rs

@@ -4,7 +4,10 @@ pub trait ServersStorage {
     type Address: Address;
 
     fn add_server(&mut self, addr: Self::Address, memo: String);
+    
     fn remove_server(&mut self, addr: &Self::Address);
+    
+    fn edit_memo(&mut self, addr: &Self::Address, new_memo: String);
 
     // type TimeIterator: Iterator<Item = Option<u128>>;
     fn iter_servers(

gui/egui/src/lib.rs

@@ -27,22 +27,31 @@ pub fn run_eframe_gui<Ctx: ServersStorage>(ctx: &mut Ctx) -> eframe::Result {
 }
 
 #[derive(PartialEq, Eq)]
-enum ModalWindows {
+enum ModalWindows<A: Address> {
     Root,
     Add { addr: String, memo: String },
     FailedAdd { why: String },
-    Edit,
+    EditMemo { address: A, memo: String },
 }
 
-struct EguiApp<'a, Ctx> {
+impl<A: Address> ModalWindows<A> {
+    fn is_root(&self) -> bool {
+        match self {
+            ModalWindows::Root => return true,
+            _ => return false,
+        }
+    }
+}
+
+struct EguiApp<'a, Ctx: ServersStorage> {
     ctx: &'a mut Ctx,
-    modal_windows: ModalWindows,
+    modal_windows: ModalWindows<Ctx::Address>,
 }
 
 impl<Ctx: ServersStorage> App for EguiApp<'_, Ctx> {
     fn update(&mut self, ctx: &Context, frame: &mut Frame) {
         egui::CentralPanel::default().show(ctx, |ui| {
-            ui.add_enabled_ui(self.modal_windows == ModalWindows::Root, |ui| {
+            ui.add_enabled_ui(self.modal_windows.is_root(), |ui| {
                 if ui.button("Add server").clicked() {
                     self.modal_windows = ModalWindows::Add {
                         addr: "".to_owned(),
@@ -51,6 +60,8 @@ impl<Ctx: ServersStorage> App for EguiApp<'_, Ctx> {
                 }
             });
 
+            let mut address_to_remove = None;
+
             TableBuilder::new(ui)
                 .striped(true) // Alternating row colors
                 .resizable(true)
@@ -78,14 +89,11 @@ impl<Ctx: ServersStorage> App for EguiApp<'_, Ctx> {
 
                             r.col(|ui| {
                                 ui.horizontal(|ui| {
-                                    ui.add_enabled_ui(
+                                    ui.add_enabled_ui(self.modal_windows.is_root(), |ui| {
-                                        self.modal_windows == ModalWindows::Root,
+                                        if ui.button("-").clicked() {
-                                        |ui| {
+                                            address_to_remove = Some(addr.clone());
-                                            if ui.button("-").clicked() {
+                                        }
-                                                todo!("Remove server")
+                                    });
-                                            }
-                                        },
-                                    );
                                     ui.label(addr.to_string());
                                 });
                             });
@@ -93,20 +101,24 @@ impl<Ctx: ServersStorage> App for EguiApp<'_, Ctx> {
                             r.col(|ui| {
                                 ui.horizontal(|ui| {
                                     ui.add(egui::Label::new(memo).wrap());
-                                    ui.add_enabled_ui(
+                                    ui.add_enabled_ui(self.modal_windows.is_root(), |ui| {
-                                        self.modal_windows == ModalWindows::Root,
+                                        if ui.button("edit").clicked() {
-                                        |ui| {
+                                            self.modal_windows = ModalWindows::EditMemo {
-                                            if ui.button("edit").clicked() {
+                                                address: addr.clone(),
-                                                todo!("edit memo")
+                                                memo: memo.to_owned(),
                                             }
-                                        },
+                                        }
-                                    );
+                                    });
                                 });
                             });
                         })
                     }
                 });
 
+            if let Some(addr) = address_to_remove {
+                self.ctx.remove_server(&addr);
+            }
+
             match &mut self.modal_windows {
                 ModalWindows::Root => {}
                 ModalWindows::Add { addr, memo } => {
@@ -147,7 +159,7 @@ impl<Ctx: ServersStorage> App for EguiApp<'_, Ctx> {
                     }
                 }
                 ModalWindows::FailedAdd { why } => {
-                    subwindow(
+                    if subwindow(
                         ui,
                         "add_error",
                         "Failed to resolve address",
@@ -155,9 +167,38 @@ impl<Ctx: ServersStorage> App for EguiApp<'_, Ctx> {
                         |ui| {
                             ui.label(why.clone());
                         },
-                    );
+                    )
+                    .close_requested()
+                    {
+                        self.modal_windows = ModalWindows::Root;
+                    }
+                }
+                ModalWindows::EditMemo { address, memo } => {
+                    let mut apply = false;
+                    let closed = subwindow(
+                        ui,
+                        "edit_memo",
+                        "Edit memo",
+                        |vb| vb,
+                        |ui| {
+                            ui.label(address.to_string());
+                            ui.text_edit_singleline(memo);
+                            if ui.button("Save").clicked() {
+                                apply = true;
+                            }
+                        },
+                    )
+                    .close_requested();
+
+                    if apply {
+                        self.ctx.edit_memo(address, memo.clone());
+                        self.modal_windows = ModalWindows::Root;
+                    }
+
+                    if closed {
+                        self.modal_windows = ModalWindows::Root;
+                    }
                 }
-                ModalWindows::Edit => {}
             };
         });
         ctx.request_repaint()