diff --git a/rtdata/images/non-themed/rt-logo.svg b/rtdata/images/non-themed/rt-logo.svg
deleted file mode 100644
index b257e1eb2..000000000
--- a/rtdata/images/non-themed/rt-logo.svg
+++ /dev/null
@@ -1,1060 +0,0 @@
-
-
-
-
diff --git a/rtdata/images/non-themed/rt-splash.svg b/rtdata/images/non-themed/rt-splash.svg
index 15ba2532c..46afaa0ba 100644
--- a/rtdata/images/non-themed/rt-splash.svg
+++ b/rtdata/images/non-themed/rt-splash.svg
@@ -1,4 +1,6 @@
+
+
diff --git a/rtdata/languages/Deutsch b/rtdata/languages/Deutsch
index 6975587c7..847aaa1f6 100644
--- a/rtdata/languages/Deutsch
+++ b/rtdata/languages/Deutsch
@@ -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: -
! Untranslated keys follow; remove the ! prefix after an entry is translated.
!!!!!!!!!!!!!!!!!!!!!!!!!
-!TP_RAW_IMAGENUM_SN;SN mode
+TP_RAW_IMAGENUM_SN;SN-Modus
diff --git a/rtengine/camconst.json b/rtengine/camconst.json
index d609c7aed..4bb0746b5 100644
--- a/rtengine/camconst.json
+++ b/rtengine/camconst.json
@@ -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
diff --git a/rtengine/demosaic_algos.cc b/rtengine/demosaic_algos.cc
index 7339981e5..e8ab4fd5c 100644
--- a/rtengine/demosaic_algos.cc
+++ b/rtengine/demosaic_algos.cc
@@ -30,7 +30,7 @@
#include "sleef.c"
#include "opthelper.h"
#include "median.h"
-#define BENCHMARK
+//#define BENCHMARK
#include "StopWatch.h"
#ifdef _OPENMP
#include
diff --git a/rtgui/editwindow.cc b/rtgui/editwindow.cc
index 3a5a0378d..8ba829b26 100644
--- a/rtgui/editwindow.cc
+++ b/rtgui/editwindow.cc
@@ -63,16 +63,16 @@ EditWindow::EditWindow (RTWindow* p) : resolution(96.), parent(p) , isFullscreen
property_destroy_with_parent().set_value(false);
- mainNB = Gtk::manage (new Gtk::Notebook ());
- mainNB->set_scrollable (true);
- mainNB->signal_switch_page().connect_notify( sigc::mem_fun(*this, &EditWindow::on_mainNB_switch_page) );
+ mainNB = Gtk::manage(new Gtk::Notebook ());
+ mainNB->set_scrollable(true);
+ mainNB->signal_switch_page().connect_notify(sigc::mem_fun(*this, &EditWindow::on_mainNB_switch_page));
- signal_key_press_event().connect( sigc::mem_fun(*this, &EditWindow::keyPressed) );
+ signal_key_press_event().connect(sigc::mem_fun(*this, &EditWindow::keyPressed));
- Gtk::VBox* mainBox = Gtk::manage (new Gtk::VBox ());
- mainBox->pack_start (*mainNB);
+ Gtk::VBox* mainBox = Gtk::manage(new Gtk::VBox());
+ mainBox->pack_start(*mainNB);
- add (*mainBox);
+ add(*mainBox);
}
diff --git a/rtgui/options.cc b/rtgui/options.cc
index b7975ddfe..b38a9f689 100644
--- a/rtgui/options.cc
+++ b/rtgui/options.cc
@@ -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);
diff --git a/rtgui/sharpenmicro.cc b/rtgui/sharpenmicro.cc
index 8686b747b..971f9247a 100644
--- a/rtgui/sharpenmicro.cc
+++ b/rtgui/sharpenmicro.cc
@@ -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();