diff options
author | Arx Cruz <arxcruz@redhat.com> | 2017-04-07 14:00:42 +0200 |
---|---|---|
committer | Arx Cruz <arxcruz@redhat.com> | 2017-04-07 14:00:42 +0200 |
commit | 4eddb202cafdcabc254aa941ad1348ff09372627 (patch) | |
tree | 693615e41338546f87d791fbc1cbe9a47738e7e6 /src/color.c | |
parent | Adding clang-format script (diff) | |
download | zenity-4eddb202cafdcabc254aa941ad1348ff09372627.tar.gz zenity-4eddb202cafdcabc254aa941ad1348ff09372627.tar.bz2 zenity-4eddb202cafdcabc254aa941ad1348ff09372627.zip |
Fix style
Fixing style in all zenity code, removing useless spaces,
empty lines, all code in 80 columns, etc.
Diffstat (limited to 'src/color.c')
-rw-r--r-- | src/color.c | 166 |
1 files changed, 85 insertions, 81 deletions
diff --git a/src/color.c b/src/color.c index ae47b19b..9ef233eb 100644 --- a/src/color.c +++ b/src/color.c @@ -23,92 +23,96 @@ #include "config.h" -#include <string.h> -#include "zenity.h" #include "util.h" +#include "zenity.h" +#include <string.h> static ZenityData *zen_data; -static void zenity_colorselection_dialog_response (GtkWidget *widget, int response, gpointer data); - -void zenity_colorselection (ZenityData *data, ZenityColorData *color_data) -{ - GtkWidget *dialog; - GtkWidget *button; - GdkRGBA color; - - zen_data = data; - - dialog = gtk_color_chooser_dialog_new (data->dialog_title, NULL); - - g_signal_connect (G_OBJECT (dialog), "response", - G_CALLBACK (zenity_colorselection_dialog_response), - color_data); - - if (color_data->color) { - if (gdk_rgba_parse (&color, color_data->color)) { - gtk_color_chooser_set_rgba (GTK_COLOR_CHOOSER (dialog), &color); - } - } - - if (data->extra_label) { - gint i=0; - while(data->extra_label[i]!=NULL){ - gtk_dialog_add_button (GTK_DIALOG (dialog), data->extra_label[i], i); - i++; - } - } - - if (data->ok_label) { - g_object_get (G_OBJECT (dialog), "ok-button", &button, NULL); - gtk_button_set_label (GTK_BUTTON (button), data->ok_label); - g_object_unref (G_OBJECT (button)); - } - - if (data->cancel_label) { - g_object_get (G_OBJECT (dialog), "cancel-button", &button, NULL); - gtk_button_set_label (GTK_BUTTON (button), data->cancel_label); - g_object_unref (G_OBJECT (button)); - } - - if (data->modal) - gtk_window_set_modal (GTK_WINDOW (dialog), TRUE); - - g_object_set (dialog, "show-editor", !color_data->show_palette, NULL); - - zenity_util_show_dialog (dialog, data->attach); - - if (data->timeout_delay > 0) { - g_timeout_add_seconds (data->timeout_delay, - (GSourceFunc) zenity_util_timeout_handle, - dialog); - } - - gtk_main(); +static void zenity_colorselection_dialog_response ( + GtkWidget *widget, int response, gpointer data); + +void +zenity_colorselection (ZenityData *data, ZenityColorData *color_data) { + GtkWidget *dialog; + GtkWidget *button; + GdkRGBA color; + + zen_data = data; + + dialog = gtk_color_chooser_dialog_new (data->dialog_title, NULL); + + g_signal_connect (G_OBJECT (dialog), + "response", + G_CALLBACK (zenity_colorselection_dialog_response), + color_data); + + if (color_data->color) { + if (gdk_rgba_parse (&color, color_data->color)) { + gtk_color_chooser_set_rgba (GTK_COLOR_CHOOSER (dialog), &color); + } + } + + if (data->extra_label) { + gint i = 0; + while (data->extra_label[i] != NULL) { + gtk_dialog_add_button ( + GTK_DIALOG (dialog), data->extra_label[i], i); + i++; + } + } + + if (data->ok_label) { + g_object_get (G_OBJECT (dialog), "ok-button", &button, NULL); + gtk_button_set_label (GTK_BUTTON (button), data->ok_label); + g_object_unref (G_OBJECT (button)); + } + + if (data->cancel_label) { + g_object_get (G_OBJECT (dialog), "cancel-button", &button, NULL); + gtk_button_set_label (GTK_BUTTON (button), data->cancel_label); + g_object_unref (G_OBJECT (button)); + } + + if (data->modal) + gtk_window_set_modal (GTK_WINDOW (dialog), TRUE); + + g_object_set (dialog, "show-editor", !color_data->show_palette, NULL); + + zenity_util_show_dialog (dialog, data->attach); + + if (data->timeout_delay > 0) { + g_timeout_add_seconds (data->timeout_delay, + (GSourceFunc) zenity_util_timeout_handle, + dialog); + } + + gtk_main (); } static void -zenity_colorselection_dialog_response (GtkWidget *widget, int response, gpointer data) -{ - GdkRGBA color; - - switch (response) { - case GTK_RESPONSE_OK: - zenity_util_exit_code_with_data(ZENITY_OK, zen_data); - gtk_color_chooser_get_rgba (GTK_COLOR_CHOOSER (widget), &color); - g_print ("%s\n", gdk_rgba_to_string (&color)); - break; - - case GTK_RESPONSE_CANCEL: - zen_data->exit_code = zenity_util_return_exit_code (ZENITY_CANCEL); - break; - - default: - if (zen_data->extra_label && response < g_strv_length(zen_data->extra_label)) - printf("%s\n",zen_data->extra_label[response]); - zen_data->exit_code = zenity_util_return_exit_code (ZENITY_ESC); - break; - } - - gtk_main_quit (); +zenity_colorselection_dialog_response ( + GtkWidget *widget, int response, gpointer data) { + GdkRGBA color; + + switch (response) { + case GTK_RESPONSE_OK: + zenity_util_exit_code_with_data (ZENITY_OK, zen_data); + gtk_color_chooser_get_rgba (GTK_COLOR_CHOOSER (widget), &color); + g_print ("%s\n", gdk_rgba_to_string (&color)); + break; + + case GTK_RESPONSE_CANCEL: + zen_data->exit_code = zenity_util_return_exit_code (ZENITY_CANCEL); + break; + + default: + if (zen_data->extra_label && + response < g_strv_length (zen_data->extra_label)) + printf ("%s\n", zen_data->extra_label[response]); + zen_data->exit_code = zenity_util_return_exit_code (ZENITY_ESC); + break; + } + + gtk_main_quit (); } |