diff callbacks.c @ 11:c18ba4ea1514

just cosmetic changes
author meillo@marmaro.de
date Thu, 04 Mar 2010 14:18:19 +0100
parents 5e282003f0c1
children 13bc21684b8a
line wrap: on
line diff
--- a/callbacks.c	Thu Mar 04 13:54:17 2010 +0100
+++ b/callbacks.c	Thu Mar 04 14:18:19 2010 +0100
@@ -1,6 +1,5 @@
 #include <gtk/gtk.h>
 #include <gdk-pixbuf/gdk-pixbuf.h>
-
 #include "main.h"
 #include "callbacks.h"
 #include "support.h"
@@ -8,42 +7,54 @@
 int image_width;
 int image_height;
 float inc = 0.3;
+
+
 /*
-void update_spin_button_ratio(GtkWidget* spinbutton) {
+void
+update_spin_button_ratio(GtkWidget* spinbutton)
+{
 	g_print("ratio change: %f\n", ratio);
 	on_ratio_w_spinbutton_value_changed(spinbutton, NULL);
 }
 
 
-
-
-
-void on_ratio_none_activate (GtkMenuItem* menuitem, gpointer user_data) {
+void
+on_ratio_none_activate(GtkMenuItem* menuitem, gpointer user_data)
+{
 	ratio = 1;
 	update_spin_button_ratio(lookup_widget(cropper_window, "ratio_w_spinbutton"));
 }
 
 
-void on_ratio_square_activate (GtkMenuItem* menuitem, gpointer user_data) {
+void
+on_ratio_square_activate(GtkMenuItem* menuitem, gpointer user_data)
+{
 	ratio = 1;
 	update_spin_button_ratio(lookup_widget(cropper_window, "ratio_w_spinbutton"));
 }
 
 
-void on_ratio_4x3_activate (GtkMenuItem* menuitem, gpointer user_data) {
+void
+on_ratio_4x3_activate(GtkMenuItem* menuitem, gpointer user_data)
+{
 	ratio = 4.0/3.0;
 	update_spin_button_ratio(lookup_widget(cropper_window, "ratio_w_spinbutton"));
 }
 
 
-void on_ratio_3x2_activate (GtkMenuItem* menuitem, gpointer user_data) {
+void
+on_ratio_3x2_activate(GtkMenuItem* menuitem, gpointer user_data)
+{
 	ratio = 1.5;
 	update_spin_button_ratio(lookup_widget(cropper_window, "ratio_w_spinbutton"));
 }
 
 
-void on_ratio_custom_activate (GtkMenuItem* menuitem, gpointer user_data) {
-	ratio = gtk_spin_button_get_value(lookup_widget(cropper_window, "ratio_w_spinbutton")) / gtk_spin_button_get_value(lookup_widget(cropper_window, "ratio_h_spinbutton"));
+void
+on_ratio_custom_activate(GtkMenuItem* menuitem, gpointer user_data)
+{
+	ratio = gtk_spin_button_get_value(lookup_widget(cropper_window, "ratio_w_spinbutton"))
+	        / gtk_spin_button_get_value(lookup_widget(cropper_window, "ratio_h_spinbutton"));
 	update_spin_button_ratio(lookup_widget(cropper_window, "ratio_w_spinbutton"));
 }
 */
