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

Merge

Browse Source
This commit is contained in:
ghorvath
2010-05-15 17:29:39 +02:00
parent 7b9fe645e8
commit 81cba00bc4
26 changed files with 72 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
rtdata/languages/Catala
View File

@@ -684,3 +684,5 @@ HISTOGRAM_BUTTON_R;R
HISTOGRAM_BUTTON_G;G
HISTOGRAM_BUTTON_B;B
HISTOGRAM_BUTTON_L;L
PREFERENCES_DCBENHANCE;Apply DCB enhancement step
PREFERENCES_DCBITERATIONS;Number of DCB iterations

2
rtdata/languages/Chinese (Simplified)
View File

@@ -686,3 +686,5 @@ HISTOGRAM_BUTTON_R;R
HISTOGRAM_BUTTON_G;G
HISTOGRAM_BUTTON_B;B
HISTOGRAM_BUTTON_L;L
PREFERENCES_DCBENHANCE;Apply DCB enhancement step
PREFERENCES_DCBITERATIONS;Number of DCB iterations

2
rtdata/languages/Chinese (Traditional)
View File

@@ -685,3 +685,5 @@ HISTOGRAM_BUTTON_R;R
HISTOGRAM_BUTTON_G;G
HISTOGRAM_BUTTON_B;B
HISTOGRAM_BUTTON_L;L
PREFERENCES_DCBENHANCE;Apply DCB enhancement step
PREFERENCES_DCBITERATIONS;Number of DCB iterations

2
rtdata/languages/Czech
View File

@@ -689,3 +689,5 @@ HISTOGRAM_BUTTON_R;R
HISTOGRAM_BUTTON_G;G
HISTOGRAM_BUTTON_B;B
HISTOGRAM_BUTTON_L;L
PREFERENCES_DCBENHANCE;Apply DCB enhancement step
PREFERENCES_DCBITERATIONS;Number of DCB iterations

2
rtdata/languages/Dansk
View File

@@ -685,3 +685,5 @@ HISTOGRAM_BUTTON_R;R
HISTOGRAM_BUTTON_G;G
HISTOGRAM_BUTTON_B;B
HISTOGRAM_BUTTON_L;L
PREFERENCES_DCBENHANCE;Apply DCB enhancement step
PREFERENCES_DCBITERATIONS;Number of DCB iterations

2
rtdata/languages/Espanol
View File

@@ -691,3 +691,5 @@ HISTOGRAM_BUTTON_R;R
HISTOGRAM_BUTTON_G;G
HISTOGRAM_BUTTON_B;B
HISTOGRAM_BUTTON_L;L
PREFERENCES_DCBENHANCE;Apply DCB enhancement step
PREFERENCES_DCBITERATIONS;Number of DCB iterations

2
rtdata/languages/Euskara
View File

@@ -685,3 +685,5 @@ HISTOGRAM_BUTTON_R;R
HISTOGRAM_BUTTON_G;G
HISTOGRAM_BUTTON_B;B
HISTOGRAM_BUTTON_L;L
PREFERENCES_DCBENHANCE;Apply DCB enhancement step
PREFERENCES_DCBITERATIONS;Number of DCB iterations

2
rtdata/languages/Francais
View File

@@ -684,3 +684,5 @@ HISTOGRAM_BUTTON_R;R
HISTOGRAM_BUTTON_G;V
HISTOGRAM_BUTTON_B;B
HISTOGRAM_BUTTON_L;L
PREFERENCES_DCBENHANCE;Apply DCB enhancement step
PREFERENCES_DCBITERATIONS;Number of DCB iterations

2
rtdata/languages/Greek
View File

@@ -683,3 +683,5 @@ HISTOGRAM_BUTTON_R;R
HISTOGRAM_BUTTON_G;G
HISTOGRAM_BUTTON_B;B
HISTOGRAM_BUTTON_L;L
PREFERENCES_DCBENHANCE;Apply DCB enhancement step
PREFERENCES_DCBITERATIONS;Number of DCB iterations

2
rtdata/languages/Hebrew
View File

