Changes to black compression and saturation controls. Black compression from 0-50 acts the same as 0-100 on the previous version, compressing dark tones without crushing blacks. 50-100 then starts crushing blacks until by 100 on the slider, all tones up to the set black point are sent to zero. In the new saturation control, negative values of the slider set a linear curve rather than an inverted S curve, and smoothly decrease saturation to zero across the board.

2010-10-26 22:59:18 -05:00
commit 926056c2c2
620 changed files with 130476 additions and 0 deletions
--- a/rtgui/dirbrowser.h
+++ b/rtgui/dirbrowser.h
@@ -0,0 +1,103 @@
+/*
+ *  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 _DIRBROWSER_
+#define _DIRBROWSER_
+
+#include <gtkmm.h>
+#include <giomm.h>
+#ifdef _WIN32
+#include <windirmonitor.h>
+#endif
+#include <dirselectionlistener.h>
+#include <dirbrowserremoteinterface.h>
+
+class DirBrowser : public Gtk::VBox, public DirBrowserRemoteInterface
+#ifdef _WIN32
+    , public WinDirChangeListener
+#endif
+ {
+
+  private:
+
+    Glib::RefPtr<Gtk::TreeStore> dirTreeModel;
+    
+    struct DirTreeColumns : public Gtk::TreeModelColumnRecord {
+      public:
+        Gtk::TreeModelColumn<Glib::ustring> filename;
+        Gtk::TreeModelColumn<Glib::RefPtr<Gdk::Pixbuf> > icon1;
+        Gtk::TreeModelColumn<Glib::RefPtr<Gdk::Pixbuf> > icon2;
+        Gtk::TreeModelColumn<Glib::ustring> dirname;
+        #ifdef _WIN32
+        Gtk::TreeModelColumn<Glib::RefPtr<WinDirMonitor>  > monitor;
+        #else
+        Gtk::TreeModelColumn<Glib::RefPtr<Gio::FileMonitor> > monitor;
+        #endif
+        
+        DirTreeColumns() { add(icon1); add(icon2); add(filename); add(dirname); add(monitor); }
+    };
+
+    Gtk::TreeViewColumn tvc;
+    Gtk::CellRendererText crt;
+    Gtk::CellRendererPixbuf crb;
+    DirTreeColumns dtColumns;
+
+    Gtk::TreeView *dirtree;
+    Gtk::ScrolledWindow *scrolledwindow4;
+    std::vector<DirSelectionListener*> dllisteners;
+
+    void fillRoot ();
+
+    Glib::RefPtr<Gdk::Pixbuf> openfolder;
+    Glib::RefPtr<Gdk::Pixbuf> closedfolder;
+    Glib::RefPtr<Gdk::Pixbuf> icdrom;
+    Glib::RefPtr<Gdk::Pixbuf> ifloppy;
+    Glib::RefPtr<Gdk::Pixbuf> ihdd;
+    Glib::RefPtr<Gdk::Pixbuf> inetwork;
+    Glib::RefPtr<Gdk::Pixbuf> iremovable;
+
+    bool expandSuccess;
+
+    #ifdef WIN32
+    int volumes;
+    public:
+    void updateVolumes ();
+	void updateDirTree  (const Gtk::TreeModel::iterator& iter);
+	void updateDirTreeRoot  ();
+    void winDirChanged ();
+    private:
+    void addRoot (char letter);
+    #endif
+    void addDir (const Gtk::TreeModel::iterator& iter, const Glib::ustring& dirname);
+    Gtk::TreePath expandToDir (const Glib::ustring& dirName);
+    void updateDir (const Gtk::TreeModel::iterator& iter);
+    void notifyListeners ();
+
+  public:
+    DirBrowser ();
+
+    void fillDirTree ();
+    void row_expanded   (const Gtk::TreeModel::iterator& iter, const Gtk::TreeModel::Path& path);
+    void row_activated  (const Gtk::TreeModel::Path& path, Gtk::TreeViewColumn* column);
+    void file_changed   (const Glib::RefPtr<Gio::File>& file, const Glib::RefPtr<Gio::File>& other_file, Gio::FileMonitorEvent event_type, const Gtk::TreeModel::iterator& iter, const Glib::ustring& dirName);
+    void open           (const Glib::ustring& dirName, const Glib::ustring& fileName=""); // goes to dir "dirName" and selects file "fileName"
+    void addDirSelectionListener (DirSelectionListener* l) { dllisteners.push_back (l); }
+    void selectDir      (Glib::ustring dir);
+};    
+
+#endif