Mercurial > geeqie
comparison src/slideshow.c @ 334:df868b947aa0
Rename image-related options.
| author | zas_ |
|---|---|
| date | Sat, 12 Apr 2008 15:04:58 +0000 |
| parents | 509b84801d66 |
| children | ddabc4873a3f |
comparison
equal
deleted
inserted
replaced
| 333:767b53cd9ab7 | 334:df868b947aa0 |
|---|---|
| 181 ss->slide_fd = NULL; | 181 ss->slide_fd = NULL; |
| 182 | 182 |
| 183 if (ss->filelist) | 183 if (ss->filelist) |
| 184 { | 184 { |
| 185 ss->slide_fd = file_data_ref((FileData *)g_list_nth_data(ss->filelist, row)); | 185 ss->slide_fd = file_data_ref((FileData *)g_list_nth_data(ss->filelist, row)); |
| 186 image_change_fd(ss->imd, ss->slide_fd, image_zoom_get_default(ss->imd, options->zoom_mode)); | 186 image_change_fd(ss->imd, ss->slide_fd, image_zoom_get_default(ss->imd, options->image.zoom_mode)); |
| 187 } | 187 } |
| 188 else if (ss->cd) | 188 else if (ss->cd) |
| 189 { | 189 { |
| 190 CollectInfo *info; | 190 CollectInfo *info; |
| 191 | 191 |
| 192 info = g_list_nth_data(ss->cd->list, row); | 192 info = g_list_nth_data(ss->cd->list, row); |
| 193 ss->slide_fd = file_data_ref(info->fd); | 193 ss->slide_fd = file_data_ref(info->fd); |
| 194 | 194 |
| 195 image_change_from_collection(ss->imd, ss->cd, info, image_zoom_get_default(ss->imd, options->zoom_mode)); | 195 image_change_from_collection(ss->imd, ss->cd, info, image_zoom_get_default(ss->imd, options->image.zoom_mode)); |
| 196 } | 196 } |
| 197 else | 197 else |
| 198 { | 198 { |
| 199 ss->slide_fd = file_data_ref(layout_list_get_fd(ss->layout, row)); | 199 ss->slide_fd = file_data_ref(layout_list_get_fd(ss->layout, row)); |
| 200 | 200 |
| 201 if (ss->from_selection) | 201 if (ss->from_selection) |
| 202 { | 202 { |
| 203 image_change_fd(ss->imd, ss->slide_fd, image_zoom_get_default(ss->imd, options->zoom_mode)); | 203 image_change_fd(ss->imd, ss->slide_fd, image_zoom_get_default(ss->imd, options->image.zoom_mode)); |
| 204 layout_status_update_info(ss->layout, NULL); | 204 layout_status_update_info(ss->layout, NULL); |
| 205 } | 205 } |
| 206 else | 206 else |
| 207 { | 207 { |
| 208 layout_image_set_index(ss->layout, row); | 208 layout_image_set_index(ss->layout, row); |
| 219 return FALSE; | 219 return FALSE; |
| 220 } | 220 } |
| 221 | 221 |
| 222 /* read ahead */ | 222 /* read ahead */ |
| 223 | 223 |
| 224 if (options->enable_read_ahead) | 224 if (options->image.enable_read_ahead) |
| 225 { | 225 { |
| 226 gint r; | 226 gint r; |
| 227 if (forward) | 227 if (forward) |
| 228 { | 228 { |
| 229 if (!ss->list) return TRUE; | 229 if (!ss->list) return TRUE; |