MeexReay/bRAC
1
0
Fork 0
mirror of https://github.com/MeexReay/bRAC.git synced 2025-09-13 15:37:40 +03:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix: replace reset button with buttonrow

Browse Source
This commit is contained in:
MeexReay 2025-08-31 23:22:45 +03:00
parent 0a43cbdf3f
commit a44d35d1f8
3 changed files with 8 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
Cargo.lock generated
View File

@ -242,11 +242,10 @@ checksum = "c08606f8c3cbf4ce6ec8e28fb0014a2c086708fe954eaa885384a6165172e7e8"
[[package]] [[package]]
name = "bRAC" name = "bRAC"
version = "0.1.6+2.0" version = "0.1.7+2.0"
dependencies = [ dependencies = [
"chrono", "chrono",
"clap", "clap",
"futures",
"gdk-pixbuf 0.3.0", "gdk-pixbuf 0.3.0",
"homedir", "homedir",
"lazy_static", "lazy_static",
@ -712,21 +711,6 @@ dependencies = [
"percent-encoding", "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]] [[package]]
name = "futures-channel" name = "futures-channel"
version = "0.3.31" version = "0.3.31"
@ -802,7 +786,6 @@ version = "0.3.31"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "9fa08315bb612088cc391249efdc3bc77536f16c91f6cf495e6fbe85b20a4a81" checksum = "9fa08315bb612088cc391249efdc3bc77536f16c91f6cf495e6fbe85b20a4a81"
dependencies = [ dependencies = [
"futures-channel",
"futures-core", "futures-core",
"futures-io", "futures-io",
"futures-macro", "futures-macro",

6
Cargo.toml
View File

@ -12,7 +12,6 @@ homedir = "0.3.4"
native-tls = "0.2.14" native-tls = "0.2.14"
clap = { version = "4.5.36", features = ["derive", "cargo"] } clap = { version = "4.5.36", features = ["derive", "cargo"] }
serde = { version = "1.0.219", features = ["serde_derive"] } serde = { version = "1.0.219", features = ["serde_derive"] }
# gtk4 = { version = "0.9.6", optional = true }
chrono = "0.4.40" chrono = "0.4.40"
serde_default = "0.2.0" serde_default = "0.2.0"
socks = "0.3.4" 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"] } winapi = { version = "0.3.9", optional = true, features = ["wincon", "winuser"] }
tungstenite = "0.27.0" tungstenite = "0.27.0"
reqwest = { version = "0.12.20", features = ["blocking"] } reqwest = { version = "0.12.20", features = ["blocking"] }
libadwaita = { version = "0.8.0", optional = true, features = ["v1_5"] } libadwaita = { version = "0.8.0", optional = true, features = ["v1_6"] }
# glycin = { version = "2.1.1", optional = true }
futures = "0.3.31"
# gio = { version = "0.20.12", optional = true }
[build-dependencies] [build-dependencies]
winresource = { version = "0.1.20", optional = true } winresource = { version = "0.1.20", optional = true }

11
src/chat/gui.rs
View File

@ -16,9 +16,7 @@ use libadwaita::gdk::{MemoryTexture, Texture};
use libadwaita::gtk::gdk_pixbuf::InterpType; use libadwaita::gtk::gdk_pixbuf::InterpType;
use libadwaita::gtk::{Adjustment, Image}; use libadwaita::gtk::{Adjustment, Image};
use libadwaita::{ use libadwaita::{
self as adw, Avatar, EntryRow, self as adw, Avatar, ButtonRow, EntryRow, PreferencesDialog, PreferencesGroup, PreferencesPage, SpinRow, SwitchRow
PreferencesDialog, PreferencesGroup, PreferencesPage,
SpinRow, SwitchRow
}; };
use adw::gdk::{Cursor, Display}; use adw::gdk::{Cursor, Display};
use adw::gio::{ActionEntry, ApplicationFlags, MemoryInputStream, Menu}; use adw::gio::{ActionEntry, ApplicationFlags, MemoryInputStream, Menu};
@ -224,9 +222,12 @@ fn open_settings(ctx: Arc<Context>, app: &Application) {
// Reset button // 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] ctx,
#[weak] app, #[weak] app,
#[weak] dialog, #[weak] dialog,