@@ -685,3 +685,5 @@ HISTOGRAM_BUTTON_R;R
HISTOGRAM_BUTTON_G;G
HISTOGRAM_BUTTON_B;B
HISTOGRAM_BUTTON_L;L
PREFERENCES_DCBENHANCE;Apply DCB enhancement step
PREFERENCES_DCBITERATIONS;Number of DCB iterations

2
rtdata/languages/Italian
View File

@@ -688,3 +688,5 @@ HISTOGRAM_BUTTON_R;R
HISTOGRAM_BUTTON_G;G
HISTOGRAM_BUTTON_B;B
HISTOGRAM_BUTTON_L;L
PREFERENCES_DCBENHANCE;Apply DCB enhancement step
PREFERENCES_DCBITERATIONS;Number of DCB iterations

2
rtdata/languages/Japanese
View File

@@ -685,3 +685,5 @@ HISTOGRAM_BUTTON_R;R
HISTOGRAM_BUTTON_G;G
HISTOGRAM_BUTTON_B;B
HISTOGRAM_BUTTON_L;L
PREFERENCES_DCBENHANCE;Apply DCB enhancement step
PREFERENCES_DCBITERATIONS;Number of DCB iterations

2
rtdata/languages/Latvian
View File

@@ -685,3 +685,5 @@ HISTOGRAM_BUTTON_R;R
HISTOGRAM_BUTTON_G;G
HISTOGRAM_BUTTON_B;B
HISTOGRAM_BUTTON_L;L
PREFERENCES_DCBENHANCE;Apply DCB enhancement step
PREFERENCES_DCBITERATIONS;Number of DCB iterations

2
rtdata/languages/Magyar
View File

@@ -685,3 +685,5 @@ HISTOGRAM_BUTTON_R;R
HISTOGRAM_BUTTON_G;G
HISTOGRAM_BUTTON_B;B
HISTOGRAM_BUTTON_L;L
PREFERENCES_DCBENHANCE;Apply DCB enhancement step
PREFERENCES_DCBITERATIONS;Number of DCB iterations

2
rtdata/languages/Nederlands
View File

@@ -686,3 +686,5 @@ HISTOGRAM_BUTTON_R;R
HISTOGRAM_BUTTON_G;G
HISTOGRAM_BUTTON_B;B
HISTOGRAM_BUTTON_L;L
PREFERENCES_DCBENHANCE;Apply DCB enhancement step
PREFERENCES_DCBITERATIONS;Number of DCB iterations

2
rtdata/languages/Norsk BM
View File

@@ -685,3 +685,5 @@ HISTOGRAM_BUTTON_R;R
HISTOGRAM_BUTTON_G;G
HISTOGRAM_BUTTON_B;B
HISTOGRAM_BUTTON_L;L
PREFERENCES_DCBENHANCE;Apply DCB enhancement step
PREFERENCES_DCBITERATIONS;Number of DCB iterations

2
rtdata/languages/Polish
View File

@@ -690,3 +690,5 @@ HISTOGRAM_BUTTON_R;R
HISTOGRAM_BUTTON_G;G
HISTOGRAM_BUTTON_B;B
HISTOGRAM_BUTTON_L;L
PREFERENCES_DCBENHANCE;Apply DCB enhancement step
PREFERENCES_DCBITERATIONS;Number of DCB iterations

2
rtdata/languages/Polish (Latin Characters)
View File

@@ -690,3 +690,5 @@ HISTOGRAM_BUTTON_R;R
HISTOGRAM_BUTTON_G;G
HISTOGRAM_BUTTON_B;B
HISTOGRAM_BUTTON_L;L
PREFERENCES_DCBENHANCE;Apply DCB enhancement step
PREFERENCES_DCBITERATIONS;Number of DCB iterations

2
rtdata/languages/Portugues (Brasil)
View File

@@ -685,3 +685,5 @@ HISTOGRAM_BUTTON_R;R
HISTOGRAM_BUTTON_G;G
HISTOGRAM_BUTTON_B;B
HISTOGRAM_BUTTON_L;L
PREFERENCES_DCBENHANCE;Apply DCB enhancement step
PREFERENCES_DCBITERATIONS;Number of DCB iterations

