appcat
/
xfce4-speed-plugin
1
0
Fork 0
Code Issues Pull Requests Wiki Activity

First try to migrate to GtkColorChooser

master
Skunnyk 2016-05-11 22:41:26 +02:00
parent 47df48814f
commit 58501561aa
1 changed files with 11 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
panel-plugin/netload.c
View File

@ -542,9 +542,9 @@ static void setup_monitor(t_global_monitor *global, gboolean supress_warnings)
if (global->monitor->options.colorize_values) if (global->monitor->options.colorize_values)
{ {
gtk_widget_modify_fg(global->monitor->rcv_label, GTK_STATE_NORMAL, gtk_widget_override_color(global->monitor->rcv_label, GTK_STATE_NORMAL,
&global->monitor->options.color[IN]); &global->monitor->options.color[IN]);
gtk_widget_modify_fg(global->monitor->sent_label, GTK_STATE_NORMAL, gtk_widget_override_color(global->monitor->sent_label, GTK_STATE_NORMAL,
&global->monitor->options.color[OUT]); &global->monitor->options.color[OUT]);
} }
else else
@ -900,31 +900,30 @@ static gboolean expose_event_cb(GtkWidget *widget, GdkEventExpose *event)
return TRUE; return TRUE;
} }
/* ---------------------------------------------------------------------------------------------- */ /* ---------------------------------------------------------------------------------------------- */
static void change_color(GtkWidget *button, t_global_monitor *global, gint type) static void change_color(GtkWidget *button, t_global_monitor *global, gint type)
{ {
GtkWidget *dialog; GtkWidget *dialog;
GtkColorSelection *colorsel; GdkRGBA colorsel;
gint response; gint response;
dialog = gtk_color_selection_dialog_new(_("Select color")); dialog = gtk_color_chooser_dialog_new(_("Select color"), GTK_WINDOW(global->opt_dialog));
gtk_window_set_transient_for(GTK_WINDOW(dialog), gtk_window_set_transient_for(GTK_WINDOW(dialog),
GTK_WINDOW(global->opt_dialog)); GTK_WINDOW(global->opt_dialog));
// Fixme for GTK3 Migration // Fixme for GTK3 Migration
//colorsel = //colorsel =
// GTK_COLOR_SELECTION(GTK_COLOR_SELECTION_DIALOG(dialog)->colorsel); // GTK_COLOR_SELECTION(GTK_COLOR_SELECTION_DIALOG(dialog)->colorsel);
gtk_color_selection_set_previous_color(colorsel, //gtk_color_selection_set_previous_color(colorsel,
&global->monitor->options.color[type]); // &global->monitor->options.color[type]);
gtk_color_selection_set_current_color(colorsel, //gtk_color_selection_set_current_color(colorsel,
&global->monitor->options.color[type]); // &global->monitor->options.color[type]);
gtk_color_selection_set_has_palette(colorsel, TRUE); //gtk_color_selection_set_has_palette(colorsel, TRUE);
//gtk_color_chooser_set_rgba(GTK_COLOR_CHOOSER (dialog), &global->monitor->options.color[type]);
response = gtk_dialog_run(GTK_DIALOG(dialog)); response = gtk_dialog_run(GTK_DIALOG(dialog));
if (response == GTK_RESPONSE_OK) if (response == GTK_RESPONSE_OK)
{ {
gtk_color_selection_get_current_color(colorsel, gtk_color_chooser_get_rgba(GTK_COLOR_CHOOSER (dialog), &global->monitor->options.color[type]);
&global->monitor->options.color[type]);
gtk_widget_modify_bg(global->monitor->opt_da[type], gtk_widget_modify_bg(global->monitor->opt_da[type],
GTK_STATE_NORMAL, GTK_STATE_NORMAL,
&global->monitor->options.color[type]); &global->monitor->options.color[type]);