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 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - image/svg+xml - - - - - Maciej Dworak - - - - - - - - RawTherapee icon. - - - - - - - - - - - - - - - - - Select the desired element and apply one of the effects in the Filter Editor. You might need to ungroup the element before applying. For example to set the RT ring to have a colorful glow, you just need to select it and enable the "ring glow" or "ring shadow" effect. You can change the flood color of the "ring shadow" effect to make it white if you want to make the logo usable on a dark background. - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Raw - Therapee - - "Raw" font Eras-UltraBlk, 69px, -3px spacing between characters, skewed 2° to the right."Therapee" font Eras-Medium, 68px, 4px spacing between characters, skewed 2° to the right.Both have a dropshadow with an opacity of 0.40 and Gaussian blur standard deviation of 3.5. Eras font from "freefonts-0.10":ftp://ftp.gimp.org/pub/gimp/fonts/ RawTherapee logo design version 1.0 from 2014-01-16 | www.rawtherapee.com - - - - - - - - - - - - - - - - Object to path:This is what it should look like. - diff --git a/rtdata/images/non-themed/rt-splash.svg b/rtdata/images/non-themed/rt-splash.svg index 87b493153..46afaa0ba 100644 --- a/rtdata/images/non-themed/rt-splash.svg +++ b/rtdata/images/non-themed/rt-splash.svg @@ -17,41 +17,12 @@ id="svg783" inkscape:version="0.92.2 2405546, 2018-03-11" sodipodi:docname="rt-splash.svg" - inkscape:export-filename="/home/morgan/programs/code-rawtherapee/rtdata/images/non-themed/png/splash.png" + inkscape:export-filename="/tmp/splash.png" inkscape:export-xdpi="96" - inkscape:export-ydpi="96"> + inkscape:export-ydpi="96" + enable-background="new"> - - - - - - - @@ -106,16 +57,6 @@ offset="1" style="stop-color:#971ec6;stop-opacity:1" /> - - @@ -149,16 +80,6 @@ offset="1" style="stop-color:#1526c3;stop-opacity:1" /> - - @@ -192,16 +103,6 @@ offset="1" style="stop-color:#fc12aa;stop-opacity:1" /> - - - - - - - - - - - - - - - - - - - + - - + result="result91" + stdDeviation="13" + id="feGaussianBlur3582-4" /> + in2="result91" + id="feComposite3584-5" /> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + style="color-interpolation-filters:sRGB" + id="filter155" + inkscape:label="RawTherapee black" + x="-0.5" + y="-0.5" + height="2" + width="2"> + flood-color="rgb(0,0,0)" + result="flood" /> - - - - - - + operator="in" + result="composite1" /> + result="blur" /> + in="SourceGraphic" + operator="over" + result="composite2" /> + inkscape:window-maximized="1" + inkscape:measure-start="416.334,192.525" + inkscape:measure-end="422.317,192.368"> + + @@ -608,269 +580,58 @@ inkscape:groupmode="layer" id="layer1" transform="translate(0,-205.45415)"> + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Apply glow effects using filters. You might need to ungroup the circle elements before applying. You can change the flood color of the "ring shadow" effect to make it white if you want to make the logo usable on a dark background. For logo specifics, refer to rt_logo.svg "Raw": font ITC Eras Std Ultra, appears in Inkscape as ITC Eras Standard - Ultra-Bold, 60pt, -3px spacing between characters."Therapee": font ITC Eras Std Medium, appears in Inkscape as ITC Eras Standard - Medium, 60pt, +1px spacing between characters.Version: font ITC Eras Std Bold, appears in Inkscape as ITC Eras Standard - Bold, 64pt, skewed -3°. Each logo element has a filter effect (ring*). Additionally, the logo as a whole (all elements grouped) also has a filter effect (logo glow)."Raw": font Eras Ultra ITC, 60pt, -3px spacing between characters."Therapee": font Eras Medium ITC, 60pt, +1px spacing between characters.Version: font Eras Bold ITC, 64pt, skewed -3°. RawTherapee splash screen design version 1.1 from 2017-01-28 | www.rawtherapee.com + x="6.052238" + y="336.89627" + style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:2.82222223px;line-height:1.25;font-family:OxygenSans;-inkscape-font-specification:OxygenSans;letter-spacing:0.26807371px;fill:#ffcc00;fill-opacity:1;stroke-width:0.26807371">RawTherapee splash screen design version 1.2 from 2019-02-27 | www.rawtherapee.com Raw - Therapee - GNU GPLv3 - 5 - . 5 + style="font-size:3.96875px;line-height:1.25;stroke-width:0.26458338px;-inkscape-font-specification:'Eras Medium ITC';font-family:'Eras Medium ITC';font-weight:normal;font-style:normal;font-stretch:normal;font-variant:normal">GNU GPLv3 Release Candidate 1 + style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:17.06666565px;line-height:110.00000238%;font-family:'Eras Bold ITC';-inkscape-font-specification:'Eras Bold ITC Bold';text-align:end;letter-spacing:-1.06666672px;text-anchor:end;fill:#ffffff;stroke-width:1.06666672px">Release Candidate 1 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 5 + . 5 + Therapee + Raw + Therapee + Raw 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/rtgui/editwindow.cc b/rtgui/editwindow.cc index a5592e6da..30114c006 100644 --- a/rtgui/editwindow.cc +++ b/rtgui/editwindow.cc @@ -53,15 +53,7 @@ EditWindow* EditWindow::getInstance(RTWindow* p, bool restore) EditWindow::EditWindow (RTWindow* p) : parent(p) , isFullscreen(false), isClosed(true) { - Glib::ustring fName = "rawtherapee-logo-24.png"; - Glib::ustring fullPath = rtengine::findIconAbsolutePath(fName); - - try { - set_default_icon_from_file (fullPath); - } catch(Glib::Exception& ex) { - printf ("%s\n", ex.what().c_str()); - } - + set_default_icon(p->get_icon()); set_title_decorated(""); set_modal(false); set_resizable(true); @@ -69,16 +61,16 @@ EditWindow::EditWindow (RTWindow* p) : parent(p) , isFullscreen(false), isClosed 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/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();