Mercurial > cropper
changeset 1:80535e4deaa4
nicer code formating
| author | meillo@marmaro.de |
|---|---|
| date | Tue, 04 Dec 2007 20:23:25 +0100 |
| parents | ca9155129253 |
| children | e359bea4c8ac |
| files | callbacks.c callbacks.h interface.c interface.h main.c support.c support.h |
| diffstat | 7 files changed, 116 insertions(+), 260 deletions(-) [+] |
line wrap: on
line diff
--- a/callbacks.c Tue Dec 04 16:48:51 2007 +0100 +++ b/callbacks.c Tue Dec 04 20:23:25 2007 +0100 @@ -1,7 +1,3 @@ -#ifdef HAVE_CONFIG_H -# include <config.h> -#endif - #include <gtk/gtk.h> #include "callbacks.h" @@ -9,119 +5,73 @@ #include "support.h" -void -on_none1_activate (GtkMenuItem *menuitem, - gpointer user_data) -{ +void on_none1_activate (GtkMenuItem* menuitem, gpointer user_data) { } -void -on_square1_activate (GtkMenuItem *menuitem, - gpointer user_data) -{ +void on_square1_activate (GtkMenuItem* menuitem, gpointer user_data) { } -void -on_4x3__book__dvd_1_activate (GtkMenuItem *menuitem, - gpointer user_data) -{ +void on_4x3__book__dvd_1_activate (GtkMenuItem* menuitem, gpointer user_data) { } -void -on_4x6__postcard_1_activate (GtkMenuItem *menuitem, - gpointer user_data) -{ +void on_4x6__postcard_1_activate (GtkMenuItem* menuitem, gpointer user_data) { } -void -on_5x1_activate (GtkMenuItem *menuitem, - gpointer user_data) -{ +void on_5x1_activate (GtkMenuItem* menuitem, gpointer user_data) { } -void -on_8x1_activate (GtkMenuItem *menuitem, - gpointer user_data) -{ +void on_8x1_activate (GtkMenuItem* menuitem, gpointer user_data) { } -void -on_custom1_activate (GtkMenuItem *menuitem, - gpointer user_data) -{ +void on_custom1_activate (GtkMenuItem* menuitem, gpointer user_data) { } -void -on_ratio_w_spinbutton_value_changed (GtkSpinButton *spinbutton, - gpointer user_data) -{ +void on_ratio_w_spinbutton_value_changed (GtkSpinButton* spinbutton, gpointer user_data) { } -void -on_ratio_w_spinbutton_change_value (GtkSpinButton *spinbutton, - GtkScrollType scroll, - gpointer user_data) -{ +void on_ratio_w_spinbutton_change_value (GtkSpinButton* spinbutton, GtkScrollType scroll, gpointer user_data) { } -void -on_ratio_swap_button_clicked (GtkButton *button, - gpointer user_data) -{ +void on_ratio_swap_button_clicked (GtkButton* button, gpointer user_data) { } -void -on_ratio_h_spinbutton_change_value (GtkSpinButton *spinbutton, - GtkScrollType scroll, - gpointer user_data) -{ +void on_ratio_h_spinbutton_change_value (GtkSpinButton* spinbutton, GtkScrollType scroll, gpointer user_data) { } -void -on_ratio_h_spinbutton_value_changed (GtkSpinButton *spinbutton, - gpointer user_data) -{ +void on_ratio_h_spinbutton_value_changed (GtkSpinButton* spinbutton, gpointer user_data) { } -gboolean -on_cropper_window_delete_event (GtkWidget *widget, - GdkEvent *event, - gpointer user_data) -{ - - g_print ("delete event occurred\n"); - return FALSE; +gboolean on_cropper_window_delete_event (GtkWidget* widget, GdkEvent *event, gpointer user_data) { + g_print("thanks for using the program - visit http://prog.marmaro.de\n"); + return FALSE; } -void -on_cropper_window_destroy (GtkObject *object, - gpointer user_data) -{ +void on_cropper_window_destroy (GtkObject* object, gpointer user_data) { gtk_main_quit(); }
--- a/callbacks.h Tue Dec 04 16:48:51 2007 +0100 +++ b/callbacks.h Tue Dec 04 20:23:25 2007 +0100 @@ -1,65 +1,32 @@ #include <gtk/gtk.h> -void -on_none1_activate (GtkMenuItem *menuitem, - gpointer user_data); +void on_none1_activate(GtkMenuItem* menuitem, gpointer user_data); -void -on_square1_activate (GtkMenuItem *menuitem, - gpointer user_data); +void on_square1_activate(GtkMenuItem* menuitem, gpointer user_data); -void -on_4x3__book__dvd_1_activate (GtkMenuItem *menuitem, - gpointer user_data); +void on_4x3__book__dvd_1_activate(GtkMenuItem* menuitem, gpointer user_data); -void -on_4x6__postcard_1_activate (GtkMenuItem *menuitem, - gpointer user_data); +void on_4x6__postcard_1_activate(GtkMenuItem* menuitem, gpointer user_data); -void -on_5x1_activate (GtkMenuItem *menuitem, - gpointer user_data); +void on_5x1_activate(GtkMenuItem* menuitem, gpointer user_data); -void -on_8x1_activate (GtkMenuItem *menuitem, - gpointer user_data); +void on_8x1_activate(GtkMenuItem* menuitem, gpointer user_data); -void -on_custom1_activate (GtkMenuItem *menuitem, - gpointer user_data); +void on_custom1_activate(GtkMenuItem* menuitem, gpointer user_data); -void -on_cropper_window_destroy (GtkObject *object, - gpointer user_data); +void on_cropper_window_destroy(GtkObject* object, gpointer user_data); -void -on_ratio_w_spinbutton_value_changed (GtkSpinButton *spinbutton, - gpointer user_data); +void on_ratio_w_spinbutton_value_changed(GtkSpinButton* spinbutton, gpointer user_data); -void -on_ratio_w_spinbutton_change_value (GtkSpinButton *spinbutton, - GtkScrollType scroll, - gpointer user_data); +void on_ratio_w_spinbutton_change_value(GtkSpinButton* spinbutton, GtkScrollType scroll, gpointer user_data); -void -on_ratio_swap_button_clicked (GtkButton *button, - gpointer user_data); +void on_ratio_swap_button_clicked(GtkButton* button, gpointer user_data); -void -on_ratio_h_spinbutton_change_value (GtkSpinButton *spinbutton, - GtkScrollType scroll, - gpointer user_data); +void on_ratio_h_spinbutton_change_value(GtkSpinButton* spinbutton, GtkScrollType scroll, gpointer user_data); -void -on_ratio_h_spinbutton_value_changed (GtkSpinButton *spinbutton, - gpointer user_data); +void on_ratio_h_spinbutton_value_changed(GtkSpinButton* spinbutton, gpointer user_data); -gboolean -on_cropper_window_delete_event (GtkWidget *widget, - GdkEvent *event, - gpointer user_data); +gboolean on_cropper_window_delete_event(GtkWidget* widget, GdkEvent *event, gpointer user_data); -void -on_cropper_window_destroy (GtkObject *object, - gpointer user_data); +void on_cropper_window_destroy(GtkObject* object, gpointer user_data);
--- a/interface.c Tue Dec 04 16:48:51 2007 +0100 +++ b/interface.c Tue Dec 04 20:23:25 2007 +0100 @@ -1,11 +1,3 @@ -/* - * DO NOT EDIT THIS FILE - it is generated by Glade. - */ - -#ifdef HAVE_CONFIG_H -# include <config.h> -#endif - #include <sys/types.h> #include <sys/stat.h> #include <unistd.h> @@ -418,6 +410,7 @@ gtk_widget_show (image1); gtk_container_add (GTK_CONTAINER (crop_zoom_fit_button), image1); + g_signal_connect ((gpointer) cropper_window, "delete_event", G_CALLBACK (on_cropper_window_delete_event), NULL);
--- a/interface.h Tue Dec 04 16:48:51 2007 +0100 +++ b/interface.h Tue Dec 04 20:23:25 2007 +0100 @@ -1,6 +1,3 @@ -/* - * DO NOT EDIT THIS FILE - it is generated by Glade. - */ #include<gtk/gtk.h> -GtkWidget* create_cropper_window (void); +GtkWidget* create_cropper_window(void);
--- a/main.c Tue Dec 04 16:48:51 2007 +0100 +++ b/main.c Tue Dec 04 20:23:25 2007 +0100 @@ -1,20 +1,9 @@ -/* - * Initial main.c file generated by Glade. Edit as required. - * Glade will not overwrite this file. - */ - -#ifdef HAVE_CONFIG_H -# include <config.h> -#endif - #include <gtk/gtk.h> #include "interface.h" #include "support.h" -int -main (int argc, char *argv[]) -{ +int main (int argc, char *argv[]) { GtkWidget *cropper_window; gtk_set_locale (); @@ -22,11 +11,6 @@ add_pixmap_directory ("/usr/share/pixmaps"); - /* - * The following code was added by Glade to create one of each component - * (except popup menus), just so that you see something after building - * the project. Delete any components that you don't want shown initially. - */ cropper_window = create_cropper_window (); gtk_widget_show (cropper_window);
--- a/support.c Tue Dec 04 16:48:51 2007 +0100 +++ b/support.c Tue Dec 04 20:23:25 2007 +0100 @@ -1,11 +1,3 @@ -/* - * DO NOT EDIT THIS FILE - it is generated by Glade. - */ - -#ifdef HAVE_CONFIG_H -# include <config.h> -#endif - #include <sys/types.h> #include <sys/stat.h> #include <unistd.h> @@ -16,129 +8,118 @@ #include "support.h" -GtkWidget* -lookup_widget (GtkWidget *widget, - const gchar *widget_name) -{ - GtkWidget *parent, *found_widget; + +GtkWidget* lookup_widget(GtkWidget* widget, const gchar* widget_name) { + GtkWidget* parent; + GtkWidget* found_widget; - for (;;) - { - if (GTK_IS_MENU (widget)) - parent = gtk_menu_get_attach_widget (GTK_MENU (widget)); - else - parent = widget->parent; - if (!parent) - parent = (GtkWidget*) g_object_get_data (G_OBJECT (widget), "GladeParentKey"); - if (parent == NULL) - break; - widget = parent; - } + for (;;) { + if (GTK_IS_MENU (widget)) { + parent = gtk_menu_get_attach_widget (GTK_MENU (widget)); + } else { + parent = widget->parent; + } + if (!parent) { + parent = (GtkWidget*) g_object_get_data (G_OBJECT (widget), "GladeParentKey"); + } + if (parent == NULL) { + break; + } + widget = parent; + } - found_widget = (GtkWidget*) g_object_get_data (G_OBJECT (widget), - widget_name); - if (!found_widget) + found_widget = (GtkWidget*) g_object_get_data (G_OBJECT (widget), widget_name); + if (!found_widget) { g_warning ("Widget not found: %s", widget_name); + } return found_widget; } + static GList *pixmaps_directories = NULL; /* Use this function to set the directory containing installed pixmaps. */ -void -add_pixmap_directory (const gchar *directory) -{ - pixmaps_directories = g_list_prepend (pixmaps_directories, - g_strdup (directory)); +void add_pixmap_directory(const gchar* directory) { + pixmaps_directories = g_list_prepend (pixmaps_directories, g_strdup (directory)); } /* This is an internally used function to find pixmap files. */ -static gchar* -find_pixmap_file (const gchar *filename) -{ - GList *elem; +static gchar* find_pixmap_file(const gchar* filename) { + GList* elem; /* We step through each of the pixmaps directory to find it. */ elem = pixmaps_directories; - while (elem) - { - gchar *pathname = g_strdup_printf ("%s%s%s", (gchar*)elem->data, - G_DIR_SEPARATOR_S, filename); - if (g_file_test (pathname, G_FILE_TEST_EXISTS)) - return pathname; - g_free (pathname); - elem = elem->next; - } + while (elem) { + gchar *pathname = g_strdup_printf ("%s%s%s", (gchar*)elem->data, G_DIR_SEPARATOR_S, filename); + if (g_file_test (pathname, G_FILE_TEST_EXISTS)) { + return pathname; + } + g_free (pathname); + elem = elem->next; + } return NULL; } + /* This is an internally used function to create pixmaps. */ -GtkWidget* -create_pixmap (GtkWidget *widget, - const gchar *filename) -{ - gchar *pathname = NULL; - GtkWidget *pixmap; +GtkWidget* create_pixmap(GtkWidget* widget, const gchar* filename) { + gchar* pathname = NULL; + GtkWidget* pixmap; - if (!filename || !filename[0]) - return gtk_image_new (); + if (!filename || !filename[0]) { + return gtk_image_new (); + } pathname = find_pixmap_file (filename); - if (!pathname) - { - g_warning ("Couldn't find pixmap file: %s", filename); - return gtk_image_new (); - } + if (!pathname) { + g_warning ("Couldn't find pixmap file: %s", filename); + return gtk_image_new (); + } pixmap = gtk_image_new_from_file (pathname); - g_free (pathname); + g_free(pathname); return pixmap; } + /* This is an internally used function to create pixmaps. */ -GdkPixbuf* -create_pixbuf (const gchar *filename) -{ - gchar *pathname = NULL; - GdkPixbuf *pixbuf; - GError *error = NULL; +GdkPixbuf* create_pixbuf(const gchar* filename) { + gchar* pathname = NULL; + GdkPixbuf* pixbuf; + GError* error = NULL; - if (!filename || !filename[0]) - return NULL; - - pathname = find_pixmap_file (filename); + if (!filename || !filename[0]) { + return NULL; + } - if (!pathname) - { - g_warning ("Couldn't find pixmap file: %s", filename); - return NULL; - } + pathname = find_pixmap_file(filename); + + if (!pathname) { + g_warning ("Couldn't find pixmap file: %s", filename); + return NULL; + } pixbuf = gdk_pixbuf_new_from_file (pathname, &error); - if (!pixbuf) - { - fprintf (stderr, "Failed to load pixbuf file: %s: %s\n", - pathname, error->message); - g_error_free (error); - } - g_free (pathname); + if (!pixbuf) { + fprintf(stderr, "Failed to load pixbuf file: %s: %s\n", pathname, error->message); + g_error_free(error); + } + g_free(pathname); return pixbuf; } + /* This is used to set ATK action descriptions. */ -void -glade_set_atk_action_description (AtkAction *action, - const gchar *action_name, - const gchar *description) -{ - gint n_actions, i; +void glade_set_atk_action_description(AtkAction* action, const gchar* action_name, const gchar* description) { + gint n_actions + gint i; n_actions = atk_action_get_n_actions (action); - for (i = 0; i < n_actions; i++) - { - if (!strcmp (atk_action_get_name (action, i), action_name)) - atk_action_set_description (action, i, description); - } + for (i = 0; i < n_actions; i++) { + if (!strcmp (atk_action_get_name (action, i), action_name)) { + atk_action_set_description (action, i, description); + } + } }
--- a/support.h Tue Dec 04 16:48:51 2007 +0100 +++ b/support.h Tue Dec 04 20:23:25 2007 +0100 @@ -1,16 +1,6 @@ -/* - * DO NOT EDIT THIS FILE - it is generated by Glade. - */ - -#ifdef HAVE_CONFIG_H -# include <config.h> -#endif - #include <gtk/gtk.h> -/* - * Public Functions. - */ +/* Public Functions */ /* * This function returns a widget in a component created by Glade. @@ -18,27 +8,21 @@ * or alternatively any widget in the component, and the name of the widget * you want returned. */ -GtkWidget* lookup_widget (GtkWidget *widget, - const gchar *widget_name); +GtkWidget* lookup_widget(GtkWidget* widget, const gchar* widget_name); /* Use this function to set the directory containing installed pixmaps. */ -void add_pixmap_directory (const gchar *directory); +void add_pixmap_directory(const gchar* directory); -/* - * Private Functions. - */ +/* Private Functions */ + /* This is used to create the pixmaps used in the interface. */ -GtkWidget* create_pixmap (GtkWidget *widget, - const gchar *filename); +GtkWidget* create_pixmap(GtkWidget* widget, const gchar* filename); /* This is used to create the pixbufs used in the interface. */ -GdkPixbuf* create_pixbuf (const gchar *filename); +GdkPixbuf* create_pixbuf(const gchar* filename); /* This is used to set ATK action descriptions. */ -void glade_set_atk_action_description (AtkAction *action, - const gchar *action_name, - const gchar *description); - +void glade_set_atk_action_description(AtkAction* action, const gchar* action_name, const gchar* description);