stuffHEADmaster

4 files changed, 26 insertions, 17 deletions

diff --git a/karld/src/main.rs b/karld/src/main.rs
index 51c33c2..b137bb5 100644
--- a/karld/src/main.rs
+++ b/karld/src/main.rs
@@ -22,24 +22,27 @@ use std::{
 };
 
 fn main() {
-    env_logger::init_from_env("LOG");
+    env_logger::builder()
+        .filter_level(log::LevelFilter::Info)
+        .parse_env("LOG")
+        .init();
     info!("logging");
     if let Err(e) = savestate::load() {
         error!("load failed: {}", e);
     }
-
     #[cfg(target_os = "windows")]
-    log::warn!("Windows is not supported, please dont report any bugs for this platform. Please use a free operating system.");
+    log::warn!("Windows is not supported, please do not report any bugs for this platform. Use a free operating system instead.");
     #[cfg(target_os = "macos")]
-    log::warn!("Mac OS is not supported, please dont report any bugs for this platform. Please use a free operating system.");
+    log::warn!("Mac OS is not supported, please do not report any bugs for this platform. Use a free operating system instead.");
 
     std::thread::spawn(move || {
         std::thread::sleep(std::time::Duration::from_secs_f64(0.1));
         schedule_dynamic();
     });
 
-    interface::start();
+    // demo::load_demo();
 
+    interface::start();
     loop {
         std::thread::sleep(std::time::Duration::from_secs_f64(100.0));
     }
diff --git a/karlgui/src/helper.rs b/karlgui/src/helper.rs
index 4acb9f3..c90e9e8 100644
--- a/karlgui/src/helper.rs
+++ b/karlgui/src/helper.rs
@@ -54,13 +54,13 @@ pub fn edit_value(ui: &mut Ui, prop: Property, value: &mut i64) {
             ui.add(DragValue::new(value).clamp_range(0..=31));
         }
         Property::Hour => {
-            ui.add(DragValue::new(value).clamp_range(0..=23).suffix("h"));
+            ui.add(DragValue::new(value).clamp_range(0..=24).suffix("h"));
         }
         Property::Minute => {
-            ui.add(DragValue::new(value).clamp_range(0..=59).suffix("m"));
+            ui.add(DragValue::new(value).clamp_range(0..=60).suffix("m"));
         }
         Property::Second => {
-            ui.add(DragValue::new(value).clamp_range(0..=59).suffix("s"));
+            ui.add(DragValue::new(value).clamp_range(0..=60).suffix("s"));
         }
         Property::Unix => {
             ui.add(DragValue::new(value).suffix("s"));
diff --git a/karlgui/src/main.rs b/karlgui/src/main.rs
index 89b48b3..eb22d5d 100644
--- a/karlgui/src/main.rs
+++ b/karlgui/src/main.rs
@@ -11,7 +11,10 @@ use log::info;
 use views::{calendar::Calendar, edit::ShowAndEdit};
 
 fn main() {
-    env_logger::init_from_env("LOG");
+    env_logger::builder()
+        .filter_level(log::LevelFilter::Info)
+        .parse_env("LOG")
+        .init();
     info!("starting native app");
     eframe::run_native(
         "karlender",
diff --git a/karlgui/src/views/edit.rs b/karlgui/src/views/edit.rs
index 6162df1..d7d397d 100644
--- a/karlgui/src/views/edit.rs
+++ b/karlgui/src/views/edit.rs
@@ -18,13 +18,11 @@ impl ShowAndEdit {
     pub fn ui(&mut self, ui: &mut Ui, g: &mut Globals) {
         for t in g.tasks.values_mut() {
             let edit = self.edit == Some(t.id);
-            let changed = if edit {
-                if ui.button("💾 Save").clicked() {
-                    self.edit = None;
-                    true
-                } else {
-                    false
-                }
+            let (changed, deleted) = if edit {
+                (
+                    ui.button("💾 Save").clicked(),
+                    ui.button("🗑 Delete").clicked(),
+                )
             } else {
                 ui.add_enabled_ui(self.edit.is_none(), |ui| {
                     if ui
@@ -37,10 +35,15 @@ impl ShowAndEdit {
                         self.edit = Some(t.id);
                     }
                 });
-                false
+                (false, false)
             };
             if changed {
                 g.client.send_sync(ServerboundPacket::UpdateTask(t.clone()));
+                self.edit = None;
+            }
+            if deleted {
+                g.client.send_sync(ServerboundPacket::RemoveTask(t.id));
+                self.edit = None;
             }
             t.ui(ui, edit);
             ui.separator();