From 92684ab7efedb3ed2509307ffd39196f2bb65b2a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B8rgen=20Lien=20Sell=C3=A6g?= Date: Thu, 6 Aug 2015 17:06:46 +0200 Subject: [PATCH] Working css load --- src/juci.cc | 15 ++++++++++----- src/juci.h | 23 +++++++++++------------ 2 files changed, 21 insertions(+), 17 deletions(-) diff --git a/src/juci.cc b/src/juci.cc index 99dcf6f..9aeadeb 100644 --- a/src/juci.cc +++ b/src/juci.cc @@ -8,7 +8,7 @@ void init_logging() { INFO("Logging initalized"); } -int juci::app::on_command_line(const Glib::RefPtr &cmd) { +int app::on_command_line(const Glib::RefPtr &cmd) { Glib::set_prgname("juci"); Glib::OptionContext ctx("[PATH ...]"); Glib::OptionGroup gtk_group(gtk_get_option_group(true)); @@ -31,7 +31,7 @@ int juci::app::on_command_line(const Glib::RefPtr & return 0; } -void juci::app::on_activate() { +void app::on_activate() { window = std::unique_ptr(new Window()); add_window(*window); window->show(); @@ -43,11 +43,16 @@ void juci::app::on_activate() { window->notebook.open(f); } -juci::app::app() : Gtk::Application("no.sout.juci", Gio::APPLICATION_HANDLES_COMMAND_LINE) { - +app::app() : Gtk::Application("no.sout.juci", Gio::APPLICATION_HANDLES_COMMAND_LINE) { + auto css_provider = Gtk::CssProvider::create(); + if (css_provider->load_from_path(Singleton::style_dir() + "juci.css")) { + auto style_context = Gtk::StyleContext::create(); + style_context->add_provider(css_provider, GTK_STYLE_PROVIDER_PRIORITY_APPLICATION); + style_context->add_provider_for_screen(window->get_screen(), css_provider, GTK_STYLE_PROVIDER_PRIORITY_APPLICATION); + } } int main(int argc, char *argv[]) { init_logging(); - return juci::app().run(argc, argv); + return app().run(argc, argv); } diff --git a/src/juci.h b/src/juci.h index 41c0fd2..87cadc6 100644 --- a/src/juci.h +++ b/src/juci.h @@ -3,19 +3,18 @@ #include "window.h" #include "logging.h" -namespace juci { - class app : public Gtk::Application { - public: - app(); +class app : public Gtk::Application { + public: + app(); - int on_command_line(const Glib::RefPtr &cmd); - void on_activate(); + int on_command_line(const Glib::RefPtr &cmd); + void on_activate(); - private: - std::unique_ptr window; - std::string directory; - std::vector files; - }; -} + private: + std::unique_ptr window; + std::string directory; + std::vector files; +}; #endif // JUCI_JUCI_H_ +