ardour/ardour
ardour/ardour
13
1
Fork 0
Code Pull Requests Releases Activity

Use non-deprecated Gtk::ColorSelection API in gtk2_ardour

Browse Source
This commit is contained in:
Tim Mayberry 2015-02-27 23:03:58 +10:00
parent 99a81e2a27
commit 78b67da9fd
3 changed files with 30 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
gtk2_ardour/color_theme_manager.cc
View File

@ -149,10 +149,14 @@ ColorThemeManager::ColorThemeManager ()
pack_start (notebook, true, true);
pack_start (reset_button, false, false);
color_dialog.get_colorsel()->set_has_opacity_control (true);
color_dialog.get_colorsel()->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));
color_dialog.get_color_selection()->set_has_opacity_control (true);
color_dialog.get_color_selection()->set_has_palette (true);
Gtk::Button* ok_button = dynamic_cast<Gtk::Button*>(color_dialog.get_widget_for_response (RESPONSE_OK));
ok_button->signal_clicked().connect (sigc::bind (sigc::mem_fun (color_dialog, &Gtk::Dialog::response), true));
Gtk::Button* cancel_button = dynamic_cast<Gtk::Button*>(color_dialog.get_widget_for_response (RESPONSE_CANCEL));
cancel_button->signal_clicked().connect (sigc::bind (sigc::mem_fun (color_dialog, &Gtk::Dialog::response), false));
color_theme_dropdown.signal_changed().connect (sigc::mem_fun (*this, &ColorThemeManager::on_color_theme_changed));
@ -384,10 +388,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));
@ -408,8 +412,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();

18
gtk2_ardour/editor_route_groups.cc
View File

@ -128,10 +128,14 @@ 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_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_color_selection()->set_has_opacity_control (false);
color_dialog.get_color_selection()->set_has_palette (true);
Gtk::Button* ok_button = dynamic_cast<Gtk::Button*>(color_dialog.get_widget_for_response (RESPONSE_OK));
ok_button->signal_clicked().connect (bind (mem_fun (color_dialog, &Gtk::Dialog::response), true));
Gtk::Button* cancel_button = dynamic_cast<Gtk::Button*>(color_dialog.get_widget_for_response (RESPONSE_CANCEL));
cancel_button->signal_clicked().connect (bind (mem_fun (color_dialog, &Gtk::Dialog::response), false));
/* name is directly editable */
@ -264,14 +268,14 @@ 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_CANCEL:
break;
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;

10
gtk2_ardour/vca_master_strip.cc
View File

@ -459,13 +459,13 @@ VCAMasterStrip::start_color_edit ()
{
Gtk::ColorSelectionDialog* color_dialog = new Gtk::ColorSelectionDialog;
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);
Gdk::Color c = gdk_color_from_rgba (_vca->presentation_info().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);
color_dialog->signal_response().connect (sigc::bind (sigc::mem_fun (*this, &VCAMasterStrip::finish_color_edit), color_dialog));
color_dialog->present ();
@ -476,7 +476,7 @@ VCAMasterStrip::finish_color_edit (int response, Gtk::ColorSelectionDialog* dial
{
switch (response) {
case RESPONSE_OK:
_vca->presentation_info().set_color (gdk_color_to_rgba (dialog->get_colorsel()->get_current_color()));
_vca->presentation_info().set_color (gdk_color_to_rgba (dialog->get_color_selection()->get_current_color()));
break;
}