From 6c8a47ebdf2d1c1693286258f97b1b173224db36 Mon Sep 17 00:00:00 2001 From: heckflosse Date: Thu, 26 Jul 2018 00:52:58 +0200 Subject: [PATCH 01/28] AHD demosaic still has some integer processing, #4698 --- rtengine/demosaic_algos.cc | 99 ++++++++++++++++++++++++++------------ rtengine/rawimagesource.h | 1 + 2 files changed, 68 insertions(+), 32 deletions(-) diff --git a/rtengine/demosaic_algos.cc b/rtengine/demosaic_algos.cc index 4ba855185..39ac911ce 100644 --- a/rtengine/demosaic_algos.cc +++ b/rtengine/demosaic_algos.cc @@ -37,6 +37,7 @@ #include "sleef.c" #include "opthelper.h" #include "median.h" +#define BENCHMARK #include "StopWatch.h" #ifdef _OPENMP #include @@ -682,6 +683,41 @@ void RawImageSource::ppg_demosaic() free (image); } +void RawImageSource::border_interpolate(unsigned int border, float (*image)[3], unsigned int start, unsigned int end) +{ + unsigned row, col, y, x, f; + float sum[8]; + unsigned int width = W, height = H; + unsigned int colors = 3; + + if (end == 0 ) { + end = H; + } + + for (row = start; row < end; row++) + for (col = 0; col < width; col++) { + if (col == border && row >= border && row < height - border) { + col = width - border; + } + + memset (sum, 0, sizeof sum); + + for (y = row - 1; y != row + 2; y++) + for (x = col - 1; x != col + 2; x++) + if (y < height && x < width) { + f = fc(y, x); + sum[f] += image[y * width + x][f]; + sum[f + 4]++; + } + + f = fc(row, col); + + FORCC if (c != f && sum[c + 4]) { + image[row * width + col][c] = sum[c] / sum[c + 4]; + } + } +} + void RawImageSource::border_interpolate(unsigned int border, float (*image)[4], unsigned int start, unsigned int end) { unsigned row, col, y, x, f; @@ -2303,12 +2339,15 @@ void RawImageSource::igv_interpolate(int winw, int winh) void RawImageSource::ahd_demosaic() { - int i, j, k, top, left, row, col, tr, tc, c, d, val, hm[2]; - float (*pix)[4], (*rix)[3]; + BENCHFUN + int i, j, k, tr, tc, c, d, hm[2]; + float val; + float (*pix)[3], (*rix)[3]; static const int dir[4] = { -1, 1, -TS, TS }; float ldiff[2][4], abdiff[2][4], leps, abeps; - float xyz[3], xyz_cam[3][4]; - float* cbrt; + float xyz[3], xyz_cam[3][3]; + LUTf cbrt(65536); + float (*rgb)[TS][TS][3]; float (*lab)[TS][TS][3]; float (*lix)[3]; @@ -2316,7 +2355,6 @@ void RawImageSource::ahd_demosaic() double r; int width = W, height = H; - float (*image)[4]; unsigned int colors = 3; const double xyz_rgb[3][3] = { /* XYZ from RGB */ @@ -2332,15 +2370,13 @@ void RawImageSource::ahd_demosaic() plistener->setProgress (0.0); } - image = (float (*)[4]) calloc (H * W, sizeof * image); + float (*image)[3] = (float (*)[3]) calloc (H * W, sizeof * image); for (int ii = 0; ii < H; ii++) for (int jj = 0; jj < W; jj++) { image[ii * W + jj][fc(ii, jj)] = rawData[ii][jj]; } - cbrt = (float (*)) calloc (0x10000, sizeof * cbrt); - for (i = 0; i < 0x10000; i++) { r = (double)i / 65535.0; cbrt[i] = r > 0.008856 ? std::cbrt(r) : 7.787 * r + 16 / 116.0; @@ -2363,40 +2399,40 @@ void RawImageSource::ahd_demosaic() int n_tiles = ((height - 7 + (TS - 7)) / (TS - 6)) * ((width - 7 + (TS - 7)) / (TS - 6)); int tile = 0; - for (top = 2; top < height - 5; top += TS - 6) - for (left = 2; left < width - 5; left += TS - 6) { + for (int top = 2; top < height - 5; top += TS - 6) + for (int left = 2; left < width - 5; left += TS - 6) { /* Interpolate green horizontally and vertically: */ - for (row = top; row < top + TS && row < height - 2; row++) { - col = left + (FC(row, left) & 1); + for (int row = top; row < top + TS && row < height - 2; row++) { + int col = left + (FC(row, left) & 1); for (c = FC(row, col); col < left + TS && col < width - 2; col += 2) { pix = image + (row * width + col); - val = 0.25 * ((pix[-1][1] + pix[0][c] + pix[1][1]) * 2 + val = 0.25f * ((pix[-1][1] + pix[0][c] + pix[1][1]) * 2 - pix[-2][c] - pix[2][c]) ; - rgb[0][row - top][col - left][1] = median(static_cast(val), pix[-1][1], pix[1][1]); - val = 0.25 * ((pix[-width][1] + pix[0][c] + pix[width][1]) * 2 + rgb[0][row - top][col - left][1] = median(val, pix[-1][1], pix[1][1]); + val = 0.25f * ((pix[-width][1] + pix[0][c] + pix[width][1]) * 2 - pix[-2 * width][c] - pix[2 * width][c]) ; - rgb[1][row - top][col - left][1] = median(static_cast(val), pix[-width][1], pix[width][1]); + rgb[1][row - top][col - left][1] = median(val, pix[-width][1], pix[width][1]); } } /* Interpolate red and blue, and convert to CIELab: */ for (d = 0; d < 2; d++) - for (row = top + 1; row < top + TS - 1 && row < height - 3; row++) - for (col = left + 1; col < left + TS - 1 && col < width - 3; col++) { + for (int row = top + 1; row < top + TS - 1 && row < height - 3; row++) + for (int col = left + 1; col < left + TS - 1 && col < width - 3; col++) { pix = image + (row * width + col); rix = &rgb[d][row - top][col - left]; lix = &lab[d][row - top][col - left]; if ((c = 2 - FC(row, col)) == 1) { c = FC(row + 1, col); - val = pix[0][1] + (0.5 * ( pix[-1][2 - c] + pix[1][2 - c] + val = pix[0][1] + (0.5f * ( pix[-1][2 - c] + pix[1][2 - c] - rix[-1][1] - rix[1][1] ) ); rix[0][2 - c] = CLIP(val); - val = pix[0][1] + (0.5 * ( pix[-width][c] + pix[width][c] + val = pix[0][1] + (0.5f * ( pix[-width][c] + pix[width][c] - rix[-TS][1] - rix[TS][1] ) ); } else - val = rix[0][1] + (0.25 * ( pix[-width - 1][c] + pix[-width + 1][c] + val = rix[0][1] + (0.25f * ( pix[-width - 1][c] + pix[-width + 1][c] + pix[+width - 1][c] + pix[+width + 1][c] - rix[-TS - 1][1] - rix[-TS + 1][1] - rix[+TS - 1][1] - rix[+TS + 1][1]) ); @@ -2404,16 +2440,16 @@ void RawImageSource::ahd_demosaic() rix[0][c] = CLIP(val); c = FC(row, col); rix[0][c] = pix[0][c]; - xyz[0] = xyz[1] = xyz[2] = 0.0; + xyz[0] = xyz[1] = xyz[2] = 0.f; FORCC { xyz[0] += xyz_cam[0][c] * rix[0][c]; xyz[1] += xyz_cam[1][c] * rix[0][c]; xyz[2] += xyz_cam[2][c] * rix[0][c]; } - xyz[0] = CurveFactory::flinterp(cbrt, xyz[0]); - xyz[1] = CurveFactory::flinterp(cbrt, xyz[1]); - xyz[2] = CurveFactory::flinterp(cbrt, xyz[2]); + xyz[0] = cbrt[xyz[0]]; + xyz[1] = cbrt[xyz[1]]; + xyz[2] = cbrt[xyz[2]]; //xyz[0] = xyz[0] > 0.008856 ? pow(xyz[0]/65535,1/3.0) : 7.787*xyz[0] + 16/116.0; //xyz[1] = xyz[1] > 0.008856 ? pow(xyz[1]/65535,1/3.0) : 7.787*xyz[1] + 16/116.0; @@ -2427,17 +2463,17 @@ void RawImageSource::ahd_demosaic() /* Build homogeneity maps from the CIELab images: */ memset (homo, 0, 2 * TS * TS); - for (row = top + 2; row < top + TS - 2 && row < height - 4; row++) { + for (int row = top + 2; row < top + TS - 2 && row < height - 4; row++) { tr = row - top; - for (col = left + 2; col < left + TS - 2 && col < width - 4; col++) { + for (int col = left + 2; col < left + TS - 2 && col < width - 4; col++) { tc = col - left; for (d = 0; d < 2; d++) { lix = &lab[d][tr][tc]; for (i = 0; i < 4; i++) { - ldiff[d][i] = ABS(lix[0][0] - lix[dir[i]][0]); + ldiff[d][i] = std::fabs(lix[0][0] - lix[dir[i]][0]); abdiff[d][i] = SQR(lix[0][1] - lix[dir[i]][1]) + SQR(lix[0][2] - lix[dir[i]][2]); } @@ -2457,10 +2493,10 @@ void RawImageSource::ahd_demosaic() } /* Combine the most homogenous pixels for the final result: */ - for (row = top + 3; row < top + TS - 3 && row < height - 5; row++) { + for (int row = top + 3; row < top + TS - 3 && row < height - 5; row++) { tr = row - top; - for (col = left + 3; col < left + TS - 3 && col < width - 5; col++) { + for (int col = left + 3; col < left + TS - 3 && col < width - 5; col++) { tc = col - left; for (d = 0; d < 2; d++) @@ -2473,7 +2509,7 @@ void RawImageSource::ahd_demosaic() FORC3 image[row * width + col][c] = rgb[hm[1] > hm[0]][tr][tc][c]; } else FORC3 image[row * width + col][c] = - 0.5 * (rgb[0][tr][tc][c] + rgb[1][tr][tc][c]) ; + 0.5f * (rgb[0][tr][tc][c] + rgb[1][tr][tc][c]) ; } } @@ -2499,7 +2535,6 @@ void RawImageSource::ahd_demosaic() } free (image); - free (cbrt); } #undef TS diff --git a/rtengine/rawimagesource.h b/rtengine/rawimagesource.h index 53d3e0dc1..aff7f4445 100644 --- a/rtengine/rawimagesource.h +++ b/rtengine/rawimagesource.h @@ -273,6 +273,7 @@ protected: void dcb_demosaic(int iterations, bool dcb_enhance); void ahd_demosaic(); void rcd_demosaic(); + void border_interpolate(unsigned int border, float (*image)[3], unsigned int start = 0, unsigned int end = 0); void border_interpolate(unsigned int border, float (*image)[4], unsigned int start = 0, unsigned int end = 0); void border_interpolate2(int winw, int winh, int lborders, const array2D &rawData, array2D &red, array2D &green, array2D &blue); void dcb_initTileLimits(int &colMin, int &rowMin, int &colMax, int &rowMax, int x0, int y0, int border); From 4aaf28760a7de3ac84ebd1b6c8c065c1e865722d Mon Sep 17 00:00:00 2001 From: Morgan Hardwood Date: Thu, 26 Jul 2018 14:46:53 +0200 Subject: [PATCH 02/28] Interface strings and keys revised Includes updated Portuguese translation --- rtdata/languages/Catala | 43 +++--- rtdata/languages/Chinese (Simplified) | 43 +++--- rtdata/languages/Chinese (Traditional) | 43 +++--- rtdata/languages/Czech | 38 ++--- rtdata/languages/Dansk | 43 +++--- rtdata/languages/Deutsch | 36 ++--- rtdata/languages/English (UK) | 43 +++--- rtdata/languages/English (US) | 43 +++--- rtdata/languages/Espanol | 43 +++--- rtdata/languages/Euskara | 43 +++--- rtdata/languages/Francais | 32 ++-- rtdata/languages/Greek | 43 +++--- rtdata/languages/Hebrew | 43 +++--- rtdata/languages/Italiano | 43 +++--- rtdata/languages/Japanese | 36 ++--- rtdata/languages/Latvian | 43 +++--- rtdata/languages/Magyar | 43 +++--- rtdata/languages/Nederlands | 42 ++--- rtdata/languages/Norsk BM | 43 +++--- rtdata/languages/Polish | 43 +++--- rtdata/languages/Polish (Latin Characters) | 43 +++--- rtdata/languages/Portugues (Brasil) | 145 +++++++++--------- rtdata/languages/Russian | 40 ++--- rtdata/languages/Serbian (Cyrilic Characters) | 43 +++--- rtdata/languages/Serbian (Latin Characters) | 43 +++--- rtdata/languages/Slovak | 43 +++--- rtdata/languages/Suomi | 43 +++--- rtdata/languages/Swedish | 43 +++--- rtdata/languages/Turkish | 43 +++--- rtdata/languages/default | 42 ++--- rtgui/iccprofilecreator.cc | 2 +- rtgui/icmpanel.cc | 24 +-- rtgui/resize.cc | 2 +- 33 files changed, 749 insertions(+), 636 deletions(-) diff --git a/rtdata/languages/Catala b/rtdata/languages/Catala index 042f5cd56..4c5beefef 100644 --- a/rtdata/languages/Catala +++ b/rtdata/languages/Catala @@ -1320,16 +1320,16 @@ ZOOMPANEL_ZOOMOUT;Allunya\nDrecera: - !HISTORY_MSG_491;White Balance !HISTORY_MSG_492;RGB Curves !HISTORY_MSG_493;L*a*b* Adjustments -!HISTORY_MSG_CLAMPOOG;Out-of-gamut color clipping +!HISTORY_MSG_CLAMPOOG;Clip out-of-gamut colors !HISTORY_MSG_COLORTONING_LABGRID_VALUE;CT - Color correction !HISTORY_MSG_DUALDEMOSAIC_CONTRAST;AMaZE+VNG4 - Contrast threshold -!HISTORY_MSG_HISTMATCHING;Auto-Matched Tone Curve -!HISTORY_MSG_ICMGAMM;Working gamma -!HISTORY_MSG_ICMPRIMARI;Output profile primaries -!HISTORY_MSG_ICMPROFILE;Output profile type -!HISTORY_MSG_ICMSLOP;Working slope -!HISTORY_MSG_ICMTEMP;Output IccV4 D illuminant -!HISTORY_MSG_ICMTRCIN;TRC working method +!HISTORY_MSG_HISTMATCHING;Auto-matched tone curve +!HISTORY_MSG_ICM_OUTPUT_PRIMARIES;Output - Primaries +!HISTORY_MSG_ICM_OUTPUT_TEMP;Output - ICC-v4 illuminant D +!HISTORY_MSG_ICM_OUTPUT_TYPE;Output - Type +!HISTORY_MSG_ICM_WORKING_GAMMA;Working - Gamma +!HISTORY_MSG_ICM_WORKING_SLOPE;Working - Slope +!HISTORY_MSG_ICM_WORKING_TRC_METHOD;Working - TRC method !HISTORY_MSG_LOCALCONTRAST_AMOUNT;Local Contrast - Amount !HISTORY_MSG_LOCALCONTRAST_DARKNESS;Local Contrast - Darkness !HISTORY_MSG_LOCALCONTRAST_ENABLED;Local Contrast @@ -1342,15 +1342,20 @@ ZOOMPANEL_ZOOMOUT;Allunya\nDrecera: - !HISTORY_MSG_PREPROCESS_PDAFLINESFILTER;PDAF lines filter !HISTORY_MSG_PRSHARPEN_CONTRAST;PRS - Contrast threshold !HISTORY_MSG_RAW_BORDER;Raw border -!HISTORY_MSG_RESIZE_ALLOW_UPSCALING;Resize - Allow upscaling +!HISTORY_MSG_RESIZE_ALLOWUPSCALING;Resize - Allow upscaling !HISTORY_MSG_SHARPENING_CONTRAST;Sharpening - Contrast threshold !HISTORY_MSG_SOFTLIGHT_ENABLED;Soft light !HISTORY_MSG_SOFTLIGHT_STRENGTH;Soft light - Strength !HISTORY_MSG_TM_FATTAL_ANCHOR;DRC - Anchor !HISTORY_NEWSNAPSHOT_TOOLTIP;Shortcut: Alt-s +!ICCPROFCREATOR_COPYRIGHT;Copyright: +!ICCPROFCREATOR_COPYRIGHT_RESET_TOOLTIP;Reset to the default copyright, granted to "RawTherapee, CC0" !ICCPROFCREATOR_CUSTOM;Custom +!ICCPROFCREATOR_DESCRIPTION;Description: +!ICCPROFCREATOR_DESCRIPTION_ADDPARAM;Append gamma and slope values to the description +!ICCPROFCREATOR_DESCRIPTION_TOOLTIP;Leave empty to set the default description. !ICCPROFCREATOR_GAMMA;Gamma -!ICCPROFCREATOR_ICCVERSION;Generated profile's version: +!ICCPROFCREATOR_ICCVERSION;ICC version: !ICCPROFCREATOR_ILL;Illuminant: !ICCPROFCREATOR_ILL_41;D41 !ICCPROFCREATOR_ILL_50;D50 @@ -1360,7 +1365,7 @@ ZOOMPANEL_ZOOMOUT;Allunya\nDrecera: - !ICCPROFCREATOR_ILL_80;D80 !ICCPROFCREATOR_ILL_DEF;Default !ICCPROFCREATOR_ILL_INC;StdA 2856K -!ICCPROFCREATOR_ILL_TOOLTIP;You can only set Illuminant with ICC v4 profiles +!ICCPROFCREATOR_ILL_TOOLTIP;You can only set the illuminant for ICC v4 profiles. !ICCPROFCREATOR_PRIMARIES;Primaries: !ICCPROFCREATOR_PRIM_ACESP0;ACES AP0 !ICCPROFCREATOR_PRIM_ACESP1;ACES AP1 @@ -1377,7 +1382,7 @@ ZOOMPANEL_ZOOMOUT;Allunya\nDrecera: - !ICCPROFCREATOR_PRIM_REDX;Red X !ICCPROFCREATOR_PRIM_REDY;Red Y !ICCPROFCREATOR_PRIM_SRGB;sRGB -!ICCPROFCREATOR_PRIM_TOOLTIP;You can only set Custom Primaries with ICC v4 profiles +!ICCPROFCREATOR_PRIM_TOOLTIP;You can only set custom primaries for ICC v4 profiles. !ICCPROFCREATOR_PRIM_WIDEG;Widegamut !ICCPROFCREATOR_PROF_V2;ICC v2 !ICCPROFCREATOR_PROF_V4;ICC v4 @@ -1464,7 +1469,7 @@ ZOOMPANEL_ZOOMOUT;Allunya\nDrecera: - !PARTIALPASTE_RAW_PIXELSHIFT;Pixel Shift !PARTIALPASTE_RETINEX;Retinex !PARTIALPASTE_SOFTLIGHT;Soft light -!PARTIALPASTE_TM_FATTAL;Dynamic Range Compression +!PARTIALPASTE_TM_FATTAL;Dynamic range compression !PREFERENCES_AUTLISLOW;Low !PREFERENCES_AUTLISMAX;Max - Average of all tiles !PREFERENCES_AUTLISSTD;High @@ -1897,12 +1902,12 @@ ZOOMPANEL_ZOOMOUT;Allunya\nDrecera: - !TP_ICM_SAVEREFERENCE_APPLYWB;Apply white balance !TP_ICM_SAVEREFERENCE_APPLYWB_TOOLTIP;Generally, apply the white balance when saving images to create ICC profiles, and do not apply the white balance to create DCP profiles. !TP_ICM_SAVEREFERENCE_TOOLTIP;Save the linear TIFF image before the input profile is applied. The result can be used for calibration purposes and generation of a camera profile. -!TP_ICM_WORKTRC;Tone response curve: -!TP_ICM_WORKTRC_CUSTOM;Custom -!TP_ICM_WORKTRC_GAMMA;Gamma -!TP_ICM_WORKTRC_NONE;None -!TP_ICM_WORKTRC_SLOPE;Slope -!TP_ICM_WORKTRC_TOOLTIP;Only for build in profiles +!TP_ICM_WORKING_TRC;Tone response curve: +!TP_ICM_WORKING_TRC_CUSTOM;Custom +!TP_ICM_WORKING_TRC_GAMMA;Gamma +!TP_ICM_WORKING_TRC_NONE;None +!TP_ICM_WORKING_TRC_SLOPE;Slope +!TP_ICM_WORKING_TRC_TOOLTIP;Only for built-in profiles. !TP_LABCURVE_CHROMA_TOOLTIP;To apply B&W toning, set Chromaticity to -100. !TP_LABCURVE_CURVEEDITOR_CL;CL !TP_LABCURVE_CURVEEDITOR_CL_TOOLTIP;Chromaticity according to luminance C=f(L) diff --git a/rtdata/languages/Chinese (Simplified) b/rtdata/languages/Chinese (Simplified) index b9ff12214..ecd0473ba 100644 --- a/rtdata/languages/Chinese (Simplified) +++ b/rtdata/languages/Chinese (Simplified) @@ -1427,16 +1427,16 @@ ZOOMPANEL_ZOOMOUT;缩放拉远\n快捷键: - !HISTORY_MSG_491;White Balance !HISTORY_MSG_492;RGB Curves !HISTORY_MSG_493;L*a*b* Adjustments -!HISTORY_MSG_CLAMPOOG;Out-of-gamut color clipping +!HISTORY_MSG_CLAMPOOG;Clip out-of-gamut colors !HISTORY_MSG_COLORTONING_LABGRID_VALUE;CT - Color correction !HISTORY_MSG_DUALDEMOSAIC_CONTRAST;AMaZE+VNG4 - Contrast threshold -!HISTORY_MSG_HISTMATCHING;Auto-Matched Tone Curve -!HISTORY_MSG_ICMGAMM;Working gamma -!HISTORY_MSG_ICMPRIMARI;Output profile primaries -!HISTORY_MSG_ICMPROFILE;Output profile type -!HISTORY_MSG_ICMSLOP;Working slope -!HISTORY_MSG_ICMTEMP;Output IccV4 D illuminant -!HISTORY_MSG_ICMTRCIN;TRC working method +!HISTORY_MSG_HISTMATCHING;Auto-matched tone curve +!HISTORY_MSG_ICM_OUTPUT_PRIMARIES;Output - Primaries +!HISTORY_MSG_ICM_OUTPUT_TEMP;Output - ICC-v4 illuminant D +!HISTORY_MSG_ICM_OUTPUT_TYPE;Output - Type +!HISTORY_MSG_ICM_WORKING_GAMMA;Working - Gamma +!HISTORY_MSG_ICM_WORKING_SLOPE;Working - Slope +!HISTORY_MSG_ICM_WORKING_TRC_METHOD;Working - TRC method !HISTORY_MSG_LOCALCONTRAST_AMOUNT;Local Contrast - Amount !HISTORY_MSG_LOCALCONTRAST_DARKNESS;Local Contrast - Darkness !HISTORY_MSG_LOCALCONTRAST_ENABLED;Local Contrast @@ -1449,14 +1449,19 @@ ZOOMPANEL_ZOOMOUT;缩放拉远\n快捷键: - !HISTORY_MSG_PREPROCESS_PDAFLINESFILTER;PDAF lines filter !HISTORY_MSG_PRSHARPEN_CONTRAST;PRS - Contrast threshold !HISTORY_MSG_RAW_BORDER;Raw border -!HISTORY_MSG_RESIZE_ALLOW_UPSCALING;Resize - Allow upscaling +!HISTORY_MSG_RESIZE_ALLOWUPSCALING;Resize - Allow upscaling !HISTORY_MSG_SHARPENING_CONTRAST;Sharpening - Contrast threshold !HISTORY_MSG_SOFTLIGHT_ENABLED;Soft light !HISTORY_MSG_SOFTLIGHT_STRENGTH;Soft light - Strength !HISTORY_MSG_TM_FATTAL_ANCHOR;DRC - Anchor +!ICCPROFCREATOR_COPYRIGHT;Copyright: +!ICCPROFCREATOR_COPYRIGHT_RESET_TOOLTIP;Reset to the default copyright, granted to "RawTherapee, CC0" !ICCPROFCREATOR_CUSTOM;Custom +!ICCPROFCREATOR_DESCRIPTION;Description: +!ICCPROFCREATOR_DESCRIPTION_ADDPARAM;Append gamma and slope values to the description +!ICCPROFCREATOR_DESCRIPTION_TOOLTIP;Leave empty to set the default description. !ICCPROFCREATOR_GAMMA;Gamma -!ICCPROFCREATOR_ICCVERSION;Generated profile's version: +!ICCPROFCREATOR_ICCVERSION;ICC version: !ICCPROFCREATOR_ILL;Illuminant: !ICCPROFCREATOR_ILL_41;D41 !ICCPROFCREATOR_ILL_50;D50 @@ -1466,7 +1471,7 @@ ZOOMPANEL_ZOOMOUT;缩放拉远\n快捷键: - !ICCPROFCREATOR_ILL_80;D80 !ICCPROFCREATOR_ILL_DEF;Default !ICCPROFCREATOR_ILL_INC;StdA 2856K -!ICCPROFCREATOR_ILL_TOOLTIP;You can only set Illuminant with ICC v4 profiles +!ICCPROFCREATOR_ILL_TOOLTIP;You can only set the illuminant for ICC v4 profiles. !ICCPROFCREATOR_PRIMARIES;Primaries: !ICCPROFCREATOR_PRIM_ACESP0;ACES AP0 !ICCPROFCREATOR_PRIM_ACESP1;ACES AP1 @@ -1483,7 +1488,7 @@ ZOOMPANEL_ZOOMOUT;缩放拉远\n快捷键: - !ICCPROFCREATOR_PRIM_REDX;Red X !ICCPROFCREATOR_PRIM_REDY;Red Y !ICCPROFCREATOR_PRIM_SRGB;sRGB -!ICCPROFCREATOR_PRIM_TOOLTIP;You can only set Custom Primaries with ICC v4 profiles +!ICCPROFCREATOR_PRIM_TOOLTIP;You can only set custom primaries for ICC v4 profiles. !ICCPROFCREATOR_PRIM_WIDEG;Widegamut !ICCPROFCREATOR_PROF_V2;ICC v2 !ICCPROFCREATOR_PROF_V4;ICC v4 @@ -1550,7 +1555,7 @@ ZOOMPANEL_ZOOMOUT;缩放拉远\n快捷键: - !PARTIALPASTE_PREPROCESS_PDAFLINESFILTER;PDAF lines filter !PARTIALPASTE_RAW_BORDER;Raw border !PARTIALPASTE_SOFTLIGHT;Soft light -!PARTIALPASTE_TM_FATTAL;Dynamic Range Compression +!PARTIALPASTE_TM_FATTAL;Dynamic range compression !PREFERENCES_AUTOSAVE_TP_OPEN;Automatically save tools collapsed/expanded\nstate before exiting !PREFERENCES_BEHADDALLHINT;Set all parameters to the Add mode.\nAdjustments of parameters in the batch tool panel will be deltas to the stored values. !PREFERENCES_BEHSETALLHINT;Set all parameters to the Set mode.\nAdjustments of parameters in the batch tool panel will be absolute, the actual values will be displayed. @@ -1847,12 +1852,12 @@ ZOOMPANEL_ZOOMOUT;缩放拉远\n快捷键: - !TP_ICM_SAVEREFERENCE_APPLYWB_TOOLTIP;Generally, apply the white balance when saving images to create ICC profiles, and do not apply the white balance to create DCP profiles. !TP_ICM_SAVEREFERENCE_TOOLTIP;Save the linear TIFF image before the input profile is applied. The result can be used for calibration purposes and generation of a camera profile. !TP_ICM_TONECURVE_TOOLTIP;Employ the embedded DCP tone curve. The setting is only available if the selected DCP has a tone curve. -!TP_ICM_WORKTRC;Tone response curve: -!TP_ICM_WORKTRC_CUSTOM;Custom -!TP_ICM_WORKTRC_GAMMA;Gamma -!TP_ICM_WORKTRC_NONE;None -!TP_ICM_WORKTRC_SLOPE;Slope -!TP_ICM_WORKTRC_TOOLTIP;Only for build in profiles +!TP_ICM_WORKING_TRC;Tone response curve: +!TP_ICM_WORKING_TRC_CUSTOM;Custom +!TP_ICM_WORKING_TRC_GAMMA;Gamma +!TP_ICM_WORKING_TRC_NONE;None +!TP_ICM_WORKING_TRC_SLOPE;Slope +!TP_ICM_WORKING_TRC_TOOLTIP;Only for built-in profiles. !TP_LABCURVE_CHROMA_TOOLTIP;To apply B&W toning, set Chromaticity to -100. !TP_LABCURVE_CURVEEDITOR_A_RANGE1;Green Saturated !TP_LABCURVE_CURVEEDITOR_A_RANGE2;Green Pastel diff --git a/rtdata/languages/Chinese (Traditional) b/rtdata/languages/Chinese (Traditional) index ad3e5c68d..d527f8c65 100644 --- a/rtdata/languages/Chinese (Traditional) +++ b/rtdata/languages/Chinese (Traditional) @@ -982,16 +982,16 @@ TP_WBALANCE_TEMPERATURE;色溫 !HISTORY_MSG_491;White Balance !HISTORY_MSG_492;RGB Curves !HISTORY_MSG_493;L*a*b* Adjustments -!HISTORY_MSG_CLAMPOOG;Out-of-gamut color clipping +!HISTORY_MSG_CLAMPOOG;Clip out-of-gamut colors !HISTORY_MSG_COLORTONING_LABGRID_VALUE;CT - Color correction !HISTORY_MSG_DUALDEMOSAIC_CONTRAST;AMaZE+VNG4 - Contrast threshold -!HISTORY_MSG_HISTMATCHING;Auto-Matched Tone Curve -!HISTORY_MSG_ICMGAMM;Working gamma -!HISTORY_MSG_ICMPRIMARI;Output profile primaries -!HISTORY_MSG_ICMPROFILE;Output profile type -!HISTORY_MSG_ICMSLOP;Working slope -!HISTORY_MSG_ICMTEMP;Output IccV4 D illuminant -!HISTORY_MSG_ICMTRCIN;TRC working method +!HISTORY_MSG_HISTMATCHING;Auto-matched tone curve +!HISTORY_MSG_ICM_OUTPUT_PRIMARIES;Output - Primaries +!HISTORY_MSG_ICM_OUTPUT_TEMP;Output - ICC-v4 illuminant D +!HISTORY_MSG_ICM_OUTPUT_TYPE;Output - Type +!HISTORY_MSG_ICM_WORKING_GAMMA;Working - Gamma +!HISTORY_MSG_ICM_WORKING_SLOPE;Working - Slope +!HISTORY_MSG_ICM_WORKING_TRC_METHOD;Working - TRC method !HISTORY_MSG_LOCALCONTRAST_AMOUNT;Local Contrast - Amount !HISTORY_MSG_LOCALCONTRAST_DARKNESS;Local Contrast - Darkness !HISTORY_MSG_LOCALCONTRAST_ENABLED;Local Contrast @@ -1004,15 +1004,20 @@ TP_WBALANCE_TEMPERATURE;色溫 !HISTORY_MSG_PREPROCESS_PDAFLINESFILTER;PDAF lines filter !HISTORY_MSG_PRSHARPEN_CONTRAST;PRS - Contrast threshold !HISTORY_MSG_RAW_BORDER;Raw border -!HISTORY_MSG_RESIZE_ALLOW_UPSCALING;Resize - Allow upscaling +!HISTORY_MSG_RESIZE_ALLOWUPSCALING;Resize - Allow upscaling !HISTORY_MSG_SHARPENING_CONTRAST;Sharpening - Contrast threshold !HISTORY_MSG_SOFTLIGHT_ENABLED;Soft light !HISTORY_MSG_SOFTLIGHT_STRENGTH;Soft light - Strength !HISTORY_MSG_TM_FATTAL_ANCHOR;DRC - Anchor !HISTORY_NEWSNAPSHOT_TOOLTIP;Shortcut: Alt-s +!ICCPROFCREATOR_COPYRIGHT;Copyright: +!ICCPROFCREATOR_COPYRIGHT_RESET_TOOLTIP;Reset to the default copyright, granted to "RawTherapee, CC0" !ICCPROFCREATOR_CUSTOM;Custom +!ICCPROFCREATOR_DESCRIPTION;Description: +!ICCPROFCREATOR_DESCRIPTION_ADDPARAM;Append gamma and slope values to the description +!ICCPROFCREATOR_DESCRIPTION_TOOLTIP;Leave empty to set the default description. !ICCPROFCREATOR_GAMMA;Gamma -!ICCPROFCREATOR_ICCVERSION;Generated profile's version: +!ICCPROFCREATOR_ICCVERSION;ICC version: !ICCPROFCREATOR_ILL;Illuminant: !ICCPROFCREATOR_ILL_41;D41 !ICCPROFCREATOR_ILL_50;D50 @@ -1022,7 +1027,7 @@ TP_WBALANCE_TEMPERATURE;色溫 !ICCPROFCREATOR_ILL_80;D80 !ICCPROFCREATOR_ILL_DEF;Default !ICCPROFCREATOR_ILL_INC;StdA 2856K -!ICCPROFCREATOR_ILL_TOOLTIP;You can only set Illuminant with ICC v4 profiles +!ICCPROFCREATOR_ILL_TOOLTIP;You can only set the illuminant for ICC v4 profiles. !ICCPROFCREATOR_PRIMARIES;Primaries: !ICCPROFCREATOR_PRIM_ACESP0;ACES AP0 !ICCPROFCREATOR_PRIM_ACESP1;ACES AP1 @@ -1039,7 +1044,7 @@ TP_WBALANCE_TEMPERATURE;色溫 !ICCPROFCREATOR_PRIM_REDX;Red X !ICCPROFCREATOR_PRIM_REDY;Red Y !ICCPROFCREATOR_PRIM_SRGB;sRGB -!ICCPROFCREATOR_PRIM_TOOLTIP;You can only set Custom Primaries with ICC v4 profiles +!ICCPROFCREATOR_PRIM_TOOLTIP;You can only set custom primaries for ICC v4 profiles. !ICCPROFCREATOR_PRIM_WIDEG;Widegamut !ICCPROFCREATOR_PROF_V2;ICC v2 !ICCPROFCREATOR_PROF_V4;ICC v4 @@ -1193,7 +1198,7 @@ TP_WBALANCE_TEMPERATURE;色溫 !PARTIALPASTE_SHARPENEDGE;Edges !PARTIALPASTE_SHARPENMICRO;Microcontrast !PARTIALPASTE_SOFTLIGHT;Soft light -!PARTIALPASTE_TM_FATTAL;Dynamic Range Compression +!PARTIALPASTE_TM_FATTAL;Dynamic range compression !PARTIALPASTE_VIBRANCE;Vibrance !PREFERENCES_ADD;Add !PREFERENCES_AUTLISLOW;Low @@ -1761,12 +1766,12 @@ TP_WBALANCE_TEMPERATURE;色溫 !TP_ICM_SAVEREFERENCE_TOOLTIP;Save the linear TIFF image before the input profile is applied. The result can be used for calibration purposes and generation of a camera profile. !TP_ICM_TONECURVE;Tone curve !TP_ICM_TONECURVE_TOOLTIP;Employ the embedded DCP tone curve. The setting is only available if the selected DCP has a tone curve. -!TP_ICM_WORKTRC;Tone response curve: -!TP_ICM_WORKTRC_CUSTOM;Custom -!TP_ICM_WORKTRC_GAMMA;Gamma -!TP_ICM_WORKTRC_NONE;None -!TP_ICM_WORKTRC_SLOPE;Slope -!TP_ICM_WORKTRC_TOOLTIP;Only for build in profiles +!TP_ICM_WORKING_TRC;Tone response curve: +!TP_ICM_WORKING_TRC_CUSTOM;Custom +!TP_ICM_WORKING_TRC_GAMMA;Gamma +!TP_ICM_WORKING_TRC_NONE;None +!TP_ICM_WORKING_TRC_SLOPE;Slope +!TP_ICM_WORKING_TRC_TOOLTIP;Only for built-in profiles. !TP_IMPULSEDENOISE_LABEL;Impulse Noise Reduction !TP_IMPULSEDENOISE_THRESH;Threshold !TP_LABCURVE_AVOIDCOLORSHIFT;Avoid color shift diff --git a/rtdata/languages/Czech b/rtdata/languages/Czech index e57ebe06d..8051a6f3b 100644 --- a/rtdata/languages/Czech +++ b/rtdata/languages/Czech @@ -2235,29 +2235,29 @@ ZOOMPANEL_ZOOMOUT;Oddálit\nZkratka: - !HISTORY_MSG_489;DRC - Threshold !HISTORY_MSG_490;DRC - Amount !HISTORY_MSG_DUALDEMOSAIC_CONTRAST;AMaZE+VNG4 - Contrast threshold -!HISTORY_MSG_ICMGAMM;Working gamma -!HISTORY_MSG_ICMPRIMARI;Output profile primaries -!HISTORY_MSG_ICMPROFILE;Output profile type -!HISTORY_MSG_ICMSLOP;Working slope -!HISTORY_MSG_ICMTEMP;Output IccV4 D illuminant -!HISTORY_MSG_ICMTRCIN;TRC working method +!HISTORY_MSG_ICM_OUTPUT_PRIMARIES;Output - Primaries +!HISTORY_MSG_ICM_OUTPUT_TEMP;Output - ICC-v4 illuminant D +!HISTORY_MSG_ICM_OUTPUT_TYPE;Output - Type +!HISTORY_MSG_ICM_WORKING_GAMMA;Working - Gamma +!HISTORY_MSG_ICM_WORKING_SLOPE;Working - Slope +!HISTORY_MSG_ICM_WORKING_TRC_METHOD;Working - TRC method !HISTORY_MSG_MICROCONTRAST_CONTRAST;Microcontrast - Contrast threshold !HISTORY_MSG_PIXELSHIFT_DEMOSAIC;PS - Demosaic method for motion !HISTORY_MSG_PRSHARPEN_CONTRAST;PRS - Contrast threshold !HISTORY_MSG_RAW_BORDER;Raw border -!HISTORY_MSG_RESIZE_ALLOW_UPSCALING;Resize - Allow upscaling +!HISTORY_MSG_RESIZE_ALLOWUPSCALING;Resize - Allow upscaling !HISTORY_MSG_SHARPENING_CONTRAST;Sharpening - Contrast threshold !HISTORY_MSG_SOFTLIGHT_ENABLED;Soft light !HISTORY_MSG_SOFTLIGHT_STRENGTH;Soft light - Strength !HISTORY_MSG_TM_FATTAL_ANCHOR;DRC - Anchor -!ICCPROFCREATOR_ADD_PARAM_IN_DESC;Append Gamma and Slope values to the description !ICCPROFCREATOR_COPYRIGHT;Copyright: !ICCPROFCREATOR_COPYRIGHT_RESET_TOOLTIP;Reset to the default copyright, granted to "RawTherapee, CC0" !ICCPROFCREATOR_CUSTOM;Custom !ICCPROFCREATOR_DESCRIPTION;Description: -!ICCPROFCREATOR_DESCRIPTION_TOOLTIP;Leave empty to set the default description +!ICCPROFCREATOR_DESCRIPTION_ADDPARAM;Append gamma and slope values to the description +!ICCPROFCREATOR_DESCRIPTION_TOOLTIP;Leave empty to set the default description. !ICCPROFCREATOR_GAMMA;Gamma -!ICCPROFCREATOR_ICCVERSION;Generated profile's version: +!ICCPROFCREATOR_ICCVERSION;ICC version: !ICCPROFCREATOR_ILL;Illuminant: !ICCPROFCREATOR_ILL_41;D41 !ICCPROFCREATOR_ILL_50;D50 @@ -2267,7 +2267,7 @@ ZOOMPANEL_ZOOMOUT;Oddálit\nZkratka: - !ICCPROFCREATOR_ILL_80;D80 !ICCPROFCREATOR_ILL_DEF;Default !ICCPROFCREATOR_ILL_INC;StdA 2856K -!ICCPROFCREATOR_ILL_TOOLTIP;You can only set Illuminant with ICC v4 profiles +!ICCPROFCREATOR_ILL_TOOLTIP;You can only set the illuminant for ICC v4 profiles. !ICCPROFCREATOR_PRIMARIES;Primaries: !ICCPROFCREATOR_PRIM_ACESP0;ACES AP0 !ICCPROFCREATOR_PRIM_ACESP1;ACES AP1 @@ -2284,7 +2284,7 @@ ZOOMPANEL_ZOOMOUT;Oddálit\nZkratka: - !ICCPROFCREATOR_PRIM_REDX;Red X !ICCPROFCREATOR_PRIM_REDY;Red Y !ICCPROFCREATOR_PRIM_SRGB;sRGB -!ICCPROFCREATOR_PRIM_TOOLTIP;You can only set Custom Primaries with ICC v4 profiles +!ICCPROFCREATOR_PRIM_TOOLTIP;You can only set custom primaries for ICC v4 profiles. !ICCPROFCREATOR_PRIM_WIDEG;Widegamut !ICCPROFCREATOR_PROF_V2;ICC v2 !ICCPROFCREATOR_PROF_V4;ICC v4 @@ -2296,17 +2296,17 @@ ZOOMPANEL_ZOOMOUT;Oddálit\nZkratka: - !PARTIALPASTE_PREPROCESS_PDAFLINESFILTER;PDAF lines filter !PARTIALPASTE_RAW_BORDER;Raw border !PARTIALPASTE_SOFTLIGHT;Soft light -!PARTIALPASTE_TM_FATTAL;Dynamic Range Compression +!PARTIALPASTE_TM_FATTAL;Dynamic range compression !SAMPLEFORMAT_32;24-bit floating-point !SAMPLEFORMAT_64;32-bit floating-point !TP_BWMIX_MIXC;Channel Mixer !TP_BWMIX_NEUTRAL;Reset -!TP_ICM_WORKTRC;Tone response curve: -!TP_ICM_WORKTRC_CUSTOM;Custom -!TP_ICM_WORKTRC_GAMMA;Gamma -!TP_ICM_WORKTRC_NONE;None -!TP_ICM_WORKTRC_SLOPE;Slope -!TP_ICM_WORKTRC_TOOLTIP;Only for build in profiles +!TP_ICM_WORKING_TRC;Tone response curve: +!TP_ICM_WORKING_TRC_CUSTOM;Custom +!TP_ICM_WORKING_TRC_GAMMA;Gamma +!TP_ICM_WORKING_TRC_NONE;None +!TP_ICM_WORKING_TRC_SLOPE;Slope +!TP_ICM_WORKING_TRC_TOOLTIP;Only for built-in profiles. !TP_RAW_2PASS;1-pass+fast !TP_RAW_4PASS;3-pass+fast !TP_RAW_AMAZEVNG4;AMaZE+VNG4 diff --git a/rtdata/languages/Dansk b/rtdata/languages/Dansk index f34c8c8f2..77ae6dc9b 100644 --- a/rtdata/languages/Dansk +++ b/rtdata/languages/Dansk @@ -977,16 +977,16 @@ TP_WBALANCE_TEMPERATURE;Temperatur !HISTORY_MSG_491;White Balance !HISTORY_MSG_492;RGB Curves !HISTORY_MSG_493;L*a*b* Adjustments -!HISTORY_MSG_CLAMPOOG;Out-of-gamut color clipping +!HISTORY_MSG_CLAMPOOG;Clip out-of-gamut colors !HISTORY_MSG_COLORTONING_LABGRID_VALUE;CT - Color correction !HISTORY_MSG_DUALDEMOSAIC_CONTRAST;AMaZE+VNG4 - Contrast threshold -!HISTORY_MSG_HISTMATCHING;Auto-Matched Tone Curve -!HISTORY_MSG_ICMGAMM;Working gamma -!HISTORY_MSG_ICMPRIMARI;Output profile primaries -!HISTORY_MSG_ICMPROFILE;Output profile type -!HISTORY_MSG_ICMSLOP;Working slope -!HISTORY_MSG_ICMTEMP;Output IccV4 D illuminant -!HISTORY_MSG_ICMTRCIN;TRC working method +!HISTORY_MSG_HISTMATCHING;Auto-matched tone curve +!HISTORY_MSG_ICM_OUTPUT_PRIMARIES;Output - Primaries +!HISTORY_MSG_ICM_OUTPUT_TEMP;Output - ICC-v4 illuminant D +!HISTORY_MSG_ICM_OUTPUT_TYPE;Output - Type +!HISTORY_MSG_ICM_WORKING_GAMMA;Working - Gamma +!HISTORY_MSG_ICM_WORKING_SLOPE;Working - Slope +!HISTORY_MSG_ICM_WORKING_TRC_METHOD;Working - TRC method !HISTORY_MSG_LOCALCONTRAST_AMOUNT;Local Contrast - Amount !HISTORY_MSG_LOCALCONTRAST_DARKNESS;Local Contrast - Darkness !HISTORY_MSG_LOCALCONTRAST_ENABLED;Local Contrast @@ -999,15 +999,20 @@ TP_WBALANCE_TEMPERATURE;Temperatur !HISTORY_MSG_PREPROCESS_PDAFLINESFILTER;PDAF lines filter !HISTORY_MSG_PRSHARPEN_CONTRAST;PRS - Contrast threshold !HISTORY_MSG_RAW_BORDER;Raw border -!HISTORY_MSG_RESIZE_ALLOW_UPSCALING;Resize - Allow upscaling +!HISTORY_MSG_RESIZE_ALLOWUPSCALING;Resize - Allow upscaling !HISTORY_MSG_SHARPENING_CONTRAST;Sharpening - Contrast threshold !HISTORY_MSG_SOFTLIGHT_ENABLED;Soft light !HISTORY_MSG_SOFTLIGHT_STRENGTH;Soft light - Strength !HISTORY_MSG_TM_FATTAL_ANCHOR;DRC - Anchor !HISTORY_NEWSNAPSHOT_TOOLTIP;Shortcut: Alt-s +!ICCPROFCREATOR_COPYRIGHT;Copyright: +!ICCPROFCREATOR_COPYRIGHT_RESET_TOOLTIP;Reset to the default copyright, granted to "RawTherapee, CC0" !ICCPROFCREATOR_CUSTOM;Custom +!ICCPROFCREATOR_DESCRIPTION;Description: +!ICCPROFCREATOR_DESCRIPTION_ADDPARAM;Append gamma and slope values to the description +!ICCPROFCREATOR_DESCRIPTION_TOOLTIP;Leave empty to set the default description. !ICCPROFCREATOR_GAMMA;Gamma -!ICCPROFCREATOR_ICCVERSION;Generated profile's version: +!ICCPROFCREATOR_ICCVERSION;ICC version: !ICCPROFCREATOR_ILL;Illuminant: !ICCPROFCREATOR_ILL_41;D41 !ICCPROFCREATOR_ILL_50;D50 @@ -1017,7 +1022,7 @@ TP_WBALANCE_TEMPERATURE;Temperatur !ICCPROFCREATOR_ILL_80;D80 !ICCPROFCREATOR_ILL_DEF;Default !ICCPROFCREATOR_ILL_INC;StdA 2856K -!ICCPROFCREATOR_ILL_TOOLTIP;You can only set Illuminant with ICC v4 profiles +!ICCPROFCREATOR_ILL_TOOLTIP;You can only set the illuminant for ICC v4 profiles. !ICCPROFCREATOR_PRIMARIES;Primaries: !ICCPROFCREATOR_PRIM_ACESP0;ACES AP0 !ICCPROFCREATOR_PRIM_ACESP1;ACES AP1 @@ -1034,7 +1039,7 @@ TP_WBALANCE_TEMPERATURE;Temperatur !ICCPROFCREATOR_PRIM_REDX;Red X !ICCPROFCREATOR_PRIM_REDY;Red Y !ICCPROFCREATOR_PRIM_SRGB;sRGB -!ICCPROFCREATOR_PRIM_TOOLTIP;You can only set Custom Primaries with ICC v4 profiles +!ICCPROFCREATOR_PRIM_TOOLTIP;You can only set custom primaries for ICC v4 profiles. !ICCPROFCREATOR_PRIM_WIDEG;Widegamut !ICCPROFCREATOR_PROF_V2;ICC v2 !ICCPROFCREATOR_PROF_V4;ICC v4 @@ -1190,7 +1195,7 @@ TP_WBALANCE_TEMPERATURE;Temperatur !PARTIALPASTE_SHARPENEDGE;Edges !PARTIALPASTE_SHARPENMICRO;Microcontrast !PARTIALPASTE_SOFTLIGHT;Soft light -!PARTIALPASTE_TM_FATTAL;Dynamic Range Compression +!PARTIALPASTE_TM_FATTAL;Dynamic range compression !PARTIALPASTE_VIBRANCE;Vibrance !PREFERENCES_ADD;Add !PREFERENCES_AUTLISLOW;Low @@ -1758,12 +1763,12 @@ TP_WBALANCE_TEMPERATURE;Temperatur !TP_ICM_SAVEREFERENCE_TOOLTIP;Save the linear TIFF image before the input profile is applied. The result can be used for calibration purposes and generation of a camera profile. !TP_ICM_TONECURVE;Tone curve !TP_ICM_TONECURVE_TOOLTIP;Employ the embedded DCP tone curve. The setting is only available if the selected DCP has a tone curve. -!TP_ICM_WORKTRC;Tone response curve: -!TP_ICM_WORKTRC_CUSTOM;Custom -!TP_ICM_WORKTRC_GAMMA;Gamma -!TP_ICM_WORKTRC_NONE;None -!TP_ICM_WORKTRC_SLOPE;Slope -!TP_ICM_WORKTRC_TOOLTIP;Only for build in profiles +!TP_ICM_WORKING_TRC;Tone response curve: +!TP_ICM_WORKING_TRC_CUSTOM;Custom +!TP_ICM_WORKING_TRC_GAMMA;Gamma +!TP_ICM_WORKING_TRC_NONE;None +!TP_ICM_WORKING_TRC_SLOPE;Slope +!TP_ICM_WORKING_TRC_TOOLTIP;Only for built-in profiles. !TP_IMPULSEDENOISE_LABEL;Impulse Noise Reduction !TP_IMPULSEDENOISE_THRESH;Threshold !TP_LABCURVE_AVOIDCOLORSHIFT;Avoid color shift diff --git a/rtdata/languages/Deutsch b/rtdata/languages/Deutsch index 01349994d..d529dc30f 100644 --- a/rtdata/languages/Deutsch +++ b/rtdata/languages/Deutsch @@ -806,7 +806,7 @@ HISTORY_MSG_PREPROCESS_LINEDENOISE_DIRECTION;(Sensor-Matrix)\nVorverarbeitung\nR HISTORY_MSG_PREPROCESS_PDAFLINESFILTER;(Sensor-Matrix)\nVorverarbeitung\nPDAF-Zeilenfilter HISTORY_MSG_PRSHARPEN_CONTRAST;(Skalieren) - Schärfen\nKontrastschwelle HISTORY_MSG_RAW_BORDER;(Sensor-Matrix)\nFarbinterpolation\nBildrand -HISTORY_MSG_RESIZE_ALLOW_UPSCALING;(Skalieren)\nHochskalieren zulassen +HISTORY_MSG_RESIZE_ALLOWUPSCALING;(Skalieren)\nHochskalieren zulassen HISTORY_MSG_SHARPENING_CONTRAST;(Schärfung)\nKontrastschwelle HISTORY_MSG_SOFTLIGHT_ENABLED;(Weiches Licht) HISTORY_MSG_SOFTLIGHT_STRENGTH;(Weiches Licht)\nIntensität @@ -2323,20 +2323,20 @@ ZOOMPANEL_ZOOMOUT;Herauszoomen\nTaste: - !!!!!!!!!!!!!!!!!!!!!!!!! !GENERAL_SAVE_AS;Save as... -!HISTORY_MSG_ICMGAMM;Working gamma -!HISTORY_MSG_ICMPRIMARI;Output profile primaries -!HISTORY_MSG_ICMPROFILE;Output profile type -!HISTORY_MSG_ICMSLOP;Working slope -!HISTORY_MSG_ICMTEMP;Output IccV4 D illuminant -!HISTORY_MSG_ICMTRCIN;TRC working method -!ICCPROFCREATOR_ADD_PARAM_IN_DESC;Append Gamma and Slope values to the description +!HISTORY_MSG_ICM_OUTPUT_PRIMARIES;Output - Primaries +!HISTORY_MSG_ICM_OUTPUT_TEMP;Output - ICC-v4 illuminant D +!HISTORY_MSG_ICM_OUTPUT_TYPE;Output - Type +!HISTORY_MSG_ICM_WORKING_GAMMA;Working - Gamma +!HISTORY_MSG_ICM_WORKING_SLOPE;Working - Slope +!HISTORY_MSG_ICM_WORKING_TRC_METHOD;Working - TRC method !ICCPROFCREATOR_COPYRIGHT;Copyright: !ICCPROFCREATOR_COPYRIGHT_RESET_TOOLTIP;Reset to the default copyright, granted to "RawTherapee, CC0" !ICCPROFCREATOR_CUSTOM;Custom !ICCPROFCREATOR_DESCRIPTION;Description: -!ICCPROFCREATOR_DESCRIPTION_TOOLTIP;Leave empty to set the default description +!ICCPROFCREATOR_DESCRIPTION_ADDPARAM;Append gamma and slope values to the description +!ICCPROFCREATOR_DESCRIPTION_TOOLTIP;Leave empty to set the default description. !ICCPROFCREATOR_GAMMA;Gamma -!ICCPROFCREATOR_ICCVERSION;Generated profile's version: +!ICCPROFCREATOR_ICCVERSION;ICC version: !ICCPROFCREATOR_ILL;Illuminant: !ICCPROFCREATOR_ILL_41;D41 !ICCPROFCREATOR_ILL_50;D50 @@ -2346,7 +2346,7 @@ ZOOMPANEL_ZOOMOUT;Herauszoomen\nTaste: - !ICCPROFCREATOR_ILL_80;D80 !ICCPROFCREATOR_ILL_DEF;Default !ICCPROFCREATOR_ILL_INC;StdA 2856K -!ICCPROFCREATOR_ILL_TOOLTIP;You can only set Illuminant with ICC v4 profiles +!ICCPROFCREATOR_ILL_TOOLTIP;You can only set the illuminant for ICC v4 profiles. !ICCPROFCREATOR_PRIMARIES;Primaries: !ICCPROFCREATOR_PRIM_ACESP0;ACES AP0 !ICCPROFCREATOR_PRIM_ACESP1;ACES AP1 @@ -2363,7 +2363,7 @@ ZOOMPANEL_ZOOMOUT;Herauszoomen\nTaste: - !ICCPROFCREATOR_PRIM_REDX;Red X !ICCPROFCREATOR_PRIM_REDY;Red Y !ICCPROFCREATOR_PRIM_SRGB;sRGB -!ICCPROFCREATOR_PRIM_TOOLTIP;You can only set Custom Primaries with ICC v4 profiles +!ICCPROFCREATOR_PRIM_TOOLTIP;You can only set custom primaries for ICC v4 profiles. !ICCPROFCREATOR_PRIM_WIDEG;Widegamut !ICCPROFCREATOR_PROF_V2;ICC v2 !ICCPROFCREATOR_PROF_V4;ICC v4 @@ -2371,9 +2371,9 @@ ZOOMPANEL_ZOOMOUT;Herauszoomen\nTaste: - !ICCPROFCREATOR_SLOPE;Slope !ICCPROFCREATOR_TRC_PRESET;Tone response curve: !MAIN_BUTTON_ICCPROFCREATOR;ICC Profile Creator -!TP_ICM_WORKTRC;Tone response curve: -!TP_ICM_WORKTRC_CUSTOM;Custom -!TP_ICM_WORKTRC_GAMMA;Gamma -!TP_ICM_WORKTRC_NONE;None -!TP_ICM_WORKTRC_SLOPE;Slope -!TP_ICM_WORKTRC_TOOLTIP;Only for build in profiles +!TP_ICM_WORKING_TRC;Tone response curve: +!TP_ICM_WORKING_TRC_CUSTOM;Custom +!TP_ICM_WORKING_TRC_GAMMA;Gamma +!TP_ICM_WORKING_TRC_NONE;None +!TP_ICM_WORKING_TRC_SLOPE;Slope +!TP_ICM_WORKING_TRC_TOOLTIP;Only for built-in profiles. diff --git a/rtdata/languages/English (UK) b/rtdata/languages/English (UK) index b36207d72..8f08152d5 100644 --- a/rtdata/languages/English (UK) +++ b/rtdata/languages/English (UK) @@ -24,7 +24,7 @@ HISTORY_MSG_322;W - Gamut - Avoid colour shift HISTORY_MSG_385;W - Residual - Colour Balance HISTORY_MSG_392;W - Residual - Colour Balance HISTORY_MSG_419;Retinex - Colour space -HISTORY_MSG_CLAMPOOG;Out-of-gamut colour clipping +HISTORY_MSG_CLAMPOOG;Clip out-of-gamut colours HISTORY_MSG_COLORTONING_LABGRID_VALUE;CT - Colour correction MAIN_TAB_COLOR;Colour MAIN_TOOLTIP_BACKCOLOR0;Background colour of the preview: Theme-based\nShortcut: 9 @@ -816,13 +816,13 @@ TP_WBALANCE_EQBLUERED_TOOLTIP;Allows to deviate from the normal behaviour of "wh !HISTORY_MSG_492;RGB Curves !HISTORY_MSG_493;L*a*b* Adjustments !HISTORY_MSG_DUALDEMOSAIC_CONTRAST;AMaZE+VNG4 - Contrast threshold -!HISTORY_MSG_HISTMATCHING;Auto-Matched Tone Curve -!HISTORY_MSG_ICMGAMM;Working gamma -!HISTORY_MSG_ICMPRIMARI;Output profile primaries -!HISTORY_MSG_ICMPROFILE;Output profile type -!HISTORY_MSG_ICMSLOP;Working slope -!HISTORY_MSG_ICMTEMP;Output IccV4 D illuminant -!HISTORY_MSG_ICMTRCIN;TRC working method +!HISTORY_MSG_HISTMATCHING;Auto-matched tone curve +!HISTORY_MSG_ICM_OUTPUT_PRIMARIES;Output - Primaries +!HISTORY_MSG_ICM_OUTPUT_TEMP;Output - ICC-v4 illuminant D +!HISTORY_MSG_ICM_OUTPUT_TYPE;Output - Type +!HISTORY_MSG_ICM_WORKING_GAMMA;Working - Gamma +!HISTORY_MSG_ICM_WORKING_SLOPE;Working - Slope +!HISTORY_MSG_ICM_WORKING_TRC_METHOD;Working - TRC method !HISTORY_MSG_LOCALCONTRAST_AMOUNT;Local Contrast - Amount !HISTORY_MSG_LOCALCONTRAST_DARKNESS;Local Contrast - Darkness !HISTORY_MSG_LOCALCONTRAST_ENABLED;Local Contrast @@ -835,7 +835,7 @@ TP_WBALANCE_EQBLUERED_TOOLTIP;Allows to deviate from the normal behaviour of "wh !HISTORY_MSG_PREPROCESS_PDAFLINESFILTER;PDAF lines filter !HISTORY_MSG_PRSHARPEN_CONTRAST;PRS - Contrast threshold !HISTORY_MSG_RAW_BORDER;Raw border -!HISTORY_MSG_RESIZE_ALLOW_UPSCALING;Resize - Allow upscaling +!HISTORY_MSG_RESIZE_ALLOWUPSCALING;Resize - Allow upscaling !HISTORY_MSG_SHARPENING_CONTRAST;Sharpening - Contrast threshold !HISTORY_MSG_SOFTLIGHT_ENABLED;Soft light !HISTORY_MSG_SOFTLIGHT_STRENGTH;Soft light - Strength @@ -844,9 +844,14 @@ TP_WBALANCE_EQBLUERED_TOOLTIP;Allows to deviate from the normal behaviour of "wh !HISTORY_NEWSNAPSHOT_TOOLTIP;Shortcut: Alt-s !HISTORY_SNAPSHOT;Snapshot !HISTORY_SNAPSHOTS;Snapshots +!ICCPROFCREATOR_COPYRIGHT;Copyright: +!ICCPROFCREATOR_COPYRIGHT_RESET_TOOLTIP;Reset to the default copyright, granted to "RawTherapee, CC0" !ICCPROFCREATOR_CUSTOM;Custom +!ICCPROFCREATOR_DESCRIPTION;Description: +!ICCPROFCREATOR_DESCRIPTION_ADDPARAM;Append gamma and slope values to the description +!ICCPROFCREATOR_DESCRIPTION_TOOLTIP;Leave empty to set the default description. !ICCPROFCREATOR_GAMMA;Gamma -!ICCPROFCREATOR_ICCVERSION;Generated profile's version: +!ICCPROFCREATOR_ICCVERSION;ICC version: !ICCPROFCREATOR_ILL;Illuminant: !ICCPROFCREATOR_ILL_41;D41 !ICCPROFCREATOR_ILL_50;D50 @@ -856,7 +861,7 @@ TP_WBALANCE_EQBLUERED_TOOLTIP;Allows to deviate from the normal behaviour of "wh !ICCPROFCREATOR_ILL_80;D80 !ICCPROFCREATOR_ILL_DEF;Default !ICCPROFCREATOR_ILL_INC;StdA 2856K -!ICCPROFCREATOR_ILL_TOOLTIP;You can only set Illuminant with ICC v4 profiles +!ICCPROFCREATOR_ILL_TOOLTIP;You can only set the illuminant for ICC v4 profiles. !ICCPROFCREATOR_PRIMARIES;Primaries: !ICCPROFCREATOR_PRIM_ACESP0;ACES AP0 !ICCPROFCREATOR_PRIM_ACESP1;ACES AP1 @@ -873,7 +878,7 @@ TP_WBALANCE_EQBLUERED_TOOLTIP;Allows to deviate from the normal behaviour of "wh !ICCPROFCREATOR_PRIM_REDX;Red X !ICCPROFCREATOR_PRIM_REDY;Red Y !ICCPROFCREATOR_PRIM_SRGB;sRGB -!ICCPROFCREATOR_PRIM_TOOLTIP;You can only set Custom Primaries with ICC v4 profiles +!ICCPROFCREATOR_PRIM_TOOLTIP;You can only set custom primaries for ICC v4 profiles. !ICCPROFCREATOR_PRIM_WIDEG;Widegamut !ICCPROFCREATOR_PROF_V2;ICC v2 !ICCPROFCREATOR_PROF_V4;ICC v4 @@ -1082,7 +1087,7 @@ TP_WBALANCE_EQBLUERED_TOOLTIP;Allows to deviate from the normal behaviour of "wh !PARTIALPASTE_SHARPENING;Sharpening (USM/RL) !PARTIALPASTE_SHARPENMICRO;Microcontrast !PARTIALPASTE_SOFTLIGHT;Soft light -!PARTIALPASTE_TM_FATTAL;Dynamic Range Compression +!PARTIALPASTE_TM_FATTAL;Dynamic range compression !PARTIALPASTE_VIBRANCE;Vibrance !PARTIALPASTE_VIGNETTING;Vignetting correction !PARTIALPASTE_WHITEBALANCE;White balance @@ -1725,12 +1730,12 @@ TP_WBALANCE_EQBLUERED_TOOLTIP;Allows to deviate from the normal behaviour of "wh !TP_ICM_TONECURVE;Tone curve !TP_ICM_TONECURVE_TOOLTIP;Employ the embedded DCP tone curve. The setting is only available if the selected DCP has a tone curve. !TP_ICM_WORKINGPROFILE;Working Profile -!TP_ICM_WORKTRC;Tone response curve: -!TP_ICM_WORKTRC_CUSTOM;Custom -!TP_ICM_WORKTRC_GAMMA;Gamma -!TP_ICM_WORKTRC_NONE;None -!TP_ICM_WORKTRC_SLOPE;Slope -!TP_ICM_WORKTRC_TOOLTIP;Only for build in profiles +!TP_ICM_WORKING_TRC;Tone response curve: +!TP_ICM_WORKING_TRC_CUSTOM;Custom +!TP_ICM_WORKING_TRC_GAMMA;Gamma +!TP_ICM_WORKING_TRC_NONE;None +!TP_ICM_WORKING_TRC_SLOPE;Slope +!TP_ICM_WORKING_TRC_TOOLTIP;Only for built-in profiles. !TP_IMPULSEDENOISE_LABEL;Impulse Noise Reduction !TP_IMPULSEDENOISE_THRESH;Threshold !TP_LABCURVE_BRIGHTNESS;Lightness diff --git a/rtdata/languages/English (US) b/rtdata/languages/English (US) index 4b6707a3f..0ab893c07 100644 --- a/rtdata/languages/English (US) +++ b/rtdata/languages/English (US) @@ -727,16 +727,16 @@ !HISTORY_MSG_491;White Balance !HISTORY_MSG_492;RGB Curves !HISTORY_MSG_493;L*a*b* Adjustments -!HISTORY_MSG_CLAMPOOG;Out-of-gamut color clipping +!HISTORY_MSG_CLAMPOOG;Clip out-of-gamut colors !HISTORY_MSG_COLORTONING_LABGRID_VALUE;CT - Color correction !HISTORY_MSG_DUALDEMOSAIC_CONTRAST;AMaZE+VNG4 - Contrast threshold -!HISTORY_MSG_HISTMATCHING;Auto-Matched Tone Curve -!HISTORY_MSG_ICMGAMM;Working gamma -!HISTORY_MSG_ICMPRIMARI;Output profile primaries -!HISTORY_MSG_ICMPROFILE;Output profile type -!HISTORY_MSG_ICMSLOP;Working slope -!HISTORY_MSG_ICMTEMP;Output IccV4 D illuminant -!HISTORY_MSG_ICMTRCIN;TRC working method +!HISTORY_MSG_HISTMATCHING;Auto-matched tone curve +!HISTORY_MSG_ICM_OUTPUT_PRIMARIES;Output - Primaries +!HISTORY_MSG_ICM_OUTPUT_TEMP;Output - ICC-v4 illuminant D +!HISTORY_MSG_ICM_OUTPUT_TYPE;Output - Type +!HISTORY_MSG_ICM_WORKING_GAMMA;Working - Gamma +!HISTORY_MSG_ICM_WORKING_SLOPE;Working - Slope +!HISTORY_MSG_ICM_WORKING_TRC_METHOD;Working - TRC method !HISTORY_MSG_LOCALCONTRAST_AMOUNT;Local Contrast - Amount !HISTORY_MSG_LOCALCONTRAST_DARKNESS;Local Contrast - Darkness !HISTORY_MSG_LOCALCONTRAST_ENABLED;Local Contrast @@ -749,7 +749,7 @@ !HISTORY_MSG_PREPROCESS_PDAFLINESFILTER;PDAF lines filter !HISTORY_MSG_PRSHARPEN_CONTRAST;PRS - Contrast threshold !HISTORY_MSG_RAW_BORDER;Raw border -!HISTORY_MSG_RESIZE_ALLOW_UPSCALING;Resize - Allow upscaling +!HISTORY_MSG_RESIZE_ALLOWUPSCALING;Resize - Allow upscaling !HISTORY_MSG_SHARPENING_CONTRAST;Sharpening - Contrast threshold !HISTORY_MSG_SOFTLIGHT_ENABLED;Soft light !HISTORY_MSG_SOFTLIGHT_STRENGTH;Soft light - Strength @@ -758,9 +758,14 @@ !HISTORY_NEWSNAPSHOT_TOOLTIP;Shortcut: Alt-s !HISTORY_SNAPSHOT;Snapshot !HISTORY_SNAPSHOTS;Snapshots +!ICCPROFCREATOR_COPYRIGHT;Copyright: +!ICCPROFCREATOR_COPYRIGHT_RESET_TOOLTIP;Reset to the default copyright, granted to "RawTherapee, CC0" !ICCPROFCREATOR_CUSTOM;Custom +!ICCPROFCREATOR_DESCRIPTION;Description: +!ICCPROFCREATOR_DESCRIPTION_ADDPARAM;Append gamma and slope values to the description +!ICCPROFCREATOR_DESCRIPTION_TOOLTIP;Leave empty to set the default description. !ICCPROFCREATOR_GAMMA;Gamma -!ICCPROFCREATOR_ICCVERSION;Generated profile's version: +!ICCPROFCREATOR_ICCVERSION;ICC version: !ICCPROFCREATOR_ILL;Illuminant: !ICCPROFCREATOR_ILL_41;D41 !ICCPROFCREATOR_ILL_50;D50 @@ -770,7 +775,7 @@ !ICCPROFCREATOR_ILL_80;D80 !ICCPROFCREATOR_ILL_DEF;Default !ICCPROFCREATOR_ILL_INC;StdA 2856K -!ICCPROFCREATOR_ILL_TOOLTIP;You can only set Illuminant with ICC v4 profiles +!ICCPROFCREATOR_ILL_TOOLTIP;You can only set the illuminant for ICC v4 profiles. !ICCPROFCREATOR_PRIMARIES;Primaries: !ICCPROFCREATOR_PRIM_ACESP0;ACES AP0 !ICCPROFCREATOR_PRIM_ACESP1;ACES AP1 @@ -787,7 +792,7 @@ !ICCPROFCREATOR_PRIM_REDX;Red X !ICCPROFCREATOR_PRIM_REDY;Red Y !ICCPROFCREATOR_PRIM_SRGB;sRGB -!ICCPROFCREATOR_PRIM_TOOLTIP;You can only set Custom Primaries with ICC v4 profiles +!ICCPROFCREATOR_PRIM_TOOLTIP;You can only set custom primaries for ICC v4 profiles. !ICCPROFCREATOR_PRIM_WIDEG;Widegamut !ICCPROFCREATOR_PROF_V2;ICC v2 !ICCPROFCREATOR_PROF_V4;ICC v4 @@ -1005,7 +1010,7 @@ !PARTIALPASTE_SHARPENING;Sharpening (USM/RL) !PARTIALPASTE_SHARPENMICRO;Microcontrast !PARTIALPASTE_SOFTLIGHT;Soft light -!PARTIALPASTE_TM_FATTAL;Dynamic Range Compression +!PARTIALPASTE_TM_FATTAL;Dynamic range compression !PARTIALPASTE_VIBRANCE;Vibrance !PARTIALPASTE_VIGNETTING;Vignetting correction !PARTIALPASTE_WHITEBALANCE;White balance @@ -1708,12 +1713,12 @@ !TP_ICM_TONECURVE;Tone curve !TP_ICM_TONECURVE_TOOLTIP;Employ the embedded DCP tone curve. The setting is only available if the selected DCP has a tone curve. !TP_ICM_WORKINGPROFILE;Working Profile -!TP_ICM_WORKTRC;Tone response curve: -!TP_ICM_WORKTRC_CUSTOM;Custom -!TP_ICM_WORKTRC_GAMMA;Gamma -!TP_ICM_WORKTRC_NONE;None -!TP_ICM_WORKTRC_SLOPE;Slope -!TP_ICM_WORKTRC_TOOLTIP;Only for build in profiles +!TP_ICM_WORKING_TRC;Tone response curve: +!TP_ICM_WORKING_TRC_CUSTOM;Custom +!TP_ICM_WORKING_TRC_GAMMA;Gamma +!TP_ICM_WORKING_TRC_NONE;None +!TP_ICM_WORKING_TRC_SLOPE;Slope +!TP_ICM_WORKING_TRC_TOOLTIP;Only for built-in profiles. !TP_IMPULSEDENOISE_LABEL;Impulse Noise Reduction !TP_IMPULSEDENOISE_THRESH;Threshold !TP_LABCURVE_AVOIDCOLORSHIFT;Avoid color shift diff --git a/rtdata/languages/Espanol b/rtdata/languages/Espanol index 3402cf13f..b869ba90c 100644 --- a/rtdata/languages/Espanol +++ b/rtdata/languages/Espanol @@ -1707,16 +1707,16 @@ ZOOMPANEL_ZOOMOUT;Reducir Zoom\nAtajo: - !HISTORY_MSG_491;White Balance !HISTORY_MSG_492;RGB Curves !HISTORY_MSG_493;L*a*b* Adjustments -!HISTORY_MSG_CLAMPOOG;Out-of-gamut color clipping +!HISTORY_MSG_CLAMPOOG;Clip out-of-gamut colors !HISTORY_MSG_COLORTONING_LABGRID_VALUE;CT - Color correction !HISTORY_MSG_DUALDEMOSAIC_CONTRAST;AMaZE+VNG4 - Contrast threshold -!HISTORY_MSG_HISTMATCHING;Auto-Matched Tone Curve -!HISTORY_MSG_ICMGAMM;Working gamma -!HISTORY_MSG_ICMPRIMARI;Output profile primaries -!HISTORY_MSG_ICMPROFILE;Output profile type -!HISTORY_MSG_ICMSLOP;Working slope -!HISTORY_MSG_ICMTEMP;Output IccV4 D illuminant -!HISTORY_MSG_ICMTRCIN;TRC working method +!HISTORY_MSG_HISTMATCHING;Auto-matched tone curve +!HISTORY_MSG_ICM_OUTPUT_PRIMARIES;Output - Primaries +!HISTORY_MSG_ICM_OUTPUT_TEMP;Output - ICC-v4 illuminant D +!HISTORY_MSG_ICM_OUTPUT_TYPE;Output - Type +!HISTORY_MSG_ICM_WORKING_GAMMA;Working - Gamma +!HISTORY_MSG_ICM_WORKING_SLOPE;Working - Slope +!HISTORY_MSG_ICM_WORKING_TRC_METHOD;Working - TRC method !HISTORY_MSG_LOCALCONTRAST_AMOUNT;Local Contrast - Amount !HISTORY_MSG_LOCALCONTRAST_DARKNESS;Local Contrast - Darkness !HISTORY_MSG_LOCALCONTRAST_ENABLED;Local Contrast @@ -1729,14 +1729,19 @@ ZOOMPANEL_ZOOMOUT;Reducir Zoom\nAtajo: - !HISTORY_MSG_PREPROCESS_PDAFLINESFILTER;PDAF lines filter !HISTORY_MSG_PRSHARPEN_CONTRAST;PRS - Contrast threshold !HISTORY_MSG_RAW_BORDER;Raw border -!HISTORY_MSG_RESIZE_ALLOW_UPSCALING;Resize - Allow upscaling +!HISTORY_MSG_RESIZE_ALLOWUPSCALING;Resize - Allow upscaling !HISTORY_MSG_SHARPENING_CONTRAST;Sharpening - Contrast threshold !HISTORY_MSG_SOFTLIGHT_ENABLED;Soft light !HISTORY_MSG_SOFTLIGHT_STRENGTH;Soft light - Strength !HISTORY_MSG_TM_FATTAL_ANCHOR;DRC - Anchor +!ICCPROFCREATOR_COPYRIGHT;Copyright: +!ICCPROFCREATOR_COPYRIGHT_RESET_TOOLTIP;Reset to the default copyright, granted to "RawTherapee, CC0" !ICCPROFCREATOR_CUSTOM;Custom +!ICCPROFCREATOR_DESCRIPTION;Description: +!ICCPROFCREATOR_DESCRIPTION_ADDPARAM;Append gamma and slope values to the description +!ICCPROFCREATOR_DESCRIPTION_TOOLTIP;Leave empty to set the default description. !ICCPROFCREATOR_GAMMA;Gamma -!ICCPROFCREATOR_ICCVERSION;Generated profile's version: +!ICCPROFCREATOR_ICCVERSION;ICC version: !ICCPROFCREATOR_ILL;Illuminant: !ICCPROFCREATOR_ILL_41;D41 !ICCPROFCREATOR_ILL_50;D50 @@ -1746,7 +1751,7 @@ ZOOMPANEL_ZOOMOUT;Reducir Zoom\nAtajo: - !ICCPROFCREATOR_ILL_80;D80 !ICCPROFCREATOR_ILL_DEF;Default !ICCPROFCREATOR_ILL_INC;StdA 2856K -!ICCPROFCREATOR_ILL_TOOLTIP;You can only set Illuminant with ICC v4 profiles +!ICCPROFCREATOR_ILL_TOOLTIP;You can only set the illuminant for ICC v4 profiles. !ICCPROFCREATOR_PRIMARIES;Primaries: !ICCPROFCREATOR_PRIM_ACESP0;ACES AP0 !ICCPROFCREATOR_PRIM_ACESP1;ACES AP1 @@ -1763,7 +1768,7 @@ ZOOMPANEL_ZOOMOUT;Reducir Zoom\nAtajo: - !ICCPROFCREATOR_PRIM_REDX;Red X !ICCPROFCREATOR_PRIM_REDY;Red Y !ICCPROFCREATOR_PRIM_SRGB;sRGB -!ICCPROFCREATOR_PRIM_TOOLTIP;You can only set Custom Primaries with ICC v4 profiles +!ICCPROFCREATOR_PRIM_TOOLTIP;You can only set custom primaries for ICC v4 profiles. !ICCPROFCREATOR_PRIM_WIDEG;Widegamut !ICCPROFCREATOR_PROF_V2;ICC v2 !ICCPROFCREATOR_PROF_V4;ICC v4 @@ -1832,7 +1837,7 @@ ZOOMPANEL_ZOOMOUT;Reducir Zoom\nAtajo: - !PARTIALPASTE_RAW_PIXELSHIFT;Pixel Shift !PARTIALPASTE_RETINEX;Retinex !PARTIALPASTE_SOFTLIGHT;Soft light -!PARTIALPASTE_TM_FATTAL;Dynamic Range Compression +!PARTIALPASTE_TM_FATTAL;Dynamic range compression !PREFERENCES_AUTLISLOW;Low !PREFERENCES_AUTLISMAX;Max - Average of all tiles !PREFERENCES_AUTLISSTD;High @@ -2008,12 +2013,12 @@ ZOOMPANEL_ZOOMOUT;Reducir Zoom\nAtajo: - !TP_ICM_SAVEREFERENCE;Save Reference Image !TP_ICM_SAVEREFERENCE_APPLYWB;Apply white balance !TP_ICM_SAVEREFERENCE_APPLYWB_TOOLTIP;Generally, apply the white balance when saving images to create ICC profiles, and do not apply the white balance to create DCP profiles. -!TP_ICM_WORKTRC;Tone response curve: -!TP_ICM_WORKTRC_CUSTOM;Custom -!TP_ICM_WORKTRC_GAMMA;Gamma -!TP_ICM_WORKTRC_NONE;None -!TP_ICM_WORKTRC_SLOPE;Slope -!TP_ICM_WORKTRC_TOOLTIP;Only for build in profiles +!TP_ICM_WORKING_TRC;Tone response curve: +!TP_ICM_WORKING_TRC_CUSTOM;Custom +!TP_ICM_WORKING_TRC_GAMMA;Gamma +!TP_ICM_WORKING_TRC_NONE;None +!TP_ICM_WORKING_TRC_SLOPE;Slope +!TP_ICM_WORKING_TRC_TOOLTIP;Only for built-in profiles. !TP_LABCURVE_CURVEEDITOR_CC;CC !TP_LOCALCONTRAST_AMOUNT;Amount !TP_LOCALCONTRAST_DARKNESS;Darkness level diff --git a/rtdata/languages/Euskara b/rtdata/languages/Euskara index 7a88eb4f1..1c4a170bf 100644 --- a/rtdata/languages/Euskara +++ b/rtdata/languages/Euskara @@ -978,16 +978,16 @@ TP_WBALANCE_TEMPERATURE;Tenperatura !HISTORY_MSG_491;White Balance !HISTORY_MSG_492;RGB Curves !HISTORY_MSG_493;L*a*b* Adjustments -!HISTORY_MSG_CLAMPOOG;Out-of-gamut color clipping +!HISTORY_MSG_CLAMPOOG;Clip out-of-gamut colors !HISTORY_MSG_COLORTONING_LABGRID_VALUE;CT - Color correction !HISTORY_MSG_DUALDEMOSAIC_CONTRAST;AMaZE+VNG4 - Contrast threshold -!HISTORY_MSG_HISTMATCHING;Auto-Matched Tone Curve -!HISTORY_MSG_ICMGAMM;Working gamma -!HISTORY_MSG_ICMPRIMARI;Output profile primaries -!HISTORY_MSG_ICMPROFILE;Output profile type -!HISTORY_MSG_ICMSLOP;Working slope -!HISTORY_MSG_ICMTEMP;Output IccV4 D illuminant -!HISTORY_MSG_ICMTRCIN;TRC working method +!HISTORY_MSG_HISTMATCHING;Auto-matched tone curve +!HISTORY_MSG_ICM_OUTPUT_PRIMARIES;Output - Primaries +!HISTORY_MSG_ICM_OUTPUT_TEMP;Output - ICC-v4 illuminant D +!HISTORY_MSG_ICM_OUTPUT_TYPE;Output - Type +!HISTORY_MSG_ICM_WORKING_GAMMA;Working - Gamma +!HISTORY_MSG_ICM_WORKING_SLOPE;Working - Slope +!HISTORY_MSG_ICM_WORKING_TRC_METHOD;Working - TRC method !HISTORY_MSG_LOCALCONTRAST_AMOUNT;Local Contrast - Amount !HISTORY_MSG_LOCALCONTRAST_DARKNESS;Local Contrast - Darkness !HISTORY_MSG_LOCALCONTRAST_ENABLED;Local Contrast @@ -1000,15 +1000,20 @@ TP_WBALANCE_TEMPERATURE;Tenperatura !HISTORY_MSG_PREPROCESS_PDAFLINESFILTER;PDAF lines filter !HISTORY_MSG_PRSHARPEN_CONTRAST;PRS - Contrast threshold !HISTORY_MSG_RAW_BORDER;Raw border -!HISTORY_MSG_RESIZE_ALLOW_UPSCALING;Resize - Allow upscaling +!HISTORY_MSG_RESIZE_ALLOWUPSCALING;Resize - Allow upscaling !HISTORY_MSG_SHARPENING_CONTRAST;Sharpening - Contrast threshold !HISTORY_MSG_SOFTLIGHT_ENABLED;Soft light !HISTORY_MSG_SOFTLIGHT_STRENGTH;Soft light - Strength !HISTORY_MSG_TM_FATTAL_ANCHOR;DRC - Anchor !HISTORY_NEWSNAPSHOT_TOOLTIP;Shortcut: Alt-s +!ICCPROFCREATOR_COPYRIGHT;Copyright: +!ICCPROFCREATOR_COPYRIGHT_RESET_TOOLTIP;Reset to the default copyright, granted to "RawTherapee, CC0" !ICCPROFCREATOR_CUSTOM;Custom +!ICCPROFCREATOR_DESCRIPTION;Description: +!ICCPROFCREATOR_DESCRIPTION_ADDPARAM;Append gamma and slope values to the description +!ICCPROFCREATOR_DESCRIPTION_TOOLTIP;Leave empty to set the default description. !ICCPROFCREATOR_GAMMA;Gamma -!ICCPROFCREATOR_ICCVERSION;Generated profile's version: +!ICCPROFCREATOR_ICCVERSION;ICC version: !ICCPROFCREATOR_ILL;Illuminant: !ICCPROFCREATOR_ILL_41;D41 !ICCPROFCREATOR_ILL_50;D50 @@ -1018,7 +1023,7 @@ TP_WBALANCE_TEMPERATURE;Tenperatura !ICCPROFCREATOR_ILL_80;D80 !ICCPROFCREATOR_ILL_DEF;Default !ICCPROFCREATOR_ILL_INC;StdA 2856K -!ICCPROFCREATOR_ILL_TOOLTIP;You can only set Illuminant with ICC v4 profiles +!ICCPROFCREATOR_ILL_TOOLTIP;You can only set the illuminant for ICC v4 profiles. !ICCPROFCREATOR_PRIMARIES;Primaries: !ICCPROFCREATOR_PRIM_ACESP0;ACES AP0 !ICCPROFCREATOR_PRIM_ACESP1;ACES AP1 @@ -1035,7 +1040,7 @@ TP_WBALANCE_TEMPERATURE;Tenperatura !ICCPROFCREATOR_PRIM_REDX;Red X !ICCPROFCREATOR_PRIM_REDY;Red Y !ICCPROFCREATOR_PRIM_SRGB;sRGB -!ICCPROFCREATOR_PRIM_TOOLTIP;You can only set Custom Primaries with ICC v4 profiles +!ICCPROFCREATOR_PRIM_TOOLTIP;You can only set custom primaries for ICC v4 profiles. !ICCPROFCREATOR_PRIM_WIDEG;Widegamut !ICCPROFCREATOR_PROF_V2;ICC v2 !ICCPROFCREATOR_PROF_V4;ICC v4 @@ -1191,7 +1196,7 @@ TP_WBALANCE_TEMPERATURE;Tenperatura !PARTIALPASTE_SHARPENEDGE;Edges !PARTIALPASTE_SHARPENMICRO;Microcontrast !PARTIALPASTE_SOFTLIGHT;Soft light -!PARTIALPASTE_TM_FATTAL;Dynamic Range Compression +!PARTIALPASTE_TM_FATTAL;Dynamic range compression !PARTIALPASTE_VIBRANCE;Vibrance !PREFERENCES_ADD;Add !PREFERENCES_AUTLISLOW;Low @@ -1759,12 +1764,12 @@ TP_WBALANCE_TEMPERATURE;Tenperatura !TP_ICM_SAVEREFERENCE_TOOLTIP;Save the linear TIFF image before the input profile is applied. The result can be used for calibration purposes and generation of a camera profile. !TP_ICM_TONECURVE;Tone curve !TP_ICM_TONECURVE_TOOLTIP;Employ the embedded DCP tone curve. The setting is only available if the selected DCP has a tone curve. -!TP_ICM_WORKTRC;Tone response curve: -!TP_ICM_WORKTRC_CUSTOM;Custom -!TP_ICM_WORKTRC_GAMMA;Gamma -!TP_ICM_WORKTRC_NONE;None -!TP_ICM_WORKTRC_SLOPE;Slope -!TP_ICM_WORKTRC_TOOLTIP;Only for build in profiles +!TP_ICM_WORKING_TRC;Tone response curve: +!TP_ICM_WORKING_TRC_CUSTOM;Custom +!TP_ICM_WORKING_TRC_GAMMA;Gamma +!TP_ICM_WORKING_TRC_NONE;None +!TP_ICM_WORKING_TRC_SLOPE;Slope +!TP_ICM_WORKING_TRC_TOOLTIP;Only for built-in profiles. !TP_IMPULSEDENOISE_LABEL;Impulse Noise Reduction !TP_IMPULSEDENOISE_THRESH;Threshold !TP_LABCURVE_AVOIDCOLORSHIFT;Avoid color shift diff --git a/rtdata/languages/Francais b/rtdata/languages/Francais index 269287073..d9e455778 100644 --- a/rtdata/languages/Francais +++ b/rtdata/languages/Francais @@ -1682,12 +1682,12 @@ TP_ICM_SAVEREFERENCE_TOOLTIP;Sauvegarde une image TIFF linéaire avant que le pr TP_ICM_TONECURVE;Utiliser la courbe tonale du profil DCP TP_ICM_TONECURVE_TOOLTIP;Utilise la courbe tonale DCP incluse. Ce paramètre ne sera actif que si le profil DCP contient une courbe tonale TP_ICM_WORKINGPROFILE;Profil de Travail -TP_ICM_WORKTRC;Courbe de réponse tonale: -TP_ICM_WORKTRC_CUSTOM;Personnalisé -TP_ICM_WORKTRC_GAMMA;Gamma -TP_ICM_WORKTRC_NONE;Aucune -TP_ICM_WORKTRC_SLOPE;Pente -TP_ICM_WORKTRC_TOOLTIP;Seulement pour les profils internes +TP_ICM_WORKING_TRC;Courbe de réponse tonale: +TP_ICM_WORKING_TRC_CUSTOM;Personnalisé +TP_ICM_WORKING_TRC_GAMMA;Gamma +TP_ICM_WORKING_TRC_NONE;Aucune +TP_ICM_WORKING_TRC_SLOPE;Pente +TP_ICM_WORKING_TRC_TOOLTIP;Seulement pour les profils internes TP_IMPULSEDENOISE_LABEL;Réduction du bruit d'impulsion TP_IMPULSEDENOISE_THRESH;Seuil TP_LABCURVE_AVOIDCOLORSHIFT;Éviter les dérives de teinte @@ -2252,30 +2252,32 @@ ZOOMPANEL_ZOOMOUT;Zoom Arrière\nRaccourci: - !HISTORY_MSG_488;Dynamic Range Compression !HISTORY_MSG_489;DRC - Threshold !HISTORY_MSG_490;DRC - Amount -!HISTORY_MSG_CLAMPOOG;Out-of-gamut color clipping +!HISTORY_MSG_CLAMPOOG;Clip out-of-gamut colors !HISTORY_MSG_DUALDEMOSAIC_CONTRAST;AMaZE+VNG4 - Contrast threshold -!HISTORY_MSG_ICMGAMM;Working gamma -!HISTORY_MSG_ICMPRIMARI;Output profile primaries -!HISTORY_MSG_ICMPROFILE;Output profile type -!HISTORY_MSG_ICMSLOP;Working slope -!HISTORY_MSG_ICMTEMP;Output IccV4 D illuminant -!HISTORY_MSG_ICMTRCIN;TRC working method +!HISTORY_MSG_ICM_OUTPUT_PRIMARIES;Output - Primaries +!HISTORY_MSG_ICM_OUTPUT_TEMP;Output - ICC-v4 illuminant D +!HISTORY_MSG_ICM_OUTPUT_TYPE;Output - Type +!HISTORY_MSG_ICM_WORKING_GAMMA;Working - Gamma +!HISTORY_MSG_ICM_WORKING_SLOPE;Working - Slope +!HISTORY_MSG_ICM_WORKING_TRC_METHOD;Working - TRC method !HISTORY_MSG_MICROCONTRAST_CONTRAST;Microcontrast - Contrast threshold !HISTORY_MSG_PIXELSHIFT_DEMOSAIC;PS - Demosaic method for motion !HISTORY_MSG_PREPROCESS_LINEDENOISE_DIRECTION;Line noise filter direction !HISTORY_MSG_PREPROCESS_PDAFLINESFILTER;PDAF lines filter !HISTORY_MSG_PRSHARPEN_CONTRAST;PRS - Contrast threshold !HISTORY_MSG_RAW_BORDER;Raw border -!HISTORY_MSG_RESIZE_ALLOW_UPSCALING;Resize - Allow upscaling +!HISTORY_MSG_RESIZE_ALLOWUPSCALING;Resize - Allow upscaling !HISTORY_MSG_SHARPENING_CONTRAST;Sharpening - Contrast threshold !HISTORY_MSG_SOFTLIGHT_ENABLED;Soft light !HISTORY_MSG_SOFTLIGHT_STRENGTH;Soft light - Strength !HISTORY_MSG_TM_FATTAL_ANCHOR;DRC - Anchor +!ICCPROFCREATOR_COPYRIGHT_RESET_TOOLTIP;Reset to the default copyright, granted to "RawTherapee, CC0" +!ICCPROFCREATOR_DESCRIPTION_ADDPARAM;Append gamma and slope values to the description !MAIN_TOOLTIP_PREVIEWSHARPMASK;Preview the Sharpening Contrast Mask.\nShortcut: None\n\nOnly works when sharpening is enabled and zoom >= 100%. !PARTIALPASTE_PREPROCESS_PDAFLINESFILTER;PDAF lines filter !PARTIALPASTE_RAW_BORDER;Raw border !PARTIALPASTE_SOFTLIGHT;Soft light -!PARTIALPASTE_TM_FATTAL;Dynamic Range Compression +!PARTIALPASTE_TM_FATTAL;Dynamic range compression !PREFERENCES_THUMBNAIL_INSPECTOR_JPEG;Embedded JPEG preview !PREFERENCES_THUMBNAIL_INSPECTOR_MODE;Image to show !PREFERENCES_THUMBNAIL_INSPECTOR_RAW;Neutral raw rendering diff --git a/rtdata/languages/Greek b/rtdata/languages/Greek index e84d3967f..149ac5345 100644 --- a/rtdata/languages/Greek +++ b/rtdata/languages/Greek @@ -977,16 +977,16 @@ TP_WBALANCE_TEMPERATURE;Θερμοκρασία !HISTORY_MSG_491;White Balance !HISTORY_MSG_492;RGB Curves !HISTORY_MSG_493;L*a*b* Adjustments -!HISTORY_MSG_CLAMPOOG;Out-of-gamut color clipping +!HISTORY_MSG_CLAMPOOG;Clip out-of-gamut colors !HISTORY_MSG_COLORTONING_LABGRID_VALUE;CT - Color correction !HISTORY_MSG_DUALDEMOSAIC_CONTRAST;AMaZE+VNG4 - Contrast threshold -!HISTORY_MSG_HISTMATCHING;Auto-Matched Tone Curve -!HISTORY_MSG_ICMGAMM;Working gamma -!HISTORY_MSG_ICMPRIMARI;Output profile primaries -!HISTORY_MSG_ICMPROFILE;Output profile type -!HISTORY_MSG_ICMSLOP;Working slope -!HISTORY_MSG_ICMTEMP;Output IccV4 D illuminant -!HISTORY_MSG_ICMTRCIN;TRC working method +!HISTORY_MSG_HISTMATCHING;Auto-matched tone curve +!HISTORY_MSG_ICM_OUTPUT_PRIMARIES;Output - Primaries +!HISTORY_MSG_ICM_OUTPUT_TEMP;Output - ICC-v4 illuminant D +!HISTORY_MSG_ICM_OUTPUT_TYPE;Output - Type +!HISTORY_MSG_ICM_WORKING_GAMMA;Working - Gamma +!HISTORY_MSG_ICM_WORKING_SLOPE;Working - Slope +!HISTORY_MSG_ICM_WORKING_TRC_METHOD;Working - TRC method !HISTORY_MSG_LOCALCONTRAST_AMOUNT;Local Contrast - Amount !HISTORY_MSG_LOCALCONTRAST_DARKNESS;Local Contrast - Darkness !HISTORY_MSG_LOCALCONTRAST_ENABLED;Local Contrast @@ -999,15 +999,20 @@ TP_WBALANCE_TEMPERATURE;Θερμοκρασία !HISTORY_MSG_PREPROCESS_PDAFLINESFILTER;PDAF lines filter !HISTORY_MSG_PRSHARPEN_CONTRAST;PRS - Contrast threshold !HISTORY_MSG_RAW_BORDER;Raw border -!HISTORY_MSG_RESIZE_ALLOW_UPSCALING;Resize - Allow upscaling +!HISTORY_MSG_RESIZE_ALLOWUPSCALING;Resize - Allow upscaling !HISTORY_MSG_SHARPENING_CONTRAST;Sharpening - Contrast threshold !HISTORY_MSG_SOFTLIGHT_ENABLED;Soft light !HISTORY_MSG_SOFTLIGHT_STRENGTH;Soft light - Strength !HISTORY_MSG_TM_FATTAL_ANCHOR;DRC - Anchor !HISTORY_NEWSNAPSHOT_TOOLTIP;Shortcut: Alt-s +!ICCPROFCREATOR_COPYRIGHT;Copyright: +!ICCPROFCREATOR_COPYRIGHT_RESET_TOOLTIP;Reset to the default copyright, granted to "RawTherapee, CC0" !ICCPROFCREATOR_CUSTOM;Custom +!ICCPROFCREATOR_DESCRIPTION;Description: +!ICCPROFCREATOR_DESCRIPTION_ADDPARAM;Append gamma and slope values to the description +!ICCPROFCREATOR_DESCRIPTION_TOOLTIP;Leave empty to set the default description. !ICCPROFCREATOR_GAMMA;Gamma -!ICCPROFCREATOR_ICCVERSION;Generated profile's version: +!ICCPROFCREATOR_ICCVERSION;ICC version: !ICCPROFCREATOR_ILL;Illuminant: !ICCPROFCREATOR_ILL_41;D41 !ICCPROFCREATOR_ILL_50;D50 @@ -1017,7 +1022,7 @@ TP_WBALANCE_TEMPERATURE;Θερμοκρασία !ICCPROFCREATOR_ILL_80;D80 !ICCPROFCREATOR_ILL_DEF;Default !ICCPROFCREATOR_ILL_INC;StdA 2856K -!ICCPROFCREATOR_ILL_TOOLTIP;You can only set Illuminant with ICC v4 profiles +!ICCPROFCREATOR_ILL_TOOLTIP;You can only set the illuminant for ICC v4 profiles. !ICCPROFCREATOR_PRIMARIES;Primaries: !ICCPROFCREATOR_PRIM_ACESP0;ACES AP0 !ICCPROFCREATOR_PRIM_ACESP1;ACES AP1 @@ -1034,7 +1039,7 @@ TP_WBALANCE_TEMPERATURE;Θερμοκρασία !ICCPROFCREATOR_PRIM_REDX;Red X !ICCPROFCREATOR_PRIM_REDY;Red Y !ICCPROFCREATOR_PRIM_SRGB;sRGB -!ICCPROFCREATOR_PRIM_TOOLTIP;You can only set Custom Primaries with ICC v4 profiles +!ICCPROFCREATOR_PRIM_TOOLTIP;You can only set custom primaries for ICC v4 profiles. !ICCPROFCREATOR_PRIM_WIDEG;Widegamut !ICCPROFCREATOR_PROF_V2;ICC v2 !ICCPROFCREATOR_PROF_V4;ICC v4 @@ -1190,7 +1195,7 @@ TP_WBALANCE_TEMPERATURE;Θερμοκρασία !PARTIALPASTE_SHARPENEDGE;Edges !PARTIALPASTE_SHARPENMICRO;Microcontrast !PARTIALPASTE_SOFTLIGHT;Soft light -!PARTIALPASTE_TM_FATTAL;Dynamic Range Compression +!PARTIALPASTE_TM_FATTAL;Dynamic range compression !PARTIALPASTE_VIBRANCE;Vibrance !PREFERENCES_ADD;Add !PREFERENCES_AUTLISLOW;Low @@ -1758,12 +1763,12 @@ TP_WBALANCE_TEMPERATURE;Θερμοκρασία !TP_ICM_SAVEREFERENCE_TOOLTIP;Save the linear TIFF image before the input profile is applied. The result can be used for calibration purposes and generation of a camera profile. !TP_ICM_TONECURVE;Tone curve !TP_ICM_TONECURVE_TOOLTIP;Employ the embedded DCP tone curve. The setting is only available if the selected DCP has a tone curve. -!TP_ICM_WORKTRC;Tone response curve: -!TP_ICM_WORKTRC_CUSTOM;Custom -!TP_ICM_WORKTRC_GAMMA;Gamma -!TP_ICM_WORKTRC_NONE;None -!TP_ICM_WORKTRC_SLOPE;Slope -!TP_ICM_WORKTRC_TOOLTIP;Only for build in profiles +!TP_ICM_WORKING_TRC;Tone response curve: +!TP_ICM_WORKING_TRC_CUSTOM;Custom +!TP_ICM_WORKING_TRC_GAMMA;Gamma +!TP_ICM_WORKING_TRC_NONE;None +!TP_ICM_WORKING_TRC_SLOPE;Slope +!TP_ICM_WORKING_TRC_TOOLTIP;Only for built-in profiles. !TP_IMPULSEDENOISE_LABEL;Impulse Noise Reduction !TP_IMPULSEDENOISE_THRESH;Threshold !TP_LABCURVE_AVOIDCOLORSHIFT;Avoid color shift diff --git a/rtdata/languages/Hebrew b/rtdata/languages/Hebrew index 02f097c5e..fb8b0d776 100644 --- a/rtdata/languages/Hebrew +++ b/rtdata/languages/Hebrew @@ -978,16 +978,16 @@ TP_WBALANCE_TEMPERATURE;מידת חום !HISTORY_MSG_491;White Balance !HISTORY_MSG_492;RGB Curves !HISTORY_MSG_493;L*a*b* Adjustments -!HISTORY_MSG_CLAMPOOG;Out-of-gamut color clipping +!HISTORY_MSG_CLAMPOOG;Clip out-of-gamut colors !HISTORY_MSG_COLORTONING_LABGRID_VALUE;CT - Color correction !HISTORY_MSG_DUALDEMOSAIC_CONTRAST;AMaZE+VNG4 - Contrast threshold -!HISTORY_MSG_HISTMATCHING;Auto-Matched Tone Curve -!HISTORY_MSG_ICMGAMM;Working gamma -!HISTORY_MSG_ICMPRIMARI;Output profile primaries -!HISTORY_MSG_ICMPROFILE;Output profile type -!HISTORY_MSG_ICMSLOP;Working slope -!HISTORY_MSG_ICMTEMP;Output IccV4 D illuminant -!HISTORY_MSG_ICMTRCIN;TRC working method +!HISTORY_MSG_HISTMATCHING;Auto-matched tone curve +!HISTORY_MSG_ICM_OUTPUT_PRIMARIES;Output - Primaries +!HISTORY_MSG_ICM_OUTPUT_TEMP;Output - ICC-v4 illuminant D +!HISTORY_MSG_ICM_OUTPUT_TYPE;Output - Type +!HISTORY_MSG_ICM_WORKING_GAMMA;Working - Gamma +!HISTORY_MSG_ICM_WORKING_SLOPE;Working - Slope +!HISTORY_MSG_ICM_WORKING_TRC_METHOD;Working - TRC method !HISTORY_MSG_LOCALCONTRAST_AMOUNT;Local Contrast - Amount !HISTORY_MSG_LOCALCONTRAST_DARKNESS;Local Contrast - Darkness !HISTORY_MSG_LOCALCONTRAST_ENABLED;Local Contrast @@ -1000,15 +1000,20 @@ TP_WBALANCE_TEMPERATURE;מידת חום !HISTORY_MSG_PREPROCESS_PDAFLINESFILTER;PDAF lines filter !HISTORY_MSG_PRSHARPEN_CONTRAST;PRS - Contrast threshold !HISTORY_MSG_RAW_BORDER;Raw border -!HISTORY_MSG_RESIZE_ALLOW_UPSCALING;Resize - Allow upscaling +!HISTORY_MSG_RESIZE_ALLOWUPSCALING;Resize - Allow upscaling !HISTORY_MSG_SHARPENING_CONTRAST;Sharpening - Contrast threshold !HISTORY_MSG_SOFTLIGHT_ENABLED;Soft light !HISTORY_MSG_SOFTLIGHT_STRENGTH;Soft light - Strength !HISTORY_MSG_TM_FATTAL_ANCHOR;DRC - Anchor !HISTORY_NEWSNAPSHOT_TOOLTIP;Shortcut: Alt-s +!ICCPROFCREATOR_COPYRIGHT;Copyright: +!ICCPROFCREATOR_COPYRIGHT_RESET_TOOLTIP;Reset to the default copyright, granted to "RawTherapee, CC0" !ICCPROFCREATOR_CUSTOM;Custom +!ICCPROFCREATOR_DESCRIPTION;Description: +!ICCPROFCREATOR_DESCRIPTION_ADDPARAM;Append gamma and slope values to the description +!ICCPROFCREATOR_DESCRIPTION_TOOLTIP;Leave empty to set the default description. !ICCPROFCREATOR_GAMMA;Gamma -!ICCPROFCREATOR_ICCVERSION;Generated profile's version: +!ICCPROFCREATOR_ICCVERSION;ICC version: !ICCPROFCREATOR_ILL;Illuminant: !ICCPROFCREATOR_ILL_41;D41 !ICCPROFCREATOR_ILL_50;D50 @@ -1018,7 +1023,7 @@ TP_WBALANCE_TEMPERATURE;מידת חום !ICCPROFCREATOR_ILL_80;D80 !ICCPROFCREATOR_ILL_DEF;Default !ICCPROFCREATOR_ILL_INC;StdA 2856K -!ICCPROFCREATOR_ILL_TOOLTIP;You can only set Illuminant with ICC v4 profiles +!ICCPROFCREATOR_ILL_TOOLTIP;You can only set the illuminant for ICC v4 profiles. !ICCPROFCREATOR_PRIMARIES;Primaries: !ICCPROFCREATOR_PRIM_ACESP0;ACES AP0 !ICCPROFCREATOR_PRIM_ACESP1;ACES AP1 @@ -1035,7 +1040,7 @@ TP_WBALANCE_TEMPERATURE;מידת חום !ICCPROFCREATOR_PRIM_REDX;Red X !ICCPROFCREATOR_PRIM_REDY;Red Y !ICCPROFCREATOR_PRIM_SRGB;sRGB -!ICCPROFCREATOR_PRIM_TOOLTIP;You can only set Custom Primaries with ICC v4 profiles +!ICCPROFCREATOR_PRIM_TOOLTIP;You can only set custom primaries for ICC v4 profiles. !ICCPROFCREATOR_PRIM_WIDEG;Widegamut !ICCPROFCREATOR_PROF_V2;ICC v2 !ICCPROFCREATOR_PROF_V4;ICC v4 @@ -1191,7 +1196,7 @@ TP_WBALANCE_TEMPERATURE;מידת חום !PARTIALPASTE_SHARPENEDGE;Edges !PARTIALPASTE_SHARPENMICRO;Microcontrast !PARTIALPASTE_SOFTLIGHT;Soft light -!PARTIALPASTE_TM_FATTAL;Dynamic Range Compression +!PARTIALPASTE_TM_FATTAL;Dynamic range compression !PARTIALPASTE_VIBRANCE;Vibrance !PREFERENCES_ADD;Add !PREFERENCES_AUTLISLOW;Low @@ -1759,12 +1764,12 @@ TP_WBALANCE_TEMPERATURE;מידת חום !TP_ICM_SAVEREFERENCE_TOOLTIP;Save the linear TIFF image before the input profile is applied. The result can be used for calibration purposes and generation of a camera profile. !TP_ICM_TONECURVE;Tone curve !TP_ICM_TONECURVE_TOOLTIP;Employ the embedded DCP tone curve. The setting is only available if the selected DCP has a tone curve. -!TP_ICM_WORKTRC;Tone response curve: -!TP_ICM_WORKTRC_CUSTOM;Custom -!TP_ICM_WORKTRC_GAMMA;Gamma -!TP_ICM_WORKTRC_NONE;None -!TP_ICM_WORKTRC_SLOPE;Slope -!TP_ICM_WORKTRC_TOOLTIP;Only for build in profiles +!TP_ICM_WORKING_TRC;Tone response curve: +!TP_ICM_WORKING_TRC_CUSTOM;Custom +!TP_ICM_WORKING_TRC_GAMMA;Gamma +!TP_ICM_WORKING_TRC_NONE;None +!TP_ICM_WORKING_TRC_SLOPE;Slope +!TP_ICM_WORKING_TRC_TOOLTIP;Only for built-in profiles. !TP_IMPULSEDENOISE_LABEL;Impulse Noise Reduction !TP_IMPULSEDENOISE_THRESH;Threshold !TP_LABCURVE_AVOIDCOLORSHIFT;Avoid color shift diff --git a/rtdata/languages/Italiano b/rtdata/languages/Italiano index b0f71895a..35369cb44 100644 --- a/rtdata/languages/Italiano +++ b/rtdata/languages/Italiano @@ -1582,16 +1582,16 @@ ZOOMPANEL_ZOOMOUT;Rimpicciolisci.\nScorciatoia: - !HISTORY_MSG_491;White Balance !HISTORY_MSG_492;RGB Curves !HISTORY_MSG_493;L*a*b* Adjustments -!HISTORY_MSG_CLAMPOOG;Out-of-gamut color clipping +!HISTORY_MSG_CLAMPOOG;Clip out-of-gamut colors !HISTORY_MSG_COLORTONING_LABGRID_VALUE;CT - Color correction !HISTORY_MSG_DUALDEMOSAIC_CONTRAST;AMaZE+VNG4 - Contrast threshold -!HISTORY_MSG_HISTMATCHING;Auto-Matched Tone Curve -!HISTORY_MSG_ICMGAMM;Working gamma -!HISTORY_MSG_ICMPRIMARI;Output profile primaries -!HISTORY_MSG_ICMPROFILE;Output profile type -!HISTORY_MSG_ICMSLOP;Working slope -!HISTORY_MSG_ICMTEMP;Output IccV4 D illuminant -!HISTORY_MSG_ICMTRCIN;TRC working method +!HISTORY_MSG_HISTMATCHING;Auto-matched tone curve +!HISTORY_MSG_ICM_OUTPUT_PRIMARIES;Output - Primaries +!HISTORY_MSG_ICM_OUTPUT_TEMP;Output - ICC-v4 illuminant D +!HISTORY_MSG_ICM_OUTPUT_TYPE;Output - Type +!HISTORY_MSG_ICM_WORKING_GAMMA;Working - Gamma +!HISTORY_MSG_ICM_WORKING_SLOPE;Working - Slope +!HISTORY_MSG_ICM_WORKING_TRC_METHOD;Working - TRC method !HISTORY_MSG_LOCALCONTRAST_AMOUNT;Local Contrast - Amount !HISTORY_MSG_LOCALCONTRAST_DARKNESS;Local Contrast - Darkness !HISTORY_MSG_LOCALCONTRAST_ENABLED;Local Contrast @@ -1604,14 +1604,19 @@ ZOOMPANEL_ZOOMOUT;Rimpicciolisci.\nScorciatoia: - !HISTORY_MSG_PREPROCESS_PDAFLINESFILTER;PDAF lines filter !HISTORY_MSG_PRSHARPEN_CONTRAST;PRS - Contrast threshold !HISTORY_MSG_RAW_BORDER;Raw border -!HISTORY_MSG_RESIZE_ALLOW_UPSCALING;Resize - Allow upscaling +!HISTORY_MSG_RESIZE_ALLOWUPSCALING;Resize - Allow upscaling !HISTORY_MSG_SHARPENING_CONTRAST;Sharpening - Contrast threshold !HISTORY_MSG_SOFTLIGHT_ENABLED;Soft light !HISTORY_MSG_SOFTLIGHT_STRENGTH;Soft light - Strength !HISTORY_MSG_TM_FATTAL_ANCHOR;DRC - Anchor +!ICCPROFCREATOR_COPYRIGHT;Copyright: +!ICCPROFCREATOR_COPYRIGHT_RESET_TOOLTIP;Reset to the default copyright, granted to "RawTherapee, CC0" !ICCPROFCREATOR_CUSTOM;Custom +!ICCPROFCREATOR_DESCRIPTION;Description: +!ICCPROFCREATOR_DESCRIPTION_ADDPARAM;Append gamma and slope values to the description +!ICCPROFCREATOR_DESCRIPTION_TOOLTIP;Leave empty to set the default description. !ICCPROFCREATOR_GAMMA;Gamma -!ICCPROFCREATOR_ICCVERSION;Generated profile's version: +!ICCPROFCREATOR_ICCVERSION;ICC version: !ICCPROFCREATOR_ILL;Illuminant: !ICCPROFCREATOR_ILL_41;D41 !ICCPROFCREATOR_ILL_50;D50 @@ -1621,7 +1626,7 @@ ZOOMPANEL_ZOOMOUT;Rimpicciolisci.\nScorciatoia: - !ICCPROFCREATOR_ILL_80;D80 !ICCPROFCREATOR_ILL_DEF;Default !ICCPROFCREATOR_ILL_INC;StdA 2856K -!ICCPROFCREATOR_ILL_TOOLTIP;You can only set Illuminant with ICC v4 profiles +!ICCPROFCREATOR_ILL_TOOLTIP;You can only set the illuminant for ICC v4 profiles. !ICCPROFCREATOR_PRIMARIES;Primaries: !ICCPROFCREATOR_PRIM_ACESP0;ACES AP0 !ICCPROFCREATOR_PRIM_ACESP1;ACES AP1 @@ -1638,7 +1643,7 @@ ZOOMPANEL_ZOOMOUT;Rimpicciolisci.\nScorciatoia: - !ICCPROFCREATOR_PRIM_REDX;Red X !ICCPROFCREATOR_PRIM_REDY;Red Y !ICCPROFCREATOR_PRIM_SRGB;sRGB -!ICCPROFCREATOR_PRIM_TOOLTIP;You can only set Custom Primaries with ICC v4 profiles +!ICCPROFCREATOR_PRIM_TOOLTIP;You can only set custom primaries for ICC v4 profiles. !ICCPROFCREATOR_PRIM_WIDEG;Widegamut !ICCPROFCREATOR_PROF_V2;ICC v2 !ICCPROFCREATOR_PROF_V4;ICC v4 @@ -1703,7 +1708,7 @@ ZOOMPANEL_ZOOMOUT;Rimpicciolisci.\nScorciatoia: - !PARTIALPASTE_RAW_PIXELSHIFT;Pixel Shift !PARTIALPASTE_RETINEX;Retinex !PARTIALPASTE_SOFTLIGHT;Soft light -!PARTIALPASTE_TM_FATTAL;Dynamic Range Compression +!PARTIALPASTE_TM_FATTAL;Dynamic range compression !PREFERENCES_AUTLISLOW;Low !PREFERENCES_AUTLISMAX;Max - Average of all tiles !PREFERENCES_AUTLISSTD;High @@ -1935,12 +1940,12 @@ ZOOMPANEL_ZOOMOUT;Rimpicciolisci.\nScorciatoia: - !TP_ICM_SAVEREFERENCE;Save Reference Image !TP_ICM_SAVEREFERENCE_APPLYWB;Apply white balance !TP_ICM_SAVEREFERENCE_APPLYWB_TOOLTIP;Generally, apply the white balance when saving images to create ICC profiles, and do not apply the white balance to create DCP profiles. -!TP_ICM_WORKTRC;Tone response curve: -!TP_ICM_WORKTRC_CUSTOM;Custom -!TP_ICM_WORKTRC_GAMMA;Gamma -!TP_ICM_WORKTRC_NONE;None -!TP_ICM_WORKTRC_SLOPE;Slope -!TP_ICM_WORKTRC_TOOLTIP;Only for build in profiles +!TP_ICM_WORKING_TRC;Tone response curve: +!TP_ICM_WORKING_TRC_CUSTOM;Custom +!TP_ICM_WORKING_TRC_GAMMA;Gamma +!TP_ICM_WORKING_TRC_NONE;None +!TP_ICM_WORKING_TRC_SLOPE;Slope +!TP_ICM_WORKING_TRC_TOOLTIP;Only for built-in profiles. !TP_LOCALCONTRAST_AMOUNT;Amount !TP_LOCALCONTRAST_DARKNESS;Darkness level !TP_LOCALCONTRAST_LABEL;Local Contrast diff --git a/rtdata/languages/Japanese b/rtdata/languages/Japanese index 389f9afeb..9e0891078 100644 --- a/rtdata/languages/Japanese +++ b/rtdata/languages/Japanese @@ -772,7 +772,7 @@ HISTORY_MSG_PREPROCESS_LINEDENOISE_DIRECTION;ラインノイズフィルタの HISTORY_MSG_PREPROCESS_PDAFLINESFILTER;PDAFラインフィルタ HISTORY_MSG_PRSHARPEN_CONTRAST;PRS - コントラストのしきい値 HISTORY_MSG_RAW_BORDER;Rawの境界 -HISTORY_MSG_RESIZE_ALLOW_UPSCALING;リサイズ - アップスケーリングを可能にする +HISTORY_MSG_RESIZE_ALLOWUPSCALING;リサイズ - アップスケーリングを可能にする HISTORY_MSG_SHARPENING_CONTRAST;シャープ化 - コントラストのしきい値 HISTORY_MSG_SOFTLIGHT_ENABLED;ソフトな明るさ HISTORY_MSG_SOFTLIGHT_STRENGTH;ソフトな明るさ - 強さ @@ -2262,20 +2262,20 @@ ZOOMPANEL_ZOOMOUT;ズームアウト\nショートカット: - !!!!!!!!!!!!!!!!!!!!!!!!! !GENERAL_SAVE_AS;Save as... -!HISTORY_MSG_ICMGAMM;Working gamma -!HISTORY_MSG_ICMPRIMARI;Output profile primaries -!HISTORY_MSG_ICMPROFILE;Output profile type -!HISTORY_MSG_ICMSLOP;Working slope -!HISTORY_MSG_ICMTEMP;Output IccV4 D illuminant -!HISTORY_MSG_ICMTRCIN;TRC working method -!ICCPROFCREATOR_ADD_PARAM_IN_DESC;Append Gamma and Slope values to the description +!HISTORY_MSG_ICM_OUTPUT_PRIMARIES;Output - Primaries +!HISTORY_MSG_ICM_OUTPUT_TEMP;Output - ICC-v4 illuminant D +!HISTORY_MSG_ICM_OUTPUT_TYPE;Output - Type +!HISTORY_MSG_ICM_WORKING_GAMMA;Working - Gamma +!HISTORY_MSG_ICM_WORKING_SLOPE;Working - Slope +!HISTORY_MSG_ICM_WORKING_TRC_METHOD;Working - TRC method !ICCPROFCREATOR_COPYRIGHT;Copyright: !ICCPROFCREATOR_COPYRIGHT_RESET_TOOLTIP;Reset to the default copyright, granted to "RawTherapee, CC0" !ICCPROFCREATOR_CUSTOM;Custom !ICCPROFCREATOR_DESCRIPTION;Description: -!ICCPROFCREATOR_DESCRIPTION_TOOLTIP;Leave empty to set the default description +!ICCPROFCREATOR_DESCRIPTION_ADDPARAM;Append gamma and slope values to the description +!ICCPROFCREATOR_DESCRIPTION_TOOLTIP;Leave empty to set the default description. !ICCPROFCREATOR_GAMMA;Gamma -!ICCPROFCREATOR_ICCVERSION;Generated profile's version: +!ICCPROFCREATOR_ICCVERSION;ICC version: !ICCPROFCREATOR_ILL;Illuminant: !ICCPROFCREATOR_ILL_41;D41 !ICCPROFCREATOR_ILL_50;D50 @@ -2285,7 +2285,7 @@ ZOOMPANEL_ZOOMOUT;ズームアウト\nショートカット: - !ICCPROFCREATOR_ILL_80;D80 !ICCPROFCREATOR_ILL_DEF;Default !ICCPROFCREATOR_ILL_INC;StdA 2856K -!ICCPROFCREATOR_ILL_TOOLTIP;You can only set Illuminant with ICC v4 profiles +!ICCPROFCREATOR_ILL_TOOLTIP;You can only set the illuminant for ICC v4 profiles. !ICCPROFCREATOR_PRIMARIES;Primaries: !ICCPROFCREATOR_PRIM_ACESP0;ACES AP0 !ICCPROFCREATOR_PRIM_ACESP1;ACES AP1 @@ -2302,7 +2302,7 @@ ZOOMPANEL_ZOOMOUT;ズームアウト\nショートカット: - !ICCPROFCREATOR_PRIM_REDX;Red X !ICCPROFCREATOR_PRIM_REDY;Red Y !ICCPROFCREATOR_PRIM_SRGB;sRGB -!ICCPROFCREATOR_PRIM_TOOLTIP;You can only set Custom Primaries with ICC v4 profiles +!ICCPROFCREATOR_PRIM_TOOLTIP;You can only set custom primaries for ICC v4 profiles. !ICCPROFCREATOR_PRIM_WIDEG;Widegamut !ICCPROFCREATOR_PROF_V2;ICC v2 !ICCPROFCREATOR_PROF_V4;ICC v4 @@ -2310,9 +2310,9 @@ ZOOMPANEL_ZOOMOUT;ズームアウト\nショートカット: - !ICCPROFCREATOR_SLOPE;Slope !ICCPROFCREATOR_TRC_PRESET;Tone response curve: !MAIN_BUTTON_ICCPROFCREATOR;ICC Profile Creator -!TP_ICM_WORKTRC;Tone response curve: -!TP_ICM_WORKTRC_CUSTOM;Custom -!TP_ICM_WORKTRC_GAMMA;Gamma -!TP_ICM_WORKTRC_NONE;None -!TP_ICM_WORKTRC_SLOPE;Slope -!TP_ICM_WORKTRC_TOOLTIP;Only for build in profiles +!TP_ICM_WORKING_TRC;Tone response curve: +!TP_ICM_WORKING_TRC_CUSTOM;Custom +!TP_ICM_WORKING_TRC_GAMMA;Gamma +!TP_ICM_WORKING_TRC_NONE;None +!TP_ICM_WORKING_TRC_SLOPE;Slope +!TP_ICM_WORKING_TRC_TOOLTIP;Only for built-in profiles. diff --git a/rtdata/languages/Latvian b/rtdata/languages/Latvian index 90ac6ca8d..1db1390a7 100644 --- a/rtdata/languages/Latvian +++ b/rtdata/languages/Latvian @@ -978,16 +978,16 @@ TP_WBALANCE_TEMPERATURE;Temperatūra !HISTORY_MSG_491;White Balance !HISTORY_MSG_492;RGB Curves !HISTORY_MSG_493;L*a*b* Adjustments -!HISTORY_MSG_CLAMPOOG;Out-of-gamut color clipping +!HISTORY_MSG_CLAMPOOG;Clip out-of-gamut colors !HISTORY_MSG_COLORTONING_LABGRID_VALUE;CT - Color correction !HISTORY_MSG_DUALDEMOSAIC_CONTRAST;AMaZE+VNG4 - Contrast threshold -!HISTORY_MSG_HISTMATCHING;Auto-Matched Tone Curve -!HISTORY_MSG_ICMGAMM;Working gamma -!HISTORY_MSG_ICMPRIMARI;Output profile primaries -!HISTORY_MSG_ICMPROFILE;Output profile type -!HISTORY_MSG_ICMSLOP;Working slope -!HISTORY_MSG_ICMTEMP;Output IccV4 D illuminant -!HISTORY_MSG_ICMTRCIN;TRC working method +!HISTORY_MSG_HISTMATCHING;Auto-matched tone curve +!HISTORY_MSG_ICM_OUTPUT_PRIMARIES;Output - Primaries +!HISTORY_MSG_ICM_OUTPUT_TEMP;Output - ICC-v4 illuminant D +!HISTORY_MSG_ICM_OUTPUT_TYPE;Output - Type +!HISTORY_MSG_ICM_WORKING_GAMMA;Working - Gamma +!HISTORY_MSG_ICM_WORKING_SLOPE;Working - Slope +!HISTORY_MSG_ICM_WORKING_TRC_METHOD;Working - TRC method !HISTORY_MSG_LOCALCONTRAST_AMOUNT;Local Contrast - Amount !HISTORY_MSG_LOCALCONTRAST_DARKNESS;Local Contrast - Darkness !HISTORY_MSG_LOCALCONTRAST_ENABLED;Local Contrast @@ -1000,15 +1000,20 @@ TP_WBALANCE_TEMPERATURE;Temperatūra !HISTORY_MSG_PREPROCESS_PDAFLINESFILTER;PDAF lines filter !HISTORY_MSG_PRSHARPEN_CONTRAST;PRS - Contrast threshold !HISTORY_MSG_RAW_BORDER;Raw border -!HISTORY_MSG_RESIZE_ALLOW_UPSCALING;Resize - Allow upscaling +!HISTORY_MSG_RESIZE_ALLOWUPSCALING;Resize - Allow upscaling !HISTORY_MSG_SHARPENING_CONTRAST;Sharpening - Contrast threshold !HISTORY_MSG_SOFTLIGHT_ENABLED;Soft light !HISTORY_MSG_SOFTLIGHT_STRENGTH;Soft light - Strength !HISTORY_MSG_TM_FATTAL_ANCHOR;DRC - Anchor !HISTORY_NEWSNAPSHOT_TOOLTIP;Shortcut: Alt-s +!ICCPROFCREATOR_COPYRIGHT;Copyright: +!ICCPROFCREATOR_COPYRIGHT_RESET_TOOLTIP;Reset to the default copyright, granted to "RawTherapee, CC0" !ICCPROFCREATOR_CUSTOM;Custom +!ICCPROFCREATOR_DESCRIPTION;Description: +!ICCPROFCREATOR_DESCRIPTION_ADDPARAM;Append gamma and slope values to the description +!ICCPROFCREATOR_DESCRIPTION_TOOLTIP;Leave empty to set the default description. !ICCPROFCREATOR_GAMMA;Gamma -!ICCPROFCREATOR_ICCVERSION;Generated profile's version: +!ICCPROFCREATOR_ICCVERSION;ICC version: !ICCPROFCREATOR_ILL;Illuminant: !ICCPROFCREATOR_ILL_41;D41 !ICCPROFCREATOR_ILL_50;D50 @@ -1018,7 +1023,7 @@ TP_WBALANCE_TEMPERATURE;Temperatūra !ICCPROFCREATOR_ILL_80;D80 !ICCPROFCREATOR_ILL_DEF;Default !ICCPROFCREATOR_ILL_INC;StdA 2856K -!ICCPROFCREATOR_ILL_TOOLTIP;You can only set Illuminant with ICC v4 profiles +!ICCPROFCREATOR_ILL_TOOLTIP;You can only set the illuminant for ICC v4 profiles. !ICCPROFCREATOR_PRIMARIES;Primaries: !ICCPROFCREATOR_PRIM_ACESP0;ACES AP0 !ICCPROFCREATOR_PRIM_ACESP1;ACES AP1 @@ -1035,7 +1040,7 @@ TP_WBALANCE_TEMPERATURE;Temperatūra !ICCPROFCREATOR_PRIM_REDX;Red X !ICCPROFCREATOR_PRIM_REDY;Red Y !ICCPROFCREATOR_PRIM_SRGB;sRGB -!ICCPROFCREATOR_PRIM_TOOLTIP;You can only set Custom Primaries with ICC v4 profiles +!ICCPROFCREATOR_PRIM_TOOLTIP;You can only set custom primaries for ICC v4 profiles. !ICCPROFCREATOR_PRIM_WIDEG;Widegamut !ICCPROFCREATOR_PROF_V2;ICC v2 !ICCPROFCREATOR_PROF_V4;ICC v4 @@ -1191,7 +1196,7 @@ TP_WBALANCE_TEMPERATURE;Temperatūra !PARTIALPASTE_SHARPENEDGE;Edges !PARTIALPASTE_SHARPENMICRO;Microcontrast !PARTIALPASTE_SOFTLIGHT;Soft light -!PARTIALPASTE_TM_FATTAL;Dynamic Range Compression +!PARTIALPASTE_TM_FATTAL;Dynamic range compression !PARTIALPASTE_VIBRANCE;Vibrance !PREFERENCES_ADD;Add !PREFERENCES_AUTLISLOW;Low @@ -1759,12 +1764,12 @@ TP_WBALANCE_TEMPERATURE;Temperatūra !TP_ICM_SAVEREFERENCE_TOOLTIP;Save the linear TIFF image before the input profile is applied. The result can be used for calibration purposes and generation of a camera profile. !TP_ICM_TONECURVE;Tone curve !TP_ICM_TONECURVE_TOOLTIP;Employ the embedded DCP tone curve. The setting is only available if the selected DCP has a tone curve. -!TP_ICM_WORKTRC;Tone response curve: -!TP_ICM_WORKTRC_CUSTOM;Custom -!TP_ICM_WORKTRC_GAMMA;Gamma -!TP_ICM_WORKTRC_NONE;None -!TP_ICM_WORKTRC_SLOPE;Slope -!TP_ICM_WORKTRC_TOOLTIP;Only for build in profiles +!TP_ICM_WORKING_TRC;Tone response curve: +!TP_ICM_WORKING_TRC_CUSTOM;Custom +!TP_ICM_WORKING_TRC_GAMMA;Gamma +!TP_ICM_WORKING_TRC_NONE;None +!TP_ICM_WORKING_TRC_SLOPE;Slope +!TP_ICM_WORKING_TRC_TOOLTIP;Only for built-in profiles. !TP_IMPULSEDENOISE_LABEL;Impulse Noise Reduction !TP_IMPULSEDENOISE_THRESH;Threshold !TP_LABCURVE_AVOIDCOLORSHIFT;Avoid color shift diff --git a/rtdata/languages/Magyar b/rtdata/languages/Magyar index 5e5676dd6..c094ed9a0 100644 --- a/rtdata/languages/Magyar +++ b/rtdata/languages/Magyar @@ -1251,16 +1251,16 @@ ZOOMPANEL_ZOOMOUT;Kicsinyítés - !HISTORY_MSG_491;White Balance !HISTORY_MSG_492;RGB Curves !HISTORY_MSG_493;L*a*b* Adjustments -!HISTORY_MSG_CLAMPOOG;Out-of-gamut color clipping +!HISTORY_MSG_CLAMPOOG;Clip out-of-gamut colors !HISTORY_MSG_COLORTONING_LABGRID_VALUE;CT - Color correction !HISTORY_MSG_DUALDEMOSAIC_CONTRAST;AMaZE+VNG4 - Contrast threshold -!HISTORY_MSG_HISTMATCHING;Auto-Matched Tone Curve -!HISTORY_MSG_ICMGAMM;Working gamma -!HISTORY_MSG_ICMPRIMARI;Output profile primaries -!HISTORY_MSG_ICMPROFILE;Output profile type -!HISTORY_MSG_ICMSLOP;Working slope -!HISTORY_MSG_ICMTEMP;Output IccV4 D illuminant -!HISTORY_MSG_ICMTRCIN;TRC working method +!HISTORY_MSG_HISTMATCHING;Auto-matched tone curve +!HISTORY_MSG_ICM_OUTPUT_PRIMARIES;Output - Primaries +!HISTORY_MSG_ICM_OUTPUT_TEMP;Output - ICC-v4 illuminant D +!HISTORY_MSG_ICM_OUTPUT_TYPE;Output - Type +!HISTORY_MSG_ICM_WORKING_GAMMA;Working - Gamma +!HISTORY_MSG_ICM_WORKING_SLOPE;Working - Slope +!HISTORY_MSG_ICM_WORKING_TRC_METHOD;Working - TRC method !HISTORY_MSG_LOCALCONTRAST_AMOUNT;Local Contrast - Amount !HISTORY_MSG_LOCALCONTRAST_DARKNESS;Local Contrast - Darkness !HISTORY_MSG_LOCALCONTRAST_ENABLED;Local Contrast @@ -1273,15 +1273,20 @@ ZOOMPANEL_ZOOMOUT;Kicsinyítés - !HISTORY_MSG_PREPROCESS_PDAFLINESFILTER;PDAF lines filter !HISTORY_MSG_PRSHARPEN_CONTRAST;PRS - Contrast threshold !HISTORY_MSG_RAW_BORDER;Raw border -!HISTORY_MSG_RESIZE_ALLOW_UPSCALING;Resize - Allow upscaling +!HISTORY_MSG_RESIZE_ALLOWUPSCALING;Resize - Allow upscaling !HISTORY_MSG_SHARPENING_CONTRAST;Sharpening - Contrast threshold !HISTORY_MSG_SOFTLIGHT_ENABLED;Soft light !HISTORY_MSG_SOFTLIGHT_STRENGTH;Soft light - Strength !HISTORY_MSG_TM_FATTAL_ANCHOR;DRC - Anchor !HISTORY_NEWSNAPSHOT_TOOLTIP;Shortcut: Alt-s +!ICCPROFCREATOR_COPYRIGHT;Copyright: +!ICCPROFCREATOR_COPYRIGHT_RESET_TOOLTIP;Reset to the default copyright, granted to "RawTherapee, CC0" !ICCPROFCREATOR_CUSTOM;Custom +!ICCPROFCREATOR_DESCRIPTION;Description: +!ICCPROFCREATOR_DESCRIPTION_ADDPARAM;Append gamma and slope values to the description +!ICCPROFCREATOR_DESCRIPTION_TOOLTIP;Leave empty to set the default description. !ICCPROFCREATOR_GAMMA;Gamma -!ICCPROFCREATOR_ICCVERSION;Generated profile's version: +!ICCPROFCREATOR_ICCVERSION;ICC version: !ICCPROFCREATOR_ILL;Illuminant: !ICCPROFCREATOR_ILL_41;D41 !ICCPROFCREATOR_ILL_50;D50 @@ -1291,7 +1296,7 @@ ZOOMPANEL_ZOOMOUT;Kicsinyítés - !ICCPROFCREATOR_ILL_80;D80 !ICCPROFCREATOR_ILL_DEF;Default !ICCPROFCREATOR_ILL_INC;StdA 2856K -!ICCPROFCREATOR_ILL_TOOLTIP;You can only set Illuminant with ICC v4 profiles +!ICCPROFCREATOR_ILL_TOOLTIP;You can only set the illuminant for ICC v4 profiles. !ICCPROFCREATOR_PRIMARIES;Primaries: !ICCPROFCREATOR_PRIM_ACESP0;ACES AP0 !ICCPROFCREATOR_PRIM_ACESP1;ACES AP1 @@ -1308,7 +1313,7 @@ ZOOMPANEL_ZOOMOUT;Kicsinyítés - !ICCPROFCREATOR_PRIM_REDX;Red X !ICCPROFCREATOR_PRIM_REDY;Red Y !ICCPROFCREATOR_PRIM_SRGB;sRGB -!ICCPROFCREATOR_PRIM_TOOLTIP;You can only set Custom Primaries with ICC v4 profiles +!ICCPROFCREATOR_PRIM_TOOLTIP;You can only set custom primaries for ICC v4 profiles. !ICCPROFCREATOR_PRIM_WIDEG;Widegamut !ICCPROFCREATOR_PROF_V2;ICC v2 !ICCPROFCREATOR_PROF_V4;ICC v4 @@ -1400,7 +1405,7 @@ ZOOMPANEL_ZOOMOUT;Kicsinyítés - !PARTIALPASTE_RAW_PIXELSHIFT;Pixel Shift !PARTIALPASTE_RETINEX;Retinex !PARTIALPASTE_SOFTLIGHT;Soft light -!PARTIALPASTE_TM_FATTAL;Dynamic Range Compression +!PARTIALPASTE_TM_FATTAL;Dynamic range compression !PREFERENCES_AUTLISLOW;Low !PREFERENCES_AUTLISMAX;Max - Average of all tiles !PREFERENCES_AUTLISSTD;High @@ -1861,12 +1866,12 @@ ZOOMPANEL_ZOOMOUT;Kicsinyítés - !TP_ICM_SAVEREFERENCE_TOOLTIP;Save the linear TIFF image before the input profile is applied. The result can be used for calibration purposes and generation of a camera profile. !TP_ICM_TONECURVE;Tone curve !TP_ICM_TONECURVE_TOOLTIP;Employ the embedded DCP tone curve. The setting is only available if the selected DCP has a tone curve. -!TP_ICM_WORKTRC;Tone response curve: -!TP_ICM_WORKTRC_CUSTOM;Custom -!TP_ICM_WORKTRC_GAMMA;Gamma -!TP_ICM_WORKTRC_NONE;None -!TP_ICM_WORKTRC_SLOPE;Slope -!TP_ICM_WORKTRC_TOOLTIP;Only for build in profiles +!TP_ICM_WORKING_TRC;Tone response curve: +!TP_ICM_WORKING_TRC_CUSTOM;Custom +!TP_ICM_WORKING_TRC_GAMMA;Gamma +!TP_ICM_WORKING_TRC_NONE;None +!TP_ICM_WORKING_TRC_SLOPE;Slope +!TP_ICM_WORKING_TRC_TOOLTIP;Only for built-in profiles. !TP_LABCURVE_AVOIDCOLORSHIFT;Avoid color shift !TP_LABCURVE_AVOIDCOLORSHIFT_TOOLTIP;Fit colors into gamut of the working color space and apply Munsell correction. !TP_LABCURVE_CHROMATICITY;Chromaticity diff --git a/rtdata/languages/Nederlands b/rtdata/languages/Nederlands index b28c0739c..3487c4091 100644 --- a/rtdata/languages/Nederlands +++ b/rtdata/languages/Nederlands @@ -2142,16 +2142,16 @@ ZOOMPANEL_ZOOMOUT;Zoom uit\nSneltoets: - !HISTORY_MSG_491;White Balance !HISTORY_MSG_492;RGB Curves !HISTORY_MSG_493;L*a*b* Adjustments -!HISTORY_MSG_CLAMPOOG;Out-of-gamut color clipping +!HISTORY_MSG_CLAMPOOG;Clip out-of-gamut colors !HISTORY_MSG_COLORTONING_LABGRID_VALUE;CT - Color correction !HISTORY_MSG_DUALDEMOSAIC_CONTRAST;AMaZE+VNG4 - Contrast threshold -!HISTORY_MSG_HISTMATCHING;Auto-Matched Tone Curve -!HISTORY_MSG_ICMGAMM;Working gamma -!HISTORY_MSG_ICMPRIMARI;Output profile primaries -!HISTORY_MSG_ICMPROFILE;Output profile type -!HISTORY_MSG_ICMSLOP;Working slope -!HISTORY_MSG_ICMTEMP;Output IccV4 D illuminant -!HISTORY_MSG_ICMTRCIN;TRC working method +!HISTORY_MSG_HISTMATCHING;Auto-matched tone curve +!HISTORY_MSG_ICM_OUTPUT_PRIMARIES;Output - Primaries +!HISTORY_MSG_ICM_OUTPUT_TEMP;Output - ICC-v4 illuminant D +!HISTORY_MSG_ICM_OUTPUT_TYPE;Output - Type +!HISTORY_MSG_ICM_WORKING_GAMMA;Working - Gamma +!HISTORY_MSG_ICM_WORKING_SLOPE;Working - Slope +!HISTORY_MSG_ICM_WORKING_TRC_METHOD;Working - TRC method !HISTORY_MSG_LOCALCONTRAST_AMOUNT;Local Contrast - Amount !HISTORY_MSG_LOCALCONTRAST_DARKNESS;Local Contrast - Darkness !HISTORY_MSG_LOCALCONTRAST_ENABLED;Local Contrast @@ -2164,19 +2164,19 @@ ZOOMPANEL_ZOOMOUT;Zoom uit\nSneltoets: - !HISTORY_MSG_PREPROCESS_PDAFLINESFILTER;PDAF lines filter !HISTORY_MSG_PRSHARPEN_CONTRAST;PRS - Contrast threshold !HISTORY_MSG_RAW_BORDER;Raw border -!HISTORY_MSG_RESIZE_ALLOW_UPSCALING;Resize - Allow upscaling +!HISTORY_MSG_RESIZE_ALLOWUPSCALING;Resize - Allow upscaling !HISTORY_MSG_SHARPENING_CONTRAST;Sharpening - Contrast threshold !HISTORY_MSG_SOFTLIGHT_ENABLED;Soft light !HISTORY_MSG_SOFTLIGHT_STRENGTH;Soft light - Strength !HISTORY_MSG_TM_FATTAL_ANCHOR;DRC - Anchor -!ICCPROFCREATOR_ADD_PARAM_IN_DESC;Append Gamma and Slope values to the description !ICCPROFCREATOR_COPYRIGHT;Copyright: !ICCPROFCREATOR_COPYRIGHT_RESET_TOOLTIP;Reset to the default copyright, granted to "RawTherapee, CC0" !ICCPROFCREATOR_CUSTOM;Custom !ICCPROFCREATOR_DESCRIPTION;Description: -!ICCPROFCREATOR_DESCRIPTION_TOOLTIP;Leave empty to set the default description +!ICCPROFCREATOR_DESCRIPTION_ADDPARAM;Append gamma and slope values to the description +!ICCPROFCREATOR_DESCRIPTION_TOOLTIP;Leave empty to set the default description. !ICCPROFCREATOR_GAMMA;Gamma -!ICCPROFCREATOR_ICCVERSION;Generated profile's version: +!ICCPROFCREATOR_ICCVERSION;ICC version: !ICCPROFCREATOR_ILL;Illuminant: !ICCPROFCREATOR_ILL_41;D41 !ICCPROFCREATOR_ILL_50;D50 @@ -2186,7 +2186,7 @@ ZOOMPANEL_ZOOMOUT;Zoom uit\nSneltoets: - !ICCPROFCREATOR_ILL_80;D80 !ICCPROFCREATOR_ILL_DEF;Default !ICCPROFCREATOR_ILL_INC;StdA 2856K -!ICCPROFCREATOR_ILL_TOOLTIP;You can only set Illuminant with ICC v4 profiles +!ICCPROFCREATOR_ILL_TOOLTIP;You can only set the illuminant for ICC v4 profiles. !ICCPROFCREATOR_PRIMARIES;Primaries: !ICCPROFCREATOR_PRIM_ACESP0;ACES AP0 !ICCPROFCREATOR_PRIM_ACESP1;ACES AP1 @@ -2203,7 +2203,7 @@ ZOOMPANEL_ZOOMOUT;Zoom uit\nSneltoets: - !ICCPROFCREATOR_PRIM_REDX;Red X !ICCPROFCREATOR_PRIM_REDY;Red Y !ICCPROFCREATOR_PRIM_SRGB;sRGB -!ICCPROFCREATOR_PRIM_TOOLTIP;You can only set Custom Primaries with ICC v4 profiles +!ICCPROFCREATOR_PRIM_TOOLTIP;You can only set custom primaries for ICC v4 profiles. !ICCPROFCREATOR_PRIM_WIDEG;Widegamut !ICCPROFCREATOR_PROF_V2;ICC v2 !ICCPROFCREATOR_PROF_V4;ICC v4 @@ -2229,7 +2229,7 @@ ZOOMPANEL_ZOOMOUT;Zoom uit\nSneltoets: - !PARTIALPASTE_PREPROCESS_PDAFLINESFILTER;PDAF lines filter !PARTIALPASTE_RAW_BORDER;Raw border !PARTIALPASTE_SOFTLIGHT;Soft light -!PARTIALPASTE_TM_FATTAL;Dynamic Range Compression +!PARTIALPASTE_TM_FATTAL;Dynamic range compression !PREFERENCES_AUTOSAVE_TP_OPEN;Automatically save tools collapsed/expanded\nstate before exiting !PREFERENCES_CROP;Crop editing !PREFERENCES_CROP_AUTO_FIT;Automatically zoom to fit the crop area @@ -2279,12 +2279,12 @@ ZOOMPANEL_ZOOMOUT;Zoom uit\nSneltoets: - !TP_EXPOSURE_CLAMPOOG;Clip out-of-gamut colors !TP_EXPOSURE_HISTMATCHING;Auto-Matched Tone Curve !TP_EXPOSURE_HISTMATCHING_TOOLTIP;Automatically adjust sliders and curves (except exposure compensation) to match the look of the embedded JPEG thumbnail. -!TP_ICM_WORKTRC;Tone response curve: -!TP_ICM_WORKTRC_CUSTOM;Custom -!TP_ICM_WORKTRC_GAMMA;Gamma -!TP_ICM_WORKTRC_NONE;None -!TP_ICM_WORKTRC_SLOPE;Slope -!TP_ICM_WORKTRC_TOOLTIP;Only for build in profiles +!TP_ICM_WORKING_TRC;Tone response curve: +!TP_ICM_WORKING_TRC_CUSTOM;Custom +!TP_ICM_WORKING_TRC_GAMMA;Gamma +!TP_ICM_WORKING_TRC_NONE;None +!TP_ICM_WORKING_TRC_SLOPE;Slope +!TP_ICM_WORKING_TRC_TOOLTIP;Only for built-in profiles. !TP_LOCALCONTRAST_AMOUNT;Amount !TP_LOCALCONTRAST_DARKNESS;Darkness level !TP_LOCALCONTRAST_LABEL;Local Contrast diff --git a/rtdata/languages/Norsk BM b/rtdata/languages/Norsk BM index 12e84894f..e2ccb2212 100644 --- a/rtdata/languages/Norsk BM +++ b/rtdata/languages/Norsk BM @@ -977,16 +977,16 @@ TP_WBALANCE_TEMPERATURE;Temperatur !HISTORY_MSG_491;White Balance !HISTORY_MSG_492;RGB Curves !HISTORY_MSG_493;L*a*b* Adjustments -!HISTORY_MSG_CLAMPOOG;Out-of-gamut color clipping +!HISTORY_MSG_CLAMPOOG;Clip out-of-gamut colors !HISTORY_MSG_COLORTONING_LABGRID_VALUE;CT - Color correction !HISTORY_MSG_DUALDEMOSAIC_CONTRAST;AMaZE+VNG4 - Contrast threshold -!HISTORY_MSG_HISTMATCHING;Auto-Matched Tone Curve -!HISTORY_MSG_ICMGAMM;Working gamma -!HISTORY_MSG_ICMPRIMARI;Output profile primaries -!HISTORY_MSG_ICMPROFILE;Output profile type -!HISTORY_MSG_ICMSLOP;Working slope -!HISTORY_MSG_ICMTEMP;Output IccV4 D illuminant -!HISTORY_MSG_ICMTRCIN;TRC working method +!HISTORY_MSG_HISTMATCHING;Auto-matched tone curve +!HISTORY_MSG_ICM_OUTPUT_PRIMARIES;Output - Primaries +!HISTORY_MSG_ICM_OUTPUT_TEMP;Output - ICC-v4 illuminant D +!HISTORY_MSG_ICM_OUTPUT_TYPE;Output - Type +!HISTORY_MSG_ICM_WORKING_GAMMA;Working - Gamma +!HISTORY_MSG_ICM_WORKING_SLOPE;Working - Slope +!HISTORY_MSG_ICM_WORKING_TRC_METHOD;Working - TRC method !HISTORY_MSG_LOCALCONTRAST_AMOUNT;Local Contrast - Amount !HISTORY_MSG_LOCALCONTRAST_DARKNESS;Local Contrast - Darkness !HISTORY_MSG_LOCALCONTRAST_ENABLED;Local Contrast @@ -999,15 +999,20 @@ TP_WBALANCE_TEMPERATURE;Temperatur !HISTORY_MSG_PREPROCESS_PDAFLINESFILTER;PDAF lines filter !HISTORY_MSG_PRSHARPEN_CONTRAST;PRS - Contrast threshold !HISTORY_MSG_RAW_BORDER;Raw border -!HISTORY_MSG_RESIZE_ALLOW_UPSCALING;Resize - Allow upscaling +!HISTORY_MSG_RESIZE_ALLOWUPSCALING;Resize - Allow upscaling !HISTORY_MSG_SHARPENING_CONTRAST;Sharpening - Contrast threshold !HISTORY_MSG_SOFTLIGHT_ENABLED;Soft light !HISTORY_MSG_SOFTLIGHT_STRENGTH;Soft light - Strength !HISTORY_MSG_TM_FATTAL_ANCHOR;DRC - Anchor !HISTORY_NEWSNAPSHOT_TOOLTIP;Shortcut: Alt-s +!ICCPROFCREATOR_COPYRIGHT;Copyright: +!ICCPROFCREATOR_COPYRIGHT_RESET_TOOLTIP;Reset to the default copyright, granted to "RawTherapee, CC0" !ICCPROFCREATOR_CUSTOM;Custom +!ICCPROFCREATOR_DESCRIPTION;Description: +!ICCPROFCREATOR_DESCRIPTION_ADDPARAM;Append gamma and slope values to the description +!ICCPROFCREATOR_DESCRIPTION_TOOLTIP;Leave empty to set the default description. !ICCPROFCREATOR_GAMMA;Gamma -!ICCPROFCREATOR_ICCVERSION;Generated profile's version: +!ICCPROFCREATOR_ICCVERSION;ICC version: !ICCPROFCREATOR_ILL;Illuminant: !ICCPROFCREATOR_ILL_41;D41 !ICCPROFCREATOR_ILL_50;D50 @@ -1017,7 +1022,7 @@ TP_WBALANCE_TEMPERATURE;Temperatur !ICCPROFCREATOR_ILL_80;D80 !ICCPROFCREATOR_ILL_DEF;Default !ICCPROFCREATOR_ILL_INC;StdA 2856K -!ICCPROFCREATOR_ILL_TOOLTIP;You can only set Illuminant with ICC v4 profiles +!ICCPROFCREATOR_ILL_TOOLTIP;You can only set the illuminant for ICC v4 profiles. !ICCPROFCREATOR_PRIMARIES;Primaries: !ICCPROFCREATOR_PRIM_ACESP0;ACES AP0 !ICCPROFCREATOR_PRIM_ACESP1;ACES AP1 @@ -1034,7 +1039,7 @@ TP_WBALANCE_TEMPERATURE;Temperatur !ICCPROFCREATOR_PRIM_REDX;Red X !ICCPROFCREATOR_PRIM_REDY;Red Y !ICCPROFCREATOR_PRIM_SRGB;sRGB -!ICCPROFCREATOR_PRIM_TOOLTIP;You can only set Custom Primaries with ICC v4 profiles +!ICCPROFCREATOR_PRIM_TOOLTIP;You can only set custom primaries for ICC v4 profiles. !ICCPROFCREATOR_PRIM_WIDEG;Widegamut !ICCPROFCREATOR_PROF_V2;ICC v2 !ICCPROFCREATOR_PROF_V4;ICC v4 @@ -1190,7 +1195,7 @@ TP_WBALANCE_TEMPERATURE;Temperatur !PARTIALPASTE_SHARPENEDGE;Edges !PARTIALPASTE_SHARPENMICRO;Microcontrast !PARTIALPASTE_SOFTLIGHT;Soft light -!PARTIALPASTE_TM_FATTAL;Dynamic Range Compression +!PARTIALPASTE_TM_FATTAL;Dynamic range compression !PARTIALPASTE_VIBRANCE;Vibrance !PREFERENCES_ADD;Add !PREFERENCES_AUTLISLOW;Low @@ -1758,12 +1763,12 @@ TP_WBALANCE_TEMPERATURE;Temperatur !TP_ICM_SAVEREFERENCE_TOOLTIP;Save the linear TIFF image before the input profile is applied. The result can be used for calibration purposes and generation of a camera profile. !TP_ICM_TONECURVE;Tone curve !TP_ICM_TONECURVE_TOOLTIP;Employ the embedded DCP tone curve. The setting is only available if the selected DCP has a tone curve. -!TP_ICM_WORKTRC;Tone response curve: -!TP_ICM_WORKTRC_CUSTOM;Custom -!TP_ICM_WORKTRC_GAMMA;Gamma -!TP_ICM_WORKTRC_NONE;None -!TP_ICM_WORKTRC_SLOPE;Slope -!TP_ICM_WORKTRC_TOOLTIP;Only for build in profiles +!TP_ICM_WORKING_TRC;Tone response curve: +!TP_ICM_WORKING_TRC_CUSTOM;Custom +!TP_ICM_WORKING_TRC_GAMMA;Gamma +!TP_ICM_WORKING_TRC_NONE;None +!TP_ICM_WORKING_TRC_SLOPE;Slope +!TP_ICM_WORKING_TRC_TOOLTIP;Only for built-in profiles. !TP_IMPULSEDENOISE_LABEL;Impulse Noise Reduction !TP_IMPULSEDENOISE_THRESH;Threshold !TP_LABCURVE_AVOIDCOLORSHIFT;Avoid color shift diff --git a/rtdata/languages/Polish b/rtdata/languages/Polish index 530063bf7..d9e513e34 100644 --- a/rtdata/languages/Polish +++ b/rtdata/languages/Polish @@ -1664,16 +1664,16 @@ ZOOMPANEL_ZOOMOUT;Oddal\nSkrót: - !HISTORY_MSG_491;White Balance !HISTORY_MSG_492;RGB Curves !HISTORY_MSG_493;L*a*b* Adjustments -!HISTORY_MSG_CLAMPOOG;Out-of-gamut color clipping +!HISTORY_MSG_CLAMPOOG;Clip out-of-gamut colors !HISTORY_MSG_COLORTONING_LABGRID_VALUE;CT - Color correction !HISTORY_MSG_DUALDEMOSAIC_CONTRAST;AMaZE+VNG4 - Contrast threshold -!HISTORY_MSG_HISTMATCHING;Auto-Matched Tone Curve -!HISTORY_MSG_ICMGAMM;Working gamma -!HISTORY_MSG_ICMPRIMARI;Output profile primaries -!HISTORY_MSG_ICMPROFILE;Output profile type -!HISTORY_MSG_ICMSLOP;Working slope -!HISTORY_MSG_ICMTEMP;Output IccV4 D illuminant -!HISTORY_MSG_ICMTRCIN;TRC working method +!HISTORY_MSG_HISTMATCHING;Auto-matched tone curve +!HISTORY_MSG_ICM_OUTPUT_PRIMARIES;Output - Primaries +!HISTORY_MSG_ICM_OUTPUT_TEMP;Output - ICC-v4 illuminant D +!HISTORY_MSG_ICM_OUTPUT_TYPE;Output - Type +!HISTORY_MSG_ICM_WORKING_GAMMA;Working - Gamma +!HISTORY_MSG_ICM_WORKING_SLOPE;Working - Slope +!HISTORY_MSG_ICM_WORKING_TRC_METHOD;Working - TRC method !HISTORY_MSG_LOCALCONTRAST_AMOUNT;Local Contrast - Amount !HISTORY_MSG_LOCALCONTRAST_DARKNESS;Local Contrast - Darkness !HISTORY_MSG_LOCALCONTRAST_ENABLED;Local Contrast @@ -1686,14 +1686,19 @@ ZOOMPANEL_ZOOMOUT;Oddal\nSkrót: - !HISTORY_MSG_PREPROCESS_PDAFLINESFILTER;PDAF lines filter !HISTORY_MSG_PRSHARPEN_CONTRAST;PRS - Contrast threshold !HISTORY_MSG_RAW_BORDER;Raw border -!HISTORY_MSG_RESIZE_ALLOW_UPSCALING;Resize - Allow upscaling +!HISTORY_MSG_RESIZE_ALLOWUPSCALING;Resize - Allow upscaling !HISTORY_MSG_SHARPENING_CONTRAST;Sharpening - Contrast threshold !HISTORY_MSG_SOFTLIGHT_ENABLED;Soft light !HISTORY_MSG_SOFTLIGHT_STRENGTH;Soft light - Strength !HISTORY_MSG_TM_FATTAL_ANCHOR;DRC - Anchor +!ICCPROFCREATOR_COPYRIGHT;Copyright: +!ICCPROFCREATOR_COPYRIGHT_RESET_TOOLTIP;Reset to the default copyright, granted to "RawTherapee, CC0" !ICCPROFCREATOR_CUSTOM;Custom +!ICCPROFCREATOR_DESCRIPTION;Description: +!ICCPROFCREATOR_DESCRIPTION_ADDPARAM;Append gamma and slope values to the description +!ICCPROFCREATOR_DESCRIPTION_TOOLTIP;Leave empty to set the default description. !ICCPROFCREATOR_GAMMA;Gamma -!ICCPROFCREATOR_ICCVERSION;Generated profile's version: +!ICCPROFCREATOR_ICCVERSION;ICC version: !ICCPROFCREATOR_ILL;Illuminant: !ICCPROFCREATOR_ILL_41;D41 !ICCPROFCREATOR_ILL_50;D50 @@ -1703,7 +1708,7 @@ ZOOMPANEL_ZOOMOUT;Oddal\nSkrót: - !ICCPROFCREATOR_ILL_80;D80 !ICCPROFCREATOR_ILL_DEF;Default !ICCPROFCREATOR_ILL_INC;StdA 2856K -!ICCPROFCREATOR_ILL_TOOLTIP;You can only set Illuminant with ICC v4 profiles +!ICCPROFCREATOR_ILL_TOOLTIP;You can only set the illuminant for ICC v4 profiles. !ICCPROFCREATOR_PRIMARIES;Primaries: !ICCPROFCREATOR_PRIM_ACESP0;ACES AP0 !ICCPROFCREATOR_PRIM_ACESP1;ACES AP1 @@ -1720,7 +1725,7 @@ ZOOMPANEL_ZOOMOUT;Oddal\nSkrót: - !ICCPROFCREATOR_PRIM_REDX;Red X !ICCPROFCREATOR_PRIM_REDY;Red Y !ICCPROFCREATOR_PRIM_SRGB;sRGB -!ICCPROFCREATOR_PRIM_TOOLTIP;You can only set Custom Primaries with ICC v4 profiles +!ICCPROFCREATOR_PRIM_TOOLTIP;You can only set custom primaries for ICC v4 profiles. !ICCPROFCREATOR_PRIM_WIDEG;Widegamut !ICCPROFCREATOR_PROF_V2;ICC v2 !ICCPROFCREATOR_PROF_V4;ICC v4 @@ -1780,7 +1785,7 @@ ZOOMPANEL_ZOOMOUT;Oddal\nSkrót: - !PARTIALPASTE_RAW_PIXELSHIFT;Pixel Shift !PARTIALPASTE_RETINEX;Retinex !PARTIALPASTE_SOFTLIGHT;Soft light -!PARTIALPASTE_TM_FATTAL;Dynamic Range Compression +!PARTIALPASTE_TM_FATTAL;Dynamic range compression !PREFERENCES_AUTLISLOW;Low !PREFERENCES_AUTLISMAX;Max - Average of all tiles !PREFERENCES_AUTLISSTD;High @@ -1956,12 +1961,12 @@ ZOOMPANEL_ZOOMOUT;Oddal\nSkrót: - !TP_ICM_SAVEREFERENCE;Save Reference Image !TP_ICM_SAVEREFERENCE_APPLYWB;Apply white balance !TP_ICM_SAVEREFERENCE_APPLYWB_TOOLTIP;Generally, apply the white balance when saving images to create ICC profiles, and do not apply the white balance to create DCP profiles. -!TP_ICM_WORKTRC;Tone response curve: -!TP_ICM_WORKTRC_CUSTOM;Custom -!TP_ICM_WORKTRC_GAMMA;Gamma -!TP_ICM_WORKTRC_NONE;None -!TP_ICM_WORKTRC_SLOPE;Slope -!TP_ICM_WORKTRC_TOOLTIP;Only for build in profiles +!TP_ICM_WORKING_TRC;Tone response curve: +!TP_ICM_WORKING_TRC_CUSTOM;Custom +!TP_ICM_WORKING_TRC_GAMMA;Gamma +!TP_ICM_WORKING_TRC_NONE;None +!TP_ICM_WORKING_TRC_SLOPE;Slope +!TP_ICM_WORKING_TRC_TOOLTIP;Only for built-in profiles. !TP_LOCALCONTRAST_AMOUNT;Amount !TP_LOCALCONTRAST_DARKNESS;Darkness level !TP_LOCALCONTRAST_LABEL;Local Contrast diff --git a/rtdata/languages/Polish (Latin Characters) b/rtdata/languages/Polish (Latin Characters) index 9b06baa9c..fe92b9823 100644 --- a/rtdata/languages/Polish (Latin Characters) +++ b/rtdata/languages/Polish (Latin Characters) @@ -1664,16 +1664,16 @@ ZOOMPANEL_ZOOMOUT;Oddal\nSkrot: - !HISTORY_MSG_491;White Balance !HISTORY_MSG_492;RGB Curves !HISTORY_MSG_493;L*a*b* Adjustments -!HISTORY_MSG_CLAMPOOG;Out-of-gamut color clipping +!HISTORY_MSG_CLAMPOOG;Clip out-of-gamut colors !HISTORY_MSG_COLORTONING_LABGRID_VALUE;CT - Color correction !HISTORY_MSG_DUALDEMOSAIC_CONTRAST;AMaZE+VNG4 - Contrast threshold -!HISTORY_MSG_HISTMATCHING;Auto-Matched Tone Curve -!HISTORY_MSG_ICMGAMM;Working gamma -!HISTORY_MSG_ICMPRIMARI;Output profile primaries -!HISTORY_MSG_ICMPROFILE;Output profile type -!HISTORY_MSG_ICMSLOP;Working slope -!HISTORY_MSG_ICMTEMP;Output IccV4 D illuminant -!HISTORY_MSG_ICMTRCIN;TRC working method +!HISTORY_MSG_HISTMATCHING;Auto-matched tone curve +!HISTORY_MSG_ICM_OUTPUT_PRIMARIES;Output - Primaries +!HISTORY_MSG_ICM_OUTPUT_TEMP;Output - ICC-v4 illuminant D +!HISTORY_MSG_ICM_OUTPUT_TYPE;Output - Type +!HISTORY_MSG_ICM_WORKING_GAMMA;Working - Gamma +!HISTORY_MSG_ICM_WORKING_SLOPE;Working - Slope +!HISTORY_MSG_ICM_WORKING_TRC_METHOD;Working - TRC method !HISTORY_MSG_LOCALCONTRAST_AMOUNT;Local Contrast - Amount !HISTORY_MSG_LOCALCONTRAST_DARKNESS;Local Contrast - Darkness !HISTORY_MSG_LOCALCONTRAST_ENABLED;Local Contrast @@ -1686,14 +1686,19 @@ ZOOMPANEL_ZOOMOUT;Oddal\nSkrot: - !HISTORY_MSG_PREPROCESS_PDAFLINESFILTER;PDAF lines filter !HISTORY_MSG_PRSHARPEN_CONTRAST;PRS - Contrast threshold !HISTORY_MSG_RAW_BORDER;Raw border -!HISTORY_MSG_RESIZE_ALLOW_UPSCALING;Resize - Allow upscaling +!HISTORY_MSG_RESIZE_ALLOWUPSCALING;Resize - Allow upscaling !HISTORY_MSG_SHARPENING_CONTRAST;Sharpening - Contrast threshold !HISTORY_MSG_SOFTLIGHT_ENABLED;Soft light !HISTORY_MSG_SOFTLIGHT_STRENGTH;Soft light - Strength !HISTORY_MSG_TM_FATTAL_ANCHOR;DRC - Anchor +!ICCPROFCREATOR_COPYRIGHT;Copyright: +!ICCPROFCREATOR_COPYRIGHT_RESET_TOOLTIP;Reset to the default copyright, granted to "RawTherapee, CC0" !ICCPROFCREATOR_CUSTOM;Custom +!ICCPROFCREATOR_DESCRIPTION;Description: +!ICCPROFCREATOR_DESCRIPTION_ADDPARAM;Append gamma and slope values to the description +!ICCPROFCREATOR_DESCRIPTION_TOOLTIP;Leave empty to set the default description. !ICCPROFCREATOR_GAMMA;Gamma -!ICCPROFCREATOR_ICCVERSION;Generated profile's version: +!ICCPROFCREATOR_ICCVERSION;ICC version: !ICCPROFCREATOR_ILL;Illuminant: !ICCPROFCREATOR_ILL_41;D41 !ICCPROFCREATOR_ILL_50;D50 @@ -1703,7 +1708,7 @@ ZOOMPANEL_ZOOMOUT;Oddal\nSkrot: - !ICCPROFCREATOR_ILL_80;D80 !ICCPROFCREATOR_ILL_DEF;Default !ICCPROFCREATOR_ILL_INC;StdA 2856K -!ICCPROFCREATOR_ILL_TOOLTIP;You can only set Illuminant with ICC v4 profiles +!ICCPROFCREATOR_ILL_TOOLTIP;You can only set the illuminant for ICC v4 profiles. !ICCPROFCREATOR_PRIMARIES;Primaries: !ICCPROFCREATOR_PRIM_ACESP0;ACES AP0 !ICCPROFCREATOR_PRIM_ACESP1;ACES AP1 @@ -1720,7 +1725,7 @@ ZOOMPANEL_ZOOMOUT;Oddal\nSkrot: - !ICCPROFCREATOR_PRIM_REDX;Red X !ICCPROFCREATOR_PRIM_REDY;Red Y !ICCPROFCREATOR_PRIM_SRGB;sRGB -!ICCPROFCREATOR_PRIM_TOOLTIP;You can only set Custom Primaries with ICC v4 profiles +!ICCPROFCREATOR_PRIM_TOOLTIP;You can only set custom primaries for ICC v4 profiles. !ICCPROFCREATOR_PRIM_WIDEG;Widegamut !ICCPROFCREATOR_PROF_V2;ICC v2 !ICCPROFCREATOR_PROF_V4;ICC v4 @@ -1780,7 +1785,7 @@ ZOOMPANEL_ZOOMOUT;Oddal\nSkrot: - !PARTIALPASTE_RAW_PIXELSHIFT;Pixel Shift !PARTIALPASTE_RETINEX;Retinex !PARTIALPASTE_SOFTLIGHT;Soft light -!PARTIALPASTE_TM_FATTAL;Dynamic Range Compression +!PARTIALPASTE_TM_FATTAL;Dynamic range compression !PREFERENCES_AUTLISLOW;Low !PREFERENCES_AUTLISMAX;Max - Average of all tiles !PREFERENCES_AUTLISSTD;High @@ -1956,12 +1961,12 @@ ZOOMPANEL_ZOOMOUT;Oddal\nSkrot: - !TP_ICM_SAVEREFERENCE;Save Reference Image !TP_ICM_SAVEREFERENCE_APPLYWB;Apply white balance !TP_ICM_SAVEREFERENCE_APPLYWB_TOOLTIP;Generally, apply the white balance when saving images to create ICC profiles, and do not apply the white balance to create DCP profiles. -!TP_ICM_WORKTRC;Tone response curve: -!TP_ICM_WORKTRC_CUSTOM;Custom -!TP_ICM_WORKTRC_GAMMA;Gamma -!TP_ICM_WORKTRC_NONE;None -!TP_ICM_WORKTRC_SLOPE;Slope -!TP_ICM_WORKTRC_TOOLTIP;Only for build in profiles +!TP_ICM_WORKING_TRC;Tone response curve: +!TP_ICM_WORKING_TRC_CUSTOM;Custom +!TP_ICM_WORKING_TRC_GAMMA;Gamma +!TP_ICM_WORKING_TRC_NONE;None +!TP_ICM_WORKING_TRC_SLOPE;Slope +!TP_ICM_WORKING_TRC_TOOLTIP;Only for built-in profiles. !TP_LOCALCONTRAST_AMOUNT;Amount !TP_LOCALCONTRAST_DARKNESS;Darkness level !TP_LOCALCONTRAST_LABEL;Local Contrast diff --git a/rtdata/languages/Portugues (Brasil) b/rtdata/languages/Portugues (Brasil) index d02d05157..915cd5fb0 100644 --- a/rtdata/languages/Portugues (Brasil) +++ b/rtdata/languages/Portugues (Brasil) @@ -1,4 +1,4 @@ -#01 2018-07-17 Digitalpix58 +#01 2018-07-25 Digitalpix58 ABOUT_TAB_BUILD;Versão ABOUT_TAB_CREDITS;Créditos @@ -45,7 +45,7 @@ DYNPROFILEEDITOR_MOVE_DOWN;Mover para Baixo DYNPROFILEEDITOR_MOVE_UP;Mover para Cima DYNPROFILEEDITOR_NEW;Novo DYNPROFILEEDITOR_NEW_RULE;Nva Regra de Perfil Dinâmico -DYNPROFILEEDITOR_PROFILE;Processando Perfil +DYNPROFILEEDITOR_PROFILE;Perfil de Processamento EDITWINDOW_TITLE;Edição de Imagem EDIT_OBJECT_TOOLTIP;Exibe um widget na janela de visualização que permite ajustar essa ferramenta. EDIT_PIPETTE_TOOLTIP;Para adicionar um ponto de ajuste à curva, segure a tecla Ctrl enquanto clica com o botão esquerdo no ponto desejado na visualização da imagem.\nPara ajustar o ponto, Mantenha pressionada a tecla Ctrl enquanto clica com o botão esquerdo na área correspondente na visualização, então solte Ctrl (amenos que deseje um fino controle) e enquanto ainda mantém pressionado o botão esquerdo do mouse, mova o mouse para cima ou para baixo para mover esse ponto para cima ou para baixo na curva. @@ -150,7 +150,7 @@ FILEBROWSER_POPUPOPEN;Abrir FILEBROWSER_POPUPOPENINEDITOR;Abrir no Editor FILEBROWSER_POPUPPROCESS;Coloque na fila FILEBROWSER_POPUPPROCESSFAST;Coloque na fila (Exportação rápida) -FILEBROWSER_POPUPPROFILEOPERATIONS;Processando operações de perfil +FILEBROWSER_POPUPPROFILEOPERATIONS;Operações de perfil de processamento FILEBROWSER_POPUPRANK;Classificar FILEBROWSER_POPUPRANK0;Desclassificar FILEBROWSER_POPUPRANK1;Rank 1 * @@ -206,7 +206,7 @@ FILECHOOSER_FILTER_ANY;Todos os arquivos FILECHOOSER_FILTER_COLPROF;Perfis de Cores FILECHOOSER_FILTER_CURVE;Arquivos de curvas FILECHOOSER_FILTER_LCP;Perfis de correção de lentes -FILECHOOSER_FILTER_PP;Processando perfis +FILECHOOSER_FILTER_PP;Perfis de processamento FILECHOOSER_FILTER_SAME;Mesmo formato da foto atual FILECHOOSER_FILTER_TIFF;Arquivos TIFF GENERAL_ABOUT;Sobre @@ -231,6 +231,7 @@ GENERAL_OPEN;Abrir GENERAL_PORTRAIT;Retrato GENERAL_RESET;Restaurar GENERAL_SAVE;Salvar +GENERAL_SAVE_AS;Salvar como... GENERAL_SLIDER;Barra de volume GENERAL_UNCHANGED;(Inalterado) GENERAL_WARNING;Atenção @@ -668,7 +669,7 @@ HISTORY_MSG_419;Retinex - Espaço colorido HISTORY_MSG_420;Retinex - Histograma - HSL HISTORY_MSG_421;Retinex - Gamma HISTORY_MSG_422;Retinex - Gamma -HISTORY_MSG_423;Retinex - Inclinação gamma +HISTORY_MSG_423;Retinex - Declive gamma HISTORY_MSG_424;Retinex - Limite HL HISTORY_MSG_425;Retinex - Base de registro HISTORY_MSG_426;Retinex - Equalizador de matiz @@ -727,6 +728,12 @@ HISTORY_MSG_CLAMPOOG;Recorte de cor fora do gamut HISTORY_MSG_COLORTONING_LABGRID_VALUE;CT - Correção de cor HISTORY_MSG_DUALDEMOSAIC_CONTRAST;AMaZE+VNG4 - Limite de contraste HISTORY_MSG_HISTMATCHING;Curva de Tom Auto-compatível +HISTORY_MSG_ICM_OUTPUT_PRIMARIESPrimárias do perfil de saída +HISTORY_MSG_ICM_OUTPUT_TEMP;Saída IccV4 D iluminante +HISTORY_MSG_ICM_OUTPUT_TYPE;Tipo de perfil de saída +HISTORY_MSG_ICM_WORKING_GAMMA;Gamma de trabalho +HISTORY_MSG_ICM_WORKING_SLOPE;Declive de trabalho +HISTORY_MSG_ICM_WORKING_TRC_METHOD;Método de trabalho TRC HISTORY_MSG_LOCALCONTRAST_AMOUNT;Contraste Local - Montante HISTORY_MSG_LOCALCONTRAST_DARKNESS;Contraste Local - Escuridão HISTORY_MSG_LOCALCONTRAST_ENABLED;Contraste Local @@ -739,7 +746,7 @@ HISTORY_MSG_PREPROCESS_LINEDENOISE_DIRECTION;Direção do filtro de ruído de li HISTORY_MSG_PREPROCESS_PDAFLINESFILTER;Filtros de linha PDAF HISTORY_MSG_PRSHARPEN_CONTRAST;PRS - Limite de contraste HISTORY_MSG_RAW_BORDER;Borda raw -HISTORY_MSG_RESIZE_ALLOW_UPSCALING;Redimensionar - Permitir escalonamento +HISTORY_MSG_RESIZE_ALLOWUPSCALING;Redimensionar - Permitir escalonamento HISTORY_MSG_SHARPENING_CONTRAST;Nitidez - Limite de contraste HISTORY_MSG_SOFTLIGHT_ENABLED;Luz suave HISTORY_MSG_SOFTLIGHT_STRENGTH;Luz suave - Intensidade @@ -748,6 +755,47 @@ HISTORY_NEWSNAPSHOT;Adicionar HISTORY_NEWSNAPSHOT_TOOLTIP;Atalho: Alt-s HISTORY_SNAPSHOT;Instantâneo HISTORY_SNAPSHOTS;Instantâneos +ICCPROFCREATOR_ADD_PARAM_IN_DESC;Anexar os valores Gamma e Declive para a descrição +ICCPROFCREATOR_COPYRIGHT;Direito Autoral: +ICCPROFCREATOR_COPYRIGHT_RESET_TOOLTIP;Restaurar para o direito autoral padrão, concedido a "RawTherapee, CC0" +ICCPROFCREATOR_CUSTOM;Personalizado +ICCPROFCREATOR_DESCRIPTION;Descrição: +ICCPROFCREATOR_DESCRIPTION_TOOLTIP;Deixe em branco para configurar a descrição padrão +ICCPROFCREATOR_GAMMA;Gamma +ICCPROFCREATOR_ICCVERSION;Versão do perfil gerado: +ICCPROFCREATOR_ILL;Iluminante: +ICCPROFCREATOR_ILL_41;D41 +ICCPROFCREATOR_ILL_50;D50 +ICCPROFCREATOR_ILL_55;D55 +ICCPROFCREATOR_ILL_60;D60 +ICCPROFCREATOR_ILL_65;D65 +ICCPROFCREATOR_ILL_80;D80 +ICCPROFCREATOR_ILL_DEF;Padrão +ICCPROFCREATOR_ILL_INC;StdA 2856K +ICCPROFCREATOR_ILL_TOOLTIP;Só podes configurar o iluminante com perfis ICC v4 +ICCPROFCREATOR_PRIMARIES;Primárias: +ICCPROFCREATOR_PRIM_ACESP0;ACES AP0 +ICCPROFCREATOR_PRIM_ACESP1;ACES AP1 +ICCPROFCREATOR_PRIM_ADOBE;Adobe RGB (1998) +ICCPROFCREATOR_PRIM_BEST;RGB superior +ICCPROFCREATOR_PRIM_BETA;BetaRGB +ICCPROFCREATOR_PRIM_BLUX;Azul X +ICCPROFCREATOR_PRIM_BLUY;Azul Y +ICCPROFCREATOR_PRIM_BRUCE;BruceRGB +ICCPROFCREATOR_PRIM_GREX;Verde X +ICCPROFCREATOR_PRIM_GREY;Verde Y +ICCPROFCREATOR_PRIM_PROPH;Prophoto +ICCPROFCREATOR_PRIM_REC2020;Rec2020 +ICCPROFCREATOR_PRIM_REDX;Vermelho X +ICCPROFCREATOR_PRIM_REDY;Vermelho Y +ICCPROFCREATOR_PRIM_SRGB;sRGB +ICCPROFCREATOR_PRIM_TOOLTIP;Só podes configurar Primárias Personalizadas com perfis ICC v4 +ICCPROFCREATOR_PRIM_WIDEG;Gamut ampla +ICCPROFCREATOR_PROF_V2;ICC v2 +ICCPROFCREATOR_PROF_V4;ICC v4 +ICCPROFCREATOR_SAVEDIALOG_TITLE;Salvar o perfil ICC como... +ICCPROFCREATOR_SLOPE;Declive +ICCPROFCREATOR_TRC_PRESET;Curva de resposta do tom: IPTCPANEL_CATEGORY;Categoria IPTCPANEL_CATEGORYHINT;Identifica o assunto da imagem na opinião do provedor. IPTCPANEL_CITY;Cidade @@ -795,6 +843,7 @@ LENSPROFILE_CORRECTION_LCPFILE;Arquivo LCP LENSPROFILE_CORRECTION_MANUAL;Parâmetros de correção manual LENSPROFILE_LENS_WARNING;Aviso: o fator de corte usado para o perfil da lente é maior que o fator de corte da câmera, os resultados podem estar errados. MAIN_BUTTON_FULLSCREEN;Tela cheia +MAIN_BUTTON_ICCPROFCREATOR;Criador de Perfil ICC MAIN_BUTTON_NAVNEXT_TOOLTIP;Navegue até a próxima imagem relativa à imagem aberta no Editor.\nAtalho: Shift-F4\n\nPara navegar até a próxima imagem relativa à miniatura selecionada no Navegador de Arquivos ou no Diapositivo:\nAtalho: F4 MAIN_BUTTON_NAVPREV_TOOLTIP;Navegue até a imagem anterior relativa à imagem aberta no Editor.\nAtalho: Shift-F3\n\nPara navegar até a imagem anterior relativa à miniatura selecionada no Navegador de Arquivos ou no Diapositivo:\nAtalho: F3 MAIN_BUTTON_NAVSYNC_TOOLTIP;Sincronize o Navegador de Arquivos ou o Diapositivo com o Editor para revelar a miniatura da imagem aberta no momento e limpe os filtros ativos.\nAtalho: x\n\nComo acima, mas sem limpar os filtros ativos:\nAtalho: y\n(Observe que a miniatura da imagem aberta não será mostrada se estiver filtrada). @@ -901,7 +950,7 @@ PARTIALPASTE_DARKFRAMEAUTOSELECT;Auto-seleção de quadro escuro PARTIALPASTE_DARKFRAMEFILE;Arquivo de quadro escuro PARTIALPASTE_DEFRINGE;Defringe PARTIALPASTE_DETAILGROUP;Configurações de detalhes -PARTIALPASTE_DIALOGLABEL;Perfil de processamento de colagem parcial +PARTIALPASTE_DIALOGLABEL;Perfil de processamento colar parcial PARTIALPASTE_DIRPYRDENOISE;Redução de ruído PARTIALPASTE_DIRPYREQUALIZER;Contraste pelos níveis de detalhe PARTIALPASTE_DISTORTION;Correção de distorção @@ -1084,7 +1133,7 @@ PREFERENCES_MED;Médio (Mosaico/2) PREFERENCES_MENUGROUPEXTPROGS;Grupo "Abrir com" PREFERENCES_MENUGROUPFILEOPERATIONS;Grupo "operações de Arquivo" PREFERENCES_MENUGROUPLABEL;Grupo "Etiqueta de cor" -PREFERENCES_MENUGROUPPROFILEOPERATIONS;Grupo "Processando operações de perfil" +PREFERENCES_MENUGROUPPROFILEOPERATIONS;Grupo "Operações de perfil de processamento" PREFERENCES_MENUGROUPRANK;Grupo "Rank" PREFERENCES_MENUOPTIONS;Opções do Menu de Contexto PREFERENCES_METADATA;Metadados @@ -1118,14 +1167,14 @@ PREFERENCES_PREVDEMO_FAST;Rápido PREFERENCES_PREVDEMO_LABEL;Método Demosaicing usado para a visualização em <100% zoom: PREFERENCES_PREVDEMO_SIDECAR;Como no PP3 PREFERENCES_PRINTER;Impressora (Soft-Proofing) -PREFERENCES_PROFILEHANDLING;Processamento de Tratamento de Perfil -PREFERENCES_PROFILELOADPR;Processando prioridade de carregamento do perfil +PREFERENCES_PROFILEHANDLING;Manuseio de Perfil de Processamento +PREFERENCES_PROFILELOADPR;Prioridade de carregamento do perfil de processamento PREFERENCES_PROFILEPRCACHE;Perfil no cache PREFERENCES_PROFILEPRFILE;Perfil próximo ao arquivo de entrada -PREFERENCES_PROFILESAVEBOTH;Salve o perfil de processamento no cache e próximo ao arquivo de entrada +PREFERENCES_PROFILESAVEBOTH;Salvar o perfil de processamento no cache e próximo ao arquivo de entrada PREFERENCES_PROFILESAVECACHE;Salvar o perfil de processamento no cache PREFERENCES_PROFILESAVEINPUT;Salvar o perfil de processamento próximo ao arquivo de entrada -PREFERENCES_PROFILESAVELOCATION;Processando o local de salvamento do perfil +PREFERENCES_PROFILESAVELOCATION;Local de salvamento do perfil de processamento PREFERENCES_PROFILE_NONE;Nenhum PREFERENCES_PROPERTY;Propriedade PREFERENCES_PRTINTENT;Intenção de renderização @@ -1187,10 +1236,10 @@ PREFERENCES_WLZER;Não PREFERENCES_WORKFLOW;Layout PROFILEPANEL_COPYPPASTE;Parâmetros para copiar PROFILEPANEL_GLOBALPROFILES;Perfis agrupados -PROFILEPANEL_LABEL;Processando Perfis +PROFILEPANEL_LABEL;Perfis de Processamento PROFILEPANEL_LOADDLGLABEL;Carregar Parâmetros de Processamento... PROFILEPANEL_LOADPPASTE;Parâmetros para carregar -PROFILEPANEL_MODE_TIP;Processando o modo de preencher o perfil.\n\nBotão pressionado: perfis parciais serão convertidos em perfis completos; os valores ausentes serão substituídos por padrões codificados.\n\nBotão liberado: os perfis serão aplicados como estão, alterando apenas os valores que eles contêm. +PROFILEPANEL_MODE_TIP;Modo de preenchimento do perfil de procesamento.\n\nBotão pressionado: perfis parciais serão convertidos em perfis completos; os valores ausentes serão substituídos por padrões codificados.\n\nBotão liberado: os perfis serão aplicados como estão, alterando apenas os valores que eles contêm. PROFILEPANEL_MYPROFILES;Meus perfis PROFILEPANEL_PASTEPPASTE;Parâmetros para colar PROFILEPANEL_PCUSTOM;Personalizado @@ -1211,7 +1260,7 @@ PROGRESSBAR_LOADPNG;Carregando arquivo PNG... PROGRESSBAR_LOADTIFF;Carregando arquivo TIFF... PROGRESSBAR_NOIMAGES;Nenhuma imagem encontrada PROGRESSBAR_PROCESSING;Processando imagem... -PROGRESSBAR_PROCESSING_PROFILESAVED;Processando perfil salvo +PROGRESSBAR_PROCESSING_PROFILESAVED;Perfil de processamento salvo PROGRESSBAR_READY;Pronto PROGRESSBAR_SAVEJPEG;Salvando arquivo JPEG... PROGRESSBAR_SAVEPNG;Salvando arquivo PNG... @@ -1667,6 +1716,12 @@ TP_ICM_SAVEREFERENCE_TOOLTIP;Salve a imagem TIFF linear antes que o perfil de en TP_ICM_TONECURVE;Curva de tom TP_ICM_TONECURVE_TOOLTIP;Empregue a curva de tom DCP incorporada. A configuração só estará disponível se o DCP selecionado tiver uma curva de tom. TP_ICM_WORKINGPROFILE;Perfil de Trabalho +TP_ICM_WORKING_TRC;Curva de resposta do tom: +TP_ICM_WORKING_TRC_CUSTOM;Personalizado +TP_ICM_WORKING_TRC_GAMMA;Gamma +TP_ICM_WORKING_TRC_NONE;Nenhum +TP_ICM_WORKING_TRC_SLOPE;Declive +TP_ICM_WORKING_TRC_TOOLTIP;Apenas para perfis internos TP_IMPULSEDENOISE_LABEL;Redução de Ruído por Impulso TP_IMPULSEDENOISE_THRESH;Limite TP_LABCURVE_AVOIDCOLORSHIFT;Evite mudança de cor @@ -1752,7 +1807,7 @@ TP_PREPROCESS_NO_FOUND;Nenhum encontrado TP_PREPROCESS_PDAFLINESFILTER;Filtro de linhas PDAF TP_PREPROCESS_PDAFLINESFILTER_TOOLTIP;Tenta suprimir o ruído de faixas causado por pixels PDAF no sensor, ocorrendo com algumas câmeras mirrorless da Sony em algumas cenas em contraluz com "flare" visível. TP_PRSHARPENING_LABEL;Pós-Redimensionamento de Nitidez -TP_PRSHARPENING_TOOLTIP;Focaliza a imagem após o redimensionamento. Funciona somente quando o método de redimensionamento "Lanczos" é usado. É impossível visualizar os efeitos dessa ferramenta. 35/5000 +TP_PRSHARPENING_TOOLTIP;Focaliza a imagem após o redimensionamento. Funciona somente quando o método de redimensionamento "Lanczos" é usado. É impossível visualizar os efeitos dessa ferramenta. Veja RawPedia para instruções de uso. TP_RAWCACORR_AUTO;Auto correção TP_RAWCACORR_CABLUE;Azul TP_RAWCACORR_CARED;Vermelho @@ -2217,7 +2272,6 @@ TP_WBALANCE_TUNGSTEN;Tungstênio TP_WBALANCE_WATER1;Embaixo da Água 1 TP_WBALANCE_WATER2;Embaixo da Água 2 TP_WBALANCE_WATER_HEADER;Embaixo da Água -Veja RawPedia para instruções de uso. ZOOMPANEL_100;(100%) ZOOMPANEL_NEWCROPWINDOW;Janela de detalhe aberta (nova) ZOOMPANEL_ZOOM100;Zoom para 100%\nAtalho: z @@ -2230,58 +2284,5 @@ ZOOMPANEL_ZOOMOUT;Menos Zoom\nAtalho: - ! Untranslated keys follow; remove the ! prefix after an entry is translated. !!!!!!!!!!!!!!!!!!!!!!!!! -!GENERAL_SAVE_AS;Save as... -!HISTORY_MSG_ICMGAMM;Working gamma -!HISTORY_MSG_ICMPRIMARI;Output profile primaries -!HISTORY_MSG_ICMPROFILE;Output profile type -!HISTORY_MSG_ICMSLOP;Working slope -!HISTORY_MSG_ICMTEMP;Output IccV4 D illuminant -!HISTORY_MSG_ICMTRCIN;TRC working method -!ICCPROFCREATOR_ADD_PARAM_IN_DESC;Append Gamma and Slope values to the description -!ICCPROFCREATOR_COPYRIGHT;Copyright: -!ICCPROFCREATOR_COPYRIGHT_RESET_TOOLTIP;Reset to the default copyright, granted to "RawTherapee, CC0" -!ICCPROFCREATOR_CUSTOM;Custom -!ICCPROFCREATOR_DESCRIPTION;Description: -!ICCPROFCREATOR_DESCRIPTION_TOOLTIP;Leave empty to set the default description -!ICCPROFCREATOR_GAMMA;Gamma -!ICCPROFCREATOR_ICCVERSION;Generated profile's version: -!ICCPROFCREATOR_ILL;Illuminant: -!ICCPROFCREATOR_ILL_41;D41 -!ICCPROFCREATOR_ILL_50;D50 -!ICCPROFCREATOR_ILL_55;D55 -!ICCPROFCREATOR_ILL_60;D60 -!ICCPROFCREATOR_ILL_65;D65 -!ICCPROFCREATOR_ILL_80;D80 -!ICCPROFCREATOR_ILL_DEF;Default -!ICCPROFCREATOR_ILL_INC;StdA 2856K -!ICCPROFCREATOR_ILL_TOOLTIP;You can only set Illuminant with ICC v4 profiles -!ICCPROFCREATOR_PRIMARIES;Primaries: -!ICCPROFCREATOR_PRIM_ACESP0;ACES AP0 -!ICCPROFCREATOR_PRIM_ACESP1;ACES AP1 -!ICCPROFCREATOR_PRIM_ADOBE;Adobe RGB (1998) -!ICCPROFCREATOR_PRIM_BEST;BestRGB -!ICCPROFCREATOR_PRIM_BETA;BetaRGB -!ICCPROFCREATOR_PRIM_BLUX;Blue X -!ICCPROFCREATOR_PRIM_BLUY;Blue Y -!ICCPROFCREATOR_PRIM_BRUCE;BruceRGB -!ICCPROFCREATOR_PRIM_GREX;Green X -!ICCPROFCREATOR_PRIM_GREY;Green Y -!ICCPROFCREATOR_PRIM_PROPH;Prophoto -!ICCPROFCREATOR_PRIM_REC2020;Rec2020 -!ICCPROFCREATOR_PRIM_REDX;Red X -!ICCPROFCREATOR_PRIM_REDY;Red Y -!ICCPROFCREATOR_PRIM_SRGB;sRGB -!ICCPROFCREATOR_PRIM_TOOLTIP;You can only set Custom Primaries with ICC v4 profiles -!ICCPROFCREATOR_PRIM_WIDEG;Widegamut -!ICCPROFCREATOR_PROF_V2;ICC v2 -!ICCPROFCREATOR_PROF_V4;ICC v4 -!ICCPROFCREATOR_SAVEDIALOG_TITLE;Save ICC profile as... -!ICCPROFCREATOR_SLOPE;Slope -!ICCPROFCREATOR_TRC_PRESET;Tone response curve: -!MAIN_BUTTON_ICCPROFCREATOR;ICC Profile Creator -!TP_ICM_WORKTRC;Tone response curve: -!TP_ICM_WORKTRC_CUSTOM;Custom -!TP_ICM_WORKTRC_GAMMA;Gamma -!TP_ICM_WORKTRC_NONE;None -!TP_ICM_WORKTRC_SLOPE;Slope -!TP_ICM_WORKTRC_TOOLTIP;Only for build in profiles +!HISTORY_MSG_ICM_OUTPUT_PRIMARIES;Output - Primaries +!ICCPROFCREATOR_DESCRIPTION_ADDPARAM;Append gamma and slope values to the description diff --git a/rtdata/languages/Russian b/rtdata/languages/Russian index 0af662b62..81b216cc8 100644 --- a/rtdata/languages/Russian +++ b/rtdata/languages/Russian @@ -1644,34 +1644,34 @@ ZOOMPANEL_ZOOMOUT;Отдалить\nГорячая клавиша: - !HISTORY_MSG_488;Dynamic Range Compression !HISTORY_MSG_489;DRC - Threshold !HISTORY_MSG_490;DRC - Amount -!HISTORY_MSG_CLAMPOOG;Out-of-gamut color clipping +!HISTORY_MSG_CLAMPOOG;Clip out-of-gamut colors !HISTORY_MSG_COLORTONING_LABGRID_VALUE;CT - Color correction !HISTORY_MSG_DUALDEMOSAIC_CONTRAST;AMaZE+VNG4 - Contrast threshold -!HISTORY_MSG_ICMGAMM;Working gamma -!HISTORY_MSG_ICMPRIMARI;Output profile primaries -!HISTORY_MSG_ICMPROFILE;Output profile type -!HISTORY_MSG_ICMSLOP;Working slope -!HISTORY_MSG_ICMTEMP;Output IccV4 D illuminant -!HISTORY_MSG_ICMTRCIN;TRC working method +!HISTORY_MSG_ICM_OUTPUT_PRIMARIES;Output - Primaries +!HISTORY_MSG_ICM_OUTPUT_TEMP;Output - ICC-v4 illuminant D +!HISTORY_MSG_ICM_OUTPUT_TYPE;Output - Type +!HISTORY_MSG_ICM_WORKING_GAMMA;Working - Gamma +!HISTORY_MSG_ICM_WORKING_SLOPE;Working - Slope +!HISTORY_MSG_ICM_WORKING_TRC_METHOD;Working - TRC method !HISTORY_MSG_MICROCONTRAST_CONTRAST;Microcontrast - Contrast threshold !HISTORY_MSG_PIXELSHIFT_DEMOSAIC;PS - Demosaic method for motion !HISTORY_MSG_PREPROCESS_LINEDENOISE_DIRECTION;Line noise filter direction !HISTORY_MSG_PREPROCESS_PDAFLINESFILTER;PDAF lines filter !HISTORY_MSG_PRSHARPEN_CONTRAST;PRS - Contrast threshold !HISTORY_MSG_RAW_BORDER;Raw border -!HISTORY_MSG_RESIZE_ALLOW_UPSCALING;Resize - Allow upscaling +!HISTORY_MSG_RESIZE_ALLOWUPSCALING;Resize - Allow upscaling !HISTORY_MSG_SHARPENING_CONTRAST;Sharpening - Contrast threshold !HISTORY_MSG_SOFTLIGHT_ENABLED;Soft light !HISTORY_MSG_SOFTLIGHT_STRENGTH;Soft light - Strength !HISTORY_MSG_TM_FATTAL_ANCHOR;DRC - Anchor -!ICCPROFCREATOR_ADD_PARAM_IN_DESC;Append Gamma and Slope values to the description !ICCPROFCREATOR_COPYRIGHT;Copyright: !ICCPROFCREATOR_COPYRIGHT_RESET_TOOLTIP;Reset to the default copyright, granted to "RawTherapee, CC0" !ICCPROFCREATOR_CUSTOM;Custom !ICCPROFCREATOR_DESCRIPTION;Description: -!ICCPROFCREATOR_DESCRIPTION_TOOLTIP;Leave empty to set the default description +!ICCPROFCREATOR_DESCRIPTION_ADDPARAM;Append gamma and slope values to the description +!ICCPROFCREATOR_DESCRIPTION_TOOLTIP;Leave empty to set the default description. !ICCPROFCREATOR_GAMMA;Gamma -!ICCPROFCREATOR_ICCVERSION;Generated profile's version: +!ICCPROFCREATOR_ICCVERSION;ICC version: !ICCPROFCREATOR_ILL;Illuminant: !ICCPROFCREATOR_ILL_41;D41 !ICCPROFCREATOR_ILL_50;D50 @@ -1681,7 +1681,7 @@ ZOOMPANEL_ZOOMOUT;Отдалить\nГорячая клавиша: - !ICCPROFCREATOR_ILL_80;D80 !ICCPROFCREATOR_ILL_DEF;Default !ICCPROFCREATOR_ILL_INC;StdA 2856K -!ICCPROFCREATOR_ILL_TOOLTIP;You can only set Illuminant with ICC v4 profiles +!ICCPROFCREATOR_ILL_TOOLTIP;You can only set the illuminant for ICC v4 profiles. !ICCPROFCREATOR_PRIMARIES;Primaries: !ICCPROFCREATOR_PRIM_ACESP0;ACES AP0 !ICCPROFCREATOR_PRIM_ACESP1;ACES AP1 @@ -1698,7 +1698,7 @@ ZOOMPANEL_ZOOMOUT;Отдалить\nГорячая клавиша: - !ICCPROFCREATOR_PRIM_REDX;Red X !ICCPROFCREATOR_PRIM_REDY;Red Y !ICCPROFCREATOR_PRIM_SRGB;sRGB -!ICCPROFCREATOR_PRIM_TOOLTIP;You can only set Custom Primaries with ICC v4 profiles +!ICCPROFCREATOR_PRIM_TOOLTIP;You can only set custom primaries for ICC v4 profiles. !ICCPROFCREATOR_PRIM_WIDEG;Widegamut !ICCPROFCREATOR_PROF_V2;ICC v2 !ICCPROFCREATOR_PROF_V4;ICC v4 @@ -1752,7 +1752,7 @@ ZOOMPANEL_ZOOMOUT;Отдалить\nГорячая клавиша: - !PARTIALPASTE_RAW_PIXELSHIFT;Pixel Shift !PARTIALPASTE_RETINEX;Retinex !PARTIALPASTE_SOFTLIGHT;Soft light -!PARTIALPASTE_TM_FATTAL;Dynamic Range Compression +!PARTIALPASTE_TM_FATTAL;Dynamic range compression !PREFERENCES_AUTLISLOW;Low !PREFERENCES_AUTLISMAX;Max - Average of all tiles !PREFERENCES_AUTLISSTD;High @@ -1977,12 +1977,12 @@ ZOOMPANEL_ZOOMOUT;Отдалить\nГорячая клавиша: - !TP_ICM_SAVEREFERENCE;Save Reference Image !TP_ICM_SAVEREFERENCE_APPLYWB;Apply white balance !TP_ICM_SAVEREFERENCE_APPLYWB_TOOLTIP;Generally, apply the white balance when saving images to create ICC profiles, and do not apply the white balance to create DCP profiles. -!TP_ICM_WORKTRC;Tone response curve: -!TP_ICM_WORKTRC_CUSTOM;Custom -!TP_ICM_WORKTRC_GAMMA;Gamma -!TP_ICM_WORKTRC_NONE;None -!TP_ICM_WORKTRC_SLOPE;Slope -!TP_ICM_WORKTRC_TOOLTIP;Only for build in profiles +!TP_ICM_WORKING_TRC;Tone response curve: +!TP_ICM_WORKING_TRC_CUSTOM;Custom +!TP_ICM_WORKING_TRC_GAMMA;Gamma +!TP_ICM_WORKING_TRC_NONE;None +!TP_ICM_WORKING_TRC_SLOPE;Slope +!TP_ICM_WORKING_TRC_TOOLTIP;Only for built-in profiles. !TP_PREPROCESS_DEADPIXFILT;Dead pixel filter !TP_PREPROCESS_DEADPIXFILT_TOOLTIP;Tries to suppress dead pixels. !TP_PREPROCESS_HOTPIXFILT;Hot pixel filter diff --git a/rtdata/languages/Serbian (Cyrilic Characters) b/rtdata/languages/Serbian (Cyrilic Characters) index eb1895e74..d8905c0a8 100644 --- a/rtdata/languages/Serbian (Cyrilic Characters) +++ b/rtdata/languages/Serbian (Cyrilic Characters) @@ -1558,16 +1558,16 @@ ZOOMPANEL_ZOOMOUT;Умањује приказ слике - !HISTORY_MSG_491;White Balance !HISTORY_MSG_492;RGB Curves !HISTORY_MSG_493;L*a*b* Adjustments -!HISTORY_MSG_CLAMPOOG;Out-of-gamut color clipping +!HISTORY_MSG_CLAMPOOG;Clip out-of-gamut colors !HISTORY_MSG_COLORTONING_LABGRID_VALUE;CT - Color correction !HISTORY_MSG_DUALDEMOSAIC_CONTRAST;AMaZE+VNG4 - Contrast threshold -!HISTORY_MSG_HISTMATCHING;Auto-Matched Tone Curve -!HISTORY_MSG_ICMGAMM;Working gamma -!HISTORY_MSG_ICMPRIMARI;Output profile primaries -!HISTORY_MSG_ICMPROFILE;Output profile type -!HISTORY_MSG_ICMSLOP;Working slope -!HISTORY_MSG_ICMTEMP;Output IccV4 D illuminant -!HISTORY_MSG_ICMTRCIN;TRC working method +!HISTORY_MSG_HISTMATCHING;Auto-matched tone curve +!HISTORY_MSG_ICM_OUTPUT_PRIMARIES;Output - Primaries +!HISTORY_MSG_ICM_OUTPUT_TEMP;Output - ICC-v4 illuminant D +!HISTORY_MSG_ICM_OUTPUT_TYPE;Output - Type +!HISTORY_MSG_ICM_WORKING_GAMMA;Working - Gamma +!HISTORY_MSG_ICM_WORKING_SLOPE;Working - Slope +!HISTORY_MSG_ICM_WORKING_TRC_METHOD;Working - TRC method !HISTORY_MSG_LOCALCONTRAST_AMOUNT;Local Contrast - Amount !HISTORY_MSG_LOCALCONTRAST_DARKNESS;Local Contrast - Darkness !HISTORY_MSG_LOCALCONTRAST_ENABLED;Local Contrast @@ -1580,14 +1580,19 @@ ZOOMPANEL_ZOOMOUT;Умањује приказ слике - !HISTORY_MSG_PREPROCESS_PDAFLINESFILTER;PDAF lines filter !HISTORY_MSG_PRSHARPEN_CONTRAST;PRS - Contrast threshold !HISTORY_MSG_RAW_BORDER;Raw border -!HISTORY_MSG_RESIZE_ALLOW_UPSCALING;Resize - Allow upscaling +!HISTORY_MSG_RESIZE_ALLOWUPSCALING;Resize - Allow upscaling !HISTORY_MSG_SHARPENING_CONTRAST;Sharpening - Contrast threshold !HISTORY_MSG_SOFTLIGHT_ENABLED;Soft light !HISTORY_MSG_SOFTLIGHT_STRENGTH;Soft light - Strength !HISTORY_MSG_TM_FATTAL_ANCHOR;DRC - Anchor +!ICCPROFCREATOR_COPYRIGHT;Copyright: +!ICCPROFCREATOR_COPYRIGHT_RESET_TOOLTIP;Reset to the default copyright, granted to "RawTherapee, CC0" !ICCPROFCREATOR_CUSTOM;Custom +!ICCPROFCREATOR_DESCRIPTION;Description: +!ICCPROFCREATOR_DESCRIPTION_ADDPARAM;Append gamma and slope values to the description +!ICCPROFCREATOR_DESCRIPTION_TOOLTIP;Leave empty to set the default description. !ICCPROFCREATOR_GAMMA;Gamma -!ICCPROFCREATOR_ICCVERSION;Generated profile's version: +!ICCPROFCREATOR_ICCVERSION;ICC version: !ICCPROFCREATOR_ILL;Illuminant: !ICCPROFCREATOR_ILL_41;D41 !ICCPROFCREATOR_ILL_50;D50 @@ -1597,7 +1602,7 @@ ZOOMPANEL_ZOOMOUT;Умањује приказ слике - !ICCPROFCREATOR_ILL_80;D80 !ICCPROFCREATOR_ILL_DEF;Default !ICCPROFCREATOR_ILL_INC;StdA 2856K -!ICCPROFCREATOR_ILL_TOOLTIP;You can only set Illuminant with ICC v4 profiles +!ICCPROFCREATOR_ILL_TOOLTIP;You can only set the illuminant for ICC v4 profiles. !ICCPROFCREATOR_PRIMARIES;Primaries: !ICCPROFCREATOR_PRIM_ACESP0;ACES AP0 !ICCPROFCREATOR_PRIM_ACESP1;ACES AP1 @@ -1614,7 +1619,7 @@ ZOOMPANEL_ZOOMOUT;Умањује приказ слике - !ICCPROFCREATOR_PRIM_REDX;Red X !ICCPROFCREATOR_PRIM_REDY;Red Y !ICCPROFCREATOR_PRIM_SRGB;sRGB -!ICCPROFCREATOR_PRIM_TOOLTIP;You can only set Custom Primaries with ICC v4 profiles +!ICCPROFCREATOR_PRIM_TOOLTIP;You can only set custom primaries for ICC v4 profiles. !ICCPROFCREATOR_PRIM_WIDEG;Widegamut !ICCPROFCREATOR_PROF_V2;ICC v2 !ICCPROFCREATOR_PROF_V4;ICC v4 @@ -1689,7 +1694,7 @@ ZOOMPANEL_ZOOMOUT;Умањује приказ слике - !PARTIALPASTE_RAW_PIXELSHIFT;Pixel Shift !PARTIALPASTE_RETINEX;Retinex !PARTIALPASTE_SOFTLIGHT;Soft light -!PARTIALPASTE_TM_FATTAL;Dynamic Range Compression +!PARTIALPASTE_TM_FATTAL;Dynamic range compression !PREFERENCES_AUTLISLOW;Low !PREFERENCES_AUTLISMAX;Max - Average of all tiles !PREFERENCES_AUTLISSTD;High @@ -1937,12 +1942,12 @@ ZOOMPANEL_ZOOMOUT;Умањује приказ слике - !TP_ICM_SAVEREFERENCE;Save Reference Image !TP_ICM_SAVEREFERENCE_APPLYWB;Apply white balance !TP_ICM_SAVEREFERENCE_APPLYWB_TOOLTIP;Generally, apply the white balance when saving images to create ICC profiles, and do not apply the white balance to create DCP profiles. -!TP_ICM_WORKTRC;Tone response curve: -!TP_ICM_WORKTRC_CUSTOM;Custom -!TP_ICM_WORKTRC_GAMMA;Gamma -!TP_ICM_WORKTRC_NONE;None -!TP_ICM_WORKTRC_SLOPE;Slope -!TP_ICM_WORKTRC_TOOLTIP;Only for build in profiles +!TP_ICM_WORKING_TRC;Tone response curve: +!TP_ICM_WORKING_TRC_CUSTOM;Custom +!TP_ICM_WORKING_TRC_GAMMA;Gamma +!TP_ICM_WORKING_TRC_NONE;None +!TP_ICM_WORKING_TRC_SLOPE;Slope +!TP_ICM_WORKING_TRC_TOOLTIP;Only for built-in profiles. !TP_LOCALCONTRAST_AMOUNT;Amount !TP_LOCALCONTRAST_DARKNESS;Darkness level !TP_LOCALCONTRAST_LABEL;Local Contrast diff --git a/rtdata/languages/Serbian (Latin Characters) b/rtdata/languages/Serbian (Latin Characters) index 7eae9ae88..26867400f 100644 --- a/rtdata/languages/Serbian (Latin Characters) +++ b/rtdata/languages/Serbian (Latin Characters) @@ -1558,16 +1558,16 @@ ZOOMPANEL_ZOOMOUT;Umanjuje prikaz slike - !HISTORY_MSG_491;White Balance !HISTORY_MSG_492;RGB Curves !HISTORY_MSG_493;L*a*b* Adjustments -!HISTORY_MSG_CLAMPOOG;Out-of-gamut color clipping +!HISTORY_MSG_CLAMPOOG;Clip out-of-gamut colors !HISTORY_MSG_COLORTONING_LABGRID_VALUE;CT - Color correction !HISTORY_MSG_DUALDEMOSAIC_CONTRAST;AMaZE+VNG4 - Contrast threshold -!HISTORY_MSG_HISTMATCHING;Auto-Matched Tone Curve -!HISTORY_MSG_ICMGAMM;Working gamma -!HISTORY_MSG_ICMPRIMARI;Output profile primaries -!HISTORY_MSG_ICMPROFILE;Output profile type -!HISTORY_MSG_ICMSLOP;Working slope -!HISTORY_MSG_ICMTEMP;Output IccV4 D illuminant -!HISTORY_MSG_ICMTRCIN;TRC working method +!HISTORY_MSG_HISTMATCHING;Auto-matched tone curve +!HISTORY_MSG_ICM_OUTPUT_PRIMARIES;Output - Primaries +!HISTORY_MSG_ICM_OUTPUT_TEMP;Output - ICC-v4 illuminant D +!HISTORY_MSG_ICM_OUTPUT_TYPE;Output - Type +!HISTORY_MSG_ICM_WORKING_GAMMA;Working - Gamma +!HISTORY_MSG_ICM_WORKING_SLOPE;Working - Slope +!HISTORY_MSG_ICM_WORKING_TRC_METHOD;Working - TRC method !HISTORY_MSG_LOCALCONTRAST_AMOUNT;Local Contrast - Amount !HISTORY_MSG_LOCALCONTRAST_DARKNESS;Local Contrast - Darkness !HISTORY_MSG_LOCALCONTRAST_ENABLED;Local Contrast @@ -1580,14 +1580,19 @@ ZOOMPANEL_ZOOMOUT;Umanjuje prikaz slike - !HISTORY_MSG_PREPROCESS_PDAFLINESFILTER;PDAF lines filter !HISTORY_MSG_PRSHARPEN_CONTRAST;PRS - Contrast threshold !HISTORY_MSG_RAW_BORDER;Raw border -!HISTORY_MSG_RESIZE_ALLOW_UPSCALING;Resize - Allow upscaling +!HISTORY_MSG_RESIZE_ALLOWUPSCALING;Resize - Allow upscaling !HISTORY_MSG_SHARPENING_CONTRAST;Sharpening - Contrast threshold !HISTORY_MSG_SOFTLIGHT_ENABLED;Soft light !HISTORY_MSG_SOFTLIGHT_STRENGTH;Soft light - Strength !HISTORY_MSG_TM_FATTAL_ANCHOR;DRC - Anchor +!ICCPROFCREATOR_COPYRIGHT;Copyright: +!ICCPROFCREATOR_COPYRIGHT_RESET_TOOLTIP;Reset to the default copyright, granted to "RawTherapee, CC0" !ICCPROFCREATOR_CUSTOM;Custom +!ICCPROFCREATOR_DESCRIPTION;Description: +!ICCPROFCREATOR_DESCRIPTION_ADDPARAM;Append gamma and slope values to the description +!ICCPROFCREATOR_DESCRIPTION_TOOLTIP;Leave empty to set the default description. !ICCPROFCREATOR_GAMMA;Gamma -!ICCPROFCREATOR_ICCVERSION;Generated profile's version: +!ICCPROFCREATOR_ICCVERSION;ICC version: !ICCPROFCREATOR_ILL;Illuminant: !ICCPROFCREATOR_ILL_41;D41 !ICCPROFCREATOR_ILL_50;D50 @@ -1597,7 +1602,7 @@ ZOOMPANEL_ZOOMOUT;Umanjuje prikaz slike - !ICCPROFCREATOR_ILL_80;D80 !ICCPROFCREATOR_ILL_DEF;Default !ICCPROFCREATOR_ILL_INC;StdA 2856K -!ICCPROFCREATOR_ILL_TOOLTIP;You can only set Illuminant with ICC v4 profiles +!ICCPROFCREATOR_ILL_TOOLTIP;You can only set the illuminant for ICC v4 profiles. !ICCPROFCREATOR_PRIMARIES;Primaries: !ICCPROFCREATOR_PRIM_ACESP0;ACES AP0 !ICCPROFCREATOR_PRIM_ACESP1;ACES AP1 @@ -1614,7 +1619,7 @@ ZOOMPANEL_ZOOMOUT;Umanjuje prikaz slike - !ICCPROFCREATOR_PRIM_REDX;Red X !ICCPROFCREATOR_PRIM_REDY;Red Y !ICCPROFCREATOR_PRIM_SRGB;sRGB -!ICCPROFCREATOR_PRIM_TOOLTIP;You can only set Custom Primaries with ICC v4 profiles +!ICCPROFCREATOR_PRIM_TOOLTIP;You can only set custom primaries for ICC v4 profiles. !ICCPROFCREATOR_PRIM_WIDEG;Widegamut !ICCPROFCREATOR_PROF_V2;ICC v2 !ICCPROFCREATOR_PROF_V4;ICC v4 @@ -1689,7 +1694,7 @@ ZOOMPANEL_ZOOMOUT;Umanjuje prikaz slike - !PARTIALPASTE_RAW_PIXELSHIFT;Pixel Shift !PARTIALPASTE_RETINEX;Retinex !PARTIALPASTE_SOFTLIGHT;Soft light -!PARTIALPASTE_TM_FATTAL;Dynamic Range Compression +!PARTIALPASTE_TM_FATTAL;Dynamic range compression !PREFERENCES_AUTLISLOW;Low !PREFERENCES_AUTLISMAX;Max - Average of all tiles !PREFERENCES_AUTLISSTD;High @@ -1937,12 +1942,12 @@ ZOOMPANEL_ZOOMOUT;Umanjuje prikaz slike - !TP_ICM_SAVEREFERENCE;Save Reference Image !TP_ICM_SAVEREFERENCE_APPLYWB;Apply white balance !TP_ICM_SAVEREFERENCE_APPLYWB_TOOLTIP;Generally, apply the white balance when saving images to create ICC profiles, and do not apply the white balance to create DCP profiles. -!TP_ICM_WORKTRC;Tone response curve: -!TP_ICM_WORKTRC_CUSTOM;Custom -!TP_ICM_WORKTRC_GAMMA;Gamma -!TP_ICM_WORKTRC_NONE;None -!TP_ICM_WORKTRC_SLOPE;Slope -!TP_ICM_WORKTRC_TOOLTIP;Only for build in profiles +!TP_ICM_WORKING_TRC;Tone response curve: +!TP_ICM_WORKING_TRC_CUSTOM;Custom +!TP_ICM_WORKING_TRC_GAMMA;Gamma +!TP_ICM_WORKING_TRC_NONE;None +!TP_ICM_WORKING_TRC_SLOPE;Slope +!TP_ICM_WORKING_TRC_TOOLTIP;Only for built-in profiles. !TP_LOCALCONTRAST_AMOUNT;Amount !TP_LOCALCONTRAST_DARKNESS;Darkness level !TP_LOCALCONTRAST_LABEL;Local Contrast diff --git a/rtdata/languages/Slovak b/rtdata/languages/Slovak index 9e09836d0..87b5ce231 100644 --- a/rtdata/languages/Slovak +++ b/rtdata/languages/Slovak @@ -1040,16 +1040,16 @@ ZOOMPANEL_ZOOMOUT;Oddialiť - !HISTORY_MSG_491;White Balance !HISTORY_MSG_492;RGB Curves !HISTORY_MSG_493;L*a*b* Adjustments -!HISTORY_MSG_CLAMPOOG;Out-of-gamut color clipping +!HISTORY_MSG_CLAMPOOG;Clip out-of-gamut colors !HISTORY_MSG_COLORTONING_LABGRID_VALUE;CT - Color correction !HISTORY_MSG_DUALDEMOSAIC_CONTRAST;AMaZE+VNG4 - Contrast threshold -!HISTORY_MSG_HISTMATCHING;Auto-Matched Tone Curve -!HISTORY_MSG_ICMGAMM;Working gamma -!HISTORY_MSG_ICMPRIMARI;Output profile primaries -!HISTORY_MSG_ICMPROFILE;Output profile type -!HISTORY_MSG_ICMSLOP;Working slope -!HISTORY_MSG_ICMTEMP;Output IccV4 D illuminant -!HISTORY_MSG_ICMTRCIN;TRC working method +!HISTORY_MSG_HISTMATCHING;Auto-matched tone curve +!HISTORY_MSG_ICM_OUTPUT_PRIMARIES;Output - Primaries +!HISTORY_MSG_ICM_OUTPUT_TEMP;Output - ICC-v4 illuminant D +!HISTORY_MSG_ICM_OUTPUT_TYPE;Output - Type +!HISTORY_MSG_ICM_WORKING_GAMMA;Working - Gamma +!HISTORY_MSG_ICM_WORKING_SLOPE;Working - Slope +!HISTORY_MSG_ICM_WORKING_TRC_METHOD;Working - TRC method !HISTORY_MSG_LOCALCONTRAST_AMOUNT;Local Contrast - Amount !HISTORY_MSG_LOCALCONTRAST_DARKNESS;Local Contrast - Darkness !HISTORY_MSG_LOCALCONTRAST_ENABLED;Local Contrast @@ -1062,15 +1062,20 @@ ZOOMPANEL_ZOOMOUT;Oddialiť - !HISTORY_MSG_PREPROCESS_PDAFLINESFILTER;PDAF lines filter !HISTORY_MSG_PRSHARPEN_CONTRAST;PRS - Contrast threshold !HISTORY_MSG_RAW_BORDER;Raw border -!HISTORY_MSG_RESIZE_ALLOW_UPSCALING;Resize - Allow upscaling +!HISTORY_MSG_RESIZE_ALLOWUPSCALING;Resize - Allow upscaling !HISTORY_MSG_SHARPENING_CONTRAST;Sharpening - Contrast threshold !HISTORY_MSG_SOFTLIGHT_ENABLED;Soft light !HISTORY_MSG_SOFTLIGHT_STRENGTH;Soft light - Strength !HISTORY_MSG_TM_FATTAL_ANCHOR;DRC - Anchor !HISTORY_NEWSNAPSHOT_TOOLTIP;Shortcut: Alt-s +!ICCPROFCREATOR_COPYRIGHT;Copyright: +!ICCPROFCREATOR_COPYRIGHT_RESET_TOOLTIP;Reset to the default copyright, granted to "RawTherapee, CC0" !ICCPROFCREATOR_CUSTOM;Custom +!ICCPROFCREATOR_DESCRIPTION;Description: +!ICCPROFCREATOR_DESCRIPTION_ADDPARAM;Append gamma and slope values to the description +!ICCPROFCREATOR_DESCRIPTION_TOOLTIP;Leave empty to set the default description. !ICCPROFCREATOR_GAMMA;Gamma -!ICCPROFCREATOR_ICCVERSION;Generated profile's version: +!ICCPROFCREATOR_ICCVERSION;ICC version: !ICCPROFCREATOR_ILL;Illuminant: !ICCPROFCREATOR_ILL_41;D41 !ICCPROFCREATOR_ILL_50;D50 @@ -1080,7 +1085,7 @@ ZOOMPANEL_ZOOMOUT;Oddialiť - !ICCPROFCREATOR_ILL_80;D80 !ICCPROFCREATOR_ILL_DEF;Default !ICCPROFCREATOR_ILL_INC;StdA 2856K -!ICCPROFCREATOR_ILL_TOOLTIP;You can only set Illuminant with ICC v4 profiles +!ICCPROFCREATOR_ILL_TOOLTIP;You can only set the illuminant for ICC v4 profiles. !ICCPROFCREATOR_PRIMARIES;Primaries: !ICCPROFCREATOR_PRIM_ACESP0;ACES AP0 !ICCPROFCREATOR_PRIM_ACESP1;ACES AP1 @@ -1097,7 +1102,7 @@ ZOOMPANEL_ZOOMOUT;Oddialiť - !ICCPROFCREATOR_PRIM_REDX;Red X !ICCPROFCREATOR_PRIM_REDY;Red Y !ICCPROFCREATOR_PRIM_SRGB;sRGB -!ICCPROFCREATOR_PRIM_TOOLTIP;You can only set Custom Primaries with ICC v4 profiles +!ICCPROFCREATOR_PRIM_TOOLTIP;You can only set custom primaries for ICC v4 profiles. !ICCPROFCREATOR_PRIM_WIDEG;Widegamut !ICCPROFCREATOR_PROF_V2;ICC v2 !ICCPROFCREATOR_PROF_V4;ICC v4 @@ -1244,7 +1249,7 @@ ZOOMPANEL_ZOOMOUT;Oddialiť - !PARTIALPASTE_SHARPENEDGE;Edges !PARTIALPASTE_SHARPENMICRO;Microcontrast !PARTIALPASTE_SOFTLIGHT;Soft light -!PARTIALPASTE_TM_FATTAL;Dynamic Range Compression +!PARTIALPASTE_TM_FATTAL;Dynamic range compression !PARTIALPASTE_VIBRANCE;Vibrance !PREFERENCES_AUTLISLOW;Low !PREFERENCES_AUTLISMAX;Max - Average of all tiles @@ -1788,12 +1793,12 @@ ZOOMPANEL_ZOOMOUT;Oddialiť - !TP_ICM_SAVEREFERENCE_TOOLTIP;Save the linear TIFF image before the input profile is applied. The result can be used for calibration purposes and generation of a camera profile. !TP_ICM_TONECURVE;Tone curve !TP_ICM_TONECURVE_TOOLTIP;Employ the embedded DCP tone curve. The setting is only available if the selected DCP has a tone curve. -!TP_ICM_WORKTRC;Tone response curve: -!TP_ICM_WORKTRC_CUSTOM;Custom -!TP_ICM_WORKTRC_GAMMA;Gamma -!TP_ICM_WORKTRC_NONE;None -!TP_ICM_WORKTRC_SLOPE;Slope -!TP_ICM_WORKTRC_TOOLTIP;Only for build in profiles +!TP_ICM_WORKING_TRC;Tone response curve: +!TP_ICM_WORKING_TRC_CUSTOM;Custom +!TP_ICM_WORKING_TRC_GAMMA;Gamma +!TP_ICM_WORKING_TRC_NONE;None +!TP_ICM_WORKING_TRC_SLOPE;Slope +!TP_ICM_WORKING_TRC_TOOLTIP;Only for built-in profiles. !TP_LABCURVE_AVOIDCOLORSHIFT;Avoid color shift !TP_LABCURVE_AVOIDCOLORSHIFT_TOOLTIP;Fit colors into gamut of the working color space and apply Munsell correction. !TP_LABCURVE_CHROMATICITY;Chromaticity diff --git a/rtdata/languages/Suomi b/rtdata/languages/Suomi index ee286ef7e..63e3c27e3 100644 --- a/rtdata/languages/Suomi +++ b/rtdata/languages/Suomi @@ -979,16 +979,16 @@ TP_WBALANCE_TEMPERATURE;Lämpötila [K] !HISTORY_MSG_491;White Balance !HISTORY_MSG_492;RGB Curves !HISTORY_MSG_493;L*a*b* Adjustments -!HISTORY_MSG_CLAMPOOG;Out-of-gamut color clipping +!HISTORY_MSG_CLAMPOOG;Clip out-of-gamut colors !HISTORY_MSG_COLORTONING_LABGRID_VALUE;CT - Color correction !HISTORY_MSG_DUALDEMOSAIC_CONTRAST;AMaZE+VNG4 - Contrast threshold -!HISTORY_MSG_HISTMATCHING;Auto-Matched Tone Curve -!HISTORY_MSG_ICMGAMM;Working gamma -!HISTORY_MSG_ICMPRIMARI;Output profile primaries -!HISTORY_MSG_ICMPROFILE;Output profile type -!HISTORY_MSG_ICMSLOP;Working slope -!HISTORY_MSG_ICMTEMP;Output IccV4 D illuminant -!HISTORY_MSG_ICMTRCIN;TRC working method +!HISTORY_MSG_HISTMATCHING;Auto-matched tone curve +!HISTORY_MSG_ICM_OUTPUT_PRIMARIES;Output - Primaries +!HISTORY_MSG_ICM_OUTPUT_TEMP;Output - ICC-v4 illuminant D +!HISTORY_MSG_ICM_OUTPUT_TYPE;Output - Type +!HISTORY_MSG_ICM_WORKING_GAMMA;Working - Gamma +!HISTORY_MSG_ICM_WORKING_SLOPE;Working - Slope +!HISTORY_MSG_ICM_WORKING_TRC_METHOD;Working - TRC method !HISTORY_MSG_LOCALCONTRAST_AMOUNT;Local Contrast - Amount !HISTORY_MSG_LOCALCONTRAST_DARKNESS;Local Contrast - Darkness !HISTORY_MSG_LOCALCONTRAST_ENABLED;Local Contrast @@ -1001,15 +1001,20 @@ TP_WBALANCE_TEMPERATURE;Lämpötila [K] !HISTORY_MSG_PREPROCESS_PDAFLINESFILTER;PDAF lines filter !HISTORY_MSG_PRSHARPEN_CONTRAST;PRS - Contrast threshold !HISTORY_MSG_RAW_BORDER;Raw border -!HISTORY_MSG_RESIZE_ALLOW_UPSCALING;Resize - Allow upscaling +!HISTORY_MSG_RESIZE_ALLOWUPSCALING;Resize - Allow upscaling !HISTORY_MSG_SHARPENING_CONTRAST;Sharpening - Contrast threshold !HISTORY_MSG_SOFTLIGHT_ENABLED;Soft light !HISTORY_MSG_SOFTLIGHT_STRENGTH;Soft light - Strength !HISTORY_MSG_TM_FATTAL_ANCHOR;DRC - Anchor !HISTORY_NEWSNAPSHOT_TOOLTIP;Shortcut: Alt-s +!ICCPROFCREATOR_COPYRIGHT;Copyright: +!ICCPROFCREATOR_COPYRIGHT_RESET_TOOLTIP;Reset to the default copyright, granted to "RawTherapee, CC0" !ICCPROFCREATOR_CUSTOM;Custom +!ICCPROFCREATOR_DESCRIPTION;Description: +!ICCPROFCREATOR_DESCRIPTION_ADDPARAM;Append gamma and slope values to the description +!ICCPROFCREATOR_DESCRIPTION_TOOLTIP;Leave empty to set the default description. !ICCPROFCREATOR_GAMMA;Gamma -!ICCPROFCREATOR_ICCVERSION;Generated profile's version: +!ICCPROFCREATOR_ICCVERSION;ICC version: !ICCPROFCREATOR_ILL;Illuminant: !ICCPROFCREATOR_ILL_41;D41 !ICCPROFCREATOR_ILL_50;D50 @@ -1019,7 +1024,7 @@ TP_WBALANCE_TEMPERATURE;Lämpötila [K] !ICCPROFCREATOR_ILL_80;D80 !ICCPROFCREATOR_ILL_DEF;Default !ICCPROFCREATOR_ILL_INC;StdA 2856K -!ICCPROFCREATOR_ILL_TOOLTIP;You can only set Illuminant with ICC v4 profiles +!ICCPROFCREATOR_ILL_TOOLTIP;You can only set the illuminant for ICC v4 profiles. !ICCPROFCREATOR_PRIMARIES;Primaries: !ICCPROFCREATOR_PRIM_ACESP0;ACES AP0 !ICCPROFCREATOR_PRIM_ACESP1;ACES AP1 @@ -1036,7 +1041,7 @@ TP_WBALANCE_TEMPERATURE;Lämpötila [K] !ICCPROFCREATOR_PRIM_REDX;Red X !ICCPROFCREATOR_PRIM_REDY;Red Y !ICCPROFCREATOR_PRIM_SRGB;sRGB -!ICCPROFCREATOR_PRIM_TOOLTIP;You can only set Custom Primaries with ICC v4 profiles +!ICCPROFCREATOR_PRIM_TOOLTIP;You can only set custom primaries for ICC v4 profiles. !ICCPROFCREATOR_PRIM_WIDEG;Widegamut !ICCPROFCREATOR_PROF_V2;ICC v2 !ICCPROFCREATOR_PROF_V4;ICC v4 @@ -1192,7 +1197,7 @@ TP_WBALANCE_TEMPERATURE;Lämpötila [K] !PARTIALPASTE_SHARPENEDGE;Edges !PARTIALPASTE_SHARPENMICRO;Microcontrast !PARTIALPASTE_SOFTLIGHT;Soft light -!PARTIALPASTE_TM_FATTAL;Dynamic Range Compression +!PARTIALPASTE_TM_FATTAL;Dynamic range compression !PARTIALPASTE_VIBRANCE;Vibrance !PREFERENCES_ADD;Add !PREFERENCES_AUTLISLOW;Low @@ -1759,12 +1764,12 @@ TP_WBALANCE_TEMPERATURE;Lämpötila [K] !TP_ICM_SAVEREFERENCE_TOOLTIP;Save the linear TIFF image before the input profile is applied. The result can be used for calibration purposes and generation of a camera profile. !TP_ICM_TONECURVE;Tone curve !TP_ICM_TONECURVE_TOOLTIP;Employ the embedded DCP tone curve. The setting is only available if the selected DCP has a tone curve. -!TP_ICM_WORKTRC;Tone response curve: -!TP_ICM_WORKTRC_CUSTOM;Custom -!TP_ICM_WORKTRC_GAMMA;Gamma -!TP_ICM_WORKTRC_NONE;None -!TP_ICM_WORKTRC_SLOPE;Slope -!TP_ICM_WORKTRC_TOOLTIP;Only for build in profiles +!TP_ICM_WORKING_TRC;Tone response curve: +!TP_ICM_WORKING_TRC_CUSTOM;Custom +!TP_ICM_WORKING_TRC_GAMMA;Gamma +!TP_ICM_WORKING_TRC_NONE;None +!TP_ICM_WORKING_TRC_SLOPE;Slope +!TP_ICM_WORKING_TRC_TOOLTIP;Only for built-in profiles. !TP_IMPULSEDENOISE_LABEL;Impulse Noise Reduction !TP_IMPULSEDENOISE_THRESH;Threshold !TP_LABCURVE_AVOIDCOLORSHIFT;Avoid color shift diff --git a/rtdata/languages/Swedish b/rtdata/languages/Swedish index d171f33ce..c2b779b4a 100644 --- a/rtdata/languages/Swedish +++ b/rtdata/languages/Swedish @@ -1944,16 +1944,16 @@ ZOOMPANEL_ZOOMOUT;Förminska.\nKortkommando: - !HISTORY_MSG_491;White Balance !HISTORY_MSG_492;RGB Curves !HISTORY_MSG_493;L*a*b* Adjustments -!HISTORY_MSG_CLAMPOOG;Out-of-gamut color clipping +!HISTORY_MSG_CLAMPOOG;Clip out-of-gamut colors !HISTORY_MSG_COLORTONING_LABGRID_VALUE;CT - Color correction !HISTORY_MSG_DUALDEMOSAIC_CONTRAST;AMaZE+VNG4 - Contrast threshold -!HISTORY_MSG_HISTMATCHING;Auto-Matched Tone Curve -!HISTORY_MSG_ICMGAMM;Working gamma -!HISTORY_MSG_ICMPRIMARI;Output profile primaries -!HISTORY_MSG_ICMPROFILE;Output profile type -!HISTORY_MSG_ICMSLOP;Working slope -!HISTORY_MSG_ICMTEMP;Output IccV4 D illuminant -!HISTORY_MSG_ICMTRCIN;TRC working method +!HISTORY_MSG_HISTMATCHING;Auto-matched tone curve +!HISTORY_MSG_ICM_OUTPUT_PRIMARIES;Output - Primaries +!HISTORY_MSG_ICM_OUTPUT_TEMP;Output - ICC-v4 illuminant D +!HISTORY_MSG_ICM_OUTPUT_TYPE;Output - Type +!HISTORY_MSG_ICM_WORKING_GAMMA;Working - Gamma +!HISTORY_MSG_ICM_WORKING_SLOPE;Working - Slope +!HISTORY_MSG_ICM_WORKING_TRC_METHOD;Working - TRC method !HISTORY_MSG_LOCALCONTRAST_AMOUNT;Local Contrast - Amount !HISTORY_MSG_LOCALCONTRAST_DARKNESS;Local Contrast - Darkness !HISTORY_MSG_LOCALCONTRAST_ENABLED;Local Contrast @@ -1966,14 +1966,19 @@ ZOOMPANEL_ZOOMOUT;Förminska.\nKortkommando: - !HISTORY_MSG_PREPROCESS_PDAFLINESFILTER;PDAF lines filter !HISTORY_MSG_PRSHARPEN_CONTRAST;PRS - Contrast threshold !HISTORY_MSG_RAW_BORDER;Raw border -!HISTORY_MSG_RESIZE_ALLOW_UPSCALING;Resize - Allow upscaling +!HISTORY_MSG_RESIZE_ALLOWUPSCALING;Resize - Allow upscaling !HISTORY_MSG_SHARPENING_CONTRAST;Sharpening - Contrast threshold !HISTORY_MSG_SOFTLIGHT_ENABLED;Soft light !HISTORY_MSG_SOFTLIGHT_STRENGTH;Soft light - Strength !HISTORY_MSG_TM_FATTAL_ANCHOR;DRC - Anchor +!ICCPROFCREATOR_COPYRIGHT;Copyright: +!ICCPROFCREATOR_COPYRIGHT_RESET_TOOLTIP;Reset to the default copyright, granted to "RawTherapee, CC0" !ICCPROFCREATOR_CUSTOM;Custom +!ICCPROFCREATOR_DESCRIPTION;Description: +!ICCPROFCREATOR_DESCRIPTION_ADDPARAM;Append gamma and slope values to the description +!ICCPROFCREATOR_DESCRIPTION_TOOLTIP;Leave empty to set the default description. !ICCPROFCREATOR_GAMMA;Gamma -!ICCPROFCREATOR_ICCVERSION;Generated profile's version: +!ICCPROFCREATOR_ICCVERSION;ICC version: !ICCPROFCREATOR_ILL;Illuminant: !ICCPROFCREATOR_ILL_41;D41 !ICCPROFCREATOR_ILL_50;D50 @@ -1983,7 +1988,7 @@ ZOOMPANEL_ZOOMOUT;Förminska.\nKortkommando: - !ICCPROFCREATOR_ILL_80;D80 !ICCPROFCREATOR_ILL_DEF;Default !ICCPROFCREATOR_ILL_INC;StdA 2856K -!ICCPROFCREATOR_ILL_TOOLTIP;You can only set Illuminant with ICC v4 profiles +!ICCPROFCREATOR_ILL_TOOLTIP;You can only set the illuminant for ICC v4 profiles. !ICCPROFCREATOR_PRIMARIES;Primaries: !ICCPROFCREATOR_PRIM_ACESP0;ACES AP0 !ICCPROFCREATOR_PRIM_ACESP1;ACES AP1 @@ -2000,7 +2005,7 @@ ZOOMPANEL_ZOOMOUT;Förminska.\nKortkommando: - !ICCPROFCREATOR_PRIM_REDX;Red X !ICCPROFCREATOR_PRIM_REDY;Red Y !ICCPROFCREATOR_PRIM_SRGB;sRGB -!ICCPROFCREATOR_PRIM_TOOLTIP;You can only set Custom Primaries with ICC v4 profiles +!ICCPROFCREATOR_PRIM_TOOLTIP;You can only set custom primaries for ICC v4 profiles. !ICCPROFCREATOR_PRIM_WIDEG;Widegamut !ICCPROFCREATOR_PROF_V2;ICC v2 !ICCPROFCREATOR_PROF_V4;ICC v4 @@ -2056,7 +2061,7 @@ ZOOMPANEL_ZOOMOUT;Förminska.\nKortkommando: - !PARTIALPASTE_RAW_IMAGENUM;Sub-image !PARTIALPASTE_RAW_PIXELSHIFT;Pixel Shift !PARTIALPASTE_SOFTLIGHT;Soft light -!PARTIALPASTE_TM_FATTAL;Dynamic Range Compression +!PARTIALPASTE_TM_FATTAL;Dynamic range compression !PREFERENCES_AUTOSAVE_TP_OPEN;Automatically save tools collapsed/expanded\nstate before exiting !PREFERENCES_CMMBPC;Black point compensation !PREFERENCES_CROP;Crop editing @@ -2144,12 +2149,12 @@ ZOOMPANEL_ZOOMOUT;Förminska.\nKortkommando: - !TP_ICM_APPLYLOOKTABLE;Look table !TP_ICM_PROFILEINTENT;Rendering Intent !TP_ICM_SAVEREFERENCE;Save Reference Image -!TP_ICM_WORKTRC;Tone response curve: -!TP_ICM_WORKTRC_CUSTOM;Custom -!TP_ICM_WORKTRC_GAMMA;Gamma -!TP_ICM_WORKTRC_NONE;None -!TP_ICM_WORKTRC_SLOPE;Slope -!TP_ICM_WORKTRC_TOOLTIP;Only for build in profiles +!TP_ICM_WORKING_TRC;Tone response curve: +!TP_ICM_WORKING_TRC_CUSTOM;Custom +!TP_ICM_WORKING_TRC_GAMMA;Gamma +!TP_ICM_WORKING_TRC_NONE;None +!TP_ICM_WORKING_TRC_SLOPE;Slope +!TP_ICM_WORKING_TRC_TOOLTIP;Only for built-in profiles. !TP_LOCALCONTRAST_AMOUNT;Amount !TP_LOCALCONTRAST_DARKNESS;Darkness level !TP_LOCALCONTRAST_LABEL;Local Contrast diff --git a/rtdata/languages/Turkish b/rtdata/languages/Turkish index 35a9fa43b..1af509412 100644 --- a/rtdata/languages/Turkish +++ b/rtdata/languages/Turkish @@ -978,16 +978,16 @@ TP_WBALANCE_TEMPERATURE;Isı !HISTORY_MSG_491;White Balance !HISTORY_MSG_492;RGB Curves !HISTORY_MSG_493;L*a*b* Adjustments -!HISTORY_MSG_CLAMPOOG;Out-of-gamut color clipping +!HISTORY_MSG_CLAMPOOG;Clip out-of-gamut colors !HISTORY_MSG_COLORTONING_LABGRID_VALUE;CT - Color correction !HISTORY_MSG_DUALDEMOSAIC_CONTRAST;AMaZE+VNG4 - Contrast threshold -!HISTORY_MSG_HISTMATCHING;Auto-Matched Tone Curve -!HISTORY_MSG_ICMGAMM;Working gamma -!HISTORY_MSG_ICMPRIMARI;Output profile primaries -!HISTORY_MSG_ICMPROFILE;Output profile type -!HISTORY_MSG_ICMSLOP;Working slope -!HISTORY_MSG_ICMTEMP;Output IccV4 D illuminant -!HISTORY_MSG_ICMTRCIN;TRC working method +!HISTORY_MSG_HISTMATCHING;Auto-matched tone curve +!HISTORY_MSG_ICM_OUTPUT_PRIMARIES;Output - Primaries +!HISTORY_MSG_ICM_OUTPUT_TEMP;Output - ICC-v4 illuminant D +!HISTORY_MSG_ICM_OUTPUT_TYPE;Output - Type +!HISTORY_MSG_ICM_WORKING_GAMMA;Working - Gamma +!HISTORY_MSG_ICM_WORKING_SLOPE;Working - Slope +!HISTORY_MSG_ICM_WORKING_TRC_METHOD;Working - TRC method !HISTORY_MSG_LOCALCONTRAST_AMOUNT;Local Contrast - Amount !HISTORY_MSG_LOCALCONTRAST_DARKNESS;Local Contrast - Darkness !HISTORY_MSG_LOCALCONTRAST_ENABLED;Local Contrast @@ -1000,15 +1000,20 @@ TP_WBALANCE_TEMPERATURE;Isı !HISTORY_MSG_PREPROCESS_PDAFLINESFILTER;PDAF lines filter !HISTORY_MSG_PRSHARPEN_CONTRAST;PRS - Contrast threshold !HISTORY_MSG_RAW_BORDER;Raw border -!HISTORY_MSG_RESIZE_ALLOW_UPSCALING;Resize - Allow upscaling +!HISTORY_MSG_RESIZE_ALLOWUPSCALING;Resize - Allow upscaling !HISTORY_MSG_SHARPENING_CONTRAST;Sharpening - Contrast threshold !HISTORY_MSG_SOFTLIGHT_ENABLED;Soft light !HISTORY_MSG_SOFTLIGHT_STRENGTH;Soft light - Strength !HISTORY_MSG_TM_FATTAL_ANCHOR;DRC - Anchor !HISTORY_NEWSNAPSHOT_TOOLTIP;Shortcut: Alt-s +!ICCPROFCREATOR_COPYRIGHT;Copyright: +!ICCPROFCREATOR_COPYRIGHT_RESET_TOOLTIP;Reset to the default copyright, granted to "RawTherapee, CC0" !ICCPROFCREATOR_CUSTOM;Custom +!ICCPROFCREATOR_DESCRIPTION;Description: +!ICCPROFCREATOR_DESCRIPTION_ADDPARAM;Append gamma and slope values to the description +!ICCPROFCREATOR_DESCRIPTION_TOOLTIP;Leave empty to set the default description. !ICCPROFCREATOR_GAMMA;Gamma -!ICCPROFCREATOR_ICCVERSION;Generated profile's version: +!ICCPROFCREATOR_ICCVERSION;ICC version: !ICCPROFCREATOR_ILL;Illuminant: !ICCPROFCREATOR_ILL_41;D41 !ICCPROFCREATOR_ILL_50;D50 @@ -1018,7 +1023,7 @@ TP_WBALANCE_TEMPERATURE;Isı !ICCPROFCREATOR_ILL_80;D80 !ICCPROFCREATOR_ILL_DEF;Default !ICCPROFCREATOR_ILL_INC;StdA 2856K -!ICCPROFCREATOR_ILL_TOOLTIP;You can only set Illuminant with ICC v4 profiles +!ICCPROFCREATOR_ILL_TOOLTIP;You can only set the illuminant for ICC v4 profiles. !ICCPROFCREATOR_PRIMARIES;Primaries: !ICCPROFCREATOR_PRIM_ACESP0;ACES AP0 !ICCPROFCREATOR_PRIM_ACESP1;ACES AP1 @@ -1035,7 +1040,7 @@ TP_WBALANCE_TEMPERATURE;Isı !ICCPROFCREATOR_PRIM_REDX;Red X !ICCPROFCREATOR_PRIM_REDY;Red Y !ICCPROFCREATOR_PRIM_SRGB;sRGB -!ICCPROFCREATOR_PRIM_TOOLTIP;You can only set Custom Primaries with ICC v4 profiles +!ICCPROFCREATOR_PRIM_TOOLTIP;You can only set custom primaries for ICC v4 profiles. !ICCPROFCREATOR_PRIM_WIDEG;Widegamut !ICCPROFCREATOR_PROF_V2;ICC v2 !ICCPROFCREATOR_PROF_V4;ICC v4 @@ -1191,7 +1196,7 @@ TP_WBALANCE_TEMPERATURE;Isı !PARTIALPASTE_SHARPENEDGE;Edges !PARTIALPASTE_SHARPENMICRO;Microcontrast !PARTIALPASTE_SOFTLIGHT;Soft light -!PARTIALPASTE_TM_FATTAL;Dynamic Range Compression +!PARTIALPASTE_TM_FATTAL;Dynamic range compression !PARTIALPASTE_VIBRANCE;Vibrance !PREFERENCES_ADD;Add !PREFERENCES_AUTLISLOW;Low @@ -1758,12 +1763,12 @@ TP_WBALANCE_TEMPERATURE;Isı !TP_ICM_SAVEREFERENCE_TOOLTIP;Save the linear TIFF image before the input profile is applied. The result can be used for calibration purposes and generation of a camera profile. !TP_ICM_TONECURVE;Tone curve !TP_ICM_TONECURVE_TOOLTIP;Employ the embedded DCP tone curve. The setting is only available if the selected DCP has a tone curve. -!TP_ICM_WORKTRC;Tone response curve: -!TP_ICM_WORKTRC_CUSTOM;Custom -!TP_ICM_WORKTRC_GAMMA;Gamma -!TP_ICM_WORKTRC_NONE;None -!TP_ICM_WORKTRC_SLOPE;Slope -!TP_ICM_WORKTRC_TOOLTIP;Only for build in profiles +!TP_ICM_WORKING_TRC;Tone response curve: +!TP_ICM_WORKING_TRC_CUSTOM;Custom +!TP_ICM_WORKING_TRC_GAMMA;Gamma +!TP_ICM_WORKING_TRC_NONE;None +!TP_ICM_WORKING_TRC_SLOPE;Slope +!TP_ICM_WORKING_TRC_TOOLTIP;Only for built-in profiles. !TP_IMPULSEDENOISE_LABEL;Impulse Noise Reduction !TP_IMPULSEDENOISE_THRESH;Threshold !TP_LABCURVE_AVOIDCOLORSHIFT;Avoid color shift diff --git a/rtdata/languages/default b/rtdata/languages/default index 4bde22209..55f2c451d 100644 --- a/rtdata/languages/default +++ b/rtdata/languages/default @@ -726,16 +726,16 @@ HISTORY_MSG_490;DRC - Amount HISTORY_MSG_491;White Balance HISTORY_MSG_492;RGB Curves HISTORY_MSG_493;L*a*b* Adjustments -HISTORY_MSG_CLAMPOOG;Out-of-gamut color clipping +HISTORY_MSG_CLAMPOOG;Clip out-of-gamut colors HISTORY_MSG_COLORTONING_LABGRID_VALUE;CT - Color correction HISTORY_MSG_DUALDEMOSAIC_CONTRAST;AMaZE+VNG4 - Contrast threshold -HISTORY_MSG_HISTMATCHING;Auto-Matched Tone Curve -HISTORY_MSG_ICMGAMM;Working gamma -HISTORY_MSG_ICMPRIMARI;Output profile primaries -HISTORY_MSG_ICMPROFILE;Output profile type -HISTORY_MSG_ICMSLOP;Working slope -HISTORY_MSG_ICMTEMP;Output IccV4 D illuminant -HISTORY_MSG_ICMTRCIN;TRC working method +HISTORY_MSG_HISTMATCHING;Auto-matched tone curve +HISTORY_MSG_ICM_OUTPUT_PRIMARIES;Output - Primaries +HISTORY_MSG_ICM_OUTPUT_TEMP;Output - ICC-v4 illuminant D +HISTORY_MSG_ICM_OUTPUT_TYPE;Output - Type +HISTORY_MSG_ICM_WORKING_GAMMA;Working - Gamma +HISTORY_MSG_ICM_WORKING_SLOPE;Working - Slope +HISTORY_MSG_ICM_WORKING_TRC_METHOD;Working - TRC method HISTORY_MSG_LOCALCONTRAST_AMOUNT;Local Contrast - Amount HISTORY_MSG_LOCALCONTRAST_DARKNESS;Local Contrast - Darkness HISTORY_MSG_LOCALCONTRAST_ENABLED;Local Contrast @@ -748,7 +748,7 @@ HISTORY_MSG_PREPROCESS_LINEDENOISE_DIRECTION;Line noise filter direction HISTORY_MSG_PREPROCESS_PDAFLINESFILTER;PDAF lines filter HISTORY_MSG_PRSHARPEN_CONTRAST;PRS - Contrast threshold HISTORY_MSG_RAW_BORDER;Raw border -HISTORY_MSG_RESIZE_ALLOW_UPSCALING;Resize - Allow upscaling +HISTORY_MSG_RESIZE_ALLOWUPSCALING;Resize - Allow upscaling HISTORY_MSG_SHARPENING_CONTRAST;Sharpening - Contrast threshold HISTORY_MSG_SOFTLIGHT_ENABLED;Soft light HISTORY_MSG_SOFTLIGHT_STRENGTH;Soft light - Strength @@ -757,14 +757,14 @@ HISTORY_NEWSNAPSHOT;Add HISTORY_NEWSNAPSHOT_TOOLTIP;Shortcut: Alt-s HISTORY_SNAPSHOT;Snapshot HISTORY_SNAPSHOTS;Snapshots -ICCPROFCREATOR_ADD_PARAM_IN_DESC;Append Gamma and Slope values to the description ICCPROFCREATOR_COPYRIGHT;Copyright: ICCPROFCREATOR_COPYRIGHT_RESET_TOOLTIP;Reset to the default copyright, granted to "RawTherapee, CC0" ICCPROFCREATOR_CUSTOM;Custom ICCPROFCREATOR_DESCRIPTION;Description: -ICCPROFCREATOR_DESCRIPTION_TOOLTIP;Leave empty to set the default description +ICCPROFCREATOR_DESCRIPTION_ADDPARAM;Append gamma and slope values to the description +ICCPROFCREATOR_DESCRIPTION_TOOLTIP;Leave empty to set the default description. ICCPROFCREATOR_GAMMA;Gamma -ICCPROFCREATOR_ICCVERSION;Generated profile's version: +ICCPROFCREATOR_ICCVERSION;ICC version: ICCPROFCREATOR_ILL;Illuminant: ICCPROFCREATOR_ILL_41;D41 ICCPROFCREATOR_ILL_50;D50 @@ -774,7 +774,7 @@ ICCPROFCREATOR_ILL_65;D65 ICCPROFCREATOR_ILL_80;D80 ICCPROFCREATOR_ILL_DEF;Default ICCPROFCREATOR_ILL_INC;StdA 2856K -ICCPROFCREATOR_ILL_TOOLTIP;You can only set Illuminant with ICC v4 profiles +ICCPROFCREATOR_ILL_TOOLTIP;You can only set the illuminant for ICC v4 profiles. ICCPROFCREATOR_PRIMARIES;Primaries: ICCPROFCREATOR_PRIM_ACESP0;ACES AP0 ICCPROFCREATOR_PRIM_ACESP1;ACES AP1 @@ -791,7 +791,7 @@ ICCPROFCREATOR_PRIM_REC2020;Rec2020 ICCPROFCREATOR_PRIM_REDX;Red X ICCPROFCREATOR_PRIM_REDY;Red Y ICCPROFCREATOR_PRIM_SRGB;sRGB -ICCPROFCREATOR_PRIM_TOOLTIP;You can only set Custom Primaries with ICC v4 profiles +ICCPROFCREATOR_PRIM_TOOLTIP;You can only set custom primaries for ICC v4 profiles. ICCPROFCREATOR_PRIM_WIDEG;Widegamut ICCPROFCREATOR_PROF_V2;ICC v2 ICCPROFCREATOR_PROF_V4;ICC v4 @@ -1009,7 +1009,7 @@ PARTIALPASTE_SHARPENEDGE;Edges PARTIALPASTE_SHARPENING;Sharpening (USM/RL) PARTIALPASTE_SHARPENMICRO;Microcontrast PARTIALPASTE_SOFTLIGHT;Soft light -PARTIALPASTE_TM_FATTAL;Dynamic Range Compression +PARTIALPASTE_TM_FATTAL;Dynamic range compression PARTIALPASTE_VIBRANCE;Vibrance PARTIALPASTE_VIGNETTING;Vignetting correction PARTIALPASTE_WHITEBALANCE;White balance @@ -1712,12 +1712,12 @@ TP_ICM_SAVEREFERENCE_TOOLTIP;Save the linear TIFF image before the input profile TP_ICM_TONECURVE;Tone curve TP_ICM_TONECURVE_TOOLTIP;Employ the embedded DCP tone curve. The setting is only available if the selected DCP has a tone curve. TP_ICM_WORKINGPROFILE;Working Profile -TP_ICM_WORKTRC;Tone response curve: -TP_ICM_WORKTRC_CUSTOM;Custom -TP_ICM_WORKTRC_GAMMA;Gamma -TP_ICM_WORKTRC_NONE;None -TP_ICM_WORKTRC_SLOPE;Slope -TP_ICM_WORKTRC_TOOLTIP;Only for build in profiles +TP_ICM_WORKING_TRC;Tone response curve: +TP_ICM_WORKING_TRC_CUSTOM;Custom +TP_ICM_WORKING_TRC_GAMMA;Gamma +TP_ICM_WORKING_TRC_NONE;None +TP_ICM_WORKING_TRC_SLOPE;Slope +TP_ICM_WORKING_TRC_TOOLTIP;Only for built-in profiles. TP_IMPULSEDENOISE_LABEL;Impulse Noise Reduction TP_IMPULSEDENOISE_THRESH;Threshold TP_LABCURVE_AVOIDCOLORSHIFT;Avoid color shift diff --git a/rtgui/iccprofilecreator.cc b/rtgui/iccprofilecreator.cc index a430fba30..a61f0e80d 100644 --- a/rtgui/iccprofilecreator.cc +++ b/rtgui/iccprofilecreator.cc @@ -207,7 +207,7 @@ ICCProfileCreator::ICCProfileCreator(RTWindow *rtwindow) setExpandAlignProperties(eDescription, true, false, Gtk::ALIGN_FILL, Gtk::ALIGN_CENTER); eDescription->set_tooltip_text(M("ICCPROFCREATOR_DESCRIPTION_TOOLTIP")); mainGrid->attach(*eDescription, 1, 7, 1, 1); - cAppendParamsToDesc = Gtk::manage(new Gtk::CheckButton(M("ICCPROFCREATOR_ADD_PARAM_IN_DESC"))); + cAppendParamsToDesc = Gtk::manage(new Gtk::CheckButton(M("ICCPROFCREATOR_DESCRIPTION_ADDPARAM"))); setExpandAlignProperties(cAppendParamsToDesc, true, false, Gtk::ALIGN_START, Gtk::ALIGN_BASELINE); mainGrid->attach(*cAppendParamsToDesc, 1, 8, 1, 1); diff --git a/rtgui/icmpanel.cc b/rtgui/icmpanel.cc index 84aa26014..9b2b32b09 100644 --- a/rtgui/icmpanel.cc +++ b/rtgui/icmpanel.cc @@ -34,18 +34,18 @@ extern Options options; ICMPanel::ICMPanel() : FoldableToolPanel(this, "icm", M("TP_ICM_LABEL")), iunchanged(nullptr), icmplistener(nullptr), lastRefFilename(""), camName("") { auto m = ProcEventMapper::getInstance(); - EvICMprimariMethod = m->newEvent(GAMMA, "HISTORY_MSG_ICMPRIMARI"); - EvICMprofileMethod = m->newEvent(GAMMA, "HISTORY_MSG_ICMPROFILE"); - EvICMtempMethod = m->newEvent(GAMMA, "HISTORY_MSG_ICMTEMP"); + EvICMprimariMethod = m->newEvent(GAMMA, "HISTORY_MSG_ICM_OUTPUT_PRIMARIES"); + EvICMprofileMethod = m->newEvent(GAMMA, "HISTORY_MSG_ICM_OUTPUT_TYPE"); + EvICMtempMethod = m->newEvent(GAMMA, "HISTORY_MSG_ICM_OUTPUT_TEMP"); EvICMpredx = m->newEvent(GAMMA, "HISTORY_MSG_ICMPREDX"); EvICMpredy = m->newEvent(GAMMA, "HISTORY_MSG_ICMPREDY"); EvICMpgrex = m->newEvent(GAMMA, "HISTORY_MSG_ICMPGREX"); EvICMpgrey = m->newEvent(GAMMA, "HISTORY_MSG_ICMPGREY"); EvICMpblux = m->newEvent(GAMMA, "HISTORY_MSG_ICMPBLUX"); EvICMpbluy = m->newEvent(GAMMA, "HISTORY_MSG_ICMPBLUY"); - EvICMgamm = m->newEvent(ALLNORAW, "HISTORY_MSG_ICMGAMM"); - EvICMslop = m->newEvent(ALLNORAW, "HISTORY_MSG_ICMSLOP"); - EvICMtrcinMethod = m->newEvent(ALLNORAW, "HISTORY_MSG_ICMTRCIN"); + EvICMgamm = m->newEvent(ALLNORAW, "HISTORY_MSG_ICM_WORKING_GAMMA"); + EvICMslop = m->newEvent(ALLNORAW, "HISTORY_MSG_ICM_WORKING_SLOPE"); + EvICMtrcinMethod = m->newEvent(ALLNORAW, "HISTORY_MSG_ICM_WORKING_TRC_METHOD"); isBatchMode = lastToneCurve = lastApplyLookTable = lastApplyBaselineExposureOffset = lastApplyHueSatMap = false; @@ -187,21 +187,21 @@ ICMPanel::ICMPanel() : FoldableToolPanel(this, "icm", M("TP_ICM_LABEL")), iuncha wTRCHBox = Gtk::manage(new Gtk::HBox()); - Gtk::Label* wtrclab = Gtk::manage(new Gtk::Label(M("TP_ICM_WORKTRC"))); + Gtk::Label* wtrclab = Gtk::manage(new Gtk::Label(M("TP_ICM_WORKING_TRC"))); wTRCHBox->pack_start(*wtrclab, Gtk::PACK_SHRINK); wTRC = Gtk::manage(new MyComboBoxText()); wTRCHBox->pack_start(*wTRC, Gtk::PACK_EXPAND_WIDGET); wProfVBox->pack_start(*wTRCHBox, Gtk::PACK_EXPAND_WIDGET); - wTRC->append(M("TP_ICM_WORKTRC_NONE")); - wTRC->append(M("TP_ICM_WORKTRC_CUSTOM")); + wTRC->append(M("TP_ICM_WORKING_TRC_NONE")); + wTRC->append(M("TP_ICM_WORKING_TRC_CUSTOM")); wTRC->set_active(0); - wTRC->set_tooltip_text(M("TP_ICM_WORKTRC_TOOLTIP")); + wTRC->set_tooltip_text(M("TP_ICM_WORKING_TRC_TOOLTIP")); - wGamma = Gtk::manage(new Adjuster(M("TP_ICM_WORKTRC_GAMMA"), 0.40, 15.0, 0.001, 2.4)); - wSlope = Gtk::manage(new Adjuster(M("TP_ICM_WORKTRC_SLOPE"), 0., 150., 0.01, 12.92310)); + wGamma = Gtk::manage(new Adjuster(M("TP_ICM_WORKING_TRC_GAMMA"), 0.40, 15.0, 0.001, 2.4)); + wSlope = Gtk::manage(new Adjuster(M("TP_ICM_WORKING_TRC_SLOPE"), 0., 150., 0.01, 12.92310)); wProfVBox->pack_start(*wGamma, Gtk::PACK_SHRINK); wGamma->show(); diff --git a/rtgui/resize.cc b/rtgui/resize.cc index d72b606ad..d99068096 100644 --- a/rtgui/resize.cc +++ b/rtgui/resize.cc @@ -26,7 +26,7 @@ using namespace rtengine::procparams; Resize::Resize () : FoldableToolPanel(this, "resize", M("TP_RESIZE_LABEL"), false, true), maxw(100000), maxh(100000) { auto m = ProcEventMapper::getInstance(); - EvResizeAllowUpscaling = m->newEvent(RESIZE, "HISTORY_MSG_RESIZE_ALLOW_UPSCALING"); + EvResizeAllowUpscaling = m->newEvent(RESIZE, "HISTORY_MSG_RESIZE_ALLOWUPSCALING"); cropw = 0; croph = 0; From a091b5c4d4d2b440552bdffe9800c491564689f3 Mon Sep 17 00:00:00 2001 From: TooWaBoo Date: Thu, 26 Jul 2018 18:19:41 +0200 Subject: [PATCH 03/28] Update Deutsch locale --- rtdata/languages/Deutsch | 120 ++++++++++++++++++++------------------- 1 file changed, 61 insertions(+), 59 deletions(-) diff --git a/rtdata/languages/Deutsch b/rtdata/languages/Deutsch index d529dc30f..519293f3f 100644 --- a/rtdata/languages/Deutsch +++ b/rtdata/languages/Deutsch @@ -66,6 +66,8 @@ #65 25.06.2018 Korrekturen (TooWaBoo) RT 5.4 #66 04.07.2018 Erweiterung (TooWaBoo) RT 5.4 #67 05.07.2018 Erweiterung (TooWaBoo) RT 5.4 +#68 05.07.2018 Erweiterung (TooWaBoo) RT 5.4 +#69 25.07.2018 Erweiterung (TooWaBoo) RT 5.4 ABOUT_TAB_BUILD;Version ABOUT_TAB_CREDITS;Danksagungen @@ -289,7 +291,7 @@ GENERAL_DISABLED;Deaktiviert GENERAL_ENABLE;Aktivieren GENERAL_ENABLED;Aktiviert GENERAL_FILE;Datei: -GENERAL_LANDSCAPE;Quer +GENERAL_LANDSCAPE;Landschaft GENERAL_NA;n/a GENERAL_NO;Nein GENERAL_NONE;Keine @@ -739,7 +741,7 @@ HISTORY_MSG_423;(Retinex) - Einstellungen\nGammasteigung HISTORY_MSG_424;(Retinex) - Einstellungen\nHL-Schwelle HISTORY_MSG_425;(Retinex) - Einstellungen\nBasis-Logarithmus HISTORY_MSG_426;(Retinex) - Einstellungen\nKorrekturen - Farbton (H) -HISTORY_MSG_427;Ausgabe-Rendering-Intent +HISTORY_MSG_427;(Farbmanagement)\nAusgabeprofil\nRendering-Intent HISTORY_MSG_428;Monitor-Rendering-Intent HISTORY_MSG_429;(Retinex) - Einstellungen\nDynamikkompression\nIterationen HISTORY_MSG_430;(Retinex) - Einstellungen\nDynamikkompression\nTransmission Gradient @@ -1134,7 +1136,7 @@ PREFERENCES_GREYSC18;Yb = 18 CIE L#49 PREFERENCES_GREYSCA;Automatisch PREFERENCES_HISTOGRAMPOSITIONLEFT;Histogramm linksseitig PREFERENCES_HISTOGRAMWORKING;Das Arbeitsprofil zur Darstellung des Haupthistogramms verwenden -PREFERENCES_HISTOGRAM_TOOLTIP;Wenn aktiviert wird das Arbeitsprofil für die Darstellung des\nHaupthistogramms, andernfalls das des gammakorrigierten\nAusgangsprofil, verwendet. +PREFERENCES_HISTOGRAM_TOOLTIP;Wenn aktiviert wird das Arbeitsprofil für die Darstellung\ndes Haupthistogramms verwendet, andernfalls das des\ngammakorrigierten Ausgangsprofil. PREFERENCES_HLTHRESHOLD;Lichter - Schwelle PREFERENCES_ICCDIR;ICC-Profile-Verzeichnis PREFERENCES_IMG_RELOAD_NEEDED;Änderungen werden nur auf neu geöffnete Bilder angewendet @@ -1733,7 +1735,7 @@ TP_ICM_INPUTPROFILE;Eingangsfarbprofil TP_ICM_LABEL;Farbmanagement TP_ICM_NOICM;Kein ICM: sRGB-Ausgabe TP_ICM_OUTPUTPROFILE;Ausgabeprofil -TP_ICM_PROFILEINTENT;Rendering Intent +TP_ICM_PROFILEINTENT;Rendering-Intent TP_ICM_SAVEREFERENCE;Referenzbild speichern TP_ICM_SAVEREFERENCE_APPLYWB;Weißabgleich anwenden TP_ICM_SAVEREFERENCE_APPLYWB_TOOLTIP;Um ICC-Profile zu erstellen, den Weißabgleich beim Speichern anwenden. Um DCP-Profile zu erstellen, den Weißabgleich NICHT beim Speichern anwenden. @@ -2322,58 +2324,58 @@ ZOOMPANEL_ZOOMOUT;Herauszoomen\nTaste: - ! Untranslated keys follow; remove the ! prefix after an entry is translated. !!!!!!!!!!!!!!!!!!!!!!!!! -!GENERAL_SAVE_AS;Save as... -!HISTORY_MSG_ICM_OUTPUT_PRIMARIES;Output - Primaries -!HISTORY_MSG_ICM_OUTPUT_TEMP;Output - ICC-v4 illuminant D -!HISTORY_MSG_ICM_OUTPUT_TYPE;Output - Type -!HISTORY_MSG_ICM_WORKING_GAMMA;Working - Gamma -!HISTORY_MSG_ICM_WORKING_SLOPE;Working - Slope -!HISTORY_MSG_ICM_WORKING_TRC_METHOD;Working - TRC method -!ICCPROFCREATOR_COPYRIGHT;Copyright: -!ICCPROFCREATOR_COPYRIGHT_RESET_TOOLTIP;Reset to the default copyright, granted to "RawTherapee, CC0" -!ICCPROFCREATOR_CUSTOM;Custom -!ICCPROFCREATOR_DESCRIPTION;Description: -!ICCPROFCREATOR_DESCRIPTION_ADDPARAM;Append gamma and slope values to the description -!ICCPROFCREATOR_DESCRIPTION_TOOLTIP;Leave empty to set the default description. -!ICCPROFCREATOR_GAMMA;Gamma -!ICCPROFCREATOR_ICCVERSION;ICC version: -!ICCPROFCREATOR_ILL;Illuminant: -!ICCPROFCREATOR_ILL_41;D41 -!ICCPROFCREATOR_ILL_50;D50 -!ICCPROFCREATOR_ILL_55;D55 -!ICCPROFCREATOR_ILL_60;D60 -!ICCPROFCREATOR_ILL_65;D65 -!ICCPROFCREATOR_ILL_80;D80 -!ICCPROFCREATOR_ILL_DEF;Default -!ICCPROFCREATOR_ILL_INC;StdA 2856K -!ICCPROFCREATOR_ILL_TOOLTIP;You can only set the illuminant for ICC v4 profiles. -!ICCPROFCREATOR_PRIMARIES;Primaries: -!ICCPROFCREATOR_PRIM_ACESP0;ACES AP0 -!ICCPROFCREATOR_PRIM_ACESP1;ACES AP1 -!ICCPROFCREATOR_PRIM_ADOBE;Adobe RGB (1998) -!ICCPROFCREATOR_PRIM_BEST;BestRGB -!ICCPROFCREATOR_PRIM_BETA;BetaRGB -!ICCPROFCREATOR_PRIM_BLUX;Blue X -!ICCPROFCREATOR_PRIM_BLUY;Blue Y -!ICCPROFCREATOR_PRIM_BRUCE;BruceRGB -!ICCPROFCREATOR_PRIM_GREX;Green X -!ICCPROFCREATOR_PRIM_GREY;Green Y -!ICCPROFCREATOR_PRIM_PROPH;Prophoto -!ICCPROFCREATOR_PRIM_REC2020;Rec2020 -!ICCPROFCREATOR_PRIM_REDX;Red X -!ICCPROFCREATOR_PRIM_REDY;Red Y -!ICCPROFCREATOR_PRIM_SRGB;sRGB -!ICCPROFCREATOR_PRIM_TOOLTIP;You can only set custom primaries for ICC v4 profiles. -!ICCPROFCREATOR_PRIM_WIDEG;Widegamut -!ICCPROFCREATOR_PROF_V2;ICC v2 -!ICCPROFCREATOR_PROF_V4;ICC v4 -!ICCPROFCREATOR_SAVEDIALOG_TITLE;Save ICC profile as... -!ICCPROFCREATOR_SLOPE;Slope -!ICCPROFCREATOR_TRC_PRESET;Tone response curve: -!MAIN_BUTTON_ICCPROFCREATOR;ICC Profile Creator -!TP_ICM_WORKING_TRC;Tone response curve: -!TP_ICM_WORKING_TRC_CUSTOM;Custom -!TP_ICM_WORKING_TRC_GAMMA;Gamma -!TP_ICM_WORKING_TRC_NONE;None -!TP_ICM_WORKING_TRC_SLOPE;Slope -!TP_ICM_WORKING_TRC_TOOLTIP;Only for built-in profiles. +GENERAL_SAVE_AS;Speichern +HISTORY_MSG_ICM_OUTPUT_PRIMARIES;(Farbmanagement)\nAusgabeprofil\nVorlagen +HISTORY_MSG_ICM_OUTPUT_TEMP;(Farbmanagement)\nAusgabeprofil\nIccV4-Illuminant D +HISTORY_MSG_ICM_OUTPUT_TYPE;(Farbmanagement)\nAusgabeprofil\nTyp +HISTORY_MSG_ICM_WORKING_GAMMA;(Farbmanagement)\nArbeitsfarbraum\nGamma +HISTORY_MSG_ICM_WORKING_SLOPE;(Farbmanagement)\nArbeitsfarbraum\nSteigung +HISTORY_MSG_ICM_WORKING_TRC_METHOD;(Farbmanagement)\nArbeitsfarbraum\nFarbtonkennlinie +ICCPROFCREATOR_COPYRIGHT;Copyright: +ICCPROFCREATOR_COPYRIGHT_RESET_TOOLTIP;Auf den vorgegebenen Copyright-Text zurücksetzen. +ICCPROFCREATOR_CUSTOM;Benutzerdefiniert +ICCPROFCREATOR_DESCRIPTION;Beschreibung: +ICCPROFCREATOR_DESCRIPTION_ADDPARAM;Füge Gamma- und Steigungswerte der Beschreibung hinzu +ICCPROFCREATOR_DESCRIPTION_TOOLTIP;Wenn leer, wird die Standardbeschreibung verwendet. +ICCPROFCREATOR_GAMMA;Gamma +ICCPROFCREATOR_ICCVERSION;ICC-Version: +ICCPROFCREATOR_ILL;Illuminant: +ICCPROFCREATOR_ILL_41;D41 +ICCPROFCREATOR_ILL_50;D50 +ICCPROFCREATOR_ILL_55;D55 +ICCPROFCREATOR_ILL_60;D60 +ICCPROFCREATOR_ILL_65;D65 +ICCPROFCREATOR_ILL_80;D80 +ICCPROFCREATOR_ILL_DEF;Vorgabe +ICCPROFCREATOR_ILL_INC;StdA 2856K +ICCPROFCREATOR_ILL_TOOLTIP;Illuminant kann nur bei ICC-v4-Profilen\nverwendet werden. +ICCPROFCREATOR_PRIMARIES;Vorlage: +ICCPROFCREATOR_PRIM_ACESP0;ACES AP0 +ICCPROFCREATOR_PRIM_ACESP1;ACES AP1 +ICCPROFCREATOR_PRIM_ADOBE;Adobe RGB (1998) +ICCPROFCREATOR_PRIM_BEST;BestRGB +ICCPROFCREATOR_PRIM_BETA;BetaRGB +ICCPROFCREATOR_PRIM_BLUX;Blau X +ICCPROFCREATOR_PRIM_BLUY;Blau Y +ICCPROFCREATOR_PRIM_BRUCE;BruceRGB +ICCPROFCREATOR_PRIM_GREX;Grün X +ICCPROFCREATOR_PRIM_GREY;Grün Y +ICCPROFCREATOR_PRIM_PROPH;Prophoto +ICCPROFCREATOR_PRIM_REC2020;Rec2020 +ICCPROFCREATOR_PRIM_REDX;Rot X +ICCPROFCREATOR_PRIM_REDY;Rot Y +ICCPROFCREATOR_PRIM_SRGB;sRGB +ICCPROFCREATOR_PRIM_TOOLTIP;Benutzerdefinierte Vorlagen können nur\nbei ICC-v4-Profilen verwendet werden. +ICCPROFCREATOR_PRIM_WIDEG;Widegamut +ICCPROFCREATOR_PROF_V2;ICC v2 +ICCPROFCREATOR_PROF_V4;ICC v4 +ICCPROFCREATOR_SAVEDIALOG_TITLE;ICC-Profile speichern unter ... +ICCPROFCREATOR_SLOPE;Steigung +ICCPROFCREATOR_TRC_PRESET;Farbtonkennlinie: +MAIN_BUTTON_ICCPROFCREATOR;ICC-Profil erstellen +TP_ICM_WORKING_TRC;Farbtonkennlinie: +TP_ICM_WORKING_TRC_CUSTOM;Benutzerdefiniert +TP_ICM_WORKING_TRC_GAMMA;Gamma +TP_ICM_WORKING_TRC_NONE;Keine +TP_ICM_WORKING_TRC_SLOPE;Steigung +TP_ICM_WORKING_TRC_TOOLTIP;Nur für die mitgelieferten\nProfile möglich. From dd255ef244fe056624dfb759490e14e4e662326c Mon Sep 17 00:00:00 2001 From: TooWaBoo Date: Thu, 26 Jul 2018 18:20:46 +0200 Subject: [PATCH 04/28] Update TooWaBoo theme v.270 --- rtdata/themes/TooWaBlue-GTK3-20_.css | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/rtdata/themes/TooWaBlue-GTK3-20_.css b/rtdata/themes/TooWaBlue-GTK3-20_.css index 42f1c681f..2a9882e33 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.69 + Version 2.70 RawTherapee is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -852,7 +852,7 @@ window.csd:not(.fullscreen) #MainNotebook > header.top { #ToolPanelNotebook > header tab #TextOrIcon image{ min-height: 2.33334em; - min-width: 2.5em; + min-width: calc(2em + 4px); padding: 2px 0; margin: 0; } @@ -1388,12 +1388,16 @@ button.flat { /* Resetbutton */ #MyExpander button.flat, dialog scale + button.flat, -scale + button.flat { +scale + button.flat, +dialog entry + button.flat { min-height: 1.16667em; min-width: 1.66667em; margin: 0.08334em 0 0.08334em 0.16667em; padding: 0; } +dialog entry + button.flat { + min-height: 1.66667em; +} #MyExpander scale + button.flat { margin: 0 0 0 0.16667em; @@ -1498,6 +1502,9 @@ dialog button.combo, #BatchQueueButtonsMainContainer button.combo { padding: 0; } +#ToolPanelNotebook > stack > box > box > combobox { + margin-right: 0.25em; +} combobox button cellview { padding: 0 0 0 0.20em; } From f89eec7eb10a6c832c8ca2be2fe6d2a49b2d234a Mon Sep 17 00:00:00 2001 From: Morgan Hardwood Date: Thu, 26 Jul 2018 18:55:23 +0200 Subject: [PATCH 05/28] generateTranslationDiffs --- rtdata/languages/Deutsch | 114 +++++++++++++++++++-------------------- 1 file changed, 55 insertions(+), 59 deletions(-) diff --git a/rtdata/languages/Deutsch b/rtdata/languages/Deutsch index 519293f3f..4318514f2 100644 --- a/rtdata/languages/Deutsch +++ b/rtdata/languages/Deutsch @@ -300,6 +300,7 @@ GENERAL_OPEN;Öffnen GENERAL_PORTRAIT;Portrait GENERAL_RESET;Zurücksetzen GENERAL_SAVE;Speichern +GENERAL_SAVE_AS;Speichern GENERAL_SLIDER;Regler GENERAL_UNCHANGED;(Unverändert) GENERAL_WARNING;Warnung @@ -796,6 +797,12 @@ HISTORY_MSG_CLAMPOOG;(Belichtung) - Farben\nauf Farbraum beschränken HISTORY_MSG_COLORTONING_LABGRID_VALUE;(Farbanpassungen)\nL*a*b* - Farbkorrektur HISTORY_MSG_DUALDEMOSAIC_CONTRAST;(Sensor-Matrix)\nFarbinterpolation\nKontrastschwelle HISTORY_MSG_HISTMATCHING;(Belichtung)\nAuto-Tonwertkurve +HISTORY_MSG_ICM_OUTPUT_PRIMARIES;(Farbmanagement)\nAusgabeprofil\nVorlagen +HISTORY_MSG_ICM_OUTPUT_TEMP;(Farbmanagement)\nAusgabeprofil\nIccV4-Illuminant D +HISTORY_MSG_ICM_OUTPUT_TYPE;(Farbmanagement)\nAusgabeprofil\nTyp +HISTORY_MSG_ICM_WORKING_GAMMA;(Farbmanagement)\nArbeitsfarbraum\nGamma +HISTORY_MSG_ICM_WORKING_SLOPE;(Farbmanagement)\nArbeitsfarbraum\nSteigung +HISTORY_MSG_ICM_WORKING_TRC_METHOD;(Farbmanagement)\nArbeitsfarbraum\nFarbtonkennlinie HISTORY_MSG_LOCALCONTRAST_AMOUNT;(Lokaler Kontrast)\nIntensität HISTORY_MSG_LOCALCONTRAST_DARKNESS;(Lokaler Kontrast)\nDunkle Bereiche HISTORY_MSG_LOCALCONTRAST_ENABLED;(Lokaler Kontrast) @@ -817,6 +824,47 @@ HISTORY_NEWSNAPSHOT;Hinzufügen HISTORY_NEWSNAPSHOT_TOOLTIP;Taste: Alt + s HISTORY_SNAPSHOT;Schnappschuss HISTORY_SNAPSHOTS;Schnappschüsse +ICCPROFCREATOR_COPYRIGHT;Copyright: +ICCPROFCREATOR_COPYRIGHT_RESET_TOOLTIP;Auf den vorgegebenen Copyright-Text zurücksetzen. +ICCPROFCREATOR_CUSTOM;Benutzerdefiniert +ICCPROFCREATOR_DESCRIPTION;Beschreibung: +ICCPROFCREATOR_DESCRIPTION_ADDPARAM;Füge Gamma- und Steigungswerte der Beschreibung hinzu +ICCPROFCREATOR_DESCRIPTION_TOOLTIP;Wenn leer, wird die Standardbeschreibung verwendet. +ICCPROFCREATOR_GAMMA;Gamma +ICCPROFCREATOR_ICCVERSION;ICC-Version: +ICCPROFCREATOR_ILL;Illuminant: +ICCPROFCREATOR_ILL_41;D41 +ICCPROFCREATOR_ILL_50;D50 +ICCPROFCREATOR_ILL_55;D55 +ICCPROFCREATOR_ILL_60;D60 +ICCPROFCREATOR_ILL_65;D65 +ICCPROFCREATOR_ILL_80;D80 +ICCPROFCREATOR_ILL_DEF;Vorgabe +ICCPROFCREATOR_ILL_INC;StdA 2856K +ICCPROFCREATOR_ILL_TOOLTIP;Illuminant kann nur bei ICC-v4-Profilen\nverwendet werden. +ICCPROFCREATOR_PRIMARIES;Vorlage: +ICCPROFCREATOR_PRIM_ACESP0;ACES AP0 +ICCPROFCREATOR_PRIM_ACESP1;ACES AP1 +ICCPROFCREATOR_PRIM_ADOBE;Adobe RGB (1998) +ICCPROFCREATOR_PRIM_BEST;BestRGB +ICCPROFCREATOR_PRIM_BETA;BetaRGB +ICCPROFCREATOR_PRIM_BLUX;Blau X +ICCPROFCREATOR_PRIM_BLUY;Blau Y +ICCPROFCREATOR_PRIM_BRUCE;BruceRGB +ICCPROFCREATOR_PRIM_GREX;Grün X +ICCPROFCREATOR_PRIM_GREY;Grün Y +ICCPROFCREATOR_PRIM_PROPH;Prophoto +ICCPROFCREATOR_PRIM_REC2020;Rec2020 +ICCPROFCREATOR_PRIM_REDX;Rot X +ICCPROFCREATOR_PRIM_REDY;Rot Y +ICCPROFCREATOR_PRIM_SRGB;sRGB +ICCPROFCREATOR_PRIM_TOOLTIP;Benutzerdefinierte Vorlagen können nur\nbei ICC-v4-Profilen verwendet werden. +ICCPROFCREATOR_PRIM_WIDEG;Widegamut +ICCPROFCREATOR_PROF_V2;ICC v2 +ICCPROFCREATOR_PROF_V4;ICC v4 +ICCPROFCREATOR_SAVEDIALOG_TITLE;ICC-Profile speichern unter ... +ICCPROFCREATOR_SLOPE;Steigung +ICCPROFCREATOR_TRC_PRESET;Farbtonkennlinie: IPTCPANEL_CATEGORY;Kategorie IPTCPANEL_CATEGORYHINT;Beschreibt das Thema des Bildes nach\nMeinung des Anbieters. IPTCPANEL_CITY;Stadt @@ -864,6 +912,7 @@ LENSPROFILE_CORRECTION_LCPFILE;LCP-Datei LENSPROFILE_CORRECTION_MANUAL;Benutzerdefiniert (Lensfun) LENSPROFILE_LENS_WARNING;Warnung: Der Cropfaktor des Profils entspricht nicht dem des Objektivs.\nDies kann zu einem fehlerhaften Ergebnis führen. MAIN_BUTTON_FULLSCREEN;Vollbild\nTaste: F11 +MAIN_BUTTON_ICCPROFCREATOR;ICC-Profil erstellen MAIN_BUTTON_NAVNEXT_TOOLTIP;Navigiert zum nächsten Miniaturbild in der\nDateiverwaltung oder Filmstreifen bezogen\nauf das ausgewählte Miniaturbild.\nTaste: F4\n\nNavigiert zum nächsten Miniaturbild in der\nDateiverwaltung oder Filmstreifen bezogen\nauf auf das im Editor geöffnete Bild.\nTaste: Umschalt + F4 MAIN_BUTTON_NAVPREV_TOOLTIP;Navigiert zum vorherigen Miniaturbild in der\nDateiverwaltung oder Filmstreifen bezogen\nauf das ausgewählte Miniaturbild.\nTaste: F3\n\nNavigiert zum vorherigen Miniaturbild in der\nDateiverwaltung oder Filmstreifen bezogen\nauf auf das im Editor geöffnete Bild.\nTaste: Umschalt + F3 MAIN_BUTTON_NAVSYNC_TOOLTIP;Selektiert das Miniaturbild des aktuell geöffneten\nBildes in der Dateiverwaltung und des Filmstreifens.\nEs werden alle aktiven Filter gelöscht.\nTaste: x\n\nWie oben, jedoch ohne Löschung aktiver Filter. Das\nMiniaturbild des geöffneten Bildes wird nicht angezeigt,\nwenn es herausgefiltert wurde.\nTaste: y @@ -1743,6 +1792,12 @@ TP_ICM_SAVEREFERENCE_TOOLTIP;Speichert das lineare TIFF-Bild bevor das\nEingangs TP_ICM_TONECURVE;Tonwertkurve TP_ICM_TONECURVE_TOOLTIP;Eingebettete DCP-Tonwertkurve verwenden.\nDie Einstellung ist nur verfügbar wenn sie\nvom Eingangsfarbprofil unterstützt wird. TP_ICM_WORKINGPROFILE;Arbeitsfarbraum +TP_ICM_WORKING_TRC;Farbtonkennlinie: +TP_ICM_WORKING_TRC_CUSTOM;Benutzerdefiniert +TP_ICM_WORKING_TRC_GAMMA;Gamma +TP_ICM_WORKING_TRC_NONE;Keine +TP_ICM_WORKING_TRC_SLOPE;Steigung +TP_ICM_WORKING_TRC_TOOLTIP;Nur für die mitgelieferten\nProfile möglich. TP_IMPULSEDENOISE_LABEL;Impulsrauschreduzierung TP_IMPULSEDENOISE_THRESH;Schwelle TP_LABCURVE_AVOIDCOLORSHIFT;Farbverschiebungen vermeiden @@ -2320,62 +2375,3 @@ ZOOMPANEL_ZOOMFITSCREEN;An Bildschirm anpassen\nTaste: Alt + f ZOOMPANEL_ZOOMIN;Hineinzoomen\nTaste: + ZOOMPANEL_ZOOMOUT;Herauszoomen\nTaste: - -!!!!!!!!!!!!!!!!!!!!!!!!! -! Untranslated keys follow; remove the ! prefix after an entry is translated. -!!!!!!!!!!!!!!!!!!!!!!!!! - -GENERAL_SAVE_AS;Speichern -HISTORY_MSG_ICM_OUTPUT_PRIMARIES;(Farbmanagement)\nAusgabeprofil\nVorlagen -HISTORY_MSG_ICM_OUTPUT_TEMP;(Farbmanagement)\nAusgabeprofil\nIccV4-Illuminant D -HISTORY_MSG_ICM_OUTPUT_TYPE;(Farbmanagement)\nAusgabeprofil\nTyp -HISTORY_MSG_ICM_WORKING_GAMMA;(Farbmanagement)\nArbeitsfarbraum\nGamma -HISTORY_MSG_ICM_WORKING_SLOPE;(Farbmanagement)\nArbeitsfarbraum\nSteigung -HISTORY_MSG_ICM_WORKING_TRC_METHOD;(Farbmanagement)\nArbeitsfarbraum\nFarbtonkennlinie -ICCPROFCREATOR_COPYRIGHT;Copyright: -ICCPROFCREATOR_COPYRIGHT_RESET_TOOLTIP;Auf den vorgegebenen Copyright-Text zurücksetzen. -ICCPROFCREATOR_CUSTOM;Benutzerdefiniert -ICCPROFCREATOR_DESCRIPTION;Beschreibung: -ICCPROFCREATOR_DESCRIPTION_ADDPARAM;Füge Gamma- und Steigungswerte der Beschreibung hinzu -ICCPROFCREATOR_DESCRIPTION_TOOLTIP;Wenn leer, wird die Standardbeschreibung verwendet. -ICCPROFCREATOR_GAMMA;Gamma -ICCPROFCREATOR_ICCVERSION;ICC-Version: -ICCPROFCREATOR_ILL;Illuminant: -ICCPROFCREATOR_ILL_41;D41 -ICCPROFCREATOR_ILL_50;D50 -ICCPROFCREATOR_ILL_55;D55 -ICCPROFCREATOR_ILL_60;D60 -ICCPROFCREATOR_ILL_65;D65 -ICCPROFCREATOR_ILL_80;D80 -ICCPROFCREATOR_ILL_DEF;Vorgabe -ICCPROFCREATOR_ILL_INC;StdA 2856K -ICCPROFCREATOR_ILL_TOOLTIP;Illuminant kann nur bei ICC-v4-Profilen\nverwendet werden. -ICCPROFCREATOR_PRIMARIES;Vorlage: -ICCPROFCREATOR_PRIM_ACESP0;ACES AP0 -ICCPROFCREATOR_PRIM_ACESP1;ACES AP1 -ICCPROFCREATOR_PRIM_ADOBE;Adobe RGB (1998) -ICCPROFCREATOR_PRIM_BEST;BestRGB -ICCPROFCREATOR_PRIM_BETA;BetaRGB -ICCPROFCREATOR_PRIM_BLUX;Blau X -ICCPROFCREATOR_PRIM_BLUY;Blau Y -ICCPROFCREATOR_PRIM_BRUCE;BruceRGB -ICCPROFCREATOR_PRIM_GREX;Grün X -ICCPROFCREATOR_PRIM_GREY;Grün Y -ICCPROFCREATOR_PRIM_PROPH;Prophoto -ICCPROFCREATOR_PRIM_REC2020;Rec2020 -ICCPROFCREATOR_PRIM_REDX;Rot X -ICCPROFCREATOR_PRIM_REDY;Rot Y -ICCPROFCREATOR_PRIM_SRGB;sRGB -ICCPROFCREATOR_PRIM_TOOLTIP;Benutzerdefinierte Vorlagen können nur\nbei ICC-v4-Profilen verwendet werden. -ICCPROFCREATOR_PRIM_WIDEG;Widegamut -ICCPROFCREATOR_PROF_V2;ICC v2 -ICCPROFCREATOR_PROF_V4;ICC v4 -ICCPROFCREATOR_SAVEDIALOG_TITLE;ICC-Profile speichern unter ... -ICCPROFCREATOR_SLOPE;Steigung -ICCPROFCREATOR_TRC_PRESET;Farbtonkennlinie: -MAIN_BUTTON_ICCPROFCREATOR;ICC-Profil erstellen -TP_ICM_WORKING_TRC;Farbtonkennlinie: -TP_ICM_WORKING_TRC_CUSTOM;Benutzerdefiniert -TP_ICM_WORKING_TRC_GAMMA;Gamma -TP_ICM_WORKING_TRC_NONE;Keine -TP_ICM_WORKING_TRC_SLOPE;Steigung -TP_ICM_WORKING_TRC_TOOLTIP;Nur für die mitgelieferten\nProfile möglich. From 5f2b34f5769148acfb962dde606838f37e735094 Mon Sep 17 00:00:00 2001 From: "U-PC-BUREAU\\jacques" Date: Thu, 26 Jul 2018 19:43:04 +0200 Subject: [PATCH 06/28] Fixed bad behavior between Tone response curve and auto-matched --- rtengine/improccoordinator.cc | 2 +- rtgui/tonecurve.cc | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/rtengine/improccoordinator.cc b/rtengine/improccoordinator.cc index 01e2226f5..96fb576cc 100644 --- a/rtengine/improccoordinator.cc +++ b/rtengine/improccoordinator.cc @@ -459,7 +459,7 @@ void ImProcCoordinator::updatePreviewImage(int todo, Crop* cropCall) readyphase++; - if (todo & M_AUTOEXP) { + if (todo & M_INIT) { if (params.toneCurve.autoexp) { LUTu aehist; int aehistcompr; diff --git a/rtgui/tonecurve.cc b/rtgui/tonecurve.cc index 30c9dadee..fff8c88db 100644 --- a/rtgui/tonecurve.cc +++ b/rtgui/tonecurve.cc @@ -30,7 +30,7 @@ using namespace rtengine::procparams; ToneCurve::ToneCurve () : FoldableToolPanel(this, "tonecurve", M("TP_EXPOSURE_LABEL")) { auto m = ProcEventMapper::getInstance(); - EvHistMatching = m->newEvent(AUTOEXP, "HISTORY_MSG_HISTMATCHING"); + EvHistMatching = m->newEvent(ALLNORAW, "HISTORY_MSG_HISTMATCHING"); EvHistMatchingBatch = m->newEvent(M_VOID, "HISTORY_MSG_HISTMATCHING"); EvClampOOG = m->newEvent(DARKFRAME, "HISTORY_MSG_CLAMPOOG"); From 2da11b61b0db7cb880ea0be600f111efff3d41d7 Mon Sep 17 00:00:00 2001 From: "U-PC-BUREAU\\jacques" Date: Thu, 26 Jul 2018 20:43:23 +0200 Subject: [PATCH 07/28] Refixed the same behavior --- rtengine/dcrop.cc | 2 +- rtengine/improccoordinator.cc | 4 ++-- rtgui/icmpanel.cc | 6 +++--- rtgui/tonecurve.cc | 2 +- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/rtengine/dcrop.cc b/rtengine/dcrop.cc index ebcef3ab6..0b5198c3c 100644 --- a/rtengine/dcrop.cc +++ b/rtengine/dcrop.cc @@ -807,7 +807,7 @@ void Crop::update(int todo) } - if (todo & M_INIT) { + if (todo & M_AUTOEXP) { if (params.icm.workingTRC == "Custom") { //exec TRC IN free Glib::ustring profile; profile = params.icm.workingProfile; diff --git a/rtengine/improccoordinator.cc b/rtengine/improccoordinator.cc index 96fb576cc..50cab329d 100644 --- a/rtengine/improccoordinator.cc +++ b/rtengine/improccoordinator.cc @@ -459,7 +459,7 @@ void ImProcCoordinator::updatePreviewImage(int todo, Crop* cropCall) readyphase++; - if (todo & M_INIT) { + if (todo & M_AUTOEXP) { if (params.toneCurve.autoexp) { LUTu aehist; int aehistcompr; @@ -497,7 +497,7 @@ void ImProcCoordinator::updatePreviewImage(int todo, Crop* cropCall) progress("Exposure curve & CIELAB conversion...", 100 * readyphase / numofphases); - if (todo & M_INIT) { + if (todo & M_AUTOEXP) { if (params.icm.workingTRC == "Custom") { //exec TRC IN free Glib::ustring profile; profile = params.icm.workingProfile; diff --git a/rtgui/icmpanel.cc b/rtgui/icmpanel.cc index 9b2b32b09..936b68fd0 100644 --- a/rtgui/icmpanel.cc +++ b/rtgui/icmpanel.cc @@ -43,9 +43,9 @@ ICMPanel::ICMPanel() : FoldableToolPanel(this, "icm", M("TP_ICM_LABEL")), iuncha EvICMpgrey = m->newEvent(GAMMA, "HISTORY_MSG_ICMPGREY"); EvICMpblux = m->newEvent(GAMMA, "HISTORY_MSG_ICMPBLUX"); EvICMpbluy = m->newEvent(GAMMA, "HISTORY_MSG_ICMPBLUY"); - EvICMgamm = m->newEvent(ALLNORAW, "HISTORY_MSG_ICM_WORKING_GAMMA"); - EvICMslop = m->newEvent(ALLNORAW, "HISTORY_MSG_ICM_WORKING_SLOPE"); - EvICMtrcinMethod = m->newEvent(ALLNORAW, "HISTORY_MSG_ICM_WORKING_TRC_METHOD"); + EvICMgamm = m->newEvent(AUTOEXP, "HISTORY_MSG_ICM_WORKING_GAMMA"); + EvICMslop = m->newEvent(AUTOEXP, "HISTORY_MSG_ICM_WORKING_SLOPE"); + EvICMtrcinMethod = m->newEvent(AUTOEXP, "HISTORY_MSG_ICM_WORKING_TRC_METHOD"); isBatchMode = lastToneCurve = lastApplyLookTable = lastApplyBaselineExposureOffset = lastApplyHueSatMap = false; diff --git a/rtgui/tonecurve.cc b/rtgui/tonecurve.cc index fff8c88db..30c9dadee 100644 --- a/rtgui/tonecurve.cc +++ b/rtgui/tonecurve.cc @@ -30,7 +30,7 @@ using namespace rtengine::procparams; ToneCurve::ToneCurve () : FoldableToolPanel(this, "tonecurve", M("TP_EXPOSURE_LABEL")) { auto m = ProcEventMapper::getInstance(); - EvHistMatching = m->newEvent(ALLNORAW, "HISTORY_MSG_HISTMATCHING"); + EvHistMatching = m->newEvent(AUTOEXP, "HISTORY_MSG_HISTMATCHING"); EvHistMatchingBatch = m->newEvent(M_VOID, "HISTORY_MSG_HISTMATCHING"); EvClampOOG = m->newEvent(DARKFRAME, "HISTORY_MSG_CLAMPOOG"); From 9dc77100396bf936fdfb76c0c4245dca04ec5c20 Mon Sep 17 00:00:00 2001 From: Morgan Hardwood Date: Fri, 27 Jul 2018 15:36:59 +0200 Subject: [PATCH 08/28] Japanese translation updated by firefly, close #4703 --- rtdata/languages/Japanese | 131 ++++++++++++++++++-------------------- 1 file changed, 61 insertions(+), 70 deletions(-) diff --git a/rtdata/languages/Japanese b/rtdata/languages/Japanese index 9e0891078..475a675bf 100644 --- a/rtdata/languages/Japanese +++ b/rtdata/languages/Japanese @@ -264,6 +264,7 @@ GENERAL_OPEN;開く GENERAL_PORTRAIT;縦 GENERAL_RESET;リセット GENERAL_SAVE;保存 +GENERAL_SAVE_AS;...で保存 GENERAL_SLIDER;スライダー GENERAL_UNCHANGED;(変更なし) GENERAL_WARNING;警告 @@ -348,9 +349,9 @@ HISTORY_MSG_65;色収差補正 HISTORY_MSG_66;ハイライト復元 HISTORY_MSG_67;ハイライト復元 量 HISTORY_MSG_68;ハイライト復元 方式 -HISTORY_MSG_69;作業カラースペース -HISTORY_MSG_70;出力カラースペース -HISTORY_MSG_71;入力カラースペース +HISTORY_MSG_69;作業色空間 +HISTORY_MSG_70;出力色空間 +HISTORY_MSG_71;入力色空間 HISTORY_MSG_72;周辺光量補正 HISTORY_MSG_73;チャンネルミキサー HISTORY_MSG_74;リサイズ スケール @@ -760,6 +761,12 @@ HISTORY_MSG_CLAMPOOG;色域外の色を切り取る HISTORY_MSG_COLORTONING_LABGRID_VALUE;CT - カラー補正 HISTORY_MSG_DUALDEMOSAIC_CONTRAST;AMaZE+VNG4 - コントラストのしきい値 HISTORY_MSG_HISTMATCHING;トーンカーブの自動調節 +HISTORY_MSG_ICM_OUTPUT_PRIMARIES;出力 - プライマリ +HISTORY_MSG_ICM_OUTPUT_TEMP;出力 - ICC-v4 光源 D +HISTORY_MSG_ICM_OUTPUT_TYPE;出力 - タイプ +HISTORY_MSG_ICM_WORKING_GAMMA;作業色空間 - ガンマ +HISTORY_MSG_ICM_WORKING_SLOPE;作業色空間 - 勾配 +HISTORY_MSG_ICM_WORKING_TRC_METHOD;作業色空間 - TRCの方式 HISTORY_MSG_LOCALCONTRAST_AMOUNT;ローカルコントラスト - 量 HISTORY_MSG_LOCALCONTRAST_DARKNESS;ローカルコントラスト - 暗い部分 HISTORY_MSG_LOCALCONTRAST_ENABLED;ローカルコントラスト @@ -781,6 +788,47 @@ HISTORY_NEWSNAPSHOT;追加 HISTORY_NEWSNAPSHOT_TOOLTIP;ショートカット: Alt-s HISTORY_SNAPSHOT;スナップショット HISTORY_SNAPSHOTS;スナップショット +ICCPROFCREATOR_COPYRIGHT;著作権: +ICCPROFCREATOR_COPYRIGHT_RESET_TOOLTIP;デフォルトの著作権にリセットする、”RawTherapee CC0”を承諾する +ICCPROFCREATOR_CUSTOM;カスタム +ICCPROFCREATOR_DESCRIPTION;記述: +ICCPROFCREATOR_DESCRIPTION_ADDPARAM;ガンマと勾配の値を記述に加える +ICCPROFCREATOR_DESCRIPTION_TOOLTIP;デフォルトの記述をセットするために空にしておく +ICCPROFCREATOR_GAMMA;ガンマ +ICCPROFCREATOR_ICCVERSION;ICCのバージョン: +ICCPROFCREATOR_ILL;光源: +ICCPROFCREATOR_ILL_41;D41 +ICCPROFCREATOR_ILL_50;D50 +ICCPROFCREATOR_ILL_55;D55 +ICCPROFCREATOR_ILL_60;D60 +ICCPROFCREATOR_ILL_65;D65 +ICCPROFCREATOR_ILL_80;D80 +ICCPROFCREATOR_ILL_DEF;デフォルト +ICCPROFCREATOR_ILL_INC;StdA 2856K +ICCPROFCREATOR_ILL_TOOLTIP;ICC v4プロファイルに関する光源だけを設定することができます +ICCPROFCREATOR_PRIMARIES;プライマリ: +ICCPROFCREATOR_PRIM_ACESP0;ACES AP0 +ICCPROFCREATOR_PRIM_ACESP1;ACES AP1 +ICCPROFCREATOR_PRIM_ADOBE;Adobe RGB (1998) +ICCPROFCREATOR_PRIM_BEST;BestRGB +ICCPROFCREATOR_PRIM_BETA;BetaRGB +ICCPROFCREATOR_PRIM_BLUX;ブルー X +ICCPROFCREATOR_PRIM_BLUY;ブルー Y +ICCPROFCREATOR_PRIM_BRUCE;BruceRGB +ICCPROFCREATOR_PRIM_GREX;グリーン X +ICCPROFCREATOR_PRIM_GREY;グリーン Y +ICCPROFCREATOR_PRIM_PROPH;Prophoto +ICCPROFCREATOR_PRIM_REC2020;Rec2020 +ICCPROFCREATOR_PRIM_REDX;レッド X +ICCPROFCREATOR_PRIM_REDY;レッド Y +ICCPROFCREATOR_PRIM_SRGB;sRGB +ICCPROFCREATOR_PRIM_TOOLTIP;ICC v4プロファイルに関するカスタムプライマリーを設定することが出来ます +ICCPROFCREATOR_PRIM_WIDEG;Widegamut +ICCPROFCREATOR_PROF_V2;ICC v2 +ICCPROFCREATOR_PROF_V4;ICC v4 +ICCPROFCREATOR_SAVEDIALOG_TITLE;...でICCプロファイルを保存 +ICCPROFCREATOR_SLOPE;勾配 +ICCPROFCREATOR_TRC_PRESET;トーン再現カーブ: IPTCPANEL_CATEGORY;カテゴリ IPTCPANEL_CATEGORYHINT;画像の意図 IPTCPANEL_CITY;都市 @@ -828,6 +876,7 @@ LENSPROFILE_CORRECTION_LCPFILE;LCPファイル LENSPROFILE_CORRECTION_MANUAL;手動でパラメータを補正する LENSPROFILE_LENS_WARNING;注意:レンズプロファイルに関する切り抜きの因数がカメラの因数より大きいと、誤った結果になるかもしれません MAIN_BUTTON_FULLSCREEN;フルスクリーン +MAIN_BUTTON_ICCPROFCREATOR;ICCプロファイルクリエーター MAIN_BUTTON_NAVNEXT_TOOLTIP;エディタで開いている画像に対応する次の画像に移動します\nショートカット: Shift-F4\n\nファイルブラウザで選択したサムネイルに対応する次の画像に移動するには\nショートカット: F4 MAIN_BUTTON_NAVPREV_TOOLTIP;エディタで開いている画像に対応する前の画像に移動します\nショートカット: Shift-F3\n\nファイルブラウザで選択したサムネイルに対応する前の画像に移動するには\nショートカット: F3 MAIN_BUTTON_NAVSYNC_TOOLTIP;現在開いている画像のサムネイルを明示しエディタとファイルブラウザを同期させ、ファイルブラウザでのフィルタをクリアします \nショートカット: x\n\n上記と同じですが、ファイルブラウザでのフィルタをクリアしません\nショートカット: y\n(除外する場合、開いているファイルのサムネイルが表示されませんので注意してください). @@ -868,9 +917,9 @@ MAIN_TAB_COLOR;カラー MAIN_TAB_COLOR_TOOLTIP;ショートカット: Alt-c MAIN_TAB_DETAIL;ディテール MAIN_TAB_DETAIL_TOOLTIP;ショートカット: Alt-d -MAIN_TAB_DEVELOP;現像 +MAIN_TAB_DEVELOP;一括編集 MAIN_TAB_EXIF;Exif -MAIN_TAB_EXPORT; 書き出し +MAIN_TAB_EXPORT;高速書き出し MAIN_TAB_EXPOSURE;露光 MAIN_TAB_EXPOSURE_TOOLTIP;ショートカット: Alt-e MAIN_TAB_FILTER;絞り込み @@ -882,7 +931,6 @@ MAIN_TAB_RAW;raw MAIN_TAB_RAW_TOOLTIP;ショートカット: Alt-r MAIN_TAB_TRANSFORM;変形 MAIN_TAB_TRANSFORM_TOOLTIP;ショートカット: Alt-t -MAIN_TAB_WAVELET_TOOLTIP;ショートカット: Alt-w MAIN_TOOLTIP_BACKCOLOR0;プレビューの背景色を指定します: テーマに基づく\nショートカット: 9 MAIN_TOOLTIP_BACKCOLOR1;プレビューの背景色を指定します: 黒\nショートカットt: 9 MAIN_TOOLTIP_BACKCOLOR2;プレビューの背景色を指定します: 白\nショートカット: 9 @@ -940,7 +988,7 @@ PARTIALPASTE_DIRPYRDENOISE;ノイズ低減 PARTIALPASTE_DIRPYREQUALIZER;ディテール・レベルのコントラスト PARTIALPASTE_DISTORTION;歪曲補正 PARTIALPASTE_EPD;トーンマッピング -PARTIALPASTE_EQUALIZER;ウェーブレットイコライザ +PARTIALPASTE_EQUALIZER;ウェーブレット PARTIALPASTE_EVERYTHING;すべて PARTIALPASTE_EXIFCHANGES;exifデータを変える PARTIALPASTE_EXPOSURE;露光量 @@ -1635,10 +1683,6 @@ TP_FLATFIELD_BT_VERTICAL;垂直 TP_FLATFIELD_CLIPCONTROL;クリップコントロール TP_FLATFIELD_CLIPCONTROL_TOOLTIP;クリップコントロールは、フラットフィールドを使った時に白飛びが発生するのを避けるために使います。適用する元画像に既に白飛びがある場合は、クリップコントロールの適用で色被りが起こる可能性があります。 TP_FLATFIELD_LABEL;フラットフィールド -TP_GAMMA_CURV;ガンマ -TP_GAMMA_FREE;フリーなガンマ -TP_GAMMA_OUTPUT;出力 ガンマ -TP_GAMMA_SLOP;勾配（リニア） TP_GENERAL_11SCALE_TOOLTIP;この機能の効果や、そのサブコンポーネントの確認には、プレビューで1:1以上のスケールが必要です。 TP_GRADIENT_CENTER;中央位置 TP_GRADIENT_CENTER_X;中央　X軸 @@ -1699,6 +1743,12 @@ TP_ICM_SAVEREFERENCE_TOOLTIP;入力プロファイルが適用される前のリ TP_ICM_TONECURVE;DCPトーンカーブ使用 TP_ICM_TONECURVE_TOOLTIP;DCPのプロファイルに含まれているトーンカーブを使用することができます TP_ICM_WORKINGPROFILE;作業プロファイル +TP_ICM_WORKING_TRC;トーン再現カーブ: +TP_ICM_WORKING_TRC_CUSTOM;カスタム +TP_ICM_WORKING_TRC_GAMMA;ガンマ +TP_ICM_WORKING_TRC_NONE;なし +TP_ICM_WORKING_TRC_SLOPE;勾配 +TP_ICM_WORKING_TRC_TOOLTIP;組み込まれたプロファイルだけ TP_IMPULSEDENOISE_LABEL;インパルスノイズ低減 TP_IMPULSEDENOISE_THRESH;しきい値 TP_LABCURVE_AVOIDCOLORSHIFT;色ずれを回避 @@ -2257,62 +2307,3 @@ ZOOMPANEL_ZOOMFITSCREEN;画像全体を画面に合わせる\nショートカッ ZOOMPANEL_ZOOMIN;ズームイン\nショートカット: + ZOOMPANEL_ZOOMOUT;ズームアウト\nショートカット: - -!!!!!!!!!!!!!!!!!!!!!!!!! -! Untranslated keys follow; remove the ! prefix after an entry is translated. -!!!!!!!!!!!!!!!!!!!!!!!!! - -!GENERAL_SAVE_AS;Save as... -!HISTORY_MSG_ICM_OUTPUT_PRIMARIES;Output - Primaries -!HISTORY_MSG_ICM_OUTPUT_TEMP;Output - ICC-v4 illuminant D -!HISTORY_MSG_ICM_OUTPUT_TYPE;Output - Type -!HISTORY_MSG_ICM_WORKING_GAMMA;Working - Gamma -!HISTORY_MSG_ICM_WORKING_SLOPE;Working - Slope -!HISTORY_MSG_ICM_WORKING_TRC_METHOD;Working - TRC method -!ICCPROFCREATOR_COPYRIGHT;Copyright: -!ICCPROFCREATOR_COPYRIGHT_RESET_TOOLTIP;Reset to the default copyright, granted to "RawTherapee, CC0" -!ICCPROFCREATOR_CUSTOM;Custom -!ICCPROFCREATOR_DESCRIPTION;Description: -!ICCPROFCREATOR_DESCRIPTION_ADDPARAM;Append gamma and slope values to the description -!ICCPROFCREATOR_DESCRIPTION_TOOLTIP;Leave empty to set the default description. -!ICCPROFCREATOR_GAMMA;Gamma -!ICCPROFCREATOR_ICCVERSION;ICC version: -!ICCPROFCREATOR_ILL;Illuminant: -!ICCPROFCREATOR_ILL_41;D41 -!ICCPROFCREATOR_ILL_50;D50 -!ICCPROFCREATOR_ILL_55;D55 -!ICCPROFCREATOR_ILL_60;D60 -!ICCPROFCREATOR_ILL_65;D65 -!ICCPROFCREATOR_ILL_80;D80 -!ICCPROFCREATOR_ILL_DEF;Default -!ICCPROFCREATOR_ILL_INC;StdA 2856K -!ICCPROFCREATOR_ILL_TOOLTIP;You can only set the illuminant for ICC v4 profiles. -!ICCPROFCREATOR_PRIMARIES;Primaries: -!ICCPROFCREATOR_PRIM_ACESP0;ACES AP0 -!ICCPROFCREATOR_PRIM_ACESP1;ACES AP1 -!ICCPROFCREATOR_PRIM_ADOBE;Adobe RGB (1998) -!ICCPROFCREATOR_PRIM_BEST;BestRGB -!ICCPROFCREATOR_PRIM_BETA;BetaRGB -!ICCPROFCREATOR_PRIM_BLUX;Blue X -!ICCPROFCREATOR_PRIM_BLUY;Blue Y -!ICCPROFCREATOR_PRIM_BRUCE;BruceRGB -!ICCPROFCREATOR_PRIM_GREX;Green X -!ICCPROFCREATOR_PRIM_GREY;Green Y -!ICCPROFCREATOR_PRIM_PROPH;Prophoto -!ICCPROFCREATOR_PRIM_REC2020;Rec2020 -!ICCPROFCREATOR_PRIM_REDX;Red X -!ICCPROFCREATOR_PRIM_REDY;Red Y -!ICCPROFCREATOR_PRIM_SRGB;sRGB -!ICCPROFCREATOR_PRIM_TOOLTIP;You can only set custom primaries for ICC v4 profiles. -!ICCPROFCREATOR_PRIM_WIDEG;Widegamut -!ICCPROFCREATOR_PROF_V2;ICC v2 -!ICCPROFCREATOR_PROF_V4;ICC v4 -!ICCPROFCREATOR_SAVEDIALOG_TITLE;Save ICC profile as... -!ICCPROFCREATOR_SLOPE;Slope -!ICCPROFCREATOR_TRC_PRESET;Tone response curve: -!MAIN_BUTTON_ICCPROFCREATOR;ICC Profile Creator -!TP_ICM_WORKING_TRC;Tone response curve: -!TP_ICM_WORKING_TRC_CUSTOM;Custom -!TP_ICM_WORKING_TRC_GAMMA;Gamma -!TP_ICM_WORKING_TRC_NONE;None -!TP_ICM_WORKING_TRC_SLOPE;Slope -!TP_ICM_WORKING_TRC_TOOLTIP;Only for built-in profiles. From 659901212ad2299f8a70c33d4199ea1e052b6da6 Mon Sep 17 00:00:00 2001 From: Morgan Hardwood Date: Sun, 29 Jul 2018 15:13:35 +0200 Subject: [PATCH 09/28] Icon tweaks and cleanup - Color-unranked icons tweaked for lighter themes, closes #4704 - Star-unranked icons smaller to increase contrast, #4469 - Deleted old icons which snuck back in with the ICC geneartor merge. --- rtdata/images/Dark/actions/gamut-plus.png | Bin 824 -> 0 bytes rtdata/images/Light/actions/gamut-plus.png | Bin 819 -> 0 bytes .../themed/png/dark/circle-darkgray-small.png | Bin 0 -> 389 bytes .../themed/png/dark/circle-gray-small.png | Bin 0 -> 396 bytes rtdata/images/themed/png/dark/star-small.png | Bin 438 -> 396 bytes .../png/light/circle-darkgray-small.png | Bin 0 -> 389 bytes .../themed/png/light/circle-gray-small.png | Bin 0 -> 396 bytes rtdata/images/themed/png/light/star-small.png | Bin 438 -> 397 bytes .../themed/svg/circle-darkgray-small.svg | 110 +++ .../images/themed/svg/circle-gray-small.svg | 110 +++ rtdata/images/themed/svg/gamut-plus.svg | 14 +- rtdata/images/themed/svg/star-small.svg | 8 +- rtgui/filebrowser.cc | 3 +- rtgui/filecatalog.cc | 7 +- rtgui/filethumbnailbuttonset.cc | 2 +- tools/source_icons/scalable/gamut-plus.file | 1 - tools/source_icons/scalable/gamut-plus.svg | 653 ------------------ 17 files changed, 238 insertions(+), 670 deletions(-) delete mode 100644 rtdata/images/Dark/actions/gamut-plus.png delete mode 100644 rtdata/images/Light/actions/gamut-plus.png create mode 100644 rtdata/images/themed/png/dark/circle-darkgray-small.png create mode 100644 rtdata/images/themed/png/dark/circle-gray-small.png create mode 100644 rtdata/images/themed/png/light/circle-darkgray-small.png create mode 100644 rtdata/images/themed/png/light/circle-gray-small.png create mode 100644 rtdata/images/themed/svg/circle-darkgray-small.svg create mode 100644 rtdata/images/themed/svg/circle-gray-small.svg delete mode 100644 tools/source_icons/scalable/gamut-plus.file delete mode 100644 tools/source_icons/scalable/gamut-plus.svg diff --git a/rtdata/images/Dark/actions/gamut-plus.png b/rtdata/images/Dark/actions/gamut-plus.png deleted file mode 100644 index 2ef6f60419c9aa6a674f37bbcca138eed48bc054..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 824 zcmeAS@N?(olHy`uVBq!ia0vp^Vj#@H1|*Mc$*~4fEX7WqAsj$Z!;#Vf4nJ z@ErkR#;MwT(m+AU64!{5;QX|b^2DN4hVt@qz0ADq;^f4FRK5J7^x5xhq=1UVK#Cko zOEU6{7<_@kiFpbhiA5>p`S~dc0i`#AD%2pxlolnYG6W@-hh(G{0gXsi02x@6SY86< z>m}#sUXA#e2GkJ*(&3z6P+63jo>9W!?5yBeQc{$eR9cdmpQjs~0d$UIPG)whLPkkR zft9{~a#3nxNoH9p(1hIlykd~+^m8(kQ}c>bi}jN#b&C`AP4o=(4~HbNGB7YPd%8G= zSoH3l;-4MtD01}t%;{O?7sFWvMOYkN!(BH8NNu?I{lu{vhVs^3-;BR{OI#{(DiA)> z72qo1!t!{2s7au9?kw};t!I_%pDkUvAicPKW_5k>^SPDGf0PR?CLD2FTJf&%FaWKR4J3m!CudTlN>gawp>EtKg6Q;yRL_}=9cF%&( z!gPJydV7V+vy(Tw85Nvsd}7Y9n?dhEzdbX&CA6vxvo}FCcAS5?;D$68=N~r_; zmMmOo$uPafRddFZ^*zC*9&EzJ>I^E8vgf()O*m$6f3kg&nCCX2Ti#dmz9AS(${f~bf-m~HVqWdO(S03>znqLJbHU>{uKbLh*2~7YY?O0L( diff --git a/rtdata/images/Light/actions/gamut-plus.png b/rtdata/images/Light/actions/gamut-plus.png deleted file mode 100644 index 0270d145d0b2efa80cfa19ef8068b84c44c1c28a..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 819 zcmeAS@N?(olHy`uVBq!ia0vp^Vj#@H1|*Mc$*~4fEX7WqAsj$Z!;#Vf4nJ z@ErkR#;MwT(m+AU64!{5;QX|b^2DN4hVt@qz0ADq;^f4FRK5J7^x5xhq=1UVK#Cko zOEU6{7<_@kiFpbhiA5>p`S~dc0i`#AD%2pxlolnYG6W@-hh(G{0gXsi02x@6SY86< z>m}#sUXA#e2GkJ*(&3z6P+63jo>9W!?5yBeQc{$eR9cdmpQjs~0d$UIPG)whLPkkR zft9{~a#3nxNoH9p(1hIlykd~+^m8(kQ}c>bi}jN#b&C`AP4o=(4~HbNGB7ay^K@|x zvFP19#lQPW}%>|}JS zpV=joyDP81o_=bQxF)l8pE0{a1_SSlQlb6PP)T)_`|!*12;cR2|Dj_ zZ`+Za?hbAS6@J$z9xm%9e{o51`Bbg=&n0{BR9=6VHkH6B9V|Qlx-zJ%v`==DYnW|z zT=GWYoaAip6r<8P+7BknOt+lJD4pCVd%V$gz0O=4_6=^I9I|WgPn)8?bXx3Wlbh0mlX>JzL*g=?8FL>&DZa!kT`)9cE(<=0>Tow08|Cu%;Vru$MWF> zlTXa`w^y>Z?k(GG8+GaIoa8N0Yl|~y?VGVntumqKWyady45#uAJWXK8Fq<9D)_ic< m``_}r?!LPon)u(fo-yUj#)nK{5AOie8H1;*pUXO@geCwBW?CQs diff --git a/rtdata/images/themed/png/dark/circle-darkgray-small.png b/rtdata/images/themed/png/dark/circle-darkgray-small.png new file mode 100644 index 0000000000000000000000000000000000000000..e706b1eba3afb828bd04587ddbe76595b7285793 GIT binary patch literal 389 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!73?$#)eFPE+Dshb{an3KOEXqvJC}D7RR&XpS zDauSLEy>K!(+$o@EJ}6E$;?hw$S5f(u+rC0E=o--$t+7v&d<%w&nwo;FG|!*UQYy zE=~rT19HLacQ#T$MVtj5k;M!Qd`Cc-ajG_-G*D0|z$e7jy}&0iF)=8k;^H1| zUhWT+Wh)8t3ufrwyxK=NzQgDPP{i8P#W95AdUC=6rid0^SqGEV6DCbcVwiAn1q%z4 zLz{5NLZ%dsMu{$mHo=aCJ!cxc4~ib%dYHE*x{;5e-k9ULgnY|SpfL=du6{1-oD!M< D4%2>( literal 0 HcmV?d00001 diff --git a/rtdata/images/themed/png/dark/circle-gray-small.png b/rtdata/images/themed/png/dark/circle-gray-small.png new file mode 100644 index 0000000000000000000000000000000000000000..18ad6330a5e5950cd550567ed560a2213e238193 GIT binary patch literal 396 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!73?$#)eFPE+Dshb{an3KOEXqvJC}D7RR&XpS zDauSLEy>K!(+$o@EJ}6E$;?hw$S5f(u+rC0E=o--$t+7v&d<%w&nwo;FG|!*UQYy zE=~rT19HLacQ#T$MVtj5k;M!Qd`Cc-ajG_-G*D19z$e7jy};)H7#uu!aR2`Od-m)B z^0IAjSppTXmjw9*GxTj-;VtZY@byFmppc!Xi(?4K_2h&DOgCD1WgSdbPna|*iDAOQ z6)Y@F4sJpn3zbP0l+XkKk#dK~ literal 0 HcmV?d00001 diff --git a/rtdata/images/themed/png/dark/star-small.png b/rtdata/images/themed/png/dark/star-small.png index f9e4a7361f48670b5f06f3a8b6abccd12c74dce7..c8f21783cbd2ffc5bf35d191985dfd494593fe9e 100644 GIT binary patch delta 144 zcmdnS+{3(qm9btfz$e7jy};+pnKP$Pp9YerPMw0VfsFI#&!0Ve_O;2$00ssIu96_X zV1_E*WEECds{jub#kN$SsFA0OV+hCf};197z%S({@idiO9$#^;P750C)_r%#^-a)AKIK6UEUR{5IG3=9n1 zB|(0{E|oD1(pfrzs;pMw73Ncb!V#V>jv*Y^lMULK*c8kP+l+dqEaY())NuCXJhCB$ zOC&)gbjF#4IV%nvIH1BdWs^X9f`$*xX95+?vHVeoYIb6Mw<&;$Stuu7Ex diff --git a/rtdata/images/themed/png/light/circle-darkgray-small.png b/rtdata/images/themed/png/light/circle-darkgray-small.png new file mode 100644 index 0000000000000000000000000000000000000000..e706b1eba3afb828bd04587ddbe76595b7285793 GIT binary patch literal 389 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!73?$#)eFPE+Dshb{an3KOEXqvJC}D7RR&XpS zDauSLEy>K!(+$o@EJ}6E$;?hw$S5f(u+rC0E=o--$t+7v&d<%w&nwo;FG|!*UQYy zE=~rT19HLacQ#T$MVtj5k;M!Qd`Cc-ajG_-G*D0|z$e7jy}&0iF)=8k;^H1| zUhWT+Wh)8t3ufrwyxK=NzQgDPP{i8P#W95AdUC=6rid0^SqGEV6DCbcVwiAn1q%z4 zLz{5NLZ%dsMu{$mHo=aCJ!cxc4~ib%dYHE*x{;5e-k9ULgnY|SpfL=du6{1-oD!M< D4%2>( literal 0 HcmV?d00001 diff --git a/rtdata/images/themed/png/light/circle-gray-small.png b/rtdata/images/themed/png/light/circle-gray-small.png new file mode 100644 index 0000000000000000000000000000000000000000..18ad6330a5e5950cd550567ed560a2213e238193 GIT binary patch literal 396 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!73?$#)eFPE+Dshb{an3KOEXqvJC}D7RR&XpS zDauSLEy>K!(+$o@EJ}6E$;?hw$S5f(u+rC0E=o--$t+7v&d<%w&nwo;FG|!*UQYy zE=~rT19HLacQ#T$MVtj5k;M!Qd`Cc-ajG_-G*D19z$e7jy};)H7#uu!aR2`Od-m)B z^0IAjSppTXmjw9*GxTj-;VtZY@byFmppc!Xi(?4K_2h&DOgCD1WgSdbPna|*iDAOQ z6)Y@F4sJpn3zbP0l+XkKk#dK~ literal 0 HcmV?d00001 diff --git a/rtdata/images/themed/png/light/star-small.png b/rtdata/images/themed/png/light/star-small.png index d4ecdd6a87f75fa1e9621c7163d87a5bc00e22f6..8ff98fa6bb095c7b692af37abaf340a78791c5fb 100644 GIT binary patch delta 145 zcmdnS+{?Uym9btfz$e7jy}(CRRaH+G}P48fDFOo`?DAr7`RG; z{DK*(INZb&w5$R$c|)G?14WHJT^vI=t|uoP;GQ9}fG3Sv<8UC0lXMpwSF_}*$-2!7 sS*lWst0GxgWe@OdQ~Junc8P%@bPCIkb&(F9K<%6ip00i_>zopr05hj13;+NC delta 186 zcmeBW-p0Ivm9btiz$e626%5=9d>{-UsRjlrDk{dt#u^$LtWox23=9n1B|(0{E|mmKL;g(Ey&978y+CkHe!u_=TVHW^LnUBKfmsB!p)#E}arz9I=C+%t|W z2+25b;D8R_luH7s2^>01D>YLR1lWzV^O6%zFc?ph + + + + + + + + + + + image/svg+xml + + + + + Maciej Dworak + + + + + + + + RawTherapee icon. + + + + + + + + + + + + + + + + diff --git a/rtdata/images/themed/svg/circle-gray-small.svg b/rtdata/images/themed/svg/circle-gray-small.svg new file mode 100644 index 000000000..6ed1fd51d --- /dev/null +++ b/rtdata/images/themed/svg/circle-gray-small.svg @@ -0,0 +1,110 @@ + + + + + + + + + + + + image/svg+xml + + + + + Maciej Dworak + + + + + + + + RawTherapee icon. + + + + + + + + + + + + + + + + diff --git a/rtdata/images/themed/svg/gamut-plus.svg b/rtdata/images/themed/svg/gamut-plus.svg index 4f4ed503b..218f3068d 100644 --- a/rtdata/images/themed/svg/gamut-plus.svg +++ b/rtdata/images/themed/svg/gamut-plus.svg @@ -17,7 +17,7 @@ inkscape:export-filename="/tmp/template.png" inkscape:export-xdpi="96" inkscape:export-ydpi="96" - inkscape:version="0.92.3 (2405546, 2018-03-11)" + inkscape:version="0.92.2 2405546, 2018-03-11" sodipodi:docname="gamut-plus.svg"> + transform="matrix(0.48946382,-0.15758811,0.15903644,0.48500634,1.5397064,9.0803117)" + inkscape:transform-center-y="-0.29218439" /> diff --git a/rtgui/filebrowser.cc b/rtgui/filebrowser.cc index 81b3dc274..edd37f7dd 100644 --- a/rtgui/filebrowser.cc +++ b/rtgui/filebrowser.cc @@ -202,7 +202,8 @@ FileBrowser::FileBrowser () : * color labels ***********************/ - // Same image arrays in filecatalog.cc + // Thumbnail context menu + // Similar image arrays in filecatalog.cc std::array clabelActiveIcons = {"circle-empty-gray-small.png", "circle-red-small.png", "circle-yellow-small.png", "circle-green-small.png", "circle-blue-small.png", "circle-purple-small.png"}; std::array clabelInactiveIcons = {"circle-empty-darkgray-small.png", "circle-empty-red-small.png", "circle-empty-yellow-small.png", "circle-empty-green-small.png", "circle-empty-blue-small.png", "circle-empty-purple-small.png"}; diff --git a/rtgui/filecatalog.cc b/rtgui/filecatalog.cc index 58184aa1c..a0d767d79 100644 --- a/rtgui/filecatalog.cc +++ b/rtgui/filecatalog.cc @@ -193,9 +193,10 @@ FileCatalog::FileCatalog (CoarsePanel* cp, ToolBar* tb, FilePanel* filepanel) : bRank[i]->signal_button_press_event().connect (sigc::mem_fun(*this, &FileCatalog::capture_event), false); } - // Same image arrays in filebrowser.cc - std::array clabelActiveIcons = {"circle-empty-gray-small.png", "circle-red-small.png", "circle-yellow-small.png", "circle-green-small.png", "circle-blue-small.png", "circle-purple-small.png"}; - std::array clabelInactiveIcons = {"circle-empty-darkgray-small.png", "circle-empty-red-small.png", "circle-empty-yellow-small.png", "circle-empty-green-small.png", "circle-empty-blue-small.png", "circle-empty-purple-small.png"}; + // Toolbar + // Similar image arrays in filebrowser.cc + std::array clabelActiveIcons = {"circle-gray-small.png", "circle-red-small.png", "circle-yellow-small.png", "circle-green-small.png", "circle-blue-small.png", "circle-purple-small.png"}; + std::array clabelInactiveIcons = {"circle-empty-gray-small.png", "circle-empty-red-small.png", "circle-empty-yellow-small.png", "circle-empty-green-small.png", "circle-empty-blue-small.png", "circle-empty-purple-small.png"}; iUnCLabeled = new RTImage(clabelActiveIcons[0]); igUnCLabeled = new RTImage(clabelInactiveIcons[0]); diff --git a/rtgui/filethumbnailbuttonset.cc b/rtgui/filethumbnailbuttonset.cc index 99ae18a8c..d32c1c339 100644 --- a/rtgui/filethumbnailbuttonset.cc +++ b/rtgui/filethumbnailbuttonset.cc @@ -49,7 +49,7 @@ FileThumbnailButtonSet::FileThumbnailButtonSet (FileBrowserEntry* myEntry) unTrashIcon = RTImage::createFromPng ("trash-remove-small.png"); processIcon = RTImage::createFromPng ("gears-small.png"); - colorLabelIcon_0 = RTImage::createFromPng ("circle-empty-gray-small.png"); //("nocolorlabel.png"); + colorLabelIcon_0 = RTImage::createFromPng ("circle-empty-gray-small.png"); colorLabelIcon_1 = RTImage::createFromPng ("circle-red-small.png"); colorLabelIcon_2 = RTImage::createFromPng ("circle-yellow-small.png"); colorLabelIcon_3 = RTImage::createFromPng ("circle-green-small.png"); diff --git a/tools/source_icons/scalable/gamut-plus.file b/tools/source_icons/scalable/gamut-plus.file deleted file mode 100644 index ec6f9f83f..000000000 --- a/tools/source_icons/scalable/gamut-plus.file +++ /dev/null @@ -1 +0,0 @@ -gamut-plus.png,w22,actions diff --git a/tools/source_icons/scalable/gamut-plus.svg b/tools/source_icons/scalable/gamut-plus.svg deleted file mode 100644 index 268bcde62..000000000 --- a/tools/source_icons/scalable/gamut-plus.svg +++ /dev/null @@ -1,653 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - image/svg+xml - - - - - - Morgan Hardwood - - - RawTherapee www.rawtherapee.com - - - - - - - - - - - - - - - - - From ae53dfdae5a601e18496f8faf9cf470f20e45d3a Mon Sep 17 00:00:00 2001 From: TooWaBoo Date: Mon, 30 Jul 2018 06:13:04 +0200 Subject: [PATCH 10/28] Update TooWaBoo theme v2.71 --- rtdata/themes/TooWaBlue-GTK3-20_.css | 68 +++++++++++++++++++--------- 1 file changed, 46 insertions(+), 22 deletions(-) diff --git a/rtdata/themes/TooWaBlue-GTK3-20_.css b/rtdata/themes/TooWaBlue-GTK3-20_.css index 2a9882e33..7e69acbc6 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.70 + Version 2.71 RawTherapee is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -75,15 +75,24 @@ -gtk-icon-shadow: none; } +#ToolBarPanelFileBrowser button:not(.smallbutton) image, +#EditorTopPanel button:not(.narrowbutton) image, +#IopsPanel button:not(.Right) image, +#ProfilePanel button image, +#MainNotebook > header :not(#CloseButton) > image { + -gtk-icon-transform: scale(calc(21/24)); +} + *:disabled { color: @fg-disabled; + -gtk-icon-effect: dim; } #ToolPanelNotebook { - min-width: 24.08334em; + min-width: 22.25em; } #HistoryPanel { - min-width: 18em; + min-width: 17.5em; } window.background { @@ -137,10 +146,6 @@ label { margin: 0; } -.drawingarea:not(.slider) { - background-color: @bg-dark-grey; -} - /*** Frames ************************************************************************************/ frame { border: none; @@ -408,7 +413,7 @@ filechooser list row:selected { background-image: none; box-shadow: none; min-height: 1.5em; - min-width: 1.83334em; + min-width: calc(1.33334em + 6px); border-radius: 0; } @@ -1091,15 +1096,15 @@ window.csd:not(.fullscreen) #MainNotebook > header.top { /* Small Lock Button */ #BeforeAfterContainer button { min-height: 2em; - min-width: 2.08334em; + min-width: 2em; margin: 0.25em 0.25em 0.25em 0; padding: 0; } #BeforeAfterContainer button image{ - margin-left: 1px; + margin: 0 0 0 1px; } #BeforeAfterContainer button:checked image{ - margin-left: 5px; + margin: 0 -2px 0 3px; } /**/ @@ -1149,9 +1154,10 @@ window.csd:not(.fullscreen) #MainNotebook > header.top { /**/ #MyExpander .drawingarea:not(.slider) { border: 0.08334em solid @bg-light-grey; + background-color: @bg-dark-grey; } #MyExpander .slider, -#MyExpander .drawingarea:nth-child(2) { +#MyExpander #CurveSHCSelector { background-image: linear-gradient(to bottom, shade (@accent-color4,1.15), shade (@accent-color4,.85)); background-color: @accent-color4; border: 0.08334em solid rgb(15,15,15); @@ -1506,10 +1512,18 @@ dialog button.combo, margin-right: 0.25em; } combobox button cellview { - padding: 0 0 0 0.20em; + padding: 0 0 0 0.16667em; } combobox arrow { - padding: 0 0.20em; + padding: 0 0.16667em 0 0; + margin: 0; +} +#MetaPanelNotebook combobox arrow { + padding: 0; + min-width: 1.25em; +} +.popupbutton-arrow { + min-width: 0; } /**/ @@ -1540,6 +1554,10 @@ buttonbox:not(.dialog-action-area) button{ #PrefNotebook buttonbox:not(.dialog-action-area) { margin-right: -5px; } +#PrefNotebook radiobutton + entry + button:last-child image { + -gtk-icon-transform: scale(calc(17/24)); + margin: -5px; +} /* Arrow toggle combo button */ #IopsPanel .image-combo button.Right, @@ -1565,16 +1583,22 @@ buttonbox:not(.dialog-action-area) button{ margin: 0;/* x */ } /* Graduated filter big button */ -#ExpanderBox button.independent:only-child { - min-height: 2.33334em; - min-width: 2.33334em; +#MyExpander button:not(.image-button).independent:first-child:not(.flat):only-child { + min-height: 2em; + min-width: 2em; padding: 0; - margin: 0 0 0.5em; + margin: 0 0 0.33334em; } - -.popupbutton-arrow { - min-width: 0; +#MyExpander button:not(.image-button).independent:first-child:not(.flat):only-child image { + -gtk-icon-transform: scale(calc(20/24)); + margin: -2px; } +/* WB pipete big button*/ +#MyExpander button.image-button.independent:first-child:not(.flat):not(:only-child) image { + -gtk-icon-transform: scale(calc(18/24)); + margin: -4px; +} +/**/ button.color { min-height: 1.16667em; @@ -1729,7 +1753,7 @@ messagedialog headerbar button.titlebutton { #MainNotebook tab #CloseButton { padding: 0; - margin: 0.33334em -3px 0.33334em 0.16667em; + margin: 0.41667em -2px 0.5em 0.25em; min-width: 1.5em; min-height: 1.5em; } From ce593170e4bfd0e079b552b856500a15eca00be5 Mon Sep 17 00:00:00 2001 From: heckflosse Date: Mon, 30 Jul 2018 18:51:23 +0200 Subject: [PATCH 11/28] Skip raw files > 0x7fffffff bytes, fixes #4705 --- rtengine/dcraw.cc | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/rtengine/dcraw.cc b/rtengine/dcraw.cc index 0d629b9bc..b76484df5 100644 --- a/rtengine/dcraw.cc +++ b/rtengine/dcraw.cc @@ -8792,16 +8792,16 @@ void CLASS identify() colors = 3; for (i=0; i < 0x10000; i++) curve[i] = i; + flen = fsize = ifp->size; + /*RT*/ if (fsize<100000 || fsize > 0x7fffffff) { + is_raw = 0; + return; + } + order = get2(); hlen = get4(); fseek (ifp, 0, SEEK_SET); fread (head, 1, 32, ifp); - fseek (ifp, 0, SEEK_END); - flen = fsize = ftell(ifp); - /*RT*/ if (fsize<100000) { - is_raw = 0; - return; - } /* RT: changed string constant */ if ((cp = (char *) memmem (head, 32, (char*)"MMMM", 4)) || (cp = (char *) memmem (head, 32, (char*)"IIII", 4))) { From c45c638edb0276e2164791df39178b7a0ff62ae6 Mon Sep 17 00:00:00 2001 From: heckflosse Date: Tue, 31 Jul 2018 14:51:30 +0200 Subject: [PATCH 12/28] ImProcFunctions::labtoning(), avoid division by zero, fixes #4706 --- rtengine/improcfun.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rtengine/improcfun.cc b/rtengine/improcfun.cc index ed806e71a..b3432b434 100644 --- a/rtengine/improcfun.cc +++ b/rtengine/improcfun.cc @@ -4082,7 +4082,7 @@ void ImProcFunctions::labtoning (float r, float g, float b, float &ro, float &go float opacity2 = (1.f - min (s / satLimit, 1.f) * (1.f - satLimitOpacity)); //float ro, go, bo; - float lm = l; + float lm = std::max(l, 0.000001f); // avoid division by zero float chromat, luma; if (clToningcurve[lm * 65535.f] / (lm * 65535.f) < 1.f) { From 8ecccb75085aef3dc07533820ddcf0da89369d2d Mon Sep 17 00:00:00 2001 From: heckflosse Date: Tue, 31 Jul 2018 17:09:28 +0200 Subject: [PATCH 13/28] better (and faster) fix for #4706 --- rtengine/improcfun.cc | 24 +++++++++++------------- 1 file changed, 11 insertions(+), 13 deletions(-) diff --git a/rtengine/improcfun.cc b/rtengine/improcfun.cc index b3432b434..232533292 100644 --- a/rtengine/improcfun.cc +++ b/rtengine/improcfun.cc @@ -4077,24 +4077,22 @@ void ImProcFunctions::labtoning (float r, float g, float b, float &ro, float &go // get the opacity and tweak it to preserve saturated colors //float l_ = Color::gamma_srgb(l*65535.f)/65535.f; - float opacity; - opacity = (1.f - min (s / satLimit, 1.f) * (1.f - satLimitOpacity)) * ctOpacityCurve.lutOpacityCurve[l * 500.f]; + float opacity = (1.f - min (s / satLimit, 1.f) * (1.f - satLimitOpacity)) * ctOpacityCurve.lutOpacityCurve[l * 500.f]; float opacity2 = (1.f - min (s / satLimit, 1.f) * (1.f - satLimitOpacity)); - //float ro, go, bo; - float lm = std::max(l, 0.000001f); // avoid division by zero - float chromat, luma; + l *= 65535.f; + float chromat = 0.f, luma = 0.f; - if (clToningcurve[lm * 65535.f] / (lm * 65535.f) < 1.f) { - chromat = (clToningcurve[ (lm) * 65535.f] / (lm * 65535.f)) - 1.f; //special effect - } else { - chromat = 1.f - SQR (SQR ((lm * 65535.f) / clToningcurve[ (lm) * 65535.f])); //apply C=f(L) acts on 'a' and 'b' + if (clToningcurve[l] < l) { + chromat = clToningcurve[l] / l - 1.f; //special effect + } else if (clToningcurve[l] > l) { + chromat = 1.f - SQR(SQR(l / clToningcurve[l])); //apply C=f(L) acts on 'a' and 'b' } - if (cl2Toningcurve[lm * 65535.f] / (lm * 65535.f) < 1.f) { - luma = (cl2Toningcurve[ (lm) * 65535.f] / (lm * 65535.f)) - 1.f; //special effect - } else { - luma = 1.f - SQR (SQR ((lm * 65535.f) / (cl2Toningcurve[ (lm) * 65535.f]))); //apply C2=f(L) acts only on 'b' + if (cl2Toningcurve[l] < l) { + luma = cl2Toningcurve[l] / l - 1.f; //special effect + } else if (cl2Toningcurve[l] > l) { + luma = 1.f - SQR(SQR(l / cl2Toningcurve[l])); //apply C2=f(L) acts only on 'b' } if (algm == 1) { From 5f867be0c3cdfc1128c3ad9300c2db13b446329b Mon Sep 17 00:00:00 2001 From: "luz.paz" Date: Tue, 31 Jul 2018 13:14:14 -0400 Subject: [PATCH 14/28] Misc. typo tixes --- rtdata/options/options.lin | 2 +- rtengine/cJSON.c | 4 ++-- rtengine/cJSON.h | 2 +- rtengine/camconst.json | 6 +++--- rtengine/colortemp.cc | 2 +- rtengine/image16.cc | 2 +- rtengine/rawimagesource.cc | 2 +- rtengine/rtengine.h | 4 ++-- rtengine/rtthumbnail.cc | 2 +- rtgui/colortoning.cc | 2 +- rtgui/coordinateadjuster.h | 4 ++-- rtgui/crop.cc | 2 +- rtgui/main.cc | 2 +- rtgui/wavelet.cc | 2 +- tools/RTProfileBuilderSample.cs | 4 ++-- 15 files changed, 21 insertions(+), 21 deletions(-) diff --git a/rtdata/options/options.lin b/rtdata/options/options.lin index 924e8b9a2..91520dc0e 100644 --- a/rtdata/options/options.lin +++ b/rtdata/options/options.lin @@ -2,7 +2,7 @@ # After the first run, all the parameters will be available in this global option file # or in a new local option file, depending on the MultiUser value below -# Most ot the options are modifiable through the Preference window +# Most of the options are modifiable through the Preference window [General] # Setting MultiUser to false will use the application's installation directory as cache directory, diff --git a/rtengine/cJSON.c b/rtengine/cJSON.c index 7e71ea9e8..fb8ce27e8 100644 --- a/rtengine/cJSON.c +++ b/rtengine/cJSON.c @@ -505,7 +505,7 @@ static cJSON_bool print_number(const cJSON * const item, printbuffer * const out } } - /* sprintf failed or buffer overrun occured */ + /* sprintf failed or buffer overrun occurred */ if ((length < 0) || (length > (int)(sizeof(number_buffer) - 1))) { return false; @@ -1556,7 +1556,7 @@ static cJSON_bool parse_object(cJSON * const item, parse_buffer * const input_bu buffer_skip_whitespace(input_buffer); if (!parse_string(current_item, input_buffer)) { - goto fail; /* faile to parse name */ + goto fail; /* failed to parse name */ } buffer_skip_whitespace(input_buffer); diff --git a/rtengine/cJSON.h b/rtengine/cJSON.h index a9c68fa2c..786dd2e0e 100644 --- a/rtengine/cJSON.h +++ b/rtengine/cJSON.h @@ -217,7 +217,7 @@ CJSON_PUBLIC(void) cJSON_AddItemToObjectCS(cJSON *object, const char *string, cJ CJSON_PUBLIC(void) cJSON_AddItemReferenceToArray(cJSON *array, cJSON *item); CJSON_PUBLIC(void) cJSON_AddItemReferenceToObject(cJSON *object, const char *string, cJSON *item); -/* Remove/Detatch items from Arrays/Objects. */ +/* Remove/Detach items from Arrays/Objects. */ CJSON_PUBLIC(cJSON *) cJSON_DetachItemViaPointer(cJSON *parent, cJSON * const item); CJSON_PUBLIC(cJSON *) cJSON_DetachItemFromArray(cJSON *array, int which); CJSON_PUBLIC(void) cJSON_DeleteItemFromArray(cJSON *array, int which); diff --git a/rtengine/camconst.json b/rtengine/camconst.json index 449484e8a..23d3f4df6 100644 --- a/rtengine/camconst.json +++ b/rtengine/camconst.json @@ -660,7 +660,7 @@ Camera constants: } }, - { // Quality A, ISO and aperture WL data copyed from Shalrath's 60D data at RawTherapee forums + { // Quality A, ISO and aperture WL data copied from Shalrath's 60D data at RawTherapee forums "make_model": "Canon EOS 60Da", "dcraw_matrix": [ 17492,-7240,-2023,-1791,10323,1701,-186,1329,5406 ], // 60Da dng d65 "ranges": { @@ -912,7 +912,7 @@ Camera constants: } }, - { // Quality C, white levels and apperture scaling copied from Canon EOS77d + { // Quality C, white levels and aperture scaling copied from Canon EOS77d "make_model": [ "Canon EOS Rebel T7i", "Canon EOS 800D", "Canon EOS Kiss X9i" ], "dcraw_matrix": [ 6970,-512,-968,-4425,12161,2553,-739,1982,5601 ], // DNG_V9.10.1 D65 "raw_crop": [ 264, 36, 6024, 4020 ], // full size 6288x4056, official crop 276,48,6275,4047 @@ -944,7 +944,7 @@ Camera constants: } }, - { // Quality B, apperture scaling copied from Canon EOS77d + { // Quality B, aperture scaling copied from Canon EOS77d "make_model": [ "Canon EOS Rebel SL2", "Canon EOS 200D", "Canon EOS Kiss X9" ], "dcraw_matrix": [ 7377,-742,-998,-4235,11981,2549,-673,1918,5538 ], // DNG_V9.12 D65 "raw_crop": [ 264, 36, 6024, 4020 ], // full size 6288x4056, official crop 276,48,6275,4047 diff --git a/rtengine/colortemp.cc b/rtengine/colortemp.cc index 75b32c83c..a7a769d93 100644 --- a/rtengine/colortemp.cc +++ b/rtengine/colortemp.cc @@ -1102,7 +1102,7 @@ void ColorTemp::temp2mul (double temp, double green, double equal, double& rmul, // only for lamp different of tungstene // first calcul with illuminant (choice) // and calcul with : blackbody at equivalent temp of lamp - // CRI_color-1 = dispaly Lab values of color CRI_color -1 + // CRI_color-1 = display Lab values of color CRI_color -1 const double whiteD50[3] = {0.9646019585, 1.0, 0.8244507152}; //calculate with this tool : spect 5nm double CAM02BB00, CAM02BB01, CAM02BB02, CAM02BB10, CAM02BB11, CAM02BB12, CAM02BB20, CAM02BB21, CAM02BB22; //for CIECAT02 double Xchk[50], Ychk[50], Zchk[50]; //50 : I think it's a good limit for number of color : for CRI and Palette diff --git a/rtengine/image16.cc b/rtengine/image16.cc index 8b9b4fbc6..20f9ab281 100644 --- a/rtengine/image16.cc +++ b/rtengine/image16.cc @@ -333,7 +333,7 @@ Image16::tofloat() return imgfloat; } -// Parallized transformation; create transform with cmsFLAGS_NOCACHE! +// Parallelized transformation; create transform with cmsFLAGS_NOCACHE! void Image16::ExecCMSTransform(cmsHTRANSFORM hTransform) { //cmsDoTransform(hTransform, data, data, planestride); diff --git a/rtengine/rawimagesource.cc b/rtengine/rawimagesource.cc index 7204862b0..8f85be13a 100644 --- a/rtengine/rawimagesource.cc +++ b/rtengine/rawimagesource.cc @@ -4603,7 +4603,7 @@ void RawImageSource::HLRecovery_CIELab (float* rin, float* gin, float* bin, floa float bo = min(b, maxval); float yy = xyz_cam[1][0] * r + xyz_cam[1][1] * g + xyz_cam[1][2] * b; float fy = (yy < 65535.0 ? Color::cachef[yy] / 327.68 : std::cbrt(yy / MAXVALD)); - // compute LCH decompostion of the clipped pixel (only color information, thus C and H will be used) + // compute LCH decomposition of the clipped pixel (only color information, thus C and H will be used) float x = xyz_cam[0][0] * ro + xyz_cam[0][1] * go + xyz_cam[0][2] * bo; float y = xyz_cam[1][0] * ro + xyz_cam[1][1] * go + xyz_cam[1][2] * bo; float z = xyz_cam[2][0] * ro + xyz_cam[2][1] * go + xyz_cam[2][2] * bo; diff --git a/rtengine/rtengine.h b/rtengine/rtengine.h index c76c542e3..d26d82396 100644 --- a/rtengine/rtengine.h +++ b/rtengine/rtengine.h @@ -537,7 +537,7 @@ public: virtual bool fastPipeline() const = 0; }; -/** This function performs all the image processinf steps corresponding to the given ProcessingJob. It returns when it is ready, so it can be slow. +/** This function performs all the image processing steps corresponding to the given ProcessingJob. It returns when it is ready, so it can be slow. * The ProcessingJob passed becomes invalid, you can not use it any more. * @param job the ProcessingJob to cancel. * @param errorCode is the error code if an error occurred (e.g. the input image could not be loaded etc.) @@ -557,7 +557,7 @@ public: virtual ProcessingJob* imageReady (IImagefloat* img) = 0; virtual void error (Glib::ustring message) = 0; }; -/** This function performs all the image processinf steps corresponding to the given ProcessingJob. It runs in the background, thus it returns immediately, +/** This function performs all the image processing steps corresponding to the given ProcessingJob. It runs in the background, thus it returns immediately, * When it finishes, it calls the BatchProcessingListener with the resulting image and asks for the next job. It the listener gives a new job, it goes on * with processing. If no new job is given, it finishes. * The ProcessingJob passed becomes invalid, you can not use it any more. diff --git a/rtengine/rtthumbnail.cc b/rtengine/rtthumbnail.cc index c49112477..79dee36bf 100644 --- a/rtengine/rtthumbnail.cc +++ b/rtengine/rtthumbnail.cc @@ -1119,7 +1119,7 @@ IImage8* Thumbnail::processImage (const procparams::ProcParams& params, eSensorT gmi = gm * defGain / mul_lum; bmi = bm * defGain / mul_lum; - // The RAW exposure is not reflected since it's done in preprocessing. If we only have e.g. the chached thumb, + // The RAW exposure is not reflected since it's done in preprocessing. If we only have e.g. the cached thumb, // that is already preprocessed. So we simulate the effect here roughly my modifying the exposure accordingly if (isRaw) { rmi *= params.raw.expos; diff --git a/rtgui/colortoning.cc b/rtgui/colortoning.cc index 0d60b769e..7b3fb97df 100644 --- a/rtgui/colortoning.cc +++ b/rtgui/colortoning.cc @@ -377,7 +377,7 @@ void ColorToning::neutralCurves_pressed () { } */ -// Will only reset the chanel mixer +// Will only reset the channel mixer void ColorToning::neutral_pressed () { disableListener(); diff --git a/rtgui/coordinateadjuster.h b/rtgui/coordinateadjuster.h index e6e16b7a2..08f2fb479 100644 --- a/rtgui/coordinateadjuster.h +++ b/rtgui/coordinateadjuster.h @@ -57,7 +57,7 @@ public: /** @brief Update the position of the edited point ; will trigger events * * @param pos New position - * @param chanIdx Chanel index as given in the std::vector upon instantiation + * @param chanIdx Channel index as given in the std::vector upon instantiation */ virtual void setPos(double pos, int chanIdx) = 0; virtual void stopNumericalAdjustment() = 0; @@ -91,7 +91,7 @@ public: // used to update the AxisAdjuster's parameters void updateGUI(const Axis &axis); - // useed to update the displayed value + // used to update the displayed value void setValue(double newValue); //bool keyPressed(GdkEventKey* event); void valueChanged(); diff --git a/rtgui/crop.cc b/rtgui/crop.cc index c229a6088..7205fc3ad 100644 --- a/rtgui/crop.cc +++ b/rtgui/crop.cc @@ -630,7 +630,7 @@ void Crop::ratioFixedChanged () void Crop::ratioChanged () { if (!fixr->get_active ()) { - fixr->set_active(true); // will ajust ratio anyway + fixr->set_active(true); // will adjust ratio anyway } else { adjustCropToRatio(); } diff --git a/rtgui/main.cc b/rtgui/main.cc index 327b0ab33..f345fecc8 100644 --- a/rtgui/main.cc +++ b/rtgui/main.cc @@ -100,7 +100,7 @@ static void myGdkLockEnter() } static void myGdkLockLeave() { - // Automatic gdk_flush for non main tread + // Automatic gdk_flush for non main thread #if AUTO_GDK_FLUSH //if (Glib::Thread::self() != mainThread) { // gdk_flush(); diff --git a/rtgui/wavelet.cc b/rtgui/wavelet.cc index 8053226a2..7acce1e90 100644 --- a/rtgui/wavelet.cc +++ b/rtgui/wavelet.cc @@ -919,7 +919,7 @@ void Wavelet::updatewavLabel () } } -// Will only reset the chanel mixer +// Will only reset the channel mixer // WARNING! In mutiImage mode, and for sliders in ADD mode, this will reset the slider to 0, but not to the default value as in SET mode. void Wavelet::neutral_pressed () { diff --git a/tools/RTProfileBuilderSample.cs b/tools/RTProfileBuilderSample.cs index 4b1b2bff0..a097e6883 100644 --- a/tools/RTProfileBuilderSample.cs +++ b/tools/RTProfileBuilderSample.cs @@ -270,11 +270,11 @@ namespace RTProfilerBuilder { if (adFocLen[i] >= adFocLen[i + 1]) throw new Exception("The distortion correction focal length points must be ordered!"); } - /// Calculates regession value of RT distortion amount for the given focal length. + /// Calculates regression value of RT distortion amount for the given focal length. /// Input focal length. /// Distortion in RT format. public string GetDistortionAmount(double focalLength) { - // if it's out of area (which should just happing with e.g. rounding errors), return flat defaults. + // if it's out of area (which should just happen with e.g. rounding errors), return flat defaults. if (focalLength <= adFocLen[0]) return adCorrect[0].ToString("G", CultureInfo.InvariantCulture); if (focalLength >= adFocLen[adFocLen.Length - 1]) return adCorrect[adFocLen.Length - 1].ToString("G", CultureInfo.InvariantCulture); From f3ecd14481b535224e4cad65c135a611fbabe7ef Mon Sep 17 00:00:00 2001 From: heckflosse Date: Wed, 1 Aug 2018 18:48:08 +0200 Subject: [PATCH 15/28] ahd demosaic, reduced processing time and memory usage, #4698 --- rtengine/demosaic_algos.cc | 256 ++++++++++++++++++------------------- 1 file changed, 124 insertions(+), 132 deletions(-) diff --git a/rtengine/demosaic_algos.cc b/rtengine/demosaic_algos.cc index 39ac911ce..a806268d0 100644 --- a/rtengine/demosaic_algos.cc +++ b/rtengine/demosaic_algos.cc @@ -2332,209 +2332,201 @@ void RawImageSource::igv_interpolate(int winw, int winh) /* Adaptive Homogeneity-Directed interpolation is based on the work of Keigo Hirakawa, Thomas Parks, and Paul Lee. + Optimized for speed and reduced memory usage 2018 Ingo Weyrich */ -#define TS 256 /* Tile Size */ -#define FORC(cnt) for (c=0; c < cnt; c++) -#define FORC3 FORC(3) +#define TS 144 void RawImageSource::ahd_demosaic() { BENCHFUN - int i, j, k, tr, tc, c, d, hm[2]; - float val; - float (*pix)[3], (*rix)[3]; - static const int dir[4] = { -1, 1, -TS, TS }; - float ldiff[2][4], abdiff[2][4], leps, abeps; - float xyz[3], xyz_cam[3][3]; + + constexpr int dir[4] = { -1, 1, -TS, TS }; + float xyz_cam[3][3]; LUTf cbrt(65536); - float (*rgb)[TS][TS][3]; - float (*lab)[TS][TS][3]; - float (*lix)[3]; - char (*homo)[TS][TS], *buffer; - double r; - int width = W, height = H; - unsigned int colors = 3; - const double xyz_rgb[3][3] = { /* XYZ from RGB */ + constexpr double xyz_rgb[3][3] = { /* XYZ from RGB */ { 0.412453, 0.357580, 0.180423 }, { 0.212671, 0.715160, 0.072169 }, { 0.019334, 0.119193, 0.950227 } }; - const float d65_white[3] = { 0.950456, 1, 1.088754 }; + constexpr float d65_white[3] = { 0.950456, 1, 1.088754 }; + volatile double progress = 0.0; if (plistener) { plistener->setProgressStr (Glib::ustring::compose(M("TP_RAW_DMETHOD_PROGRESSBAR"), RAWParams::BayerSensor::getMethodString(RAWParams::BayerSensor::Method::AHD))); plistener->setProgress (0.0); } - float (*image)[3] = (float (*)[3]) calloc (H * W, sizeof * image); - - for (int ii = 0; ii < H; ii++) - for (int jj = 0; jj < W; jj++) { - image[ii * W + jj][fc(ii, jj)] = rawData[ii][jj]; - } - - for (i = 0; i < 0x10000; i++) { - r = (double)i / 65535.0; + for (int i = 0; i < 0x10000; i++) { + double r = (double)i / 65535.0; cbrt[i] = r > 0.008856 ? std::cbrt(r) : 7.787 * r + 16 / 116.0; } - for (i = 0; i < 3; i++) - for (unsigned int j = 0; j < colors; j++) - for (xyz_cam[i][j] = k = 0; k < 3; k++) { + for (int i = 0; i < 3; i++) + for (unsigned int j = 0; j < 3; j++) { + xyz_cam[i][j] = 0; + for (int k = 0; k < 3; k++) { xyz_cam[i][j] += xyz_rgb[i][k] * imatrices.rgb_cam[k][j] / d65_white[i]; } + } - border_interpolate(5, image); - buffer = (char *) malloc (13 * TS * TS * sizeof(float)); /* 1664 kB */ - //merror (buffer, "ahd_interpolate()"); - rgb = (float(*)[TS][TS][3]) buffer; - lab = (float(*)[TS][TS][3])(buffer + 6 * TS * TS * sizeof(float)); - homo = (char (*)[TS][TS]) (buffer + 12 * TS * TS * sizeof(float)); + border_interpolate2(W, H, 5, rawData, red, green, blue); - // helper variables for progress indication - int n_tiles = ((height - 7 + (TS - 7)) / (TS - 6)) * ((width - 7 + (TS - 7)) / (TS - 6)); - int tile = 0; +#ifdef _OPENMP +#pragma omp parallel +#endif +{ + int progresscounter = 0; + float (*pix), (*rix)[3]; + float ldiff[2][4], abdiff[2][4]; + float (*lix)[3]; + char *buffer = (char *) malloc (12 * TS * TS * sizeof(float) + 2 * TS * TS * sizeof(uint16_t)); /* 1053 kB per core */ + float (*rgb)[TS][TS][3] = (float(*)[TS][TS][3]) buffer; + float (*lab)[TS][TS][3] = (float(*)[TS][TS][3])(buffer + 6 * TS * TS * sizeof(float)); + uint16_t (*homo)[TS][TS] = (uint16_t(*)[TS][TS])(buffer + 12 * TS * TS * sizeof(float)); - for (int top = 2; top < height - 5; top += TS - 6) +#ifdef _OPENMP + #pragma omp for collapse(2) schedule(dynamic) nowait +#endif + for (int top = 2; top < height - 5; top += TS - 6) { for (int left = 2; left < width - 5; left += TS - 6) { - /* Interpolate green horizontally and vertically: */ + // Interpolate green horizontally and vertically: for (int row = top; row < top + TS && row < height - 2; row++) { - int col = left + (FC(row, left) & 1); - - for (c = FC(row, col); col < left + TS && col < width - 2; col += 2) { - pix = image + (row * width + col); - val = 0.25f * ((pix[-1][1] + pix[0][c] + pix[1][1]) * 2 - - pix[-2][c] - pix[2][c]) ; - rgb[0][row - top][col - left][1] = median(val, pix[-1][1], pix[1][1]); - val = 0.25f * ((pix[-width][1] + pix[0][c] + pix[width][1]) * 2 - - pix[-2 * width][c] - pix[2 * width][c]) ; - rgb[1][row - top][col - left][1] = median(val, pix[-width][1], pix[width][1]); + for (int col = left + (FC(row, left) & 1); col < std::min(left + TS, width - 2); col += 2) { + pix = &(rawData[row][col]); + float val0 = 0.25f * ((pix[-1] + pix[0] + pix[1]) * 2 + - pix[-2] - pix[2]) ; + rgb[0][row - top][col - left][1] = median(val0, pix[-1], pix[1]); + float val1 = 0.25f * ((pix[-width] + pix[0] + pix[width]) * 2 + - pix[-2 * width] - pix[2 * width]) ; + rgb[1][row - top][col - left][1] = median(val1, pix[-width], pix[width]); } } - /* Interpolate red and blue, and convert to CIELab: */ - for (d = 0; d < 2; d++) - for (int row = top + 1; row < top + TS - 1 && row < height - 3; row++) - for (int col = left + 1; col < left + TS - 1 && col < width - 3; col++) { - pix = image + (row * width + col); + // Interpolate red and blue, and convert to CIELab: + for (int d = 0; d < 2; d++) + for (int row = top + 1; row < top + TS - 1 && row < height - 3; row++) { + int cng = FC(row + 1, FC(row + 1, 0) & 1); + for (int col = left + 1; col < std::min(left + TS - 1, width - 3); col++) { + pix = &(rawData[row][col]); rix = &rgb[d][row - top][col - left]; lix = &lab[d][row - top][col - left]; - - if ((c = 2 - FC(row, col)) == 1) { - c = FC(row + 1, col); - val = pix[0][1] + (0.5f * ( pix[-1][2 - c] + pix[1][2 - c] - - rix[-1][1] - rix[1][1] ) ); - rix[0][2 - c] = CLIP(val); - val = pix[0][1] + (0.5f * ( pix[-width][c] + pix[width][c] - - rix[-TS][1] - rix[TS][1] ) ); - } else - val = rix[0][1] + (0.25f * ( pix[-width - 1][c] + pix[-width + 1][c] - + pix[+width - 1][c] + pix[+width + 1][c] + if (FC(row, col) == 1) { + rix[0][2 - cng] = CLIP(pix[0] + (0.5f * (pix[-1] + pix[1] + - rix[-1][1] - rix[1][1] ) )); + rix[0][cng] = CLIP(pix[0] + (0.5f * (pix[-width] + pix[width] + - rix[-TS][1] - rix[TS][1]))); + rix[0][1] = pix[0]; + } else { + rix[0][cng] = CLIP(rix[0][1] + (0.25f * (pix[-width - 1] + pix[-width + 1] + + pix[+width - 1] + pix[+width + 1] - rix[-TS - 1][1] - rix[-TS + 1][1] - - rix[+TS - 1][1] - rix[+TS + 1][1]) ); - - rix[0][c] = CLIP(val); - c = FC(row, col); - rix[0][c] = pix[0][c]; - xyz[0] = xyz[1] = xyz[2] = 0.f; - FORCC { - xyz[0] += xyz_cam[0][c] * rix[0][c]; - xyz[1] += xyz_cam[1][c] * rix[0][c]; - xyz[2] += xyz_cam[2][c] * rix[0][c]; + - rix[+TS - 1][1] - rix[+TS + 1][1]))); + rix[0][2 - cng] = pix[0]; + } + float xyz0 = 0.f; + float xyz1 = 0.f; + float xyz2 = 0.f; + + for(unsigned int c = 0; c < 3; ++c) { + xyz0 += xyz_cam[0][c] * rix[0][c]; + xyz1 += xyz_cam[1][c] * rix[0][c]; + xyz2 += xyz_cam[2][c] * rix[0][c]; } - xyz[0] = cbrt[xyz[0]]; - xyz[1] = cbrt[xyz[1]]; - xyz[2] = cbrt[xyz[2]]; + xyz0 = cbrt[xyz0]; + xyz1 = cbrt[xyz1]; + xyz2 = cbrt[xyz2]; - //xyz[0] = xyz[0] > 0.008856 ? pow(xyz[0]/65535,1/3.0) : 7.787*xyz[0] + 16/116.0; - //xyz[1] = xyz[1] > 0.008856 ? pow(xyz[1]/65535,1/3.0) : 7.787*xyz[1] + 16/116.0; - //xyz[2] = xyz[2] > 0.008856 ? pow(xyz[2]/65535,1/3.0) : 7.787*xyz[2] + 16/116.0; - - lix[0][0] = (116 * xyz[1] - 16); - lix[0][1] = 500 * (xyz[0] - xyz[1]); - lix[0][2] = 200 * (xyz[1] - xyz[2]); + lix[0][0] = 116.f * xyz1 - 16.f; + lix[0][1] = 500.f * (xyz0 - xyz1); + lix[0][2] = 200.f * (xyz1 - xyz2); } + } - /* Build homogeneity maps from the CIELab images: */ - memset (homo, 0, 2 * TS * TS); + // Build homogeneity maps from the CIELab images: for (int row = top + 2; row < top + TS - 2 && row < height - 4; row++) { - tr = row - top; + int tr = row - top; - for (int col = left + 2; col < left + TS - 2 && col < width - 4; col++) { - tc = col - left; - - for (d = 0; d < 2; d++) { + for (int col = left + 2, tc = 2; col < left + TS - 2 && col < width - 4; col++, tc++) { + for (int d = 0; d < 2; d++) { lix = &lab[d][tr][tc]; - for (i = 0; i < 4; i++) { + for (int i = 0; i < 4; i++) { ldiff[d][i] = std::fabs(lix[0][0] - lix[dir[i]][0]); abdiff[d][i] = SQR(lix[0][1] - lix[dir[i]][1]) + SQR(lix[0][2] - lix[dir[i]][2]); } } - leps = min(max(ldiff[0][0], ldiff[0][1]), - max(ldiff[1][2], ldiff[1][3])); - abeps = min(max(abdiff[0][0], abdiff[0][1]), - max(abdiff[1][2], abdiff[1][3])); + float leps = min(max(ldiff[0][0], ldiff[0][1]), + max(ldiff[1][2], ldiff[1][3])); + float abeps = min(max(abdiff[0][0], abdiff[0][1]), + max(abdiff[1][2], abdiff[1][3])); - for (d = 0; d < 2; d++) - for (i = 0; i < 4; i++) + for (int d = 0; d < 2; d++) { + homo[d][tr][tc] = 0; + for (int i = 0; i < 4; i++) { if (ldiff[d][i] <= leps && abdiff[d][i] <= abeps) { homo[d][tr][tc]++; } + } + } } } - /* Combine the most homogenous pixels for the final result: */ + // Combine the most homogenous pixels for the final result: for (int row = top + 3; row < top + TS - 3 && row < height - 5; row++) { - tr = row - top; + int tr = row - top; - for (int col = left + 3; col < left + TS - 3 && col < width - 5; col++) { - tc = col - left; + for (int col = left + 3, tc = 3; col < std::min(left + TS - 3, width - 5); col++, tc++) { + uint16_t hm0 = 0, hm1 = 0; + for (int i = tr - 1; i <= tr + 1; i++) + for (int j = tc - 1; j <= tc + 1; j++) { + hm0 += homo[0][i][j]; + hm1 += homo[1][i][j]; + } - for (d = 0; d < 2; d++) - for (hm[d] = 0, i = tr - 1; i <= tr + 1; i++) - for (j = tc - 1; j <= tc + 1; j++) { - hm[d] += homo[d][i][j]; - } - - if (hm[0] != hm[1]) { - FORC3 image[row * width + col][c] = rgb[hm[1] > hm[0]][tr][tc][c]; - } else - FORC3 image[row * width + col][c] = - 0.5f * (rgb[0][tr][tc][c] + rgb[1][tr][tc][c]) ; + if (hm0 != hm1) { + int dir = hm1 > hm0; + red[row][col] = rgb[dir][tr][tc][0]; + green[row][col] = rgb[dir][tr][tc][1]; + blue[row][col] = rgb[dir][tr][tc][2]; + } else { + red[row][col] = 0.5f * (rgb[0][tr][tc][0] + rgb[1][tr][tc][0]); + green[row][col] = 0.5f * (rgb[0][tr][tc][1] + rgb[1][tr][tc][1]); + blue[row][col] = 0.5f * (rgb[0][tr][tc][2] + rgb[1][tr][tc][2]); + } } } - tile++; - if(plistener) { - plistener->setProgress((double)tile / n_tiles); - } - } + progresscounter++; + if(progresscounter % 32 == 0) { +#ifdef _OPENMP + #pragma omp critical (ahdprogress) +#endif + { + progress += (double)32 * ((TS - 32) * (TS - 32)) / (height * width); + progress = progress > 1.0 ? 1.0 : progress; + plistener->setProgress(progress); + } + } + } + + } + } + free (buffer); +} if(plistener) { plistener->setProgress (1.0); } - free (buffer); - - for (int i = 0; i < H; i++) { - for (int j = 0; j < W; j++) { - red[i][j] = image[i * W + j][0]; - green[i][j] = image[i * W + j][1]; - blue[i][j] = image[i * W + j][2]; - } - } - - free (image); } #undef TS From c4bd557851e7fae6e3b6c999eb56b821bf50ffbd Mon Sep 17 00:00:00 2001 From: heckflosse Date: Wed, 1 Aug 2018 19:38:46 +0200 Subject: [PATCH 16/28] ahd demosaic: own compilation unit --- rtengine/CMakeLists.txt | 1 + rtengine/ahd_demosaic_RT.cc | 230 ++++++++++++++++++++++++++++++++++++ rtengine/demosaic_algos.cc | 207 +------------------------------- 3 files changed, 233 insertions(+), 205 deletions(-) create mode 100644 rtengine/ahd_demosaic_RT.cc diff --git a/rtengine/CMakeLists.txt b/rtengine/CMakeLists.txt index ff3024beb..74497d7d0 100644 --- a/rtengine/CMakeLists.txt +++ b/rtengine/CMakeLists.txt @@ -32,6 +32,7 @@ set(RTENGINESOURCEFILES EdgePreservingDecomposition.cc FTblockDN.cc PF_correct_RT.cc + ahd_demosaic_RT.cc amaze_demosaic_RT.cc cJSON.c calc_distort.cc diff --git a/rtengine/ahd_demosaic_RT.cc b/rtengine/ahd_demosaic_RT.cc new file mode 100644 index 000000000..f394fbfc7 --- /dev/null +++ b/rtengine/ahd_demosaic_RT.cc @@ -0,0 +1,230 @@ +/* + * This file is part of RawTherapee. + * + * Copyright (c) 2018 Ingo Weyrich (heckflosse67@gmx.de) + * + * RawTherapee is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * RawTherapee is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with RawTherapee. If not, see . + */ + +// +// Adaptive Homogeneity-Directed interpolation is based on +// the work of Keigo Hirakawa, Thomas Parks, and Paul Lee. +// Optimized for speed and reduced memory usage 2018 Ingo Weyrich +// + +#include "rtengine.h" +#include "rawimagesource.h" +#include "rt_math.h" +#include "../rtgui/multilangmgr.h" +#include "median.h" +#include "StopWatch.h" + +namespace rtengine +{ +#define TS 144 +void RawImageSource::ahd_demosaic() +{ + BENCHFUN + + constexpr int dir[4] = { -1, 1, -TS, TS }; + float xyz_cam[3][3]; + LUTf cbrt(65536); + + int width = W, height = H; + + constexpr double xyz_rgb[3][3] = { /* XYZ from RGB */ + { 0.412453, 0.357580, 0.180423 }, + { 0.212671, 0.715160, 0.072169 }, + { 0.019334, 0.119193, 0.950227 } + }; + + constexpr float d65_white[3] = { 0.950456, 1, 1.088754 }; + + volatile double progress = 0.0; + if (plistener) { + plistener->setProgressStr (Glib::ustring::compose(M("TP_RAW_DMETHOD_PROGRESSBAR"), RAWParams::BayerSensor::getMethodString(RAWParams::BayerSensor::Method::AHD))); + plistener->setProgress (0.0); + } + + for (int i = 0; i < 0x10000; i++) { + double r = (double)i / 65535.0; + cbrt[i] = r > 0.008856 ? std::cbrt(r) : 7.787 * r + 16 / 116.0; + } + + for (int i = 0; i < 3; i++) + for (unsigned int j = 0; j < 3; j++) { + xyz_cam[i][j] = 0; + for (int k = 0; k < 3; k++) { + xyz_cam[i][j] += xyz_rgb[i][k] * imatrices.rgb_cam[k][j] / d65_white[i]; + } + } + + border_interpolate2(W, H, 5, rawData, red, green, blue); + +#ifdef _OPENMP +#pragma omp parallel +#endif +{ + int progresscounter = 0; + float (*pix), (*rix)[3]; + float ldiff[2][4], abdiff[2][4]; + float (*lix)[3]; + char *buffer = (char *) malloc (12 * TS * TS * sizeof(float) + 2 * TS * TS * sizeof(uint16_t)); /* 1053 kB per core */ + float (*rgb)[TS][TS][3] = (float(*)[TS][TS][3]) buffer; + float (*lab)[TS][TS][3] = (float(*)[TS][TS][3])(buffer + 6 * TS * TS * sizeof(float)); + uint16_t (*homo)[TS][TS] = (uint16_t(*)[TS][TS])(buffer + 12 * TS * TS * sizeof(float)); + +#ifdef _OPENMP + #pragma omp for collapse(2) schedule(dynamic) nowait +#endif + for (int top = 2; top < height - 5; top += TS - 6) { + for (int left = 2; left < width - 5; left += TS - 6) { + // Interpolate green horizontally and vertically: + for (int row = top; row < top + TS && row < height - 2; row++) { + for (int col = left + (FC(row, left) & 1); col < std::min(left + TS, width - 2); col += 2) { + pix = &(rawData[row][col]); + float val0 = 0.25f * ((pix[-1] + pix[0] + pix[1]) * 2 + - pix[-2] - pix[2]) ; + rgb[0][row - top][col - left][1] = median(val0, pix[-1], pix[1]); + float val1 = 0.25f * ((pix[-width] + pix[0] + pix[width]) * 2 + - pix[-2 * width] - pix[2 * width]) ; + rgb[1][row - top][col - left][1] = median(val1, pix[-width], pix[width]); + } + } + + // Interpolate red and blue, and convert to CIELab: + for (int d = 0; d < 2; d++) + for (int row = top + 1; row < top + TS - 1 && row < height - 3; row++) { + int cng = FC(row + 1, FC(row + 1, 0) & 1); + for (int col = left + 1; col < std::min(left + TS - 1, width - 3); col++) { + pix = &(rawData[row][col]); + rix = &rgb[d][row - top][col - left]; + lix = &lab[d][row - top][col - left]; + if (FC(row, col) == 1) { + rix[0][2 - cng] = CLIP(pix[0] + (0.5f * (pix[-1] + pix[1] + - rix[-1][1] - rix[1][1] ) )); + rix[0][cng] = CLIP(pix[0] + (0.5f * (pix[-width] + pix[width] + - rix[-TS][1] - rix[TS][1]))); + rix[0][1] = pix[0]; + } else { + rix[0][cng] = CLIP(rix[0][1] + (0.25f * (pix[-width - 1] + pix[-width + 1] + + pix[+width - 1] + pix[+width + 1] + - rix[-TS - 1][1] - rix[-TS + 1][1] + - rix[+TS - 1][1] - rix[+TS + 1][1]))); + rix[0][2 - cng] = pix[0]; + } + float xyz0 = 0.f; + float xyz1 = 0.f; + float xyz2 = 0.f; + + for(unsigned int c = 0; c < 3; ++c) { + xyz0 += xyz_cam[0][c] * rix[0][c]; + xyz1 += xyz_cam[1][c] * rix[0][c]; + xyz2 += xyz_cam[2][c] * rix[0][c]; + } + + xyz0 = cbrt[xyz0]; + xyz1 = cbrt[xyz1]; + xyz2 = cbrt[xyz2]; + + lix[0][0] = 116.f * xyz1 - 16.f; + lix[0][1] = 500.f * (xyz0 - xyz1); + lix[0][2] = 200.f * (xyz1 - xyz2); + } + } + + // Build homogeneity maps from the CIELab images: + + for (int row = top + 2; row < top + TS - 2 && row < height - 4; row++) { + int tr = row - top; + + for (int col = left + 2, tc = 2; col < left + TS - 2 && col < width - 4; col++, tc++) { + for (int d = 0; d < 2; d++) { + lix = &lab[d][tr][tc]; + + for (int i = 0; i < 4; i++) { + ldiff[d][i] = std::fabs(lix[0][0] - lix[dir[i]][0]); + abdiff[d][i] = SQR(lix[0][1] - lix[dir[i]][1]) + + SQR(lix[0][2] - lix[dir[i]][2]); + } + } + + float leps = min(max(ldiff[0][0], ldiff[0][1]), + max(ldiff[1][2], ldiff[1][3])); + float abeps = min(max(abdiff[0][0], abdiff[0][1]), + max(abdiff[1][2], abdiff[1][3])); + + for (int d = 0; d < 2; d++) { + homo[d][tr][tc] = 0; + for (int i = 0; i < 4; i++) { + if (ldiff[d][i] <= leps && abdiff[d][i] <= abeps) { + homo[d][tr][tc]++; + } + } + } + } + } + + // Combine the most homogenous pixels for the final result: + for (int row = top + 3; row < top + TS - 3 && row < height - 5; row++) { + int tr = row - top; + + for (int col = left + 3, tc = 3; col < std::min(left + TS - 3, width - 5); col++, tc++) { + uint16_t hm0 = 0, hm1 = 0; + for (int i = tr - 1; i <= tr + 1; i++) + for (int j = tc - 1; j <= tc + 1; j++) { + hm0 += homo[0][i][j]; + hm1 += homo[1][i][j]; + } + + if (hm0 != hm1) { + int dir = hm1 > hm0; + red[row][col] = rgb[dir][tr][tc][0]; + green[row][col] = rgb[dir][tr][tc][1]; + blue[row][col] = rgb[dir][tr][tc][2]; + } else { + red[row][col] = 0.5f * (rgb[0][tr][tc][0] + rgb[1][tr][tc][0]); + green[row][col] = 0.5f * (rgb[0][tr][tc][1] + rgb[1][tr][tc][1]); + blue[row][col] = 0.5f * (rgb[0][tr][tc][2] + rgb[1][tr][tc][2]); + } + } + } + + if(plistener) { + progresscounter++; + + if(progresscounter % 32 == 0) { +#ifdef _OPENMP + #pragma omp critical (ahdprogress) +#endif + { + progress += (double)32 * ((TS - 32) * (TS - 32)) / (height * width); + progress = progress > 1.0 ? 1.0 : progress; + plistener->setProgress(progress); + } + } + } + + } + } + free (buffer); +} + if(plistener) { + plistener->setProgress (1.0); + } + +} +#undef TS + +} \ No newline at end of file diff --git a/rtengine/demosaic_algos.cc b/rtengine/demosaic_algos.cc index a806268d0..5955c758b 100644 --- a/rtengine/demosaic_algos.cc +++ b/rtengine/demosaic_algos.cc @@ -37,7 +37,6 @@ #include "sleef.c" #include "opthelper.h" #include "median.h" -#define BENCHMARK #include "StopWatch.h" #ifdef _OPENMP #include @@ -1221,7 +1220,7 @@ void RawImageSource::lmmse_interpolate_omp(int winw, int winh, array2D &r // apply low pass filter on differential colors #ifdef _OPENMP - #pragma omp for + #pragma omp for #endif for (int rr = 4; rr < rr1 - 4; rr++) @@ -1447,7 +1446,7 @@ void RawImageSource::lmmse_interpolate_omp(int winw, int winh, array2D &r // interpolate R/B at B/R location #ifdef _OPENMP - #pragma omp for + #pragma omp for #endif for (int rr = 1; rr < rr1 - 1; rr++) @@ -2328,208 +2327,6 @@ void RawImageSource::igv_interpolate(int winw, int winh) } #endif - -/* - Adaptive Homogeneity-Directed interpolation is based on - the work of Keigo Hirakawa, Thomas Parks, and Paul Lee. - Optimized for speed and reduced memory usage 2018 Ingo Weyrich - */ - -#define TS 144 -void RawImageSource::ahd_demosaic() -{ - BENCHFUN - - constexpr int dir[4] = { -1, 1, -TS, TS }; - float xyz_cam[3][3]; - LUTf cbrt(65536); - - int width = W, height = H; - - constexpr double xyz_rgb[3][3] = { /* XYZ from RGB */ - { 0.412453, 0.357580, 0.180423 }, - { 0.212671, 0.715160, 0.072169 }, - { 0.019334, 0.119193, 0.950227 } - }; - - constexpr float d65_white[3] = { 0.950456, 1, 1.088754 }; - - volatile double progress = 0.0; - if (plistener) { - plistener->setProgressStr (Glib::ustring::compose(M("TP_RAW_DMETHOD_PROGRESSBAR"), RAWParams::BayerSensor::getMethodString(RAWParams::BayerSensor::Method::AHD))); - plistener->setProgress (0.0); - } - - for (int i = 0; i < 0x10000; i++) { - double r = (double)i / 65535.0; - cbrt[i] = r > 0.008856 ? std::cbrt(r) : 7.787 * r + 16 / 116.0; - } - - for (int i = 0; i < 3; i++) - for (unsigned int j = 0; j < 3; j++) { - xyz_cam[i][j] = 0; - for (int k = 0; k < 3; k++) { - xyz_cam[i][j] += xyz_rgb[i][k] * imatrices.rgb_cam[k][j] / d65_white[i]; - } - } - - border_interpolate2(W, H, 5, rawData, red, green, blue); - -#ifdef _OPENMP -#pragma omp parallel -#endif -{ - int progresscounter = 0; - float (*pix), (*rix)[3]; - float ldiff[2][4], abdiff[2][4]; - float (*lix)[3]; - char *buffer = (char *) malloc (12 * TS * TS * sizeof(float) + 2 * TS * TS * sizeof(uint16_t)); /* 1053 kB per core */ - float (*rgb)[TS][TS][3] = (float(*)[TS][TS][3]) buffer; - float (*lab)[TS][TS][3] = (float(*)[TS][TS][3])(buffer + 6 * TS * TS * sizeof(float)); - uint16_t (*homo)[TS][TS] = (uint16_t(*)[TS][TS])(buffer + 12 * TS * TS * sizeof(float)); - -#ifdef _OPENMP - #pragma omp for collapse(2) schedule(dynamic) nowait -#endif - for (int top = 2; top < height - 5; top += TS - 6) { - for (int left = 2; left < width - 5; left += TS - 6) { - // Interpolate green horizontally and vertically: - for (int row = top; row < top + TS && row < height - 2; row++) { - for (int col = left + (FC(row, left) & 1); col < std::min(left + TS, width - 2); col += 2) { - pix = &(rawData[row][col]); - float val0 = 0.25f * ((pix[-1] + pix[0] + pix[1]) * 2 - - pix[-2] - pix[2]) ; - rgb[0][row - top][col - left][1] = median(val0, pix[-1], pix[1]); - float val1 = 0.25f * ((pix[-width] + pix[0] + pix[width]) * 2 - - pix[-2 * width] - pix[2 * width]) ; - rgb[1][row - top][col - left][1] = median(val1, pix[-width], pix[width]); - } - } - - // Interpolate red and blue, and convert to CIELab: - for (int d = 0; d < 2; d++) - for (int row = top + 1; row < top + TS - 1 && row < height - 3; row++) { - int cng = FC(row + 1, FC(row + 1, 0) & 1); - for (int col = left + 1; col < std::min(left + TS - 1, width - 3); col++) { - pix = &(rawData[row][col]); - rix = &rgb[d][row - top][col - left]; - lix = &lab[d][row - top][col - left]; - if (FC(row, col) == 1) { - rix[0][2 - cng] = CLIP(pix[0] + (0.5f * (pix[-1] + pix[1] - - rix[-1][1] - rix[1][1] ) )); - rix[0][cng] = CLIP(pix[0] + (0.5f * (pix[-width] + pix[width] - - rix[-TS][1] - rix[TS][1]))); - rix[0][1] = pix[0]; - } else { - rix[0][cng] = CLIP(rix[0][1] + (0.25f * (pix[-width - 1] + pix[-width + 1] - + pix[+width - 1] + pix[+width + 1] - - rix[-TS - 1][1] - rix[-TS + 1][1] - - rix[+TS - 1][1] - rix[+TS + 1][1]))); - rix[0][2 - cng] = pix[0]; - } - float xyz0 = 0.f; - float xyz1 = 0.f; - float xyz2 = 0.f; - - for(unsigned int c = 0; c < 3; ++c) { - xyz0 += xyz_cam[0][c] * rix[0][c]; - xyz1 += xyz_cam[1][c] * rix[0][c]; - xyz2 += xyz_cam[2][c] * rix[0][c]; - } - - xyz0 = cbrt[xyz0]; - xyz1 = cbrt[xyz1]; - xyz2 = cbrt[xyz2]; - - lix[0][0] = 116.f * xyz1 - 16.f; - lix[0][1] = 500.f * (xyz0 - xyz1); - lix[0][2] = 200.f * (xyz1 - xyz2); - } - } - - // Build homogeneity maps from the CIELab images: - - for (int row = top + 2; row < top + TS - 2 && row < height - 4; row++) { - int tr = row - top; - - for (int col = left + 2, tc = 2; col < left + TS - 2 && col < width - 4; col++, tc++) { - for (int d = 0; d < 2; d++) { - lix = &lab[d][tr][tc]; - - for (int i = 0; i < 4; i++) { - ldiff[d][i] = std::fabs(lix[0][0] - lix[dir[i]][0]); - abdiff[d][i] = SQR(lix[0][1] - lix[dir[i]][1]) - + SQR(lix[0][2] - lix[dir[i]][2]); - } - } - - float leps = min(max(ldiff[0][0], ldiff[0][1]), - max(ldiff[1][2], ldiff[1][3])); - float abeps = min(max(abdiff[0][0], abdiff[0][1]), - max(abdiff[1][2], abdiff[1][3])); - - for (int d = 0; d < 2; d++) { - homo[d][tr][tc] = 0; - for (int i = 0; i < 4; i++) { - if (ldiff[d][i] <= leps && abdiff[d][i] <= abeps) { - homo[d][tr][tc]++; - } - } - } - } - } - - // Combine the most homogenous pixels for the final result: - for (int row = top + 3; row < top + TS - 3 && row < height - 5; row++) { - int tr = row - top; - - for (int col = left + 3, tc = 3; col < std::min(left + TS - 3, width - 5); col++, tc++) { - uint16_t hm0 = 0, hm1 = 0; - for (int i = tr - 1; i <= tr + 1; i++) - for (int j = tc - 1; j <= tc + 1; j++) { - hm0 += homo[0][i][j]; - hm1 += homo[1][i][j]; - } - - if (hm0 != hm1) { - int dir = hm1 > hm0; - red[row][col] = rgb[dir][tr][tc][0]; - green[row][col] = rgb[dir][tr][tc][1]; - blue[row][col] = rgb[dir][tr][tc][2]; - } else { - red[row][col] = 0.5f * (rgb[0][tr][tc][0] + rgb[1][tr][tc][0]); - green[row][col] = 0.5f * (rgb[0][tr][tc][1] + rgb[1][tr][tc][1]); - blue[row][col] = 0.5f * (rgb[0][tr][tc][2] + rgb[1][tr][tc][2]); - } - } - } - - if(plistener) { - progresscounter++; - - if(progresscounter % 32 == 0) { -#ifdef _OPENMP - #pragma omp critical (ahdprogress) -#endif - { - progress += (double)32 * ((TS - 32) * (TS - 32)) / (height * width); - progress = progress > 1.0 ? 1.0 : progress; - plistener->setProgress(progress); - } - } - } - - } - } - free (buffer); -} - if(plistener) { - plistener->setProgress (1.0); - } - -} -#undef TS - void RawImageSource::nodemosaic(bool bw) { red(W, H); From 7b883f054fdde2e1a667cda0012ebe508327a88a Mon Sep 17 00:00:00 2001 From: heckflosse Date: Thu, 2 Aug 2018 16:14:57 +0200 Subject: [PATCH 17/28] ahd demosaic: further 10% speedup --- rtengine/ahd_demosaic_RT.cc | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/rtengine/ahd_demosaic_RT.cc b/rtengine/ahd_demosaic_RT.cc index f394fbfc7..75e3af970 100644 --- a/rtengine/ahd_demosaic_RT.cc +++ b/rtengine/ahd_demosaic_RT.cc @@ -28,6 +28,7 @@ #include "rt_math.h" #include "../rtgui/multilangmgr.h" #include "median.h" +#define BENCHMARK #include "StopWatch.h" namespace rtengine @@ -168,9 +169,7 @@ void RawImageSource::ahd_demosaic() for (int d = 0; d < 2; d++) { homo[d][tr][tc] = 0; for (int i = 0; i < 4; i++) { - if (ldiff[d][i] <= leps && abdiff[d][i] <= abeps) { - homo[d][tr][tc]++; - } + homo[d][tr][tc] += ((ldiff[d][i] <= leps) * (abdiff[d][i] <= abeps)); } } } From 7f1d6d67bc9bbc521de39f5990bfc60b19dc249e Mon Sep 17 00:00:00 2001 From: heckflosse Date: Fri, 3 Aug 2018 17:43:37 +0200 Subject: [PATCH 18/28] ahd demosaic review changes --- rtengine/ahd_demosaic_RT.cc | 67 ++++++++++++++++++------------------- rtengine/demosaic_algos.cc | 35 ------------------- rtengine/rawimagesource.h | 1 - 3 files changed, 32 insertions(+), 71 deletions(-) diff --git a/rtengine/ahd_demosaic_RT.cc b/rtengine/ahd_demosaic_RT.cc index 75e3af970..a25ca1363 100644 --- a/rtengine/ahd_demosaic_RT.cc +++ b/rtengine/ahd_demosaic_RT.cc @@ -23,6 +23,7 @@ // Optimized for speed and reduced memory usage 2018 Ingo Weyrich // +#include #include "rtengine.h" #include "rawimagesource.h" #include "rt_math.h" @@ -52,14 +53,14 @@ void RawImageSource::ahd_demosaic() constexpr float d65_white[3] = { 0.950456, 1, 1.088754 }; - volatile double progress = 0.0; + double progress = 0.0; if (plistener) { plistener->setProgressStr (Glib::ustring::compose(M("TP_RAW_DMETHOD_PROGRESSBAR"), RAWParams::BayerSensor::getMethodString(RAWParams::BayerSensor::Method::AHD))); plistener->setProgress (0.0); } - for (int i = 0; i < 0x10000; i++) { - double r = (double)i / 65535.0; + for (int i = 0; i < 65536; i++) { + const double r = i / 65535.0; cbrt[i] = r > 0.008856 ? std::cbrt(r) : 7.787 * r + 16 / 116.0; } @@ -78,13 +79,10 @@ void RawImageSource::ahd_demosaic() #endif { int progresscounter = 0; - float (*pix), (*rix)[3]; - float ldiff[2][4], abdiff[2][4]; - float (*lix)[3]; - char *buffer = (char *) malloc (12 * TS * TS * sizeof(float) + 2 * TS * TS * sizeof(uint16_t)); /* 1053 kB per core */ - float (*rgb)[TS][TS][3] = (float(*)[TS][TS][3]) buffer; - float (*lab)[TS][TS][3] = (float(*)[TS][TS][3])(buffer + 6 * TS * TS * sizeof(float)); - uint16_t (*homo)[TS][TS] = (uint16_t(*)[TS][TS])(buffer + 12 * TS * TS * sizeof(float)); + float *buffer = new float[13 * TS * TS]; /* 1053 kB per core */ + auto rgb = (float(*)[TS][TS][3]) buffer; + auto lab = (float(*)[TS][TS][3])(buffer + 6 * TS * TS); + auto homo = (uint16_t(*)[TS][TS])(buffer + 12 * TS * TS); #ifdef _OPENMP #pragma omp for collapse(2) schedule(dynamic) nowait @@ -94,7 +92,7 @@ void RawImageSource::ahd_demosaic() // Interpolate green horizontally and vertically: for (int row = top; row < top + TS && row < height - 2; row++) { for (int col = left + (FC(row, left) & 1); col < std::min(left + TS, width - 2); col += 2) { - pix = &(rawData[row][col]); + auto pix = &rawData[row][col]; float val0 = 0.25f * ((pix[-1] + pix[0] + pix[1]) * 2 - pix[-2] - pix[2]) ; rgb[0][row - top][col - left][1] = median(val0, pix[-1], pix[1]); @@ -109,9 +107,9 @@ void RawImageSource::ahd_demosaic() for (int row = top + 1; row < top + TS - 1 && row < height - 3; row++) { int cng = FC(row + 1, FC(row + 1, 0) & 1); for (int col = left + 1; col < std::min(left + TS - 1, width - 3); col++) { - pix = &(rawData[row][col]); - rix = &rgb[d][row - top][col - left]; - lix = &lab[d][row - top][col - left]; + auto pix = &rawData[row][col]; + auto rix = &rgb[d][row - top][col - left]; + auto lix = lab[d][row - top][col - left]; if (FC(row, col) == 1) { rix[0][2 - cng] = CLIP(pix[0] + (0.5f * (pix[-1] + pix[1] - rix[-1][1] - rix[1][1] ) )); @@ -125,23 +123,21 @@ void RawImageSource::ahd_demosaic() - rix[+TS - 1][1] - rix[+TS + 1][1]))); rix[0][2 - cng] = pix[0]; } - float xyz0 = 0.f; - float xyz1 = 0.f; - float xyz2 = 0.f; + float xyz[3] = {}; for(unsigned int c = 0; c < 3; ++c) { - xyz0 += xyz_cam[0][c] * rix[0][c]; - xyz1 += xyz_cam[1][c] * rix[0][c]; - xyz2 += xyz_cam[2][c] * rix[0][c]; + xyz[0] += xyz_cam[0][c] * rix[0][c]; + xyz[1] += xyz_cam[1][c] * rix[0][c]; + xyz[2] += xyz_cam[2][c] * rix[0][c]; } - xyz0 = cbrt[xyz0]; - xyz1 = cbrt[xyz1]; - xyz2 = cbrt[xyz2]; + xyz[0] = cbrt[xyz[0]]; + xyz[1] = cbrt[xyz[1]]; + xyz[2] = cbrt[xyz[2]]; - lix[0][0] = 116.f * xyz1 - 16.f; - lix[0][1] = 500.f * (xyz0 - xyz1); - lix[0][2] = 200.f * (xyz1 - xyz2); + lix[0] = 116.f * xyz[1] - 16.f; + lix[1] = 500.f * (xyz[0] - xyz[1]); + lix[2] = 200.f * (xyz[1] - xyz[2]); } } @@ -149,10 +145,11 @@ void RawImageSource::ahd_demosaic() for (int row = top + 2; row < top + TS - 2 && row < height - 4; row++) { int tr = row - top; + float ldiff[2][4], abdiff[2][4]; for (int col = left + 2, tc = 2; col < left + TS - 2 && col < width - 4; col++, tc++) { for (int d = 0; d < 2; d++) { - lix = &lab[d][tr][tc]; + auto lix = &lab[d][tr][tc]; for (int i = 0; i < 4; i++) { ldiff[d][i] = std::fabs(lix[0][0] - lix[dir[i]][0]); @@ -161,15 +158,15 @@ void RawImageSource::ahd_demosaic() } } - float leps = min(max(ldiff[0][0], ldiff[0][1]), - max(ldiff[1][2], ldiff[1][3])); - float abeps = min(max(abdiff[0][0], abdiff[0][1]), - max(abdiff[1][2], abdiff[1][3])); + float leps = std::min(std::max(ldiff[0][0], ldiff[0][1]), + std::max(ldiff[1][2], ldiff[1][3])); + float abeps = std::min(std::max(abdiff[0][0], abdiff[0][1]), + std::max(abdiff[1][2], abdiff[1][3])); for (int d = 0; d < 2; d++) { homo[d][tr][tc] = 0; for (int i = 0; i < 4; i++) { - homo[d][tr][tc] += ((ldiff[d][i] <= leps) * (abdiff[d][i] <= abeps)); + homo[d][tr][tc] += (ldiff[d][i] <= leps) * (abdiff[d][i] <= abeps); } } } @@ -208,8 +205,8 @@ void RawImageSource::ahd_demosaic() #pragma omp critical (ahdprogress) #endif { - progress += (double)32 * ((TS - 32) * (TS - 32)) / (height * width); - progress = progress > 1.0 ? 1.0 : progress; + progress += 32.0 * SQR(TS - 32) / (height * width); + progress = std::min(progress, 1.0); plistener->setProgress(progress); } } @@ -217,7 +214,7 @@ void RawImageSource::ahd_demosaic() } } - free (buffer); + delete [] buffer; } if(plistener) { plistener->setProgress (1.0); diff --git a/rtengine/demosaic_algos.cc b/rtengine/demosaic_algos.cc index 5955c758b..78b5490b5 100644 --- a/rtengine/demosaic_algos.cc +++ b/rtengine/demosaic_algos.cc @@ -682,41 +682,6 @@ void RawImageSource::ppg_demosaic() free (image); } -void RawImageSource::border_interpolate(unsigned int border, float (*image)[3], unsigned int start, unsigned int end) -{ - unsigned row, col, y, x, f; - float sum[8]; - unsigned int width = W, height = H; - unsigned int colors = 3; - - if (end == 0 ) { - end = H; - } - - for (row = start; row < end; row++) - for (col = 0; col < width; col++) { - if (col == border && row >= border && row < height - border) { - col = width - border; - } - - memset (sum, 0, sizeof sum); - - for (y = row - 1; y != row + 2; y++) - for (x = col - 1; x != col + 2; x++) - if (y < height && x < width) { - f = fc(y, x); - sum[f] += image[y * width + x][f]; - sum[f + 4]++; - } - - f = fc(row, col); - - FORCC if (c != f && sum[c + 4]) { - image[row * width + col][c] = sum[c] / sum[c + 4]; - } - } -} - void RawImageSource::border_interpolate(unsigned int border, float (*image)[4], unsigned int start, unsigned int end) { unsigned row, col, y, x, f; diff --git a/rtengine/rawimagesource.h b/rtengine/rawimagesource.h index aff7f4445..53d3e0dc1 100644 --- a/rtengine/rawimagesource.h +++ b/rtengine/rawimagesource.h @@ -273,7 +273,6 @@ protected: void dcb_demosaic(int iterations, bool dcb_enhance); void ahd_demosaic(); void rcd_demosaic(); - void border_interpolate(unsigned int border, float (*image)[3], unsigned int start = 0, unsigned int end = 0); void border_interpolate(unsigned int border, float (*image)[4], unsigned int start = 0, unsigned int end = 0); void border_interpolate2(int winw, int winh, int lborders, const array2D &rawData, array2D &red, array2D &green, array2D &blue); void dcb_initTileLimits(int &colMin, int &rowMin, int &colMax, int &rowMax, int x0, int y0, int border); From 9ced597a18e1acb55a1b93b573884af81ec9af39 Mon Sep 17 00:00:00 2001 From: Morgan Hardwood Date: Sat, 4 Aug 2018 00:17:27 +0200 Subject: [PATCH 19/28] Makes Preferences window scrollable - The Preferences window is now scrollable. - Cleanup of arcane variable names and obsolete comments. - Issue #4581 --- rtgui/preferences.cc | 202 +++++++++++++++++++++---------------------- rtgui/preferences.h | 25 ++++-- 2 files changed, 114 insertions(+), 113 deletions(-) diff --git a/rtgui/preferences.cc b/rtgui/preferences.cc index 086592822..48e3b865a 100644 --- a/rtgui/preferences.cc +++ b/rtgui/preferences.cc @@ -49,13 +49,6 @@ Preferences::Preferences (RTWindow *rtwindow) moptions.copyFrom (&options); - /* - * Do not increase height, since it's not visible on e.g. smaller netbook - * screens. The default height is about 620 pixels currently, that's why - * we do not set the height anymore. Netbook users will most certainly set - * a smaller font, so they'll be able to shrink the Preferences window and - * close it. - */ set_size_request (650, -1); set_default_size (options.preferencesWidth, options.preferencesHeight); @@ -69,9 +62,9 @@ Preferences::Preferences (RTWindow *rtwindow) mainBox->set_spacing (8); #endif //GTK318 - //set_has_separator (false); Gtk::Notebook* nb = Gtk::manage (new Gtk::Notebook ()); + nb->set_scrollable(true); nb->set_name ("PrefNotebook"); mainBox->pack_start (*nb); @@ -87,16 +80,16 @@ Preferences::Preferences (RTWindow *rtwindow) get_action_area()->pack_end (*ok); get_action_area()->pack_end (*cancel); - nb->append_page (*getGeneralPanel(), M ("PREFERENCES_TAB_GENERAL")); - nb->append_page (*getProcParamsPanel(), M ("PREFERENCES_TAB_IMPROC")); - nb->append_page (*getDynProfilePanel(), M ("PREFERENCES_TAB_DYNAMICPROFILE")); - nb->append_page (*getFileBrowserPanel(), M ("PREFERENCES_TAB_BROWSER")); - nb->append_page (*getColorManagementPanel(), M ("PREFERENCES_TAB_COLORMGR")); - nb->append_page (*getBatchProcPanel(), M ("PREFERENCES_BATCH_PROCESSING")); - nb->append_page (*getPerformancePanel(), M ("PREFERENCES_TAB_PERFORMANCE")); + nb->append_page(*getGeneralPanel(), M("PREFERENCES_TAB_GENERAL")); + nb->append_page(*getImageProcessingPanel(), M("PREFERENCES_TAB_IMPROC")); + nb->append_page(*getDynamicProfilePanel(), M("PREFERENCES_TAB_DYNAMICPROFILE")); + nb->append_page(*getFileBrowserPanel(), M("PREFERENCES_TAB_BROWSER")); + nb->append_page(*getColorManPanel(), M("PREFERENCES_TAB_COLORMGR")); + nb->append_page(*getBatchProcPanel(), M("PREFERENCES_BATCH_PROCESSING")); + nb->append_page(*getPerformancePanel(), M("PREFERENCES_TAB_PERFORMANCE")); // Sounds only on Windows and Linux #if defined(WIN32) || defined(__linux__) - nb->append_page (*getSoundPanel(), M ("PREFERENCES_TAB_SOUND")); + nb->append_page(*getSoundsPanel(), M("PREFERENCES_TAB_SOUND")); #endif nb->set_current_page (0); @@ -131,8 +124,10 @@ int Preferences::getThemeRowNumber (Glib::ustring& longThemeFName) Gtk::Widget* Preferences::getBatchProcPanel () { + swBatchProc = Gtk::manage(new Gtk::ScrolledWindow()); + swBatchProc->set_policy(Gtk::POLICY_AUTOMATIC, Gtk::POLICY_AUTOMATIC); - Gtk::VBox* mvbpp = Gtk::manage (new Gtk::VBox ()); + Gtk::VBox* vbBatchProc = Gtk::manage (new Gtk::VBox ()); Gtk::ScrolledWindow* behscrollw = Gtk::manage (new Gtk::ScrolledWindow ()); behscrollw->set_policy (Gtk::POLICY_AUTOMATIC, Gtk::POLICY_AUTOMATIC); @@ -141,8 +136,7 @@ Gtk::Widget* Preferences::getBatchProcPanel () vbbeh->pack_start (*behscrollw, Gtk::PACK_EXPAND_WIDGET); Gtk::Frame* behFrame = Gtk::manage (new Gtk::Frame (M ("PREFERENCES_BEHAVIOR"))); behFrame->add (*vbbeh); - //mvbpp->pack_start (*behFrame); - mvbpp->pack_start (*behFrame, Gtk::PACK_EXPAND_WIDGET, 4); + vbBatchProc->pack_start (*behFrame, Gtk::PACK_EXPAND_WIDGET, 4); Gtk::TreeView* behTreeView = Gtk::manage (new Gtk::TreeView ()); behscrollw->add (*behTreeView); @@ -239,7 +233,6 @@ Gtk::Widget* Preferences::getBatchProcPanel () appendBehavList(mi, M("TP_LOCALCONTRAST_AMOUNT"), ADDSET_LOCALCONTRAST_AMOUNT, false); appendBehavList(mi, M("TP_LOCALCONTRAST_DARKNESS"), ADDSET_LOCALCONTRAST_DARKNESS, false); appendBehavList(mi, M("TP_LOCALCONTRAST_LIGHTNESS"), ADDSET_LOCALCONTRAST_LIGHTNESS, false); - mi = behModel->append (); mi->set_value (behavColumns.label, M ("TP_SHARPENEDGE_LABEL")); @@ -254,7 +247,6 @@ Gtk::Widget* Preferences::getBatchProcPanel () mi = behModel->append (); mi->set_value (behavColumns.label, M ("TP_DIRPYRDENOISE_LABEL")); - //appendBehavList (mi, M("TP_DIRPYRDENOISE_LUMA")+", "+M("TP_DIRPYRDENOISE_CHROMA"), ADDSET_DIRPYRDN_CHLUM, true); appendBehavList (mi, M ("TP_DIRPYRDENOISE_LUMINANCE_SMOOTHING"), ADDSET_DIRPYRDN_LUMA, true); appendBehavList (mi, M ("TP_DIRPYRDENOISE_LUMINANCE_DETAIL"), ADDSET_DIRPYRDN_LUMDET, true); appendBehavList (mi, M ("TP_DIRPYRDENOISE_CHROMINANCE_MASTER"), ADDSET_DIRPYRDN_CHROMA, true); @@ -435,15 +427,15 @@ Gtk::Widget* Preferences::getBatchProcPanel () behSetAll->signal_clicked().connect ( sigc::mem_fun (*this, &Preferences::behSetAllPressed) ); Gtk::HBox* buttonpanel1 = Gtk::manage (new Gtk::HBox ()); - //buttonpanel1->set_spacing(8); buttonpanel1->pack_end (*behSetAll, Gtk::PACK_SHRINK, 4); buttonpanel1->pack_end (*behAddAll, Gtk::PACK_SHRINK, 4); vbbeh->pack_start (*buttonpanel1, Gtk::PACK_SHRINK, 4); chOverwriteOutputFile = Gtk::manage ( new Gtk::CheckButton (M ("PREFERENCES_OVERWRITEOUTPUTFILE")) ); - mvbpp->pack_start (*chOverwriteOutputFile, Gtk::PACK_SHRINK, 4); + vbBatchProc->pack_start (*chOverwriteOutputFile, Gtk::PACK_SHRINK, 4); - return mvbpp; + swBatchProc->add(*vbBatchProc); + return swBatchProc; } void Preferences::appendBehavList (Gtk::TreeModel::iterator& parent, Glib::ustring label, int id, bool set) @@ -475,17 +467,24 @@ void Preferences::behSetRadioToggled (const Glib::ustring& path) } -Gtk::Widget *Preferences::getDynProfilePanel() +Gtk::Widget *Preferences::getDynamicProfilePanel() { + swDynamicProfile = Gtk::manage(new Gtk::ScrolledWindow()); + swDynamicProfile->set_policy(Gtk::POLICY_AUTOMATIC, Gtk::POLICY_AUTOMATIC); + dynProfilePanel = Gtk::manage (new DynamicProfilePanel()); - return dynProfilePanel; + + swDynamicProfile->add(*dynProfilePanel); + return swDynamicProfile; } -Gtk::Widget* Preferences::getProcParamsPanel () +Gtk::Widget* Preferences::getImageProcessingPanel () { + swImageProcessing = Gtk::manage(new Gtk::ScrolledWindow()); + swImageProcessing->set_policy(Gtk::POLICY_AUTOMATIC, Gtk::POLICY_AUTOMATIC); - Gtk::VBox* mvbpp = Gtk::manage (new Gtk::VBox ()); + Gtk::VBox* vbImageProcessing = Gtk::manage (new Gtk::VBox ()); Gtk::Frame* fpp = Gtk::manage (new Gtk::Frame (M ("PREFERENCES_IMPROCPARAMS"))); Gtk::VBox* vbpp = Gtk::manage (new Gtk::VBox ()); @@ -512,7 +511,7 @@ Gtk::Widget* Preferences::getProcParamsPanel () bpconn = useBundledProfiles->signal_clicked().connect ( sigc::mem_fun (*this, &Preferences::bundledProfilesChanged) ); vbpp->pack_start (*useBundledProfiles, Gtk::PACK_SHRINK, 4); fpp->add (*vbpp); - mvbpp->pack_start (*fpp, Gtk::PACK_SHRINK, 4); + vbImageProcessing->pack_start (*fpp, Gtk::PACK_SHRINK, 4); // Custom profile builder box Gtk::Frame* cpfrm = Gtk::manage ( new Gtk::Frame (M ("PREFERENCES_CUSTPROFBUILD")) ); @@ -530,7 +529,7 @@ Gtk::Widget* Preferences::getProcParamsPanel () cpbt->attach (*cpltypelab, 0, 1, 1, 2, Gtk::FILL, Gtk::SHRINK, 2, 2); cpbt->attach (*custProfBuilderLabelType, 1, 2, 1, 2, Gtk::EXPAND | Gtk::FILL | Gtk::SHRINK, Gtk::SHRINK, 2, 2); cpfrm->add (*cpbt); - mvbpp->pack_start (*cpfrm, Gtk::PACK_SHRINK, 4); + vbImageProcessing->pack_start (*cpfrm, Gtk::PACK_SHRINK, 4); Gtk::Frame* fdp = Gtk::manage (new Gtk::Frame (M ("PREFERENCES_PROFILEHANDLING"))); Gtk::Table* vbdp = Gtk::manage (new Gtk::Table (2, 2)); @@ -548,7 +547,7 @@ Gtk::Widget* Preferences::getProcParamsPanel () vbdp->attach (*lplab, 0, 1, 1, 2, Gtk::FILL, Gtk::SHRINK, 2, 2); vbdp->attach (*loadParamsPreference, 1, 2, 1, 2, Gtk::EXPAND | Gtk::FILL | Gtk::SHRINK, Gtk::SHRINK, 2, 2); fdp->add (*vbdp); - mvbpp->pack_start (*fdp, Gtk::PACK_SHRINK, 4); + vbImageProcessing->pack_start (*fdp, Gtk::PACK_SHRINK, 4); // Directories Gtk::Frame* cdf = Gtk::manage (new Gtk::Frame (M ("PREFERENCES_DIRECTORIES")) ); @@ -566,8 +565,7 @@ Gtk::Widget* Preferences::getProcParamsPanel () 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); + dfconn = darkFrameDir->signal_selection_changed().connect ( sigc::mem_fun (*this, &Preferences::darkFrameChanged)); // FLATFIELD Gtk::Label *ffLab = Gtk::manage (new Gtk::Label (M ("PREFERENCES_FLATFIELDSDIR") + ":")); @@ -581,8 +579,7 @@ Gtk::Widget* Preferences::getProcParamsPanel () 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); + ffconn = flatFieldDir->signal_selection_changed().connect ( sigc::mem_fun (*this, &Preferences::flatFieldChanged)); //Cluts Dir Gtk::Label *clutsDirLabel = Gtk::manage (new Gtk::Label (M ("PREFERENCES_CLUTSDIR") + ":")); @@ -597,7 +594,7 @@ Gtk::Widget* Preferences::getProcParamsPanel () dirgrid->attach_next_to(*clutsRestartNeeded, *clutsDir, Gtk::POS_RIGHT, 1, 1); cdf->add(*dirgrid); - mvbpp->pack_start (*cdf, Gtk::PACK_SHRINK, 4 ); + vbImageProcessing->pack_start (*cdf, Gtk::PACK_SHRINK, 4 ); // Crop Gtk::Frame *cropframe = Gtk::manage(new Gtk::Frame(M("PREFERENCES_CROP"))); @@ -613,15 +610,19 @@ Gtk::Widget* Preferences::getProcParamsPanel () cropAutoFit = Gtk::manage(new Gtk::CheckButton(M("PREFERENCES_CROP_AUTO_FIT"))); cropvb->pack_start(*cropAutoFit); cropframe->add(*cropvb); - mvbpp->pack_start(*cropframe, Gtk::PACK_SHRINK, 4); + vbImageProcessing->pack_start(*cropframe, Gtk::PACK_SHRINK, 4); - return mvbpp; + swImageProcessing->add(*vbImageProcessing); + return swImageProcessing; } Gtk::Widget* Preferences::getPerformancePanel () { - Gtk::VBox* mainContainer = Gtk::manage ( new Gtk::VBox () ); - mainContainer->set_spacing (4); + swPerformance = Gtk::manage(new Gtk::ScrolledWindow()); + swPerformance->set_policy(Gtk::POLICY_AUTOMATIC, Gtk::POLICY_AUTOMATIC); + + Gtk::VBox* vbPerformance = Gtk::manage ( new Gtk::VBox () ); + vbPerformance->set_spacing (4); Gtk::Frame* fprevdemo = Gtk::manage (new Gtk::Frame (M ("PREFERENCES_PREVDEMO"))); Gtk::HBox* hbprevdemo = Gtk::manage (new Gtk::HBox (false, 4)); @@ -633,7 +634,7 @@ Gtk::Widget* Preferences::getPerformancePanel () hbprevdemo->pack_start (*lprevdemo, Gtk::PACK_SHRINK); hbprevdemo->pack_start (*cprevdemo); fprevdemo->add (*hbprevdemo); - mainContainer->pack_start (*fprevdemo, Gtk::PACK_SHRINK, 4); + vbPerformance->pack_start (*fprevdemo, Gtk::PACK_SHRINK, 4); Gtk::Frame* ftiffserialize = Gtk::manage (new Gtk::Frame (M ("PREFERENCES_SERIALIZE_TIFF_READ"))); Gtk::HBox* htiffserialize = Gtk::manage (new Gtk::HBox (false, 4)); @@ -641,7 +642,7 @@ Gtk::Widget* Preferences::getPerformancePanel () ctiffserialize->set_tooltip_text (M ("PREFERENCES_SERIALIZE_TIFF_READ_TOOLTIP")); htiffserialize->pack_start (*ctiffserialize); ftiffserialize->add (*htiffserialize); - mainContainer->pack_start (*ftiffserialize, Gtk::PACK_SHRINK, 4); + vbPerformance->pack_start (*ftiffserialize, Gtk::PACK_SHRINK, 4); Gtk::Frame* fclut = Gtk::manage ( new Gtk::Frame (M ("PREFERENCES_CLUTSCACHE")) ); Gtk::HBox* clutCacheSizeHB = Gtk::manage ( new Gtk::HBox () ); @@ -659,7 +660,7 @@ Gtk::Widget* Preferences::getPerformancePanel () clutCacheSizeHB->pack_start (*CLUTLl, Gtk::PACK_SHRINK, 0); clutCacheSizeHB->pack_end (*clutCacheSizeSB, Gtk::PACK_SHRINK, 0); fclut->add (*clutCacheSizeHB); - mainContainer->pack_start (*fclut, Gtk::PACK_SHRINK, 4); + vbPerformance->pack_start (*fclut, Gtk::PACK_SHRINK, 4); Gtk::Frame* finspect = Gtk::manage ( new Gtk::Frame (M ("PREFERENCES_INSPECT_LABEL")) ); Gtk::HBox* maxIBuffersHB = Gtk::manage ( new Gtk::HBox () ); @@ -686,7 +687,7 @@ Gtk::Widget* Preferences::getPerformancePanel () insphb->pack_start(*thumbnailInspectorMode); inspectorvb->pack_start(*insphb); finspect->add (*inspectorvb); - mainContainer->pack_start (*finspect, Gtk::PACK_SHRINK, 4); + vbPerformance->pack_start (*finspect, Gtk::PACK_SHRINK, 4); Gtk::Frame* fdenoise = Gtk::manage ( new Gtk::Frame (M ("PREFERENCES_NOISE")) ); Gtk::VBox* vbdenoise = Gtk::manage ( new Gtk::VBox (Gtk::PACK_SHRINK, 4) ); @@ -766,16 +767,19 @@ Gtk::Widget* Preferences::getPerformancePanel () // vbdenoise->pack_start (*cbdaubech, Gtk::PACK_SHRINK); // ---> fdenoise->add (*vbdenoise); - mainContainer->pack_start (*fdenoise, Gtk::PACK_SHRINK, 4); + vbPerformance->pack_start (*fdenoise, Gtk::PACK_SHRINK, 4); - return mainContainer; + swPerformance->add(*vbPerformance); + return swPerformance; } -Gtk::Widget* Preferences::getColorManagementPanel () +Gtk::Widget* Preferences::getColorManPanel () { + swColorMan = Gtk::manage(new Gtk::ScrolledWindow()); + swColorMan->set_policy(Gtk::POLICY_AUTOMATIC, Gtk::POLICY_AUTOMATIC); - Gtk::VBox* mvbcm = Gtk::manage (new Gtk::VBox ()); - mvbcm->set_spacing (4); + Gtk::VBox* vbColorMan = Gtk::manage (new Gtk::VBox ()); + vbColorMan->set_spacing (4); iccDir = Gtk::manage (new MyFileChooserButton (M ("PREFERENCES_ICCDIR"), Gtk::FILE_CHOOSER_ACTION_SELECT_FOLDER)); setExpandAlignProperties (iccDir, true, false, Gtk::ALIGN_FILL, Gtk::ALIGN_CENTER); @@ -795,7 +799,7 @@ Gtk::Widget* Preferences::getColorManagementPanel () iccDir->signal_selection_changed ().connect (sigc::mem_fun (this, &Preferences::iccDirChanged)); - mvbcm->pack_start (*iccdgrid, Gtk::PACK_SHRINK); + vbColorMan->pack_start (*iccdgrid, Gtk::PACK_SHRINK); //------------------------- MONITOR ---------------------- @@ -835,11 +839,9 @@ Gtk::Widget* Preferences::getColorManagementPanel () setExpandAlignProperties (monBPC, false, false, Gtk::ALIGN_START, Gtk::ALIGN_CENTER); monBPC->set_active (true); -//#if defined(WIN32) // Auto-detection not implemented for Linux, see issue 851 cbAutoMonProfile = Gtk::manage (new Gtk::CheckButton (M ("PREFERENCES_AUTOMONPROFILE"))); setExpandAlignProperties (cbAutoMonProfile, false, false, Gtk::ALIGN_START, Gtk::ALIGN_CENTER); autoMonProfileConn = cbAutoMonProfile->signal_toggled().connect (sigc::mem_fun (*this, &Preferences::autoMonProfileToggled)); -//#endif int row = 0; gmonitor->attach (*mplabel, 0, row, 1, 1); @@ -851,22 +853,18 @@ Gtk::Widget* Preferences::getColorManagementPanel () gmonitor->attach (*monProfile, 1, row, 1, 1); #endif ++row; -//#if defined(WIN32) gmonitor->attach (*cbAutoMonProfile, 1, row, 1, 1); ++row; -//#endif gmonitor->attach (*milabel, 0, row, 1, 1); gmonitor->attach (*monIntent, 1, row, 1, 1); ++row; gmonitor->attach (*monBPC, 0, row, 2, 1); -//#if defined(WIN32) autoMonProfileToggled(); -//#endif fmonitor->add (*gmonitor); - mvbcm->pack_start (*fmonitor, Gtk::PACK_SHRINK); + vbColorMan->pack_start (*fmonitor, Gtk::PACK_SHRINK); //------------------------- PRINTER ---------------------- @@ -911,23 +909,24 @@ Gtk::Widget* Preferences::getColorManagementPanel () ++row; gprinter->attach (*prtBPC, 0, row, 2, 1); -//#if defined(WIN32) autoMonProfileToggled(); -//#endif fprinter->add (*gprinter); - mvbcm->pack_start (*fprinter, Gtk::PACK_SHRINK); + vbColorMan->pack_start (*fprinter, Gtk::PACK_SHRINK); - return mvbcm; + swColorMan->add(*vbColorMan); + return swColorMan; } Gtk::Widget* Preferences::getGeneralPanel () { + swGeneral = Gtk::manage(new Gtk::ScrolledWindow()); + swGeneral->set_policy(Gtk::POLICY_AUTOMATIC, Gtk::POLICY_AUTOMATIC); - Gtk::Grid* mvbsd = Gtk::manage ( new Gtk::Grid () ); - mvbsd->set_column_spacing (4); - mvbsd->set_row_spacing (4); + Gtk::Grid* vbGeneral = Gtk::manage ( new Gtk::Grid () ); + vbGeneral->set_column_spacing (4); + vbGeneral->set_row_spacing (4); Gtk::Frame* fworklflow = Gtk::manage (new Gtk::Frame (M ("PREFERENCES_WORKFLOW"))); setExpandAlignProperties (fworklflow, true, false, Gtk::ALIGN_FILL, Gtk::ALIGN_START); @@ -1010,7 +1009,7 @@ Gtk::Widget* Preferences::getGeneralPanel () fworklflow->add (*workflowGrid); - mvbsd->attach_next_to (*fworklflow, Gtk::POS_TOP, 2, 1); + vbGeneral->attach_next_to (*fworklflow, Gtk::POS_TOP, 2, 1); // --------------------------------------------- @@ -1045,7 +1044,7 @@ Gtk::Widget* Preferences::getGeneralPanel () langGrid->attach_next_to (*languages, *langlab, Gtk::POS_RIGHT, 1, 1); langGrid->attach_next_to (*langw, *languages, Gtk::POS_RIGHT, 1, 1); flang->add (*langGrid); - mvbsd->attach_next_to (*flang, *fworklflow, Gtk::POS_BOTTOM, 2, 1); + vbGeneral->attach_next_to (*flang, *fworklflow, Gtk::POS_BOTTOM, 2, 1); // --------------------------------------------- @@ -1118,7 +1117,7 @@ Gtk::Widget* Preferences::getGeneralPanel () themeGrid->attach_next_to (*butNavGuideCol, *navGuideLabel, Gtk::POS_RIGHT, 1, 1); ftheme->add (*themeGrid); - mvbsd->attach_next_to (*ftheme, *flang, Gtk::POS_BOTTOM, 2, 1); + vbGeneral->attach_next_to (*ftheme, *flang, Gtk::POS_BOTTOM, 2, 1); // --------------------------------------------- @@ -1151,7 +1150,7 @@ Gtk::Widget* Preferences::getGeneralPanel () clipGrid->attach_next_to (*shThresh, *shl, Gtk::POS_RIGHT, 1, 1); fclip->add (*clipGrid); - mvbsd->attach_next_to (*fclip, *ftheme, Gtk::POS_BOTTOM, 1, 1); + vbGeneral->attach_next_to (*fclip, *ftheme, Gtk::POS_BOTTOM, 1, 1); // --------------------------------------------- @@ -1179,7 +1178,7 @@ Gtk::Widget* Preferences::getGeneralPanel () navigationGrid->attach_next_to (*rememberZoomPanCheckbutton, *panFactorLabel, Gtk::POS_BOTTOM, 2, 1); fnav->add (*navigationGrid); - mvbsd->attach_next_to (*fnav, *fclip, Gtk::POS_RIGHT, 1, 1); + vbGeneral->attach_next_to (*fnav, *fclip, Gtk::POS_RIGHT, 1, 1); // --------------------------------------------- @@ -1242,20 +1241,23 @@ Gtk::Widget* Preferences::getGeneralPanel () #endif fdg->add (*externaleditorGrid); - mvbsd->attach_next_to (*fdg, *fclip, Gtk::POS_BOTTOM, 2, 1); + vbGeneral->attach_next_to (*fdg, *fclip, Gtk::POS_BOTTOM, 2, 1); langAutoDetectConn = ckbLangAutoDetect->signal_toggled().connect (sigc::mem_fun (*this, &Preferences::langAutoDetectToggled)); tconn = theme->signal_changed().connect ( sigc::mem_fun (*this, &Preferences::themeChanged) ); fconn = fontButton->signal_font_set().connect ( sigc::mem_fun (*this, &Preferences::fontChanged) ); cpfconn = colorPickerFontButton->signal_font_set().connect ( sigc::mem_fun (*this, &Preferences::cpFontChanged) ); - return mvbsd; + swGeneral->add(*vbGeneral); + return swGeneral; } Gtk::Widget* Preferences::getFileBrowserPanel () { + swFileBrowser = Gtk::manage(new Gtk::ScrolledWindow()); + swFileBrowser->set_policy(Gtk::POLICY_AUTOMATIC, Gtk::POLICY_AUTOMATIC); - Gtk::VBox* mvbfb = Gtk::manage ( new Gtk::VBox () ); + Gtk::VBox* vbFileBrowser = Gtk::manage ( new Gtk::VBox () ); Gtk::Frame* fsd = Gtk::manage ( new Gtk::Frame (M ("PREFERENCES_STARTUPIMDIR")) ); @@ -1284,7 +1286,7 @@ Gtk::Widget* Preferences::getFileBrowserPanel () vbsd->pack_start (*otherbox, Gtk::PACK_SHRINK, 0); fsd->add (*vbsd); - mvbfb->pack_start (*fsd, Gtk::PACK_SHRINK, 4); + vbFileBrowser->pack_start (*fsd, Gtk::PACK_SHRINK, 4); sdselect->signal_clicked().connect ( sigc::mem_fun (*this, &Preferences::selectStartupDir) ); @@ -1439,11 +1441,7 @@ Gtk::Widget* Preferences::getFileBrowserPanel () hb6->pack_start (*fre); hb6->set_spacing (4); - mvbfb->pack_start (*hb6, Gtk::PACK_SHRINK, 4); - -// mvbfb->pack_start (*fro, Gtk::PACK_SHRINK, 4); -// mvbfb->pack_start (*fre); -// mvbfb->pack_start (*frc, Gtk::PACK_SHRINK, 4); + vbFileBrowser->pack_start (*hb6, Gtk::PACK_SHRINK, 4); addExt->signal_clicked().connect ( sigc::mem_fun (*this, &Preferences::addExtPressed) ); delExt->signal_clicked().connect ( sigc::mem_fun (*this, &Preferences::delExtPressed) ); @@ -1454,22 +1452,26 @@ Gtk::Widget* Preferences::getFileBrowserPanel () clearProfiles->signal_clicked().connect ( sigc::mem_fun (*this, &Preferences::clearProfilesPressed) ); clearAll->signal_clicked().connect ( sigc::mem_fun (*this, &Preferences::clearAllPressed) ); - return mvbfb; + swFileBrowser->add(*vbFileBrowser); + return swFileBrowser; } -Gtk::Widget* Preferences::getSoundPanel () +Gtk::Widget* Preferences::getSoundsPanel () { - Gtk::VBox* pSnd = new Gtk::VBox (); + swSounds = Gtk::manage(new Gtk::ScrolledWindow()); + swSounds->set_policy(Gtk::POLICY_AUTOMATIC, Gtk::POLICY_AUTOMATIC); + + Gtk::VBox* vbSounds = new Gtk::VBox (); ckbSndEnable = Gtk::manage ( new Gtk::CheckButton (M ("GENERAL_ENABLE"))); sndEnableConn = ckbSndEnable->signal_toggled().connect (sigc::mem_fun (*this, &Preferences::sndEnableToggled)); - pSnd->pack_start (*ckbSndEnable, Gtk::PACK_SHRINK, 4); + vbSounds->pack_start (*ckbSndEnable, Gtk::PACK_SHRINK, 4); Gtk::HBox* hblSndHelp = Gtk::manage (new Gtk::HBox ()); Gtk::Label* lSndHelp = Gtk::manage (new Gtk::Label (M ("PREFERENCES_SND_HELP"))); hblSndHelp->pack_start (*lSndHelp, Gtk::PACK_SHRINK, 4); - pSnd->pack_start (*hblSndHelp, Gtk::PACK_SHRINK, 4); + vbSounds->pack_start (*hblSndHelp, Gtk::PACK_SHRINK, 4); // BatchQueueDone Gtk::HBox* pBatchQueueDone = Gtk::manage ( new Gtk::HBox() ); @@ -1480,7 +1482,7 @@ Gtk::Widget* Preferences::getSoundPanel () txtSndBatchQueueDone = Gtk::manage (new Gtk::Entry()); pBatchQueueDone->pack_end (*txtSndBatchQueueDone, Gtk::PACK_EXPAND_WIDGET, 4); - pSnd->pack_start (*pBatchQueueDone, Gtk::PACK_SHRINK, 4); + vbSounds->pack_start (*pBatchQueueDone, Gtk::PACK_SHRINK, 4); // LngEditProcDone Gtk::HBox* pSndLngEditProcDone = Gtk::manage ( new Gtk::HBox() ); @@ -1500,11 +1502,12 @@ Gtk::Widget* Preferences::getSoundPanel () spbSndLngEditProcDoneSecs->set_range (0, 10); pSndLngEditProcDone->pack_end (*spbSndLngEditProcDoneSecs, Gtk::PACK_SHRINK, 4); - pSnd->pack_start (*pSndLngEditProcDone, Gtk::PACK_SHRINK, 4); + vbSounds->pack_start (*pSndLngEditProcDone, Gtk::PACK_SHRINK, 4); sndEnableToggled(); - return pSnd; + swSounds->add(*vbSounds); + return swSounds; } void Preferences::parseDir (Glib::ustring dirname, std::vector& items, Glib::ustring ext) @@ -1596,8 +1599,9 @@ void Preferences::parseThemeDir (Glib::ustring dirname) void Preferences::storePreferences () { -// With the new mechanism, we can't be sure of the availability of the DEFPROFILE_RAW & DEFPROFILE_IMG profiles, -// because useBundledProfiles may be false. We're now using DEFPROFILE_INTERNAL instead, which is always available. + // With the new mechanism, we can't be sure of the availability of the DEFPROFILE_RAW & DEFPROFILE_IMG profiles, + // because useBundledProfiles may be false. We're now using DEFPROFILE_INTERNAL instead, which is always available. + moptions.defProfRaw = rprofiles->getFullPathFromActiveRow(); if (moptions.defProfRaw.empty()) { @@ -1730,16 +1734,11 @@ void Preferences::storePreferences () } moptions.rtSettings.monitorBPC = monBPC->get_active (); -//#if defined(WIN32) moptions.rtSettings.autoMonitorProfile = cbAutoMonProfile->get_active (); -//#endif #endif moptions.rtSettings.iccDirectory = iccDir->get_filename (); -// moptions.rtSettings.viewingdevice = view->get_active_row_number (); -// moptions.rtSettings.viewingdevicegrey = grey->get_active_row_number (); -// moptions.rtSettings.viewinggreySc = greySc->get_active_row_number (); -// moptions.rtSettings.autocielab = cbAutocielab->get_active (); + moptions.rtSettings.leveldnv = dnv->get_active_row_number (); moptions.rtSettings.leveldnti = dnti->get_active_row_number (); moptions.rtSettings.leveldnliss = dnliss->get_active_row_number (); @@ -1889,18 +1888,13 @@ void Preferences::fillPreferences () } monBPC->set_active (moptions.rtSettings.monitorBPC); -//#if defined(WIN32) cbAutoMonProfile->set_active (moptions.rtSettings.autoMonitorProfile); -//#endif #endif if (Glib::file_test (moptions.rtSettings.iccDirectory, Glib::FILE_TEST_IS_DIR)) { iccDir->set_current_folder (moptions.rtSettings.iccDirectory); } -// view->set_active (moptions.rtSettings.viewingdevice); -// grey->set_active (moptions.rtSettings.viewingdevicegrey); -// greySc->set_active (moptions.rtSettings.viewinggreySc); dnv->set_active (moptions.rtSettings.leveldnv); dnti->set_active (moptions.rtSettings.leveldnti); dnliss->set_active (moptions.rtSettings.leveldnliss); @@ -1910,7 +1904,6 @@ void Preferences::fillPreferences () cprevdemo->set_active (moptions.prevdemo); cbdaubech->set_active (moptions.rtSettings.daubech); -// cbAutocielab->set_active (moptions.rtSettings.autocielab); languages->set_active_text (moptions.language); ckbLangAutoDetect->set_active (moptions.languageAutoDetect); int themeNbr = getThemeRowNumber (moptions.theme); @@ -2023,7 +2016,6 @@ void Preferences::fillPreferences () curveBBoxPosC->set_active (moptions.curvebboxpos); ckbHistogramPositionLeft->set_active (moptions.histogramPosition == 1); -// ckbHistogramWorking->set_active(moptions.histogramWorking==1); ckbFileBrowserToolbarSingleRow->set_active (moptions.FileBrowserToolbarSingleRow); ckbShowFilmStripToolBar->set_active (moptions.showFilmStripToolBar); ckbHideTPVScrollbar->set_active (moptions.hideTPVScrollbar); @@ -2098,17 +2090,17 @@ void Preferences::savePressed () { } */ -//#if defined(WIN32) void Preferences::autoMonProfileToggled () { monProfile->set_sensitive (!cbAutoMonProfile->get_active()); } -//#endif + /* void Preferences::autocielabToggled () { // cbAutocielab->set_sensitive(cbAutocielab->get_active()); } */ + void Preferences::sndEnableToggled () { txtSndBatchQueueDone->set_sensitive (ckbSndEnable->get_active()); @@ -2162,7 +2154,7 @@ void Preferences::cancelPressed () // update the profileStore if (useBundledProfiles->get_active () != options.useBundledProfiles) { - // we have to rescan with the old value; + // we have to rescan with the old value bpconn.block (true); useBundledProfiles->set_active (false); bundledProfilesChanged(); @@ -2176,7 +2168,7 @@ void Preferences::selectStartupDir () { Gtk::FileChooserDialog dialog (getToplevelWindow (this), M ("PREFERENCES_DIRSELECTDLG"), Gtk::FILE_CHOOSER_ACTION_SELECT_FOLDER); -// dialog.set_transient_for(*this); + //dialog.set_transient_for(*this); //Add response buttons to the dialog: dialog.add_button (M ("GENERAL_CANCEL"), Gtk::RESPONSE_CANCEL); diff --git a/rtgui/preferences.h b/rtgui/preferences.h index 3a51deb13..d9f61f157 100644 --- a/rtgui/preferences.h +++ b/rtgui/preferences.h @@ -242,14 +242,23 @@ class Preferences : public Gtk::Dialog, public ProfileStoreListener void appendBehavList (Gtk::TreeModel::iterator& parent, Glib::ustring label, int id, bool set); - Gtk::Widget* getProcParamsPanel (); - Gtk::Widget* getColorManagementPanel (); - Gtk::Widget* getFileBrowserPanel (); - Gtk::Widget* getGeneralPanel (); - Gtk::Widget* getBatchProcPanel (); - Gtk::Widget* getPerformancePanel (); - Gtk::Widget* getSoundPanel (); - Gtk::Widget* getDynProfilePanel (); + Gtk::ScrolledWindow *swGeneral; + Gtk::ScrolledWindow *swImageProcessing; + Gtk::ScrolledWindow *swDynamicProfile; + Gtk::ScrolledWindow *swFileBrowser; + Gtk::ScrolledWindow *swColorMan; + Gtk::ScrolledWindow *swBatchProc; + Gtk::ScrolledWindow *swPerformance; + Gtk::ScrolledWindow *swSounds; + + Gtk::Widget *getGeneralPanel(); + Gtk::Widget *getImageProcessingPanel(); + Gtk::Widget *getDynamicProfilePanel(); + Gtk::Widget *getFileBrowserPanel(); + Gtk::Widget *getColorManPanel(); + Gtk::Widget *getBatchProcPanel(); + Gtk::Widget *getPerformancePanel(); + Gtk::Widget *getSoundsPanel(); public: explicit Preferences (RTWindow *rtwindow); From 4509e39d708185522f7f640038c2450f173580ff Mon Sep 17 00:00:00 2001 From: TooWaBoo Date: Sat, 4 Aug 2018 17:17:40 +0200 Subject: [PATCH 20/28] Cosmetic changes --- rtdata/themes/TooWaBlue-GTK3-20_.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rtdata/themes/TooWaBlue-GTK3-20_.css b/rtdata/themes/TooWaBlue-GTK3-20_.css index 7e69acbc6..c4179c78a 100644 --- a/rtdata/themes/TooWaBlue-GTK3-20_.css +++ b/rtdata/themes/TooWaBlue-GTK3-20_.css @@ -80,7 +80,7 @@ #IopsPanel button:not(.Right) image, #ProfilePanel button image, #MainNotebook > header :not(#CloseButton) > image { - -gtk-icon-transform: scale(calc(21/24)); + -gtk-icon-transform: scale(calc(22/24)); } *:disabled { From c9e6a18fb8f8c0d519af5616c0f5b303da2d32df Mon Sep 17 00:00:00 2001 From: Morgan Hardwood Date: Mon, 6 Aug 2018 11:16:09 +0200 Subject: [PATCH 21/28] Use small thumbnail icon for files in queue --- rtgui/filebrowserentry.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rtgui/filebrowserentry.cc b/rtgui/filebrowserentry.cc index f457ae165..6046d372d 100644 --- a/rtgui/filebrowserentry.cc +++ b/rtgui/filebrowserentry.cc @@ -58,7 +58,7 @@ FileBrowserEntry::FileBrowserEntry (Thumbnail* thm, const Glib::ustring& fname) if (!iconsLoaded) { editedIcon = RTImage::createFromFile ("tick-small.png"); recentlySavedIcon = RTImage::createFromFile ("save-small.png"); - enqueuedIcon = RTImage::createFromFile ("gears.png"); + enqueuedIcon = RTImage::createFromFile ("gears-small.png"); hdr = RTImage::createFromFile ("filetype-hdr.png"); ps = RTImage::createFromFile ("filetype-ps.png"); iconsLoaded = true; From 7f26eb3072e96df9012a81d8c945b9b2844bb941 Mon Sep 17 00:00:00 2001 From: Morgan Hardwood Date: Mon, 6 Aug 2018 11:39:44 +0200 Subject: [PATCH 22/28] Power icons tweaked #4718 Increases the visual difference between enabled and disabled tool status icons. --- .../images/themed/png/dark/power-off-small.png | Bin 422 -> 382 bytes .../images/themed/png/light/power-off-small.png | Bin 411 -> 382 bytes rtdata/images/themed/svg/power-off-small.svg | 6 +++--- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/rtdata/images/themed/png/dark/power-off-small.png b/rtdata/images/themed/png/dark/power-off-small.png index f9ece5472eaadea3e1fa3419764980eaeb0e1e82..9b3118c50baf0a6cea647e460850d681a6e6832a 100644 GIT binary patch delta 129 zcmZ3+{Euk^D`TZ-fKQ0)88C1!@Huhf1dw_3=+UcJuTDvJ`@q1!z+MvM7hD#=z{f8r zGtVS<$Ms-)Bz dWieq44DD?EpVXf{z5>+C;OXk;vd$@?2>`>{F{A(h delta 170 zcmeyzw2XNJD`UN4fKQ0)*|TTe3w+L;Idl5-=?fPw0J-PRojY;j1VjYL)%82Y#lXP8 zT@vIMypbWUmM2?QWr3oW)kjDJn~9I zXaPrx3JVuk*Cs|uuD+%wB_D@2RS$n-BW69;uro@1YhnW$7dLXIxhhUt%5bEaPvZSv Sfmc9789ZJ6T-G@yGywqP)I|LN diff --git a/rtdata/images/themed/png/light/power-off-small.png b/rtdata/images/themed/png/light/power-off-small.png index 581712d14af0560e92c156ff048799f085437ff6..6036813a9624710785166b13d1e8f738c86f943a 100644 GIT binary patch delta 129 zcmbQu{Euk^D`TZ-fKQ04s;a7rii&%I50KQ>)>cwd($&?y*}VKL0|NtlNswP~SpWl{ z5WnCNcI$OOAp=hr#}JO|$pKAFY>y;XG4;45xG^kdFrJ|}VaXwmGzL$`khTWlkW&oH gA|#i|P8Vh9y21bc%Z3SifqEG{UHx3vIVCg!00-SBH2xL03-~#}JO|$pS4*Y&krfsf(QqoEwieavl*#@)h9@U@?+nVr6x`*~ruC z;^=6orf`^L$#KbL1JJ<#P=u@z_{gQu&X%Q~loCIGqA BD$xJ{ diff --git a/rtdata/images/themed/svg/power-off-small.svg b/rtdata/images/themed/svg/power-off-small.svg index aeaa42993..d04115bb9 100644 --- a/rtdata/images/themed/svg/power-off-small.svg +++ b/rtdata/images/themed/svg/power-off-small.svg @@ -18,7 +18,7 @@ inkscape:export-xdpi="96" inkscape:export-ydpi="96" inkscape:version="0.92.2 2405546, 2018-03-11" - sodipodi:docname="power-off.svg"> + sodipodi:docname="power-off-small.svg"> + r="3.2497637" /> From 5d8d757f7d4c47db6705fdb3f926e81eca8621b3 Mon Sep 17 00:00:00 2001 From: heckflosse Date: Mon, 6 Aug 2018 23:59:07 +0200 Subject: [PATCH 23/28] ahd_demosaic: removed stopwatch and improved progress bar --- rtengine/ahd_demosaic_RT.cc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/rtengine/ahd_demosaic_RT.cc b/rtengine/ahd_demosaic_RT.cc index a25ca1363..7931bf17d 100644 --- a/rtengine/ahd_demosaic_RT.cc +++ b/rtengine/ahd_demosaic_RT.cc @@ -29,7 +29,7 @@ #include "rt_math.h" #include "../rtgui/multilangmgr.h" #include "median.h" -#define BENCHMARK +//#define BENCHMARK #include "StopWatch.h" namespace rtengine @@ -205,7 +205,7 @@ void RawImageSource::ahd_demosaic() #pragma omp critical (ahdprogress) #endif { - progress += 32.0 * SQR(TS - 32) / (height * width); + progress += 32.0 * SQR(TS - 6) / (height * width); progress = std::min(progress, 1.0); plistener->setProgress(progress); } From faaaa016f0951d88aacea8c8e978aa387bdc9168 Mon Sep 17 00:00:00 2001 From: Morgan Hardwood Date: Mon, 13 Aug 2018 22:47:41 +0200 Subject: [PATCH 24/28] Star icons more narrow to not bloat thumbnail size The star icons used for ranking thumbnails are now of the "narrow" size, i.e. 10x16px. This change removes mostly the padding, which caused the ranking buttons to bloat the minimum thumbnail size to an unacceptably large size. --- .../png/dark/star-gold-hollow-narrow.png | Bin 0 -> 426 bytes .../themed/png/dark/star-gold-hollow.png | Bin 0 -> 564 bytes .../themed/png/dark/star-gold-narrow.png | Bin 0 -> 419 bytes rtdata/images/themed/png/dark/star-gold.png | Bin 0 -> 569 bytes .../themed/png/dark/star-hollow-narrow.png | Bin 0 -> 420 bytes rtdata/images/themed/png/dark/star-hollow.png | Bin 0 -> 538 bytes rtdata/images/themed/png/dark/star-narrow.png | Bin 0 -> 405 bytes rtdata/images/themed/png/dark/star-small.png | Bin 396 -> 434 bytes rtdata/images/themed/png/dark/star.png | Bin 0 -> 540 bytes .../png/light/star-gold-hollow-narrow.png | Bin 0 -> 426 bytes .../themed/png/light/star-gold-hollow.png | Bin 0 -> 564 bytes .../themed/png/light/star-gold-narrow.png | Bin 0 -> 419 bytes rtdata/images/themed/png/light/star-gold.png | Bin 0 -> 569 bytes .../themed/png/light/star-hollow-narrow.png | Bin 0 -> 409 bytes .../images/themed/png/light/star-hollow.png | Bin 0 -> 555 bytes .../images/themed/png/light/star-narrow.png | Bin 0 -> 405 bytes rtdata/images/themed/png/light/star-small.png | Bin 397 -> 446 bytes rtdata/images/themed/png/light/star.png | Bin 0 -> 537 bytes .../themed/svg/star-gold-hollow-narrow.svg | 128 ++++++++++++++++++ rtdata/images/themed/svg/star-gold-narrow.svg | 128 ++++++++++++++++++ .../images/themed/svg/star-hollow-narrow.svg | 128 ++++++++++++++++++ rtdata/images/themed/svg/star-narrow.svg | 128 ++++++++++++++++++ rtdata/images/themed/svg/star-small.svg | 12 +- rtdata/images/themed/svg/template-narrow.svg | 110 +++++++++++++++ rtgui/filethumbnailbuttonset.cc | 6 +- 25 files changed, 631 insertions(+), 9 deletions(-) create mode 100644 rtdata/images/themed/png/dark/star-gold-hollow-narrow.png create mode 100644 rtdata/images/themed/png/dark/star-gold-hollow.png create mode 100644 rtdata/images/themed/png/dark/star-gold-narrow.png create mode 100644 rtdata/images/themed/png/dark/star-gold.png create mode 100644 rtdata/images/themed/png/dark/star-hollow-narrow.png create mode 100644 rtdata/images/themed/png/dark/star-hollow.png create mode 100644 rtdata/images/themed/png/dark/star-narrow.png create mode 100644 rtdata/images/themed/png/dark/star.png create mode 100644 rtdata/images/themed/png/light/star-gold-hollow-narrow.png create mode 100644 rtdata/images/themed/png/light/star-gold-hollow.png create mode 100644 rtdata/images/themed/png/light/star-gold-narrow.png create mode 100644 rtdata/images/themed/png/light/star-gold.png create mode 100644 rtdata/images/themed/png/light/star-hollow-narrow.png create mode 100644 rtdata/images/themed/png/light/star-hollow.png create mode 100644 rtdata/images/themed/png/light/star-narrow.png create mode 100644 rtdata/images/themed/png/light/star.png create mode 100644 rtdata/images/themed/svg/star-gold-hollow-narrow.svg create mode 100644 rtdata/images/themed/svg/star-gold-narrow.svg create mode 100644 rtdata/images/themed/svg/star-hollow-narrow.svg create mode 100644 rtdata/images/themed/svg/star-narrow.svg create mode 100644 rtdata/images/themed/svg/template-narrow.svg diff --git a/rtdata/images/themed/png/dark/star-gold-hollow-narrow.png b/rtdata/images/themed/png/dark/star-gold-hollow-narrow.png new file mode 100644 index 0000000000000000000000000000000000000000..b0ce704d69962500bc43d29a03893277eb75c3ab GIT binary patch literal 426 zcmeAS@N?(olHy`uVBq!ia0vp^AhrMtGmyL+__-KJ1(mo)lsM-XR2F5XXOu8FJ1aPr zloVwqm6l}Y=jjG#Bo?JQ=4584DrA(D6jnBy}7ANYP=o#oA4oPAKnl1}6-6gd+xhS&$WFSLOVtGhLYEfcAYN|qJa(lV!_B$IXpd!u!k4T`O_>O=u<5X=vX`rB1fKQ0)|5*&~1wQ|0GW<_q_&QoBbvQ2kia`7;&YI5x1X|m&SZ`kDcbd|%VUPWdP gBQCB5vzb{Ky!?37K02GI0L^0XboFyt=akR{0E0V@RR910 literal 0 HcmV?d00001 diff --git a/rtdata/images/themed/png/dark/star-gold-hollow.png b/rtdata/images/themed/png/dark/star-gold-hollow.png new file mode 100644 index 0000000000000000000000000000000000000000..44bf29d1226749f782d91fc5e129e2e2472f1070 GIT binary patch literal 564 zcmeAS@N?(olHy`uVBq!ia0vp^5+KaN3?zjj6;1=Gpc2=J66gGa%A(Blj1mTCX9dTS zlA_F{(vr;lJl)`o#G+KkoXqT0g^ZGt0xNy}ERK!`}5n0T@z;^_M8K-LVNdpB90(?ST|Ic7>FYx(4li`0g1Bjf3 zL{4Y;4@5x0*$hBs5GlqBZ{vY_1xkYaf;ThFVon$6a$ccm6wn}{8MQP!RTn6C$kW9! zMB;L?fD02(LeLF?PUX0cBZfh4k3=>oTO8u@X)EZnnCzrDC;3R+0-mQF_lp9|k|Mc7 zPAI%veBeNU#<>FrN|sD;+|=lJ{B}UaX+^faPM#*?8wb=R)k~PZp3qv-WRWH#?8p|A z#4REs;(LL0w%Y0k8X6jhN(7Vo54$-!W{Ry?%E|4@y!6I`Ic)*`(*pQ7+^0QeXLhb< zcIg*kK77)Whll&1OlF&n4P$pbtWu5FLO}FGjW5t`k_6%tPIO7wM!$prt|=P O!{F)a=d#Wzp$P!>y2b?n literal 0 HcmV?d00001 diff --git a/rtdata/images/themed/png/dark/star-gold-narrow.png b/rtdata/images/themed/png/dark/star-gold-narrow.png new file mode 100644 index 0000000000000000000000000000000000000000..32710fb9d0670351acaf54d2e9a68a420a58fd40 GIT binary patch literal 419 zcmeAS@N?(olHy`uVBq!ia0vp^AhrMtGmyL+__-KJ1(mo)lsM-XR2F5XXOu8FJ1aPr zloVwqm6l}Y=jjG#Bo?JQ=4584DrA(D6jnBy}7ANYP=o#oA4oPAKnl1}6-6gd+xhS&$WFSLOVtGhLYEfcAYN|qJa(lV!_B$IXpd!u!k4T`O_>O=u<5X=vX`rB1fKQ04dx6jYiwytIGW@^8@c%W# z|C0>=&oKNy1tx)l=V0h8gLEp-TA(hzk|4iehP6WLH?tR*&kK`sUYPp&;O#p=8B0$W z#}JO|$q5ITm<~M2GpJmdKI;Vst0K1iuL;wH) literal 0 HcmV?d00001 diff --git a/rtdata/images/themed/png/dark/star-gold.png b/rtdata/images/themed/png/dark/star-gold.png new file mode 100644 index 0000000000000000000000000000000000000000..5e38050052c6eca005a09f2a42db0300cb6ddd64 GIT binary patch literal 569 zcmeAS@N?(olHy`uVBq!ia0vp^5+KaM3?#3wJbMaA1(mo)lsM-XR2F5XXOu8FJ1aPr zloVwqm6l}Y=jjG#Bo?JQ=4584DrA(D6jnBy}7ANYP=o#oA4oPAKnl1}6-6gd+xhS&$WFSLOVtGhLYEfcAYN|qJa(lV!_B$IXpd!u!kH}&M2EHR8%s5q>PZ}s_7T^=&`u_~W|FdAUmf`foctlpn@Hv55qa8a~Ec9ZZH*bZDOI!FB$gZ#B+u3l3jVHnO zW>W#P=!{a1q_$TFS4q8Dc=Ec$ver4xPais%+%#)@#IN8b!7X=wUULlJnHO~~|9!nBy}7ANYP=o#oA4oPAKnl1}6-6gd+xhS&$WFSLOVtGhLYEfcAYN|qJa(lV!_B$IXpd!u!k4T`O_>O=u<5X=vX`rA=fKQ0)>C>m(3w+Lk!S(CcfizI$ z%$YMl#_ij;&z(DW`SRscj}%mZ>Um0n{DS!yymOgs)#J+8^~D7xn|1)jojhF}LpZJ{ z3$QSERK!`}5n0T@z;^_M8K-LVNdpBH1AIbUPoF;RUf^@)%$c)b0AW0O z^av;pVRJi4PXa3DE(!7rZeYkuF!tnO7AsfEoWHLQD7?qh#W6(UvhVqgd`$)-tQTf8 zIUk>NOK6!IpM{WcZ{nh6Yd3Lsu`-i72CJ7xk{)?Q{P9^Ba>?Ap()0e_%7k+V_G~IU zu(jEsaKdjsk(KEMi@x++I4{ioQ)`m<2U)u&dC>)y4rWq;-A`9e`)!)R{Oya+Bp>_3 zeoM9~uiGNY{4Va~43BU%-xbWs+(CY}M=zXUj-FMvsK>T@n^seopTHNMJ-0K}*~<7A v7(X~6@p>U|-pzyIiI$L>^6bTD|j`njxgN@xNAuKdha literal 0 HcmV?d00001 diff --git a/rtdata/images/themed/png/dark/star-narrow.png b/rtdata/images/themed/png/dark/star-narrow.png new file mode 100644 index 0000000000000000000000000000000000000000..bdcc73bfea787978667eb4d5a079eba9ded0964b GIT binary patch literal 405 zcmeAS@N?(olHy`uVBq!ia0vp^AhrMtGmyL+__-KJ1(mo)lsM-XR2F5XXOu8FJ1aPr zloVwqm6l}Y=jjG#Bo?JQ=4584DrA(D6jnBy}7ANYP=o#oA4oPAKnl1}6-6gd+xhS&$WFSLOVtGhLYEfcAYN|qJa(lV!_B$IXpd!u!k4T`O_>O=u<5X=vX`rBDfKQ04dx6hcFgODS=gysjaDn8h zQ>V_KKVPQYcpj*jyCldjn87=btCBy_R?|SW-s6@cP}tnl#W95AdUC=6&a@^^RfV+J z6)K_!1fHnPSaj;ZDzzCR2M%0NS;06(qp*;DQq!>}hf58OlHH07>YZ!>&tuC$;mqLa L>gTe~DWM4fLw1l> literal 0 HcmV?d00001 diff --git a/rtdata/images/themed/png/dark/star-small.png b/rtdata/images/themed/png/dark/star-small.png index c8f21783cbd2ffc5bf35d191985dfd494593fe9e..db895d932b649ed45468034361bf96a2761ca235 100644 GIT binary patch delta 177 zcmeBS-o(6ti?ROPxpQaEoN+JkIeYdjkOAQW*$}RM_sJ~`3=CW)L4Lt5l?*b`dRcLS ztPfpoP5_EVc)B=-a9mFgXkubh2s3Lky3)OX$2n2s@KM$y7g9V$5=4q;99bap;=q9e zN?cQdrY0n0@G!09Oi2)6)iz5`@L)5(!KHaL_+XD)x-h3fbEM}FVdQ&MBb@08qC`oB#j- delta 139 zcmdnQ+{3(qi?QClz~{`FGpA3V29l>vor17|jPvKupFMl_waLi<1_lPMk|4iehAQ4< z6;@ZP01p+#wp5^~k*AAe2*>s0gah0&L>BOz;|yq9B+%j~VkW|D+;n!5uVR*}l;WyL l7FJn>o=XMnY?l}q3UgTg+;BBZ2kK_ERK!`}5n0T@z;^_M8K-LVNdpB{0(?ST&z(DW=FA!Q0v{lG76wk8 zIt66HMP8KaJOrxeDGBlmc5PtDFN;bRmS-}s`kIo+1Qg%p>Eak7aoP9$ZoVc15w-`- zUB>lMk}{q=BFoj(+Io*26g78`xv}zH%vd%+9u3v$GcN5zvh^{Z?qCbba=$XHx%ITzC4{xOB*TFns26;3wl1w&*F2 v7artp(ENJjY|fd?uW5^Zty`O1@snYXoc?y-t!nRqzF_cl^>bP0l+XkK5DU}4 literal 0 HcmV?d00001 diff --git a/rtdata/images/themed/png/light/star-gold-hollow-narrow.png b/rtdata/images/themed/png/light/star-gold-hollow-narrow.png new file mode 100644 index 0000000000000000000000000000000000000000..b0ce704d69962500bc43d29a03893277eb75c3ab GIT binary patch literal 426 zcmeAS@N?(olHy`uVBq!ia0vp^AhrMtGmyL+__-KJ1(mo)lsM-XR2F5XXOu8FJ1aPr zloVwqm6l}Y=jjG#Bo?JQ=4584DrA(D6jnBy}7ANYP=o#oA4oPAKnl1}6-6gd+xhS&$WFSLOVtGhLYEfcAYN|qJa(lV!_B$IXpd!u!k4T`O_>O=u<5X=vX`rB1fKQ0)|5*&~1wQ|0GW<_q_&QoBbvQ2kia`7;&YI5x1X|m&SZ`kDcbd|%VUPWdP gBQCB5vzb{Ky!?37K02GI0L^0XboFyt=akR{0E0V@RR910 literal 0 HcmV?d00001 diff --git a/rtdata/images/themed/png/light/star-gold-hollow.png b/rtdata/images/themed/png/light/star-gold-hollow.png new file mode 100644 index 0000000000000000000000000000000000000000..44bf29d1226749f782d91fc5e129e2e2472f1070 GIT binary patch literal 564 zcmeAS@N?(olHy`uVBq!ia0vp^5+KaN3?zjj6;1=Gpc2=J66gGa%A(Blj1mTCX9dTS zlA_F{(vr;lJl)`o#G+KkoXqT0g^ZGt0xNy}ERK!`}5n0T@z;^_M8K-LVNdpB90(?ST|Ic7>FYx(4li`0g1Bjf3 zL{4Y;4@5x0*$hBs5GlqBZ{vY_1xkYaf;ThFVon$6a$ccm6wn}{8MQP!RTn6C$kW9! zMB;L?fD02(LeLF?PUX0cBZfh4k3=>oTO8u@X)EZnnCzrDC;3R+0-mQF_lp9|k|Mc7 zPAI%veBeNU#<>FrN|sD;+|=lJ{B}UaX+^faPM#*?8wb=R)k~PZp3qv-WRWH#?8p|A z#4REs;(LL0w%Y0k8X6jhN(7Vo54$-!W{Ry?%E|4@y!6I`Ic)*`(*pQ7+^0QeXLhb< zcIg*kK77)Whll&1OlF&n4P$pbtWu5FLO}FGjW5t`k_6%tPIO7wM!$prt|=P O!{F)a=d#Wzp$P!>y2b?n literal 0 HcmV?d00001 diff --git a/rtdata/images/themed/png/light/star-gold-narrow.png b/rtdata/images/themed/png/light/star-gold-narrow.png new file mode 100644 index 0000000000000000000000000000000000000000..32710fb9d0670351acaf54d2e9a68a420a58fd40 GIT binary patch literal 419 zcmeAS@N?(olHy`uVBq!ia0vp^AhrMtGmyL+__-KJ1(mo)lsM-XR2F5XXOu8FJ1aPr zloVwqm6l}Y=jjG#Bo?JQ=4584DrA(D6jnBy}7ANYP=o#oA4oPAKnl1}6-6gd+xhS&$WFSLOVtGhLYEfcAYN|qJa(lV!_B$IXpd!u!k4T`O_>O=u<5X=vX`rB1fKQ04dx6jYiwytIGW@^8@c%W# z|C0>=&oKNy1tx)l=V0h8gLEp-TA(hzk|4iehP6WLH?tR*&kK`sUYPp&;O#p=8B0$W z#}JO|$q5ITm<~M2GpJmdKI;Vst0K1iuL;wH) literal 0 HcmV?d00001 diff --git a/rtdata/images/themed/png/light/star-gold.png b/rtdata/images/themed/png/light/star-gold.png new file mode 100644 index 0000000000000000000000000000000000000000..5e38050052c6eca005a09f2a42db0300cb6ddd64 GIT binary patch literal 569 zcmeAS@N?(olHy`uVBq!ia0vp^5+KaM3?#3wJbMaA1(mo)lsM-XR2F5XXOu8FJ1aPr zloVwqm6l}Y=jjG#Bo?JQ=4584DrA(D6jnBy}7ANYP=o#oA4oPAKnl1}6-6gd+xhS&$WFSLOVtGhLYEfcAYN|qJa(lV!_B$IXpd!u!kH}&M2EHR8%s5q>PZ}s_7T^=&`u_~W|FdAUmf`foctlpn@Hv55qa8a~Ec9ZZH*bZDOI!FB$gZ#B+u3l3jVHnO zW>W#P=!{a1q_$TFS4q8Dc=Ec$ver4xPais%+%#)@#IN8b!7X=wUULlJnHO~~|9!nBy}7ANYP=o#oA4oPAKnl1}6-6gd+xhS&$WFSLOVtGhLYEfcAYN|qJa(lV!_B$IXpd!u!k4T`O_>O=u<5X=vX`rA=fKQ04dx4LNii(<=nyRWQkkr!B zQdd_8GLS)ovgu=>dY+OXzhDNQvRqqH^*E0JFa0+D90{Pfxu=U`2*>s0gae#q&7R2$ zX=gR^xf2AgapW4MB$y-?h$SR=i0d$WS!mB>I2qZb-MEB-Sy{}PA@nkPLd(-KeV`Ex Mp00i_>zopr0HObPivR!s literal 0 HcmV?d00001 diff --git a/rtdata/images/themed/png/light/star-hollow.png b/rtdata/images/themed/png/light/star-hollow.png new file mode 100644 index 0000000000000000000000000000000000000000..3e610948d503baa3930bfc1c393d616b105df349 GIT binary patch literal 555 zcmeAS@N?(olHy`uVBq!ia0vp^5+KaN3?zjj6;1=Gpc2=J66gGa%A(Blj1mTCX9dTS zlA_F{(vr;lJl)`o#G+KkoXqT0g^ZGt0xNy}ERK!`}5n0T@z;^_M8K-LVNdpD70(?ST)zsA73w%_;KvPrG+uIvR zLbyN@D668P0%5GrbeIX$#a9yK7u>**8_&xm>1j}Dtx_B?>w$1GQ0Abgi(`nyK6M;_UiycQegIph(6ew6M;__)M=wq4eq&!FX$i)R*Pdlo_SFml&XVglWpb?gk zkTE48A;Bm=MPT-U1u>!;yY6%}8c%dIXqU{HwBn%Q0=bRMY6^Y^{z@kp)YaS_9R-_} z6E3@maIvx;byQNQ<`U!L^4jREYkEWDk;Yk`r#=NM=e#?_`LLs4T}r|XQ^rN^vlGm literal 0 HcmV?d00001 diff --git a/rtdata/images/themed/png/light/star-narrow.png b/rtdata/images/themed/png/light/star-narrow.png new file mode 100644 index 0000000000000000000000000000000000000000..78c8eea8a7070534f1820f52b1adb02c7b5c8f68 GIT binary patch literal 405 zcmeAS@N?(olHy`uVBq!ia0vp^AhrMtGmyL+__-KJ1(mo)lsM-XR2F5XXOu8FJ1aPr zloVwqm6l}Y=jjG#Bo?JQ=4584DrA(D6jnBy}7ANYP=o#oA4oPAKnl1}6-6gd+xhS&$WFSLOVtGhLYEfcAYN|qJa(lV!_B$IXpd!u!k4T`O_>O=u<5X=vX`rBDfKQ04dx4Lts;Zir8k|&DR|j$- z04Vrnj_^C6V(yY4zhH(u-%4&lb+<%Yg9C>{9s`BVJzX3_IIbrr9N-LV^mJ56^A*?O zPT<%QkR_IyFi|7FBq6~gM2OkT$7~zRBriQLhf9r(tlf$XPEu^Y9;RfK0*zqsboFyt I=akR{0JB?ph5!Hn literal 0 HcmV?d00001 diff --git a/rtdata/images/themed/png/light/star-small.png b/rtdata/images/themed/png/light/star-small.png index 8ff98fa6bb095c7b692af37abaf340a78791c5fb..2bb54647a72ac9c3abd14476fe116603aeffa671 100644 GIT binary patch delta 194 zcmeBW-p9Owm9btuz$e626%5=9d>{-Usivl;uC5Mb7#kaFfB{gXBS~~K0|NtZNswQ# zOC>|Bba1w|3ah1V+6~{64}cO8o-U3d9M_WrnwZ!W!U~&=rt~i0aTnA$d_&^Mg%n?r z1QG5TM;3%+95`@5hi}Ryfz$*JD;=hlH%}Z;;0?QT?7#%Zv^9nzcC2YEvn;xsBz3&J h_ym|APFrNeuw=D}^V@Z*u|P{0JYD@<);T3K0RUn{JFEZz delta 145 zcmdnT+{?Uym9btfz$e7jy}(CRRaH+G}P48fDFOo`?DAr7`RG; z{DK*(INZb&w5$R$c|)G?14WHJT^vI=t|uoP;GQ9}fG3Sv<8UC0lXMpwSF_}*$-2!7 sS*lWst0GxgWe@OdQ~Junc8P%@bPCIkb&(F9K<%6ip00i_>zopr05~ru6aWAK diff --git a/rtdata/images/themed/png/light/star.png b/rtdata/images/themed/png/light/star.png new file mode 100644 index 0000000000000000000000000000000000000000..f29ccfdcdcce445aebcf033cf59f6e3f4609d65a GIT binary patch literal 537 zcmeAS@N?(olHy`uVBq!ia0vp^5+KaN3?zjj6;1=Gpc2=J66gGa%A(Blj1mTCX9dTS zlA_F{(vr;lJl)`o#G+KkoXqT0g^ZGt0xNy}ERK!`}5n0T@z;^_M8K-LVNdpB{0(?ST)zsA73w(g2s;a7nh6a#? z02LJ#h@iTTk^HjcXe9%yL-7R$K=JLKE{-7*my-otn0RK$ ztZem=x#*yBj!93&k3qXh`RKF_0_OyuW^l9=+VD=gGGlpzMUWUH509@D56_yj+>$Or z5<%KirrbI#aYIIuFL=lndR>|dDBET>nW2HVh-e;VSCtNAYx#!!Pw!8hmpaS3IhWlmf|InTCA+g tjdNIvTeKbZ=H+o*Wai{`-*SPG!QqhV-;Ap{hCnYcc)I$ztaD0e0svhfr;h*t literal 0 HcmV?d00001 diff --git a/rtdata/images/themed/svg/star-gold-hollow-narrow.svg b/rtdata/images/themed/svg/star-gold-hollow-narrow.svg new file mode 100644 index 000000000..82ab83a4a --- /dev/null +++ b/rtdata/images/themed/svg/star-gold-hollow-narrow.svg @@ -0,0 +1,128 @@ + + + + + + + + + + + + image/svg+xml + + + + + Maciej Dworak + + + + + + + + RawTherapee icon. + + + + + + + + + + + + + + + + diff --git a/rtdata/images/themed/svg/star-gold-narrow.svg b/rtdata/images/themed/svg/star-gold-narrow.svg new file mode 100644 index 000000000..ee54c8214 --- /dev/null +++ b/rtdata/images/themed/svg/star-gold-narrow.svg @@ -0,0 +1,128 @@ + + + + + + + + + + + + image/svg+xml + + + + + Maciej Dworak + + + + + + + + RawTherapee icon. + + + + + + + + + + + + + + + + diff --git a/rtdata/images/themed/svg/star-hollow-narrow.svg b/rtdata/images/themed/svg/star-hollow-narrow.svg new file mode 100644 index 000000000..66b1c233c --- /dev/null +++ b/rtdata/images/themed/svg/star-hollow-narrow.svg @@ -0,0 +1,128 @@ + + + + + + + + + + + + image/svg+xml + + + + + Maciej Dworak + + + + + + + + RawTherapee icon. + + + + + + + + + + + + + + + + diff --git a/rtdata/images/themed/svg/star-narrow.svg b/rtdata/images/themed/svg/star-narrow.svg new file mode 100644 index 000000000..90add16d5 --- /dev/null +++ b/rtdata/images/themed/svg/star-narrow.svg @@ -0,0 +1,128 @@ + + + + + + + + + + + + image/svg+xml + + + + + Maciej Dworak + + + + + + + + RawTherapee icon. + + + + + + + + + + + + + + + + diff --git a/rtdata/images/themed/svg/star-small.svg b/rtdata/images/themed/svg/star-small.svg index f15d135b8..cd7a9b8ef 100644 --- a/rtdata/images/themed/svg/star-small.svg +++ b/rtdata/images/themed/svg/star-small.svg @@ -26,8 +26,8 @@ borderopacity="1.0" inkscape:pageopacity="0" inkscape:pageshadow="2" - inkscape:zoom="50.625" - inkscape:cx="8" + inkscape:zoom="51.375" + inkscape:cx="8.0194647" inkscape:cy="8" inkscape:document-units="px" inkscape:current-layer="layer1" @@ -109,8 +109,8 @@ transform="translate(0,-8)"> + transform="matrix(0.86350439,-0.28029946,0.28056958,0.86267304,-3.3971484,4.0671624)" + inkscape:transform-center-y="-0.51970384" /> diff --git a/rtdata/images/themed/svg/template-narrow.svg b/rtdata/images/themed/svg/template-narrow.svg new file mode 100644 index 000000000..9a6321317 --- /dev/null +++ b/rtdata/images/themed/svg/template-narrow.svg @@ -0,0 +1,110 @@ + + + + + + + + + + + + image/svg+xml + + + + + Maciej Dworak + + + + + + + + RawTherapee icon. + + + + + + + + + + + + + + diff --git a/rtgui/filethumbnailbuttonset.cc b/rtgui/filethumbnailbuttonset.cc index d32c1c339..556397b7b 100644 --- a/rtgui/filethumbnailbuttonset.cc +++ b/rtgui/filethumbnailbuttonset.cc @@ -42,9 +42,9 @@ FileThumbnailButtonSet::FileThumbnailButtonSet (FileBrowserEntry* myEntry) { if (!iconsLoaded) { - unRankIcon = RTImage::createFromPng ("star-hollow-small.png"); - rankIcon = RTImage::createFromPng ("star-gold-small.png"); - gRankIcon = RTImage::createFromPng ("star-small.png"); + unRankIcon = RTImage::createFromPng ("star-hollow-narrow.png"); + rankIcon = RTImage::createFromPng ("star-gold-narrow.png"); + gRankIcon = RTImage::createFromPng ("star-narrow.png"); trashIcon = RTImage::createFromPng ("trash-small.png"); unTrashIcon = RTImage::createFromPng ("trash-remove-small.png"); processIcon = RTImage::createFromPng ("gears-small.png"); From e7697f5980aca4149d491c14a15486243ef02fee Mon Sep 17 00:00:00 2001 From: Morgan Hardwood Date: Mon, 13 Aug 2018 23:11:31 +0200 Subject: [PATCH 25/28] Updated ICC Generator icon --- rtdata/images/themed/png/dark/gamut-plus.png | Bin 869 -> 548 bytes rtdata/images/themed/png/light/gamut-plus.png | Bin 864 -> 546 bytes rtdata/images/themed/svg/gamut-plus.svg | 10 ++-------- 3 files changed, 2 insertions(+), 8 deletions(-) diff --git a/rtdata/images/themed/png/dark/gamut-plus.png b/rtdata/images/themed/png/dark/gamut-plus.png index 091e38337cf0d9ea1d91e507edbe40539d3b0468..a83f5e603e56df7a14d1eca66844f26ba4712286 100644 GIT binary patch delta 321 zcmaFLwuEJZ1SbnK0|SFlq{8WmTM{PrYE8^jnCPiG(L}UfH^3*v^~{+w?gc(T5)MwE zK79@h;37cA*|TSXf}i(`ny z`fMIH40DLC4CxY3fbZms)d+O7b>{VY7{=QjY(SJ@Q0WJ?)mCRmIv|l zZS*<5@ZPl4h{TP8Vr+^|Jm!LoN}G68O9U7gPMa&uKJvVBGSCkUp00i_>zopr0Jpq- A;Q#;t delta 645 zcmV;00($+V1my;h7#Ro#0002scRlz3000DYLP=Bz2nYy#2xN$n?HG~EC6TKjk%B3a zBwc?3J4r-AR7i={m9dKxQ4q$zdD(CmBnSpQxKzP(f_mAPh%sOz2;!-YTlpv08Z7iU zw6L|YwZF6%3qgojU6QxE=HM(Wl1kw)sjf&c``%cXNG|T?k_#42^Vpf4@AqbQ_C4Sq z8v%e)Y8L>cl$)m!8Rv&-h-G#+k3|AJ&%1x=y6)v=0ajE%Ykg4&amRJt7q)HhPsbL}_MT0kGwH-jxM6{>LH#%$y#rE6n`7(P&&f4Is2dl}aT>L~9eU6(Piy z@B6PdHa42T@o8Cjin7`4+7$fI7_+0bF1xO4FH%7$fQZsluDwE`utP*I0X$YpU7LRw z5ZWTG^)#Rk0Jd%KE2W+=b6F_`DPv~jjE|>cd1i|@cvw0)xoxi?8tyWuQ z=5s^@0K*^%{IJAUt92m=f``VK+d_W`R!Y5=Qr1ocB$LTBMyISX=5w)F>`%s(QfFha z*n{D4cppGq2=R@XKgHwmgSjd&#-xS#-8mt|-q_#ibXL3F?p***5CkzIsvBe8=kxg% z5pkG!D8RC;bz=;enFoVGlbJ2g^KSKey+;6k5YgLID)ljw$qb@IPpkj{i0D;oB9XYH zl)7hG)&Vn@bGh92c|>OdMyKeIhz2Si^U f%i7Ef=fAOEwNv;nL>?G}00000NkvXXu0mjfz7;Kl diff --git a/rtdata/images/themed/png/light/gamut-plus.png b/rtdata/images/themed/png/light/gamut-plus.png index 43c0c321a4da3556fdc034be75bf38c9c182ee27..c41e5a39b0f83a04fe56ba4b700caa1e0cd886ad 100644 GIT binary patch delta 319 zcmaFBwuohd1SbnK0|SFlq{8WmTM{PrYE8^jnCPiG(L}V~AiyWY)xE$+6$~^qG=Q|S zvND9Lq@<*xq5@&VNuWsJaWie8c>*Ote!&czCkrR?w3oBbTO$+bV5H9IG}jI&x53lJ zF+}2Wa)JY^T*9P40UzCLhk^*!U_qHW$At`RY>o;72?-BG>qSCZiz8SZg97+=FG!fG z<-sY=L;UNDD0F~daCh)p{U(> z#$=5jj2=ZYOy0gzSSFgYsyDZ=9Bq7}?6^_dp({F|ukqpR1zZuL>mP8ny$vcAm|V%i x?bDLyV0%`tBIOiYggnQFgHswT-6c0LGki9a;jFoKr3~nL22WQ%mvv4FO#o>1WSam0 delta 640 zcmV-`0)PFY1mFgc7#Ro#0002scRlz3000DYLP=Bz2nYy#2xN$n?HG~EC6TKjk%B3a zBwc?3Hc3Q5R7i={mA{JyD5YyL=mwtg&>HhHnH+gur*ld z6h+E*TOJ-%FKWF zUDv%dEg)$ZO#s3$tN}o$(`kC1_drCduIs`WQv=cuXlw@7+9+VRR4RQQH?-E@=I7@h ziO7X~K7aY33}OMyyg2?Bk^1`j`j4o;)oKmf?e+_1KH+)Z#hC%o8i+_ODOhX$2Eb{@ zajqnd`J)E8T<$o4Q={ho-rim#F0g-CES?F1pdupInOPjidA_x^_4Yu3QYwqlEh{1) zyWQ>}>R(=7KB<(tGZ+kR6VWjMJpk_kw5G~nbVZC|o6*daQa73Tu87PrbIn@&+8FZ* zfW(O>0Tx9B03-;4dbwOy{eJ(Nwe}u>uSE26I2^v)-roM6B$^7q=nRO6R!UHv?e%)M zh^WQPRp0l&Oe2~Ku-0aYXrG97h-hGpc?iJHDx3&l=2t}Y!T0^$!-__2;!XbBmiplQ aH}(_0%HIsnFO$Cj0000 - Date: Mon, 13 Aug 2018 23:23:22 +0200 Subject: [PATCH 26/28] Icons renamed to reflect their size --- ...png => square-toggle-black-off-narrow.png} | Bin ....png => square-toggle-black-on-narrow.png} | Bin ....png => square-toggle-blue-off-narrow.png} | Bin ...n.png => square-toggle-blue-on-narrow.png} | Bin ....png => square-toggle-gray-off-narrow.png} | Bin ...n.png => square-toggle-gray-on-narrow.png} | Bin ...png => square-toggle-green-off-narrow.png} | Bin ....png => square-toggle-green-on-narrow.png} | Bin ...> square-toggle-luminosity-off-narrow.png} | Bin ...=> square-toggle-luminosity-on-narrow.png} | Bin ...f.png => square-toggle-red-off-narrow.png} | Bin ...on.png => square-toggle-red-on-narrow.png} | Bin ...png => square-toggle-theme-off-narrow.png} | Bin ....png => square-toggle-theme-on-narrow.png} | Bin ...png => square-toggle-white-off-narrow.png} | Bin ....png => square-toggle-white-on-narrow.png} | Bin ...png => square-toggle-black-off-narrow.png} | Bin ....png => square-toggle-black-on-narrow.png} | Bin ....png => square-toggle-blue-off-narrow.png} | Bin ...n.png => square-toggle-blue-on-narrow.png} | Bin ....png => square-toggle-gray-off-narrow.png} | Bin ...n.png => square-toggle-gray-on-narrow.png} | Bin ...png => square-toggle-green-off-narrow.png} | Bin ....png => square-toggle-green-on-narrow.png} | Bin ...> square-toggle-luminosity-off-narrow.png} | Bin ...=> square-toggle-luminosity-on-narrow.png} | Bin ...f.png => square-toggle-red-off-narrow.png} | Bin ...on.png => square-toggle-red-on-narrow.png} | Bin ...png => square-toggle-theme-off-narrow.png} | Bin ....png => square-toggle-theme-on-narrow.png} | Bin ...png => square-toggle-white-off-narrow.png} | Bin ....png => square-toggle-white-on-narrow.png} | Bin ...svg => square-toggle-black-off-narrow.svg} | 0 ....svg => square-toggle-black-on-narrow.svg} | 0 ....svg => square-toggle-blue-off-narrow.svg} | 0 ...n.svg => square-toggle-blue-on-narrow.svg} | 0 ....svg => square-toggle-gray-off-narrow.svg} | 0 ...n.svg => square-toggle-gray-on-narrow.svg} | 0 ...svg => square-toggle-green-off-narrow.svg} | 0 ....svg => square-toggle-green-on-narrow.svg} | 0 ...> square-toggle-luminosity-off-narrow.svg} | 0 ...=> square-toggle-luminosity-on-narrow.svg} | 0 ...f.svg => square-toggle-red-off-narrow.svg} | 0 ...on.svg => square-toggle-red-on-narrow.svg} | 0 ...svg => square-toggle-theme-off-narrow.svg} | 0 ....svg => square-toggle-theme-on-narrow.svg} | 0 ...svg => square-toggle-white-off-narrow.svg} | 0 ....svg => square-toggle-white-on-narrow.svg} | 0 rtgui/previewmodepanel.cc | 32 +++++++++--------- 49 files changed, 16 insertions(+), 16 deletions(-) rename rtdata/images/themed/png/dark/{square-toggle-black-off.png => square-toggle-black-off-narrow.png} (100%) rename rtdata/images/themed/png/dark/{square-toggle-black-on.png => square-toggle-black-on-narrow.png} (100%) rename rtdata/images/themed/png/dark/{square-toggle-blue-off.png => square-toggle-blue-off-narrow.png} (100%) rename rtdata/images/themed/png/dark/{square-toggle-blue-on.png => square-toggle-blue-on-narrow.png} (100%) rename rtdata/images/themed/png/dark/{square-toggle-gray-off.png => square-toggle-gray-off-narrow.png} (100%) rename rtdata/images/themed/png/dark/{square-toggle-gray-on.png => square-toggle-gray-on-narrow.png} (100%) rename rtdata/images/themed/png/dark/{square-toggle-green-off.png => square-toggle-green-off-narrow.png} (100%) rename rtdata/images/themed/png/dark/{square-toggle-green-on.png => square-toggle-green-on-narrow.png} (100%) rename rtdata/images/themed/png/dark/{square-toggle-luminosity-off.png => square-toggle-luminosity-off-narrow.png} (100%) rename rtdata/images/themed/png/dark/{square-toggle-luminosity-on.png => square-toggle-luminosity-on-narrow.png} (100%) rename rtdata/images/themed/png/dark/{square-toggle-red-off.png => square-toggle-red-off-narrow.png} (100%) rename rtdata/images/themed/png/dark/{square-toggle-red-on.png => square-toggle-red-on-narrow.png} (100%) rename rtdata/images/themed/png/dark/{square-toggle-theme-off.png => square-toggle-theme-off-narrow.png} (100%) rename rtdata/images/themed/png/dark/{square-toggle-theme-on.png => square-toggle-theme-on-narrow.png} (100%) rename rtdata/images/themed/png/dark/{square-toggle-white-off.png => square-toggle-white-off-narrow.png} (100%) rename rtdata/images/themed/png/dark/{square-toggle-white-on.png => square-toggle-white-on-narrow.png} (100%) rename rtdata/images/themed/png/light/{square-toggle-black-off.png => square-toggle-black-off-narrow.png} (100%) rename rtdata/images/themed/png/light/{square-toggle-black-on.png => square-toggle-black-on-narrow.png} (100%) rename rtdata/images/themed/png/light/{square-toggle-blue-off.png => square-toggle-blue-off-narrow.png} (100%) rename rtdata/images/themed/png/light/{square-toggle-blue-on.png => square-toggle-blue-on-narrow.png} (100%) rename rtdata/images/themed/png/light/{square-toggle-gray-off.png => square-toggle-gray-off-narrow.png} (100%) rename rtdata/images/themed/png/light/{square-toggle-gray-on.png => square-toggle-gray-on-narrow.png} (100%) rename rtdata/images/themed/png/light/{square-toggle-green-off.png => square-toggle-green-off-narrow.png} (100%) rename rtdata/images/themed/png/light/{square-toggle-green-on.png => square-toggle-green-on-narrow.png} (100%) rename rtdata/images/themed/png/light/{square-toggle-luminosity-off.png => square-toggle-luminosity-off-narrow.png} (100%) rename rtdata/images/themed/png/light/{square-toggle-luminosity-on.png => square-toggle-luminosity-on-narrow.png} (100%) rename rtdata/images/themed/png/light/{square-toggle-red-off.png => square-toggle-red-off-narrow.png} (100%) rename rtdata/images/themed/png/light/{square-toggle-red-on.png => square-toggle-red-on-narrow.png} (100%) rename rtdata/images/themed/png/light/{square-toggle-theme-off.png => square-toggle-theme-off-narrow.png} (100%) rename rtdata/images/themed/png/light/{square-toggle-theme-on.png => square-toggle-theme-on-narrow.png} (100%) rename rtdata/images/themed/png/light/{square-toggle-white-off.png => square-toggle-white-off-narrow.png} (100%) rename rtdata/images/themed/png/light/{square-toggle-white-on.png => square-toggle-white-on-narrow.png} (100%) rename rtdata/images/themed/svg/{square-toggle-black-off.svg => square-toggle-black-off-narrow.svg} (100%) rename rtdata/images/themed/svg/{square-toggle-black-on.svg => square-toggle-black-on-narrow.svg} (100%) rename rtdata/images/themed/svg/{square-toggle-blue-off.svg => square-toggle-blue-off-narrow.svg} (100%) rename rtdata/images/themed/svg/{square-toggle-blue-on.svg => square-toggle-blue-on-narrow.svg} (100%) rename rtdata/images/themed/svg/{square-toggle-gray-off.svg => square-toggle-gray-off-narrow.svg} (100%) rename rtdata/images/themed/svg/{square-toggle-gray-on.svg => square-toggle-gray-on-narrow.svg} (100%) rename rtdata/images/themed/svg/{square-toggle-green-off.svg => square-toggle-green-off-narrow.svg} (100%) rename rtdata/images/themed/svg/{square-toggle-green-on.svg => square-toggle-green-on-narrow.svg} (100%) rename rtdata/images/themed/svg/{square-toggle-luminosity-off.svg => square-toggle-luminosity-off-narrow.svg} (100%) rename rtdata/images/themed/svg/{square-toggle-luminosity-on.svg => square-toggle-luminosity-on-narrow.svg} (100%) rename rtdata/images/themed/svg/{square-toggle-red-off.svg => square-toggle-red-off-narrow.svg} (100%) rename rtdata/images/themed/svg/{square-toggle-red-on.svg => square-toggle-red-on-narrow.svg} (100%) rename rtdata/images/themed/svg/{square-toggle-theme-off.svg => square-toggle-theme-off-narrow.svg} (100%) rename rtdata/images/themed/svg/{square-toggle-theme-on.svg => square-toggle-theme-on-narrow.svg} (100%) rename rtdata/images/themed/svg/{square-toggle-white-off.svg => square-toggle-white-off-narrow.svg} (100%) rename rtdata/images/themed/svg/{square-toggle-white-on.svg => square-toggle-white-on-narrow.svg} (100%) diff --git a/rtdata/images/themed/png/dark/square-toggle-black-off.png b/rtdata/images/themed/png/dark/square-toggle-black-off-narrow.png similarity index 100% rename from rtdata/images/themed/png/dark/square-toggle-black-off.png rename to rtdata/images/themed/png/dark/square-toggle-black-off-narrow.png diff --git a/rtdata/images/themed/png/dark/square-toggle-black-on.png b/rtdata/images/themed/png/dark/square-toggle-black-on-narrow.png similarity index 100% rename from rtdata/images/themed/png/dark/square-toggle-black-on.png rename to rtdata/images/themed/png/dark/square-toggle-black-on-narrow.png diff --git a/rtdata/images/themed/png/dark/square-toggle-blue-off.png b/rtdata/images/themed/png/dark/square-toggle-blue-off-narrow.png similarity index 100% rename from rtdata/images/themed/png/dark/square-toggle-blue-off.png rename to rtdata/images/themed/png/dark/square-toggle-blue-off-narrow.png diff --git a/rtdata/images/themed/png/dark/square-toggle-blue-on.png b/rtdata/images/themed/png/dark/square-toggle-blue-on-narrow.png similarity index 100% rename from rtdata/images/themed/png/dark/square-toggle-blue-on.png rename to rtdata/images/themed/png/dark/square-toggle-blue-on-narrow.png diff --git a/rtdata/images/themed/png/dark/square-toggle-gray-off.png b/rtdata/images/themed/png/dark/square-toggle-gray-off-narrow.png similarity index 100% rename from rtdata/images/themed/png/dark/square-toggle-gray-off.png rename to rtdata/images/themed/png/dark/square-toggle-gray-off-narrow.png diff --git a/rtdata/images/themed/png/dark/square-toggle-gray-on.png b/rtdata/images/themed/png/dark/square-toggle-gray-on-narrow.png similarity index 100% rename from rtdata/images/themed/png/dark/square-toggle-gray-on.png rename to rtdata/images/themed/png/dark/square-toggle-gray-on-narrow.png diff --git a/rtdata/images/themed/png/dark/square-toggle-green-off.png b/rtdata/images/themed/png/dark/square-toggle-green-off-narrow.png similarity index 100% rename from rtdata/images/themed/png/dark/square-toggle-green-off.png rename to rtdata/images/themed/png/dark/square-toggle-green-off-narrow.png diff --git a/rtdata/images/themed/png/dark/square-toggle-green-on.png b/rtdata/images/themed/png/dark/square-toggle-green-on-narrow.png similarity index 100% rename from rtdata/images/themed/png/dark/square-toggle-green-on.png rename to rtdata/images/themed/png/dark/square-toggle-green-on-narrow.png diff --git a/rtdata/images/themed/png/dark/square-toggle-luminosity-off.png b/rtdata/images/themed/png/dark/square-toggle-luminosity-off-narrow.png similarity index 100% rename from rtdata/images/themed/png/dark/square-toggle-luminosity-off.png rename to rtdata/images/themed/png/dark/square-toggle-luminosity-off-narrow.png diff --git a/rtdata/images/themed/png/dark/square-toggle-luminosity-on.png b/rtdata/images/themed/png/dark/square-toggle-luminosity-on-narrow.png similarity index 100% rename from rtdata/images/themed/png/dark/square-toggle-luminosity-on.png rename to rtdata/images/themed/png/dark/square-toggle-luminosity-on-narrow.png diff --git a/rtdata/images/themed/png/dark/square-toggle-red-off.png b/rtdata/images/themed/png/dark/square-toggle-red-off-narrow.png similarity index 100% rename from rtdata/images/themed/png/dark/square-toggle-red-off.png rename to rtdata/images/themed/png/dark/square-toggle-red-off-narrow.png diff --git a/rtdata/images/themed/png/dark/square-toggle-red-on.png b/rtdata/images/themed/png/dark/square-toggle-red-on-narrow.png similarity index 100% rename from rtdata/images/themed/png/dark/square-toggle-red-on.png rename to rtdata/images/themed/png/dark/square-toggle-red-on-narrow.png diff --git a/rtdata/images/themed/png/dark/square-toggle-theme-off.png b/rtdata/images/themed/png/dark/square-toggle-theme-off-narrow.png similarity index 100% rename from rtdata/images/themed/png/dark/square-toggle-theme-off.png rename to rtdata/images/themed/png/dark/square-toggle-theme-off-narrow.png diff --git a/rtdata/images/themed/png/dark/square-toggle-theme-on.png b/rtdata/images/themed/png/dark/square-toggle-theme-on-narrow.png similarity index 100% rename from rtdata/images/themed/png/dark/square-toggle-theme-on.png rename to rtdata/images/themed/png/dark/square-toggle-theme-on-narrow.png diff --git a/rtdata/images/themed/png/dark/square-toggle-white-off.png b/rtdata/images/themed/png/dark/square-toggle-white-off-narrow.png similarity index 100% rename from rtdata/images/themed/png/dark/square-toggle-white-off.png rename to rtdata/images/themed/png/dark/square-toggle-white-off-narrow.png diff --git a/rtdata/images/themed/png/dark/square-toggle-white-on.png b/rtdata/images/themed/png/dark/square-toggle-white-on-narrow.png similarity index 100% rename from rtdata/images/themed/png/dark/square-toggle-white-on.png rename to rtdata/images/themed/png/dark/square-toggle-white-on-narrow.png diff --git a/rtdata/images/themed/png/light/square-toggle-black-off.png b/rtdata/images/themed/png/light/square-toggle-black-off-narrow.png similarity index 100% rename from rtdata/images/themed/png/light/square-toggle-black-off.png rename to rtdata/images/themed/png/light/square-toggle-black-off-narrow.png diff --git a/rtdata/images/themed/png/light/square-toggle-black-on.png b/rtdata/images/themed/png/light/square-toggle-black-on-narrow.png similarity index 100% rename from rtdata/images/themed/png/light/square-toggle-black-on.png rename to rtdata/images/themed/png/light/square-toggle-black-on-narrow.png diff --git a/rtdata/images/themed/png/light/square-toggle-blue-off.png b/rtdata/images/themed/png/light/square-toggle-blue-off-narrow.png similarity index 100% rename from rtdata/images/themed/png/light/square-toggle-blue-off.png rename to rtdata/images/themed/png/light/square-toggle-blue-off-narrow.png diff --git a/rtdata/images/themed/png/light/square-toggle-blue-on.png b/rtdata/images/themed/png/light/square-toggle-blue-on-narrow.png similarity index 100% rename from rtdata/images/themed/png/light/square-toggle-blue-on.png rename to rtdata/images/themed/png/light/square-toggle-blue-on-narrow.png diff --git a/rtdata/images/themed/png/light/square-toggle-gray-off.png b/rtdata/images/themed/png/light/square-toggle-gray-off-narrow.png similarity index 100% rename from rtdata/images/themed/png/light/square-toggle-gray-off.png rename to rtdata/images/themed/png/light/square-toggle-gray-off-narrow.png diff --git a/rtdata/images/themed/png/light/square-toggle-gray-on.png b/rtdata/images/themed/png/light/square-toggle-gray-on-narrow.png similarity index 100% rename from rtdata/images/themed/png/light/square-toggle-gray-on.png rename to rtdata/images/themed/png/light/square-toggle-gray-on-narrow.png diff --git a/rtdata/images/themed/png/light/square-toggle-green-off.png b/rtdata/images/themed/png/light/square-toggle-green-off-narrow.png similarity index 100% rename from rtdata/images/themed/png/light/square-toggle-green-off.png rename to rtdata/images/themed/png/light/square-toggle-green-off-narrow.png diff --git a/rtdata/images/themed/png/light/square-toggle-green-on.png b/rtdata/images/themed/png/light/square-toggle-green-on-narrow.png similarity index 100% rename from rtdata/images/themed/png/light/square-toggle-green-on.png rename to rtdata/images/themed/png/light/square-toggle-green-on-narrow.png diff --git a/rtdata/images/themed/png/light/square-toggle-luminosity-off.png b/rtdata/images/themed/png/light/square-toggle-luminosity-off-narrow.png similarity index 100% rename from rtdata/images/themed/png/light/square-toggle-luminosity-off.png rename to rtdata/images/themed/png/light/square-toggle-luminosity-off-narrow.png diff --git a/rtdata/images/themed/png/light/square-toggle-luminosity-on.png b/rtdata/images/themed/png/light/square-toggle-luminosity-on-narrow.png similarity index 100% rename from rtdata/images/themed/png/light/square-toggle-luminosity-on.png rename to rtdata/images/themed/png/light/square-toggle-luminosity-on-narrow.png diff --git a/rtdata/images/themed/png/light/square-toggle-red-off.png b/rtdata/images/themed/png/light/square-toggle-red-off-narrow.png similarity index 100% rename from rtdata/images/themed/png/light/square-toggle-red-off.png rename to rtdata/images/themed/png/light/square-toggle-red-off-narrow.png diff --git a/rtdata/images/themed/png/light/square-toggle-red-on.png b/rtdata/images/themed/png/light/square-toggle-red-on-narrow.png similarity index 100% rename from rtdata/images/themed/png/light/square-toggle-red-on.png rename to rtdata/images/themed/png/light/square-toggle-red-on-narrow.png diff --git a/rtdata/images/themed/png/light/square-toggle-theme-off.png b/rtdata/images/themed/png/light/square-toggle-theme-off-narrow.png similarity index 100% rename from rtdata/images/themed/png/light/square-toggle-theme-off.png rename to rtdata/images/themed/png/light/square-toggle-theme-off-narrow.png diff --git a/rtdata/images/themed/png/light/square-toggle-theme-on.png b/rtdata/images/themed/png/light/square-toggle-theme-on-narrow.png similarity index 100% rename from rtdata/images/themed/png/light/square-toggle-theme-on.png rename to rtdata/images/themed/png/light/square-toggle-theme-on-narrow.png diff --git a/rtdata/images/themed/png/light/square-toggle-white-off.png b/rtdata/images/themed/png/light/square-toggle-white-off-narrow.png similarity index 100% rename from rtdata/images/themed/png/light/square-toggle-white-off.png rename to rtdata/images/themed/png/light/square-toggle-white-off-narrow.png diff --git a/rtdata/images/themed/png/light/square-toggle-white-on.png b/rtdata/images/themed/png/light/square-toggle-white-on-narrow.png similarity index 100% rename from rtdata/images/themed/png/light/square-toggle-white-on.png rename to rtdata/images/themed/png/light/square-toggle-white-on-narrow.png diff --git a/rtdata/images/themed/svg/square-toggle-black-off.svg b/rtdata/images/themed/svg/square-toggle-black-off-narrow.svg similarity index 100% rename from rtdata/images/themed/svg/square-toggle-black-off.svg rename to rtdata/images/themed/svg/square-toggle-black-off-narrow.svg diff --git a/rtdata/images/themed/svg/square-toggle-black-on.svg b/rtdata/images/themed/svg/square-toggle-black-on-narrow.svg similarity index 100% rename from rtdata/images/themed/svg/square-toggle-black-on.svg rename to rtdata/images/themed/svg/square-toggle-black-on-narrow.svg diff --git a/rtdata/images/themed/svg/square-toggle-blue-off.svg b/rtdata/images/themed/svg/square-toggle-blue-off-narrow.svg similarity index 100% rename from rtdata/images/themed/svg/square-toggle-blue-off.svg rename to rtdata/images/themed/svg/square-toggle-blue-off-narrow.svg diff --git a/rtdata/images/themed/svg/square-toggle-blue-on.svg b/rtdata/images/themed/svg/square-toggle-blue-on-narrow.svg similarity index 100% rename from rtdata/images/themed/svg/square-toggle-blue-on.svg rename to rtdata/images/themed/svg/square-toggle-blue-on-narrow.svg diff --git a/rtdata/images/themed/svg/square-toggle-gray-off.svg b/rtdata/images/themed/svg/square-toggle-gray-off-narrow.svg similarity index 100% rename from rtdata/images/themed/svg/square-toggle-gray-off.svg rename to rtdata/images/themed/svg/square-toggle-gray-off-narrow.svg diff --git a/rtdata/images/themed/svg/square-toggle-gray-on.svg b/rtdata/images/themed/svg/square-toggle-gray-on-narrow.svg similarity index 100% rename from rtdata/images/themed/svg/square-toggle-gray-on.svg rename to rtdata/images/themed/svg/square-toggle-gray-on-narrow.svg diff --git a/rtdata/images/themed/svg/square-toggle-green-off.svg b/rtdata/images/themed/svg/square-toggle-green-off-narrow.svg similarity index 100% rename from rtdata/images/themed/svg/square-toggle-green-off.svg rename to rtdata/images/themed/svg/square-toggle-green-off-narrow.svg diff --git a/rtdata/images/themed/svg/square-toggle-green-on.svg b/rtdata/images/themed/svg/square-toggle-green-on-narrow.svg similarity index 100% rename from rtdata/images/themed/svg/square-toggle-green-on.svg rename to rtdata/images/themed/svg/square-toggle-green-on-narrow.svg diff --git a/rtdata/images/themed/svg/square-toggle-luminosity-off.svg b/rtdata/images/themed/svg/square-toggle-luminosity-off-narrow.svg similarity index 100% rename from rtdata/images/themed/svg/square-toggle-luminosity-off.svg rename to rtdata/images/themed/svg/square-toggle-luminosity-off-narrow.svg diff --git a/rtdata/images/themed/svg/square-toggle-luminosity-on.svg b/rtdata/images/themed/svg/square-toggle-luminosity-on-narrow.svg similarity index 100% rename from rtdata/images/themed/svg/square-toggle-luminosity-on.svg rename to rtdata/images/themed/svg/square-toggle-luminosity-on-narrow.svg diff --git a/rtdata/images/themed/svg/square-toggle-red-off.svg b/rtdata/images/themed/svg/square-toggle-red-off-narrow.svg similarity index 100% rename from rtdata/images/themed/svg/square-toggle-red-off.svg rename to rtdata/images/themed/svg/square-toggle-red-off-narrow.svg diff --git a/rtdata/images/themed/svg/square-toggle-red-on.svg b/rtdata/images/themed/svg/square-toggle-red-on-narrow.svg similarity index 100% rename from rtdata/images/themed/svg/square-toggle-red-on.svg rename to rtdata/images/themed/svg/square-toggle-red-on-narrow.svg diff --git a/rtdata/images/themed/svg/square-toggle-theme-off.svg b/rtdata/images/themed/svg/square-toggle-theme-off-narrow.svg similarity index 100% rename from rtdata/images/themed/svg/square-toggle-theme-off.svg rename to rtdata/images/themed/svg/square-toggle-theme-off-narrow.svg diff --git a/rtdata/images/themed/svg/square-toggle-theme-on.svg b/rtdata/images/themed/svg/square-toggle-theme-on-narrow.svg similarity index 100% rename from rtdata/images/themed/svg/square-toggle-theme-on.svg rename to rtdata/images/themed/svg/square-toggle-theme-on-narrow.svg diff --git a/rtdata/images/themed/svg/square-toggle-white-off.svg b/rtdata/images/themed/svg/square-toggle-white-off-narrow.svg similarity index 100% rename from rtdata/images/themed/svg/square-toggle-white-off.svg rename to rtdata/images/themed/svg/square-toggle-white-off-narrow.svg diff --git a/rtdata/images/themed/svg/square-toggle-white-on.svg b/rtdata/images/themed/svg/square-toggle-white-on-narrow.svg similarity index 100% rename from rtdata/images/themed/svg/square-toggle-white-on.svg rename to rtdata/images/themed/svg/square-toggle-white-on-narrow.svg diff --git a/rtgui/previewmodepanel.cc b/rtgui/previewmodepanel.cc index 4b821f298..086f6ab17 100644 --- a/rtgui/previewmodepanel.cc +++ b/rtgui/previewmodepanel.cc @@ -24,23 +24,23 @@ PreviewModePanel::PreviewModePanel (ImageArea* ia) : imageArea(ia) { - iR = new RTImage ("square-toggle-red-on.png"); - iG = new RTImage ("square-toggle-green-on.png"); - iB = new RTImage ("square-toggle-blue-on.png"); - iL = new RTImage ("square-toggle-luminosity-on.png"); - iBC0 = new RTImage ("square-toggle-theme-on.png"); - iBC1 = new RTImage ("square-toggle-black-on.png"); - iBC2 = new RTImage ("square-toggle-white-on.png"); - iBC3 = new RTImage ("square-toggle-gray-on.png"); + iR = new RTImage ("square-toggle-red-on-narrow.png"); + iG = new RTImage ("square-toggle-green-on-narrow.png"); + iB = new RTImage ("square-toggle-blue-on-narrow.png"); + iL = new RTImage ("square-toggle-luminosity-on-narrow.png"); + iBC0 = new RTImage ("square-toggle-theme-on-narrow.png"); + iBC1 = new RTImage ("square-toggle-black-on-narrow.png"); + iBC2 = new RTImage ("square-toggle-white-on-narrow.png"); + iBC3 = new RTImage ("square-toggle-gray-on-narrow.png"); - igR = new RTImage ("square-toggle-red-off.png"); - igG = new RTImage ("square-toggle-green-off.png"); - igB = new RTImage ("square-toggle-blue-off.png"); - igL = new RTImage ("square-toggle-luminosity-off.png"); - igBC0 = new RTImage ("square-toggle-theme-off.png"); - igBC1 = new RTImage ("square-toggle-black-off.png"); - igBC2 = new RTImage ("square-toggle-white-off.png"); - igBC3 = new RTImage ("square-toggle-gray-off.png"); + igR = new RTImage ("square-toggle-red-off-narrow.png"); + igG = new RTImage ("square-toggle-green-off-narrow.png"); + igB = new RTImage ("square-toggle-blue-off-narrow.png"); + igL = new RTImage ("square-toggle-luminosity-off-narrow.png"); + igBC0 = new RTImage ("square-toggle-theme-off-narrow.png"); + igBC1 = new RTImage ("square-toggle-black-off-narrow.png"); + igBC2 = new RTImage ("square-toggle-white-off-narrow.png"); + igBC3 = new RTImage ("square-toggle-gray-off-narrow.png"); backColor0 = Gtk::manage (new Gtk::ToggleButton ()); backColor0->get_style_context()->add_class("narrowbutton"); From d831e6fbf2557c913534acb419499527dc725fc1 Mon Sep 17 00:00:00 2001 From: Morgan Hardwood Date: Tue, 14 Aug 2018 00:46:40 +0200 Subject: [PATCH 27/28] Icon tweaks - Added missing icons, closes #4730 - Added high-contrast for cursors. --- rtdata/images/non-themed/png/empty.png | Bin 0 -> 81 bytes .../png/dark/color-picker-add-hicontrast.png | Bin 0 -> 639 bytes .../png/dark/color-picker-hicontrast.png | Bin 0 -> 628 bytes ...crosshair.png => crosshair-hicontrast.png} | Bin ...-closed.png => hand-closed-hicontrast.png} | Bin .../png/dark/node-move-x-hicontrast.png | Bin 0 -> 489 bytes .../png/dark/node-move-xy-hicontrast.png | Bin 0 -> 524 bytes .../png/dark/node-move-y-hicontrast.png | Bin 0 -> 469 bytes .../png/dark/rotate-aroundnode-hicontrast.png | Bin 0 -> 786 bytes .../themed/png/dark/rotate-aroundnode.png | Bin 0 -> 540 bytes .../png/light/color-picker-add-hicontrast.png | Bin 0 -> 639 bytes .../png/light/color-picker-hicontrast.png | Bin 0 -> 628 bytes ...crosshair.png => crosshair-hicontrast.png} | Bin ...-closed.png => hand-closed-hicontrast.png} | Bin .../png/light/node-move-x-hicontrast.png | Bin 0 -> 489 bytes .../png/light/node-move-xy-hicontrast.png | Bin 0 -> 524 bytes .../png/light/node-move-y-hicontrast.png | Bin 0 -> 469 bytes .../light/rotate-aroundnode-hicontrast.png | Bin 0 -> 786 bytes .../themed/png/light/rotate-aroundnode.png | Bin 0 -> 544 bytes .../svg/color-picker-add-hicontrast.svg | 142 ++++++++++++++++++ .../themed/svg/color-picker-hicontrast.svg | 137 +++++++++++++++++ ...crosshair.svg => crosshair-hicontrast.svg} | 0 ...-closed.svg => hand-closed-hicontrast.svg} | 0 .../themed/svg/node-move-x-hicontrast.svg | 120 +++++++++++++++ .../themed/svg/node-move-xy-hicontrast.svg | 130 ++++++++++++++++ .../themed/svg/node-move-y-hicontrast.svg | 120 +++++++++++++++ .../svg/rotate-aroundnode-hicontrast.svg | 118 +++++++++++++++ .../images/themed/svg/rotate-aroundnode.svg | 136 +++++++++++++++++ rtgui/cursormanager.cc | 16 +- 29 files changed, 911 insertions(+), 8 deletions(-) create mode 100644 rtdata/images/non-themed/png/empty.png create mode 100644 rtdata/images/themed/png/dark/color-picker-add-hicontrast.png create mode 100644 rtdata/images/themed/png/dark/color-picker-hicontrast.png rename rtdata/images/themed/png/dark/{crosshair.png => crosshair-hicontrast.png} (100%) rename rtdata/images/themed/png/dark/{hand-closed.png => hand-closed-hicontrast.png} (100%) create mode 100644 rtdata/images/themed/png/dark/node-move-x-hicontrast.png create mode 100644 rtdata/images/themed/png/dark/node-move-xy-hicontrast.png create mode 100644 rtdata/images/themed/png/dark/node-move-y-hicontrast.png create mode 100644 rtdata/images/themed/png/dark/rotate-aroundnode-hicontrast.png create mode 100644 rtdata/images/themed/png/dark/rotate-aroundnode.png create mode 100644 rtdata/images/themed/png/light/color-picker-add-hicontrast.png create mode 100644 rtdata/images/themed/png/light/color-picker-hicontrast.png rename rtdata/images/themed/png/light/{crosshair.png => crosshair-hicontrast.png} (100%) rename rtdata/images/themed/png/light/{hand-closed.png => hand-closed-hicontrast.png} (100%) create mode 100644 rtdata/images/themed/png/light/node-move-x-hicontrast.png create mode 100644 rtdata/images/themed/png/light/node-move-xy-hicontrast.png create mode 100644 rtdata/images/themed/png/light/node-move-y-hicontrast.png create mode 100644 rtdata/images/themed/png/light/rotate-aroundnode-hicontrast.png create mode 100644 rtdata/images/themed/png/light/rotate-aroundnode.png create mode 100644 rtdata/images/themed/svg/color-picker-add-hicontrast.svg create mode 100644 rtdata/images/themed/svg/color-picker-hicontrast.svg rename rtdata/images/themed/svg/{crosshair.svg => crosshair-hicontrast.svg} (100%) rename rtdata/images/themed/svg/{hand-closed.svg => hand-closed-hicontrast.svg} (100%) create mode 100644 rtdata/images/themed/svg/node-move-x-hicontrast.svg create mode 100644 rtdata/images/themed/svg/node-move-xy-hicontrast.svg create mode 100644 rtdata/images/themed/svg/node-move-y-hicontrast.svg create mode 100644 rtdata/images/themed/svg/rotate-aroundnode-hicontrast.svg create mode 100644 rtdata/images/themed/svg/rotate-aroundnode.svg diff --git a/rtdata/images/non-themed/png/empty.png b/rtdata/images/non-themed/png/empty.png new file mode 100644 index 0000000000000000000000000000000000000000..534ddcb72f7095c18e07739f7ee3be7747d667e7 GIT binary patch literal 81 zcmeAS@N?(olHy`uVBq!ia0vp^5+KaM1|%Pp+x`G?JY5_^JdVFT$jAufHB9)o{v8Jw aL&GXYP6-A^wQydLCI(MeKbLh*2~7Z@suFns literal 0 HcmV?d00001 diff --git a/rtdata/images/themed/png/dark/color-picker-add-hicontrast.png b/rtdata/images/themed/png/dark/color-picker-add-hicontrast.png new file mode 100644 index 0000000000000000000000000000000000000000..53eaabf6036423321b4c4e9d66920b9c5cf903f9 GIT binary patch literal 639 zcmeAS@N?(olHy`uVBq!ia0vp^5+KaM3?#3wJbMaA1(mo)lsM-XR2F5XXOu8FJ1aPr zloVwqm6l}Y=jjG#Bo?JQ=4584DrA(D6jnBy}7ANYP=o#oA4oPAKnl1}6-6gd+xhS&$WFSLOVtGhLYEfcAYN|qJa(lV!_B$IXpd!u!kH}&M2EHR8%s5q>PZ}uL7~m7)>R#XjWNzQS{qp6@Kn5Hz zf&q}r$;k;M_wL;bmqKPtnl$O$xpNQ^CMG5yUq44jr_|KcuV263ym^y@g99k_|NsA6 zx9_gsunEX@baa%HlWS~jOh`xos!2&n5#ahC092$<666=mPZT|UneMo~-TZr^$_gbs$>I~xudy#t&ZtyQOcQ84-^}voh!SR(o VLWefL)Y=IOBTrX9mvv4FO#tih?I!>L literal 0 HcmV?d00001 diff --git a/rtdata/images/themed/png/dark/color-picker-hicontrast.png b/rtdata/images/themed/png/dark/color-picker-hicontrast.png new file mode 100644 index 0000000000000000000000000000000000000000..c2592a8b79451f3d9dfbce2f4e08ec7d54ab9df4 GIT binary patch literal 628 zcmeAS@N?(olHy`uVBq!ia0vp^5+KaM3?#3wJbMaA1(mo)lsM-XR2F5XXOu8FJ1aPr zloVwqm6l}Y=jjG#Bo?JQ=4584DrA(D6jnBy}7ANYP=o#oA4oPAKnl1}6-6gd+xhS&$WFSLOVtGhLYEfcAYN|qJa(lV!_B$IXpd!u!kH}&M2EHR8%s5q>PZ}uL65tc!>R#XjWL~{`6-Yt=Gcz+I z7y!B3w{HiMuCA^?a_`=~KoTeeBr(C)uV2rdI|mVWbaYBhO$D;W#Kd}fdS=X+0c8LG z|9|zG^>^>y=iuN-N=mwN?WUZZ9MJs6#zy~s)xSU$N+m&l!3=WuL-b?ry?AVMVZtAa z%O6(xl%&@&onrZQ*OCAJfoCC|%fc=~Pb# z^DHBaKmY&VlndV$`C*#*Nu}q8+e`x|I=fa(TI?(Nj{EtHpK||YUf1UZhjbSge&hR* z^-NqzWgh=rqi4PrHVJR-Em-OdtoJ26-nk`@ee1Uv?&nIpa$?oDEZ@3suWvdKX>%!$ z|CjZ{HLcorOfELAG4d>1rl%X3X6CPIsWC6unNQ`t(l*=pwS_$1yas8?KzA~Dy85}S Ib4q9e0G=k?X#fBK literal 0 HcmV?d00001 diff --git a/rtdata/images/themed/png/dark/crosshair.png b/rtdata/images/themed/png/dark/crosshair-hicontrast.png similarity index 100% rename from rtdata/images/themed/png/dark/crosshair.png rename to rtdata/images/themed/png/dark/crosshair-hicontrast.png diff --git a/rtdata/images/themed/png/dark/hand-closed.png b/rtdata/images/themed/png/dark/hand-closed-hicontrast.png similarity index 100% rename from rtdata/images/themed/png/dark/hand-closed.png rename to rtdata/images/themed/png/dark/hand-closed-hicontrast.png diff --git a/rtdata/images/themed/png/dark/node-move-x-hicontrast.png b/rtdata/images/themed/png/dark/node-move-x-hicontrast.png new file mode 100644 index 0000000000000000000000000000000000000000..92a1c49e2befb702f3c3555f7946b337c2d7b8bf GIT binary patch literal 489 zcmeAS@N?(olHy`uVBq!ia0vp^5+KaM3?#3wJbMaA1(mo)lsM-XR2F5XXOu8FJ1aPr zloVwqm6l}Y=jjG#Bo?JQ=4584DrA(D6jnBy}7ANYP=o#oA4oPAKnl1}6-6gd+xhS&$WFSLOVtGhLYEfcAYN|qJa(lV!_B$IXpd!u!kH}&M2EHR8%s5q>PZ}s_AK(+>>R#Z(&CSii!U7Zs4Gjg7 zY;0^m5&{-3TnJ<+D=YKx@F*%OW@csrx%~Y6K<@wl|G$0v_P0RoEl^0fB*-tA;c=4Y zx3q7JeEZ1vzvrVa-Fmgi z_xdKKJx`pQ1dOMZl|TPt5x%WC^t{CPN0JvLQa+>}7E@kmw18#8i2!lQ^)nofBs6gF xFb7&ZwtJ|Xm3z8aYWnh?`sYPQ`3g_*%bwW5BB^5dNDyctgQu&X%Q~loCIBnnBy}7ANYP=o#oA4oPAKnl1}6-6gd+xhS&$WFSLOVtGhLYEfcAYN|qJa(lV!_B$IXpd!u!kH}&M2EHR8%s5q>PZ}s_6W|l#>R#XjWGX2sEn2jQjg5_k zg(WmJ6et1#+}zx}U=R}%1Ee!EGlAm&|NsB~{rlIiUuCDM9|Q6QN`m}?8PdM|`L zQJeSa{T1KVeVe4OSOt{p^K@|x(KtVK(rdnE1CG|Wy-v}w8{hw5C-gk&PQvUzSwAKf zKe&+jYjMz}-xA7MwW}0Ef*fYge7;QL$3dH#UnVcA_ufvZ+xw|?Nkvn|s=&{&43_H7 zPv6}(ln#?%TEQS9w82ixE|qCB1N)f=EC%hd=UBQz9PidFjDK7gd7zopr0M+}xO#lD@ literal 0 HcmV?d00001 diff --git a/rtdata/images/themed/png/dark/node-move-y-hicontrast.png b/rtdata/images/themed/png/dark/node-move-y-hicontrast.png new file mode 100644 index 0000000000000000000000000000000000000000..e2fc55da844ad4d8db37bbbceb44601e95aedb17 GIT binary patch literal 469 zcmeAS@N?(olHy`uVBq!ia0vp^5+KaM3?#3wJbMaA1(mo)lsM-XR2F5XXOu8FJ1aPr zloVwqm6l}Y=jjG#Bo?JQ=4584DrA(D6jnBy}7ANYP=o#oA4oPAKnl1}6-6gd+xhS&$WFSLOVtGhLYEfcAYN|qJa(lV!_B$IXpd!u!kH}&M2EHR8%s5q>PZ}s_9N-h;>R#ZZtgOt<%^edH6A}^v zWH2%^GBGg$<$+-F;>El$@c;jRpvbpx-)f?7zW}oMN`m}?8NPh|_VwAf6h7^LEADSN zqJ6s?D3j#r;uxZFe(j{&Tn7v|oU1p6-ahy3|Nb(AZ$@bet#gmF^td?xVA#Aq+w0X! zqbTV|61KCSzGFF(y6us++v`0mr0N`I9KFgN_)$j9_>nAgU(>_g54-|8%ipqFOxdqz erCZmgu5SH|dB#MOW${4U7(8A5T-G@yGywqD2Bjqc literal 0 HcmV?d00001 diff --git a/rtdata/images/themed/png/dark/rotate-aroundnode-hicontrast.png b/rtdata/images/themed/png/dark/rotate-aroundnode-hicontrast.png new file mode 100644 index 0000000000000000000000000000000000000000..d8929ac4229b246e64f30ae806cd2517a2c1e104 GIT binary patch literal 786 zcmeAS@N?(olHy`uVBq!ia0vp^5+KaM3?#3wJbMaA1(mo)lsM-XR2F5XXOu8FJ1aPr zloVwqm6l}Y=jjG#Bo?JQ=4584DrA(D6jnBy}7ANYP=o#oA4oPAKnl1}6-6gd+xhS&$WFSLOVtGhLYEfcAYN|qJa(lV!_B$IXpd!u!kH}&M2EHR8%s5q>PZ}sVC%`Af_5c6>-@bhV^7#1pfFutO z4>vcrdw~x-J3EjoE-v2E(&FRe16KeMhjXu7xdLP}F);zj@bK^n6D9x^oIQKCw6ruc zGxO%noBI0t2M!##bLUQIXlO`Ch>(!b^5x6z?CjRBU;qC7dsbG~;NW0kVPOFQfrSef z@`8bgh{)r|kAV)`9o85FG}pK!$S?TWv$S)pcds%$7P#~Dj^a`A4(_liF34 z`|RO^XE&cc`}%e9vs=%eReoJP=h>VYTb^AmI{uu2fl<)Y#W6(VeCec@Wrq|5TGbUF zOqly-x0>79TX()5r3K*O4u4E@)f;(yRA!I!Gm?feFepcx@Jbr*$2|u+g__18QUjnDc_pM zCTDu!?*-P6yCy#mcqVm(@6F%rg^F@>+}didHmpsYyyEq;ldeKSudFgW1p+J*1P|wy?biy iHQmlxP3*wpzYLcSiqE|`@fs+RGkCiCxvXERK!`}5n0T@z;^_M8K-LVNdpB90(?ST-3xq9pFVvC49=Z92V|c; zdltxp3j)~?5r~>IFTXtl>J=yn@(X5Ye6~5BH%DH_WueKfz^YT)o7F!8J506g! z6qW{=xPu`IHy1DY!sv07lSx%#($py?4Izs;n47N)wVgPw<#5g=lT9o+nVqdIOX2w< z7Ut<2KQeVp)tJ*cDIirLK;zh41``IR8!WXv5B#2q*(~Y$;LtZo&FR^MNlJ5s*DP7m nA0Vc^KBVEv+ey4UEDQ{@ES0;wX8jTZx|+e$)z4*}Q$iB}j3&)^ literal 0 HcmV?d00001 diff --git a/rtdata/images/themed/png/light/color-picker-add-hicontrast.png b/rtdata/images/themed/png/light/color-picker-add-hicontrast.png new file mode 100644 index 0000000000000000000000000000000000000000..53eaabf6036423321b4c4e9d66920b9c5cf903f9 GIT binary patch literal 639 zcmeAS@N?(olHy`uVBq!ia0vp^5+KaM3?#3wJbMaA1(mo)lsM-XR2F5XXOu8FJ1aPr zloVwqm6l}Y=jjG#Bo?JQ=4584DrA(D6jnBy}7ANYP=o#oA4oPAKnl1}6-6gd+xhS&$WFSLOVtGhLYEfcAYN|qJa(lV!_B$IXpd!u!kH}&M2EHR8%s5q>PZ}uL7~m7)>R#XjWNzQS{qp6@Kn5Hz zf&q}r$;k;M_wL;bmqKPtnl$O$xpNQ^CMG5yUq44jr_|KcuV263ym^y@g99k_|NsA6 zx9_gsunEX@baa%HlWS~jOh`xos!2&n5#ahC092$<666=mPZT|UneMo~-TZr^$_gbs$>I~xudy#t&ZtyQOcQ84-^}voh!SR(o VLWefL)Y=IOBTrX9mvv4FO#tih?I!>L literal 0 HcmV?d00001 diff --git a/rtdata/images/themed/png/light/color-picker-hicontrast.png b/rtdata/images/themed/png/light/color-picker-hicontrast.png new file mode 100644 index 0000000000000000000000000000000000000000..c2592a8b79451f3d9dfbce2f4e08ec7d54ab9df4 GIT binary patch literal 628 zcmeAS@N?(olHy`uVBq!ia0vp^5+KaM3?#3wJbMaA1(mo)lsM-XR2F5XXOu8FJ1aPr zloVwqm6l}Y=jjG#Bo?JQ=4584DrA(D6jnBy}7ANYP=o#oA4oPAKnl1}6-6gd+xhS&$WFSLOVtGhLYEfcAYN|qJa(lV!_B$IXpd!u!kH}&M2EHR8%s5q>PZ}uL65tc!>R#XjWL~{`6-Yt=Gcz+I z7y!B3w{HiMuCA^?a_`=~KoTeeBr(C)uV2rdI|mVWbaYBhO$D;W#Kd}fdS=X+0c8LG z|9|zG^>^>y=iuN-N=mwN?WUZZ9MJs6#zy~s)xSU$N+m&l!3=WuL-b?ry?AVMVZtAa z%O6(xl%&@&onrZQ*OCAJfoCC|%fc=~Pb# z^DHBaKmY&VlndV$`C*#*Nu}q8+e`x|I=fa(TI?(Nj{EtHpK||YUf1UZhjbSge&hR* z^-NqzWgh=rqi4PrHVJR-Em-OdtoJ26-nk`@ee1Uv?&nIpa$?oDEZ@3suWvdKX>%!$ z|CjZ{HLcorOfELAG4d>1rl%X3X6CPIsWC6unNQ`t(l*=pwS_$1yas8?KzA~Dy85}S Ib4q9e0G=k?X#fBK literal 0 HcmV?d00001 diff --git a/rtdata/images/themed/png/light/crosshair.png b/rtdata/images/themed/png/light/crosshair-hicontrast.png similarity index 100% rename from rtdata/images/themed/png/light/crosshair.png rename to rtdata/images/themed/png/light/crosshair-hicontrast.png diff --git a/rtdata/images/themed/png/light/hand-closed.png b/rtdata/images/themed/png/light/hand-closed-hicontrast.png similarity index 100% rename from rtdata/images/themed/png/light/hand-closed.png rename to rtdata/images/themed/png/light/hand-closed-hicontrast.png diff --git a/rtdata/images/themed/png/light/node-move-x-hicontrast.png b/rtdata/images/themed/png/light/node-move-x-hicontrast.png new file mode 100644 index 0000000000000000000000000000000000000000..92a1c49e2befb702f3c3555f7946b337c2d7b8bf GIT binary patch literal 489 zcmeAS@N?(olHy`uVBq!ia0vp^5+KaM3?#3wJbMaA1(mo)lsM-XR2F5XXOu8FJ1aPr zloVwqm6l}Y=jjG#Bo?JQ=4584DrA(D6jnBy}7ANYP=o#oA4oPAKnl1}6-6gd+xhS&$WFSLOVtGhLYEfcAYN|qJa(lV!_B$IXpd!u!kH}&M2EHR8%s5q>PZ}s_AK(+>>R#Z(&CSii!U7Zs4Gjg7 zY;0^m5&{-3TnJ<+D=YKx@F*%OW@csrx%~Y6K<@wl|G$0v_P0RoEl^0fB*-tA;c=4Y zx3q7JeEZ1vzvrVa-Fmgi z_xdKKJx`pQ1dOMZl|TPt5x%WC^t{CPN0JvLQa+>}7E@kmw18#8i2!lQ^)nofBs6gF xFb7&ZwtJ|Xm3z8aYWnh?`sYPQ`3g_*%bwW5BB^5dNDyctgQu&X%Q~loCIBnnBy}7ANYP=o#oA4oPAKnl1}6-6gd+xhS&$WFSLOVtGhLYEfcAYN|qJa(lV!_B$IXpd!u!kH}&M2EHR8%s5q>PZ}s_6W|l#>R#XjWGX2sEn2jQjg5_k zg(WmJ6et1#+}zx}U=R}%1Ee!EGlAm&|NsB~{rlIiUuCDM9|Q6QN`m}?8PdM|`L zQJeSa{T1KVeVe4OSOt{p^K@|x(KtVK(rdnE1CG|Wy-v}w8{hw5C-gk&PQvUzSwAKf zKe&+jYjMz}-xA7MwW}0Ef*fYge7;QL$3dH#UnVcA_ufvZ+xw|?Nkvn|s=&{&43_H7 zPv6}(ln#?%TEQS9w82ixE|qCB1N)f=EC%hd=UBQz9PidFjDK7gd7zopr0M+}xO#lD@ literal 0 HcmV?d00001 diff --git a/rtdata/images/themed/png/light/node-move-y-hicontrast.png b/rtdata/images/themed/png/light/node-move-y-hicontrast.png new file mode 100644 index 0000000000000000000000000000000000000000..e2fc55da844ad4d8db37bbbceb44601e95aedb17 GIT binary patch literal 469 zcmeAS@N?(olHy`uVBq!ia0vp^5+KaM3?#3wJbMaA1(mo)lsM-XR2F5XXOu8FJ1aPr zloVwqm6l}Y=jjG#Bo?JQ=4584DrA(D6jnBy}7ANYP=o#oA4oPAKnl1}6-6gd+xhS&$WFSLOVtGhLYEfcAYN|qJa(lV!_B$IXpd!u!kH}&M2EHR8%s5q>PZ}s_9N-h;>R#ZZtgOt<%^edH6A}^v zWH2%^GBGg$<$+-F;>El$@c;jRpvbpx-)f?7zW}oMN`m}?8NPh|_VwAf6h7^LEADSN zqJ6s?D3j#r;uxZFe(j{&Tn7v|oU1p6-ahy3|Nb(AZ$@bet#gmF^td?xVA#Aq+w0X! zqbTV|61KCSzGFF(y6us++v`0mr0N`I9KFgN_)$j9_>nAgU(>_g54-|8%ipqFOxdqz erCZmgu5SH|dB#MOW${4U7(8A5T-G@yGywqD2Bjqc literal 0 HcmV?d00001 diff --git a/rtdata/images/themed/png/light/rotate-aroundnode-hicontrast.png b/rtdata/images/themed/png/light/rotate-aroundnode-hicontrast.png new file mode 100644 index 0000000000000000000000000000000000000000..d8929ac4229b246e64f30ae806cd2517a2c1e104 GIT binary patch literal 786 zcmeAS@N?(olHy`uVBq!ia0vp^5+KaM3?#3wJbMaA1(mo)lsM-XR2F5XXOu8FJ1aPr zloVwqm6l}Y=jjG#Bo?JQ=4584DrA(D6jnBy}7ANYP=o#oA4oPAKnl1}6-6gd+xhS&$WFSLOVtGhLYEfcAYN|qJa(lV!_B$IXpd!u!kH}&M2EHR8%s5q>PZ}sVC%`Af_5c6>-@bhV^7#1pfFutO z4>vcrdw~x-J3EjoE-v2E(&FRe16KeMhjXu7xdLP}F);zj@bK^n6D9x^oIQKCw6ruc zGxO%noBI0t2M!##bLUQIXlO`Ch>(!b^5x6z?CjRBU;qC7dsbG~;NW0kVPOFQfrSef z@`8bgh{)r|kAV)`9o85FG}pK!$S?TWv$S)pcds%$7P#~Dj^a`A4(_liF34 z`|RO^XE&cc`}%e9vs=%eReoJP=h>VYTb^AmI{uu2fl<)Y#W6(VeCec@Wrq|5TGbUF zOqly-x0>79TX()5r3K*O4u4E@)f;(yRA!I!Gm?feFepcx@Jbr*$2|u+g__18QUjnDc_pM zCTDu!?*-P6yCy#mcqVm(@6F%rg^F@>+}didHmpsYyyEq;ldeKSudFgW1p+J*1P|wy?biy iHQmlxP3*wpzYLcSiqE|`@fs+RGkCiCxvXnBy}7ANYP=o#oA4oPAKnl1}6-6gd+xhS&$WFSLOVtGhLYEfcAYN|qJa(lV!_B$IXpd!u!kH}&M2EHR8%s5q>PZ}s_7T^=&>R#ZZrKP2!qM`~0a0Y}6 zAvHBMm6es%)YRZ=6ph&hfhGu*1o;Is@GQI)ubPJHD(@=j+6xb{h0hE zchYy)9|v~K;C&}pRH(G0?s<6Q+DjQ%uQ>;A;CtUV$$16~_pIi*8XCWsdA2_*sHqQJ pptm5f>$u-raknR;XX<}2Y_?)OKV`x1&p;P5c)I$ztaD0e0s#3?!k7R6 literal 0 HcmV?d00001 diff --git a/rtdata/images/themed/svg/color-picker-add-hicontrast.svg b/rtdata/images/themed/svg/color-picker-add-hicontrast.svg new file mode 100644 index 000000000..3d51dd31f --- /dev/null +++ b/rtdata/images/themed/svg/color-picker-add-hicontrast.svg @@ -0,0 +1,142 @@ + + + + + + + + + + + + image/svg+xml + + + + + Maciej Dworak + + + + + + + + RawTherapee icon. + + + + + + + + + + + + + + + + + + + + + + diff --git a/rtdata/images/themed/svg/color-picker-hicontrast.svg b/rtdata/images/themed/svg/color-picker-hicontrast.svg new file mode 100644 index 000000000..867f9730b --- /dev/null +++ b/rtdata/images/themed/svg/color-picker-hicontrast.svg @@ -0,0 +1,137 @@ + + + + + + + + + + + + image/svg+xml + + + + + Maciej Dworak + + + + + + + + RawTherapee icon. + + + + + + + + + + + + + + + + + + + + + diff --git a/rtdata/images/themed/svg/crosshair.svg b/rtdata/images/themed/svg/crosshair-hicontrast.svg similarity index 100% rename from rtdata/images/themed/svg/crosshair.svg rename to rtdata/images/themed/svg/crosshair-hicontrast.svg diff --git a/rtdata/images/themed/svg/hand-closed.svg b/rtdata/images/themed/svg/hand-closed-hicontrast.svg similarity index 100% rename from rtdata/images/themed/svg/hand-closed.svg rename to rtdata/images/themed/svg/hand-closed-hicontrast.svg diff --git a/rtdata/images/themed/svg/node-move-x-hicontrast.svg b/rtdata/images/themed/svg/node-move-x-hicontrast.svg new file mode 100644 index 000000000..6e6079901 --- /dev/null +++ b/rtdata/images/themed/svg/node-move-x-hicontrast.svg @@ -0,0 +1,120 @@ + + + + + + + + + + + + image/svg+xml + + + + + Maciej Dworak + + + + + + + + RawTherapee icon. + + + + + + + + + + + + + + + + + + diff --git a/rtdata/images/themed/svg/node-move-xy-hicontrast.svg b/rtdata/images/themed/svg/node-move-xy-hicontrast.svg new file mode 100644 index 000000000..9c3915804 --- /dev/null +++ b/rtdata/images/themed/svg/node-move-xy-hicontrast.svg @@ -0,0 +1,130 @@ + + + + + + + + + + + + image/svg+xml + + + + + Maciej Dworak + + + + + + + + RawTherapee icon. + + + + + + + + + + + + + + + + + + + + diff --git a/rtdata/images/themed/svg/node-move-y-hicontrast.svg b/rtdata/images/themed/svg/node-move-y-hicontrast.svg new file mode 100644 index 000000000..fe7b285e7 --- /dev/null +++ b/rtdata/images/themed/svg/node-move-y-hicontrast.svg @@ -0,0 +1,120 @@ + + + + + + + + + + + + image/svg+xml + + + + + Maciej Dworak + + + + + + + + RawTherapee icon. + + + + + + + + + + + + + + + + + + diff --git a/rtdata/images/themed/svg/rotate-aroundnode-hicontrast.svg b/rtdata/images/themed/svg/rotate-aroundnode-hicontrast.svg new file mode 100644 index 000000000..fda645c55 --- /dev/null +++ b/rtdata/images/themed/svg/rotate-aroundnode-hicontrast.svg @@ -0,0 +1,118 @@ + + + + + + + + + + + + image/svg+xml + + + + + Maciej Dworak + + + + + + + + RawTherapee icon. + + + + + + + + + + + + + + + + + diff --git a/rtdata/images/themed/svg/rotate-aroundnode.svg b/rtdata/images/themed/svg/rotate-aroundnode.svg new file mode 100644 index 000000000..67ac406fa --- /dev/null +++ b/rtdata/images/themed/svg/rotate-aroundnode.svg @@ -0,0 +1,136 @@ + + + + + + + + + + + + image/svg+xml + + + + + Maciej Dworak + + + + + + + + RawTherapee icon. + + + + + + + + + + + + + + + + + + + + + diff --git a/rtgui/cursormanager.cc b/rtgui/cursormanager.cc index d1973dcca..6c280ee8c 100644 --- a/rtgui/cursormanager.cc +++ b/rtgui/cursormanager.cc @@ -51,15 +51,15 @@ void CursorManager::init (Glib::RefPtr mainWindow) cAdd = Gdk::Cursor::create (display, Gdk::PLUS); cWait = Gdk::Cursor::create (display, Gdk::CLOCK); - Glib::RefPtr hand = RTImage::createFromFile ("crosshair.png"); - Glib::RefPtr close_hand = RTImage::createFromFile ("hand-closed.png"); - Glib::RefPtr wbpick = RTImage::createFromFile ("color-picker.png"); - Glib::RefPtr cpick = RTImage::createFromFile ("color-picker-add.png"); + Glib::RefPtr hand = RTImage::createFromFile ("crosshair-hicontrast.png"); + Glib::RefPtr close_hand = RTImage::createFromFile ("hand-closed-hicontrast.png"); + Glib::RefPtr wbpick = RTImage::createFromFile ("color-picker-hicontrast.png"); + Glib::RefPtr cpick = RTImage::createFromFile ("color-picker-add-hicontrast.png"); Glib::RefPtr empty = RTImage::createFromFile ("empty.png"); - Glib::RefPtr move2D = RTImage::createFromFile ("node-move-xy.png"); - Glib::RefPtr move1DH = RTImage::createFromFile ("node-move-x.png"); - Glib::RefPtr move1DV = RTImage::createFromFile ("node-move-y.png"); - Glib::RefPtr moveRotate = RTImage::createFromFile ("move-rotate.png"); + Glib::RefPtr move2D = RTImage::createFromFile ("node-move-xy-hicontrast.png"); + Glib::RefPtr move1DH = RTImage::createFromFile ("node-move-x-hicontrast.png"); + Glib::RefPtr move1DV = RTImage::createFromFile ("node-move-y-hicontrast.png"); + Glib::RefPtr moveRotate = RTImage::createFromFile ("rotate-aroundnode-hicontrast.png"); cHand = hand ? Gdk::Cursor::create (cAdd->get_display(), hand, 12, 12) : Gdk::Cursor::create (cAdd->get_display(), Gdk::HAND2); cClosedHand = close_hand ? Gdk::Cursor::create (cAdd->get_display(), close_hand, 12, 12) : Gdk::Cursor::create (cAdd->get_display(), Gdk::HAND2); From 584163fbaa9b3517b26cb551aa74fe22cbfd0e3c Mon Sep 17 00:00:00 2001 From: heckflosse Date: Wed, 15 Aug 2018 19:27:37 +0200 Subject: [PATCH 28/28] Segfault when processing image in queue for fast export, fixes #4734 --- rtengine/ipresize.cc | 1 + 1 file changed, 1 insertion(+) diff --git a/rtengine/ipresize.cc b/rtengine/ipresize.cc index f9ff94ef9..b3275b2e4 100644 --- a/rtengine/ipresize.cc +++ b/rtengine/ipresize.cc @@ -373,6 +373,7 @@ float ImProcFunctions::resizeScale (const ProcParams* params, int fw, int fh, in } else { dScale = (double)params->resize.height / (double)refh; } + dScale = (dScale > 1.0 && !params->resize.allowUpscaling) ? 1.0 : dScale; break;