Compare commits
2 Commits
f5e2be9651
...
bf4dbc5ba7
Author | SHA1 | Date | |
---|---|---|---|
bf4dbc5ba7 | |||
bd637cb97d |
@ -20,7 +20,7 @@ pki-types = { package = "rustls-pki-types", version = "1.0", features = [
|
||||
"alloc",
|
||||
] }
|
||||
tokio-rustls = { version = "0.25" }
|
||||
env_logger = "0.10.1"
|
||||
env_logger = "0.11"
|
||||
log = "0.4.20"
|
||||
tokio = { version = "1.34.0", features = ["full", "tracing"] }
|
||||
webpki-roots = "0.26.0"
|
||||
@ -28,7 +28,10 @@ nom = "7.1.3"
|
||||
managesieve = { path = "../managesieve" }
|
||||
anyhow = "1.0"
|
||||
thiserror = "1.0"
|
||||
gtk4 = { version = "0.7", features = ["gnome_45", "blueprint"] }
|
||||
gtk = { version = "0.7", package = "gtk4", features = [
|
||||
"gnome_45",
|
||||
"blueprint",
|
||||
] }
|
||||
serde = { version = "1.0.193", features = ["derive"] }
|
||||
libadwaita = { version = "0.5.3", features = ["gtk_v4_10", "v1_4"] }
|
||||
gtk-blueprint = "0.2"
|
||||
|
@ -13,11 +13,20 @@ Adw.ApplicationWindow window {
|
||||
title: "Sieverman";
|
||||
};
|
||||
|
||||
Gtk.Button { label: "Neu";}
|
||||
[start]
|
||||
Gtk.Button {
|
||||
label: "Neu";
|
||||
}
|
||||
|
||||
[end]
|
||||
Gtk.ToggleButton settings_button {
|
||||
icon-name: "open-menu-symbolic";
|
||||
active: true;
|
||||
}
|
||||
}
|
||||
|
||||
Gtk.Box {
|
||||
orientation: horizontal;
|
||||
|
||||
vexpand: true;
|
||||
halign: fill;
|
||||
|
||||
@ -25,8 +34,14 @@ Adw.ApplicationWindow window {
|
||||
label: "Log information";
|
||||
hexpand: true;
|
||||
}
|
||||
|
||||
Gtk.Revealer settings_pane {
|
||||
reveal-child: bind settings_button.active bidirectional;
|
||||
transition-type: slide_left;
|
||||
|
||||
Gtk.ScrolledWindow server_info {
|
||||
width-request: 100;
|
||||
|
||||
Adw.PreferencesPage {
|
||||
Adw.PreferencesGroup server_settings {
|
||||
vexpand: true;
|
||||
@ -34,21 +49,30 @@ Adw.ApplicationWindow window {
|
||||
title: "Server Information";
|
||||
description: "The information the server published on connection";
|
||||
}
|
||||
|
||||
Adw.PreferencesGroup credentials {
|
||||
vexpand: true;
|
||||
valign: center;
|
||||
title: "Login Information";
|
||||
description: "The credentials that will be used to log in.";
|
||||
Adw.EntryRow{title: "Username:";}
|
||||
Adw.PasswordEntryRow{title: "Password:";}
|
||||
|
||||
}}
|
||||
Adw.EntryRow {
|
||||
title: "Username:";
|
||||
}
|
||||
|
||||
Adw.PasswordEntryRow {
|
||||
title: "Password:";
|
||||
}
|
||||
}
|
||||
Gtk.Statusbar{Gtk.Label{
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
Gtk.Statusbar {
|
||||
Gtk.Label {
|
||||
label: "Status";
|
||||
}}
|
||||
|
||||
}
|
||||
}
|
||||
};
|
||||
}
|
@ -1,8 +1,7 @@
|
||||
use std::{cell::RefCell, rc::Rc};
|
||||
|
||||
use crate::__COMPILED_BLUEPRINT_MAP__;
|
||||
use gtk4::{
|
||||
glib,
|
||||
use gtk::{
|
||||
prelude::{ApplicationExt, GtkWindowExt},
|
||||
Application,
|
||||
};
|
||||
@ -25,16 +24,17 @@ pub(crate) fn get_app(
|
||||
}
|
||||
|
||||
fn build_ui(
|
||||
app: >k4::Application,
|
||||
app: >k::Application,
|
||||
from_backend_rx: Rc<RefCell<Option<tokio::sync::mpsc::Receiver<BackToFront>>>>,
|
||||
) {
|
||||
let builder = gtk4::Builder::new();
|
||||
let builder = gtk::Builder::new();
|
||||
builder
|
||||
.add_from_string(get_blp!("gui/main_window.blp"))
|
||||
.expect("Failed to parse blueprint");
|
||||
let main_window = builder
|
||||
.object::<libadwaita::ApplicationWindow>("window")
|
||||
.unwrap();
|
||||
|
||||
let prefrences_group = builder
|
||||
.object::<libadwaita::PreferencesGroup>("server_settings")
|
||||
.unwrap();
|
||||
@ -58,14 +58,14 @@ fn build_ui(
|
||||
}
|
||||
};
|
||||
|
||||
let c = glib::MainContext::default();
|
||||
let c = gtk::glib::MainContext::default();
|
||||
c.spawn_local(future);
|
||||
main_window.present();
|
||||
trace!("Window is visible");
|
||||
}
|
||||
|
||||
fn row_in_settings(name: &str, value: &str) -> libadwaita::ActionRow {
|
||||
let builder = gtk4::Builder::new();
|
||||
let builder = gtk::Builder::new();
|
||||
builder
|
||||
.add_from_string(get_blp!("gui/server_info_row.blp"))
|
||||
.expect("Failed to parse blueprint");
|
||||
@ -75,7 +75,7 @@ fn row_in_settings(name: &str, value: &str) -> libadwaita::ActionRow {
|
||||
.unwrap();
|
||||
row.set_title(name);
|
||||
let label = builder
|
||||
.object::<gtk4::Label>("server_info_row_value")
|
||||
.object::<gtk::Label>("server_info_row_value")
|
||||
.unwrap();
|
||||
label.set_label(value);
|
||||
row
|
||||
|
@ -3,7 +3,7 @@ mod gui;
|
||||
pub mod protocol;
|
||||
use std::{cell::RefCell, rc::Rc, thread, time::Duration};
|
||||
|
||||
use gtk4::{glib, prelude::ApplicationExtManual as _};
|
||||
use gtk::{glib, prelude::ApplicationExtManual as _};
|
||||
use tracing::{info, trace};
|
||||
|
||||
gtk_blueprint::gen_blp_map!("gui");
|
||||
@ -16,7 +16,7 @@ fn main() -> glib::ExitCode {
|
||||
.server_addr(([127, 0, 0, 1], 6669))
|
||||
.init();
|
||||
|
||||
gtk4::init().expect("Failed to initialize GTK");
|
||||
gtk::init().expect("Failed to initialize GTK");
|
||||
libadwaita::init().expect("Adwaita initialization failed");
|
||||
|
||||
let (to_frontent_tx, from_backend_rx) = tokio::sync::mpsc::channel(5);
|
||||
|
Loading…
Reference in New Issue
Block a user