smokephil/ardour
1
0
Fork 0
mirror of https://github.com/Ardour/ardour.git synced 2025-12-06 06:44:57 +01:00
Code Issues Projects Releases Wiki Activity

gtkmm: use get_color_selection() instead of deprecated Gtk::ColorSelectionDialog::get_colorsel()

Browse source
This commit is contained in:
Mads Kiilerich 2022-01-27 00:06:19 +01:00 • committed by Robin Gareus
parent 440264e0b8
commit f9b3ed0523
No known key found for this signature in database
GPG key ID: A090BCE02CF57F04
6 changed files with 39 additions and 39 deletions
Download patch file Download diff file Expand all files Collapse all files

16
gtk2_ardour/color_theme_manager.cc
View file

@ -155,8 +155,8 @@ ColorThemeManager::ColorThemeManager ()
a->add (reset_button); a->add (reset_button);
table.attach (*a, 0, 1, n, n + 1); table.attach (*a, 0, 1, n, n + 1);
color_dialog.get_colorsel()->set_has_opacity_control (true); color_dialog.get_color_selection()->set_has_opacity_control (true);
color_dialog.get_colorsel()->set_has_palette (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_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)); 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); color_to_rgba (c, r, g, b, a);
gdkcolor.set_rgb_p (r, g, b); gdkcolor.set_rgb_p (r, g, b);
color_dialog.get_colorsel()->set_previous_color (gdkcolor); color_dialog.get_color_selection()->set_previous_color (gdkcolor);
color_dialog.get_colorsel()->set_current_color (gdkcolor); color_dialog.get_color_selection()->set_current_color (gdkcolor);
color_dialog.get_colorsel()->set_previous_alpha ((guint16) (a * 65535)); color_dialog.get_color_selection()->set_previous_alpha ((guint16) (a * 65535));
color_dialog.get_colorsel()->set_current_alpha ((guint16) (a * 65535)); color_dialog.get_color_selection()->set_current_alpha ((guint16) (a * 65535));
color_dialog_connection.disconnect (); color_dialog_connection.disconnect ();
color_dialog_connection = color_dialog.signal_response().connect (sigc::bind (sigc::mem_fun (*this, &ColorThemeManager::palette_color_response), name)); 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) { switch (result) {
case RESPONSE_ACCEPT: case RESPONSE_ACCEPT:
case RESPONSE_OK: case RESPONSE_OK:
gdkcolor = color_dialog.get_colorsel()->get_current_color(); gdkcolor = color_dialog.get_color_selection()->get_current_color();
a = color_dialog.get_colorsel()->get_current_alpha() / 65535.0; a = color_dialog.get_color_selection()->get_current_alpha() / 65535.0;
r = gdkcolor.get_red_p(); r = gdkcolor.get_red_p();
g = gdkcolor.get_green_p(); g = gdkcolor.get_green_p();
b = gdkcolor.get_blue_p(); b = gdkcolor.get_blue_p();

10
gtk2_ardour/cuebox_ui.cc
View file

@ -360,19 +360,19 @@ CueBoxUI::clear_all_triggers (uint64_t idx)
void void
CueBoxUI::set_all_colors (uint64_t idx) CueBoxUI::set_all_colors (uint64_t idx)
{ {
_color_dialog.get_colorsel()->set_has_opacity_control (false); _color_dialog.get_color_selection()->set_has_opacity_control (false);
_color_dialog.get_colorsel()->set_has_palette (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), Gtk::RESPONSE_ACCEPT)); _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)); _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); Gdk::Color c = ARDOUR_UI_UTILS::gdk_color_from_rgba(0xBEBEBEFF);
_color_dialog.get_colorsel()->set_previous_color (c); _color_dialog.get_color_selection()->set_previous_color (c);
_color_dialog.get_colorsel()->set_current_color (c); _color_dialog.get_color_selection()->set_current_color (c);
switch (_color_dialog.run()) { switch (_color_dialog.run()) {
case Gtk::RESPONSE_ACCEPT: { 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); color_t ct = ARDOUR_UI_UTILS::gdk_color_to_rgba(c);
TriggerList tl; TriggerList tl;
get_slots(tl, idx); get_slots(tl, idx);

10
gtk2_ardour/editor_route_groups.cc
View file

@ -132,8 +132,8 @@ EditorRouteGroups::EditorRouteGroups (Editor* e)
_display.set_headers_visible (true); _display.set_headers_visible (true);
color_dialog.get_colorsel()->set_has_opacity_control (false); color_dialog.get_color_selection()->set_has_opacity_control (false);
color_dialog.get_colorsel()->set_has_palette (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_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)); 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")))) { switch (GPOINTER_TO_UINT (column->get_data (X_("colnum")))) {
case 0: case 0:
c = (*iter)[_columns.gdkcolor]; c = (*iter)[_columns.gdkcolor];
color_dialog.get_colorsel()->set_previous_color (c); color_dialog.get_color_selection()->set_previous_color (c);
color_dialog.get_colorsel()->set_current_color (c); color_dialog.get_color_selection()->set_current_color (c);
switch (color_dialog.run()) { switch (color_dialog.run()) {
case RESPONSE_ACCEPT: 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)); GroupTabs::set_group_color (group, gdk_color_to_rgba (c));
break; break;

22
gtk2_ardour/stripable_colorpicker.cc
View file

@ -48,7 +48,7 @@ StripableColorDialog::StripableColorDialog ()
* *
* top_hbox [ VBOX [ triangle || hbox [ sample-area || picker-button] ] || ... ] * 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 ; } if (!cs) { return ; }
Gtk::HBox* top_hbox = dynamic_cast<Gtk::HBox*> (cs->children()[0].get_widget()); Gtk::HBox* top_hbox = dynamic_cast<Gtk::HBox*> (cs->children()[0].get_widget());
if (!top_hbox) { return ; } if (!top_hbox) { return ; }
@ -83,7 +83,7 @@ StripableColorDialog::initialize_color_palette ()
return; return;
} }
gtk_palette_changed_hook = 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 (); std::string cp = UIConfiguration::instance ().get_stripable_color_palette ();
if (!cp.empty()) { if (!cp.empty()) {
@ -110,15 +110,15 @@ StripableColorDialog::popup (const std::string& name, uint32_t color)
set_title (string_compose (_("Color Selection: %1"), name)); set_title (string_compose (_("Color Selection: %1"), name));
_initial_color = color; _initial_color = color;
get_colorsel()->set_has_opacity_control (false); get_color_selection()->set_has_opacity_control (false);
get_colorsel()->set_has_palette (true); get_color_selection()->set_has_palette (true);
Gdk::Color c = gdk_color_from_rgba (_initial_color); Gdk::Color c = gdk_color_from_rgba (_initial_color);
get_colorsel()->set_previous_color (c); get_color_selection()->set_previous_color (c);
get_colorsel()->set_current_color (c); get_color_selection()->set_current_color (c);
_color_changed_connection.disconnect (); _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 (); present ();
} }
@ -147,13 +147,13 @@ StripableColorDialog::finish_color_edit (int response)
ARDOUR::RouteList rl = PublicEditor::instance().get_selection().tracks.routelist(); ARDOUR::RouteList rl = PublicEditor::instance().get_selection().tracks.routelist();
if (response == RESPONSE_OK) { 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) { if (_stripable && response == RESPONSE_OK) {
for (ARDOUR::RouteList::iterator i = rl.begin(); i != rl.end(); ++i) { 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) { } else if (_stripable) {
_stripable->presentation_info().set_color (_initial_color); _stripable->presentation_info().set_color (_initial_color);
} }
@ -164,7 +164,7 @@ void
StripableColorDialog::color_changed () StripableColorDialog::color_changed ()
{ {
if (_stripable) { 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()));
} }
} }

