Merge branch 'dev' of https://github.com/Beep6581/RawTherapee into defish
This commit is contained in:
Alexander Brock
@@ -24,7 +24,13 @@ endif()
|
||||
if(UNIX)
|
||||
configure_file("${CMAKE_CURRENT_SOURCE_DIR}/rawtherapee.desktop.in" "${CMAKE_CURRENT_BINARY_DIR}/rawtherapee.desktop")
|
||||
install(FILES "${CMAKE_CURRENT_BINARY_DIR}/rawtherapee.desktop" DESTINATION ${DESKTOPDIR})
|
||||
install(DIRECTORY "${ICONTHEMEDIR}/hicolor" DESTINATION "${ICONSDIR}")
|
||||
if(BUILD_BUNDLE)
|
||||
install(DIRECTORY "${ICONTHEMEDIR}/hicolor" DESTINATION "${ICONSDIR}")
|
||||
else()
|
||||
# For theme 'hicolor' (containing app icon), 'index.theme' shall not be installed for Linux build with 'BUILD_BUNDLE=OFF' option
|
||||
# (to avoid conflict with existing 'index.theme' distro file)
|
||||
install(DIRECTORY "${ICONTHEMEDIR}/hicolor" DESTINATION "${ICONSDIR}" PATTERN "index.theme" EXCLUDE)
|
||||
endif()
|
||||
endif()
|
||||
|
||||
install(FILES ${LANGUAGEFILES} DESTINATION "${DATADIR}/languages")
|
||||
|
||||
98
rtdata/icons/rawtherapee/scalable/apps/folder-subfolder.svg
Normal file
98
rtdata/icons/rawtherapee/scalable/apps/folder-subfolder.svg
Normal file
@@ -0,0 +1,98 @@
|
||||
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
|
||||
<!-- Created with Inkscape (http://www.inkscape.org/) -->
|
||||
|
||||
<svg
|
||||
width="24px"
|
||||
height="24px"
|
||||
viewBox="0 0 24 24"
|
||||
version="1.1"
|
||||
id="SVGRoot"
|
||||
inkscape:export-filename="/tmp/template.png"
|
||||
inkscape:export-xdpi="96"
|
||||
inkscape:export-ydpi="96"
|
||||
inkscape:version="1.2.2 (b0a8486541, 2022-12-01)"
|
||||
sodipodi:docname="folder-subfolder.svg"
|
||||
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
|
||||
xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
|
||||
xmlns="http://www.w3.org/2000/svg"
|
||||
xmlns:svg="http://www.w3.org/2000/svg"
|
||||
xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#">
|
||||
<sodipodi:namedview
|
||||
id="base"
|
||||
pagecolor="#E0E1E2"
|
||||
bordercolor="#666768"
|
||||
borderopacity="1.0"
|
||||
inkscape:pageopacity="0"
|
||||
inkscape:pageshadow="2"
|
||||
inkscape:zoom="27.559042"
|
||||
inkscape:cx="11.067148"
|
||||
inkscape:cy="11.212291"
|
||||
inkscape:document-units="px"
|
||||
inkscape:current-layer="layer1"
|
||||
showgrid="true"
|
||||
inkscape:window-width="1920"
|
||||
inkscape:window-height="1041"
|
||||
inkscape:window-x="0"
|
||||
inkscape:window-y="0"
|
||||
inkscape:window-maximized="1"
|
||||
inkscape:grid-bbox="true"
|
||||
inkscape:pagecheckerboard="false"
|
||||
inkscape:snap-bbox="true"
|
||||
inkscape:bbox-nodes="true"
|
||||
inkscape:snap-others="false"
|
||||
inkscape:object-nodes="true"
|
||||
inkscape:snap-grids="false"
|
||||
inkscape:snap-bbox-midpoints="false"
|
||||
inkscape:snap-smooth-nodes="true"
|
||||
inkscape:snap-midpoints="true"
|
||||
inkscape:snap-intersection-paths="true"
|
||||
inkscape:object-paths="true"
|
||||
inkscape:showpageshadow="2"
|
||||
inkscape:deskcolor="#E0E1E2">
|
||||
<inkscape:grid
|
||||
type="xygrid"
|
||||
id="grid1374"
|
||||
originx="1"
|
||||
originy="1"
|
||||
empspacing="11"
|
||||
dotted="false"
|
||||
spacingx="1"
|
||||
spacingy="1"
|
||||
visible="true" />
|
||||
</sodipodi:namedview>
|
||||
<defs
|
||||
id="defs815" />
|
||||
<metadata
|
||||
id="metadata818">
|
||||
<rdf:RDF />
|
||||
</metadata>
|
||||
<g
|
||||
id="layer1"
|
||||
inkscape:groupmode="layer"
|
||||
inkscape:label="Layer 1">
|
||||
<path
|
||||
style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;font-variant-ligatures:normal;font-variant-position:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-alternates:normal;font-feature-settings:normal;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;writing-mode:lr-tb;direction:ltr;text-orientation:mixed;dominant-baseline:auto;baseline-shift:baseline;text-anchor:start;white-space:normal;shape-padding:0;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:0.5;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;vector-effect:none;fill:#cccccc;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
|
||||
d="M 8.3845376,8 C 8.094003,8 7.7740668,8.0155229 7.4612704,8.2668157 7.148474,8.5181086 7.055613,8.9356452 7.0631644,9.2267877 V 19.533781 c -8.84e-5,0.199356 0.082156,0.389899 0.2272874,0.526573 0.2698504,0.283712 0.5071187,0.520303 0.7905739,0.765991 -0.086082,-0.07558 -0.2899772,-0.262658 -0.2400017,-0.577429 l 1.5331317,-7.333295 c 0.061673,-0.345222 0.3622328,-0.596383 0.7129203,-0.595747 h 10.693806 v -2.030059 l -0.0014,0.0056 c 0.0021,-0.28168 -0.08163,-0.6906547 -0.395249,-0.9458534 C 20.070572,9.094409 19.749426,9.0799684 19.458096,9.0799684 H 12.80182 L 12.450301,8.4785743 C 12.405002,8.4009886 12.345637,8.332527 12.275248,8.2766978 12.119431,8.1534118 11.88987,8 11.527034,8 Z"
|
||||
id="path1026"
|
||||
inkscape:connector-curvature="0"
|
||||
sodipodi:nodetypes="sscccccccccccscccss" />
|
||||
<path
|
||||
style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;font-variant-ligatures:normal;font-variant-position:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-alternates:normal;font-feature-settings:normal;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;writing-mode:lr-tb;direction:ltr;text-orientation:mixed;dominant-baseline:auto;baseline-shift:baseline;text-anchor:start;white-space:normal;shape-padding:0;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:0.9;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;vector-effect:none;fill:#cccccc;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.85216;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;paint-order:normal;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
|
||||
d="M 10.087076,12.319875 C 9.7363885,12.319329 9.4358285,12.53473 9.3741557,12.830801 L 7.841024,20.248916 c -0.07805,0.379479 0.2622,0.727446 0.7115087,0.727646 H 20.824645 c 0.350155,-4.1e-5 0.649929,-0.215306 0.711508,-0.510926 l 1.534544,-7.418115 c 0.07815,-0.379963 -0.263039,-0.728199 -0.71292,-0.727646 z"
|
||||
id="rect1030"
|
||||
inkscape:connector-curvature="0"
|
||||
sodipodi:nodetypes="ccccccccc" />
|
||||
<g
|
||||
id="g1729"
|
||||
style="opacity:0.5">
|
||||
<path
|
||||
style="fill:none;stroke:#cccccc;stroke-width:2;stroke-linecap:butt;stroke-linejoin:round;stroke-dasharray:none;stroke-opacity:1"
|
||||
d="M 2,3 V 19 H 5"
|
||||
id="path1712" />
|
||||
<path
|
||||
style="fill:none;stroke:#cccccc;stroke-width:2;stroke-linecap:butt;stroke-linejoin:round;stroke-dasharray:none;stroke-opacity:1"
|
||||
d="m 2,3 v 8 h 3"
|
||||
id="path1714" />
|
||||
</g>
|
||||
</g>
|
||||
</svg>
|
||||
|
After Width: | Height: | Size: 6.2 KiB |
File diff suppressed because it is too large
Load Diff
@@ -203,6 +203,7 @@ FILEBROWSER_SHOWRANK4HINT;Show images ranked as 4-star.\nShortcut: <b>Shift-4</b
|
||||
FILEBROWSER_SHOWRANK5HINT;Show images ranked as 5-star.\nShortcut: <b>Shift-5</b>
|
||||
FILEBROWSER_SHOWRECENTLYSAVEDHINT;Show saved images.\nShortcut: <b>Alt-7</b>
|
||||
FILEBROWSER_SHOWRECENTLYSAVEDNOTHINT;Show unsaved images.\nShortcut: <b>Alt-6</b>
|
||||
FILEBROWSER_SHOWRECURSIVE;Show images in sub-folders recursively.
|
||||
FILEBROWSER_SHOWTRASHHINT;Show contents of trash.\nShortcut: <b>Ctrl-t</b>
|
||||
FILEBROWSER_SHOWUNCOLORHINT;Show images without a color label.\nShortcut: <b>Alt-0</b>
|
||||
FILEBROWSER_SHOWUNRANKHINT;Show unranked images.\nShortcut: <b>Shift-0</b>
|
||||
@@ -1845,6 +1846,9 @@ PREFERENCES_BEHADDALLHINT;Set all parameters to the <b>Add</b> mode.\nAdjustment
|
||||
PREFERENCES_BEHAVIOR;Behavior
|
||||
PREFERENCES_BEHSETALL;All to 'Set'
|
||||
PREFERENCES_BEHSETALLHINT;Set all parameters to the <b>Set</b> mode.\nAdjustments of parameters in the batch tool panel will be <b>absolute</b>, the actual values will be displayed.
|
||||
PREFERENCES_BROWSERECURSIVEDEPTH;Browse sub-folders depth
|
||||
PREFERENCES_BROWSERECURSIVEFOLLOWLINKS;Follow symbolic links when browsing sub-folders
|
||||
PREFERENCES_BROWSERECURSIVEMAXDIRS;Maximum sub-folders
|
||||
PREFERENCES_CACHECLEAR;Clear
|
||||
PREFERENCES_CACHECLEAR_ALL;Clear all cached files:
|
||||
PREFERENCES_CACHECLEAR_ALLBUTPROFILES;Clear all cached files except for cached processing profiles:
|
||||
@@ -2637,8 +2641,8 @@ TP_ICM_INPUTCAMERA_TOOLTIP;Use a simple color matrix from dcraw, an enhanced Raw
|
||||
TP_ICM_INPUTCUSTOM;Custom
|
||||
TP_ICM_INPUTCUSTOM_TOOLTIP;Select your own DCP/ICC color profile file for the camera.
|
||||
TP_ICM_INPUTDLGLABEL;Select Input DCP/ICC Profile...
|
||||
TP_ICM_INPUTEMBEDDED;Use embedded, if possible
|
||||
TP_ICM_INPUTEMBEDDED_TOOLTIP;Use color profile embedded in non-raw files.
|
||||
TP_ICM_INPUTEMBEDDED;Use embedded
|
||||
TP_ICM_INPUTEMBEDDED_TOOLTIP;Use the color profile embedded in the file.\nIf unavailable, fall back to Camera standard
|
||||
TP_ICM_INPUTNONE;No profile
|
||||
TP_ICM_INPUTNONE_TOOLTIP;Use no input color profile at all.\nUse only in special cases.
|
||||
TP_ICM_INPUTPROFILE;Input Profile
|
||||
|
||||
Reference in New Issue
Block a user