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

Merge branch 'master' into gtk3

Browse Source
This commit is contained in:
Morgan Hardwood
2016-12-18 18:21:07 +01:00
parent 76314b9422 7fdcc8f172
commit 78ab525330
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
rtdata/languages/default
View File

@@ -957,7 +957,7 @@ PREFERENCES_FLUOF7;Fluorescent F7
PREFERENCES_FLUOF11;Fluorescent F11 PREFERENCES_FLUOF11;Fluorescent F11
PREFERENCES_FORIMAGE;For non-raw photos PREFERENCES_FORIMAGE;For non-raw photos
PREFERENCES_FORRAW;For raw photos PREFERENCES_FORRAW;For raw photos
PREFERENCES_FSTRIP_SAME_THUMB_HEIGHT;Same thumbnail height between the Editor's panel and the File Browser PREFERENCES_FSTRIP_SAME_THUMB_HEIGHT;Same thumbnail height between the Filmstrip and the File Browser
PREFERENCES_FSTRIP_SAME_THUMB_HEIGHT_HINT;Having separate thumbnail size will require more processing time each time you'll switch between the single Editor tab and the File Browser. PREFERENCES_FSTRIP_SAME_THUMB_HEIGHT_HINT;Having separate thumbnail size will require more processing time each time you'll switch between the single Editor tab and the File Browser.
PREFERENCES_GIMPPATH;GIMP installation directory PREFERENCES_GIMPPATH;GIMP installation directory
PREFERENCES_GREY;Output device's Yb luminance (%) PREFERENCES_GREY;Output device's Yb luminance (%)

6
rtgui/options.cc
View File

@@ -356,10 +356,10 @@ void Options::setDefaults ()
profilePath = "profiles"; profilePath = "profiles";
loadSaveProfilePath = ""; // will be corrected in load as otherwise construction fails loadSaveProfilePath = ""; // will be corrected in load as otherwise construction fails
version = "0.0.0.0"; // temporary value; will be correctly set in RTWindow::on_realize version = "0.0.0.0"; // temporary value; will be correctly set in RTWindow::on_realize
thumbSize = 240; thumbSize = 160;
thumbSizeTab = 180; thumbSizeTab = 160;
thumbSizeQueue = 160; thumbSizeQueue = 160;
sameThumbSize = true; // preferring speed of switch between file browser and single editor tab sameThumbSize = false; // preferring speed of switch between file browser and single editor tab
showHistory = true; showHistory = true;
showFilePanelState = 0; // Not used anymore ; was the thumb strip state showFilePanelState = 0; // Not used anymore ; was the thumb strip state
showInfo = true; showInfo = true;