diff interface.c @ 4:2f11ab3e6047

added option handling; added output for convert; commented all ratio code cause it is not really important now
author meillo@marmaro.de
date Fri, 07 Dec 2007 17:40:08 +0100
parents e359bea4c8ac
children 61e5a1727231
line wrap: on
line diff
--- a/interface.c	Wed Dec 05 00:08:39 2007 +0100
+++ b/interface.c	Fri Dec 07 17:40:08 2007 +0100
@@ -81,6 +81,13 @@
   GtkWidget *image3;
   GtkWidget *crop_zoom_fit_button;
   GtkWidget *image1;
+	GtkWidget *dialog_action_area1;
+	GtkWidget *crop_okbutton;
+	GtkWidget *alignment1;
+	GtkWidget *hbox11;
+	GtkWidget *crop_image;
+	GtkWidget *label12;
+
 
   cropper_window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
   gtk_widget_set_name (cropper_window, "cropper_window");
@@ -400,48 +407,148 @@
 
 
 
+/*
+  okay_box = gtk_hbox_new (FALSE, 0);
+  gtk_widget_set_name (okay_box, "okay_box");
+  gtk_widget_show (okay_box);
+  gtk_box_pack_end (GTK_BOX (hbox16), okay_box, FALSE, TRUE, 0);
+*/
+
+	crop_okbutton = gtk_button_new (); 
+	gtk_widget_set_name (crop_okbutton, "crop_okbutton"); 
+	gtk_widget_show (crop_okbutton); 
+	gtk_box_pack_end (GTK_BOX (dialog_vbox1), crop_okbutton, FALSE, FALSE, 0); 
+	GTK_WIDGET_SET_FLAGS (crop_okbutton, GTK_CAN_DEFAULT); 
+
+	alignment1 = gtk_alignment_new (0.5, 0.5, 0, 0); 
+	gtk_widget_set_name (alignment1, "alignment1"); 
+	gtk_widget_show (alignment1); 
+	gtk_container_add (GTK_CONTAINER (crop_okbutton), alignment1); 
+
+	hbox11 = gtk_hbox_new (FALSE, 2); 
+	gtk_widget_set_name (hbox11, "hbox11"); 
+	gtk_widget_show (hbox11); 
+	gtk_container_add (GTK_CONTAINER (alignment1), hbox11); 
+
+	crop_image = gtk_image_new_from_stock ("gtk-ok", GTK_ICON_SIZE_BUTTON); 
+	gtk_widget_set_name (crop_image, "crop_image"); 
+	gtk_widget_show (crop_image); 
+	gtk_box_pack_start (GTK_BOX (hbox11), crop_image, FALSE, FALSE, 0); 
+
+	label12 = gtk_label_new_with_mnemonic ("_Crop"); 
+	gtk_widget_set_name (label12, "label12"); 
+	gtk_widget_show (label12); 
+	gtk_box_pack_start (GTK_BOX (hbox11), label12, FALSE, FALSE, 0); 
 
 
 
