From a44d35d1f8e2496f51fb002db1416cbffe6f8384 Mon Sep 17 00:00:00 2001
From: MeexReay <meexreay@gmail.com>
Date: Sun, 31 Aug 2025 23:22:45 +0300
Subject: [PATCH] fix: replace reset button with buttonrow

---
 Cargo.lock      | 19 +------------------
 Cargo.toml      |  6 +-----
 src/chat/gui.rs | 11 ++++++-----
 3 files changed, 8 insertions(+), 28 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index fa1deef..d43eb97 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -242,11 +242,10 @@ checksum = "c08606f8c3cbf4ce6ec8e28fb0014a2c086708fe954eaa885384a6165172e7e8"
 
 [[package]]
 name = "bRAC"
-version = "0.1.6+2.0"
+version = "0.1.7+2.0"
 dependencies = [
  "chrono",
  "clap",
- "futures",
  "gdk-pixbuf 0.3.0",
  "homedir",
  "lazy_static",
@@ -712,21 +711,6 @@ dependencies = [
  "percent-encoding",
 ]
 
-[[package]]
-name = "futures"
-version = "0.3.31"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "65bc07b1a8bc7c85c5f2e110c476c7389b4554ba72af57d8445ea63a576b0876"
-dependencies = [
- "futures-channel",
- "futures-core",
- "futures-executor",
- "futures-io",
- "futures-sink",
- "futures-task",
- "futures-util",
-]
-
 [[package]]
 name = "futures-channel"
 version = "0.3.31"
@@ -802,7 +786,6 @@ version = "0.3.31"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "9fa08315bb612088cc391249efdc3bc77536f16c91f6cf495e6fbe85b20a4a81"
 dependencies = [
- "futures-channel",
  "futures-core",
  "futures-io",
  "futures-macro",
diff --git a/Cargo.toml b/Cargo.toml
index 5885029..bd414cf 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -12,7 +12,6 @@ homedir = "0.3.4"
 native-tls = "0.2.14"
 clap = { version = "4.5.36", features = ["derive", "cargo"] }
 serde = { version = "1.0.219", features = ["serde_derive"] }
-# gtk4 = { version = "0.9.6", optional = true }
 chrono = "0.4.40"
 serde_default = "0.2.0"
 socks = "0.3.4"
@@ -22,10 +21,7 @@ gdk-pixbuf = { version = "0.3.0", optional = true } # DO NOT UPDATE
 winapi = { version = "0.3.9", optional = true, features = ["wincon", "winuser"] }
 tungstenite = "0.27.0"
 reqwest = { version = "0.12.20", features = ["blocking"] }
-libadwaita = { version = "0.8.0", optional = true, features = ["v1_5"] }
-# glycin = { version = "2.1.1", optional = true }
-futures = "0.3.31"
-# gio = { version = "0.20.12", optional = true }
+libadwaita = { version = "0.8.0", optional = true, features = ["v1_6"] }
 
 [build-dependencies]
 winresource = { version = "0.1.20", optional = true }
diff --git a/src/chat/gui.rs b/src/chat/gui.rs
index 7e39e2c..8e964f8 100644
--- a/src/chat/gui.rs
+++ b/src/chat/gui.rs
@@ -16,9 +16,7 @@ use libadwaita::gdk::{MemoryTexture, Texture};
 use libadwaita::gtk::gdk_pixbuf::InterpType;
 use libadwaita::gtk::{Adjustment, Image};
 use libadwaita::{
-    self as adw, Avatar, EntryRow,
-    PreferencesDialog, PreferencesGroup, PreferencesPage,
-    SpinRow, SwitchRow
+    self as adw, Avatar, ButtonRow, EntryRow, PreferencesDialog, PreferencesGroup, PreferencesPage, SpinRow, SwitchRow
 };
 use adw::gdk::{Cursor, Display};
 use adw::gio::{ActionEntry, ApplicationFlags, MemoryInputStream, Menu};
@@ -224,9 +222,12 @@ fn open_settings(ctx: Arc<Context>, app: &Application) {
 
     // Reset button
 
-    let reset_button = Button::builder().label("Reset all").build();
+    let reset_button = ButtonRow::builder()
+        .title("Reset all")
+        .end_icon_name("user-trash-symbolic")
+        .build();
 
-    reset_button.connect_clicked(clone!(
+    reset_button.connect_activated(clone!(
         #[weak] ctx,
         #[weak] app,
         #[weak] dialog,