Merge with 4e0f46f25a716ac65a4016bac6284685147b5ec9

(note: color.cc is still in the source tree and CMakeLists.txt)
This commit is contained in:
michael
2012-07-09 06:28:15 -04:00
parent 5a7efbbbbb
commit 6b842fd408
35 changed files with 270 additions and 185 deletions

View File

@@ -29,6 +29,10 @@
class ProfilePanel : public Gtk::VBox, public PParamsChangeListener {
private:
Glib::ustring lastFilename;
protected:
static PartialPasteDlg* partialProfileDlg;
@@ -44,7 +48,6 @@ class ProfilePanel : public Gtk::VBox, public PParamsChangeListener {
ProfileChangeListener* tpc;
bool dontupdate;
sigc::connection changeconn;
Gtk::FileChooserDialog* savedialog;
void changeTo (rtengine::procparams::PartialProfile* newpp, Glib::ustring profname);
void refreshProfileList ();
@@ -60,6 +63,7 @@ class ProfilePanel : public Gtk::VBox, public PParamsChangeListener {
static void cleanup ();
void initProfile (const Glib::ustring& profname, rtengine::procparams::ProcParams* lastSaved);
void setInitialFileName (const Glib::ustring& filename) {lastFilename = filename;}
// PParamsChangeListener interface
void procParamsChanged (rtengine::procparams::ProcParams* params, rtengine::ProcEvent ev, Glib::ustring descr, ParamsEdited* paramsEdited=NULL);