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

merge with Dev another time

Browse Source
This commit is contained in:
Desmis
2017-04-10 08:42:20 +02:00
parent 57e34c178e 3ff2519302
commit 8ca404f140
50 changed files with 1765 additions and 1658 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
rtgui/preferences.cc
View File

@@ -1580,10 +1580,9 @@ void Preferences::parseThemeDir (Glib::ustring dirname)
Glib::ustring fname = Glib::build_filename (dirname, *i);
Glib::ustring sname = *i;
bool keepIt = false;
// ignore directories and filter out unsupported theme
if (regex->match (sname, matchInfo) && !Glib::file_test (fname, Glib::FILE_TEST_IS_DIR) && sname.size() >= 4) {
bool keepIt = false;
Glib::ustring fname2 = matchInfo.fetch (1);
Glib::ustring minMinor = matchInfo.fetch (2);
Glib::ustring maxMinor = matchInfo.fetch (3);
@@ -2159,8 +2158,8 @@ void Preferences::okPressed ()
void Preferences::cancelPressed ()
{
// set the initial theme back
if (themeFNames.at(theme->get_active_row_number ()).longFName != options.theme) {
rtengine::setPaths(options);
if (themeFNames.at (theme->get_active_row_number ()).longFName != options.theme) {
rtengine::setPaths (options);
RTImage::updateImages();
switchThemeTo (options.theme);
}
@@ -2217,8 +2216,8 @@ void Preferences::aboutPressed ()
void Preferences::themeChanged ()
{
moptions.theme = themeFNames.at(theme->get_active_row_number ()).longFName;
rtengine::setPaths(moptions);
moptions.theme = themeFNames.at (theme->get_active_row_number ()).longFName;
rtengine::setPaths (moptions);
RTImage::updateImages();
switchThemeTo (moptions.theme);
}