🧹 pages: use own MessageType

do not depend on gtk messagetype, which allows to have qt,cli
implementations in the future

Author: vnepogodin

src/actions.rs

@@ -1,4 +1,4 @@
-use crate::pages::{Action, DialogMessage};
+use crate::pages::{Action, DialogMessage, MessageType};
 use crate::{fl, kwin_dbus, utils, PacmanWrapper};
 
 use std::path::Path;
@@ -73,15 +73,15 @@ pub fn change_dns_server(
         dialog_tx
             .send(DialogMessage {
                 msg: fl!("dns-server-changed"),
-                msg_type: gtk::MessageType::Info,
+                msg_type: MessageType::Info,
                 action: Action::SetDnsServer,
             })
             .expect("Couldn't send data to channel");
     } else {
         dialog_tx
             .send(DialogMessage {
                 msg: fl!("dns-server-failed"),
-                msg_type: gtk::MessageType::Error,
+                msg_type: MessageType::Error,
                 action: Action::SetDnsServer,
             })
             .expect("Couldn't send data to channel");
@@ -101,15 +101,15 @@ pub fn reset_dns_server(conn_name: &str, dialog_tx: Sender<DialogMessage>) {
         dialog_tx
             .send(DialogMessage {
                 msg: fl!("dns-server-reset"),
-                msg_type: gtk::MessageType::Info,
+                msg_type: MessageType::Info,
                 action: Action::SetDnsServer,
             })
             .expect("Couldn't send data to channel");
     } else {
         dialog_tx
             .send(DialogMessage {
                 msg: fl!("dns-server-reset-failed"),
-                msg_type: gtk::MessageType::Error,
+                msg_type: MessageType::Error,
                 action: Action::SetDnsServer,
             })
             .expect("Couldn't send data to channel");
@@ -123,7 +123,7 @@ pub fn remove_dblock(dialog_tx: Sender<DialogMessage>) {
             dialog_tx
                 .send(DialogMessage {
                     msg: fl!("removed-db-lock"),
-                    msg_type: gtk::MessageType::Info,
+                    msg_type: MessageType::Info,
                     action: Action::RemoveLock,
                 })
                 .expect("Couldn't send data to channel");
@@ -132,7 +132,7 @@ pub fn remove_dblock(dialog_tx: Sender<DialogMessage>) {
         dialog_tx
             .send(DialogMessage {
                 msg: fl!("lock-doesnt-exist"),
-                msg_type: gtk::MessageType::Info,
+                msg_type: MessageType::Info,
                 action: Action::RemoveLock,
             })
             .expect("Couldn't send data to channel");
@@ -177,7 +177,7 @@ pub fn remove_orphans(dialog_tx: Sender<DialogMessage>) {
         dialog_tx
             .send(DialogMessage {
                 msg: fl!("orphans-not-found"),
-                msg_type: gtk::MessageType::Info,
+                msg_type: MessageType::Info,
                 action: Action::RemoveOrphans,
             })
             .expect("Couldn't send data to channel");
@@ -214,7 +214,7 @@ pub fn install_needed_packages(
         dialog_tx
             .send(DialogMessage {
                 msg: dialog_msg,
-                msg_type: gtk::MessageType::Info,
+                msg_type: MessageType::Info,
                 action: dialog_action,
             })
             .expect("Couldn't send data to channel");

src/installer.rs

@@ -1,3 +1,4 @@
+use crate::pages::MessageType;
 use crate::{check_regular_file, fl, utils, G_HELLO_WINDOW};
 
 use std::fs;
@@ -27,7 +28,7 @@ fn outdated_version_check(window: &gtk::Window, message: String) -> bool {
     if version_tag.contains("testing") {
         utils::show_simple_dialog(
             window,
-            gtk::MessageType::Warning,
+            MessageType::Warning,
             &fl!("testing-iso-warning"),
             message.clone(),
         );
@@ -39,7 +40,7 @@ fn outdated_version_check(window: &gtk::Window, message: String) -> bool {
     if response.is_err() {
         utils::show_simple_dialog(
             window,
-            gtk::MessageType::Warning,
+            MessageType::Warning,
             &fl!("offline-error"),
             message.clone(),
         );
@@ -59,7 +60,7 @@ fn outdated_version_check(window: &gtk::Window, message: String) -> bool {
     if version_tag != latest_version {
         utils::show_simple_dialog(
             window,
-            gtk::MessageType::Warning,
+            MessageType::Warning,
             &fl!("outdated-version-warning"),
             message.clone(),
         );
@@ -85,7 +86,7 @@ fn edition_compat_check(window: &gtk::Window, message: String) -> bool {
         {
             utils::show_simple_dialog(
                 window,
-                gtk::MessageType::Warning,
+                MessageType::Warning,
                 &fl!("unsupported-hw-warning"),
                 message.clone(),
             );
@@ -126,7 +127,7 @@ fn connectivity_check(window: &gtk::Window, message: String) -> bool {
     }
 
     // All connectivity checks failed
-    utils::show_simple_dialog(window, gtk::MessageType::Error, &fl!("offline-error"), message);
+    utils::show_simple_dialog(window, MessageType::Error, &fl!("offline-error"), message);
     false
 }
 

src/pages/mod.rs

@@ -4,6 +4,7 @@ mod tweaks;
 
 use crate::{actions, fl, utils};
 
+use std::fmt;
 use std::path::Path;
 
 use gtk::prelude::*;
@@ -22,18 +23,38 @@ macro_rules! create_gtk_button {
     }};
 }
 
+#[derive(Clone, Copy, Debug)]
+pub enum MessageType {
+    Info,
+    Warning,
+    Error,
+}
+impl fmt::Display for MessageType {
+    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
+        let type_str = match self {
+            MessageType::Info => "INFO",
+            MessageType::Warning => "WARNING",
+            MessageType::Error => "ERROR",
+        };
+        write!(f, "{type_str}")
+    }
+}
+
+#[derive(Clone, Debug)]
 pub struct DialogMessage {
     pub msg: String,
-    pub msg_type: gtk::MessageType,
+    pub msg_type: MessageType,
     pub action: Action,
 }
 
+#[derive(Clone, Debug)]
 pub enum Action {
     RemoveLock,
     RemoveOrphans,
     SetDnsServer,
     InstallGaming,
     InstallSnapper,
+    InstallSpoofDpi,
 }
 
 fn create_fixes_section(builder: &Builder) -> gtk::Box {

src/pages/tweaks.rs

@@ -1,3 +1,4 @@
+use crate::pages::MessageType;
 use crate::systemd_units::SystemdUnits;
 use crate::{fl, systemd_units, utils};
 
@@ -196,9 +197,9 @@ fn toggle_service(
 
             utils::show_simple_dialog(
                 &widget_window,
-                gtk::MessageType::Error,
+                MessageType::Error,
                 &dialog_text,
-                "Error".to_string(),
+                MessageType::Error.to_string(),
             );
         }
         glib::ControlFlow::Continue

src/utils.rs

@@ -1,3 +1,5 @@
+use crate::pages::MessageType;
+
 use std::fs::File;
 use std::path::Path;
 use std::{fs, slice, str};
@@ -162,10 +164,16 @@ pub fn is_root_on_btrfs() -> bool {
 
 pub fn show_simple_dialog(
     widget_window: &gtk::Window,
-    dialog_msg_type: gtk::MessageType,
+    message_type: MessageType,
     dialog_text: &String,
     dialog_title: String,
 ) {
+    let dialog_msg_type = match message_type {
+        MessageType::Info => gtk::MessageType::Info,
+        MessageType::Warning => gtk::MessageType::Warning,
+        MessageType::Error => gtk::MessageType::Error,
+    };
+
     let dialog = gtk::MessageDialog::builder()
         .transient_for(widget_window)
         .message_type(dialog_msg_type)