Cargo.toml

@@ -20,7 +20,7 @@ pki-types = { package = "rustls-pki-types", version = "1.0", features = [
     "alloc",
 ] }
 tokio-rustls = { version = "0.25" }
-env_logger = "0.11"
+env_logger = "0.10.1"
 log = "0.4.20"
 tokio = { version = "1.34.0", features = ["full", "tracing"] }
 webpki-roots = "0.26.0"
@@ -28,10 +28,7 @@ nom = "7.1.3"
 managesieve = { path = "../managesieve" }
 anyhow = "1.0"
 thiserror = "1.0"
-gtk = { version = "0.7", package = "gtk4", features = [
+gtk4 = { version = "0.7", features = ["gnome_45", "blueprint"] }
-    "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"

gui/main_window.blp

@@ -2,77 +2,53 @@ using Gtk 4.0;
 using Adw 1;
 
 Adw.ApplicationWindow window {
-  default-width: 900;
+    default-width: 900;
-  default-height: 500;
+    default-height: 500;
 
-  content: Gtk.Box {
+    content: Gtk.Box {
-    orientation: vertical;
+        orientation: vertical;
 
-    Adw.HeaderBar {
+        Adw.HeaderBar{
-      title-widget: Adw.WindowTitle {
+            title-widget: Adw.WindowTitle {
-        title: "Sieverman";
+                title: "Sieverman";
-      };
+            };
 
-      [start]
+            Gtk.Button { label: "Neu";}
-      Gtk.Button {
-        label: "Neu";
-      }
-
-      [end]
-      Gtk.ToggleButton settings_button {
-        icon-name: "open-menu-symbolic";
-        active: true;
-      }
-    }
-
-    Gtk.Box {
-      orientation: horizontal;
-      vexpand: true;
-      halign: fill;
-
-      Gtk.Label {
-        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;
-              valign: center;
-              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:";
-              }
-            }
-          }
         }
-      }
+        Gtk.Box {
-    }
+            orientation: horizontal;
             
-    Gtk.Statusbar {
+            vexpand: true;
-      Gtk.Label {
+            halign: fill;
-        label: "Status";
+
-      }
+            Gtk.Label{
-    }
+                label: "Log information";
-  };
+                hexpand: true;
+            }
+            Gtk.ScrolledWindow server_info {
+                width-request: 100;
+                Adw.PreferencesPage {
+            Adw.PreferencesGroup server_settings{
+                vexpand: true;
+                valign: center;
+                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:";}
+
+        }}
+                
+            }
+        }
+        Gtk.Statusbar{Gtk.Label{
+                label: "Status";
+            }}
+
+    };
 }

src/bin/gui/main_window.rs

@@ -1,7 +1,8 @@
 use std::{cell::RefCell, rc::Rc};
 
 use crate::__COMPILED_BLUEPRINT_MAP__;
-use gtk::{
+use gtk4::{
+    glib,
     prelude::{ApplicationExt, GtkWindowExt},
     Application,
 };
@@ -24,17 +25,16 @@ pub(crate) fn get_app(
 }
 
 fn build_ui(
-    app: &gtk::Application,
+    app: &gtk4::Application,
     from_backend_rx: Rc<RefCell<Option<tokio::sync::mpsc::Receiver<BackToFront>>>>,
 ) {
-    let builder = gtk::Builder::new();
+    let builder = gtk4::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 = gtk::glib::MainContext::default();
+    let c = 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 = gtk::Builder::new();
+    let builder = gtk4::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::<gtk::Label>("server_info_row_value")
+        .object::<gtk4::Label>("server_info_row_value")
         .unwrap();
     label.set_label(value);
     row

src/bin/sieverman.rs

@@ -3,7 +3,7 @@ mod gui;
 pub mod protocol;
 use std::{cell::RefCell, rc::Rc, thread, time::Duration};
 
-use gtk::{glib, prelude::ApplicationExtManual as _};
+use gtk4::{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();
 
-    gtk::init().expect("Failed to initialize GTK");
+    gtk4::init().expect("Failed to initialize GTK");
     libadwaita::init().expect("Adwaita initialization failed");
 
     let (to_frontent_tx, from_backend_rx) = tokio::sync::mpsc::channel(5);