Mercurial > cropper

changeset 2:e359bea4c8ac

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
added code for ratio swap; new names for ratio operations; added main.h; some more
author meillo@marmaro.de
date Tue, 04 Dec 2007 23:20:51 +0100
parents 80535e4deaa4
children 6aaba3a61563
files Makefile callbacks.c callbacks.h interface.c main.c main.h support.c
diffstat 7 files changed, 104 insertions(+), 114 deletions(-) [+]
line wrap: on
line diff
--- a/Makefile	Tue Dec 04 20:23:25 2007 +0100
+++ b/Makefile	Tue Dec 04 23:20:51 2007 +0100
@@ -17,4 +17,10 @@
 .c.o:
 	${CC} ${CFLAGS} -c $<
 
+
+clean:
+	rm ${OBJS}
+	rm ${PACKAGE}
+
+
 # end of file
--- a/callbacks.c	Tue Dec 04 20:23:25 2007 +0100
+++ b/callbacks.c	Tue Dec 04 23:20:51 2007 +0100
@@ -1,43 +1,38 @@
 #include <gtk/gtk.h>
 
+#include "main.h"
 #include "callbacks.h"
 #include "interface.h"
 #include "support.h"
 
 
-void on_none1_activate (GtkMenuItem* menuitem, gpointer user_data) {
 
+void on_ratio_none_activate (GtkMenuItem* menuitem, gpointer user_data) {
+	ratio = 0;
+}
+
+
+void on_ratio_square_activate (GtkMenuItem* menuitem, gpointer user_data) {
+	ratio = 1;
 }
 
 
-void on_square1_activate (GtkMenuItem* menuitem, gpointer user_data) {
-
+void on_ratio_4x3_activate (GtkMenuItem* menuitem, gpointer user_data) {
+	ratio = 4/3;
 }
 
 
-void on_4x3__book__dvd_1_activate (GtkMenuItem* menuitem, gpointer user_data) {
+void on_ratio_3x2_activate (GtkMenuItem* menuitem, gpointer user_data) {
+	ratio = 3/2;
+}
+
+
+void on_ratio_custom_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_8x1_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) {
@@ -50,11 +45,6 @@
 }
 
 
-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) {
 
 }
@@ -65,12 +55,23 @@
 }
 
 
+void on_ratio_swap_button_clicked (GtkButton* button, gpointer user_data) {
+	gint h;
+	
+	h = gtk_spin_button_get_value_as_int(lookup_widget(cropper_window, "ratio_w_spinbutton"));
+	gtk_spin_button_set_value(lookup_widget(cropper_window, "ratio_w_spinbutton"), gtk_spin_button_get_value(lookup_widget(cropper_window, "ratio_h_spinbutton")));
+	gtk_spin_button_set_value(lookup_widget(cropper_window, "ratio_h_spinbutton"), h);
+}
+
+
+
+
+
 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");
