[Rawstudio-commit] r3221 - in trunk: librawstudio src

[Anders Kvist]

Author: akv
Date: 2010-02-14 15:40:10 +0100 (Sun, 14 Feb 2010)
New Revision: 3221

Modified:
   trunk/librawstudio/rs-profile-factory.c
   trunk/librawstudio/rs-profile-selector.c
   trunk/src/rs-toolbox.c
Log:
Using sRGB for default profile - fixes bug 349.

Modified: trunk/librawstudio/rs-profile-factory.c
===================================================================
--- trunk/librawstudio/rs-profile-factory.c	2010-02-14 02:22:09 UTC (rev 3220)
+++ trunk/librawstudio/rs-profile-factory.c	2010-02-14 14:40:10 UTC (rev 3221)
@@ -119,9 +119,11 @@
 	load_profiles(factory, search_path, TRUE, FALSE);
 
 	GtkTreeIter iter;
+	RSIccProfile *srgb = rs_icc_profile_new_from_file(PACKAGE_DATA_DIR "/" PACKAGE "/profiles/sRGB.icc");
 	gtk_list_store_prepend(factory->profiles, &iter);
 	gtk_list_store_set(factory->profiles, &iter,
 		FACTORY_MODEL_COLUMN_TYPE, FACTORY_MODEL_TYPE_INFO,
+		FACTORY_MODEL_COLUMN_PROFILE, srgb,
 		-1);
 	gtk_list_store_prepend(factory->profiles, &iter);
 	gtk_list_store_set(factory->profiles, &iter,

Modified: trunk/librawstudio/rs-profile-selector.c
===================================================================
--- trunk/librawstudio/rs-profile-selector.c	2010-02-14 02:22:09 UTC (rev 3220)
+++ trunk/librawstudio/rs-profile-selector.c	2010-02-14 14:40:10 UTC (rev 3221)
@@ -96,7 +96,7 @@
 			g_signal_emit(RS_PROFILE_SELECTOR(combo), signals[DCP_SELECTED_SIGNAL], 0, profile);
 			selector->selected = profile;
 		}
-		else if (type == FACTORY_MODEL_TYPE_ICC)
+		else if (type == FACTORY_MODEL_TYPE_ICC || type == FACTORY_MODEL_TYPE_INFO)
 		{
 			g_signal_emit(RS_PROFILE_SELECTOR(combo), signals[ICC_SELECTED_SIGNAL], 0, profile);
 			selector->selected = profile;

Modified: trunk/src/rs-toolbox.c
===================================================================
--- trunk/src/rs-toolbox.c	2010-02-14 02:22:09 UTC (rev 3220)
+++ trunk/src/rs-toolbox.c	2010-02-14 14:40:10 UTC (rev 3221)
@@ -999,7 +999,10 @@
 	if (photo)
 	{
 		RSDcpFile *dcp_profile = rs_photo_get_dcp_profile(photo);
-		rs_profile_selector_select_profile(toolbox->selector, dcp_profile);
+		if (dcp_profile)
+			rs_profile_selector_select_profile(toolbox->selector, dcp_profile);
+		else
+			gtk_combo_box_set_active(GTK_COMBO_BOX(toolbox->selector), 0);
 		/* FIXME: support ICC profiles too */
 	}
 	gtk_widget_set_sensitive(toolbox->transforms, !!(toolbox->photo));