comparison src/typedefs.h @ 113:55166d93498d

Fri Nov 24 21:37:01 2006 John Ellis <johne@verizon.net> * configure.in: Add test for lcms (little cms). * Makefile.am: Add color-man.[ch]: * color-man.[ch]: New files for color management support. * globals.c, gqview.h, main.c, rcfile.c, typedefs.h: Add color profile variables and option saving. * image.[ch]: Add color profile functions. * layout.c, layout_image.[ch]: Add color profile icon, popup menu, and fix sort menu to use radio buttons. * menu.c: Use radio buttons for sort menu when appropriate. * preferences.c: Add color profile options to preferences. * ui_menu.[ch]: Add menu_item_add_radio() for radio item menus. * ui_misc.c: Fix gtk_table_attach() arg for vertical expansion. * view_file_icon.c, view_file_list.c: Check for active state in sort menu callbacks. * README: Add info about lcms, and how to disable.
author gqview
date Sat, 25 Nov 2006 03:00:33 +0000
parents a4c1b7014e6e
children 53b2bfdcff69
comparison
equal deleted inserted replaced
112:b15d4c18168f 113:55166d93498d
40 LAYOUT_TOP = 1 << 2, 40 LAYOUT_TOP = 1 << 2,
41 LAYOUT_BOTTOM = 1 << 3 41 LAYOUT_BOTTOM = 1 << 3
42 } LayoutLocation; 42 } LayoutLocation;
43 43
44 44
45 typedef enum {
46 IMAGE_STATE_NONE = 0,
47 IMAGE_STATE_IMAGE = 1 << 0,
48 IMAGE_STATE_LOADING = 1 << 1,
49 IMAGE_STATE_ERROR = 1 << 2,
50 IMAGE_STATE_COLOR_ADJ = 1 << 3,
51 IMAGE_STATE_ROTATE_AUTO = 1 << 4,
52 IMAGE_STATE_ROTATE_USER = 1 << 5,
53 IMAGE_STATE_DELAY_FLIP = 1 << 6
54 } ImageState;
55
45 typedef struct _ImageLoader ImageLoader; 56 typedef struct _ImageLoader ImageLoader;
46 typedef struct _ThumbLoader ThumbLoader; 57 typedef struct _ThumbLoader ThumbLoader;
47 58
48 typedef struct _CollectInfo CollectInfo; 59 typedef struct _CollectInfo CollectInfo;
49 typedef struct _CollectionData CollectionData; 60 typedef struct _CollectionData CollectionData;
240 gchar *title; /* window title to display left of file name */ 251 gchar *title; /* window title to display left of file name */
241 gchar *title_right; /* window title to display right of file name */ 252 gchar *title_right; /* window title to display right of file name */
242 gint title_show_zoom; /* option to include zoom in window title */ 253 gint title_show_zoom; /* option to include zoom in window title */
243 254
244 gint completed; 255 gint completed;
256 ImageState state; /* mask of IMAGE_STATE_* flags about current image */
245 257
246 void (*func_update)(ImageWindow *, gpointer); 258 void (*func_update)(ImageWindow *, gpointer);
247 void (*func_complete)(ImageWindow *, gint preload, gpointer); 259 void (*func_complete)(ImageWindow *, gint preload, gpointer);
248 void (*func_new)(ImageWindow *, gpointer); 260 void (*func_new)(ImageWindow *, gpointer);
249 ImageTileRequestFunc func_tile_request; 261 ImageTileRequestFunc func_tile_request;
270 282
271 /* collection info */ 283 /* collection info */
272 CollectionData *collection; 284 CollectionData *collection;
273 CollectInfo *collection_info; 285 CollectInfo *collection_info;
274 286
287 /* color profiles */
288 gint color_profile_enable;
289 gint color_profile_input;
290 gint color_profile_screen;
291 gint color_profile_use_image;
292 gpointer *cm;
293
275 AlterType delay_alter_type; 294 AlterType delay_alter_type;
276 295
277 ImageLoader *read_ahead_il; 296 ImageLoader *read_ahead_il;
278 GdkPixbuf *read_ahead_pixbuf; 297 GdkPixbuf *read_ahead_pixbuf;
279 gchar *read_ahead_path; 298 gchar *read_ahead_path;
280 299
281 GdkPixbuf *prev_pixbuf; 300 GdkPixbuf *prev_pixbuf;
282 gchar *prev_path; 301 gchar *prev_path;
302 gint prev_color_row;
283 303
284 gint auto_refresh_id; 304 gint auto_refresh_id;
285 gint auto_refresh_interval; 305 gint auto_refresh_interval;
286 306
287 gint delay_flip; 307 gint delay_flip;
364 /* status bar */ 384 /* status bar */
365 385
366 GtkWidget *info_box; 386 GtkWidget *info_box;
367 GtkWidget *info_progress_bar; 387 GtkWidget *info_progress_bar;
368 GtkWidget *info_sort; 388 GtkWidget *info_sort;
389 GtkWidget *info_color;
369 GtkWidget *info_status; 390 GtkWidget *info_status;
370 GtkWidget *info_details; 391 GtkWidget *info_details;
371 GtkWidget *info_zoom; 392 GtkWidget *info_zoom;
372 393
373 /* slide show */ 394 /* slide show */