@@ -57,8 +68,10 @@
 
 
 /*
-static void ratio_optionmenu_changed_cb (GtkOptionMenu* optionmenu, gpointer unser_data) {
-	int      idx = gtk_option_menu_get_history (optionmenu);
+static void
+ratio_optionmenu_changed_cb(GtkOptionMenu* optionmenu, gpointer unser_data)
+{
+	int      idx = gtk_option_menu_get_history(optionmenu);
 	int      w = 1, h = 1;
 	gboolean use_ratio = TRUE;
 
@@ -87,30 +100,39 @@
 			break;
 		case GTH_CROP_RATIO_CUSTOM:
 		default:
-			w = gtk_spin_button_get_value_as_int (GTK_SPIN_BUTTON (lookup_widget(cropper_window, "ratio_w_spinbutton")));
-			h = gtk_spin_button_get_value_as_int (GTK_SPIN_BUTTON (lookup_widget(cropper_window, "ratio_h_spinbutton")));
+			w = gtk_spin_button_get_value_as_int(GTK_SPIN_BUTTON(
+			        lookup_widget(cropper_window, "ratio_w_spinbutton")));
+			h = gtk_spin_button_get_value_as_int(GTK_SPIN_BUTTON(
+			        lookup_widget(cropper_window, "ratio_h_spinbutton")));
 			break;
 	}
 
-	gtk_widget_set_sensitive (lookup_widget(cropper_window, "custom_ratio_box"), idx == GTH_CROP_RATIO_CUSTOM);
-	set_spin_value (cropper_window, lookup_widget(cropper_window, "ratio_w_spinbutton"), w);
-	set_spin_value (cropper_window, lookup_widget(cropper_window, "ratio_h_spinbutton"), h);
+	gtk_widget_set_sensitive(lookup_widget(cropper_window, "custom_ratio_box"),
+	                         idx == GTH_CROP_RATIO_CUSTOM);
+	set_spin_value(cropper_window, lookup_widget(cropper_window, "ratio_w_spinbutton"), w);
+	set_spin_value(cropper_window, lookup_widget(cropper_window, "ratio_h_spinbutton"), h);
 
-	gth_image_selector_set_ratio (GTH_IMAGE_SELECTOR (lookup_widget(cropper_window, "crop_image")), use_ratio, (double) w / h);
+	gth_image_selector_set_ratio(GTH_IMAGE_SELECTOR(lookup_widget(cropper_window, "crop_image")),
+	                             use_ratio, (double) w / h);
 }
 
 
-static void ratio_value_changed_cb (GtkSpinButton* spin, gpointer unser_data) {
+static void
+ratio_value_changed_cb(GtkSpinButton* spin, gpointer unser_data)
+{
 	int w, h;
 
-	w = gtk_spin_button_get_value_as_int (lookup_widget(cropper_window, "ratio_w_spinbutton"));
-	h = gtk_spin_button_get_value_as_int (lookup_widget(cropper_window, "ratio_h_spinbutton"));
+	w = gtk_spin_button_get_value_as_int(lookup_widget(cropper_window, "ratio_w_spinbutton"));
+	h = gtk_spin_button_get_value_as_int(lookup_widget(cropper_window, "ratio_h_spinbutton"));
 			
-	gth_image_selector_set_ratio (GTH_IMAGE_SELECTOR (lookup_widget(cropper_window, "crop_image")), TRUE, (double) w / h);
+	gth_image_selector_set_ratio(GTH_IMAGE_SELECTOR(
+	         lookup_widget(cropper_window, "crop_image")), TRUE, (double) w / h);
 }
 
 
-static void ratio_swap_button_cb (GtkButton* button, gpointer unser_data) {
+static void
+ratio_swap_button_cb(GtkButton* button, gpointer unser_data)
+{
 	int w, h;
 
 	w = gtk_spin_button_get_value_as_int(lookup_widget(cropper_window, "ratio_w_spinbutton"));
@@ -119,7 +141,8 @@
 	set_spin_value(cropper_window, lookup_widget(cropper_window, "ratio_w_spinbutton"), h);
 	set_spin_value(cropper_window, lookup_widget(cropper_window, "ratio_h_spinbutton"), w);
 
-	gth_image_selector_set_ratio(GTH_IMAGE_SELECTOR (lookup_widget(cropper_window, "crop_image")), TRUE, (double) h / w);
+	gth_image_selector_set_ratio(GTH_IMAGE_SELECTOR(lookup_widget(cropper_window,
+	                             "crop_image")), TRUE, (double) h / w);
 }
 
 */
@@ -132,31 +155,45 @@
 
 
 /*
-void on_ratio_w_spinbutton_value_changed (GtkSpinButton* spinbutton, gpointer user_data) {
+void
+on_ratio_w_spinbutton_value_changed(GtkSpinButton* spinbutton, gpointer user_data)
+{
 	g_print("spinbutton W - ratio: %f\n", ratio);
-	gtk_spin_button_set_value(lookup_widget(cropper_window, "ratio_h_spinbutton"), gtk_spin_button_get_value(spinbutton) / ratio);
+	gtk_spin_button_set_value(lookup_widget(cropper_window, "ratio_h_spinbutton"),
+	                          gtk_spin_button_get_value(spinbutton) / ratio);
 }
 
 
-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_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)
+{
 	g_print("spinbutton H - ratio: %f\n", ratio);
-	gtk_spin_button_set_value(lookup_widget(cropper_window, "ratio_w_spinbutton"), gtk_spin_button_get_value(spinbutton) * ratio);
+	gtk_spin_button_set_value(lookup_widget(cropper_window, "ratio_w_spinbutton"),
+	                          gtk_spin_button_get_value(spinbutton) * ratio);
 
 }
 
 
-void on_ratio_swap_button_clicked (GtkButton* button, gpointer user_data) {
+void
+on_ratio_swap_button_clicked(GtkButton* button, gpointer user_data)
+{
 	
 	ratio = 1.0 / ratio;
-	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_w_spinbutton"),
+	                          gtk_spin_button_get_value(lookup_widget(cropper_window,
+	                          "ratio_h_spinbutton")));
 	gtk_spin_button_update(lookup_widget(cropper_window, "ratio_w_spinbutton"));
 
 }
@@ -165,7 +202,9 @@
 
 
 /* zoom */
