diff --git a/resources/client_row.ui b/resources/client_row.ui index 226fbbe0..ecb44e63 100644 --- a/resources/client_row.ui +++ b/resources/client_row.ui @@ -66,6 +66,7 @@ center center delete-button + diff --git a/resources/resources.gresource.xml b/resources/resources.gresource.xml index 55500176..eb701a01 100644 --- a/resources/resources.gresource.xml +++ b/resources/resources.gresource.xml @@ -3,8 +3,6 @@ window.ui client_row.ui - style.css - style-dark.css de.feschber.LanMouse.svg diff --git a/resources/style-dark.css b/resources/style-dark.css deleted file mode 100644 index e147077c..00000000 --- a/resources/style-dark.css +++ /dev/null @@ -1,11 +0,0 @@ -#delete-button { - color: @red_1; -} - -#port-edit-cancel { - color: @red_1; -} - -#port-edit-apply { - color: @green_1; -} diff --git a/resources/style.css b/resources/style.css deleted file mode 100644 index a21d63be..00000000 --- a/resources/style.css +++ /dev/null @@ -1,11 +0,0 @@ -#delete-button { - color: @red_3; -} - -#port-edit-cancel { - color: @red_3; -} - -#port-edit-apply { - color: @green_3; -} diff --git a/resources/window.ui b/resources/window.ui index 4b15c861..88c62708 100644 --- a/resources/window.ui +++ b/resources/window.ui @@ -84,6 +84,7 @@ center false port-edit-apply + @@ -93,6 +94,7 @@ center false port-edit-cancel + diff --git a/src/frontend/gtk.rs b/src/frontend/gtk.rs index 7d7dea17..2664c8cb 100644 --- a/src/frontend/gtk.rs +++ b/src/frontend/gtk.rs @@ -12,7 +12,7 @@ use crate::frontend::gtk::window::Window; use adw::Application; use gtk::{ - gdk::Display, glib::clone, prelude::*, subclass::prelude::ObjectSubclassIsExt, CssProvider, + gdk::Display, glib::clone, prelude::*, subclass::prelude::ObjectSubclassIsExt, IconTheme, }; use gtk::{gio, glib, prelude::ApplicationExt}; @@ -51,23 +51,12 @@ fn gtk_main() -> glib::ExitCode { .build(); app.connect_startup(|_| load_icons()); - app.connect_startup(|_| load_css()); app.connect_activate(build_ui); let args: Vec<&'static str> = vec![]; app.run_with_args(&args) } -fn load_css() { - let provider = CssProvider::new(); - provider.load_from_resource("de/feschber/LanMouse/style.css"); - gtk::style_context_add_provider_for_display( - &Display::default().expect("Could not connect to a display."), - &provider, - gtk::STYLE_PROVIDER_PRIORITY_APPLICATION, - ); -} - fn load_icons() { let display = &Display::default().expect("Could not connect to a display."); let icon_theme = IconTheme::for_display(display);