diff options
| author | Doug McLain <doug@nostar.net> | 2007-07-05 05:33:40 +0000 |
|---|---|---|
| committer | Doug McLain <doug@nostar.net> | 2007-07-05 05:33:40 +0000 |
| commit | 291a186cba343ed705c60d15fa7db0b21eb8a1fd (patch) | |
| tree | 683a299b237164b5a67d2d79e9b05dc2251b8f46 /libs/gtkmm2ext | |
| parent | 0518b045c62ef764eced6fff0b64d4f71832a7b0 (diff) | |
New theme manager from trunk, backported to 2.0-ongoing
git-svn-id: svn://localhost/ardour2/branches/2.0-ongoing@2110 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'libs/gtkmm2ext')
| -rw-r--r-- | libs/gtkmm2ext/gtk_ui.cc | 11 | ||||
| -rw-r--r-- | libs/gtkmm2ext/gtkmm2ext/gtk_ui.h | 6 |
2 files changed, 12 insertions, 5 deletions
diff --git a/libs/gtkmm2ext/gtk_ui.cc b/libs/gtkmm2ext/gtk_ui.cc index 903f56ba6f..be415acba2 100644 --- a/libs/gtkmm2ext/gtk_ui.cc +++ b/libs/gtkmm2ext/gtk_ui.cc @@ -61,7 +61,7 @@ BaseUI::RequestType Gtkmm2ext::AddTimeout = BaseUI::new_request_type(); #include <pbd/abstract_ui.cc> /* instantiate the template */ -UI::UI (string namestr, int *argc, char ***argv, string rcfile) +UI::UI (string namestr, int *argc, char ***argv) : AbstractUI<UIRequest> (namestr, true) { theMain = new Main (argc, argv); @@ -99,7 +99,6 @@ UI::UI (string namestr, int *argc, char ***argv, string rcfile) register_thread (pthread_self(), X_("GUI")); - load_rcfile (rcfile); } UI::~UI () @@ -114,7 +113,7 @@ UI::caller_is_ui_thread () } int -UI::load_rcfile (string path) +UI::load_rcfile (string path, bool themechange) { if (path.length() == 0) { return -1; @@ -129,6 +128,12 @@ UI::load_rcfile (string path) } RC rc (path.c_str()); + RC::reset_styles(Gtk::Settings::get_default()); + theme_changed.emit(); + + if (themechange) { + return 0; //Don't continue on every time there is a theme change + } /* have to pack widgets into a toplevel window so that styles will stick */ diff --git a/libs/gtkmm2ext/gtkmm2ext/gtk_ui.h b/libs/gtkmm2ext/gtkmm2ext/gtk_ui.h index b6a52c6c0c..0c2ff0d798 100644 --- a/libs/gtkmm2ext/gtkmm2ext/gtk_ui.h +++ b/libs/gtkmm2ext/gtkmm2ext/gtk_ui.h @@ -87,7 +87,7 @@ struct UIRequest : public BaseUI::BaseRequestObject { class UI : public Receiver, public AbstractUI<UIRequest> { public: - UI (string name, int *argc, char **argv[], string rcfile); + UI (string name, int *argc, char **argv[]); virtual ~UI (); static UI *instance() { return theGtkUI; } @@ -107,7 +107,7 @@ class UI : public Receiver, public AbstractUI<UIRequest> bool running (); void quit (); void kill (); - int load_rcfile (string); + int load_rcfile (string, bool themechange = false); void run (Receiver &old_receiver); void set_state (Gtk::Widget *w, Gtk::StateType state); @@ -132,6 +132,8 @@ class UI : public Receiver, public AbstractUI<UIRequest> sigc::signal<void> starting; sigc::signal<void> stopping; + sigc::signal<void> theme_changed; + static bool just_hide_it (GdkEventAny *, Gtk::Window *); static pthread_t the_gui_thread() { return gui_thread; } |