-void set_zoom() {
+void
+set_zoom()
+{
 	static GdkPixbuf* pixbuf_new;
 	g_object_unref(pixbuf_new);
 
@@ -173,30 +212,38 @@
 	gtk_image_set_from_pixbuf((GtkImage*) lookup_widget(cropper_window, "image_area"), pixbuf_new);
 }
 
-void on_zoom_in_button_clicked(GtkObject* object, gpointer user_data) {
+void
+on_zoom_in_button_clicked(GtkObject* object, gpointer user_data)
+{
 	image_width *= 1 + inc;
 	image_height *= 1 + inc;
 	set_zoom();
 }
 
-void on_zoom_out_button_clicked(GtkObject* object, gpointer user_data) {
+void
+on_zoom_out_button_clicked(GtkObject* object, gpointer user_data)
+{
 	image_width *= 1 - inc;
 	image_height *= 1 - inc;
 	set_zoom();
 }
 
-void on_zoom_100_button_clicked(GtkObject* object, gpointer user_data) {
+void
+on_zoom_100_button_clicked(GtkObject* object, gpointer user_data)
+{
 	image_width = gdk_pixbuf_get_width(image_buffer);
 	image_height = gdk_pixbuf_get_height(image_buffer);
 	set_zoom();
 }
 
-void on_zoom_fit_button_clicked(GtkObject* object, gpointer user_data) {
+void
+on_zoom_fit_button_clicked(GtkObject* object, gpointer user_data)
+{
 	int w, h;
 	GtkWidget* image_a;
 
 	image_a = (GtkWidget*) lookup_widget(cropper_window, "image_area");
-	gdk_drawable_get_size (image_a->window, &w, &h);
+	gdk_drawable_get_size(image_a->window, &w, &h);
 
 	image_width = w - 200;
 	image_height = h - 150;
@@ -209,14 +256,20 @@
 
 
 
-void on_crop_clicked(GtkButton* button, gpointer user_data) {
+void
+on_crop_clicked(GtkButton* button, gpointer user_data)
+{
 	char crop_call[256];
 
 	sprintf(crop_call, "echo \"convert -crop %ix%i+%i+%i %s cropped_%s\"",
-		gtk_spin_button_get_value_as_int((GtkSpinButton*) lookup_widget(cropper_window, "crop_width_spinbutton")),
-		gtk_spin_button_get_value_as_int((GtkSpinButton*) lookup_widget(cropper_window, "crop_height_spinbutton")),
-		gtk_spin_button_get_value_as_int((GtkSpinButton*) lookup_widget(cropper_window, "crop_x_spinbutton")),
-		gtk_spin_button_get_value_as_int((GtkSpinButton*) lookup_widget(cropper_window, "crop_y_spinbutton")),
+		gtk_spin_button_get_value_as_int((GtkSpinButton*) lookup_widget(cropper_window,
+		                                 "crop_width_spinbutton")),
+		gtk_spin_button_get_value_as_int((GtkSpinButton*) lookup_widget(cropper_window,
+		                                 "crop_height_spinbutton")),
+		gtk_spin_button_get_value_as_int((GtkSpinButton*) lookup_widget(cropper_window,
+		                                 "crop_x_spinbutton")),
+		gtk_spin_button_get_value_as_int((GtkSpinButton*) lookup_widget(cropper_window,
+		                                 "crop_y_spinbutton")),
 		image_filename,
 		image_filename
 	);
@@ -224,19 +277,22 @@
 	gtk_main_quit();
 }
 
-void on_cropper_window_create(GtkObject* object, gpointer user_data) {
+
+void
+on_cropper_window_create(GtkObject* object, gpointer user_data)
+{
 	image_width = gdk_pixbuf_get_width(image_buffer);
 	image_height = gdk_pixbuf_get_height(image_buffer);
 
 	/*
-  image_buffer = gdk_pixbuf_new_from_file(image_filename, NULL);
-  image_area = gtk_image_new_from_pixbuf(image_buffer);
+	image_buffer = gdk_pixbuf_new_from_file(image_filename, NULL);
+	image_area = gtk_image_new_from_pixbuf(image_buffer);
 
 	int w, h;
 	GtkWidget* image_a;
 
 	image_a = (GtkWidget*) lookup_widget(cropper_window, "image_area");
-	gdk_drawable_get_size (image_a->window, &w, &h);
+	gdk_drawable_get_size(image_a->window, &w, &h);
 
 	image_width = w - 200;
 	image_height = h - 150;
@@ -244,7 +300,9 @@
 	*/
 }
 
-void on_cropper_window_destroy(GtkObject* object, gpointer user_data) {
+void
+on_cropper_window_destroy(GtkObject* object, gpointer user_data)
+{
 	gtk_main_quit();
 }