Mercurial > cropper
changeset 15:7dbf3879939a
removed support.*
| author | meillo@marmaro.de |
|---|---|
| date | Thu, 04 Mar 2010 19:16:10 +0100 |
| parents | da18f2d4f92f |
| children | 88b8856fccf5 |
| files | Makefile callbacks.c interface.c main.c support.c support.h |
| diffstat | 6 files changed, 42 insertions(+), 180 deletions(-) [+] |
line wrap: on
line diff
--- a/Makefile Thu Mar 04 18:31:28 2010 +0100 +++ b/Makefile Thu Mar 04 19:16:10 2010 +0100 @@ -2,8 +2,8 @@ NAME = cropper -SRC = interface.c callbacks.c support.c main.c -DEP = main.h callbacks.h support.h +SRC = interface.c callbacks.c main.c +DEP = main.h callbacks.h OBJ = ${SRC:.c=.o} CC = gcc @@ -21,10 +21,9 @@ ${CC} ${CFLAGS} -c $< -support.o: support.h -interface.o: main.h callbacks.h support.h -callbacks.o: main.h callbacks.h support.h -main.o: main.h support.h +interface.o: main.h callbacks.h +callbacks.o: main.h callbacks.h +main.o: main.h clean:
--- a/callbacks.c Thu Mar 04 18:31:28 2010 +0100 +++ b/callbacks.c Thu Mar 04 19:16:10 2010 +0100 @@ -3,7 +3,6 @@ #include <gdk/gdkkeysyms.h> #include "main.h" #include "callbacks.h" -#include "support.h" int image_width; int image_height;
--- a/interface.c Thu Mar 04 18:31:28 2010 +0100 +++ b/interface.c Thu Mar 04 19:16:10 2010 +0100 @@ -10,7 +10,6 @@ #include "main.h" #include "callbacks.h" -#include "support.h" #define GLADE_HOOKUP_OBJECT(component,widget,name) \ g_object_set_data_full(G_OBJECT(component), name, \ @@ -19,6 +18,43 @@ #define GLADE_HOOKUP_OBJECT_NO_REF(component,widget,name) \ g_object_set_data(G_OBJECT(component), name, widget) + +/* + * This function returns a widget in a component created by Glade. + * Call it with the toplevel widget in the component (i.e. a window/dialog), + * 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* 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; + } + + 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; +} + + + GtkWidget* create_cropper_window(void) {
--- a/main.c Thu Mar 04 18:31:28 2010 +0100 +++ b/main.c Thu Mar 04 19:16:10 2010 +0100 @@ -1,7 +1,6 @@ #include <gtk/gtk.h> #include "main.h" -#include "support.h" int @@ -15,16 +14,8 @@ } image_filename = argv[1]; - -/* - gtk_set_locale(); -*/ gtk_init(&argc, &argv); -/* - add_pixmap_directory("/usr/share/pixmaps"); -*/ - cropper_window = create_cropper_window(); gtk_widget_show(cropper_window); gtk_main();
--- a/support.c Thu Mar 04 18:31:28 2010 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,135 +0,0 @@ -#include <sys/types.h> -#include <sys/stat.h> -#include <unistd.h> -#include <string.h> -#include <stdio.h> -#include <gtk/gtk.h> -#include "support.h" - -static GList *pixmaps_directories = NULL; - - -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; - } - - 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; -} - - -/* 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)); -} - - -/* This is an internally used function to find pixmap files. */ -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; - } - return NULL; -} - - -/* This is an internally used function to create pixmaps. */ -GtkWidget* -create_pixmap(GtkWidget* widget, const gchar* filename) -{ - gchar* pathname = NULL; - GtkWidget* pixmap; - - 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(); - } - - pixmap = gtk_image_new_from_file(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; - - if (!filename || !filename[0]) { - 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); - 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; - 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); - } - } -}
--- a/support.h Thu Mar 04 18:31:28 2010 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,28 +0,0 @@ -#include <gtk/gtk.h> - -/* Public Functions */ - -/* - * This function returns a widget in a component created by Glade. - * Call it with the toplevel widget in the component (i.e. a window/dialog), - * 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); - - -/* Use this function to set the directory containing installed pixmaps. */ -void add_pixmap_directory(const gchar* directory); - - -/* Private Functions */ - - -/* This is used to create the pixmaps used in the interface. */ -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); - -/* This is used to set ATK action descriptions. */ -void glade_set_atk_action_description(AtkAction* action, const gchar* action_name, const gchar* description);