[Goodies-commits] r2484 - in ristretto/trunk: . src

[Stephan Arts]

Author: stephan
Date: 2007-02-04 14:41:09 +0000 (Sun, 04 Feb 2007)
New Revision: 2484

Modified:
   ristretto/trunk/Makefile.am
   ristretto/trunk/ristretto.desktop.in
   ristretto/trunk/src/main.c
   ristretto/trunk/src/picture_viewer.c
   ristretto/trunk/src/picture_viewer.h
Log:
Reduced zoom factor to 20%
Fit-to-window does not happen real-time anymore (increase performance)
added mime-types to .desktop file



Modified: ristretto/trunk/Makefile.am
===================================================================
--- ristretto/trunk/Makefile.am	2007-02-03 16:38:18 UTC (rev 2483)
+++ ristretto/trunk/Makefile.am	2007-02-04 14:41:09 UTC (rev 2484)
@@ -1,6 +1,6 @@
 ## Process this file with automake to produce Makefile.in
 
-SUBDIRS = src po
+SUBDIRS = src
 
 desktopdir = $(datadir)/applications
 desktop_in_files = ristretto.desktop.in

Modified: ristretto/trunk/ristretto.desktop.in
===================================================================
--- ristretto/trunk/ristretto.desktop.in	2007-02-03 16:38:18 UTC (rev 2483)
+++ ristretto/trunk/ristretto.desktop.in	2007-02-04 14:41:09 UTC (rev 2484)
@@ -11,4 +11,4 @@
 X-MultipleArgs=false
 Categories=GTK;Graphics;Viewer;
 StartupNotify=true
-MimeType=
+MimeType=image/png;image/gif;image/jpeg;image/bmp

Modified: ristretto/trunk/src/main.c
===================================================================
--- ristretto/trunk/src/main.c	2007-02-03 16:38:18 UTC (rev 2483)
+++ ristretto/trunk/src/main.c	2007-02-04 14:41:09 UTC (rev 2484)
@@ -65,8 +65,9 @@
 
 	gtk_box_pack_start(GTK_BOX(main_vbox), s_window, TRUE, TRUE, 0);
 	gtk_box_pack_start(GTK_BOX(main_vbox), tool_bar, FALSE, TRUE, 0);
-	rstto_picture_viewer_set_scale(RSTTO_PICTURE_VIEWER(viewer), 0);
 
+	rstto_picture_viewer_set_scale(RSTTO_PICTURE_VIEWER(viewer), 1);
+
 	gtk_toolbar_insert(GTK_TOOLBAR(tool_bar), zoom_fit, 0);
 	gtk_toolbar_insert(GTK_TOOLBAR(tool_bar), zoom_100, 0);
 	gtk_toolbar_insert(GTK_TOOLBAR(tool_bar), zoom_out, 0);
@@ -89,7 +90,7 @@
 static void
 cb_rstto_zoom_fit(GtkToolItem *item, RsttoPictureViewer *viewer)
 {
-	rstto_picture_viewer_set_scale(viewer, 0);
+	rstto_picture_viewer_fit_scale(viewer);
 }
 
 static void
@@ -102,12 +103,12 @@
 cb_rstto_zoom_in(GtkToolItem *item, RsttoPictureViewer *viewer)
 {
 	gdouble scale = rstto_picture_viewer_get_scale(viewer);
-	rstto_picture_viewer_set_scale(viewer, scale*2);
+	rstto_picture_viewer_set_scale(viewer, scale*1.2);
 }
 
 static void
 cb_rstto_zoom_out(GtkToolItem *item, RsttoPictureViewer *viewer)
 {
 	gdouble scale = rstto_picture_viewer_get_scale(viewer);
-	rstto_picture_viewer_set_scale(viewer, scale/2);
+	rstto_picture_viewer_set_scale(viewer, scale/1.2);
 }

Modified: ristretto/trunk/src/picture_viewer.c
===================================================================
--- ristretto/trunk/src/picture_viewer.c	2007-02-03 16:38:18 UTC (rev 2483)
+++ ristretto/trunk/src/picture_viewer.c	2007-02-04 14:41:09 UTC (rev 2484)
@@ -302,30 +302,31 @@
 void
 rstto_picture_viewer_set_scale(RsttoPictureViewer *viewer, gdouble scale)
 {
-	if(scale > 0)
-	{
-		viewer->scale = scale;
-		viewer->scale_fts = FALSE;
-	}
+	g_return_if_fail(scale > 0);
+	viewer->scale = scale;
+
+	rstto_picture_viewer_refresh(viewer);
+	rstto_picture_viewer_paint(GTK_WIDGET(viewer));
+}
+
+gdouble
+rstto_picture_viewer_fit_scale(RsttoPictureViewer *viewer)
+{
+	g_return_val_if_fail(viewer->src_pixbuf, 0);
+
+	gdouble width = (gdouble)gdk_pixbuf_get_width(viewer->src_pixbuf);
+	gdouble height = (gdouble)gdk_pixbuf_get_height(viewer->src_pixbuf);
+	gdouble h_scale = GTK_WIDGET(viewer)->allocation.width / width;
+	gdouble v_scale = GTK_WIDGET(viewer)->allocation.height / height;
+	if(h_scale < v_scale)
+		viewer->scale = h_scale;
 	else
-	{
-		viewer->scale_fts = TRUE;
-		if(viewer->src_pixbuf)
-		{
-			gdouble width = (gdouble)gdk_pixbuf_get_width(viewer->src_pixbuf);
-			gdouble height = (gdouble)gdk_pixbuf_get_height(viewer->src_pixbuf);
-			gdouble h_scale = GTK_WIDGET(viewer)->allocation.width / width;
-			gdouble v_scale = GTK_WIDGET(viewer)->allocation.height / height;
-			if(h_scale < v_scale)
-				viewer->scale = h_scale;
-			else
-				viewer->scale = v_scale;
-		}
-		else
-			viewer->scale = 0;
-	}
+		viewer->scale = v_scale;
+
 	rstto_picture_viewer_refresh(viewer);
 	rstto_picture_viewer_paint(GTK_WIDGET(viewer));
+
+	return viewer->scale;
 }
 
 gdouble

Modified: ristretto/trunk/src/picture_viewer.h
===================================================================
--- ristretto/trunk/src/picture_viewer.h	2007-02-03 16:38:18 UTC (rev 2483)
+++ ristretto/trunk/src/picture_viewer.h	2007-02-04 14:41:09 UTC (rev 2484)
@@ -72,6 +72,7 @@
 void       rstto_picture_viewer_set_pixbuf(RsttoPictureViewer *viewer, GdkPixbuf *pixbuf);
 void       rstto_picture_viewer_set_scale(RsttoPictureViewer *viewer, gdouble scale);
 gdouble    rstto_picture_viewer_get_scale(RsttoPictureViewer *viewer);
+gdouble    rstto_picture_viewer_fit_scale(RsttoPictureViewer *viewer);
 
 
 G_END_DECLS