diff src/img-view.c @ 334:df868b947aa0

Rename image-related options.

--- a/src/img-view.c	Sat Apr 12 09:41:44 2008 +0000
+++ b/src/img-view.c	Sat Apr 12 15:04:58 2008 +0000
@@ -112,7 +112,7 @@
 	if (next)
 		{
 		info = collection_next_by_info(cd, info);
-		if (options->enable_read_ahead)
+		if (options->image.enable_read_ahead)
 			{
 			read_ahead_info = collection_next_by_info(cd, info);
 			if (!read_ahead_info) read_ahead_info = collection_prev_by_info(cd, info);
@@ -121,7 +121,7 @@
 	else
 		{
 		info = collection_prev_by_info(cd, info);
-		if (options->enable_read_ahead)
+		if (options->image.enable_read_ahead)
 			{
 			read_ahead_info = collection_prev_by_info(cd, info);
 			if (!read_ahead_info) read_ahead_info = collection_next_by_info(cd, info);
@@ -130,7 +130,7 @@
 
 	if (info)
 		{
-		image_change_from_collection(imd, cd, info, image_zoom_get_default(imd, options->zoom_mode));
+		image_change_from_collection(imd, cd, info, image_zoom_get_default(imd, options->image.zoom_mode));
 
 		if (read_ahead_info) image_prebuffer_set(imd, read_ahead_info->fd);
 		}
@@ -151,17 +151,17 @@
 	if (last)
 		{
 		info = collection_get_last(cd);
-		if (options->enable_read_ahead) read_ahead_info = collection_prev_by_info(cd, info);
+		if (options->image.enable_read_ahead) read_ahead_info = collection_prev_by_info(cd, info);
 		}
 	else
 		{
 		info = collection_get_first(cd);
-		if (options->enable_read_ahead) read_ahead_info = collection_next_by_info(cd, info);
+		if (options->image.enable_read_ahead) read_ahead_info = collection_next_by_info(cd, info);
 		}
 
 	if (info)
 		{
-		image_change_from_collection(imd, cd, info, image_zoom_get_default(imd, options->zoom_mode));
+		image_change_from_collection(imd, cd, info, image_zoom_get_default(imd, options->image.zoom_mode));
 		if (read_ahead_info) image_prebuffer_set(imd, read_ahead_info->fd);
 		}
 }
@@ -221,9 +221,9 @@
 
 	vw->list_pointer = work;
 	fd = work->data;
-	image_change_fd(imd, fd, image_zoom_get_default(imd, options->zoom_mode));
+	image_change_fd(imd, fd, image_zoom_get_default(imd, options->image.zoom_mode));
 
-	if (options->enable_read_ahead && work_ahead)
+	if (options->image.enable_read_ahead && work_ahead)
 		{
 		FileData *next_fd = work_ahead->data;
 		image_prebuffer_set(imd, next_fd);
@@ -252,9 +252,9 @@
 
 	vw->list_pointer = work;
 	fd = work->data;
-	image_change_fd(imd, fd, image_zoom_get_default(imd, options->zoom_mode));
+	image_change_fd(imd, fd, image_zoom_get_default(imd, options->image.zoom_mode));
 
-	if (options->enable_read_ahead && work_ahead)
+	if (options->image.enable_read_ahead && work_ahead)
 		{
 		FileData *next_fd = work_ahead->data;
 		image_prebuffer_set(imd, next_fd);
@@ -877,8 +877,8 @@
 			 G_CALLBACK(view_window_key_press_cb), vw);
 	if (cd && info)
 		{
-		image_change_from_collection(vw->imd, cd, info, image_zoom_get_default(NULL, options->zoom_mode));
-		if (options->enable_read_ahead)
+		image_change_from_collection(vw->imd, cd, info, image_zoom_get_default(NULL, options->image.zoom_mode));
+		if (options->image.enable_read_ahead)
 			{
 			CollectInfo * r_info = collection_next_by_info(cd, info);
 			if (!r_info) r_info = collection_prev_by_info(cd, info);
@@ -889,9 +889,9 @@
 		{
 		view_window_set_list(vw, list);
 		vw->list_pointer = vw->list;
-		image_change_fd(vw->imd, (FileData *)vw->list->data, image_zoom_get_default(NULL, options->zoom_mode));
+		image_change_fd(vw->imd, (FileData *)vw->list->data, image_zoom_get_default(NULL, options->image.zoom_mode));
 
-		if (options->enable_read_ahead)
+		if (options->image.enable_read_ahead)
 			{
 			GList *work = vw->list->next;
 			if (work) image_prebuffer_set(vw->imd, (FileData *)work->data);
@@ -899,7 +899,7 @@
 		}
 	else
 		{
-		image_change_fd(vw->imd, fd, image_zoom_get_default(NULL, options->zoom_mode));
+		image_change_fd(vw->imd, fd, image_zoom_get_default(NULL, options->image.zoom_mode));
 		}
 
 	if (image_zoom_get(vw->imd) == 0.0)
@@ -910,10 +910,10 @@
 		{
 		pixbuf_renderer_get_scaled_size(PIXBUF_RENDERER(vw->imd->pr), &w, &h);
 		}
-	if (options->limit_window_size)
+	if (options->image.limit_window_size)
 		{
-		gint mw = gdk_screen_width() * options->max_window_size / 100;
-		gint mh = gdk_screen_height() * options->max_window_size / 100;
+		gint mw = gdk_screen_width() * options->image.max_window_size / 100;
+		gint mh = gdk_screen_height() * options->image.max_window_size / 100;
 
 		if (w > mw) w = mw;
 		if (h > mh) h = mh;
@@ -1351,10 +1351,10 @@
 
 		vw->list_pointer = vw->list;
 		fd = vw->list->data;
-		image_change_fd(vw->imd, fd, image_zoom_get_default(vw->imd, options->zoom_mode));
+		image_change_fd(vw->imd, fd, image_zoom_get_default(vw->imd, options->image.zoom_mode));
 
 		work = vw->list->next;
-		if (options->enable_read_ahead && work)
+		if (options->image.enable_read_ahead && work)
 			{
 			fd = work->data;
 			image_prebuffer_set(vw->imd, fd);
@@ -1362,7 +1362,7 @@
 		}
 	else
 		{
-		image_change_fd(vw->imd, NULL, image_zoom_get_default(vw->imd, options->zoom_mode));
+		image_change_fd(vw->imd, NULL, image_zoom_get_default(vw->imd, options->image.zoom_mode));
 		}
 }
 
@@ -1481,7 +1481,7 @@
 
 				if (source && info_list)
 					{
-					image_change_from_collection(imd, source, info_list->data, image_zoom_get_default(imd, options->zoom_mode));
+					image_change_from_collection(imd, source, info_list->data, image_zoom_get_default(imd, options->image.zoom_mode));
 					}
 				else
 					{
@@ -1492,7 +1492,7 @@
 
 						vw->list_pointer = vw->list;
 						}
-					image_change_fd(imd, fd, image_zoom_get_default(imd, options->zoom_mode));
+					image_change_fd(imd, fd, image_zoom_get_default(imd, options->image.zoom_mode));
 					}
 				}
 			}
@@ -1598,7 +1598,7 @@
 			}
 		if (image_get_fd(imd) == image_fd)
 			{
-			image_change_fd(imd, NULL, image_zoom_get_default(imd, options->zoom_mode));
+			image_change_fd(imd, NULL, image_zoom_get_default(imd, options->image.zoom_mode));
 			}
 		}
 
@@ -1644,7 +1644,7 @@
 				fd = NULL;
 				}
 
-			image_change_fd(imd, fd, image_zoom_get_default(imd, options->zoom_mode));
+			image_change_fd(imd, fd, image_zoom_get_default(imd, options->image.zoom_mode));
 			}
 		}