+	/* 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) {
 	gtk_main_quit();
 }
--- a/callbacks.h	Tue Dec 04 20:23:25 2007 +0100
+++ b/callbacks.h	Tue Dec 04 23:20:51 2007 +0100
@@ -1,32 +1,19 @@
 #include <gtk/gtk.h>
 
-
-void on_none1_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);
+gdouble ratio;
 
-void on_4x6__postcard_1_activate(GtkMenuItem* menuitem, gpointer user_data);
-
-void on_5x1_activate(GtkMenuItem* menuitem, gpointer user_data);
+void on_ratio_none_activate(GtkMenuItem* menuitem, gpointer user_data);
+void on_ratio_square_activate(GtkMenuItem* menuitem, gpointer user_data);
+void on_ratio_4x3_activate(GtkMenuItem* menuitem, gpointer user_data);
+void on_ratio_3x2_activate(GtkMenuItem* menuitem, gpointer user_data);
+void on_ratio_custom_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_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_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_swap_button_clicked(GtkButton* button, 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_change_value(GtkSpinButton* spinbutton, GtkScrollType scroll, 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_value_changed(GtkSpinButton* spinbutton, 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);
--- a/interface.c	Tue Dec 04 20:23:25 2007 +0100
+++ b/interface.c	Tue Dec 04 23:20:51 2007 +0100
@@ -62,13 +62,11 @@
   GtkWidget *ratio_h_spinbutton;
   GtkWidget *ratio_optionmenu;
   GtkWidget *menu1;
-  GtkWidget *none1;
-  GtkWidget *square1;
-  GtkWidget *_4x3__book__dvd_1;
-  GtkWidget *_4x6__postcard_1;
-  GtkWidget *_5x1;
-  GtkWidget *_8x1;
-  GtkWidget *custom1;
+  GtkWidget *ratio_none;
+  GtkWidget *ratio_square;
+  GtkWidget *ratio_4x3;
+  GtkWidget *ratio_3x2;
+  GtkWidget *ratio_custom;
   GtkWidget *vbox5;
   GtkWidget *frame1;
   GtkWidget *vbox7;
@@ -298,40 +296,30 @@
   menu1 = gtk_menu_new ();
   gtk_widget_set_name (menu1, "menu1");
 
-  none1 = gtk_menu_item_new_with_mnemonic ("None");
-  gtk_widget_set_name (none1, "none1");
-  gtk_widget_show (none1);
-  gtk_container_add (GTK_CONTAINER (menu1), none1);
+  ratio_none = gtk_menu_item_new_with_mnemonic ("None");
+  gtk_widget_set_name (ratio_none, "ratio_none");
+  gtk_widget_show (ratio_none);
+  gtk_container_add (GTK_CONTAINER (menu1), ratio_none);
 
-  square1 = gtk_menu_item_new_with_mnemonic ("Square");
-  gtk_widget_set_name (square1, "square1");
-  gtk_widget_show (square1);
-  gtk_container_add (GTK_CONTAINER (menu1), square1);
-
-  _4x3__book__dvd_1 = gtk_menu_item_new_with_mnemonic ("4 x 3 (Book, DVD)");
-  gtk_widget_set_name (_4x3__book__dvd_1, "_4x3__book__dvd_1");
-  gtk_widget_show (_4x3__book__dvd_1);
-  gtk_container_add (GTK_CONTAINER (menu1), _4x3__book__dvd_1);
+  ratio_square = gtk_menu_item_new_with_mnemonic ("Square");
+  gtk_widget_set_name (ratio_square, "ratio_square");
+  gtk_widget_show (ratio_square);
+  gtk_container_add (GTK_CONTAINER (menu1), ratio_square);
 
-  _4x6__postcard_1 = gtk_menu_item_new_with_mnemonic ("4 x 6 (Postcard)");
-  gtk_widget_set_name (_4x6__postcard_1, "_4x6__postcard_1");
-  gtk_widget_show (_4x6__postcard_1);
-  gtk_container_add (GTK_CONTAINER (menu1), _4x6__postcard_1);
-
-  _5x1 = gtk_menu_item_new_with_mnemonic ("5 x 7");
-  gtk_widget_set_name (_5x1, "_5x1");
-  gtk_widget_show (_5x1);
-  gtk_container_add (GTK_CONTAINER (menu1), _5x1);
+  ratio_4x3 = gtk_menu_item_new_with_mnemonic ("4 x 3 (Book, DVD)");
+  gtk_widget_set_name (ratio_4x3, "ratio_4x3");
+  gtk_widget_show (ratio_4x3);
+  gtk_container_add (GTK_CONTAINER (menu1), ratio_4x3);
 
-  _8x1 = gtk_menu_item_new_with_mnemonic ("8 x 10");
-  gtk_widget_set_name (_8x1, "_8x1");
-  gtk_widget_show (_8x1);
-  gtk_container_add (GTK_CONTAINER (menu1), _8x1);
+  ratio_3x2 = gtk_menu_item_new_with_mnemonic ("4 x 6 (Postcard)");
+  gtk_widget_set_name (ratio_3x2, "ratio_3x2");
+  gtk_widget_show (ratio_3x2);
+  gtk_container_add (GTK_CONTAINER (menu1), ratio_3x2);
 
-  custom1 = gtk_menu_item_new_with_mnemonic ("Custom");
-  gtk_widget_set_name (custom1, "custom1");
-  gtk_widget_show (custom1);
-  gtk_container_add (GTK_CONTAINER (menu1), custom1);
+  ratio_custom = gtk_menu_item_new_with_mnemonic ("Custom");
+  gtk_widget_set_name (ratio_custom, "ratio_custom");
+  gtk_widget_show (ratio_custom);
+  gtk_container_add (GTK_CONTAINER (menu1), ratio_custom);
 
   gtk_option_menu_set_menu (GTK_OPTION_MENU (ratio_optionmenu), menu1);
 
@@ -411,12 +399,17 @@
   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);
   g_signal_connect ((gpointer) cropper_window, "destroy",
                     G_CALLBACK (on_cropper_window_destroy),
                     NULL);
+
   g_signal_connect ((gpointer) ratio_w_spinbutton, "value_changed",
                     G_CALLBACK (on_ratio_w_spinbutton_value_changed),
                     NULL);
@@ -432,28 +425,24 @@
   g_signal_connect ((gpointer) ratio_h_spinbutton, "value_changed",
                     G_CALLBACK (on_ratio_h_spinbutton_value_changed),
                     NULL);
-  g_signal_connect ((gpointer) none1, "activate",
-                    G_CALLBACK (on_none1_activate),
+
+  g_signal_connect ((gpointer) ratio_none, "activate",
+                    G_CALLBACK (on_ratio_none_activate),
                     NULL);
-  g_signal_connect ((gpointer) square1, "activate",
-                    G_CALLBACK (on_square1_activate),
-                    NULL);
-  g_signal_connect ((gpointer) _4x3__book__dvd_1, "activate",
-                    G_CALLBACK (on_4x3__book__dvd_1_activate),
+  g_signal_connect ((gpointer) ratio_square, "activate",
+                    G_CALLBACK (on_ratio_square_activate),
                     NULL);
-  g_signal_connect ((gpointer) _4x6__postcard_1, "activate",
-                    G_CALLBACK (on_4x6__postcard_1_activate),
-                    NULL);
-  g_signal_connect ((gpointer) _5x1, "activate",
-                    G_CALLBACK (on_5x1_activate),
+  g_signal_connect ((gpointer) ratio_4x3, "activate",
+                    G_CALLBACK (on_ratio_4x3_activate),
                     NULL);
-  g_signal_connect ((gpointer) _8x1, "activate",
-                    G_CALLBACK (on_8x1_activate),
+  g_signal_connect ((gpointer) ratio_3x2, "activate",
+                    G_CALLBACK (on_ratio_3x2_activate),
                     NULL);
-  g_signal_connect ((gpointer) custom1, "activate",
-                    G_CALLBACK (on_custom1_activate),
+  g_signal_connect ((gpointer) ratio_custom, "activate",
+                    G_CALLBACK (on_ratio_custom_activate),
                     NULL);
 
+
   /* Store pointers to all widgets, for use by lookup_widget(). */
   GLADE_HOOKUP_OBJECT_NO_REF (cropper_window, cropper_window, "cropper_window");
   GLADE_HOOKUP_OBJECT (cropper_window, dialog_vbox1, "dialog_vbox1");