10
gtk2_ardour/trigger_master.cc
View file

@ -371,19 +371,19 @@ TriggerMaster::clear_all_triggers ()
void void
TriggerMaster::set_all_colors () TriggerMaster::set_all_colors ()
{ {
_color_dialog.get_colorsel()->set_has_opacity_control (false); _color_dialog.get_color_selection()->set_has_opacity_control (false);
_color_dialog.get_colorsel()->set_has_palette (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), Gtk::RESPONSE_ACCEPT)); _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)); _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); Gdk::Color c = ARDOUR_UI_UTILS::gdk_color_from_rgba(0xBEBEBEFF);
_color_dialog.get_colorsel()->set_previous_color (c); _color_dialog.get_color_selection()->set_previous_color (c);
_color_dialog.get_colorsel()->set_current_color (c); _color_dialog.get_color_selection()->set_current_color (c);
switch (_color_dialog.run()) { switch (_color_dialog.run()) {
case Gtk::RESPONSE_ACCEPT: { 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); color_t ct = ARDOUR_UI_UTILS::gdk_color_to_rgba(c);
for (int n = 0; n < default_triggers_per_box; n++) { for (int n = 0; n < default_triggers_per_box; n++) {
_triggerbox->trigger (n)->set_color(ct); _triggerbox->trigger (n)->set_color(ct);

10
gtk2_ardour/trigger_ui.cc
View file

@ -178,19 +178,19 @@ TriggerUI::trigger_cue (int32_t n)
void void
TriggerUI::choose_color () TriggerUI::choose_color ()
{ {
_color_dialog.get_colorsel()->set_has_opacity_control (false); _color_dialog.get_color_selection()->set_has_opacity_control (false);
_color_dialog.get_colorsel()->set_has_palette (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), Gtk::RESPONSE_ACCEPT)); _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)); _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()); Gdk::Color c = ARDOUR_UI_UTILS::gdk_color_from_rgba(trigger()->color());
_color_dialog.get_colorsel()->set_previous_color (c); _color_dialog.get_color_selection()->set_previous_color (c);
_color_dialog.get_colorsel()->set_current_color (c); _color_dialog.get_color_selection()->set_current_color (c);
switch (_color_dialog.run()) { switch (_color_dialog.run()) {
case Gtk::RESPONSE_ACCEPT: { 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); color_t ct = ARDOUR_UI_UTILS::gdk_color_to_rgba(c);
trigger()->set_color(ct); trigger()->set_color(ct);
} break; } break;