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

Falling back to RT's default profile if actually set default profile

Browse Source 
doesn't exist (see #4396). If the actually set default profile was RT's
default profile, whichcan't be accessed for any reason, it'll then fall
back by the Internal profile.
This commit is contained in:
Hombre
2018-02-19 23:20:41 +01:00
parent cb0798502b
commit ff021826c6
3 changed files with 26 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
rtdata/languages/Francais
View File

@@ -868,8 +868,8 @@ NAVIGATOR_S;S:
NAVIGATOR_V;V: NAVIGATOR_V;V:
NAVIGATOR_XY_FULL;Largeur = %1, Hauteur = %2 NAVIGATOR_XY_FULL;Largeur = %1, Hauteur = %2
NAVIGATOR_XY_NA;x = n/d, y = n/d NAVIGATOR_XY_NA;x = n/d, y = n/d
OPTIONS_DEFIMG_MISSING;Le profil par défaut pour les <b>images standards</b> n'a pas été trouvé ou n'a pas été réglé.\n\nVérifiez également le dossier de vos profils, il peut être manquant ou endommagé\n\nLes valeurs internes pas défaut seront utilisées. OPTIONS_DEFIMG_MISSING;Le profil par défaut pour les <b>images standards</b> n'a pas été trouvé ou n'a pas été réglé.\n\nVérifiez également le dossier de vos profils, il peut être manquant ou endommagé\n\n"<b>%1</b>" sera utilisé à la place.
OPTIONS_DEFRAW_MISSING;Le profil par défaut pour les <b>images Raw</b> n'a pas été trouvé ou n'a pas été réglé.\n\nVérifiez également le dossier de vos profils, il peut être manquant ou endommagé\n\nLes valeurs internes pas défaut seront utilisées. OPTIONS_DEFRAW_MISSING;Le profil par défaut pour les <b>images Raw</b> n'a pas été trouvé ou n'a pas été réglé.\n\nVérifiez également le dossier de vos profils, il peut être manquant ou endommagé\n\n"<b>%1</b>" sera utilisé à la place.
PARTIALPASTE_ADVANCEDGROUP;Réglages Avancés PARTIALPASTE_ADVANCEDGROUP;Réglages Avancés
PARTIALPASTE_BASICGROUP;Réglages de base PARTIALPASTE_BASICGROUP;Réglages de base
PARTIALPASTE_CACORRECTION;Aberration chromatique PARTIALPASTE_CACORRECTION;Aberration chromatique

4
rtdata/languages/default
View File

@@ -869,8 +869,8 @@ NAVIGATOR_S;S:
NAVIGATOR_V;V: NAVIGATOR_V;V:
NAVIGATOR_XY_FULL;Width: %1, Height: %2 NAVIGATOR_XY_FULL;Width: %1, Height: %2
NAVIGATOR_XY_NA;x: --, y: -- NAVIGATOR_XY_NA;x: --, y: --
OPTIONS_DEFIMG_MISSING;The default profile for <b>non-raw photos</b> could not be found or is not set.\n\nPlease check your profiles' directory, it may be missing or damaged.\n\nDefault internal values will be used. OPTIONS_DEFIMG_MISSING;The default profile for <b>non-raw photos</b> could not be found or is not set.\n\nPlease check your profiles' directory, it may be missing or damaged.\n\n"<b>%1</b>" will be used instead.
OPTIONS_DEFRAW_MISSING;The default profile for <b>raw photos</b> could not be found or is not set.\n\nPlease check your profiles' directory, it may be missing or damaged.\n\nDefault internal values will be used. OPTIONS_DEFRAW_MISSING;The default profile for <b>raw photos</b> could not be found or is not set.\n\nPlease check your profiles' directory, it may be missing or damaged.\n\n"<b>%1</b>" will be used instead.
PARTIALPASTE_ADVANCEDGROUP;Advanced Settings PARTIALPASTE_ADVANCEDGROUP;Advanced Settings
PARTIALPASTE_BASICGROUP;Basic Settings PARTIALPASTE_BASICGROUP;Basic Settings
PARTIALPASTE_CACORRECTION;Chromatic aberration correction PARTIALPASTE_CACORRECTION;Chromatic aberration correction

32
rtgui/options.cc
View File

@@ -2192,7 +2192,7 @@ void Options::load (bool lightweight)
// Check default Raw and Img procparams existence // Check default Raw and Img procparams existence
if (options.defProfRaw.empty()) { if (options.defProfRaw.empty()) {
options.defProfRaw = DEFPROFILE_INTERNAL; options.defProfRaw = DEFPROFILE_RAW;
} else { } else {
Glib::ustring tmpFName = options.findProfilePath (options.defProfRaw); Glib::ustring tmpFName = options.findProfilePath (options.defProfRaw);
@@ -2201,17 +2201,23 @@ void Options::load (bool lightweight)
printf ("Default profile for raw images \"%s\" found\n", options.defProfRaw.c_str()); printf ("Default profile for raw images \"%s\" found\n", options.defProfRaw.c_str());
} }
} else { } else {
if (options.rtSettings.verbose) { if (options.defProfRaw != DEFPROFILE_RAW) {
printf ("Default profile for raw images \"%s\" not found or not set -> using Internal values\n", options.defProfRaw.c_str()); if (options.rtSettings.verbose) {
printf ("Default profile for raw images \"%s\" not found or not set -> using RawTherapee's default raw profile\n", options.defProfRaw.c_str());
}
options.defProfRaw = DEFPROFILE_RAW;
} else {
if (options.rtSettings.verbose) {
printf ("Default profile for raw images \"%s\" not found or not set -> using Internal values\n", options.defProfRaw.c_str());
}
options.defProfRaw = DEFPROFILE_INTERNAL;
} }
options.defProfRaw = DEFPROFILE_INTERNAL;
options.defProfRawMissing = true; options.defProfRawMissing = true;
} }
} }
if (options.defProfImg.empty()) { if (options.defProfImg.empty()) {
options.defProfImg = DEFPROFILE_INTERNAL; options.defProfImg = DEFPROFILE_IMG;
} else { } else {
Glib::ustring tmpFName = options.findProfilePath (options.defProfImg); Glib::ustring tmpFName = options.findProfilePath (options.defProfImg);
@@ -2220,11 +2226,17 @@ void Options::load (bool lightweight)
printf ("Default profile for non-raw images \"%s\" found\n", options.defProfImg.c_str()); printf ("Default profile for non-raw images \"%s\" found\n", options.defProfImg.c_str());
} }
} else { } else {
if (options.rtSettings.verbose) { if (options.defProfImg != DEFPROFILE_IMG) {
printf ("Default profile for non-raw images \"%s\" not found or not set -> using Internal values\n", options.defProfImg.c_str()); if (options.rtSettings.verbose) {
printf ("Default profile for non-raw images \"%s\" not found or not set -> using RawTherapee's default non-raw profile\n", options.defProfImg.c_str());
}
options.defProfImg = DEFPROFILE_IMG;
} else {
if (options.rtSettings.verbose) {
printf ("Default profile for non-raw images \"%s\" not found or not set -> using Internal values\n", options.defProfImg.c_str());
}
options.defProfImg = DEFPROFILE_INTERNAL;
} }
options.defProfImg = DEFPROFILE_INTERNAL;
options.defProfImgMissing = true; options.defProfImgMissing = true;
} }
} }