diff --git a/src/gtkutils.c b/src/gtkutils.c index 25182de..2cdb3f8 100644 --- a/src/gtkutils.c +++ b/src/gtkutils.c @@ -8,121 +8,138 @@ #include #include -gboolean ut_key_pressed_cb(GtkWidget *widget, GdkEventKey *event) { - if(widget && event && event->keyval == GDK_Escape) { - gtk_widget_destroy(widget); - return TRUE; - } - return FALSE; +gboolean ut_key_pressed_cb(GtkWidget *widget, GdkEventKey *event) +{ + if(widget && event && event->keyval == GDK_Escape) { + gtk_widget_destroy(widget); + return TRUE; + } + return FALSE; } + GtkWidget *ut_window_new(gchar *title, gchar *wmname, gchar *wmclass, - gboolean escaable, gboolean modal, gboolean resizable, - gint border) { - GtkWidget *window = gtk_window_new(GTK_WINDOW_TOPLEVEL); - gtk_window_set_modal(GTK_WINDOW(window), modal); - gtk_window_set_resizable(GTK_WINDOW(window), resizable); - gtk_window_set_title(GTK_WINDOW(window), title); - gtk_window_set_role(GTK_WINDOW(window), wmname); - if(escaable) { - g_signal_connect(G_OBJECT(window), "key_press_event", G_CALLBACK(ut_key_pressed_cb), NULL); - } - gtk_container_set_border_width(GTK_CONTAINER(window), border); - return window; + gboolean escaable, gboolean modal, gboolean resizable, + gint border) +{ + GtkWidget *window = gtk_window_new(GTK_WINDOW_TOPLEVEL); + gtk_window_set_modal(GTK_WINDOW(window), modal); + gtk_window_set_resizable(GTK_WINDOW(window), resizable); + gtk_window_set_title(GTK_WINDOW(window), title); + gtk_window_set_role(GTK_WINDOW(window), wmname); + if(escaable) { + g_signal_connect(G_OBJECT(window), "key_press_event", G_CALLBACK(ut_key_pressed_cb), NULL); + } + gtk_container_set_border_width(GTK_CONTAINER(window), border); + return window; } -GtkWidget *ut_check_button_new(gchar *label, gboolean active, GtkWidget *parent) { - GtkWidget *button; - button = gtk_check_button_new_with_label(label); - gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(button), active); - gtk_box_pack_start(GTK_BOX(parent), button, FALSE, FALSE, 0); +GtkWidget *ut_check_button_new(gchar *label, gboolean active, GtkWidget *parent) +{ + GtkWidget *button; - return button; + button = gtk_check_button_new_with_label(label); + gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(button), active); + gtk_box_pack_start(GTK_BOX(parent), button, FALSE, FALSE, 0); + + return button; } -GtkWidget *ut_button_new(gchar *label, gpointer func, gpointer func_data, GtkWidget *parent) { - GtkWidget *button; - button = gtk_button_new_with_label(label); - g_signal_connect(G_OBJECT(button), "clicked", func, func_data); - gtk_box_pack_start(GTK_BOX(parent), button, TRUE, TRUE, 0); - gtk_widget_set_can_default (button, TRUE); +GtkWidget *ut_button_new(gchar *label, gpointer func, gpointer func_data, GtkWidget *parent) +{ + GtkWidget *button; - return button; + button = gtk_button_new_with_label(label); + g_signal_connect(G_OBJECT(button), "clicked", func, func_data); + gtk_box_pack_start(GTK_BOX(parent), button, TRUE, TRUE, 0); + gtk_widget_set_can_default (button, TRUE); + + return button; } -GtkWidget *ut_button_new_stock(const gchar *stock_id, gpointer func, gpointer func_data, GtkWidget *parent) { - GtkWidget *button; - button = gtk_button_new_from_stock(stock_id); - g_signal_connect(G_OBJECT(button), "clicked", G_CALLBACK(func), func_data); - gtk_box_pack_start(GTK_BOX(parent), button, TRUE, TRUE, 0); - gtk_widget_set_can_default (button, TRUE); +GtkWidget *ut_button_new_stock(const gchar *stock_id, gpointer func, gpointer func_data, GtkWidget *parent) +{ + GtkWidget *button; - return button; + button = gtk_button_new_from_stock(stock_id); + g_signal_connect(G_OBJECT(button), "clicked", G_CALLBACK(func), func_data); + gtk_box_pack_start(GTK_BOX(parent), button, TRUE, TRUE, 0); + gtk_widget_set_can_default (button, TRUE); + + return button; } -GtkWidget *ut_button_new_stock_swap(const gchar *stock_id, gpointer func, gpointer func_data, GtkWidget *parent) { - GtkWidget *button; - button = gtk_button_new_from_stock(stock_id); - g_signal_connect_swapped(G_OBJECT(button), "clicked", G_CALLBACK(func), func_data); - gtk_box_pack_start(GTK_BOX(parent), button, TRUE, TRUE, 0); - gtk_widget_set_can_default (button, TRUE); +GtkWidget *ut_button_new_stock_swap(const gchar *stock_id, gpointer func, gpointer func_data, GtkWidget *parent) +{ + GtkWidget *button; - return button; + button = gtk_button_new_from_stock(stock_id); + g_signal_connect_swapped(G_OBJECT(button), "clicked", G_CALLBACK(func), func_data); + gtk_box_pack_start(GTK_BOX(parent), button, TRUE, TRUE, 0); + gtk_widget_set_can_default (button, TRUE); + + return button; } -GtkWidget *ut_spin_button_new(gchar *label, gint min, gint max, gint val, GtkWidget *parent) { - GtkAdjustment *adj; - GtkWidget *button, *hbox, *labelw; - hbox = gtk_hbox_new(FALSE, 0); - gtk_box_pack_start(GTK_BOX(parent), hbox, TRUE, TRUE, 2); +GtkWidget *ut_spin_button_new(gchar *label, gint min, gint max, gint val, GtkWidget *parent) +{ + GtkAdjustment *adj; + GtkWidget *button, *hbox, *labelw; - labelw = gtk_label_new(label); - gtk_box_pack_start(GTK_BOX(hbox), labelw, FALSE, FALSE, 5); + hbox = gtk_hbox_new(FALSE, 0); + gtk_box_pack_start(GTK_BOX(parent), hbox, TRUE, TRUE, 2); - adj = GTK_ADJUSTMENT (gtk_adjustment_new(val, min, max, 1, 10, 10)); - button = gtk_spin_button_new(adj, 1, 0); - gtk_spin_button_set_numeric(GTK_SPIN_BUTTON(button), TRUE); - gtk_box_pack_end(GTK_BOX(hbox), button, FALSE, FALSE, 5); + labelw = gtk_label_new(label); + gtk_box_pack_start(GTK_BOX(hbox), labelw, FALSE, FALSE, 5); - return button; + adj = GTK_ADJUSTMENT (gtk_adjustment_new(val, min, max, 1, 10, 10)); + button = gtk_spin_button_new(adj, 1, 0); + gtk_spin_button_set_numeric(GTK_SPIN_BUTTON(button), TRUE); + gtk_box_pack_end(GTK_BOX(hbox), button, FALSE, FALSE, 5); + + return button; } + GtkWidget *ut_spin_button_start_new(gchar *label, gint min, gint max, gint val, GtkWidget *parent) { - GtkAdjustment *adj; - GtkWidget *button, *hbox, *labelw; + GtkAdjustment *adj; + GtkWidget *button, *hbox, *labelw; - hbox = gtk_hbox_new(FALSE, 0); - gtk_box_pack_start(GTK_BOX(parent), hbox, TRUE, TRUE, 2); + hbox = gtk_hbox_new(FALSE, 0); + gtk_box_pack_start(GTK_BOX(parent), hbox, TRUE, TRUE, 2); - labelw = gtk_label_new(label); - gtk_box_pack_start(GTK_BOX(hbox), labelw, FALSE, FALSE, 5); + labelw = gtk_label_new(label); + gtk_box_pack_start(GTK_BOX(hbox), labelw, FALSE, FALSE, 5); - adj = GTK_ADJUSTMENT (gtk_adjustment_new(val, min, max, 1, 10, 10)); - button = gtk_spin_button_new(adj, 1, 0); - gtk_spin_button_set_numeric(GTK_SPIN_BUTTON(button), TRUE); - gtk_box_pack_start(GTK_BOX(hbox), button, FALSE, FALSE, 5); + adj = GTK_ADJUSTMENT (gtk_adjustment_new(val, min, max, 1, 10, 10)); + button = gtk_spin_button_new(adj, 1, 0); + gtk_spin_button_set_numeric(GTK_SPIN_BUTTON(button), TRUE); + gtk_box_pack_start(GTK_BOX(hbox), button, FALSE, FALSE, 5); - return button; + return button; } + /* shows simple message box */ -void ut_simple_message_box(gchar *message) { - GtkWidget *dialog = gtk_message_dialog_new(NULL, 0, GTK_MESSAGE_INFO, GTK_BUTTONS_CLOSE, message); - gtk_dialog_run(GTK_DIALOG(dialog)); - gtk_widget_destroy(dialog); +void ut_simple_message_box(gchar *message) +{ + GtkWidget *dialog = gtk_message_dialog_new(NULL, 0, GTK_MESSAGE_INFO, GTK_BUTTONS_CLOSE, message); + gtk_dialog_run(GTK_DIALOG(dialog)); + gtk_widget_destroy(dialog); } + /* shows simple message box */ void ut_simple_message_box_with_title(gchar *message, gchar *title) { - GtkWidget *dialog = gtk_message_dialog_new(NULL, 0, GTK_MESSAGE_INFO, GTK_BUTTONS_CLOSE, message); - gtk_window_set_title(GTK_WINDOW(dialog), title); - gtk_dialog_run(GTK_DIALOG(dialog)); - gtk_widget_destroy(dialog); + GtkWidget *dialog = gtk_message_dialog_new(NULL, 0, GTK_MESSAGE_INFO, GTK_BUTTONS_CLOSE, message); + gtk_window_set_title(GTK_WINDOW(dialog), title); + gtk_dialog_run(GTK_DIALOG(dialog)); + gtk_widget_destroy(dialog); } diff --git a/src/gtkutils.h b/src/gtkutils.h index fa736ff..0c9f53e 100644 --- a/src/gtkutils.h +++ b/src/gtkutils.h @@ -1,49 +1,48 @@ #ifndef __GTKUTILS_H #define __GTKUTILS_H -gboolean ut_key_pressed_cb (GtkWidget *widget, - GdkEventKey *event); +gboolean ut_key_pressed_cb (GtkWidget *widget, GdkEventKey *event); -GtkWidget *ut_window_new (gchar *title, - gchar *wmname, - gchar *wmclass, - gboolean escaable, - gboolean modal, - gboolean resizable, - gint border); +GtkWidget *ut_window_new (gchar *title, + gchar *wmname, + gchar *wmclass, + gboolean escaable, + gboolean modal, + gboolean resizable, + gint border); -GtkWidget *ut_check_button_new (gchar *label, - gboolean active, - GtkWidget *parent); +GtkWidget *ut_check_button_new (gchar *label, + gboolean active, + GtkWidget *parent); -GtkWidget *ut_button_new (gchar *label, - gpointer func, - gpointer func_data, - GtkWidget *parent); +GtkWidget *ut_button_new (gchar *label, + gpointer func, + gpointer func_data, + GtkWidget *parent); -GtkWidget *ut_button_new_stock (const gchar *stock_id, - gpointer func, - gpointer func_data, - GtkWidget *parent); +GtkWidget *ut_button_new_stock (const gchar *stock_id, + gpointer func, + gpointer func_data, + GtkWidget *parent); -GtkWidget *ut_button_new_stock_swap (const gchar *stock_id, - gpointer func, - gpointer func_data, - GtkWidget *parent); +GtkWidget *ut_button_new_stock_swap (const gchar *stock_id, + gpointer func, + gpointer func_data, + GtkWidget *parent); -GtkWidget *ut_spin_button_new (gchar *label, - gint min, - gint max, - gint val, - GtkWidget *parent); +GtkWidget *ut_spin_button_new (gchar *label, + gint min, + gint max, + gint val, + GtkWidget *parent); -GtkWidget *ut_spin_button_start_new (gchar *label, - gint min, - gint max, - gint val, - GtkWidget *parent); -void ut_simple_message_box (gchar *message); +GtkWidget *ut_spin_button_start_new (gchar *label, + gint min, + gint max, + gint val, + GtkWidget *parent); -void ut_simple_message_box_with_title (gchar *message, - gchar *title); +void ut_simple_message_box (gchar *message); + +void ut_simple_message_box_with_title (gchar *message, gchar *title); #endif