liz/rawTherapee
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

merged dev into locallab_dev

Browse Source
This commit is contained in:
heckflosse
2017-05-03 14:15:52 +02:00
parent f2f45458be edfea689b8
commit 2492001c50
33 changed files with 1939 additions and 1700 deletions
Download Patch File Download Diff File Expand all files Collapse all files

48
rtgui/preferences.cc
View File

@@ -87,20 +87,20 @@ Preferences::Preferences (RTWindow *rtwindow)
get_action_area()->pack_end (*ok);
get_action_area()->pack_end (*cancel);
nb->append_page (*getGeneralPanel(), M ("PREFERENCES_TAB_GENERAL"));
nb->append_page (*getProcParamsPanel(), M ("PREFERENCES_TAB_IMPROC"));
nb->append_page (*getDynProfilePanel(), M ("PREFERENCES_TAB_DYNAMICPROFILE"));
nb->append_page (*getFileBrowserPanel(), M ("PREFERENCES_TAB_BROWSER"));
nb->append_page (*getColorManagementPanel(), M ("PREFERENCES_TAB_COLORMGR"));
nb->append_page (*getBatchProcPanel(), M ("PREFERENCES_BATCH_PROCESSING"));
nb->append_page (*getPerformancePanel(), M ("PREFERENCES_TAB_PERFORMANCE"));
nb->append_page (*getGeneralPanel(), M("PREFERENCES_TAB_GENERAL"));
nb->append_page (*getProcParamsPanel(), M("PREFERENCES_TAB_IMPROC"));
nb->append_page (*getDynProfilePanel(), M("PREFERENCES_TAB_DYNAMICPROFILE"));
nb->append_page (*getFileBrowserPanel(), M("PREFERENCES_TAB_BROWSER"));
nb->append_page (*getColorManagementPanel(), M("PREFERENCES_TAB_COLORMGR"));
nb->append_page (*getBatchProcPanel(), M("PREFERENCES_BATCH_PROCESSING"));
nb->append_page (*getPerformancePanel(), M("PREFERENCES_TAB_PERFORMANCE"));
// Sounds only on Windows and Linux
#if defined(WIN32) || defined(__linux__)
nb->append_page (*getSoundPanel(), M ("PREFERENCES_TAB_SOUND"));
nb->append_page (*getSoundPanel(), M("PREFERENCES_TAB_SOUND"));
#endif
nb->set_current_page (0);
profileStore.addListener (this);
ProfileStore::getInstance()->addListener(this);
fillPreferences ();
@@ -111,8 +111,8 @@ Preferences::Preferences (RTWindow *rtwindow)
Preferences::~Preferences ()
{
profileStore.removeListener (this);
get_size (options.preferencesWidth, options.preferencesHeight);
ProfileStore::getInstance()->removeListener(this);
get_size(options.preferencesWidth, options.preferencesHeight);
}
int Preferences::getThemeRowNumber (Glib::ustring& longThemeFName)
@@ -465,16 +465,17 @@ Gtk::Widget* Preferences::getProcParamsPanel ()
Gtk::VBox* vbpp = Gtk::manage (new Gtk::VBox ());
Gtk::Label* drlab = Gtk::manage (new Gtk::Label (M ("PREFERENCES_FORRAW") + ":", Gtk::ALIGN_START));
rprofiles = Gtk::manage (new ProfileStoreComboBox ());
rprofiles->addRow (profileStore.getInternalDynamicPSE());
setExpandAlignProperties (rprofiles, true, false, Gtk::ALIGN_FILL, Gtk::ALIGN_CENTER);
rprofiles->set_size_request (50, -1);
rpconn = rprofiles->signal_changed().connect ( sigc::mem_fun (*this, &Preferences::forRAWComboChanged) );
Gtk::Label* drimg = Gtk::manage (new Gtk::Label (M ("PREFERENCES_FORIMAGE") + ":", Gtk::ALIGN_START));
const ProfileStoreEntry* dynpse = ProfileStore::getInstance()->getInternalDynamicPSE();
rprofiles->addRow(dynpse);
setExpandAlignProperties(rprofiles, true, false, Gtk::ALIGN_FILL, Gtk::ALIGN_CENTER);
rprofiles->set_size_request(50, -1);
rpconn = rprofiles->signal_changed().connect( sigc::mem_fun(*this, &Preferences::forRAWComboChanged) );
Gtk::Label* drimg = Gtk::manage (new Gtk::Label (M("PREFERENCES_FORIMAGE") + ":", Gtk::ALIGN_START));
iprofiles = Gtk::manage (new ProfileStoreComboBox ());
iprofiles->addRow (profileStore.getInternalDynamicPSE());
iprofiles->set_size_request (50, -1);
setExpandAlignProperties (iprofiles, true, false, Gtk::ALIGN_FILL, Gtk::ALIGN_FILL);
ipconn = iprofiles->signal_changed().connect ( sigc::mem_fun (*this, &Preferences::forImageComboChanged) );
iprofiles->addRow(dynpse);
iprofiles->set_size_request(50, -1);
setExpandAlignProperties(iprofiles, true, false, Gtk::ALIGN_FILL, Gtk::ALIGN_FILL);
ipconn = iprofiles->signal_changed().connect( sigc::mem_fun(*this, &Preferences::forImageComboChanged) );
Gtk::Table* defpt = Gtk::manage (new Gtk::Table (2, 2));
defpt->attach (*drlab, 0, 1, 0, 1, Gtk::FILL, Gtk::SHRINK, 2, 2);
defpt->attach (*rprofiles, 1, 2, 0, 1, Gtk::EXPAND | Gtk::FILL | Gtk::SHRINK, Gtk::SHRINK, 2, 2);
@@ -2302,7 +2303,7 @@ void Preferences::bundledProfilesChanged ()
options.useBundledProfiles = useBundledProfiles->get_active ();
// rescan the file's tree
profileStore.parseProfiles(); // This will call Preferences::updateProfileList in return
ProfileStore::getInstance()->parseProfiles(); // This will call Preferences::updateProfileList in return
// restoring back the old value
options.useBundledProfiles = currValue;
@@ -2338,8 +2339,9 @@ void Preferences::updateProfileList()
{
rprofiles->updateProfileList();
iprofiles->updateProfileList();
rprofiles->addRow (profileStore.getInternalDynamicPSE());
iprofiles->addRow (profileStore.getInternalDynamicPSE());
const ProfileStoreEntry* dynpse = ProfileStore::getInstance()->getInternalDynamicPSE();
rprofiles->addRow(dynpse);
iprofiles->addRow(dynpse);
}
void Preferences::restoreValue()