One step towards "Profile (look) browser" (issue 853): global (bundled) and user's profiles can now be stored in subdirectories.

"Use bundles profiles" added to the Preferences window.
This commit is contained in:
Hombre
2013-09-16 00:32:44 +02:00
parent 0a4b476a02
commit 7e26931ecb
74 changed files with 1459 additions and 571 deletions

View File

@@ -24,21 +24,31 @@
#include "../rtengine/rtengine.h"
#include "pparamschangelistener.h"
#include "profilechangelistener.h"
#include "profilestore.h"
#include "partialpastedlg.h"
#include "guiutils.h"
#include "rtimage.h"
class ProfilePanel : public Gtk::VBox, public PParamsChangeListener {
class ProfilePanel : public Gtk::VBox, public PParamsChangeListener, public ProfileStoreListener {
private:
rtengine::procparams::PartialProfile* storedPProfile;
Glib::ustring storedValue;
Glib::ustring lastFilename;
Glib::ustring imagePath;
RTImage *profileFillModeOnImage;
RTImage *profileFillModeOffImage;
Gtk::ToggleButton* fillMode;
Gtk::TreeIter currRow;
void profileFillModeToggled();
void profileFillModeToggled ();
bool isCustomSelected ();
bool isLastSavedSelected ();
Gtk::TreeIter getCustomRow ();
Gtk::TreeIter getLastSavedRow ();
Gtk::TreeIter addCustomRow ();
Gtk::TreeIter addLastSavedRow ();
protected:
@@ -47,17 +57,14 @@ class ProfilePanel : public Gtk::VBox, public PParamsChangeListener {
Gtk::Button* load;
Gtk::Button* copy;
Gtk::Button* paste;
MyComboBoxText* profiles;
std::vector<Glib::ustring> pparams;
ProfileStoreComboBox* profiles;
rtengine::procparams::PartialProfile* custom;
rtengine::procparams::PartialProfile* lastsaved;
Glib::ustring old;
ProfileChangeListener* tpc;
bool dontupdate;
sigc::connection changeconn;
void changeTo (const rtengine::procparams::PartialProfile* newpp, Glib::ustring profname);
void refreshProfileList ();
public:
@@ -68,8 +75,11 @@ class ProfilePanel : public Gtk::VBox, public PParamsChangeListener {
static void init ();
static void cleanup ();
void storeCurrentValue();
void updateProfileList ();
void restoreValue();
void initProfile (const Glib::ustring& profname, rtengine::procparams::ProcParams* lastSaved);
void initProfile (const Glib::ustring& profileFullPath, rtengine::procparams::ProcParams* lastSaved);
void setInitialFileName (const Glib::ustring& filename);
// PParamsChangeListener interface