diff --git a/CMakeLists.txt b/CMakeLists.txt index 01865fcf7..490cfa7ca 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -266,10 +266,15 @@ endif() # Check for libraries: find_package(PkgConfig) +if(WIN32) +pkg_check_modules (GTK REQUIRED gtk+-3.0>=3.22.24) +pkg_check_modules (GTKMM REQUIRED gtkmm-3.0>=3.22) +else() pkg_check_modules (GTK REQUIRED gtk+-3.0>=3.16) +pkg_check_modules (GTKMM REQUIRED gtkmm-3.0>=3.16) +endif() pkg_check_modules (GLIB2 REQUIRED glib-2.0>=2.44) pkg_check_modules (GLIBMM REQUIRED glibmm-2.4>=2.44) -pkg_check_modules (GTKMM REQUIRED gtkmm-3.0>=3.16) pkg_check_modules (CAIROMM REQUIRED cairomm-1.0) pkg_check_modules (GIO REQUIRED gio-2.0>=2.44) pkg_check_modules (GIOMM REQUIRED giomm-2.4>=2.44) diff --git a/rtdata/dcpprofiles/NIKON D700.dcp b/rtdata/dcpprofiles/NIKON D700.dcp new file mode 100644 index 000000000..1ae994439 Binary files /dev/null and b/rtdata/dcpprofiles/NIKON D700.dcp differ diff --git a/rtdata/dcpprofiles/Nikon D700.dcp b/rtdata/dcpprofiles/Nikon D700.dcp deleted file mode 100644 index 969c6b964..000000000 Binary files a/rtdata/dcpprofiles/Nikon D700.dcp and /dev/null differ diff --git a/rtdata/languages/Catala b/rtdata/languages/Catala index 1e2127bd1..de98ba38f 100644 --- a/rtdata/languages/Catala +++ b/rtdata/languages/Catala @@ -1386,7 +1386,7 @@ ZOOMPANEL_ZOOMOUT;Allunya\nDrecera: - !PARTIALPASTE_RAWCACORR_CAREDBLUE;CA red & blue !PARTIALPASTE_RAW_IMAGENUM;Sub-image !PARTIALPASTE_RAW_LMMSEITERATIONS;LMMSE enhancement steps -!PARTIALPASTE_RAW_PIXELSHIFT;PixelShift +!PARTIALPASTE_RAW_PIXELSHIFT;Pixel Shift !PARTIALPASTE_RETINEX;Retinex !PARTIALPASTE_WAVELETGROUP;Wavelet Levels !PREFERENCES_AUTLISLOW;Low @@ -1512,7 +1512,7 @@ ZOOMPANEL_ZOOMOUT;Allunya\nDrecera: - !PROGRESSBAR_SNAPSHOT_ADDED;Snapshot added !QINFO_FRAMECOUNT;%2 frames !QINFO_HDR;HDR / %2 frame(s) -!QINFO_PIXELSHIFT;PixelShift / %2 frame(s) +!QINFO_PIXELSHIFT;Pixel Shift / %2 frame(s) !SAMPLEFORMAT_0;Unknown data format !SAMPLEFORMAT_1;Unsigned 8 bits !SAMPLEFORMAT_2;Unsigned 16 bits diff --git a/rtdata/languages/Chinese (Simplified) b/rtdata/languages/Chinese (Simplified) index 6c1e54685..581b70204 100644 --- a/rtdata/languages/Chinese (Simplified) +++ b/rtdata/languages/Chinese (Simplified) @@ -1494,7 +1494,7 @@ ZOOMPANEL_ZOOMOUT;缩放拉远\n快捷键: - !PROGRESSDLG_PROFILECHANGEDINBROWSER;Processing profile changed in browser !QINFO_FRAMECOUNT;%2 frames !QINFO_HDR;HDR / %2 frame(s) -!QINFO_PIXELSHIFT;PixelShift / %2 frame(s) +!QINFO_PIXELSHIFT;Pixel Shift / %2 frame(s) !SAMPLEFORMAT_0;Unknown data format !SAMPLEFORMAT_1;Unsigned 8 bits !SAMPLEFORMAT_2;Unsigned 16 bits diff --git a/rtdata/languages/Chinese (Traditional) b/rtdata/languages/Chinese (Traditional) index 10e5f974a..17a59937d 100644 --- a/rtdata/languages/Chinese (Traditional) +++ b/rtdata/languages/Chinese (Traditional) @@ -1110,7 +1110,7 @@ TP_WBALANCE_TEMPERATURE;色溫 !PARTIALPASTE_RAW_FALSECOLOR;False color suppression !PARTIALPASTE_RAW_IMAGENUM;Sub-image !PARTIALPASTE_RAW_LMMSEITERATIONS;LMMSE enhancement steps -!PARTIALPASTE_RAW_PIXELSHIFT;PixelShift +!PARTIALPASTE_RAW_PIXELSHIFT;Pixel Shift !PARTIALPASTE_RETINEX;Retinex !PARTIALPASTE_RGBCURVES;RGB curves !PARTIALPASTE_SHARPENEDGE;Edges @@ -1297,7 +1297,7 @@ TP_WBALANCE_TEMPERATURE;色溫 !PROGRESSDLG_PROFILECHANGEDINBROWSER;Processing profile changed in browser !QINFO_FRAMECOUNT;%2 frames !QINFO_HDR;HDR / %2 frame(s) -!QINFO_PIXELSHIFT;PixelShift / %2 frame(s) +!QINFO_PIXELSHIFT;Pixel Shift / %2 frame(s) !SAMPLEFORMAT_0;Unknown data format !SAMPLEFORMAT_1;Unsigned 8 bits !SAMPLEFORMAT_2;Unsigned 16 bits diff --git a/rtdata/languages/Czech b/rtdata/languages/Czech index 898ae93c2..7f3a68d00 100644 --- a/rtdata/languages/Czech +++ b/rtdata/languages/Czech @@ -2197,7 +2197,7 @@ ZOOMPANEL_ZOOMOUT;Oddálit\nZkratka: - !PREFERENCES_THEME;Theme !QINFO_FRAMECOUNT;%2 frames !QINFO_HDR;HDR / %2 frame(s) -!QINFO_PIXELSHIFT;PixelShift / %2 frame(s) +!QINFO_PIXELSHIFT;Pixel Shift / %2 frame(s) !SAMPLEFORMAT_0;Unknown data format !SAMPLEFORMAT_1;Unsigned 8 bits !SAMPLEFORMAT_2;Unsigned 16 bits diff --git a/rtdata/languages/Dansk b/rtdata/languages/Dansk index 3c6921967..99e2e212e 100644 --- a/rtdata/languages/Dansk +++ b/rtdata/languages/Dansk @@ -1108,7 +1108,7 @@ TP_WBALANCE_TEMPERATURE;Temperatur !PARTIALPASTE_RAW_FALSECOLOR;False color suppression !PARTIALPASTE_RAW_IMAGENUM;Sub-image !PARTIALPASTE_RAW_LMMSEITERATIONS;LMMSE enhancement steps -!PARTIALPASTE_RAW_PIXELSHIFT;PixelShift +!PARTIALPASTE_RAW_PIXELSHIFT;Pixel Shift !PARTIALPASTE_RETINEX;Retinex !PARTIALPASTE_RGBCURVES;RGB curves !PARTIALPASTE_SHARPENEDGE;Edges @@ -1295,7 +1295,7 @@ TP_WBALANCE_TEMPERATURE;Temperatur !PROGRESSDLG_PROFILECHANGEDINBROWSER;Processing profile changed in browser !QINFO_FRAMECOUNT;%2 frames !QINFO_HDR;HDR / %2 frame(s) -!QINFO_PIXELSHIFT;PixelShift / %2 frame(s) +!QINFO_PIXELSHIFT;Pixel Shift / %2 frame(s) !SAMPLEFORMAT_0;Unknown data format !SAMPLEFORMAT_1;Unsigned 8 bits !SAMPLEFORMAT_2;Unsigned 16 bits diff --git a/rtdata/languages/Deutsch b/rtdata/languages/Deutsch index aa72b5757..76dfb0a41 100644 --- a/rtdata/languages/Deutsch +++ b/rtdata/languages/Deutsch @@ -43,6 +43,8 @@ #42 13.05.2017 Erweiterung (TooWaBoo) RT 5.0 r1 #43 21.07.2017 Erweiterung (TooWaBoo) RT 5.1 #44 21.09.2017 Erweiterung (TooWaBoo) RT 5.2 +#45 15.10.2017 Erweiterung (TooWaBoo) RT 5.3 +#46 18.10.2017 Erweiterung (TooWaBoo) RT 5.3 ABOUT_TAB_BUILD;Version ABOUT_TAB_CREDITS;Danksagungen @@ -113,6 +115,7 @@ EXIFPANEL_RESET;Zurücksetzen EXIFPANEL_RESETALL;Alle zurücksetzen EXIFPANEL_RESETALLHINT;Alle Attribute auf die ursprünglichen Werte zurücksetzen EXIFPANEL_RESETHINT;Gewählte Attribute auf die ursprünglichen Werte zurücksetzen +EXIFPANEL_SHOWALL;Alle anzeigen EXIFPANEL_SUBDIRECTORY;Unterverzeichnis EXPORT_BYPASS;Verarbeitungsschritte überspringen EXPORT_BYPASS_ALL;Alle/Keine auswählen @@ -1044,6 +1047,7 @@ PREFERENCES_DATEFORMATHINT;Die folgenden Variablen können verwendet werden:\nAlt ZOOMPANEL_ZOOMFITSCREEN;An Bildschirm anpassen\nTaste: f ZOOMPANEL_ZOOMIN;Hineinzoomen\nTaste: + ZOOMPANEL_ZOOMOUT;Herauszoomen\nTaste: - - -!!!!!!!!!!!!!!!!!!!!!!!!! -! Untranslated keys follow; remove the ! prefix after an entry is translated. -!!!!!!!!!!!!!!!!!!!!!!!!! - -!EXIFPANEL_SHOWALL;Show all -!QINFO_FRAMECOUNT;%2 frames -!QINFO_HDR;HDR / %2 frame(s) -!QINFO_PIXELSHIFT;PixelShift / %2 frame(s) -!SAMPLEFORMAT_0;Unknown data format -!SAMPLEFORMAT_1;Unsigned 8 bits -!SAMPLEFORMAT_2;Unsigned 16 bits -!SAMPLEFORMAT_4;LogLuv 24 bits -!SAMPLEFORMAT_8;LogLuv 32 bits -!SAMPLEFORMAT_16;32 bits floating point diff --git a/rtdata/languages/English (UK) b/rtdata/languages/English (UK) index 165b3de80..4dba02c5a 100644 --- a/rtdata/languages/English (UK) +++ b/rtdata/languages/English (UK) @@ -990,7 +990,7 @@ TP_WBALANCE_EQBLUERED_TOOLTIP;Allows to deviate from the normal behaviour of "wh !PARTIALPASTE_RAW_DMETHOD;Demosaic method !PARTIALPASTE_RAW_IMAGENUM;Sub-image !PARTIALPASTE_RAW_LMMSEITERATIONS;LMMSE enhancement steps -!PARTIALPASTE_RAW_PIXELSHIFT;PixelShift +!PARTIALPASTE_RAW_PIXELSHIFT;Pixel Shift !PARTIALPASTE_RESIZE;Resize !PARTIALPASTE_RETINEX;Retinex !PARTIALPASTE_RGBCURVES;RGB curves @@ -1247,7 +1247,7 @@ TP_WBALANCE_EQBLUERED_TOOLTIP;Allows to deviate from the normal behaviour of "wh !QINFO_HDR;HDR / %2 frame(s) !QINFO_ISO;ISO !QINFO_NOEXIF;Exif data not available. -!QINFO_PIXELSHIFT;PixelShift / %2 frame(s) +!QINFO_PIXELSHIFT;Pixel Shift / %2 frame(s) !SAMPLEFORMAT_0;Unknown data format !SAMPLEFORMAT_1;Unsigned 8 bits !SAMPLEFORMAT_2;Unsigned 16 bits diff --git a/rtdata/languages/English (US) b/rtdata/languages/English (US) index 25054bd30..34e5cc42e 100644 --- a/rtdata/languages/English (US) +++ b/rtdata/languages/English (US) @@ -917,7 +917,7 @@ !PARTIALPASTE_RAW_FALSECOLOR;False color suppression !PARTIALPASTE_RAW_IMAGENUM;Sub-image !PARTIALPASTE_RAW_LMMSEITERATIONS;LMMSE enhancement steps -!PARTIALPASTE_RAW_PIXELSHIFT;PixelShift +!PARTIALPASTE_RAW_PIXELSHIFT;Pixel Shift !PARTIALPASTE_RESIZE;Resize !PARTIALPASTE_RETINEX;Retinex !PARTIALPASTE_RGBCURVES;RGB curves @@ -1186,7 +1186,7 @@ !QINFO_HDR;HDR / %2 frame(s) !QINFO_ISO;ISO !QINFO_NOEXIF;Exif data not available. -!QINFO_PIXELSHIFT;PixelShift / %2 frame(s) +!QINFO_PIXELSHIFT;Pixel Shift / %2 frame(s) !SAMPLEFORMAT_0;Unknown data format !SAMPLEFORMAT_1;Unsigned 8 bits !SAMPLEFORMAT_2;Unsigned 16 bits diff --git a/rtdata/languages/Espanol b/rtdata/languages/Espanol index 8a83535b1..8dc5164bc 100644 --- a/rtdata/languages/Espanol +++ b/rtdata/languages/Espanol @@ -1760,7 +1760,7 @@ ZOOMPANEL_ZOOMOUT;Reducir Zoom\nAtajo: - !PARTIALPASTE_PRSHARPENING;Post-resize sharpening !PARTIALPASTE_RAWCACORR_CAREDBLUE;CA red & blue !PARTIALPASTE_RAW_IMAGENUM;Sub-image -!PARTIALPASTE_RAW_PIXELSHIFT;PixelShift +!PARTIALPASTE_RAW_PIXELSHIFT;Pixel Shift !PARTIALPASTE_RETINEX;Retinex !PARTIALPASTE_WAVELETGROUP;Wavelet Levels !PREFERENCES_AUTLISLOW;Low @@ -1844,7 +1844,7 @@ ZOOMPANEL_ZOOMOUT;Reducir Zoom\nAtajo: - !PROFILEPANEL_PDYNAMIC;Dynamic !QINFO_FRAMECOUNT;%2 frames !QINFO_HDR;HDR / %2 frame(s) -!QINFO_PIXELSHIFT;PixelShift / %2 frame(s) +!QINFO_PIXELSHIFT;Pixel Shift / %2 frame(s) !SAMPLEFORMAT_0;Unknown data format !SAMPLEFORMAT_1;Unsigned 8 bits !SAMPLEFORMAT_2;Unsigned 16 bits diff --git a/rtdata/languages/Euskara b/rtdata/languages/Euskara index dd3e410ed..d0e6465a8 100644 --- a/rtdata/languages/Euskara +++ b/rtdata/languages/Euskara @@ -1108,7 +1108,7 @@ TP_WBALANCE_TEMPERATURE;Tenperatura !PARTIALPASTE_RAW_FALSECOLOR;False color suppression !PARTIALPASTE_RAW_IMAGENUM;Sub-image !PARTIALPASTE_RAW_LMMSEITERATIONS;LMMSE enhancement steps -!PARTIALPASTE_RAW_PIXELSHIFT;PixelShift +!PARTIALPASTE_RAW_PIXELSHIFT;Pixel Shift !PARTIALPASTE_RETINEX;Retinex !PARTIALPASTE_RGBCURVES;RGB curves !PARTIALPASTE_SHARPENEDGE;Edges @@ -1295,7 +1295,7 @@ TP_WBALANCE_TEMPERATURE;Tenperatura !PROGRESSDLG_PROFILECHANGEDINBROWSER;Processing profile changed in browser !QINFO_FRAMECOUNT;%2 frames !QINFO_HDR;HDR / %2 frame(s) -!QINFO_PIXELSHIFT;PixelShift / %2 frame(s) +!QINFO_PIXELSHIFT;Pixel Shift / %2 frame(s) !SAMPLEFORMAT_0;Unknown data format !SAMPLEFORMAT_1;Unsigned 8 bits !SAMPLEFORMAT_2;Unsigned 16 bits diff --git a/rtdata/languages/Francais b/rtdata/languages/Francais index 001304c35..c39d9f5e5 100644 --- a/rtdata/languages/Francais +++ b/rtdata/languages/Francais @@ -955,7 +955,6 @@ PREFERENCES_D50;5000K PREFERENCES_D55;5500K PREFERENCES_D60;6000K PREFERENCES_D65;6500K -PREFERENCES_DARKFRAME;Soustraction de Trame Noire PREFERENCES_DARKFRAMEFOUND;Trouvé PREFERENCES_DARKFRAMESHOTS;image(s) PREFERENCES_DARKFRAMETEMPLATES;modèle(s) @@ -964,6 +963,7 @@ PREFERENCES_DATEFORMATHINT;Vous pouvez utiliser les paramètres de chaînes f PREFERENCES_DAUB_LABEL;Utiliser les ondelettes de Daubechies D6 au lieu de D4 PREFERENCES_DAUB_TOOLTIP;Les outils de Réduction de Bruit et de Niveaux d'Ondelettes utilisent une ondelette de Debauchie mère. Si vous choisissez D6 au lieu de D4 vous augmentez le nombre de coéf. orthogonaux de Daubechies et augmentez probablement la qualité des niveaux de taille moyenne. Il n'y a pas de différence de consommation mémoire ou de temps de traitement entre les deux. PREFERENCES_DIRDARKFRAMES;Dossier des images de Trame Noire +PREFERENCES_DIRECTORIES;Dossiers PREFERENCES_DIRHOME;Racine de mes documents personnels PREFERENCES_DIRLAST;Dernier dossier visité PREFERENCES_DIROTHER;Autre @@ -976,8 +976,6 @@ PREFERENCES_EXTERNALEDITOR;Éditeur externe PREFERENCES_FBROWSEROPTS;Options du navigateur de fichiers et de vignettes PREFERENCES_FILEBROWSERTOOLBARSINGLEROW;Barre de menu de l'explorateur de fichiers uni-ligne\n(à désactiver pour les écrans de faible résolution) PREFERENCES_FILEFORMAT;Format du fichier -PREFERENCES_FILMSIMULATION;Simulation de Film -PREFERENCES_FLATFIELD;Champ Uniforme PREFERENCES_FLATFIELDFOUND;Trouvé PREFERENCES_FLATFIELDSDIR;Dossier des images de Champ Uniforme PREFERENCES_FLATFIELDSHOTS;image(s) diff --git a/rtdata/languages/Greek b/rtdata/languages/Greek index f41040577..b6fbebcd8 100644 --- a/rtdata/languages/Greek +++ b/rtdata/languages/Greek @@ -1107,7 +1107,7 @@ TP_WBALANCE_TEMPERATURE;Θερμοκρασία !PARTIALPASTE_RAW_FALSECOLOR;False color suppression !PARTIALPASTE_RAW_IMAGENUM;Sub-image !PARTIALPASTE_RAW_LMMSEITERATIONS;LMMSE enhancement steps -!PARTIALPASTE_RAW_PIXELSHIFT;PixelShift +!PARTIALPASTE_RAW_PIXELSHIFT;Pixel Shift !PARTIALPASTE_RETINEX;Retinex !PARTIALPASTE_RGBCURVES;RGB curves !PARTIALPASTE_SHARPENEDGE;Edges @@ -1294,7 +1294,7 @@ TP_WBALANCE_TEMPERATURE;Θερμοκρασία !PROGRESSDLG_PROFILECHANGEDINBROWSER;Processing profile changed in browser !QINFO_FRAMECOUNT;%2 frames !QINFO_HDR;HDR / %2 frame(s) -!QINFO_PIXELSHIFT;PixelShift / %2 frame(s) +!QINFO_PIXELSHIFT;Pixel Shift / %2 frame(s) !SAMPLEFORMAT_0;Unknown data format !SAMPLEFORMAT_1;Unsigned 8 bits !SAMPLEFORMAT_2;Unsigned 16 bits diff --git a/rtdata/languages/Hebrew b/rtdata/languages/Hebrew index 346a39cdc..f41258e06 100644 --- a/rtdata/languages/Hebrew +++ b/rtdata/languages/Hebrew @@ -1108,7 +1108,7 @@ TP_WBALANCE_TEMPERATURE;מידת חום !PARTIALPASTE_RAW_FALSECOLOR;False color suppression !PARTIALPASTE_RAW_IMAGENUM;Sub-image !PARTIALPASTE_RAW_LMMSEITERATIONS;LMMSE enhancement steps -!PARTIALPASTE_RAW_PIXELSHIFT;PixelShift +!PARTIALPASTE_RAW_PIXELSHIFT;Pixel Shift !PARTIALPASTE_RETINEX;Retinex !PARTIALPASTE_RGBCURVES;RGB curves !PARTIALPASTE_SHARPENEDGE;Edges @@ -1295,7 +1295,7 @@ TP_WBALANCE_TEMPERATURE;מידת חום !PROGRESSDLG_PROFILECHANGEDINBROWSER;Processing profile changed in browser !QINFO_FRAMECOUNT;%2 frames !QINFO_HDR;HDR / %2 frame(s) -!QINFO_PIXELSHIFT;PixelShift / %2 frame(s) +!QINFO_PIXELSHIFT;Pixel Shift / %2 frame(s) !SAMPLEFORMAT_0;Unknown data format !SAMPLEFORMAT_1;Unsigned 8 bits !SAMPLEFORMAT_2;Unsigned 16 bits diff --git a/rtdata/languages/Italiano b/rtdata/languages/Italiano index 4101355c0..90cc5e2c2 100644 --- a/rtdata/languages/Italiano +++ b/rtdata/languages/Italiano @@ -1629,7 +1629,7 @@ ZOOMPANEL_ZOOMOUT;Rimpicciolisci.\nScorciatoia: - !PARTIALPASTE_PRSHARPENING;Post-resize sharpening !PARTIALPASTE_RAWCACORR_CAREDBLUE;CA red & blue !PARTIALPASTE_RAW_IMAGENUM;Sub-image -!PARTIALPASTE_RAW_PIXELSHIFT;PixelShift +!PARTIALPASTE_RAW_PIXELSHIFT;Pixel Shift !PARTIALPASTE_RETINEX;Retinex !PARTIALPASTE_WAVELETGROUP;Wavelet Levels !PREFERENCES_AUTLISLOW;Low @@ -1715,7 +1715,7 @@ ZOOMPANEL_ZOOMOUT;Rimpicciolisci.\nScorciatoia: - !PROFILEPANEL_PDYNAMIC;Dynamic !QINFO_FRAMECOUNT;%2 frames !QINFO_HDR;HDR / %2 frame(s) -!QINFO_PIXELSHIFT;PixelShift / %2 frame(s) +!QINFO_PIXELSHIFT;Pixel Shift / %2 frame(s) !SAMPLEFORMAT_0;Unknown data format !SAMPLEFORMAT_1;Unsigned 8 bits !SAMPLEFORMAT_2;Unsigned 16 bits diff --git a/rtdata/languages/Japanese b/rtdata/languages/Japanese index 787b5dfe6..5f9f026f7 100644 --- a/rtdata/languages/Japanese +++ b/rtdata/languages/Japanese @@ -1998,7 +1998,7 @@ ZOOMPANEL_ZOOMOUT;ズームアウト\nショートカット: - !PARTIALPASTE_PRSHARPENING;Post-resize sharpening !PARTIALPASTE_RAWCACORR_CAREDBLUE;CA red & blue !PARTIALPASTE_RAW_IMAGENUM;Sub-image -!PARTIALPASTE_RAW_PIXELSHIFT;PixelShift +!PARTIALPASTE_RAW_PIXELSHIFT;Pixel Shift !PARTIALPASTE_RETINEX;Retinex !PREFERENCES_AUTOSAVE_TP_OPEN;Automatically save tools collapsed/expanded\nstate before exiting !PREFERENCES_CMMBPC;Black point compensation @@ -2025,7 +2025,7 @@ ZOOMPANEL_ZOOMOUT;ズームアウト\nショートカット: - !PROFILEPANEL_PDYNAMIC;Dynamic !QINFO_FRAMECOUNT;%2 frames !QINFO_HDR;HDR / %2 frame(s) -!QINFO_PIXELSHIFT;PixelShift / %2 frame(s) +!QINFO_PIXELSHIFT;Pixel Shift / %2 frame(s) !SAMPLEFORMAT_0;Unknown data format !SAMPLEFORMAT_1;Unsigned 8 bits !SAMPLEFORMAT_2;Unsigned 16 bits diff --git a/rtdata/languages/Latvian b/rtdata/languages/Latvian index 8dc2dc670..34200732f 100644 --- a/rtdata/languages/Latvian +++ b/rtdata/languages/Latvian @@ -1108,7 +1108,7 @@ TP_WBALANCE_TEMPERATURE;Temperatūra !PARTIALPASTE_RAW_FALSECOLOR;False color suppression !PARTIALPASTE_RAW_IMAGENUM;Sub-image !PARTIALPASTE_RAW_LMMSEITERATIONS;LMMSE enhancement steps -!PARTIALPASTE_RAW_PIXELSHIFT;PixelShift +!PARTIALPASTE_RAW_PIXELSHIFT;Pixel Shift !PARTIALPASTE_RETINEX;Retinex !PARTIALPASTE_RGBCURVES;RGB curves !PARTIALPASTE_SHARPENEDGE;Edges @@ -1295,7 +1295,7 @@ TP_WBALANCE_TEMPERATURE;Temperatūra !PROGRESSDLG_PROFILECHANGEDINBROWSER;Processing profile changed in browser !QINFO_FRAMECOUNT;%2 frames !QINFO_HDR;HDR / %2 frame(s) -!QINFO_PIXELSHIFT;PixelShift / %2 frame(s) +!QINFO_PIXELSHIFT;Pixel Shift / %2 frame(s) !SAMPLEFORMAT_0;Unknown data format !SAMPLEFORMAT_1;Unsigned 8 bits !SAMPLEFORMAT_2;Unsigned 16 bits diff --git a/rtdata/languages/Magyar b/rtdata/languages/Magyar index d98d6e29c..e53dcdb6f 100644 --- a/rtdata/languages/Magyar +++ b/rtdata/languages/Magyar @@ -1322,7 +1322,7 @@ ZOOMPANEL_ZOOMOUT;Kicsinyítés - !PARTIALPASTE_RAWCACORR_CAREDBLUE;CA red & blue !PARTIALPASTE_RAW_IMAGENUM;Sub-image !PARTIALPASTE_RAW_LMMSEITERATIONS;LMMSE enhancement steps -!PARTIALPASTE_RAW_PIXELSHIFT;PixelShift +!PARTIALPASTE_RAW_PIXELSHIFT;Pixel Shift !PARTIALPASTE_RETINEX;Retinex !PARTIALPASTE_WAVELETGROUP;Wavelet Levels !PREFERENCES_AUTLISLOW;Low @@ -1450,7 +1450,7 @@ ZOOMPANEL_ZOOMOUT;Kicsinyítés - !PROGRESSBAR_SNAPSHOT_ADDED;Snapshot added !QINFO_FRAMECOUNT;%2 frames !QINFO_HDR;HDR / %2 frame(s) -!QINFO_PIXELSHIFT;PixelShift / %2 frame(s) +!QINFO_PIXELSHIFT;Pixel Shift / %2 frame(s) !SAMPLEFORMAT_0;Unknown data format !SAMPLEFORMAT_1;Unsigned 8 bits !SAMPLEFORMAT_2;Unsigned 16 bits diff --git a/rtdata/languages/Nederlands b/rtdata/languages/Nederlands index 754ba1573..3ae4a958a 100644 --- a/rtdata/languages/Nederlands +++ b/rtdata/languages/Nederlands @@ -2172,7 +2172,7 @@ ZOOMPANEL_ZOOMOUT;Zoom uit\nSneltoets: - !PREFERENCES_THEME;Theme !QINFO_FRAMECOUNT;%2 frames !QINFO_HDR;HDR / %2 frame(s) -!QINFO_PIXELSHIFT;PixelShift / %2 frame(s) +!QINFO_PIXELSHIFT;Pixel Shift / %2 frame(s) !SAMPLEFORMAT_0;Unknown data format !SAMPLEFORMAT_1;Unsigned 8 bits !SAMPLEFORMAT_2;Unsigned 16 bits diff --git a/rtdata/languages/Norsk BM b/rtdata/languages/Norsk BM index c270541d8..3f44a7372 100644 --- a/rtdata/languages/Norsk BM +++ b/rtdata/languages/Norsk BM @@ -1107,7 +1107,7 @@ TP_WBALANCE_TEMPERATURE;Temperatur !PARTIALPASTE_RAW_FALSECOLOR;False color suppression !PARTIALPASTE_RAW_IMAGENUM;Sub-image !PARTIALPASTE_RAW_LMMSEITERATIONS;LMMSE enhancement steps -!PARTIALPASTE_RAW_PIXELSHIFT;PixelShift +!PARTIALPASTE_RAW_PIXELSHIFT;Pixel Shift !PARTIALPASTE_RETINEX;Retinex !PARTIALPASTE_RGBCURVES;RGB curves !PARTIALPASTE_SHARPENEDGE;Edges @@ -1294,7 +1294,7 @@ TP_WBALANCE_TEMPERATURE;Temperatur !PROGRESSDLG_PROFILECHANGEDINBROWSER;Processing profile changed in browser !QINFO_FRAMECOUNT;%2 frames !QINFO_HDR;HDR / %2 frame(s) -!QINFO_PIXELSHIFT;PixelShift / %2 frame(s) +!QINFO_PIXELSHIFT;Pixel Shift / %2 frame(s) !SAMPLEFORMAT_0;Unknown data format !SAMPLEFORMAT_1;Unsigned 8 bits !SAMPLEFORMAT_2;Unsigned 16 bits diff --git a/rtdata/languages/Polish b/rtdata/languages/Polish index 7845247dc..ad7809224 100644 --- a/rtdata/languages/Polish +++ b/rtdata/languages/Polish @@ -1708,7 +1708,7 @@ ZOOMPANEL_ZOOMOUT;Oddal\nSkrót: - !PARTIALPASTE_PRSHARPENING;Post-resize sharpening !PARTIALPASTE_RAWCACORR_CAREDBLUE;CA red & blue !PARTIALPASTE_RAW_IMAGENUM;Sub-image -!PARTIALPASTE_RAW_PIXELSHIFT;PixelShift +!PARTIALPASTE_RAW_PIXELSHIFT;Pixel Shift !PARTIALPASTE_RETINEX;Retinex !PARTIALPASTE_WAVELETGROUP;Wavelet Levels !PREFERENCES_AUTLISLOW;Low @@ -1792,7 +1792,7 @@ ZOOMPANEL_ZOOMOUT;Oddal\nSkrót: - !PROFILEPANEL_PDYNAMIC;Dynamic !QINFO_FRAMECOUNT;%2 frames !QINFO_HDR;HDR / %2 frame(s) -!QINFO_PIXELSHIFT;PixelShift / %2 frame(s) +!QINFO_PIXELSHIFT;Pixel Shift / %2 frame(s) !SAMPLEFORMAT_0;Unknown data format !SAMPLEFORMAT_1;Unsigned 8 bits !SAMPLEFORMAT_2;Unsigned 16 bits diff --git a/rtdata/languages/Polish (Latin Characters) b/rtdata/languages/Polish (Latin Characters) index 978fa96cf..8dca28f01 100644 --- a/rtdata/languages/Polish (Latin Characters) +++ b/rtdata/languages/Polish (Latin Characters) @@ -1708,7 +1708,7 @@ ZOOMPANEL_ZOOMOUT;Oddal\nSkrot: - !PARTIALPASTE_PRSHARPENING;Post-resize sharpening !PARTIALPASTE_RAWCACORR_CAREDBLUE;CA red & blue !PARTIALPASTE_RAW_IMAGENUM;Sub-image -!PARTIALPASTE_RAW_PIXELSHIFT;PixelShift +!PARTIALPASTE_RAW_PIXELSHIFT;Pixel Shift !PARTIALPASTE_RETINEX;Retinex !PARTIALPASTE_WAVELETGROUP;Wavelet Levels !PREFERENCES_AUTLISLOW;Low @@ -1792,7 +1792,7 @@ ZOOMPANEL_ZOOMOUT;Oddal\nSkrot: - !PROFILEPANEL_PDYNAMIC;Dynamic !QINFO_FRAMECOUNT;%2 frames !QINFO_HDR;HDR / %2 frame(s) -!QINFO_PIXELSHIFT;PixelShift / %2 frame(s) +!QINFO_PIXELSHIFT;Pixel Shift / %2 frame(s) !SAMPLEFORMAT_0;Unknown data format !SAMPLEFORMAT_1;Unsigned 8 bits !SAMPLEFORMAT_2;Unsigned 16 bits diff --git a/rtdata/languages/Portugues (Brasil) b/rtdata/languages/Portugues (Brasil) index 102f6ac89..71c424e7a 100644 --- a/rtdata/languages/Portugues (Brasil) +++ b/rtdata/languages/Portugues (Brasil) @@ -1108,7 +1108,7 @@ TP_WBALANCE_TEMPERATURE;Temperatura !PARTIALPASTE_RAW_FALSECOLOR;False color suppression !PARTIALPASTE_RAW_IMAGENUM;Sub-image !PARTIALPASTE_RAW_LMMSEITERATIONS;LMMSE enhancement steps -!PARTIALPASTE_RAW_PIXELSHIFT;PixelShift +!PARTIALPASTE_RAW_PIXELSHIFT;Pixel Shift !PARTIALPASTE_RETINEX;Retinex !PARTIALPASTE_RGBCURVES;RGB curves !PARTIALPASTE_SHARPENEDGE;Edges @@ -1295,7 +1295,7 @@ TP_WBALANCE_TEMPERATURE;Temperatura !PROGRESSDLG_PROFILECHANGEDINBROWSER;Processing profile changed in browser !QINFO_FRAMECOUNT;%2 frames !QINFO_HDR;HDR / %2 frame(s) -!QINFO_PIXELSHIFT;PixelShift / %2 frame(s) +!QINFO_PIXELSHIFT;Pixel Shift / %2 frame(s) !SAMPLEFORMAT_0;Unknown data format !SAMPLEFORMAT_1;Unsigned 8 bits !SAMPLEFORMAT_2;Unsigned 16 bits diff --git a/rtdata/languages/Russian b/rtdata/languages/Russian index 908bc03df..900f640ce 100644 --- a/rtdata/languages/Russian +++ b/rtdata/languages/Russian @@ -1583,7 +1583,7 @@ ZOOMPANEL_ZOOMOUT;Удалить - !PARTIALPASTE_PRSHARPENING;Post-resize sharpening !PARTIALPASTE_RAWCACORR_CAREDBLUE;CA red & blue !PARTIALPASTE_RAW_IMAGENUM;Sub-image -!PARTIALPASTE_RAW_PIXELSHIFT;PixelShift +!PARTIALPASTE_RAW_PIXELSHIFT;Pixel Shift !PARTIALPASTE_RETINEX;Retinex !PARTIALPASTE_WAVELETGROUP;Wavelet Levels !PREFERENCES_AUTLISLOW;Low @@ -1672,7 +1672,7 @@ ZOOMPANEL_ZOOMOUT;Удалить - !PROFILEPANEL_PDYNAMIC;Dynamic !QINFO_FRAMECOUNT;%2 frames !QINFO_HDR;HDR / %2 frame(s) -!QINFO_PIXELSHIFT;PixelShift / %2 frame(s) +!QINFO_PIXELSHIFT;Pixel Shift / %2 frame(s) !SAMPLEFORMAT_0;Unknown data format !SAMPLEFORMAT_1;Unsigned 8 bits !SAMPLEFORMAT_2;Unsigned 16 bits diff --git a/rtdata/languages/Serbian (Cyrilic Characters) b/rtdata/languages/Serbian (Cyrilic Characters) index 76c8d8693..844e6852b 100644 --- a/rtdata/languages/Serbian (Cyrilic Characters) +++ b/rtdata/languages/Serbian (Cyrilic Characters) @@ -1615,7 +1615,7 @@ ZOOMPANEL_ZOOMOUT;Умањује приказ слике - !PARTIALPASTE_PRSHARPENING;Post-resize sharpening !PARTIALPASTE_RAWCACORR_CAREDBLUE;CA red & blue !PARTIALPASTE_RAW_IMAGENUM;Sub-image -!PARTIALPASTE_RAW_PIXELSHIFT;PixelShift +!PARTIALPASTE_RAW_PIXELSHIFT;Pixel Shift !PARTIALPASTE_RETINEX;Retinex !PARTIALPASTE_WAVELETGROUP;Wavelet Levels !PREFERENCES_AUTLISLOW;Low @@ -1703,7 +1703,7 @@ ZOOMPANEL_ZOOMOUT;Умањује приказ слике - !PROFILEPANEL_PDYNAMIC;Dynamic !QINFO_FRAMECOUNT;%2 frames !QINFO_HDR;HDR / %2 frame(s) -!QINFO_PIXELSHIFT;PixelShift / %2 frame(s) +!QINFO_PIXELSHIFT;Pixel Shift / %2 frame(s) !SAMPLEFORMAT_0;Unknown data format !SAMPLEFORMAT_1;Unsigned 8 bits !SAMPLEFORMAT_2;Unsigned 16 bits diff --git a/rtdata/languages/Serbian (Latin Characters) b/rtdata/languages/Serbian (Latin Characters) index 603526a14..744b1d318 100644 --- a/rtdata/languages/Serbian (Latin Characters) +++ b/rtdata/languages/Serbian (Latin Characters) @@ -1615,7 +1615,7 @@ ZOOMPANEL_ZOOMOUT;Umanjuje prikaz slike - !PARTIALPASTE_PRSHARPENING;Post-resize sharpening !PARTIALPASTE_RAWCACORR_CAREDBLUE;CA red & blue !PARTIALPASTE_RAW_IMAGENUM;Sub-image -!PARTIALPASTE_RAW_PIXELSHIFT;PixelShift +!PARTIALPASTE_RAW_PIXELSHIFT;Pixel Shift !PARTIALPASTE_RETINEX;Retinex !PARTIALPASTE_WAVELETGROUP;Wavelet Levels !PREFERENCES_AUTLISLOW;Low @@ -1703,7 +1703,7 @@ ZOOMPANEL_ZOOMOUT;Umanjuje prikaz slike - !PROFILEPANEL_PDYNAMIC;Dynamic !QINFO_FRAMECOUNT;%2 frames !QINFO_HDR;HDR / %2 frame(s) -!QINFO_PIXELSHIFT;PixelShift / %2 frame(s) +!QINFO_PIXELSHIFT;Pixel Shift / %2 frame(s) !SAMPLEFORMAT_0;Unknown data format !SAMPLEFORMAT_1;Unsigned 8 bits !SAMPLEFORMAT_2;Unsigned 16 bits diff --git a/rtdata/languages/Slovak b/rtdata/languages/Slovak index 6bacd9d7e..9c107a499 100644 --- a/rtdata/languages/Slovak +++ b/rtdata/languages/Slovak @@ -1161,7 +1161,7 @@ ZOOMPANEL_ZOOMOUT;Oddialiť - !PARTIALPASTE_RAW_FALSECOLOR;False color suppression !PARTIALPASTE_RAW_IMAGENUM;Sub-image !PARTIALPASTE_RAW_LMMSEITERATIONS;LMMSE enhancement steps -!PARTIALPASTE_RAW_PIXELSHIFT;PixelShift +!PARTIALPASTE_RAW_PIXELSHIFT;Pixel Shift !PARTIALPASTE_RETINEX;Retinex !PARTIALPASTE_RGBCURVES;RGB curves !PARTIALPASTE_SHARPENEDGE;Edges @@ -1336,7 +1336,7 @@ ZOOMPANEL_ZOOMOUT;Oddialiť - !PROGRESSBAR_SNAPSHOT_ADDED;Snapshot added !QINFO_FRAMECOUNT;%2 frames !QINFO_HDR;HDR / %2 frame(s) -!QINFO_PIXELSHIFT;PixelShift / %2 frame(s) +!QINFO_PIXELSHIFT;Pixel Shift / %2 frame(s) !SAMPLEFORMAT_0;Unknown data format !SAMPLEFORMAT_1;Unsigned 8 bits !SAMPLEFORMAT_2;Unsigned 16 bits diff --git a/rtdata/languages/Suomi b/rtdata/languages/Suomi index 413144a76..76d1531e2 100644 --- a/rtdata/languages/Suomi +++ b/rtdata/languages/Suomi @@ -1109,7 +1109,7 @@ TP_WBALANCE_TEMPERATURE;Lämpötila [K] !PARTIALPASTE_RAW_FALSECOLOR;False color suppression !PARTIALPASTE_RAW_IMAGENUM;Sub-image !PARTIALPASTE_RAW_LMMSEITERATIONS;LMMSE enhancement steps -!PARTIALPASTE_RAW_PIXELSHIFT;PixelShift +!PARTIALPASTE_RAW_PIXELSHIFT;Pixel Shift !PARTIALPASTE_RETINEX;Retinex !PARTIALPASTE_RGBCURVES;RGB curves !PARTIALPASTE_SHARPENEDGE;Edges @@ -1296,7 +1296,7 @@ TP_WBALANCE_TEMPERATURE;Lämpötila [K] !PROGRESSDLG_PROFILECHANGEDINBROWSER;Processing profile changed in browser !QINFO_FRAMECOUNT;%2 frames !QINFO_HDR;HDR / %2 frame(s) -!QINFO_PIXELSHIFT;PixelShift / %2 frame(s) +!QINFO_PIXELSHIFT;Pixel Shift / %2 frame(s) !SAMPLEFORMAT_0;Unknown data format !SAMPLEFORMAT_1;Unsigned 8 bits !SAMPLEFORMAT_2;Unsigned 16 bits diff --git a/rtdata/languages/Swedish b/rtdata/languages/Swedish index cc459eaa1..b5ec9dc65 100644 --- a/rtdata/languages/Swedish +++ b/rtdata/languages/Swedish @@ -1990,7 +1990,7 @@ ZOOMPANEL_ZOOMOUT;Förminska.\nKortkommando: - !PARTIALPASTE_FLATFIELDCLIPCONTROL;Flat-field clip control !PARTIALPASTE_RAWCACORR_CAREDBLUE;CA red & blue !PARTIALPASTE_RAW_IMAGENUM;Sub-image -!PARTIALPASTE_RAW_PIXELSHIFT;PixelShift +!PARTIALPASTE_RAW_PIXELSHIFT;Pixel Shift !PREFERENCES_AUTOSAVE_TP_OPEN;Automatically save tools collapsed/expanded\nstate before exiting !PREFERENCES_CMMBPC;Black point compensation !PREFERENCES_D50_OLD;5000K @@ -2014,7 +2014,7 @@ ZOOMPANEL_ZOOMOUT;Förminska.\nKortkommando: - !PROFILEPANEL_PDYNAMIC;Dynamic !QINFO_FRAMECOUNT;%2 frames !QINFO_HDR;HDR / %2 frame(s) -!QINFO_PIXELSHIFT;PixelShift / %2 frame(s) +!QINFO_PIXELSHIFT;Pixel Shift / %2 frame(s) !SAMPLEFORMAT_0;Unknown data format !SAMPLEFORMAT_1;Unsigned 8 bits !SAMPLEFORMAT_2;Unsigned 16 bits diff --git a/rtdata/languages/Turkish b/rtdata/languages/Turkish index 5c98df27d..590f65161 100644 --- a/rtdata/languages/Turkish +++ b/rtdata/languages/Turkish @@ -1108,7 +1108,7 @@ TP_WBALANCE_TEMPERATURE;Isı !PARTIALPASTE_RAW_FALSECOLOR;False color suppression !PARTIALPASTE_RAW_IMAGENUM;Sub-image !PARTIALPASTE_RAW_LMMSEITERATIONS;LMMSE enhancement steps -!PARTIALPASTE_RAW_PIXELSHIFT;PixelShift +!PARTIALPASTE_RAW_PIXELSHIFT;Pixel Shift !PARTIALPASTE_RETINEX;Retinex !PARTIALPASTE_RGBCURVES;RGB curves !PARTIALPASTE_SHARPENEDGE;Edges @@ -1295,7 +1295,7 @@ TP_WBALANCE_TEMPERATURE;Isı !PROGRESSDLG_PROFILECHANGEDINBROWSER;Processing profile changed in browser !QINFO_FRAMECOUNT;%2 frames !QINFO_HDR;HDR / %2 frame(s) -!QINFO_PIXELSHIFT;PixelShift / %2 frame(s) +!QINFO_PIXELSHIFT;Pixel Shift / %2 frame(s) !SAMPLEFORMAT_0;Unknown data format !SAMPLEFORMAT_1;Unsigned 8 bits !SAMPLEFORMAT_2;Unsigned 16 bits diff --git a/rtdata/languages/default b/rtdata/languages/default index 58bcbd244..cbcbd142c 100644 --- a/rtdata/languages/default +++ b/rtdata/languages/default @@ -1028,7 +1028,7 @@ PARTIALPASTE_RAW_DMETHOD;Demosaic method PARTIALPASTE_RAW_FALSECOLOR;False color suppression PARTIALPASTE_RAW_IMAGENUM;Sub-image PARTIALPASTE_RAW_LMMSEITERATIONS;LMMSE enhancement steps -PARTIALPASTE_RAW_PIXELSHIFT;PixelShift +PARTIALPASTE_RAW_PIXELSHIFT;Pixel Shift PARTIALPASTE_RESIZE;Resize PARTIALPASTE_RETINEX;Retinex PARTIALPASTE_RGBCURVES;RGB curves @@ -1091,7 +1091,6 @@ PREFERENCES_D50_OLD;5000K PREFERENCES_D55;5500K PREFERENCES_D60;6000K PREFERENCES_D65;6500K -PREFERENCES_DARKFRAME;Dark-Frame PREFERENCES_DARKFRAMEFOUND;Found PREFERENCES_DARKFRAMESHOTS;shots PREFERENCES_DARKFRAMETEMPLATES;templates @@ -1100,6 +1099,7 @@ PREFERENCES_DATEFORMATHINT;You can use the following formatting strings:\n%y< PREFERENCES_DAUB_LABEL;Use Daubechies D6 wavelets instead of D4 PREFERENCES_DAUB_TOOLTIP;The Noise Reduction and Wavelet Levels tools use a Debauchies mother wavelet. If you choose D6 instead of D4 you increase the number of orthogonal Daubechies coefficients and probably increase quality of small-scale levels. There is no memory or processing time difference between the two. PREFERENCES_DIRDARKFRAMES;Dark-frames directory +PREFERENCES_DIRECTORIES;Directories PREFERENCES_DIRHOME;Home directory PREFERENCES_DIRLAST;Last visited directory PREFERENCES_DIROTHER;Other @@ -1112,8 +1112,6 @@ PREFERENCES_EXTERNALEDITOR;External Editor PREFERENCES_FBROWSEROPTS;File Browser / Thumbnail Options PREFERENCES_FILEBROWSERTOOLBARSINGLEROW;Single row file browser toolbar\n(de-select for low resolution display) PREFERENCES_FILEFORMAT;File format -PREFERENCES_FILMSIMULATION;Film Simulation -PREFERENCES_FLATFIELD;Flat-Field PREFERENCES_FLATFIELDFOUND;Found PREFERENCES_FLATFIELDSDIR;Flat-fields directory PREFERENCES_FLATFIELDSHOTS;shots @@ -1309,7 +1307,7 @@ QINFO_FRAMECOUNT;%2 frames QINFO_HDR;HDR / %2 frame(s) QINFO_ISO;ISO QINFO_NOEXIF;Exif data not available. -QINFO_PIXELSHIFT;PixelShift / %2 frame(s) +QINFO_PIXELSHIFT;Pixel Shift / %2 frame(s) SAMPLEFORMAT_0;Unknown data format SAMPLEFORMAT_1;Unsigned 8 bits SAMPLEFORMAT_2;Unsigned 16 bits diff --git a/rtdata/themes/TooWaBlue-GTK3-20_.css b/rtdata/themes/TooWaBlue-GTK3-20_.css index 42488b977..569d151a1 100644 --- a/rtdata/themes/TooWaBlue-GTK3-20_.css +++ b/rtdata/themes/TooWaBlue-GTK3-20_.css @@ -2,7 +2,7 @@ This file is part of RawTherapee. Copyright (c) 2016-2017 TooWaBoo - Version 2.56 - requires RT 5.0 (Gtk+ >= 3.20) + Version 2.58 RawTherapee is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -1182,7 +1182,7 @@ entry > window > frame > border { padding: 0.08334em; border: 0.08334em solid @accent-color; } -.csd entry > window > frame > border { +entry > window > frame > border { margin: 0.08334em; } /* end */ @@ -1190,15 +1190,14 @@ entry > window > frame > border { /*** end ***************************************************************************************/ /*** Popover *** Context menu filechooser ******************************************************/ -.csd popover.background { - box-shadow: 0 1px 6px 1px rgba(0, 0, 0, 0.5), 0 0 0 1px @bg-dark-grey; -} + popover.background { background-color: @bg-dark-grey; border: 0.08334em solid @accent-color; border-radius: 0; padding: 0; margin: 0; + box-shadow: 0 1px 6px 1px rgba(0, 0, 0, 0.5), 0 0 0 1px @bg-dark-grey; } popover.background > box { padding: 0; @@ -1614,6 +1613,10 @@ radiobutton { margin: 0; min-height: 2em; } +#PrefNotebook checkbox, +#PrefNotebook checkbutton { + min-height: 1.6667em; +} check, radio { diff --git a/rtengine/imagedata.cc b/rtengine/imagedata.cc index ed8e0b52b..b498f69f1 100644 --- a/rtengine/imagedata.cc +++ b/rtengine/imagedata.cc @@ -1105,6 +1105,7 @@ FramesData::FramesData (const Glib::ustring& fname, std::unique_ptr NALensDataInterpreter::lenses = { - // The key is a composite string made of 8 HEX bytes - // LensIDNumber LensFStops MinFocalLength MaxFocalLength MaxApertureAtMinFocal MaxApertureAtMaxFocal MCUVersion and LensType + /* + * The Nikon LensID is constructed as a Composite tag from the raw hex values of 8 other tags: + * LensIDNumber, LensFStops, MinFocalLength, MaxFocalLength, MaxApertureAtMinFocal, MaxApertureAtMaxFocal, MCUVersion and LensType, in that order. + */ {"00 00 00 00 00 00 00 01", "Manual Lens No CPU"}, {"00 00 00 00 00 00 E1 12", "TC-17E II"}, {"00 00 00 00 00 00 F1 0C", "TC-14E [II] or Sigma APO Tele Converter 1.4x EX DG or Kenko Teleplus PRO 300 DG 1.4x"}, @@ -953,6 +955,7 @@ const std::map NALensDataInterpreter::lenses = { {"92 48 24 37 24 24 94 06", "AF-S Zoom-Nikkor 14-24mm f/2.8G ED"}, {"93 48 37 5C 24 24 95 06", "AF-S Zoom-Nikkor 24-70mm f/2.8G ED"}, {"94 40 2D 53 2C 3C 96 06", "AF-S DX Zoom-Nikkor 18-55mm f/3.5-5.6G ED II"}, + {"94 48 7C 7C 24 24 4B 0E", "Sigma 180mm f/2.8 APO Macro EX DG OS"}, {"95 00 37 37 2C 2C 97 06", "PC-E Nikkor 24mm f/3.5D ED"}, {"95 4C 37 37 2C 2C 97 02", "PC-E Nikkor 24mm f/3.5D ED"}, {"96 38 1F 37 34 3C 4B 06", "Sigma 12-24mm f/4.5-5.6 II DG HSM"}, diff --git a/rtexif/sonyminoltaattribs.cc b/rtexif/sonyminoltaattribs.cc index 7680e53eb..083affa72 100644 --- a/rtexif/sonyminoltaattribs.cc +++ b/rtexif/sonyminoltaattribs.cc @@ -665,6 +665,12 @@ public: {128, "Sigma 18-35mm f/1.8 DC HSM"}, {128, "Sigma 50-500mm f/4.5-6.3 APO DG OS HSM"}, {128, "Sigma 24-105mm f/4 DG HSM | A"}, + {128, "Sigma 30mm f/1.4"}, + {128, "Sigma 35mm f/1.4 DG HSM | A"}, + {128, "Sigma 105mm f/2.8 EX DG OS HSM Macro"}, + {128, "Sigma 180mm f/2.8 EX DG OS HSM APO Macro"}, + {128, "Sigma 18-300mm f/3.5-6.3 DC Macro HSM | C"}, + {128, "Sigma 18-50mm f/2.8-4.5 DC HSM"}, {129, "Tamron Lens (129)"}, {129, "Tamron 200-400mm f/5.6 LD"}, {129, "Tamron 70-300mm f/4-5.6 LD"}, diff --git a/rtgui/exifpanel.cc b/rtgui/exifpanel.cc index 2e47786e5..da2659a4f 100644 --- a/rtgui/exifpanel.cc +++ b/rtgui/exifpanel.cc @@ -126,6 +126,7 @@ ExifPanel::ExifPanel () : idata (nullptr) showAll = Gtk::manage (new Gtk::ToggleButton (M ("EXIFPANEL_SHOWALL"))); //add->set_tooltip_text (M("EXIFPANEL_SHOWALL")); + showAll->get_style_context()->add_class ("Left"); setExpandAlignProperties (showAll, false, true, Gtk::ALIGN_FILL, Gtk::ALIGN_FILL); showAll->set_active (options.lastShowAllExif); buttons2->attach_next_to (*showAll, Gtk::POS_LEFT, 1, 1); @@ -133,7 +134,7 @@ ExifPanel::ExifPanel () : idata (nullptr) reset = Gtk::manage (new Gtk::Button ()); // M("EXIFPANEL_RESET") reset->set_image (*Gtk::manage (new RTImage ("gtk-undo-ltr.png", "gtk-undo-rtl.png"))); reset->set_tooltip_text (M ("EXIFPANEL_RESETHINT")); - reset->get_style_context()->add_class ("Left"); + reset->get_style_context()->add_class ("MiddleH"); setExpandAlignProperties (reset, true, true, Gtk::ALIGN_FILL, Gtk::ALIGN_FILL); buttons2->attach_next_to (*reset, Gtk::POS_RIGHT, 1, 1); diff --git a/rtgui/history.cc b/rtgui/history.cc index 75b46d0cf..b1c2b8369 100644 --- a/rtgui/history.cc +++ b/rtgui/history.cc @@ -24,18 +24,17 @@ using namespace rtengine; using namespace rtengine::procparams; -Glib::ustring eventDescrArray[NUMOFEVENTS]; History::History (bool bookmarkSupport) : historyVPaned (nullptr), blistener (nullptr), tpc (nullptr), bmnum (1) { blistenerLock = false; // sets default that the Before preview will not be locked - +/* // fill history event message array for (int i = 0; i < NUMOFEVENTS; i++) { eventDescrArray[i] = M (Glib::ustring::compose ("HISTORY_MSG_%1", i + 1)); } - +*/ // History List // ~~~~~~~~~~~~ Gtk::ScrolledWindow* hscrollw = Gtk::manage (new Gtk::ScrolledWindow ()); @@ -238,7 +237,7 @@ void History::procParamsChanged (ProcParams* params, ProcEvent ev, Glib::ustring } // construct formatted list content - Glib::ustring text = Glib::ustring::compose ("%1", eventDescrArray[ev]); + Glib::ustring text = M("HISTORY_MSG_" + std::to_string(ev + 1)); Glib::RefPtr selection = hTreeView->get_selection(); Gtk::TreeModel::iterator iter = selection->get_selected(); @@ -262,8 +261,9 @@ void History::procParamsChanged (ProcParams* params, ProcEvent ev, Glib::ustring // if there is no last item or its chev!=ev, create a new one if (size == 0 || !row || row[historyColumns.chev] != ev || ev == EvProfileChanged) { - Gtk::TreeModel::Row newrow = * (historyModel->append()); - newrow[historyColumns.realText] = eventDescrArray[ev]; + // Gtk::TreeModel::Row newrow = * (historyModel->append()); + // newrow[historyColumns.realText] = eventDescrArray[ev]; + Gtk::TreeModel::Row newrow = *(historyModel->append()); newrow[historyColumns.text] = text; newrow[historyColumns.value] = g_markup_escape_text (descr.c_str(), -1); newrow[historyColumns.chev] = ev; @@ -282,7 +282,6 @@ void History::procParamsChanged (ProcParams* params, ProcEvent ev, Glib::ustring } // else just update it else { - row[historyColumns.realText] = eventDescrArray[ev]; row[historyColumns.text] = text; row[historyColumns.value] = g_markup_escape_text (descr.c_str(), -1); row[historyColumns.chev] = ev; @@ -430,9 +429,12 @@ bool History::on_query_tooltip (int x, int y, bool keyboard_tooltip, const Glib: Gtk::TreeModel::iterator iter = historyModel->get_iter (path); if (iter) { - Glib::ustring param, val; - iter->get_value (1, param); - iter->get_value (2, val); +// Glib::ustring param, val; +// iter->get_value (1, param); +// iter->get_value (2, val); + Glib::ustring text, val; + iter->get_value(0, text); + iter->get_value(1, val); /* * @@ -451,7 +453,8 @@ bool History::on_query_tooltip (int x, int y, bool keyboard_tooltip, const Glib: tooltip->set_custom(*hbox); */ - tooltip->set_text (param + " : " + val); + // tooltip->set_text (param + " : " + val); + tooltip->set_text(text + " : " + val); displayTooltip = true; } } diff --git a/rtgui/history.h b/rtgui/history.h index e905cb396..8fbe256e4 100644 --- a/rtgui/history.h +++ b/rtgui/history.h @@ -40,7 +40,6 @@ public: class HistoryColumns : public Gtk::TreeModel::ColumnRecord { public: - Gtk::TreeModelColumn realText; Gtk::TreeModelColumn text; Gtk::TreeModelColumn value; Gtk::TreeModelColumn params; @@ -49,7 +48,6 @@ public: HistoryColumns() { add(text); - add(realText); add(value); add(chev); add(params); diff --git a/rtgui/multilangmgr.cc b/rtgui/multilangmgr.cc index d8a619292..886f7bfd3 100644 --- a/rtgui/multilangmgr.cc +++ b/rtgui/multilangmgr.cc @@ -114,35 +114,37 @@ MultiLangMgr::MultiLangMgr (const Glib::ustring& fname, MultiLangMgr* fallbackMg bool MultiLangMgr::load (const Glib::ustring& fname, MultiLangMgr* fallbackMgr) { - this->fallbackMgr.reset (fallbackMgr); + this->fallbackMgr.reset(fallbackMgr); - std::ifstream file (fname.c_str ()); - if (!file.is_open ()) { + std::ifstream file(fname.c_str()); + if (!file.is_open()) { return false; } std::map translations; - std::string entry, key, value; + std::string entry; - while (std::getline (file, entry)) { + while (std::getline(file, entry)) { - if (entry.empty () || entry.front () == '#') { + if (entry.empty() || entry.front() == '#' || entry.front() == '!') { continue; } - std::istringstream line (entry); + std::string key, value; - if (!std::getline (line, key, ';') || !std::getline (line, value)) { + std::istringstream line(entry); + + if (!std::getline(line, key, ';') || !std::getline(line, value)) { continue; } - static const std::regex newline ("\\\\n"); - value = std::regex_replace (value, newline, "\n"); + static const std::regex newline("\\\\n"); + value = std::regex_replace(value, newline, "\n"); - translations.emplace (key, value); + translations.emplace(key, value); } - this->translations.swap (translations); + this->translations.swap(translations); return true; } diff --git a/rtgui/preferences.cc b/rtgui/preferences.cc index 38decb412..a2447a47c 100644 --- a/rtgui/preferences.cc +++ b/rtgui/preferences.cc @@ -528,51 +528,59 @@ Gtk::Widget* Preferences::getProcParamsPanel () hbmip->set_border_width (4); mvbpp->pack_start (*fmip, Gtk::PACK_SHRINK, 4); - Gtk::Frame* fdf = Gtk::manage (new Gtk::Frame (M ("PREFERENCES_DARKFRAME")) ); - Gtk::HBox* hb42 = Gtk::manage (new Gtk::HBox ()); - darkFrameDir = Gtk::manage (new Gtk::FileChooserButton (M ("PREFERENCES_DIRDARKFRAMES"), Gtk::FILE_CHOOSER_ACTION_SELECT_FOLDER)); +// Gtk::Frame* fdf = Gtk::manage (new Gtk::Frame (M ("PREFERENCES_DARKFRAME")) ); +// Gtk::HBox* hb42 = Gtk::manage (new Gtk::HBox ()); +// darkFrameDir = Gtk::manage (new Gtk::FileChooserButton (M ("PREFERENCES_DIRDARKFRAMES"), Gtk::FILE_CHOOSER_ACTION_SELECT_FOLDER)); + // Directories + Gtk::Frame* cdf = Gtk::manage (new Gtk::Frame (M ("PREFERENCES_DIRECTORIES")) ); + Gtk::Grid* dirgrid = Gtk::manage (new Gtk::Grid ()); + setExpandAlignProperties(dirgrid, true, false, Gtk::ALIGN_FILL, Gtk::ALIGN_CENTER); + Gtk::Label *dfLab = Gtk::manage (new Gtk::Label (M ("PREFERENCES_DIRDARKFRAMES") + ":")); - hb42->pack_start (*dfLab, Gtk::PACK_SHRINK, 4 ); - hb42->pack_start (*darkFrameDir, Gtk::PACK_EXPAND_WIDGET, 4); + setExpandAlignProperties(dfLab, false, false, Gtk::ALIGN_START, Gtk::ALIGN_CENTER); + darkFrameDir = Gtk::manage (new Gtk::FileChooserButton (M ("PREFERENCES_DIRDARKFRAMES"), Gtk::FILE_CHOOSER_ACTION_SELECT_FOLDER)); + setExpandAlignProperties(darkFrameDir, true, false, Gtk::ALIGN_FILL, Gtk::ALIGN_CENTER); dfLabel = Gtk::manage (new Gtk::Label ("Found:")); - Gtk::VBox* vbdf = Gtk::manage (new Gtk::VBox ()); - vbdf->pack_start (*hb42, Gtk::PACK_SHRINK, 4); - vbdf->pack_start (*dfLabel, Gtk::PACK_SHRINK, 4 ); - fdf->add (*vbdf ); - mvbpp->pack_start (*fdf, Gtk::PACK_SHRINK, 4); + setExpandAlignProperties(dfLabel, false, false, Gtk::ALIGN_START, Gtk::ALIGN_CENTER); + + dirgrid->attach_next_to(*dfLab, Gtk::POS_TOP, 1, 1); + dirgrid->attach_next_to(*darkFrameDir, *dfLab, Gtk::POS_RIGHT, 1, 1); + dirgrid->attach_next_to(*dfLabel, *darkFrameDir, Gtk::POS_RIGHT, 1, 1); //dfconn = darkFrameDir->signal_file_set().connect ( sigc::mem_fun(*this, &Preferences::darkFrameChanged), true); dfconn = darkFrameDir->signal_selection_changed().connect ( sigc::mem_fun (*this, &Preferences::darkFrameChanged), true); // FLATFIELD - Gtk::Frame* fff = Gtk::manage (new Gtk::Frame (M ("PREFERENCES_FLATFIELD")) ); - Gtk::HBox* hb43 = Gtk::manage (new Gtk::HBox ()); - flatFieldDir = Gtk::manage (new Gtk::FileChooserButton (M ("PREFERENCES_FLATFIELDSDIR"), Gtk::FILE_CHOOSER_ACTION_SELECT_FOLDER)); Gtk::Label *ffLab = Gtk::manage (new Gtk::Label (M ("PREFERENCES_FLATFIELDSDIR") + ":")); - hb43->pack_start (*ffLab, Gtk::PACK_SHRINK, 4 ); - hb43->pack_start (*flatFieldDir); + setExpandAlignProperties(ffLab, false, false, Gtk::ALIGN_START, Gtk::ALIGN_CENTER); + flatFieldDir = Gtk::manage (new Gtk::FileChooserButton (M ("PREFERENCES_FLATFIELDSDIR"), Gtk::FILE_CHOOSER_ACTION_SELECT_FOLDER)); + setExpandAlignProperties(flatFieldDir, true, false, Gtk::ALIGN_FILL, Gtk::ALIGN_CENTER); ffLabel = Gtk::manage (new Gtk::Label ("Found:")); - Gtk::VBox* vbff = Gtk::manage (new Gtk::VBox ()); - vbff->pack_start (*hb43, Gtk::PACK_SHRINK, 4); - vbff->pack_start (*ffLabel, Gtk::PACK_SHRINK, 4 ); - fff->add (*vbff ); - mvbpp->pack_start (*fff, Gtk::PACK_SHRINK, 4); + setExpandAlignProperties(ffLabel, false, false, Gtk::ALIGN_START, Gtk::ALIGN_CENTER); + + dirgrid->attach_next_to(*ffLab, *dfLab, Gtk::POS_BOTTOM, 1, 1); + dirgrid->attach_next_to(*flatFieldDir, *ffLab, Gtk::POS_RIGHT, 1, 1); + dirgrid->attach_next_to(*ffLabel, *flatFieldDir, Gtk::POS_RIGHT, 1, 1); //ffconn = flatFieldDir->signal_file_set().connect ( sigc::mem_fun(*this, &Preferences::flatFieldChanged), true); ffconn = flatFieldDir->signal_selection_changed().connect ( sigc::mem_fun (*this, &Preferences::flatFieldChanged), true); //Cluts Dir - Gtk::Frame* clutsDirFrame = Gtk::manage (new Gtk::Frame (M ("PREFERENCES_FILMSIMULATION")) ); - Gtk::HBox* clutsDirBox = Gtk::manage (new Gtk::HBox ()); - clutsDir = Gtk::manage (new Gtk::FileChooserButton (M ("PREFERENCES_CLUTSDIR"), Gtk::FILE_CHOOSER_ACTION_SELECT_FOLDER)); Gtk::Label *clutsDirLabel = Gtk::manage (new Gtk::Label (M ("PREFERENCES_CLUTSDIR") + ":")); + setExpandAlignProperties(clutsDirLabel, false, false, Gtk::ALIGN_START, Gtk::ALIGN_CENTER); + clutsDir = Gtk::manage (new Gtk::FileChooserButton (M ("PREFERENCES_CLUTSDIR"), Gtk::FILE_CHOOSER_ACTION_SELECT_FOLDER)); + setExpandAlignProperties(clutsDir, true, false, Gtk::ALIGN_FILL, Gtk::ALIGN_CENTER); Gtk::Label* clutsRestartNeeded = Gtk::manage ( new Gtk::Label (Glib::ustring (" (") + M ("PREFERENCES_APPLNEXTSTARTUP") + ")") ); - clutsDirBox->pack_start (*clutsDirLabel, Gtk::PACK_SHRINK, 4 ); - clutsDirBox->pack_start (*clutsDir ); - clutsDirBox->pack_start (*clutsRestartNeeded, Gtk::PACK_SHRINK, 4 ); - clutsDirFrame->add (*clutsDirBox ); - mvbpp->pack_start (*clutsDirFrame, Gtk::PACK_SHRINK, 4 ); + setExpandAlignProperties(clutsRestartNeeded, false, false, Gtk::ALIGN_START, Gtk::ALIGN_CENTER); + dirgrid->attach_next_to(*clutsDirLabel, *ffLab, Gtk::POS_BOTTOM, 1, 1); + dirgrid->attach_next_to(*clutsDir, *clutsDirLabel, Gtk::POS_RIGHT, 1, 1); + dirgrid->attach_next_to(*clutsRestartNeeded, *clutsDir, Gtk::POS_RIGHT, 1, 1); + + cdf->add(*dirgrid); + mvbpp->pack_start (*cdf, Gtk::PACK_SHRINK, 4 ); + + // Metadata Gtk::Frame* fmd = Gtk::manage (new Gtk::Frame (M ("PREFERENCES_METADATA"))); Gtk::VBox* vbmd = Gtk::manage (new Gtk::VBox ()); ckbTunnelMetaData = Gtk::manage (new Gtk::CheckButton (M ("PREFERENCES_TUNNELMETADATA"))); diff --git a/tools/generateRtexifUpdates b/tools/generateRtexifUpdates index 95a32c088..cdc0dd70c 100755 --- a/tools/generateRtexifUpdates +++ b/tools/generateRtexifUpdates @@ -11,7 +11,7 @@ # Blame DrSlony # Please report bugs or enhancements to https://github.com/Beep6581/RawTherapee -et="$HOME/programs/Image-ExifTool-10.61/exiftool" +et="$HOME/programs/code-exiftool/exiftool" hash "$et" 2>/dev/null || { echo >&2 "ExifTool not found, install it first."; exit 1; } hash xmlstarlet 2>/dev/null || { echo >&2 "XMLStarlet not found, install it first."; exit 1; }