From f9b3ed0523611dc89cd2fa43dd777230ff0de2f7 Mon Sep 17 00:00:00 2001 From: Mads Kiilerich Date: Thu, 27 Jan 2022 00:06:19 +0100 Subject: [PATCH] gtkmm: use get_color_selection() instead of deprecated Gtk::ColorSelectionDialog::get_colorsel() --- gtk2_ardour/color_theme_manager.cc | 16 ++++++++-------- gtk2_ardour/cuebox_ui.cc | 10 +++++----- gtk2_ardour/editor_route_groups.cc | 10 +++++----- gtk2_ardour/stripable_colorpicker.cc | 22 +++++++++++----------- gtk2_ardour/trigger_master.cc | 10 +++++----- gtk2_ardour/trigger_ui.cc | 10 +++++----- 6 files changed, 39 insertions(+), 39 deletions(-) diff --git a/gtk2_ardour/color_theme_manager.cc b/gtk2_ardour/color_theme_manager.cc index 6e43451535..6eb44a9d1d 100644 --- a/gtk2_ardour/color_theme_manager.cc +++ b/gtk2_ardour/color_theme_manager.cc @@ -155,8 +155,8 @@ ColorThemeManager::ColorThemeManager () a->add (reset_button); table.attach (*a, 0, 1, n, n + 1); - color_dialog.get_colorsel()->set_has_opacity_control (true); - color_dialog.get_colorsel()->set_has_palette (true); + color_dialog.get_color_selection()->set_has_opacity_control (true); + color_dialog.get_color_selection()->set_has_palette (true); color_dialog.get_ok_button()->signal_clicked().connect (sigc::bind (sigc::mem_fun (color_dialog, &Gtk::Dialog::response), RESPONSE_ACCEPT)); color_dialog.get_cancel_button()->signal_clicked().connect (sigc::bind (sigc::mem_fun (color_dialog, &Gtk::Dialog::response), RESPONSE_CANCEL)); @@ -380,10 +380,10 @@ ColorThemeManager::edit_palette_color (std::string name) color_to_rgba (c, r, g, b, a); gdkcolor.set_rgb_p (r, g, b); - color_dialog.get_colorsel()->set_previous_color (gdkcolor); - color_dialog.get_colorsel()->set_current_color (gdkcolor); - color_dialog.get_colorsel()->set_previous_alpha ((guint16) (a * 65535)); - color_dialog.get_colorsel()->set_current_alpha ((guint16) (a * 65535)); + color_dialog.get_color_selection()->set_previous_color (gdkcolor); + color_dialog.get_color_selection()->set_current_color (gdkcolor); + color_dialog.get_color_selection()->set_previous_alpha ((guint16) (a * 65535)); + color_dialog.get_color_selection()->set_current_alpha ((guint16) (a * 65535)); color_dialog_connection.disconnect (); color_dialog_connection = color_dialog.signal_response().connect (sigc::bind (sigc::mem_fun (*this, &ColorThemeManager::palette_color_response), name)); @@ -404,8 +404,8 @@ ColorThemeManager::palette_color_response (int result, std::string name) switch (result) { case RESPONSE_ACCEPT: case RESPONSE_OK: - gdkcolor = color_dialog.get_colorsel()->get_current_color(); - a = color_dialog.get_colorsel()->get_current_alpha() / 65535.0; + gdkcolor = color_dialog.get_color_selection()->get_current_color(); + a = color_dialog.get_color_selection()->get_current_alpha() / 65535.0; r = gdkcolor.get_red_p(); g = gdkcolor.get_green_p(); b = gdkcolor.get_blue_p(); diff --git a/gtk2_ardour/cuebox_ui.cc b/gtk2_ardour/cuebox_ui.cc index 95d6f82818..06ff6028fe 100644 --- a/gtk2_ardour/cuebox_ui.cc +++ b/gtk2_ardour/cuebox_ui.cc @@ -360,19 +360,19 @@ CueBoxUI::clear_all_triggers (uint64_t idx) void CueBoxUI::set_all_colors (uint64_t idx) { - _color_dialog.get_colorsel()->set_has_opacity_control (false); - _color_dialog.get_colorsel()->set_has_palette (true); + _color_dialog.get_color_selection()->set_has_opacity_control (false); + _color_dialog.get_color_selection()->set_has_palette (true); _color_dialog.get_ok_button()->signal_clicked().connect (sigc::bind (sigc::mem_fun (_color_dialog, &Gtk::Dialog::response), Gtk::RESPONSE_ACCEPT)); _color_dialog.get_cancel_button()->signal_clicked().connect (sigc::bind (sigc::mem_fun (_color_dialog, &Gtk::Dialog::response), Gtk::RESPONSE_CANCEL)); Gdk::Color c = ARDOUR_UI_UTILS::gdk_color_from_rgba(0xBEBEBEFF); - _color_dialog.get_colorsel()->set_previous_color (c); - _color_dialog.get_colorsel()->set_current_color (c); + _color_dialog.get_color_selection()->set_previous_color (c); + _color_dialog.get_color_selection()->set_current_color (c); switch (_color_dialog.run()) { case Gtk::RESPONSE_ACCEPT: { - c = _color_dialog.get_colorsel()->get_current_color(); + c = _color_dialog.get_color_selection()->get_current_color(); color_t ct = ARDOUR_UI_UTILS::gdk_color_to_rgba(c); TriggerList tl; get_slots(tl, idx); diff --git a/gtk2_ardour/editor_route_groups.cc b/gtk2_ardour/editor_route_groups.cc index 50b19bd50d..4c0f5c3720 100644 --- a/gtk2_ardour/editor_route_groups.cc +++ b/gtk2_ardour/editor_route_groups.cc @@ -132,8 +132,8 @@ EditorRouteGroups::EditorRouteGroups (Editor* e) _display.set_headers_visible (true); - color_dialog.get_colorsel()->set_has_opacity_control (false); - color_dialog.get_colorsel()->set_has_palette (true); + color_dialog.get_color_selection()->set_has_opacity_control (false); + color_dialog.get_color_selection()->set_has_palette (true); color_dialog.get_ok_button()->signal_clicked().connect (sigc::bind (sigc::mem_fun (color_dialog, &Gtk::Dialog::response), RESPONSE_ACCEPT)); color_dialog.get_cancel_button()->signal_clicked().connect (sigc::bind (sigc::mem_fun (color_dialog, &Gtk::Dialog::response), RESPONSE_CANCEL)); @@ -268,12 +268,12 @@ EditorRouteGroups::button_press_event (GdkEventButton* ev) switch (GPOINTER_TO_UINT (column->get_data (X_("colnum")))) { case 0: c = (*iter)[_columns.gdkcolor]; - color_dialog.get_colorsel()->set_previous_color (c); - color_dialog.get_colorsel()->set_current_color (c); + color_dialog.get_color_selection()->set_previous_color (c); + color_dialog.get_color_selection()->set_current_color (c); switch (color_dialog.run()) { case RESPONSE_ACCEPT: - c = color_dialog.get_colorsel()->get_current_color(); + c = color_dialog.get_color_selection()->get_current_color(); GroupTabs::set_group_color (group, gdk_color_to_rgba (c)); break; diff --git a/gtk2_ardour/stripable_colorpicker.cc b/gtk2_ardour/stripable_colorpicker.cc index 5a095e787d..883fa08ece 100644 --- a/gtk2_ardour/stripable_colorpicker.cc +++ b/gtk2_ardour/stripable_colorpicker.cc @@ -48,7 +48,7 @@ StripableColorDialog::StripableColorDialog () * * top_hbox [ VBOX [ triangle || hbox [ sample-area || picker-button] ] || ... ] */ - ColorSelection* cs = get_colorsel(); // IS-A VBOX + ColorSelection* cs = get_color_selection(); // IS-A VBOX if (!cs) { return ; } Gtk::HBox* top_hbox = dynamic_cast (cs->children()[0].get_widget()); if (!top_hbox) { return ; } @@ -83,7 +83,7 @@ StripableColorDialog::initialize_color_palette () return; } gtk_palette_changed_hook = - get_colorsel()->set_change_palette_hook (&StripableColorDialog::palette_changed_hook); + get_color_selection()->set_change_palette_hook (&StripableColorDialog::palette_changed_hook); std::string cp = UIConfiguration::instance ().get_stripable_color_palette (); if (!cp.empty()) { @@ -110,15 +110,15 @@ StripableColorDialog::popup (const std::string& name, uint32_t color) set_title (string_compose (_("Color Selection: %1"), name)); _initial_color = color; - get_colorsel()->set_has_opacity_control (false); - get_colorsel()->set_has_palette (true); + get_color_selection()->set_has_opacity_control (false); + get_color_selection()->set_has_palette (true); Gdk::Color c = gdk_color_from_rgba (_initial_color); - get_colorsel()->set_previous_color (c); - get_colorsel()->set_current_color (c); + get_color_selection()->set_previous_color (c); + get_color_selection()->set_current_color (c); _color_changed_connection.disconnect (); - _color_changed_connection = get_colorsel()->signal_color_changed().connect (sigc::mem_fun (*this, &StripableColorDialog::color_changed)); + _color_changed_connection = get_color_selection()->signal_color_changed().connect (sigc::mem_fun (*this, &StripableColorDialog::color_changed)); present (); } @@ -147,13 +147,13 @@ StripableColorDialog::finish_color_edit (int response) ARDOUR::RouteList rl = PublicEditor::instance().get_selection().tracks.routelist(); if (response == RESPONSE_OK) { - ColorChanged (gdk_color_to_rgba (get_colorsel()->get_current_color())); /* EMIT SIGNAL */ + ColorChanged (gdk_color_to_rgba (get_color_selection()->get_current_color())); /* EMIT SIGNAL */ } if (_stripable && response == RESPONSE_OK) { for (ARDOUR::RouteList::iterator i = rl.begin(); i != rl.end(); ++i) { - (*i)->presentation_info().set_color (gdk_color_to_rgba (get_colorsel()->get_current_color())); + (*i)->presentation_info().set_color (gdk_color_to_rgba (get_color_selection()->get_current_color())); } - _stripable->presentation_info().set_color (gdk_color_to_rgba (get_colorsel()->get_current_color())); + _stripable->presentation_info().set_color (gdk_color_to_rgba (get_color_selection()->get_current_color())); } else if (_stripable) { _stripable->presentation_info().set_color (_initial_color); } @@ -164,7 +164,7 @@ void StripableColorDialog::color_changed () { if (_stripable) { - _stripable->presentation_info().set_color (gdk_color_to_rgba (get_colorsel()->get_current_color())); + _stripable->presentation_info().set_color (gdk_color_to_rgba (get_color_selection()->get_current_color())); } } diff --git a/gtk2_ardour/trigger_master.cc b/gtk2_ardour/trigger_master.cc index f8aadb00d0..e86d54ee28 100644 --- a/gtk2_ardour/trigger_master.cc +++ b/gtk2_ardour/trigger_master.cc @@ -371,19 +371,19 @@ TriggerMaster::clear_all_triggers () void TriggerMaster::set_all_colors () { - _color_dialog.get_colorsel()->set_has_opacity_control (false); - _color_dialog.get_colorsel()->set_has_palette (true); + _color_dialog.get_color_selection()->set_has_opacity_control (false); + _color_dialog.get_color_selection()->set_has_palette (true); _color_dialog.get_ok_button()->signal_clicked().connect (sigc::bind (sigc::mem_fun (_color_dialog, &Gtk::Dialog::response), Gtk::RESPONSE_ACCEPT)); _color_dialog.get_cancel_button()->signal_clicked().connect (sigc::bind (sigc::mem_fun (_color_dialog, &Gtk::Dialog::response), Gtk::RESPONSE_CANCEL)); Gdk::Color c = ARDOUR_UI_UTILS::gdk_color_from_rgba(0xBEBEBEFF); - _color_dialog.get_colorsel()->set_previous_color (c); - _color_dialog.get_colorsel()->set_current_color (c); + _color_dialog.get_color_selection()->set_previous_color (c); + _color_dialog.get_color_selection()->set_current_color (c); switch (_color_dialog.run()) { case Gtk::RESPONSE_ACCEPT: { - c = _color_dialog.get_colorsel()->get_current_color(); + c = _color_dialog.get_color_selection()->get_current_color(); color_t ct = ARDOUR_UI_UTILS::gdk_color_to_rgba(c); for (int n = 0; n < default_triggers_per_box; n++) { _triggerbox->trigger (n)->set_color(ct); diff --git a/gtk2_ardour/trigger_ui.cc b/gtk2_ardour/trigger_ui.cc index 7c5ff46c3a..729b026cb8 100644 --- a/gtk2_ardour/trigger_ui.cc +++ b/gtk2_ardour/trigger_ui.cc @@ -178,19 +178,19 @@ TriggerUI::trigger_cue (int32_t n) void TriggerUI::choose_color () { - _color_dialog.get_colorsel()->set_has_opacity_control (false); - _color_dialog.get_colorsel()->set_has_palette (true); + _color_dialog.get_color_selection()->set_has_opacity_control (false); + _color_dialog.get_color_selection()->set_has_palette (true); _color_dialog.get_ok_button()->signal_clicked().connect (sigc::bind (sigc::mem_fun (_color_dialog, &Gtk::Dialog::response), Gtk::RESPONSE_ACCEPT)); _color_dialog.get_cancel_button()->signal_clicked().connect (sigc::bind (sigc::mem_fun (_color_dialog, &Gtk::Dialog::response), Gtk::RESPONSE_CANCEL)); Gdk::Color c = ARDOUR_UI_UTILS::gdk_color_from_rgba(trigger()->color()); - _color_dialog.get_colorsel()->set_previous_color (c); - _color_dialog.get_colorsel()->set_current_color (c); + _color_dialog.get_color_selection()->set_previous_color (c); + _color_dialog.get_color_selection()->set_current_color (c); switch (_color_dialog.run()) { case Gtk::RESPONSE_ACCEPT: { - c = _color_dialog.get_colorsel()->get_current_color(); + c = _color_dialog.get_color_selection()->get_current_color(); color_t ct = ARDOUR_UI_UTILS::gdk_color_to_rgba(c); trigger()->set_color(ct); } break;