X-Git-Url: http://git.wpitchoune.net/gitweb/?a=blobdiff_plain;f=src%2Fui_color.c;h=3f91aa99c0bbe8e59887bc112c2c57a9f785d1a2;hb=28ba8deef53e8f46fa79919b9fea4fe2dc1163e4;hp=a5e1e872bdd310c8c00f923c7c31993dc621af25;hpb=2b51051578ef29b031d0927388c4d62baa3c525e;p=psensor.git

diff --git a/src/ui_color.c b/src/ui_color.c
index a5e1e87..3f91aa9 100644
--- a/src/ui_color.c
+++ b/src/ui_color.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2010-2012 jeanfi@gmail.com
+ * Copyright (C) 2010-2014 jeanfi@gmail.com
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License as
@@ -18,34 +18,29 @@
  */
 #include <gtk/gtk.h>
 
-#include "ui_color.h"
+#include <ui_color.h>
 
-int ui_change_color(const char *title, struct color *col)
+/*
+ * UI to change a given color.
+ *
+ * Returns 1 if the color has been modified.
+ */
+bool ui_change_color(const char *title, GdkRGBA *color, GtkWindow *win)
 {
-	GdkColor color;
-	GtkColorSelection *colorsel;
 	int res;
-	GtkColorSelectionDialog *colordlg;
+	GtkColorChooserDialog *colordlg;
 
-	color.red = col->red;
-	color.green = col->green;
-	color.blue = col->blue;
+	colordlg = GTK_COLOR_CHOOSER_DIALOG
+		(gtk_color_chooser_dialog_new(title, win));
 
-	colordlg = GTK_COLOR_SELECTION_DIALOG
-		(gtk_color_selection_dialog_new(title));
+	gtk_color_chooser_set_use_alpha(GTK_COLOR_CHOOSER(colordlg), 0);
 
-	colorsel = GTK_COLOR_SELECTION
-		(gtk_color_selection_dialog_get_color_selection(colordlg));
-
-	gtk_color_selection_set_current_color(colorsel, &color);
+	gtk_color_chooser_set_rgba(GTK_COLOR_CHOOSER(colordlg), color);
 
 	res = gtk_dialog_run(GTK_DIALOG(colordlg));
 
-	if (res == GTK_RESPONSE_OK) {
-		gtk_color_selection_get_current_color(colorsel, &color);
-
-		color_set(col, color.red, color.green, color.blue);
-	}
+	if (res == GTK_RESPONSE_OK)
+		gtk_color_chooser_get_rgba(GTK_COLOR_CHOOSER(colordlg), color);
 
 	gtk_widget_destroy(GTK_WIDGET(colordlg));