Added better handling of failures loading icons, as Cairo generated exception were crashing app under windows. Minor fix to handling missing processing params to not alter the global defaults.

rtgui/preferences.h

@@ -0,0 +1,145 @@
+/*
+ *  This file is part of RawTherapee.
+ *
+ *  Copyright (c) 2004-2010 Gabor Horvath <hgabor@rawtherapee.com>
+ *
+ *  RawTherapee is free software: you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation, either version 3 of the License, or
+ *  (at your option) any later version.
+ * 
+ *  RawTherapee is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with RawTherapee.  If not, see <http://www.gnu.org/licenses/>.
+ */
+#ifndef __PREFERENCES_H__
+#define __PREFERENCES_H__
+
+#include <gtkmm.h>
+#include <adjuster.h>
+#include <options.h>
+#include <vector>
+
+class Preferences : public Gtk::Dialog {
+
+        class ExtensionColumns : public Gtk::TreeModel::ColumnRecord {
+            public:
+                Gtk::TreeModelColumn<bool>  enabled;
+                Gtk::TreeModelColumn<Glib::ustring>  ext;
+                ExtensionColumns() { add(enabled); add(ext); }
+        };
+        ExtensionColumns extensionColumns;
+        Glib::RefPtr<Gtk::ListStore> extensionModel;
+
+
+        class BehavColumns : public Gtk::TreeModel::ColumnRecord {
+            public:
+                Gtk::TreeModelColumn<Glib::ustring> label;
+                Gtk::TreeModelColumn<bool>          badd;
+                Gtk::TreeModelColumn<bool>          bset;
+                Gtk::TreeModelColumn<bool>          visible;
+                Gtk::TreeModelColumn<int>           addsetid;
+                BehavColumns() { add(label); add(badd); add(bset); add(visible); add(addsetid); }
+        };
+        Glib::RefPtr<Gtk::TreeStore> behModel;
+        BehavColumns behavColumns;
+
+
+  protected:
+    Gtk::ComboBoxText* rprofiles;
+    Gtk::ComboBoxText* iprofiles;
+    Gtk::ComboBoxText* dmethod;
+    Gtk::ComboBoxText* languages;
+    Gtk::Entry* dateformat;
+    Gtk::Entry* startupdir;
+    Gtk::RadioButton* sdcurrent;
+    Gtk::RadioButton* sdlast;
+    Gtk::RadioButton* sdhome;
+    Gtk::RadioButton* sdother;
+    Gtk::FileChooserButton* gimpDir;
+    Gtk::FileChooserButton* psDir;
+    Gtk::Entry* editorToSendTo;
+    Gtk::RadioButton* edGimp;
+    Gtk::RadioButton* edPS;
+    Gtk::RadioButton* edOther;
+    
+
+    Gtk::CheckButton* showDateTime;
+    Gtk::CheckButton* showBasicExif;
+
+    Gtk::SpinButton*  ccSteps;
+    Gtk::Label* dcbIterationsLabel;
+    Gtk::SpinButton*  dcbIterations;
+    Gtk::CheckButton* dcbEnhance;
+    Gtk::FileChooserButton* iccDir;
+    Gtk::FileChooserButton* monProfile;
+
+    Gtk::CheckButton* blinkClipped;
+	Gtk::SpinButton*  hlThresh;
+	Gtk::SpinButton*  shThresh;
+
+    Gtk::ComboBoxText* intent;
+
+    Gtk::ComboBoxText* theme;
+	
+    Gtk::ComboBoxText* cformat;
+    Gtk::SpinButton*   maxThumbSize;
+    Gtk::SpinButton*   maxCacheEntries;
+    Gtk::Button*       clearThumbnails;
+    Gtk::Button*       clearProfiles;
+    Gtk::Button*       clearAll;
+    Gtk::Entry*     extension;
+    Gtk::TreeView*  extensions;
+    Gtk::Button*    addExt;
+    Gtk::Button*    delExt;
+    Gtk::CheckButton* overlayedFileNames;
+
+    Gtk::CheckButton* saveParamsFile;
+    Gtk::CheckButton* saveParamsCache;
+    Gtk::ComboBoxText* loadParamsPreference;
+	
+    Options moptions;
+    sigc::connection dmconn, tconn, addc, setc;
+
+    void fillPreferences ();
+    void storePreferences ();
+    void parseDir       (Glib::ustring dirname, std::vector<Glib::ustring>& items, Glib::ustring ext);
+    void dmethodChanged ();
+
+    void themeChanged ();
+
+    void appendBehavList (Gtk::TreeModel::iterator& parent, Glib::ustring label, int id, bool set);
+
+    Gtk::Widget* getProcParamsPanel ();
+    Gtk::Widget* getColorManagementPanel ();
+    Gtk::Widget* getFileBrowserPanel ();
+    Gtk::Widget* getGeneralPanel ();
+    Gtk::Widget* getBatchProcPanel ();
+    
+  public:
+         Preferences (int initialPage=0);
+    
+    void savePressed ();
+    void loadPressed ();
+    void okPressed ();
+    void cancelPressed ();
+    void aboutPressed ();
+
+    void selectStartupDir ();
+    void addExtPressed ();
+    void delExtPressed ();
+
+    void clearProfilesPressed ();
+    void clearThumbImagesPressed ();
+    void clearAllPressed ();
+    void behAddRadioToggled (const Glib::ustring& path);
+    void behSetRadioToggled (const Glib::ustring& path);
+//    void selectICCProfileDir ();
+//    void selectMonitorProfile ();
+};
+
+#endif