Merge pull request #224 from squidowl/feat/new-iced

Updated iced to master

Cargo.toml

@@ -14,14 +14,14 @@ data = { version = "0.1.0", path = "data" }
 notify-rust = "4"
 chrono = { version = "0.4", features = ['serde'] }
 fern = "0.6.1"
-iced = { version = "0.9", features = ["tokio", "lazy", "advanced", "image"] }
+iced = { version = "0.12.0", features = ["tokio", "lazy", "advanced", "image"] }
 log = "0.4.16"
 once_cell = "1.18"
-palette = "=0.7.2"
+palette = "0.7.4"
 thiserror = "1.0.30"
 tokio = { version = "1.0", features = ["rt", "fs", "process"] }
 unicode-segmentation = "1.6"
-open = "4.1.0"
+open = "5.0.1"
 
 [dependencies.uuid]
 version = "1.0"
@@ -34,12 +34,8 @@ image = "0.24.6"
 embed-resource = "2.1.1"
 
 [workspace]
-members = [
-  "data",
-  "irc",
-  "irc/proto",
-]
+members = ["data", "irc", "irc/proto"]
 
 [patch.crates-io]
-iced = { git = "https://github.com/iced-rs/iced", rev = "78dc341ea82449f1e075e37e67c1ccf66b88e8d6" }
-iced_core = { git = "https://github.com/iced-rs/iced", rev = "78dc341ea82449f1e075e37e67c1ccf66b88e8d6" }
+iced = { git = "https://github.com/tarkah/iced", rev = "f9db8d1efe68634b7b06ce07f12ea33a3e37d79c" }
+iced_core = { git = "https://github.com/tarkah/iced", rev = "f9db8d1efe68634b7b06ce07f12ea33a3e37d79c" }

data/Cargo.toml

@@ -12,18 +12,18 @@ chrono = { version = "0.4", features = ['serde'] }
 dirs-next = "2.0.0"
 flate2 = "1.0"
 futures = "0.3.21"
-iced_core = "0.9"
+iced_core = "0.12.0"
 log = "0.4.16"
-palette = "=0.7.2"
+palette = "0.7.4"
 rand = "0.8.4"
 rand_chacha = "0.3.0"
 seahash = "4.1.0"
 serde_json = "1.0"
-serde_yaml = "0.8.23"
+serde_yaml = "0.9.30"
 thiserror = "1.0.30"
 tokio = { version = "1.0", features = ["io-util"] }
 tokio-stream = { version = "0.1", features = ["time"] }
-itertools = "0.10.5"
+itertools = "0.12.1"
 
 [dependencies.irc]
 path = "../irc"

data/src/config/keys.rs

@@ -24,6 +24,8 @@ pub struct Keys {
     pub cycle_previous_buffer: KeyBind,
     #[serde(default = "KeyBind::toggle_nick_list")]
     pub toggle_nick_list: KeyBind,
+    #[serde(default = "KeyBind::command_bar")]
+    pub command_bar: KeyBind,
 }
 
 impl Default for Keys {
@@ -39,6 +41,7 @@ impl Default for Keys {
             cycle_next_buffer: KeyBind::cycle_next_buffer(),
             cycle_previous_buffer: KeyBind::cycle_previous_buffer(),
             toggle_nick_list: KeyBind::toggle_nick_list(),
+            command_bar: KeyBind::command_bar(),
         }
     }
 }
@@ -48,16 +51,17 @@ impl Keys {
         use crate::shortcut::Command::*;
 
         vec![
-            shortcut(self.move_up, MoveUp),
-            shortcut(self.move_down, MoveDown),
-            shortcut(self.move_left, MoveLeft),
-            shortcut(self.move_right, MoveRight),
-            shortcut(self.close_buffer, CloseBuffer),
-            shortcut(self.maximize_buffer, MaximizeBuffer),
-            shortcut(self.restore_buffer, RestoreBuffer),
-            shortcut(self.cycle_next_buffer, CycleNextBuffer),
-            shortcut(self.cycle_previous_buffer, CyclePreviousBuffer),
-            shortcut(self.toggle_nick_list, ToggleNickList),
+            shortcut(self.move_up.clone(), MoveUp),
+            shortcut(self.move_down.clone(), MoveDown),
+            shortcut(self.move_left.clone(), MoveLeft),
+            shortcut(self.move_right.clone(), MoveRight),
+            shortcut(self.close_buffer.clone(), CloseBuffer),
+            shortcut(self.maximize_buffer.clone(), MaximizeBuffer),
+            shortcut(self.restore_buffer.clone(), RestoreBuffer),
+            shortcut(self.cycle_next_buffer.clone(), CycleNextBuffer),
+            shortcut(self.cycle_previous_buffer.clone(), CyclePreviousBuffer),
+            shortcut(self.toggle_nick_list.clone(), ToggleNickList),
+            shortcut(self.command_bar.clone(), CommandBar),
         ]
     }
 }