rpms/ufraw/F-8 ufraw-0.13-scrollable-preview.patch, NONE, 1.1 ufraw.spec, 1.27, 1.28

[Nils Philippsen (nphilipp)]

Author: nphilipp

Update of /cvs/pkgs/rpms/ufraw/F-8
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10538

Modified Files:
	ufraw.spec 
Added Files:
	ufraw-0.13-scrollable-preview.patch 
Log Message:
make preview scrollable, window resizable


ufraw-0.13-scrollable-preview.patch:

--- NEW FILE ufraw-0.13-scrollable-preview.patch ---
diff -up ufraw-0.13/ufraw_preview.c.scrollable-preview ufraw-0.13/ufraw_preview.c
--- ufraw-0.13/ufraw_preview.c.scrollable-preview	2007-11-11 03:11:19.000000000 +0100
+++ ufraw-0.13/ufraw_preview.c	2007-11-30 23:09:20.000000000 +0100
@@ -3358,7 +3358,7 @@ int ufraw_preview(ufraw_data *uf, int pl
     GtkTable *table, *subTable;
     GtkBox *previewHBox, *box, *hbox;
     GtkComboBox *combo;
-    GtkWidget *button, *saveButton, *saveAsButton=NULL, *event_box, *align,
+    GtkWidget *button, *saveButton, *saveAsButton=NULL, *scrolled_window, *event_box, *align,
 	    *label, *vBox, *page, *menu, *menu_item, *frame, *entry;
     GSList *group;
     GdkPixbuf *pixbuf;
@@ -3407,9 +3407,6 @@ int ufraw_preview(ufraw_data *uf, int pl
 
     ufraw_icons_init();
     uf_window_set_icon_name(GTK_WINDOW(previewWindow), "ufraw");
-#ifndef HAVE_GTKIMAGEVIEW
-    gtk_window_set_resizable(GTK_WINDOW(previewWindow), FALSE);
-#endif
     g_signal_connect(G_OBJECT(previewWindow), "delete-event",
 	    G_CALLBACK(window_delete_event), NULL);
     g_signal_connect(G_OBJECT(previewWindow), "map-event",
@@ -4515,17 +4512,21 @@ int ufraw_preview(ufraw_data *uf, int pl
 	    GTK_EXPAND | GTK_FILL, GTK_EXPAND | GTK_FILL, 0, 0);
     gtk_box_pack_start(GTK_BOX(vBox), scroll, TRUE, TRUE, 0);
 #else
-    align = gtk_alignment_new(0.5, 0.5, 0, 0);
+    align = gtk_alignment_new(0.5, 0.5, 1, 1);
     gtk_box_pack_start(GTK_BOX(vBox), align, TRUE, TRUE, 0);
     box = GTK_BOX(gtk_vbox_new(FALSE, 0));
     gtk_container_add(GTK_CONTAINER(align), GTK_WIDGET(box));
-    gtk_box_pack_start(box, PreviewEventBox, FALSE, FALSE, 0);
+    scrolled_window = gtk_scrolled_window_new(NULL, NULL);
+    gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(scrolled_window),
+        GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC);
     data->PreviewPixbuf = gdk_pixbuf_new(GDK_COLORSPACE_RGB, FALSE, 8,
 	    preview_width, preview_height);
     data->PreviewWidget = gtk_image_new_from_pixbuf(data->PreviewPixbuf);
     g_object_unref(data->PreviewPixbuf);
     gtk_misc_set_alignment(GTK_MISC(data->PreviewWidget), 0, 0);
     gtk_container_add(GTK_CONTAINER(PreviewEventBox), data->PreviewWidget);
+    gtk_scrolled_window_add_with_viewport(GTK_SCROLLED_WINDOW(scrolled_window), PreviewEventBox);
+    gtk_box_pack_start(box, scrolled_window, TRUE, TRUE, 0);
 #endif
     data->PreviewButtonPressed = FALSE;
     g_signal_connect(G_OBJECT(PreviewEventBox), "button-press-event",


Index: ufraw.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ufraw/F-8/ufraw.spec,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- ufraw.spec	30 Nov 2007 11:55:47 -0000	1.27
+++ ufraw.spec	30 Nov 2007 22:18:12 -0000	1.28
@@ -30,11 +30,12 @@
 Summary: Raw image data retrieval tool for digital cameras
 Name: ufraw
 Version: 0.13
-Release: 1%{?dist}
+Release: 2%{?dist}
 Group: Applications/Multimedia
 License: GPLv2
 URL: http://ufraw.sourceforge.net
 Source0: http://download.sourceforge.net/ufraw/ufraw-%{version}.tar.gz
+Patch0: ufraw-0.13-scrollable-preview.patch
 BuildRequires: gimp-devel >= 2.0
 BuildRequires: gimp >= 2.0
 %if %cinepaint
@@ -122,6 +123,7 @@
 
 EOF
 %setup -q
+%patch0 -p1 -b .scrollable-preview
 
 #./autogen.sh
 
@@ -200,6 +202,9 @@
 %{cinepaintplugindir}/ufraw-cinepaint
 
 %changelog
+* Fri Nov 30 2007 Nils Philippsen <nphilipp at redhat.com> - 0.13-2
+- make preview scrollable, window resizable
+
 * Fri Nov 30 2007 Nils Philippsen <nphilipp at redhat.com> - 0.13-1
 - version 0.13
 - build cinepaint plugin from Fedora 7 on (#282641)