diff src/typedefs.h @ 113:55166d93498d

Fri Nov 24 21:37:01 2006 John Ellis <[e-mail]> * 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.

--- a/src/typedefs.h	Sat Nov 18 00:12:22 2006 +0000
+++ b/src/typedefs.h	Sat Nov 25 03:00:33 2006 +0000
@@ -42,6 +42,17 @@
 } LayoutLocation;
 
 
+typedef enum {
+	IMAGE_STATE_NONE	= 0,
+	IMAGE_STATE_IMAGE	= 1 << 0,
+	IMAGE_STATE_LOADING	= 1 << 1,
+	IMAGE_STATE_ERROR	= 1 << 2,
+	IMAGE_STATE_COLOR_ADJ	= 1 << 3,
+	IMAGE_STATE_ROTATE_AUTO	= 1 << 4,
+	IMAGE_STATE_ROTATE_USER	= 1 << 5,
+	IMAGE_STATE_DELAY_FLIP	= 1 << 6
+} ImageState;
+
 typedef struct _ImageLoader ImageLoader;
 typedef struct _ThumbLoader ThumbLoader;
 
@@ -242,6 +253,7 @@
 	gint title_show_zoom;	/* option to include zoom in window title */
 
 	gint completed;
+	ImageState state;	/* mask of IMAGE_STATE_* flags about current image */
 
 	void (*func_update)(ImageWindow *, gpointer);
 	void (*func_complete)(ImageWindow *, gint preload, gpointer);
@@ -272,6 +284,13 @@
 	CollectionData *collection;
 	CollectInfo *collection_info;
 
+	/* color profiles */
+	gint color_profile_enable;
+	gint color_profile_input;
+	gint color_profile_screen;
+	gint color_profile_use_image;
+	gpointer *cm;
+
 	AlterType delay_alter_type;
 
 	ImageLoader *read_ahead_il;
@@ -280,6 +299,7 @@
 
 	GdkPixbuf *prev_pixbuf;
 	gchar *prev_path;
+	gint prev_color_row;
 
 	gint auto_refresh_id;
 	gint auto_refresh_interval;
@@ -366,6 +386,7 @@
 	GtkWidget *info_box;
 	GtkWidget *info_progress_bar;
 	GtkWidget *info_sort;
+	GtkWidget *info_color;
 	GtkWidget *info_status;
 	GtkWidget *info_details;
 	GtkWidget *info_zoom;