--- clock-binary.c 2011-04-04 10:33:40.051169783 +0200 +++ clock-binary.cc 2011-02-25 21:18:23.000000000 +0100 @@ -33,6 +33,8 @@ #include "clock.h" #include "clock-binary.h" + + static void xfce_clock_binary_set_property (GObject *object, guint prop_id, const GValue *value, @@ -362,24 +364,7 @@ else { inactive = &(GTK_WIDGET (binary)->style->dark[GTK_STATE_NORMAL]); - active = &(GTK_WIDGET (binary)->style->mid[GTK_STATE_INSENSITIVE]); - //TODO BEGIN - win = gtk_window_new(GTK_WINDOW_TOPLEVEL); - color_edit *ce = (color_edit*) malloc(sizeof(color_edit)); - GtkWidget *layout = gtk_vbox_new(TRUE, 0); - ce->edit = gtk_entry_new_with_max_length(6); - ce->color = active; - GtkWidget *button = gtk_button_new(); - gtk_button_set_label(GTK_BUTTON(button),"change color"); - gtk_container_add(GTK_CONTAINER(win), layout); - gtk_box_pack_start(GTK_BOX(layout), ce->edit, TRUE, FALSE, 0); - gtk_box_pack_start(GTK_BOX(layout), button, TRUE, FALSE, 0); - g_signal_connect(G_OBJECT(button), "clicked", GTK_SIGNAL_FUNC(gtk_edit), ce); - gtk_window_set_title(GTK_WINDOW(win), "color"); - gtk_window_set_default_size(GTK_WINDOW(win), 150, 70); - gtk_window_set_position(GTK_WINDOW(win), GTK_WIN_POS_CENTER_ON_PARENT); - gtk_widget_show_all(win); - //TODO END + active = &(GTK_WIDGET (binary)->style->dark[GTK_STATE_SELECTED]); } clock_plugin_get_localtime (&tm); @@ -438,6 +423,8 @@ } } + + static gboolean xfce_clock_binary_expose_event (GtkWidget *widget, GdkEventExpose *event) @@ -487,7 +474,6 @@ if (binary->show_grid) { color = &(GTK_WIDGET (binary)->style->light[GTK_STATE_SELECTED]); - gdk_cairo_set_source_color (cr, color); cairo_set_line_width (cr, 1); @@ -529,34 +515,7 @@ return FALSE; } -//TODO -void gtk_edit(GtkWidget *widget, gpointer *ce) -{ - color_edit *structCe = (color_edit*) ce; - gchar *char_color = gtk_entry_get_text(GTK_ENTRY(structCe->edit)); - if (strlen(char_color) == 6) - { - int nb = 0; - int i; - for (i = 0; i < 6; i++) - { - if (!(((char_color[i] >= 48) && (char_color[i] <= 57)) || ((char_color[i] >= 65) && (char_color[i] <= 70)) || ((char_color[i] >= 97) && (char_color[i] <= 102)))) - { - nb = 1; - break; - } - } - if (!nb) - { - gchar* chaine = g_strconcat("#",char_color,NULL); - gdk_color_parse(chaine,structCe->color); - gtk_widget_hide(win); - } - } - gtk_widget_hide_all(win); -} -//TODO static gboolean xfce_clock_binary_update (gpointer user_data) --- clock-binary.h 2011-04-02 17:43:17.506113249 +0200 +++ clock-binary.hh 2011-02-25 21:18:23.000000000 +0100 @@ -23,13 +23,6 @@ typedef struct _XfceClockBinaryClass XfceClockBinaryClass; typedef struct _XfceClockBinary XfceClockBinary; -//TODO -typedef struct { - GdkColor *color; - GtkWidget *edit; -} color_edit; -GtkWidget *win; -//TODO #define XFCE_CLOCK_TYPE_BINARY (xfce_clock_binary_get_type ()) #define XFCE_CLOCK_BINARY(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), XFCE_CLOCK_TYPE_BINARY, XfceClockBinary)) @@ -44,8 +37,6 @@ GtkWidget *xfce_clock_binary_new (void) G_GNUC_MALLOC; -void gtk_edit(GtkWidget *widget, gpointer *ce); - G_END_DECLS #endif /* !__CLOCK_BINARY_H__ */