Author: post
Date: 2010-04-05 15:41:59 +0200 (Mon, 05 Apr 2010)
New Revision: 3340
Modified:
trunk/src/rs-toolbox.c
Log:
Always update lens ID label, detect when no lens information is available,
disable Edit Lens when camera is unknown or lens cannot be identified.
Capitalize captions.
Modified: trunk/src/rs-toolbox.c
===================================================================
--- trunk/src/rs-toolbox.c 2010-04-05 12:46:17 UTC (rev 3339)
+++ trunk/src/rs-toolbox.c 2010-04-05 13:41:59 UTC (rev 3340)
@@ -910,19 +910,25 @@
if(toolbox->rs_lens)
{
if (!rs_lens_get_lensfun_model(toolbox->rs_lens))
- lens_text = _("Lens unknown");
+ lens_text = _("Lens Unknown");
else if (!rs_lens_get_lensfun_enabled(toolbox->rs_lens))
- lens_text = _("Lens disabled");
+ lens_text = _("Lens Disabled");
else
lens_text = rs_lens_get_lensfun_model(toolbox->rs_lens);
+
gtk_widget_set_sensitive(GTK_WIDGET(toolbox->lensbutton[snapshot]), TRUE);
}
else if(toolbox->photo)
{
- lens_text = _("Camera unknown");
+ if (!toolbox->photo->metadata->lens_identifier)
+ lens_text = _("No Lens Information");
+ else
+ lens_text = _("Camera Unknown");
+
gtk_widget_set_sensitive(GTK_WIDGET(toolbox->lensbutton[snapshot]), FALSE);
}
else
{
- lens_text = _("No photo");
+ lens_text = _("No Photo");
+
gtk_widget_set_sensitive(GTK_WIDGET(toolbox->lensbutton[snapshot]), FALSE);
}
GString *temp = g_string_new(lens_text);
@@ -973,8 +979,8 @@
if (photo->metadata->lens_identifier) {
RSLensDb *lens_db = rs_lens_db_get_default();
toolbox->rs_lens =
rs_lens_db_get_from_identifier(lens_db, photo->metadata->lens_identifier);
- toolbox_lens_set_label(toolbox, snapshot);
}
+ toolbox_lens_set_label(toolbox, snapshot);
for(i=0;i<NLENS;i++)
gtk_widget_set_sensitive(GTK_WIDGET(toolbox->lens[snapshot][i]), TRUE);
_______________________________________________
Rawstudio-commit mailing list
[email protected]
http://rawstudio.org/cgi-bin/mailman/listinfo/rawstudio-commit