@@ -490,13 +479,11 @@
   GLADE_HOOKUP_OBJECT (cropper_window, ratio_h_spinbutton, "ratio_h_spinbutton");
   GLADE_HOOKUP_OBJECT (cropper_window, ratio_optionmenu, "ratio_optionmenu");
   GLADE_HOOKUP_OBJECT (cropper_window, menu1, "menu1");
-  GLADE_HOOKUP_OBJECT (cropper_window, none1, "none1");
-  GLADE_HOOKUP_OBJECT (cropper_window, square1, "square1");
-  GLADE_HOOKUP_OBJECT (cropper_window, _4x3__book__dvd_1, "_4x3__book__dvd_1");
-  GLADE_HOOKUP_OBJECT (cropper_window, _4x6__postcard_1, "_4x6__postcard_1");
-  GLADE_HOOKUP_OBJECT (cropper_window, _5x1, "_5x1");
-  GLADE_HOOKUP_OBJECT (cropper_window, _8x1, "_8x1");
-  GLADE_HOOKUP_OBJECT (cropper_window, custom1, "custom1");
+  GLADE_HOOKUP_OBJECT (cropper_window, ratio_none, "ratio_none");
+  GLADE_HOOKUP_OBJECT (cropper_window, ratio_square, "ratio_square");
+  GLADE_HOOKUP_OBJECT (cropper_window, ratio_4x3, "ratio_4x3");
+  GLADE_HOOKUP_OBJECT (cropper_window, ratio_3x2, "ratio_3x2");
+  GLADE_HOOKUP_OBJECT (cropper_window, ratio_custom, "ratio_custom");
   GLADE_HOOKUP_OBJECT (cropper_window, vbox5, "vbox5");
   GLADE_HOOKUP_OBJECT (cropper_window, frame1, "frame1");
   GLADE_HOOKUP_OBJECT (cropper_window, vbox7, "vbox7");
--- a/main.c	Tue Dec 04 20:23:25 2007 +0100
+++ b/main.c	Tue Dec 04 23:20:51 2007 +0100
@@ -1,10 +1,11 @@
 #include <gtk/gtk.h>
 
+#include "main.h"
 #include "interface.h"
 #include "support.h"
 
+
 int main (int argc, char *argv[]) {
-  GtkWidget *cropper_window;
 
   gtk_set_locale ();
   gtk_init (&argc, &argv);
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/main.h	Tue Dec 04 23:20:51 2007 +0100
@@ -0,0 +1,8 @@
+#ifndef _MAIN_H_
+#define _MAIN_H_
+
+#include <gtk/gtk.h>
+
+GtkWidget* cropper_window;
+
+#endif
--- a/support.c	Tue Dec 04 20:23:25 2007 +0100
+++ b/support.c	Tue Dec 04 23:20:51 2007 +0100
@@ -112,7 +112,7 @@
 
 /* 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 n_actions;
 	gint i;
 
   n_actions = atk_action_get_n_actions (action);