diff options
| author | Paul Davis <paul@linuxaudiosystems.com> | 2014-12-08 22:02:32 -0500 |
|---|---|---|
| committer | Paul Davis <paul@linuxaudiosystems.com> | 2014-12-08 22:02:38 -0500 |
| commit | 0bb8e80f87f1cfd84ebfd02e48b9addffacb78c4 (patch) | |
| tree | 19e711a870e8c0ffca480635f26376cfeee8f808 /gtk2_ardour/theme_manager.cc | |
| parent | 9ac551abab0fd80d3e61cb084d2e70c4ecc78310 (diff) | |
more tweaking of color management.
User's own modification to NAME.colors are stored in $CONFIG/my-NAME.colors now.
Diffstat (limited to 'gtk2_ardour/theme_manager.cc')
| -rw-r--r-- | gtk2_ardour/theme_manager.cc | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/gtk2_ardour/theme_manager.cc b/gtk2_ardour/theme_manager.cc index 1f333058ed..c48b8a494f 100644 --- a/gtk2_ardour/theme_manager.cc +++ b/gtk2_ardour/theme_manager.cc @@ -639,6 +639,8 @@ ThemeManager::alias_palette_event (GdkEvent* ev, string new_alias, string target void ThemeManager::alias_palette_response (int response, std::string target_name, std::string old_alias) { + cerr << "palette response: " << response << endl; + switch (response) { case GTK_RESPONSE_OK: case GTK_RESPONSE_ACCEPT: @@ -646,10 +648,15 @@ ThemeManager::alias_palette_response (int response, std::string target_name, std setup_aliases (); break; - default: + + case GTK_RESPONSE_REJECT: /* revert choice */ ARDOUR_UI::instance()->config()->set_alias (target_name, old_alias); break; + + default: + /* do nothing */ + break; } palette_window->hide (); @@ -668,7 +675,7 @@ ThemeManager::choose_color_from_palette (string const & name) delete palette_window; palette_window = new ArdourDialog (_("Color Palette")); - palette_window->add_button (Stock::CANCEL, RESPONSE_CANCEL); + palette_window->add_button (Stock::CANCEL, RESPONSE_REJECT); /* using CANCEL causes confusion if dialog is closed via CloseAllDialogs */ palette_window->add_button (Stock::OK, RESPONSE_OK); ArdourCanvas::GtkCanvas* canvas = new ArdourCanvas::GtkCanvas (); |