-  g_signal_connect ((gpointer) cropper_window, "delete_event",
-                    G_CALLBACK (on_cropper_window_delete_event),
-                    NULL);
-  g_signal_connect ((gpointer) cropper_window, "destroy",
+
+
+/* destroy */
+  g_signal_connect (G_OBJECT (cropper_window), "destroy",
                     G_CALLBACK (on_cropper_window_destroy),
                     NULL);
 
-  g_signal_connect ((gpointer) ratio_w_spinbutton, "value_changed",
+
+/* crop */
+  g_signal_connect (G_OBJECT (crop_okbutton), "clicked",
+                    G_CALLBACK (on_crop_clicked),
+                    NULL);
+
+
+
+/* aspect ratio */
+/*
+  g_signal_connect (G_OBJECT (ratio_w_spinbutton), "value_changed",
                     G_CALLBACK (on_ratio_w_spinbutton_value_changed),
                     NULL);
-  g_signal_connect ((gpointer) ratio_w_spinbutton, "change_value",
-                    G_CALLBACK (on_ratio_w_spinbutton_change_value),
-                    NULL);
-  g_signal_connect ((gpointer) ratio_swap_button, "clicked",
+  g_signal_connect (G_OBJECT (ratio_swap_button), "clicked",
                     G_CALLBACK (on_ratio_swap_button_clicked),
                     NULL);
-  g_signal_connect ((gpointer) ratio_h_spinbutton, "change_value",
-                    G_CALLBACK (on_ratio_h_spinbutton_change_value),
-                    NULL);
-  g_signal_connect ((gpointer) ratio_h_spinbutton, "value_changed",
+  g_signal_connect (G_OBJECT (ratio_h_spinbutton), "value_changed",
                     G_CALLBACK (on_ratio_h_spinbutton_value_changed),
                     NULL);
 
-  g_signal_connect ((gpointer) ratio_none, "activate",
+  g_signal_connect (G_OBJECT (ratio_none), "activate",
                     G_CALLBACK (on_ratio_none_activate),
                     NULL);
-  g_signal_connect ((gpointer) ratio_square, "activate",
+  g_signal_connect (G_OBJECT (ratio_square), "activate",
                     G_CALLBACK (on_ratio_square_activate),
                     NULL);
-  g_signal_connect ((gpointer) ratio_4x3, "activate",
+  g_signal_connect (G_OBJECT (ratio_4x3), "activate",
                     G_CALLBACK (on_ratio_4x3_activate),
                     NULL);
-  g_signal_connect ((gpointer) ratio_3x2, "activate",
+  g_signal_connect (G_OBJECT (ratio_3x2), "activate",
                     G_CALLBACK (on_ratio_3x2_activate),
                     NULL);
-  g_signal_connect ((gpointer) ratio_custom, "activate",
+  g_signal_connect (G_OBJECT (ratio_custom), "activate",
                     G_CALLBACK (on_ratio_custom_activate),
                     NULL);
 
+g_signal_connect (G_OBJECT (lookup_widget(cropper_window, "ratio_optionmenu")), "changed",
+	G_CALLBACK (ratio_optionmenu_changed_cb),
+	NULL);
+g_signal_connect (G_OBJECT (lookup_widget(cropper_window, "ratio_w_spinbutton")), "value_changed",
+	G_CALLBACK (ratio_value_changed_cb),
+	NULL);
+g_signal_connect (G_OBJECT (lookup_widget(cropper_window, "ratio_h_spinbutton")), "value_changed",
+	G_CALLBACK (ratio_value_changed_cb),
+	NULL);
+g_signal_connect (G_OBJECT (lookup_widget(cropper_window, "ratio_swap_button")), "clicked",
+	G_CALLBACK (ratio_swap_button_cb),
+	NULL);
+*/
+
+
+/* selection */
+/*
+g_signal_connect (G_OBJECT (lookup_widget(cropper_window, "crop_x_spinbutton")), "value_changed",
+	G_CALLBACK (selection_x_value_changed_cb),
+	data);
+g_signal_connect (G_OBJECT (lookup_widget(cropper_window, "crop_y_spinbutton")), "value_changed",
+	G_CALLBACK (selection_y_value_changed_cb),
+	data);
+g_signal_connect (G_OBJECT (lookup_widget(cropper_window, "crop_width_spinbutton")), "value_changed",
+	G_CALLBACK (selection_width_value_changed_cb),
+	data);
+g_signal_connect (G_OBJECT (lookup_widget(cropper_window, "crop_height_spinbutton")), "value_changed",
+	G_CALLBACK (selection_height_value_changed_cb),
+	data);
+g_signal_connect (G_OBJECT (lookup_widget(cropper_window, "crop_image")), "selection_changed",
+	G_CALLBACK (selection_changed_cb),
+	data);
+*/
+
+
+/* zoom */
+/*
+g_signal_connect (G_OBJECT (zoom_in_button), "clicked",
+	G_CALLBACK (zoom_in_button_clicked_cb),
+	data);
+g_signal_connect (G_OBJECT (zoom_out_button), "clicked",
+	G_CALLBACK (zoom_out_button_clicked_cb),
+	data);
+g_signal_connect (G_OBJECT (zoom_100_button), "clicked",
+	G_CALLBACK (zoom_100_button_clicked_cb),
+	data);
+g_signal_connect (G_OBJECT (zoom_fit_button), "clicked",
+	G_CALLBACK (zoom_fit_button_clicked_cb),
+	data);
+*/
+
+
+
+
+
+
+
+
+
+
+
+
+
+
 
   /* Store pointers to all widgets, for use by lookup_widget(). */
   GLADE_HOOKUP_OBJECT_NO_REF (cropper_window, cropper_window, "cropper_window");
@@ -498,6 +605,13 @@
   GLADE_HOOKUP_OBJECT (cropper_window, image3, "image3");
   GLADE_HOOKUP_OBJECT (cropper_window, crop_zoom_fit_button, "crop_zoom_fit_button");
   GLADE_HOOKUP_OBJECT (cropper_window, image1, "image1");
+	/*GLADE_HOOKUP_OBJECT_NO_REF (cropper_window, dialog_action_area1, "dialog_action_area1"); */
+	GLADE_HOOKUP_OBJECT (cropper_window, crop_okbutton, "crop_okbutton"); 
+	GLADE_HOOKUP_OBJECT (cropper_window, alignment1, "alignment1");
+	GLADE_HOOKUP_OBJECT (cropper_window, hbox11, "hbox11");
+	GLADE_HOOKUP_OBJECT (cropper_window, crop_image, "crop_image");
+	GLADE_HOOKUP_OBJECT (cropper_window, label12, "label12");
+
 
   return cropper_window;
 }