2
rtdata/languages/Russian
View File

@@ -688,3 +688,5 @@ HISTOGRAM_BUTTON_R;R
HISTOGRAM_BUTTON_G;G
HISTOGRAM_BUTTON_B;B
HISTOGRAM_BUTTON_L;L
PREFERENCES_DCBENHANCE;Apply DCB enhancement step
PREFERENCES_DCBITERATIONS;Number of DCB iterations

2
rtdata/languages/Slovak
View File

@@ -686,3 +686,5 @@ HISTOGRAM_BUTTON_R;R
HISTOGRAM_BUTTON_G;G
HISTOGRAM_BUTTON_B;B
HISTOGRAM_BUTTON_L;L
PREFERENCES_DCBENHANCE;Apply DCB enhancement step
PREFERENCES_DCBITERATIONS;Number of DCB iterations

2
rtdata/languages/Suomi
View File

@@ -685,3 +685,5 @@ HISTOGRAM_BUTTON_R;R
HISTOGRAM_BUTTON_G;G
HISTOGRAM_BUTTON_B;B
HISTOGRAM_BUTTON_L;L
PREFERENCES_DCBENHANCE;Apply DCB enhancement step
PREFERENCES_DCBITERATIONS;Number of DCB iterations

2
rtdata/languages/Swedish
View File

@@ -685,3 +685,5 @@ HISTOGRAM_BUTTON_R;R
HISTOGRAM_BUTTON_G;G
HISTOGRAM_BUTTON_B;B
HISTOGRAM_BUTTON_L;L
PREFERENCES_DCBENHANCE;Apply DCB enhancement step
PREFERENCES_DCBITERATIONS;Number of DCB iterations

2
rtdata/languages/Turkish
View File

@@ -685,3 +685,5 @@ HISTOGRAM_BUTTON_R;R
HISTOGRAM_BUTTON_G;G
HISTOGRAM_BUTTON_B;B
HISTOGRAM_BUTTON_L;L
PREFERENCES_DCBENHANCE;Apply DCB enhancement step
PREFERENCES_DCBITERATIONS;Number of DCB iterations

2
rtgui/placesbrowser.cc
View File

@@ -18,7 +18,7 @@
*/
#include <placesbrowser.h>
#include <options.h>
#include <toolpanel.h>>
#include <toolpanel.h>
#include <safegtk.h>
PlacesBrowser::PlacesBrowser () : listener (NULL) {

42
rtgui/thumbnail.cc
View File

@@ -19,6 +19,7 @@
#include <multilangmgr.h>
#include <thumbnail.h>
#include <sstream>
#include <iomanip>
#include <options.h>
#include <mytime.h>
#include <stdio.h>
@@ -268,25 +269,28 @@ void Thumbnail::generateExifDateTimeStrings () {
std::ostringstream ostr;
bool spec = false;
for (int i=0; i<dateFormat.size(); i++)
if (spec && dateFormat[i]=='y') {
ostr << cfs.year;
spec = false;
}
else if (spec && dateFormat[i]=='m') {
ostr << (int)cfs.month;
spec = false;
}
else if (spec && dateFormat[i]=='d') {
ostr << (int)cfs.day;
spec = false;
}
else if (dateFormat[i]=='%')
spec = true;
else {
ostr << (char)dateFormat[i];
spec = false;
}
ostr << " " << (int)cfs.hour << ":" << (int)cfs.min << ":" << (int)cfs.sec;
if (spec && dateFormat[i]=='y') {
ostr << cfs.year;
spec = false;
}
else if (spec && dateFormat[i]=='m') {
ostr << (int)cfs.month;
spec = false;
}
else if (spec && dateFormat[i]=='d') {
ostr << (int)cfs.day;
spec = false;
}
else if (dateFormat[i]=='%')
spec = true;
else {
ostr << (char)dateFormat[i];
spec = false;
}
ostr << " " << (int)cfs.hour;
ostr << ":" << std::setw(2) << std::setfill('0') << (int)cfs.min;
ostr << ":" << std::setw(2) << std::setfill('0') << (int)cfs.sec;
dateTimeString = ostr.str ();
}