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

Merge branch 'dev' into hidpi-icons

Browse Source
This commit is contained in:
Hombre 2019-02-28 21:57:44 +01:00
commit 2d0b376ae9
8 changed files with 804 additions and 2202 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1060
rtdata/images/non-themed/rt-logo.svg
View File

File diff suppressed because it is too large Load Diff
Side by Side

Before

Width:  |  Height:  |  Size: 51 KiB

1900
rtdata/images/non-themed/rt-splash.svg
View File

File diff suppressed because it is too large Load Diff
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 79 KiB

After

Width:  |  Height:  |  Size: 51 KiB

3
rtdata/languages/Deutsch
View File

@ -77,6 +77,7 @@
#76 11.12.2018 Erweiterung (TooWaBoo) RT 5.5
#77 16.12.2018 Korrektur Farbwähler-Tooltip (TooWaBoo) RT 5.5
#78 19.01.2019 Erweiterung (TooWaBoo) RT 5.5
#79 24.02.2019 Erweiterung (TooWaBoo) RT 5.5
ABOUT_TAB_BUILD;Version
ABOUT_TAB_CREDITS;Danksagungen
@ -2414,4 +2415,4 @@ ZOOMPANEL_ZOOMOUT;Herauszoomen\nTaste: <b>-</b>
! Untranslated keys follow; remove the ! prefix after an entry is translated.
!!!!!!!!!!!!!!!!!!!!!!!!!
!TP_RAW_IMAGENUM_SN;SN mode
TP_RAW_IMAGENUM_SN;SN-Modus

14
rtengine/camconst.json
View File

@ -1305,12 +1305,6 @@ Camera constants:
"ranges": { "white": 16100 }
},
{ // Quality B
"make_model": "FUJIFILM X-E3",
"dcraw_matrix": [ 11434,-4948,-1210,-3746,12042,1903,-666,1479,5235 ], // DNG v10 D65
"ranges": { "white": 16100 }
},
{ // Quality B
"make_model": "FUJIFILM X-PRO1",
"dcraw_matrix": [ 10413,-3996,-993,-3721,11640,2361,-733,1540,6011 ], // DNG_v9.4 D65
@ -1318,15 +1312,17 @@ Camera constants:
},
{ // Quality B
"make_model": [ "FUJIFILM X-PRO2", "FUJIFILM X-T2", "FUJIFILM X100F", "FUJIFILM X-T20" ],
"make_model": [ "FUJIFILM X-T2", "FUJIFILM X-T20", "FUJIFILM X-E3", "FUJIFILM X100F", "FUJIFILM X-PRO2", "FUJIFILM X-H1" ],
"dcraw_matrix": [ 11434,-4948,-1210,-3746,12042,1903,-666,1479,5235 ], // DNG_v9.4 D65
//"raw_crop": [ 0, 0, 6032, 4032 ], // full raw 6160,4032, Usable 6032,4032 - experimental crop
// "raw_crop": [ 0, 5, 6032, 4032 ], // full raw 6160,4032, Usable 6032,4032 - for lossless compressed files
// "raw_crop": [ 0, 0, 6032, 4032 ], // full raw 6160,4032, Usable 6032,4032 - for uncompressed files
"raw_crop": [ 0, 5, 6032, 4026 ], // full raw 6160,4032, Usable 6032,4026 - for uncompressed and lossless compressed files (but reduces height by 6 pixels)
"ranges": { "white": 16100 }
},
{ // Quality C, only raw crop
"make_model": [ "FUJIFILM X-T3" ],
"raw_crop": [ 0, 0, 6254, 0]
"raw_crop": [ 0, 5, 6252, 4176]
},
{ // Quality B

2
rtengine/demosaic_algos.cc
View File

@ -30,7 +30,7 @@
#include "sleef.c"
#include "opthelper.h"
#include "median.h"
#define BENCHMARK
//#define BENCHMARK
#include "StopWatch.h"
#ifdef _OPENMP
#include <omp.h>

11
rtgui/options.cc
View File

@ -352,7 +352,14 @@ void Options::setDefaults()
fbShowDateTime = true;
fbShowBasicExif = true;
fbShowExpComp = false;
#ifdef WIN32
// use windows setting for visibility of hidden files/folders
SHELLFLAGSTATE sft = { 0 };
SHGetSettings(&sft, SSF_SHOWALLOBJECTS);
fbShowHidden = sft.fShowAllObjects;
#else
fbShowHidden = false;
#endif
fbArrangement = 2; // was 0
navRGBUnit = NavigatorUnit::PERCENT;
navHSVUnit = NavigatorUnit::PERCENT;
@ -930,9 +937,11 @@ void Options::readFromFile(Glib::ustring fname)
fbShowExpComp = keyFile.get_boolean("File Browser", "BrowserShowsExpComp");
}
#ifndef WIN32
if (keyFile.has_key("File Browser", "BrowserShowsHidden")) {
fbShowHidden = keyFile.get_boolean("File Browser", "BrowserShowsHidden");
}
#endif
if (keyFile.has_key("File Browser", "MaxPreviewHeight")) {
maxThumbnailHeight = keyFile.get_integer("File Browser", "MaxPreviewHeight");
@ -1887,7 +1896,9 @@ void Options::saveToFile(Glib::ustring fname)
keyFile.set_boolean("File Browser", "BrowserShowsDate", fbShowDateTime);
keyFile.set_boolean("File Browser", "BrowserShowsExif", fbShowBasicExif);
keyFile.set_boolean("File Browser", "BrowserShowsExpComp", fbShowExpComp);
#ifndef WIN32
keyFile.set_boolean("File Browser", "BrowserShowsHidden", fbShowHidden);
#endif
keyFile.set_integer("File Browser", "ThumbnailSize", thumbSize);
keyFile.set_integer("File Browser", "ThumbnailSizeTab", thumbSizeTab);
keyFile.set_integer("File Browser", "ThumbnailSizeQueue", thumbSizeQueue);

2
rtgui/sharpenmicro.cc
View File

@ -32,7 +32,7 @@ SharpenMicro::SharpenMicro () : FoldableToolPanel(this, "sharpenmicro", M("TP_SH
auto m = ProcEventMapper::getInstance();
EvSharpenMicroContrast = m->newEvent(SHARPENING, "HISTORY_MSG_MICROCONTRAST_CONTRAST");
contrast = Gtk::manage(new Adjuster (M("TP_SHARPENMICRO_CONTRAST"), 0, 100, 1, 20));
contrast = Gtk::manage(new Adjuster (M("TP_SHARPENMICRO_CONTRAST"), 0, 200, 1, 20));
contrast->setAdjusterListener (this);
contrast->show();