[Rawstudio-commit] r2899 - branches/rawstudio-ng-color/librawstudio

[Anders Kvist]

Author: akv
Date: 2009-12-30 20:21:54 +0100 (Wed, 30 Dec 2009)
New Revision: 2899

Modified:
   branches/rawstudio-ng-color/librawstudio/rs-lens-db-editor.c
   branches/rawstudio-ng-color/librawstudio/rs-lens-db-editor.h
Log:
Made enable button only activatable when lens is selected.

Modified: branches/rawstudio-ng-color/librawstudio/rs-lens-db-editor.c
===================================================================
--- branches/rawstudio-ng-color/librawstudio/rs-lens-db-editor.c        
2009-12-30 18:48:46 UTC (rev 2898)
+++ branches/rawstudio-ng-color/librawstudio/rs-lens-db-editor.c        
2009-12-30 19:21:54 UTC (rev 2899)
@@ -55,6 +55,7 @@
        gtk_list_store_set (GTK_LIST_STORE(model), &iter,
                            RS_LENS_DB_EDITOR_LENS_MAKE, lens->Maker,
                            RS_LENS_DB_EDITOR_LENS_MODEL, lens->Model,
+                           RS_LENS_DB_EDITOR_ENABLED_ACTIVATABLE, TRUE,
                            -1);
 
        RSLens *rs_lens = NULL;
@@ -347,7 +348,7 @@
 void
 rs_lens_db_editor() 
 {
-       GtkTreeModel *tree_model = GTK_TREE_MODEL(gtk_list_store_new(9, 
G_TYPE_STRING, G_TYPE_STRING, G_TYPE_STRING, G_TYPE_STRING, G_TYPE_STRING, 
G_TYPE_STRING, G_TYPE_STRING, G_TYPE_BOOLEAN, G_TYPE_OBJECT));
+       GtkTreeModel *tree_model = GTK_TREE_MODEL(gtk_list_store_new(10, 
G_TYPE_STRING, G_TYPE_STRING, G_TYPE_STRING, G_TYPE_STRING, G_TYPE_STRING, 
G_TYPE_STRING, G_TYPE_STRING, G_TYPE_BOOLEAN, G_TYPE_BOOLEAN, G_TYPE_OBJECT));
 
        RSLensDb *lens_db = rs_lens_db_get_default();
        fill_model(lens_db, tree_model);
@@ -398,6 +399,7 @@
         GtkTreeViewColumn *column_enabled = 
gtk_tree_view_column_new_with_attributes (_("Enabled"),
                                                                  
renderer_enabled,
                                                                  "active", 
RS_LENS_DB_EDITOR_ENABLED,
+                                                                 
"activatable", RS_LENS_DB_EDITOR_ENABLED_ACTIVATABLE,
                                                                                
   NULL);
 
        g_signal_connect(G_OBJECT(view), "row-activated",
@@ -460,6 +462,10 @@
 
                GtkTreeIter iter;
 
+               gboolean enabled_activatable = FALSE;
+               if (lensfun_make && lensfun_model)
+                       enabled_activatable = TRUE;
+
                gtk_list_store_append (GTK_LIST_STORE(tree_model), &iter);
                gtk_list_store_set (GTK_LIST_STORE(tree_model), &iter,
                                    RS_LENS_DB_EDITOR_IDENTIFIER, identifier,
@@ -470,6 +476,7 @@
                                    RS_LENS_DB_EDITOR_CAMERA_MAKE, camera_make,
                                    RS_LENS_DB_EDITOR_CAMERA_MODEL, 
camera_model,
                                    RS_LENS_DB_EDITOR_ENABLED, enabled,
+                                   RS_LENS_DB_EDITOR_ENABLED_ACTIVATABLE, 
enabled_activatable,
                                    RS_LENS_DB_EDITOR_LENS, lens,
                                    -1);
                list = g_list_next (list);

Modified: branches/rawstudio-ng-color/librawstudio/rs-lens-db-editor.h
===================================================================
--- branches/rawstudio-ng-color/librawstudio/rs-lens-db-editor.h        
2009-12-30 18:48:46 UTC (rev 2898)
+++ branches/rawstudio-ng-color/librawstudio/rs-lens-db-editor.h        
2009-12-30 19:21:54 UTC (rev 2899)
@@ -29,6 +29,7 @@
        RS_LENS_DB_EDITOR_CAMERA_MAKE,
        RS_LENS_DB_EDITOR_CAMERA_MODEL,
        RS_LENS_DB_EDITOR_ENABLED,
+       RS_LENS_DB_EDITOR_ENABLED_ACTIVATABLE,
        RS_LENS_DB_EDITOR_LENS
 };
 


_______________________________________________
Rawstudio-commit mailing list
Rawstudio-commit@rawstudio.org
http://rawstudio.org/cgi-bin/mailman/listinfo/rawstudio-commit