liz/rawTherapee
liz/rawTherapee
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge with 'Beep6581/dev'

Browse Source
This commit is contained in:
Pandagrapher 2023-09-05 09:48:43 +02:00
commit 990e9c70a5
91 changed files with 1524 additions and 1157 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
.github/workflows/appimage.yml vendored
View File

@ -10,8 +10,10 @@ on:
branches: branches:
- dev - dev
workflow_dispatch: workflow_dispatch:
env: env:
publish_pre_dev_labels: '[]' publish_pre_dev_labels: '[]'
jobs: jobs:
build: build:
runs-on: ubuntu-20.04 runs-on: ubuntu-20.04
@ -21,7 +23,7 @@ jobs:
build_type: [release] build_type: [release]
steps: steps:
- name: Checkout source - name: Checkout source
uses: actions/checkout@v2 uses: actions/checkout@v3
with: with:
fetch-depth: 0 fetch-depth: 0
@ -104,7 +106,7 @@ jobs:
- name: Restore AppImage tools from cache - name: Restore AppImage tools from cache
id: appimage-tools-cache id: appimage-tools-cache
uses: actions/cache@v2 uses: actions/cache@v3
with: with:
key: appimage-tools-1 key: appimage-tools-1
path: | path: |
@ -157,7 +159,7 @@ jobs:
echo "ARTIFACT_NAME=$ARTIFACT_NAME" >> $GITHUB_ENV echo "ARTIFACT_NAME=$ARTIFACT_NAME" >> $GITHUB_ENV
- name: Upload artifacts - name: Upload artifacts
uses: actions/upload-artifact@v2 uses: actions/upload-artifact@v3
with: with:
name: ${{env.ARTIFACT_NAME}}.AppImage name: ${{env.ARTIFACT_NAME}}.AppImage
path: ${{github.workspace}}/build/${{env.ARTIFACT_NAME}}.AppImage path: ${{github.workspace}}/build/${{env.ARTIFACT_NAME}}.AppImage

1
.github/workflows/macos.yml vendored
View File

@ -10,6 +10,7 @@ on:
branches: branches:
- dev - dev
workflow_dispatch: workflow_dispatch:
jobs: jobs:
build: build:
runs-on: macos-11 runs-on: macos-11

10
.github/workflows/windows.yml vendored
View File

@ -10,11 +10,13 @@ on:
branches: branches:
- dev - dev
workflow_dispatch: workflow_dispatch:
env: env:
publish_pre_dev_labels: '[]' publish_pre_dev_labels: '[]'
jobs: jobs:
build: build:
runs-on: windows-2022 runs-on: windows-latest
defaults: defaults:
run: run:
shell: msys2 {0} shell: msys2 {0}
@ -24,7 +26,7 @@ jobs:
build_type: [release, debug] build_type: [release, debug]
steps: steps:
- name: Checkout source - name: Checkout source
uses: actions/checkout@v2 uses: actions/checkout@v3
with: with:
fetch-depth: 0 fetch-depth: 0
@ -199,14 +201,14 @@ jobs:
7z a -tzip "%ARTIFACT_NAME%.zip" "./%ARTIFACT_NAME%" 7z a -tzip "%ARTIFACT_NAME%.zip" "./%ARTIFACT_NAME%"
- name: Upload artifacts - name: Upload artifacts
uses: actions/upload-artifact@v2 uses: actions/upload-artifact@v3
with: with:
name: ${{env.ARTIFACT_NAME}} name: ${{env.ARTIFACT_NAME}}
path: build\${{env.ARTIFACT_NAME}} path: build\${{env.ARTIFACT_NAME}}
- name: Upload installer - name: Upload installer
if: ${{matrix.build_type == 'release' && (github.ref_type == 'tag' || github.ref_name == 'dev')}} if: ${{matrix.build_type == 'release' && (github.ref_type == 'tag' || github.ref_name == 'dev')}}
uses: actions/upload-artifact@v2 uses: actions/upload-artifact@v3
with: with:
name: ${{env.ARTIFACT_NAME}}.exe name: ${{env.ARTIFACT_NAME}}.exe
path: build\${{env.ARTIFACT_NAME}}.exe path: build\${{env.ARTIFACT_NAME}}.exe

7
CMakeLists.txt
View File

@ -559,6 +559,13 @@ if(WITH_MYFILE_MMAP)
add_definitions(-DMYFILE_MMAP) add_definitions(-DMYFILE_MMAP)
endif() endif()
# Atomic is required in some builds: #6821
find_package(ATOMIC)
if(ATOMIC_FOUND)
target_link_libraries(rth ${ATOMIC_LIBRARIES})
target_link_libraries(rth-cli ${ATOMIC_LIBRARIES})
endif()
if(WITH_LTO) if(WITH_LTO)
# Using LTO with older versions of binutils requires setting extra flags # Using LTO with older versions of binutils requires setting extra flags
set(BINUTILS_VERSION_MININUM "2.29") set(BINUTILS_VERSION_MININUM "2.29")

36
cmake/modules/FindATOMIC.cmake Normal file
View File

@ -0,0 +1,36 @@
include(CheckCXXSourceCompiles)
set(ATOMIC_CXX_TEST_SOURCE
"
#include <atomic>
int main() {
std::atomic<bool> b(false);
std::atomic<int> i(0);
std::atomic<unsigned int> ui(0);
b.exchange(true);
++i;
return ++ui;
}
")
set(SAFE_CMAKE_REQUIRED_LIBRARIES "${CMAKE_REQUIRED_LIBRARIES}")
list(REMOVE_ITEM CMAKE_REQUIRED_LIBRARIES "atomic")
check_cxx_source_compiles("${ATOMIC_CXX_TEST_SOURCE}" HAVE_CXX_ATOMICS_WITHOUT_LIB)
if(NOT HAVE_CXX_ATOMICS_WITHOUT_LIB)
list(APPEND CMAKE_REQUIRED_LIBRARIES "atomic")
check_cxx_source_compiles("${ATOMIC_CXX_TEST_SOURCE}" HAVE_CXX_ATOMICS_WITH_LIB)
if (NOT HAVE_CXX_ATOMICS_WITH_LIB)
message(FATAL_ERROR "libatomic support needed for std::atomic<> but not
found.")
endif()
set(ATOMIC_LIBRARIES "atomic")
set(ATOMIC_FOUND ON)
endif()
set(CMAKE_REQUIRED_LIBRARIES "${SAFE_CMAKE_REQUIRED_LIBRARIES}")
unset(SAFE_CMAKE_REQUIRED_LIBRARIES)
mark_as_advanced(ATOMIC_LIBRARIES)
mark_as_advanced(ATOMIC_FOUND)

28
rtdata/languages/Catala
View File

@ -125,19 +125,19 @@ FILEBROWSER_SHOWCOLORLABEL3HINT;Mostra imatges etiqueta verda.\nDrecera: <b>Alt-
FILEBROWSER_SHOWCOLORLABEL4HINT;Mostra imatges etiqueta blava.\nDrecera: <b>Alt-4</b> FILEBROWSER_SHOWCOLORLABEL4HINT;Mostra imatges etiqueta blava.\nDrecera: <b>Alt-4</b>
FILEBROWSER_SHOWCOLORLABEL5HINT;Mostra imatges etiqueta porpra.\nDrecera: <b>Alt-5</b> FILEBROWSER_SHOWCOLORLABEL5HINT;Mostra imatges etiqueta porpra.\nDrecera: <b>Alt-5</b>
FILEBROWSER_SHOWDIRHINT;Neteja tots els filtres.\nDrecera: <b>D</b> FILEBROWSER_SHOWDIRHINT;Neteja tots els filtres.\nDrecera: <b>D</b>
FILEBROWSER_SHOWEDITEDHINT;Mostra imatges editades.\nDrecera: <b>7</b> FILEBROWSER_SHOWEDITEDHINT;Mostra imatges editades.\nDrecera: <b>Shift-7</b>
FILEBROWSER_SHOWEDITEDNOTHINT;Mostra imatges no editades.\nDrecera: <b>6</b> FILEBROWSER_SHOWEDITEDNOTHINT;Mostra imatges no editades.\nDrecera: <b>Shift-6</b>
FILEBROWSER_SHOWEXIFINFO;Mostra dades EXIF.\nDrecera: <b>i</b> FILEBROWSER_SHOWEXIFINFO;Mostra dades EXIF.\nDrecera: <b>i</b>
FILEBROWSER_SHOWRANK1HINT;Exposa imatges d' 1 estrella.\nDrecera: <b>1</b> FILEBROWSER_SHOWRANK1HINT;Exposa imatges d' 1 estrella.\nDrecera: <b>Shift-1</b>
FILEBROWSER_SHOWRANK2HINT;Exposa imatges de 2 estrelles.\nDrecera: <b>2</b> FILEBROWSER_SHOWRANK2HINT;Exposa imatges de 2 estrelles.\nDrecera: <b>Shift-2</b>
FILEBROWSER_SHOWRANK3HINT;Exposa imatges de 3 estrelles.\nDrecera: <b>3</b> FILEBROWSER_SHOWRANK3HINT;Exposa imatges de 3 estrelles.\nDrecera: <b>Shift-3</b>
FILEBROWSER_SHOWRANK4HINT;Exposa imatges de 4 estrelles.\nDrecera: <b>4</b> FILEBROWSER_SHOWRANK4HINT;Exposa imatges de 4 estrelles.\nDrecera: <b>Shift-4</b>
FILEBROWSER_SHOWRANK5HINT;Exposa imatges de 5 estrelles.\nDrecera: <b>5</b> FILEBROWSER_SHOWRANK5HINT;Exposa imatges de 5 estrelles.\nDrecera: <b>Shift-5</b>
FILEBROWSER_SHOWRECENTLYSAVEDHINT;Mostra últimes imatges desades.\nDrecera: <b>Alt-7</b> FILEBROWSER_SHOWRECENTLYSAVEDHINT;Mostra últimes imatges desades.\nDrecera: <b>Alt-7</b>
FILEBROWSER_SHOWRECENTLYSAVEDNOTHINT;Mostra imatges no recentment desades.\nDrecera: <b>Alt-6</b> FILEBROWSER_SHOWRECENTLYSAVEDNOTHINT;Mostra imatges no recentment desades.\nDrecera: <b>Alt-6</b>
FILEBROWSER_SHOWTRASHHINT;Veure què hi ha a la paperera.\nDrecera: <b>Ctrl-t</b> FILEBROWSER_SHOWTRASHHINT;Veure què hi ha a la paperera.\nDrecera: <b>Ctrl-t</b>
FILEBROWSER_SHOWUNCOLORHINT;Mostra imatges sense etiqueta de color.\nDrecera: <b>Alt-0</b> FILEBROWSER_SHOWUNCOLORHINT;Mostra imatges sense etiqueta de color.\nDrecera: <b>Alt-0</b>
FILEBROWSER_SHOWUNRANKHINT;Mostra imatges sense rang.\nDrecera: <b>0</b> FILEBROWSER_SHOWUNRANKHINT;Mostra imatges sense rang.\nDrecera: <b>Shift-0</b>
FILEBROWSER_THUMBSIZE;Tamany minifoto FILEBROWSER_THUMBSIZE;Tamany minifoto
FILEBROWSER_ZOOMINHINT;Engrandir minifoto.\nDrecera: <b>+</b> FILEBROWSER_ZOOMINHINT;Engrandir minifoto.\nDrecera: <b>+</b>
FILEBROWSER_ZOOMOUTHINT;Reduïr minifoto.\nDrecera: <b>-</b> FILEBROWSER_ZOOMOUTHINT;Reduïr minifoto.\nDrecera: <b>-</b>
@ -940,15 +940,15 @@ ZOOMPANEL_ZOOMOUT;Allunya\nDrecera: <b>-</b>
!FILEBROWSER_POPUPRANK5;Rank 5 ***** !FILEBROWSER_POPUPRANK5;Rank 5 *****
!FILEBROWSER_POPUPREMOVE;Delete permanently !FILEBROWSER_POPUPREMOVE;Delete permanently
!FILEBROWSER_POPUPREMOVEINCLPROC;Delete permanently, including queue-processed version !FILEBROWSER_POPUPREMOVEINCLPROC;Delete permanently, including queue-processed version
!FILEBROWSER_RANK1_TOOLTIP;Rank 1 *\nShortcut: <b>Shift-1</b> !FILEBROWSER_RANK1_TOOLTIP;Rank 1 *\nShortcut: <b>1</b>
!FILEBROWSER_RANK2_TOOLTIP;Rank 2 *\nShortcut: <b>Shift-2</b> !FILEBROWSER_RANK2_TOOLTIP;Rank 2 *\nShortcut: <b>2</b>
!FILEBROWSER_RANK3_TOOLTIP;Rank 3 *\nShortcut: <b>Shift-3</b> !FILEBROWSER_RANK3_TOOLTIP;Rank 3 *\nShortcut: <b>3</b>
!FILEBROWSER_RANK4_TOOLTIP;Rank 4 *\nShortcut: <b>Shift-4</b> !FILEBROWSER_RANK4_TOOLTIP;Rank 4 *\nShortcut: <b>4</b>
!FILEBROWSER_RANK5_TOOLTIP;Rank 5 *\nShortcut: <b>Shift-5</b> !FILEBROWSER_RANK5_TOOLTIP;Rank 5 *\nShortcut: <b>5</b>
!FILEBROWSER_RESETDEFAULTPROFILE;Reset to default !FILEBROWSER_RESETDEFAULTPROFILE;Reset to default
!FILEBROWSER_SHOWNOTTRASHHINT;Show only images not in trash. !FILEBROWSER_SHOWNOTTRASHHINT;Show only images not in trash.
!FILEBROWSER_SHOWORIGINALHINT;Show only original images.\n\nWhen several images exist with the same filename but different extensions, the one considered original is the one whose extension is nearest the top of the parsed extensions list in Preferences > File Browser > Parsed Extensions. !FILEBROWSER_SHOWORIGINALHINT;Show only original images.\n\nWhen several images exist with the same filename but different extensions, the one considered original is the one whose extension is nearest the top of the parsed extensions list in Preferences > File Browser > Parsed Extensions.
!FILEBROWSER_UNRANK_TOOLTIP;Unrank.\nShortcut: <b>Shift-0</b> !FILEBROWSER_UNRANK_TOOLTIP;Unrank.\nShortcut: <b>0</b>
!FILECHOOSER_FILTER_ANY;All files !FILECHOOSER_FILTER_ANY;All files
!FILECHOOSER_FILTER_COLPROF;Color profiles (*.icc) !FILECHOOSER_FILTER_COLPROF;Color profiles (*.icc)
!FILECHOOSER_FILTER_CURVE;Curve files !FILECHOOSER_FILTER_CURVE;Curve files

28
rtdata/languages/Czech
View File

@ -217,11 +217,11 @@ FILEBROWSER_POPUPUNTRASH;Vymazat z koše
FILEBROWSER_QUERYBUTTONHINT;Smaže vyhledávací dotaz FILEBROWSER_QUERYBUTTONHINT;Smaže vyhledávací dotaz
FILEBROWSER_QUERYHINT;Napište názvy hledaných souborů. Podporuje částečná jména souborů. Hledané termíny oddělte čárkami. Například:\n<i>1001,1004,1199</i>\n\nPro vyřazení výsledků z hledání použijte <i>!=</i> před hledaný výraz.\nNapříklad: \n<i>!=1001,1004,1199</i>\n\nZkratky:\n<b>Ctrl-F</b> pro přepnutí do pole hledání ,\n<b>Enter</b> pro zahájení hledání,\n<b>Esc</b> pro vyčištění,\n<b>Shift-Esc</b> pro zrušení přepnutí. FILEBROWSER_QUERYHINT;Napište názvy hledaných souborů. Podporuje částečná jména souborů. Hledané termíny oddělte čárkami. Například:\n<i>1001,1004,1199</i>\n\nPro vyřazení výsledků z hledání použijte <i>!=</i> před hledaný výraz.\nNapříklad: \n<i>!=1001,1004,1199</i>\n\nZkratky:\n<b>Ctrl-F</b> pro přepnutí do pole hledání ,\n<b>Enter</b> pro zahájení hledání,\n<b>Esc</b> pro vyčištění,\n<b>Shift-Esc</b> pro zrušení přepnutí.
FILEBROWSER_QUERYLABEL; Najít: FILEBROWSER_QUERYLABEL; Najít:
FILEBROWSER_RANK1_TOOLTIP;Hodnocení 1 *\nZkratka: <b>Shift-1</b> FILEBROWSER_RANK1_TOOLTIP;Hodnocení 1 *\nZkratka: <b>1</b>
FILEBROWSER_RANK2_TOOLTIP;Hodnocení 2 *\nZkratka: <b>Shift-2</b> FILEBROWSER_RANK2_TOOLTIP;Hodnocení 2 *\nZkratka: <b>2</b>
FILEBROWSER_RANK3_TOOLTIP;Hodnocení 3 *\nZkratka: <b>Shift-3</b> FILEBROWSER_RANK3_TOOLTIP;Hodnocení 3 *\nZkratka: <b>3</b>
FILEBROWSER_RANK4_TOOLTIP;Hodnocení 4 *\nZkratka: <b>Shift-4</b> FILEBROWSER_RANK4_TOOLTIP;Hodnocení 4 *\nZkratka: <b>4</b>
FILEBROWSER_RANK5_TOOLTIP;Hodnocení 5 *\nZkratka: <b>Shift-5</b> FILEBROWSER_RANK5_TOOLTIP;Hodnocení 5 *\nZkratka: <b>5</b>
FILEBROWSER_RENAMEDLGLABEL;Přejmenování souboru FILEBROWSER_RENAMEDLGLABEL;Přejmenování souboru
FILEBROWSER_RESETDEFAULTPROFILE;Vrátit se k původnímu FILEBROWSER_RESETDEFAULTPROFILE;Vrátit se k původnímu
FILEBROWSER_SELECTDARKFRAME;Výběr tmavého snímku... FILEBROWSER_SELECTDARKFRAME;Výběr tmavého snímku...
@ -232,23 +232,23 @@ FILEBROWSER_SHOWCOLORLABEL3HINT;Ukázat obrázky se zeleným štítkem.\nZkratka
FILEBROWSER_SHOWCOLORLABEL4HINT;Ukázat obrázky s modrým štítkem.\nZkratka: <b>Alt-4</b> FILEBROWSER_SHOWCOLORLABEL4HINT;Ukázat obrázky s modrým štítkem.\nZkratka: <b>Alt-4</b>
FILEBROWSER_SHOWCOLORLABEL5HINT;Ukázat obrázky s nachovým štítkem.\nZkratka: <b>Alt-5</b> FILEBROWSER_SHOWCOLORLABEL5HINT;Ukázat obrázky s nachovým štítkem.\nZkratka: <b>Alt-5</b>
FILEBROWSER_SHOWDIRHINT;Smazat všechny filtry.\nZkratka: <b>d</b> FILEBROWSER_SHOWDIRHINT;Smazat všechny filtry.\nZkratka: <b>d</b>
FILEBROWSER_SHOWEDITEDHINT;Ukázat upravené obrázky.\nZkratka: <b>7</b> FILEBROWSER_SHOWEDITEDHINT;Ukázat upravené obrázky.\nZkratka: <b>Shift-7</b>
FILEBROWSER_SHOWEDITEDNOTHINT;Ukázat neupravené obrázky.\nZkratka: <b>6</b> FILEBROWSER_SHOWEDITEDNOTHINT;Ukázat neupravené obrázky.\nZkratka: <b>Shift-6</b>
FILEBROWSER_SHOWEXIFINFO;Zobrazit Exif informace.\n\nZkratky:\n<b>i</b> - režim více karet editoru,\n<b>Alt-i</b> - režim jedné karty editoru. FILEBROWSER_SHOWEXIFINFO;Zobrazit Exif informace.\n\nZkratky:\n<b>i</b> - režim více karet editoru,\n<b>Alt-i</b> - režim jedné karty editoru.
FILEBROWSER_SHOWNOTTRASHHINT;Zobrazit pouze snímky které nejsou v koši. FILEBROWSER_SHOWNOTTRASHHINT;Zobrazit pouze snímky které nejsou v koši.
FILEBROWSER_SHOWORIGINALHINT;Zobrazí pouze originální obrázky.\n\nPokud existuje několik obrázků se stejným názvem, ale rozdílnými příponami, bude jako originál vybrán ten, jehož přípona je nejvýše v seznamu přípon veVolby > Prohlížeč souborů > Analyzované přípony. FILEBROWSER_SHOWORIGINALHINT;Zobrazí pouze originální obrázky.\n\nPokud existuje několik obrázků se stejným názvem, ale rozdílnými příponami, bude jako originál vybrán ten, jehož přípona je nejvýše v seznamu přípon veVolby > Prohlížeč souborů > Analyzované přípony.
FILEBROWSER_SHOWRANK1HINT;Ukázat obrázky hodnocené jednou hvězdičkou.\nZkratka: <b>1</b> FILEBROWSER_SHOWRANK1HINT;Ukázat obrázky hodnocené jednou hvězdičkou.\nZkratka: <b>Shift-1</b>
FILEBROWSER_SHOWRANK2HINT;Ukázat obrázky hodnocené dvěma hvězdičkami.\nZkratka: <b>2</b> FILEBROWSER_SHOWRANK2HINT;Ukázat obrázky hodnocené dvěma hvězdičkami.\nZkratka: <b>Shift-2</b>
FILEBROWSER_SHOWRANK3HINT;Ukázat obrázky hodnocené třemi hvězdičkami.\nZkratka: <b>3</b> FILEBROWSER_SHOWRANK3HINT;Ukázat obrázky hodnocené třemi hvězdičkami.\nZkratka: <b>Shift-3</b>
FILEBROWSER_SHOWRANK4HINT;Ukázat obrázky hodnocené čtyřmi hvězdičkami.\nZkratka: <b>4</b> FILEBROWSER_SHOWRANK4HINT;Ukázat obrázky hodnocené čtyřmi hvězdičkami.\nZkratka: <b>Shift-4</b>
FILEBROWSER_SHOWRANK5HINT;Ukázat obrázky hodnocené pěti hvězdičkami.\nZkratka: <b>5</b> FILEBROWSER_SHOWRANK5HINT;Ukázat obrázky hodnocené pěti hvězdičkami.\nZkratka: <b>Shift-5</b>
FILEBROWSER_SHOWRECENTLYSAVEDHINT;Ukázat uložené obrázky.\nZkratka: <b>Alt-7</b> FILEBROWSER_SHOWRECENTLYSAVEDHINT;Ukázat uložené obrázky.\nZkratka: <b>Alt-7</b>
FILEBROWSER_SHOWRECENTLYSAVEDNOTHINT;Ukázat neuložené obrázky.\nZkratka: <b>Alt-6</b> FILEBROWSER_SHOWRECENTLYSAVEDNOTHINT;Ukázat neuložené obrázky.\nZkratka: <b>Alt-6</b>
FILEBROWSER_SHOWTRASHHINT;Ukázat obsah koše.\nZkratka: <b>Ctrl-t</b> FILEBROWSER_SHOWTRASHHINT;Ukázat obsah koše.\nZkratka: <b>Ctrl-t</b>
FILEBROWSER_SHOWUNCOLORHINT;Ukázat obrázky bez barevného štítku.\nZkratka: <b>Alt-0</b> FILEBROWSER_SHOWUNCOLORHINT;Ukázat obrázky bez barevného štítku.\nZkratka: <b>Alt-0</b>
FILEBROWSER_SHOWUNRANKHINT;Ukázat nehodnocené obrázky.\nZkratka: <b>0</b> FILEBROWSER_SHOWUNRANKHINT;Ukázat nehodnocené obrázky.\nZkratka: <b>Shift-0</b>
FILEBROWSER_THUMBSIZE;Velikost náhledu FILEBROWSER_THUMBSIZE;Velikost náhledu
FILEBROWSER_UNRANK_TOOLTIP;Zrušit hodnocení.\nZkratka: <b>Shift - 0</b> FILEBROWSER_UNRANK_TOOLTIP;Zrušit hodnocení.\nZkratka: <b>0</b>
FILEBROWSER_ZOOMINHINT;Zvětšit velikosti náhledů.\n\nZkratky:\n<b>+</b> - režim více karet editoru,\n<b>Alt-+</b> - režim jedné karty editoru. FILEBROWSER_ZOOMINHINT;Zvětšit velikosti náhledů.\n\nZkratky:\n<b>+</b> - režim více karet editoru,\n<b>Alt-+</b> - režim jedné karty editoru.
FILEBROWSER_ZOOMOUTHINT;Zmenšit velikosti náhledů.\n\nZkratky:\n<b>-</b> - režim více karet editoru,\n<b>Alt--</b> - režim jedné karty editoru. FILEBROWSER_ZOOMOUTHINT;Zmenšit velikosti náhledů.\n\nZkratky:\n<b>-</b> - režim více karet editoru,\n<b>Alt--</b> - režim jedné karty editoru.
FILECHOOSER_FILTER_ANY;Všechny soubory FILECHOOSER_FILTER_ANY;Všechny soubory

28
rtdata/languages/English (UK)
View File

@ -442,11 +442,11 @@ TP_WBALANCE_EQBLUERED_TOOLTIP;Allows to deviate from the normal behaviour of 'wh
!FILEBROWSER_QUERYBUTTONHINT;Clear the Find query !FILEBROWSER_QUERYBUTTONHINT;Clear the Find query
!FILEBROWSER_QUERYHINT;Type filenames to search for. Supports partial filenames. Separate the search terms using commas, e.g.\n<i>1001,1004,1199</i>\n\nExclude search terms by prefixing them with <i>!=</i>\ne.g.\n<i>!=1001,1004,1199</i>\n\nShortcuts:\n<b>Ctrl-f</b> - focus the Find box,\n<b>Enter</b> - search,\n<b>Esc</b> - clear the Find box,\n<b>Shift-Esc</b> - defocus the Find box. !FILEBROWSER_QUERYHINT;Type filenames to search for. Supports partial filenames. Separate the search terms using commas, e.g.\n<i>1001,1004,1199</i>\n\nExclude search terms by prefixing them with <i>!=</i>\ne.g.\n<i>!=1001,1004,1199</i>\n\nShortcuts:\n<b>Ctrl-f</b> - focus the Find box,\n<b>Enter</b> - search,\n<b>Esc</b> - clear the Find box,\n<b>Shift-Esc</b> - defocus the Find box.
!FILEBROWSER_QUERYLABEL; Find: !FILEBROWSER_QUERYLABEL; Find:
!FILEBROWSER_RANK1_TOOLTIP;Rank 1 *\nShortcut: <b>Shift-1</b> !FILEBROWSER_RANK1_TOOLTIP;Rank 1 *\nShortcut: <b>1</b>
!FILEBROWSER_RANK2_TOOLTIP;Rank 2 *\nShortcut: <b>Shift-2</b> !FILEBROWSER_RANK2_TOOLTIP;Rank 2 *\nShortcut: <b>2</b>
!FILEBROWSER_RANK3_TOOLTIP;Rank 3 *\nShortcut: <b>Shift-3</b> !FILEBROWSER_RANK3_TOOLTIP;Rank 3 *\nShortcut: <b>3</b>
!FILEBROWSER_RANK4_TOOLTIP;Rank 4 *\nShortcut: <b>Shift-4</b> !FILEBROWSER_RANK4_TOOLTIP;Rank 4 *\nShortcut: <b>4</b>
!FILEBROWSER_RANK5_TOOLTIP;Rank 5 *\nShortcut: <b>Shift-5</b> !FILEBROWSER_RANK5_TOOLTIP;Rank 5 *\nShortcut: <b>5</b>
!FILEBROWSER_RENAMEDLGLABEL;Rename file !FILEBROWSER_RENAMEDLGLABEL;Rename file
!FILEBROWSER_RESETDEFAULTPROFILE;Reset to default !FILEBROWSER_RESETDEFAULTPROFILE;Reset to default
!FILEBROWSER_SELECTDARKFRAME;Select dark-frame... !FILEBROWSER_SELECTDARKFRAME;Select dark-frame...
@ -457,22 +457,22 @@ TP_WBALANCE_EQBLUERED_TOOLTIP;Allows to deviate from the normal behaviour of 'wh
!FILEBROWSER_SHOWCOLORLABEL4HINT;Show images labeled Blue.\nShortcut: <b>Alt-4</b> !FILEBROWSER_SHOWCOLORLABEL4HINT;Show images labeled Blue.\nShortcut: <b>Alt-4</b>
!FILEBROWSER_SHOWCOLORLABEL5HINT;Show images labeled Purple.\nShortcut: <b>Alt-5</b> !FILEBROWSER_SHOWCOLORLABEL5HINT;Show images labeled Purple.\nShortcut: <b>Alt-5</b>
!FILEBROWSER_SHOWDIRHINT;Clear all filters.\nShortcut: <b>d</b> !FILEBROWSER_SHOWDIRHINT;Clear all filters.\nShortcut: <b>d</b>
!FILEBROWSER_SHOWEDITEDHINT;Show edited images.\nShortcut: <b>7</b> !FILEBROWSER_SHOWEDITEDHINT;Show edited images.\nShortcut: <b>Shift-7</b>
!FILEBROWSER_SHOWEDITEDNOTHINT;Show not edited images.\nShortcut: <b>6</b> !FILEBROWSER_SHOWEDITEDNOTHINT;Show not edited images.\nShortcut: <b>Shift-6</b>
!FILEBROWSER_SHOWEXIFINFO;Show Exif info.\n\nShortcuts:\n<b>i</b> - Multiple Editor Tabs Mode,\n<b>Alt-i</b> - Single Editor Tab Mode. !FILEBROWSER_SHOWEXIFINFO;Show Exif info.\n\nShortcuts:\n<b>i</b> - Multiple Editor Tabs Mode,\n<b>Alt-i</b> - Single Editor Tab Mode.
!FILEBROWSER_SHOWNOTTRASHHINT;Show only images not in trash. !FILEBROWSER_SHOWNOTTRASHHINT;Show only images not in trash.
!FILEBROWSER_SHOWORIGINALHINT;Show only original images.\n\nWhen several images exist with the same filename but different extensions, the one considered original is the one whose extension is nearest the top of the parsed extensions list in Preferences > File Browser > Parsed Extensions. !FILEBROWSER_SHOWORIGINALHINT;Show only original images.\n\nWhen several images exist with the same filename but different extensions, the one considered original is the one whose extension is nearest the top of the parsed extensions list in Preferences > File Browser > Parsed Extensions.
!FILEBROWSER_SHOWRANK1HINT;Show images ranked as 1-star.\nShortcut: <b>1</b> !FILEBROWSER_SHOWRANK1HINT;Show images ranked as 1-star.\nShortcut: <b>Shift-1</b>
!FILEBROWSER_SHOWRANK2HINT;Show images ranked as 2-star.\nShortcut: <b>2</b> !FILEBROWSER_SHOWRANK2HINT;Show images ranked as 2-star.\nShortcut: <b>Shift-2</b>
!FILEBROWSER_SHOWRANK3HINT;Show images ranked as 3-star.\nShortcut: <b>3</b> !FILEBROWSER_SHOWRANK3HINT;Show images ranked as 3-star.\nShortcut: <b>Shift-3</b>
!FILEBROWSER_SHOWRANK4HINT;Show images ranked as 4-star.\nShortcut: <b>4</b> !FILEBROWSER_SHOWRANK4HINT;Show images ranked as 4-star.\nShortcut: <b>Shift-4</b>
!FILEBROWSER_SHOWRANK5HINT;Show images ranked as 5-star.\nShortcut: <b>5</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_SHOWRECENTLYSAVEDHINT;Show saved images.\nShortcut: <b>Alt-7</b>
!FILEBROWSER_SHOWRECENTLYSAVEDNOTHINT;Show unsaved images.\nShortcut: <b>Alt-6</b> !FILEBROWSER_SHOWRECENTLYSAVEDNOTHINT;Show unsaved images.\nShortcut: <b>Alt-6</b>
!FILEBROWSER_SHOWTRASHHINT;Show contents of trash.\nShortcut: <b>Ctrl-t</b> !FILEBROWSER_SHOWTRASHHINT;Show contents of trash.\nShortcut: <b>Ctrl-t</b>
!FILEBROWSER_SHOWUNRANKHINT;Show unranked images.\nShortcut: <b>0</b> !FILEBROWSER_SHOWUNRANKHINT;Show unranked images.\nShortcut: <b>Shift-0</b>
!FILEBROWSER_THUMBSIZE;Thumbnail size !FILEBROWSER_THUMBSIZE;Thumbnail size
!FILEBROWSER_UNRANK_TOOLTIP;Unrank.\nShortcut: <b>Shift-0</b> !FILEBROWSER_UNRANK_TOOLTIP;Unrank.\nShortcut: <b>0</b>
!FILEBROWSER_ZOOMINHINT;Increase thumbnail size.\n\nShortcuts:\n<b>+</b> - Multiple Editor Tabs Mode,\n<b>Alt</b>-<b>+</b> - Single Editor Tab Mode. !FILEBROWSER_ZOOMINHINT;Increase thumbnail size.\n\nShortcuts:\n<b>+</b> - Multiple Editor Tabs Mode,\n<b>Alt</b>-<b>+</b> - Single Editor Tab Mode.
!FILEBROWSER_ZOOMOUTHINT;Decrease thumbnail size.\n\nShortcuts:\n<b>-</b> - Multiple Editor Tabs Mode,\n<b>Alt</b>-<b>-</b> - Single Editor Tab Mode. !FILEBROWSER_ZOOMOUTHINT;Decrease thumbnail size.\n\nShortcuts:\n<b>-</b> - Multiple Editor Tabs Mode,\n<b>Alt</b>-<b>-</b> - Single Editor Tab Mode.
!FILECHOOSER_FILTER_ANY;All files !FILECHOOSER_FILTER_ANY;All files

28
rtdata/languages/English (US)
View File

@ -172,11 +172,11 @@
!FILEBROWSER_QUERYBUTTONHINT;Clear the Find query !FILEBROWSER_QUERYBUTTONHINT;Clear the Find query
!FILEBROWSER_QUERYHINT;Type filenames to search for. Supports partial filenames. Separate the search terms using commas, e.g.\n<i>1001,1004,1199</i>\n\nExclude search terms by prefixing them with <i>!=</i>\ne.g.\n<i>!=1001,1004,1199</i>\n\nShortcuts:\n<b>Ctrl-f</b> - focus the Find box,\n<b>Enter</b> - search,\n<b>Esc</b> - clear the Find box,\n<b>Shift-Esc</b> - defocus the Find box. !FILEBROWSER_QUERYHINT;Type filenames to search for. Supports partial filenames. Separate the search terms using commas, e.g.\n<i>1001,1004,1199</i>\n\nExclude search terms by prefixing them with <i>!=</i>\ne.g.\n<i>!=1001,1004,1199</i>\n\nShortcuts:\n<b>Ctrl-f</b> - focus the Find box,\n<b>Enter</b> - search,\n<b>Esc</b> - clear the Find box,\n<b>Shift-Esc</b> - defocus the Find box.
!FILEBROWSER_QUERYLABEL; Find: !FILEBROWSER_QUERYLABEL; Find:
!FILEBROWSER_RANK1_TOOLTIP;Rank 1 *\nShortcut: <b>Shift-1</b> !FILEBROWSER_RANK1_TOOLTIP;Rank 1 *\nShortcut: <b>1</b>
!FILEBROWSER_RANK2_TOOLTIP;Rank 2 *\nShortcut: <b>Shift-2</b> !FILEBROWSER_RANK2_TOOLTIP;Rank 2 *\nShortcut: <b>2</b>
!FILEBROWSER_RANK3_TOOLTIP;Rank 3 *\nShortcut: <b>Shift-3</b> !FILEBROWSER_RANK3_TOOLTIP;Rank 3 *\nShortcut: <b>3</b>
!FILEBROWSER_RANK4_TOOLTIP;Rank 4 *\nShortcut: <b>Shift-4</b> !FILEBROWSER_RANK4_TOOLTIP;Rank 4 *\nShortcut: <b>4</b>
!FILEBROWSER_RANK5_TOOLTIP;Rank 5 *\nShortcut: <b>Shift-5</b> !FILEBROWSER_RANK5_TOOLTIP;Rank 5 *\nShortcut: <b>5</b>
!FILEBROWSER_RENAMEDLGLABEL;Rename file !FILEBROWSER_RENAMEDLGLABEL;Rename file
!FILEBROWSER_RESETDEFAULTPROFILE;Reset to default !FILEBROWSER_RESETDEFAULTPROFILE;Reset to default
!FILEBROWSER_SELECTDARKFRAME;Select dark-frame... !FILEBROWSER_SELECTDARKFRAME;Select dark-frame...
@ -187,23 +187,23 @@
!FILEBROWSER_SHOWCOLORLABEL4HINT;Show images labeled Blue.\nShortcut: <b>Alt-4</b> !FILEBROWSER_SHOWCOLORLABEL4HINT;Show images labeled Blue.\nShortcut: <b>Alt-4</b>
!FILEBROWSER_SHOWCOLORLABEL5HINT;Show images labeled Purple.\nShortcut: <b>Alt-5</b> !FILEBROWSER_SHOWCOLORLABEL5HINT;Show images labeled Purple.\nShortcut: <b>Alt-5</b>
!FILEBROWSER_SHOWDIRHINT;Clear all filters.\nShortcut: <b>d</b> !FILEBROWSER_SHOWDIRHINT;Clear all filters.\nShortcut: <b>d</b>
!FILEBROWSER_SHOWEDITEDHINT;Show edited images.\nShortcut: <b>7</b> !FILEBROWSER_SHOWEDITEDHINT;Show edited images.\nShortcut: <b>Shift-7</b>
!FILEBROWSER_SHOWEDITEDNOTHINT;Show not edited images.\nShortcut: <b>6</b> !FILEBROWSER_SHOWEDITEDNOTHINT;Show not edited images.\nShortcut: <b>Shift-6</b>
!FILEBROWSER_SHOWEXIFINFO;Show Exif info.\n\nShortcuts:\n<b>i</b> - Multiple Editor Tabs Mode,\n<b>Alt-i</b> - Single Editor Tab Mode. !FILEBROWSER_SHOWEXIFINFO;Show Exif info.\n\nShortcuts:\n<b>i</b> - Multiple Editor Tabs Mode,\n<b>Alt-i</b> - Single Editor Tab Mode.
!FILEBROWSER_SHOWNOTTRASHHINT;Show only images not in trash. !FILEBROWSER_SHOWNOTTRASHHINT;Show only images not in trash.
!FILEBROWSER_SHOWORIGINALHINT;Show only original images.\n\nWhen several images exist with the same filename but different extensions, the one considered original is the one whose extension is nearest the top of the parsed extensions list in Preferences > File Browser > Parsed Extensions. !FILEBROWSER_SHOWORIGINALHINT;Show only original images.\n\nWhen several images exist with the same filename but different extensions, the one considered original is the one whose extension is nearest the top of the parsed extensions list in Preferences > File Browser > Parsed Extensions.
!FILEBROWSER_SHOWRANK1HINT;Show images ranked as 1-star.\nShortcut: <b>1</b> !FILEBROWSER_SHOWRANK1HINT;Show images ranked as 1-star.\nShortcut: <b>Shift-1</b>
!FILEBROWSER_SHOWRANK2HINT;Show images ranked as 2-star.\nShortcut: <b>2</b> !FILEBROWSER_SHOWRANK2HINT;Show images ranked as 2-star.\nShortcut: <b>Shift-2</b>
!FILEBROWSER_SHOWRANK3HINT;Show images ranked as 3-star.\nShortcut: <b>3</b> !FILEBROWSER_SHOWRANK3HINT;Show images ranked as 3-star.\nShortcut: <b>Shift-3</b>
!FILEBROWSER_SHOWRANK4HINT;Show images ranked as 4-star.\nShortcut: <b>4</b> !FILEBROWSER_SHOWRANK4HINT;Show images ranked as 4-star.\nShortcut: <b>Shift-4</b>
!FILEBROWSER_SHOWRANK5HINT;Show images ranked as 5-star.\nShortcut: <b>5</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_SHOWRECENTLYSAVEDHINT;Show saved images.\nShortcut: <b>Alt-7</b>
!FILEBROWSER_SHOWRECENTLYSAVEDNOTHINT;Show unsaved images.\nShortcut: <b>Alt-6</b> !FILEBROWSER_SHOWRECENTLYSAVEDNOTHINT;Show unsaved images.\nShortcut: <b>Alt-6</b>
!FILEBROWSER_SHOWTRASHHINT;Show contents of trash.\nShortcut: <b>Ctrl-t</b> !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_SHOWUNCOLORHINT;Show images without a color label.\nShortcut: <b>Alt-0</b>
!FILEBROWSER_SHOWUNRANKHINT;Show unranked images.\nShortcut: <b>0</b> !FILEBROWSER_SHOWUNRANKHINT;Show unranked images.\nShortcut: <b>Shift-0</b>
!FILEBROWSER_THUMBSIZE;Thumbnail size !FILEBROWSER_THUMBSIZE;Thumbnail size
!FILEBROWSER_UNRANK_TOOLTIP;Unrank.\nShortcut: <b>Shift-0</b> !FILEBROWSER_UNRANK_TOOLTIP;Unrank.\nShortcut: <b>0</b>
!FILEBROWSER_ZOOMINHINT;Increase thumbnail size.\n\nShortcuts:\n<b>+</b> - Multiple Editor Tabs Mode,\n<b>Alt</b>-<b>+</b> - Single Editor Tab Mode. !FILEBROWSER_ZOOMINHINT;Increase thumbnail size.\n\nShortcuts:\n<b>+</b> - Multiple Editor Tabs Mode,\n<b>Alt</b>-<b>+</b> - Single Editor Tab Mode.
!FILEBROWSER_ZOOMOUTHINT;Decrease thumbnail size.\n\nShortcuts:\n<b>-</b> - Multiple Editor Tabs Mode,\n<b>Alt</b>-<b>-</b> - Single Editor Tab Mode. !FILEBROWSER_ZOOMOUTHINT;Decrease thumbnail size.\n\nShortcuts:\n<b>-</b> - Multiple Editor Tabs Mode,\n<b>Alt</b>-<b>-</b> - Single Editor Tab Mode.
!FILECHOOSER_FILTER_ANY;All files !FILECHOOSER_FILTER_ANY;All files

28
rtdata/languages/Espanol (Castellano)
View File

@ -172,11 +172,11 @@ FILEBROWSER_POPUPUNTRASH;Sacar de la papelera
FILEBROWSER_QUERYBUTTONHINT;Borrar la búsqueda FILEBROWSER_QUERYBUTTONHINT;Borrar la búsqueda
FILEBROWSER_QUERYHINT;Aquí se escriben los nombres de archivo que se desea buscar. También se puede indicar sólo una parte del nombre del archivo. Los términos de la búsqueda se separan mediante comas (por ej.<i>1001,1004,1199</i>)\nLos términos de búsqueda no deseados se pueden excluir añadiendo el prefijo <i>!=</i>\npor ej. <i>!=1001,1004,1199</i>\n\nAtajos de teclado:\n<b>Ctrl-f</b> - lleva el foco al cuadro de texto <b>Buscar:</b>\n<b>Intro</b> - realiza la búsqueda,\n<b>Esc</b> - borra el cuadro de texto <b>Buscar:</b>\n<b>Mayús-Esc</b> - quita el foco del cuadro de texto <b>Buscar:</b>. FILEBROWSER_QUERYHINT;Aquí se escriben los nombres de archivo que se desea buscar. También se puede indicar sólo una parte del nombre del archivo. Los términos de la búsqueda se separan mediante comas (por ej.<i>1001,1004,1199</i>)\nLos términos de búsqueda no deseados se pueden excluir añadiendo el prefijo <i>!=</i>\npor ej. <i>!=1001,1004,1199</i>\n\nAtajos de teclado:\n<b>Ctrl-f</b> - lleva el foco al cuadro de texto <b>Buscar:</b>\n<b>Intro</b> - realiza la búsqueda,\n<b>Esc</b> - borra el cuadro de texto <b>Buscar:</b>\n<b>Mayús-Esc</b> - quita el foco del cuadro de texto <b>Buscar:</b>.
FILEBROWSER_QUERYLABEL;Buscar: FILEBROWSER_QUERYLABEL;Buscar:
FILEBROWSER_RANK1_TOOLTIP;Rango 1 *\nAtajo de teclado: <b>Mayús-1</b> FILEBROWSER_RANK1_TOOLTIP;Rango 1 *\nAtajo de teclado: <b>1</b>
FILEBROWSER_RANK2_TOOLTIP;Rango 2 **\nAtajo de teclado: <b>Mayús-2</b> FILEBROWSER_RANK2_TOOLTIP;Rango 2 **\nAtajo de teclado: <b>2</b>
FILEBROWSER_RANK3_TOOLTIP;Rango 3 ***\nAtajo de teclado: <b>Mayús-3</b> FILEBROWSER_RANK3_TOOLTIP;Rango 3 ***\nAtajo de teclado: <b>3</b>
FILEBROWSER_RANK4_TOOLTIP;Rango 4 ****\nAtajo de teclado: <b>Mayús-4</b> FILEBROWSER_RANK4_TOOLTIP;Rango 4 ****\nAtajo de teclado: <b>4</b>
FILEBROWSER_RANK5_TOOLTIP;Rango 5 *****\nAtajo de teclado: <b>Mayús-5</b> FILEBROWSER_RANK5_TOOLTIP;Rango 5 *****\nAtajo de teclado: <b>5</b>
FILEBROWSER_RENAMEDLGLABEL;Renombrar el archivo FILEBROWSER_RENAMEDLGLABEL;Renombrar el archivo
FILEBROWSER_RESETDEFAULTPROFILE;Restablecer el perfil a los valores predeterminados FILEBROWSER_RESETDEFAULTPROFILE;Restablecer el perfil a los valores predeterminados
FILEBROWSER_SELECTDARKFRAME;Seleccionar Foto Negra... FILEBROWSER_SELECTDARKFRAME;Seleccionar Foto Negra...
@ -187,23 +187,23 @@ FILEBROWSER_SHOWCOLORLABEL3HINT;Muestra imágenes etiquetadas con color verde.\n
FILEBROWSER_SHOWCOLORLABEL4HINT;Muestra imágenes etiquetadas con color azul.\nAtajo de teclado: <b>Alt-4</b> FILEBROWSER_SHOWCOLORLABEL4HINT;Muestra imágenes etiquetadas con color azul.\nAtajo de teclado: <b>Alt-4</b>
FILEBROWSER_SHOWCOLORLABEL5HINT;Muestra imágenes etiquetadas con color morado.\nAtajo de teclado: <b>Alt-5</b> FILEBROWSER_SHOWCOLORLABEL5HINT;Muestra imágenes etiquetadas con color morado.\nAtajo de teclado: <b>Alt-5</b>
FILEBROWSER_SHOWDIRHINT;Quita todos los filtros.\nAtajo de teclado: <b>d</b> FILEBROWSER_SHOWDIRHINT;Quita todos los filtros.\nAtajo de teclado: <b>d</b>
FILEBROWSER_SHOWEDITEDHINT;Muestra las imágenes editadas.\nAtajo de teclado: <b>7</b> FILEBROWSER_SHOWEDITEDHINT;Muestra las imágenes editadas.\nAtajo de teclado: <b>Mayús-7</b>
FILEBROWSER_SHOWEDITEDNOTHINT;Muestra las imágenes no editadas.\nAtajo de teclado: <b>6</b> FILEBROWSER_SHOWEDITEDNOTHINT;Muestra las imágenes no editadas.\nAtajo de teclado: <b>Mayús-6</b>
FILEBROWSER_SHOWEXIFINFO;Muestra los datos Exif.\n\nAtajos de teclado:\n<b>i</b> - Modo de Editor de pestañas múltiples,\n<b>Alt-i</b> - Modo de Editor de pestaña única. FILEBROWSER_SHOWEXIFINFO;Muestra los datos Exif.\n\nAtajos de teclado:\n<b>i</b> - Modo de Editor de pestañas múltiples,\n<b>Alt-i</b> - Modo de Editor de pestaña única.
FILEBROWSER_SHOWNOTTRASHHINT;Muestra sólo las imágenes no borradas. FILEBROWSER_SHOWNOTTRASHHINT;Muestra sólo las imágenes no borradas.
FILEBROWSER_SHOWORIGINALHINT;Muestra sólo las imágenes originales.\n\nCuando existen varias imágenes con el mismo nombre de archivo pero con diferentes extensiones, la que se considera original es aquella cuya extensión está más cerca de la parte superior de la lista de extensiones analizadas en Preferencias > Navegador de archivos > Extensiones analizadas. FILEBROWSER_SHOWORIGINALHINT;Muestra sólo las imágenes originales.\n\nCuando existen varias imágenes con el mismo nombre de archivo pero con diferentes extensiones, la que se considera original es aquella cuya extensión está más cerca de la parte superior de la lista de extensiones analizadas en Preferencias > Navegador de archivos > Extensiones analizadas.
FILEBROWSER_SHOWRANK1HINT;Muestra las imágenes con 1 estrella.\nAtajo de teclado: <b>1</b> FILEBROWSER_SHOWRANK1HINT;Muestra las imágenes con 1 estrella.\nAtajo de teclado: <b>Mayús-1</b>
FILEBROWSER_SHOWRANK2HINT;Muestra las imágenes con 2 estrellas.\nAtajo de teclado: <b>2</b> FILEBROWSER_SHOWRANK2HINT;Muestra las imágenes con 2 estrellas.\nAtajo de teclado: <b>Mayús-2</b>
FILEBROWSER_SHOWRANK3HINT;Muestra las imágenes con 3 estrellas.\nAtajo de teclado: <b>3</b> FILEBROWSER_SHOWRANK3HINT;Muestra las imágenes con 3 estrellas.\nAtajo de teclado: <b>Mayús-3</b>
FILEBROWSER_SHOWRANK4HINT;Muestra las imágenes con 4 estrellas.\nAtajo de teclado: <b>4</b> FILEBROWSER_SHOWRANK4HINT;Muestra las imágenes con 4 estrellas.\nAtajo de teclado: <b>Mayús-4</b>
FILEBROWSER_SHOWRANK5HINT;Muestra las imágenes con 5 estrellas.\nAtajo de teclado: <b>5</b> FILEBROWSER_SHOWRANK5HINT;Muestra las imágenes con 5 estrellas.\nAtajo de teclado: <b>Mayús-5</b>
FILEBROWSER_SHOWRECENTLYSAVEDHINT;Muestra las imágenes guardadas recientemente.\nAtajo de teclado: <b>Alt-7</b> FILEBROWSER_SHOWRECENTLYSAVEDHINT;Muestra las imágenes guardadas recientemente.\nAtajo de teclado: <b>Alt-7</b>
FILEBROWSER_SHOWRECENTLYSAVEDNOTHINT;Muestra las imágenes que no se han guardado recientemente.\nAtajo de teclado: <b>Alt-6</b> FILEBROWSER_SHOWRECENTLYSAVEDNOTHINT;Muestra las imágenes que no se han guardado recientemente.\nAtajo de teclado: <b>Alt-6</b>
FILEBROWSER_SHOWTRASHHINT;Muestra el contenido de la papelera.\nAtajo de teclado: <b>Ctrl-t</b> FILEBROWSER_SHOWTRASHHINT;Muestra el contenido de la papelera.\nAtajo de teclado: <b>Ctrl-t</b>
FILEBROWSER_SHOWUNCOLORHINT;Muestra las imágenes sin etiqueta de color.\nAtajo de teclado: <b>Alt-0</b> FILEBROWSER_SHOWUNCOLORHINT;Muestra las imágenes sin etiqueta de color.\nAtajo de teclado: <b>Alt-0</b>
FILEBROWSER_SHOWUNRANKHINT;Muestra las imágenes sin rango.\nAtajo de teclado: <b>0</b> FILEBROWSER_SHOWUNRANKHINT;Muestra las imágenes sin rango.\nAtajo de teclado: <b>Mayús-0</b>
FILEBROWSER_THUMBSIZE;Tamaño de las miniaturas FILEBROWSER_THUMBSIZE;Tamaño de las miniaturas
FILEBROWSER_UNRANK_TOOLTIP;Borra el rango.\nAtajo de teclado:<b>May - 0</b> FILEBROWSER_UNRANK_TOOLTIP;Borra el rango.\nAtajo de teclado:<b>0</b>
FILEBROWSER_ZOOMINHINT;Aumenta las miniaturas.\nAtajos de teclado:\n<b>+</b> - Modo de Editor de pestañas múltiples,\n<b>Alt</b>-<b>+</b> - Modo de Editor de Pestaña Única FILEBROWSER_ZOOMINHINT;Aumenta las miniaturas.\nAtajos de teclado:\n<b>+</b> - Modo de Editor de pestañas múltiples,\n<b>Alt</b>-<b>+</b> - Modo de Editor de Pestaña Única
FILEBROWSER_ZOOMOUTHINT;Reduce las miniaturas.\nAtajos de teclado:\n<b>-</b> - Modo de Editor de pestañas múltiples,\n<b>Alt</b>-<b>-</b> - Modo de Editor de pestaña única FILEBROWSER_ZOOMOUTHINT;Reduce las miniaturas.\nAtajos de teclado:\n<b>-</b> - Modo de Editor de pestañas múltiples,\n<b>Alt</b>-<b>-</b> - Modo de Editor de pestaña única
FILECHOOSER_FILTER_ANY;Todos los archivos FILECHOOSER_FILTER_ANY;Todos los archivos

28
rtdata/languages/Espanol (Latin America)
View File

@ -224,11 +224,11 @@ FILEBROWSER_POPUPUNTRASH;Sacar de la papelera
FILEBROWSER_QUERYBUTTONHINT;Borrar la búsqueda FILEBROWSER_QUERYBUTTONHINT;Borrar la búsqueda
FILEBROWSER_QUERYHINT;Escriba <i>parte del nombre del archivo</i> a buscar, o una <i>lista separada con comas</i>.\nP.ej. <i>1001,1004,1199</i>\n\n<b>Ctrl-F</b> Para poner el foco en el campo Buscar.\n<b>Enter</b> Para iniciar la búsqueda.\n<b>Esc</b> Para limpiar.\n<b>Shift-Esc</b> Para quitar el foco. FILEBROWSER_QUERYHINT;Escriba <i>parte del nombre del archivo</i> a buscar, o una <i>lista separada con comas</i>.\nP.ej. <i>1001,1004,1199</i>\n\n<b>Ctrl-F</b> Para poner el foco en el campo Buscar.\n<b>Enter</b> Para iniciar la búsqueda.\n<b>Esc</b> Para limpiar.\n<b>Shift-Esc</b> Para quitar el foco.
FILEBROWSER_QUERYLABEL; Buscar: FILEBROWSER_QUERYLABEL; Buscar:
FILEBROWSER_RANK1_TOOLTIP;Rango 1 *\nTecla de Atajo<b>Shift-1</b> FILEBROWSER_RANK1_TOOLTIP;Rango 1 *\nTecla de Atajo<b>1</b>
FILEBROWSER_RANK2_TOOLTIP;Rango 2 **\nTecla de Atajo<b>Shift-2</b> FILEBROWSER_RANK2_TOOLTIP;Rango 2 **\nTecla de Atajo<b>2</b>
FILEBROWSER_RANK3_TOOLTIP;Rango 3 ***\nTecla de Atajo<b>Shift-3</b> FILEBROWSER_RANK3_TOOLTIP;Rango 3 ***\nTecla de Atajo<b>3</b>
FILEBROWSER_RANK4_TOOLTIP;Rango 4 ****\nTecla de Atajo<b>Shift-4</b> FILEBROWSER_RANK4_TOOLTIP;Rango 4 ****\nTecla de Atajo<b>4</b>
FILEBROWSER_RANK5_TOOLTIP;Rango 5 *****\nTecla de Atajo<b>Shift-5</b> FILEBROWSER_RANK5_TOOLTIP;Rango 5 *****\nTecla de Atajo<b>5</b>
FILEBROWSER_RENAMEDLGLABEL;Renombrar archivo FILEBROWSER_RENAMEDLGLABEL;Renombrar archivo
FILEBROWSER_RESETDEFAULTPROFILE;Restablecen a los predeterminados FILEBROWSER_RESETDEFAULTPROFILE;Restablecen a los predeterminados
FILEBROWSER_SELECTDARKFRAME;Seleccionar Toma Negra… FILEBROWSER_SELECTDARKFRAME;Seleccionar Toma Negra…
@ -239,22 +239,22 @@ FILEBROWSER_SHOWCOLORLABEL3HINT;Mostrar imágenes etiquetadas con Verde <b>Alt-3
FILEBROWSER_SHOWCOLORLABEL4HINT;Mostrar imágenes etiquetadas con Azul <b>Alt-4</b> FILEBROWSER_SHOWCOLORLABEL4HINT;Mostrar imágenes etiquetadas con Azul <b>Alt-4</b>
FILEBROWSER_SHOWCOLORLABEL5HINT;Mostrar imágenes etiquetadas con Púrpura <b>Alt-5</b> FILEBROWSER_SHOWCOLORLABEL5HINT;Mostrar imágenes etiquetadas con Púrpura <b>Alt-5</b>
FILEBROWSER_SHOWDIRHINT;Quitar todos los filtros.\nTecla de Atajo: <b>d</b> FILEBROWSER_SHOWDIRHINT;Quitar todos los filtros.\nTecla de Atajo: <b>d</b>
FILEBROWSER_SHOWEDITEDHINT;Mostrar imágenes editadas.\nTecla de Atajo: <b>7</b> FILEBROWSER_SHOWEDITEDHINT;Mostrar imágenes editadas.\nTecla de Atajo: <b>Shift-7</b>
FILEBROWSER_SHOWEDITEDNOTHINT;Mostrar imágenes no editadas.\nTecla de Atajo: <b>6</b> FILEBROWSER_SHOWEDITEDNOTHINT;Mostrar imágenes no editadas.\nTecla de Atajo: <b>Shift-6</b>
FILEBROWSER_SHOWEXIFINFO;Mostrar datos Exif.\nTecla de Atajo: <b>i</b>\n\nTecla de Atajo en modo editor simple: <b>Alt-I</b> FILEBROWSER_SHOWEXIFINFO;Mostrar datos Exif.\nTecla de Atajo: <b>i</b>\n\nTecla de Atajo en modo editor simple: <b>Alt-I</b>
FILEBROWSER_SHOWORIGINALHINT;Muestre solo imágenes originales. \nCuando existen varias imágenes con el mismo nombre de archivo pero con diferentes extensiones, la que se considera original es aquella cuya extensión está más cerca de la parte superior de la lista de extensiones analizadas en Preferencias> Explorador de archivos> Extensiones analizadas. FILEBROWSER_SHOWORIGINALHINT;Muestre solo imágenes originales. \nCuando existen varias imágenes con el mismo nombre de archivo pero con diferentes extensiones, la que se considera original es aquella cuya extensión está más cerca de la parte superior de la lista de extensiones analizadas en Preferencias> Explorador de archivos> Extensiones analizadas.
FILEBROWSER_SHOWRANK1HINT;Mostrar imágenes con 1 estrella.\nTecla de Atajo: <b>1</b> FILEBROWSER_SHOWRANK1HINT;Mostrar imágenes con 1 estrella.\nTecla de Atajo: <b>Shift-1</b>
FILEBROWSER_SHOWRANK2HINT;Mostrar imágenes con 2 estrellas.\nTecla de Atajo: <b>2</b> FILEBROWSER_SHOWRANK2HINT;Mostrar imágenes con 2 estrellas.\nTecla de Atajo: <b>Shift-2</b>
FILEBROWSER_SHOWRANK3HINT;Mostrar imágenes con 3 estrellas.\nTecla de Atajo: <b>3</b> FILEBROWSER_SHOWRANK3HINT;Mostrar imágenes con 3 estrellas.\nTecla de Atajo: <b>Shift-3</b>
FILEBROWSER_SHOWRANK4HINT;Mostrar imágenes con 4 estrellas.\nTecla de Atajo: <b>4</b> FILEBROWSER_SHOWRANK4HINT;Mostrar imágenes con 4 estrellas.\nTecla de Atajo: <b>Shift-4</b>
FILEBROWSER_SHOWRANK5HINT;Mostrar imágenes con 5 estrellas.\nTecla de Atajo: <b>5</b> FILEBROWSER_SHOWRANK5HINT;Mostrar imágenes con 5 estrellas.\nTecla de Atajo: <b>Shift-5</b>
FILEBROWSER_SHOWRECENTLYSAVEDHINT;Mostrar imágenes guardadas recientemente.\nTecla de Atajo: <b>Alt-7</b> FILEBROWSER_SHOWRECENTLYSAVEDHINT;Mostrar imágenes guardadas recientemente.\nTecla de Atajo: <b>Alt-7</b>
FILEBROWSER_SHOWRECENTLYSAVEDNOTHINT;Mostrar imágenes no guardadas recientemente.\nTecla de Atajo: <b>Alt-6</b> FILEBROWSER_SHOWRECENTLYSAVEDNOTHINT;Mostrar imágenes no guardadas recientemente.\nTecla de Atajo: <b>Alt-6</b>
FILEBROWSER_SHOWTRASHHINT;Mostrar el contenido de la papelera.\nTecla de Atajo: <b>Ctrl-t</b> FILEBROWSER_SHOWTRASHHINT;Mostrar el contenido de la papelera.\nTecla de Atajo: <b>Ctrl-t</b>
FILEBROWSER_SHOWUNCOLORHINT;Mostrar imágenes sin etiqueta de color.\nTecla de Atajo: <b>Alt-0</b> FILEBROWSER_SHOWUNCOLORHINT;Mostrar imágenes sin etiqueta de color.\nTecla de Atajo: <b>Alt-0</b>
FILEBROWSER_SHOWUNRANKHINT;Mostrar imágenes sin rango.\nTecla de Atajo: <b>0</b> FILEBROWSER_SHOWUNRANKHINT;Mostrar imágenes sin rango.\nTecla de Atajo: <b>Shift-0</b>
FILEBROWSER_THUMBSIZE;Tamaño miniatura FILEBROWSER_THUMBSIZE;Tamaño miniatura
FILEBROWSER_UNRANK_TOOLTIP;Sin Rango\nTecla de Atajo<b>Shift - 0</b> FILEBROWSER_UNRANK_TOOLTIP;Sin Rango\nTecla de Atajo<b>0</b>
FILEBROWSER_ZOOMINHINT;Agrandar miniatura.\nTecla de Atajo: <b>+</b>\n\nTecla de Atajo en modo editor simple: <b>Alt-+</b> FILEBROWSER_ZOOMINHINT;Agrandar miniatura.\nTecla de Atajo: <b>+</b>\n\nTecla de Atajo en modo editor simple: <b>Alt-+</b>
FILEBROWSER_ZOOMOUTHINT;Reducir miniatura.\nTecla de Atajo: <b>-</b>\n\nTecla de Atajo en modo editor simple: <b>Alt--</b> FILEBROWSER_ZOOMOUTHINT;Reducir miniatura.\nTecla de Atajo: <b>-</b>\n\nTecla de Atajo en modo editor simple: <b>Alt--</b>
FILECHOOSER_FILTER_ANY;Todos los archivos FILECHOOSER_FILTER_ANY;Todos los archivos

28
rtdata/languages/Francais
View File

@ -163,11 +163,11 @@ FILEBROWSER_POPUPUNTRASH;Retirer de la corbeille
FILEBROWSER_QUERYBUTTONHINT;Effacer la recherche FILEBROWSER_QUERYBUTTONHINT;Effacer la recherche
FILEBROWSER_QUERYHINT;Taper la <i>partie du nom</i> du fichier à chercher ou une <i>liste spéarée par des virgules</i>.\nEx: <i>1001.1004.1199</i>\n\n<b>Ctrl-F</b> pour placer le curseur dans le champ de saisie.\n<b>Entrée</b> pour lancer la recherche\n<b>Esc</b> pour effacer.\n<b>Shift-Esc</b> pour enlever le focus. FILEBROWSER_QUERYHINT;Taper la <i>partie du nom</i> du fichier à chercher ou une <i>liste spéarée par des virgules</i>.\nEx: <i>1001.1004.1199</i>\n\n<b>Ctrl-F</b> pour placer le curseur dans le champ de saisie.\n<b>Entrée</b> pour lancer la recherche\n<b>Esc</b> pour effacer.\n<b>Shift-Esc</b> pour enlever le focus.
FILEBROWSER_QUERYLABEL;Chercher: FILEBROWSER_QUERYLABEL;Chercher:
FILEBROWSER_RANK1_TOOLTIP;Rang 1 *\nRaccourci: <b>Shift-1</b> FILEBROWSER_RANK1_TOOLTIP;Rang 1 *\nRaccourci: <b>1</b>
FILEBROWSER_RANK2_TOOLTIP;Rang 2 *\nRaccourci: <b>Shift-2</b> FILEBROWSER_RANK2_TOOLTIP;Rang 2 *\nRaccourci: <b>2</b>
FILEBROWSER_RANK3_TOOLTIP;Rang 3 *\nRaccourci: <b>Shift-3</b> FILEBROWSER_RANK3_TOOLTIP;Rang 3 *\nRaccourci: <b>3</b>
FILEBROWSER_RANK4_TOOLTIP;Rang 4 *\nRaccourci: <b>Shift-4</b> FILEBROWSER_RANK4_TOOLTIP;Rang 4 *\nRaccourci: <b>4</b>
FILEBROWSER_RANK5_TOOLTIP;Rang 5 *\nRaccourci: <b>Shift-5</b> FILEBROWSER_RANK5_TOOLTIP;Rang 5 *\nRaccourci: <b>5</b>
FILEBROWSER_RENAMEDLGLABEL;Renommage du fichier FILEBROWSER_RENAMEDLGLABEL;Renommage du fichier
FILEBROWSER_RESETDEFAULTPROFILE;Réinitialise au traitement par défaut FILEBROWSER_RESETDEFAULTPROFILE;Réinitialise au traitement par défaut
FILEBROWSER_SELECTDARKFRAME;Choisir une image de Trame Noire... FILEBROWSER_SELECTDARKFRAME;Choisir une image de Trame Noire...
@ -178,22 +178,22 @@ FILEBROWSER_SHOWCOLORLABEL3HINT;Afficher les images avec un label Vert\nRaccourc
FILEBROWSER_SHOWCOLORLABEL4HINT;Afficher les images avec un label Bleu\nRaccourci: <b>Alt-4</b> FILEBROWSER_SHOWCOLORLABEL4HINT;Afficher les images avec un label Bleu\nRaccourci: <b>Alt-4</b>
FILEBROWSER_SHOWCOLORLABEL5HINT;Afficher les images avec un label Pourpre\nRaccourci: <b>Alt-5</b> FILEBROWSER_SHOWCOLORLABEL5HINT;Afficher les images avec un label Pourpre\nRaccourci: <b>Alt-5</b>
FILEBROWSER_SHOWDIRHINT;Voir toutes les images du dossier\nRaccourci: <b>d</b> FILEBROWSER_SHOWDIRHINT;Voir toutes les images du dossier\nRaccourci: <b>d</b>
FILEBROWSER_SHOWEDITEDHINT;Afficher les images éditées\nRaccourci: <b>7</b> FILEBROWSER_SHOWEDITEDHINT;Afficher les images éditées\nRaccourci: <b>Shift-7</b>
FILEBROWSER_SHOWEDITEDNOTHINT;Afficher les images non éditées\nRaccourci: <b>6</b> FILEBROWSER_SHOWEDITEDNOTHINT;Afficher les images non éditées\nRaccourci: <b>Shift-6</b>
FILEBROWSER_SHOWEXIFINFO;Montrer les infos EXIF.\nRaccourci: <b>i</b>\n\nRaccourcis dans le mode Éditeur Unique: <b>Alt-i</b> FILEBROWSER_SHOWEXIFINFO;Montrer les infos EXIF.\nRaccourci: <b>i</b>\n\nRaccourcis dans le mode Éditeur Unique: <b>Alt-i</b>
FILEBROWSER_SHOWORIGINALHINT;Voir seulement les images originales.\n\nQuand plusieurs images éxistent avec le même nom de fichier mais des extensions différentes, celle considéré originale est celle dont l'extention est au plus dans la liste des extensions dans Préférences > Navigateur de fichiers > Extensions considérées. FILEBROWSER_SHOWORIGINALHINT;Voir seulement les images originales.\n\nQuand plusieurs images éxistent avec le même nom de fichier mais des extensions différentes, celle considéré originale est celle dont l'extention est au plus dans la liste des extensions dans Préférences > Navigateur de fichiers > Extensions considérées.
FILEBROWSER_SHOWRANK1HINT;Voir les images 1 étoile\nRaccourci: <b>1</b> FILEBROWSER_SHOWRANK1HINT;Voir les images 1 étoile\nRaccourci: <b>Shift-1</b>
FILEBROWSER_SHOWRANK2HINT;Voir les images 2 étoiles\nRaccourci: <b>2</b> FILEBROWSER_SHOWRANK2HINT;Voir les images 2 étoiles\nRaccourci: <b>Shift-2</b>
FILEBROWSER_SHOWRANK3HINT;Voir les images 3 étoiles\nRaccourci: <b>3</b> FILEBROWSER_SHOWRANK3HINT;Voir les images 3 étoiles\nRaccourci: <b>Shift-3</b>
FILEBROWSER_SHOWRANK4HINT;Voir les images 4 étoiles\nRaccourci: <b>4</b> FILEBROWSER_SHOWRANK4HINT;Voir les images 4 étoiles\nRaccourci: <b>Shift-4</b>
FILEBROWSER_SHOWRANK5HINT;Voir les images 5 étoiles\nRaccourci: <b>5</b> FILEBROWSER_SHOWRANK5HINT;Voir les images 5 étoiles\nRaccourci: <b>Shift-5</b>
FILEBROWSER_SHOWRECENTLYSAVEDHINT;Afficher les images sauvegardées récemment\nRaccourci: <b>Alt-7</b> FILEBROWSER_SHOWRECENTLYSAVEDHINT;Afficher les images sauvegardées récemment\nRaccourci: <b>Alt-7</b>
FILEBROWSER_SHOWRECENTLYSAVEDNOTHINT; Afficher les images non sauvegardées récemment\nRaccourci: <b>Alt-6</b> FILEBROWSER_SHOWRECENTLYSAVEDNOTHINT; Afficher les images non sauvegardées récemment\nRaccourci: <b>Alt-6</b>
FILEBROWSER_SHOWTRASHHINT;Voir le contenu de la corbeille\nRaccourci: <b>Ctrl-t</b> FILEBROWSER_SHOWTRASHHINT;Voir le contenu de la corbeille\nRaccourci: <b>Ctrl-t</b>
FILEBROWSER_SHOWUNCOLORHINT;Afficher les images sans label de couleur\nRaccourci: <b>Alt-0</b> FILEBROWSER_SHOWUNCOLORHINT;Afficher les images sans label de couleur\nRaccourci: <b>Alt-0</b>
FILEBROWSER_SHOWUNRANKHINT;Voir les images sans étoile\nRaccourci: <b>0</b> FILEBROWSER_SHOWUNRANKHINT;Voir les images sans étoile\nRaccourci: <b>Shift-0</b>
FILEBROWSER_THUMBSIZE;Taille vign. FILEBROWSER_THUMBSIZE;Taille vign.
FILEBROWSER_UNRANK_TOOLTIP;Effacer le rang\nRaccourci: <b>Shift-0</b> FILEBROWSER_UNRANK_TOOLTIP;Effacer le rang\nRaccourci: <b>0</b>
FILEBROWSER_ZOOMINHINT;Augmenter la taille des vignettes.\nRaccourci: <b>+</b>\n\nRaccourcis dans le mode Éditeur Unique: <b>Alt-+</b> FILEBROWSER_ZOOMINHINT;Augmenter la taille des vignettes.\nRaccourci: <b>+</b>\n\nRaccourcis dans le mode Éditeur Unique: <b>Alt-+</b>
FILEBROWSER_ZOOMOUTHINT;Diminuer la taille des vignettes.\nRaccourci: <b>-</b>\n\nRaccourcis dans le mode Éditeur Unique: <b>Alt--</b> FILEBROWSER_ZOOMOUTHINT;Diminuer la taille des vignettes.\nRaccourci: <b>-</b>\n\nRaccourcis dans le mode Éditeur Unique: <b>Alt--</b>
FILECHOOSER_FILTER_ANY;Tous les fichiers FILECHOOSER_FILTER_ANY;Tous les fichiers

28
rtdata/languages/Italiano
View File

@ -136,11 +136,11 @@ FILEBROWSER_POPUPUNTRASH;Rimuovi dal cestino
FILEBROWSER_QUERYBUTTONHINT;Azzera la ricerca FILEBROWSER_QUERYBUTTONHINT;Azzera la ricerca
FILEBROWSER_QUERYHINT;Scrivi il nome del file da cercare. Supporta nomi parziali. Separa i termini di ricerca con una virgola, ad esempio:\n<i>1001,1004,1199</i>\n\nScorciatoie:\n<b>Ctrl-f</b> - Posiziona sulla Casella di Ricerca,\n<b>Invio</b> - ricerca,\n<b>Esc<\b> - cancellare la Casella di Ricerca,\n<b>Shift-Esc</b> - Toglie il fuoco dalla Casella di Ricerca. FILEBROWSER_QUERYHINT;Scrivi il nome del file da cercare. Supporta nomi parziali. Separa i termini di ricerca con una virgola, ad esempio:\n<i>1001,1004,1199</i>\n\nScorciatoie:\n<b>Ctrl-f</b> - Posiziona sulla Casella di Ricerca,\n<b>Invio</b> - ricerca,\n<b>Esc<\b> - cancellare la Casella di Ricerca,\n<b>Shift-Esc</b> - Toglie il fuoco dalla Casella di Ricerca.
FILEBROWSER_QUERYLABEL; Cerca: FILEBROWSER_QUERYLABEL; Cerca:
FILEBROWSER_RANK1_TOOLTIP;Punteggio 1 *\nScorciatoia: <b>Shift-1</b> FILEBROWSER_RANK1_TOOLTIP;Punteggio 1 *\nScorciatoia: <b>1</b>
FILEBROWSER_RANK2_TOOLTIP;Punteggio 2 *\nScorciatoia: <b>Shift-2</b> FILEBROWSER_RANK2_TOOLTIP;Punteggio 2 *\nScorciatoia: <b>2</b>
FILEBROWSER_RANK3_TOOLTIP;Punteggio 3 *\nScorciatoia: <b>Shift-3</b> FILEBROWSER_RANK3_TOOLTIP;Punteggio 3 *\nScorciatoia: <b>3</b>
FILEBROWSER_RANK4_TOOLTIP;Punteggio 4 *\nScorciatoia: <b>Shift-4</b> FILEBROWSER_RANK4_TOOLTIP;Punteggio 4 *\nScorciatoia: <b>4</b>
FILEBROWSER_RANK5_TOOLTIP;Punteggio 5 *\nScorciatoia: <b>Shift-5</b> FILEBROWSER_RANK5_TOOLTIP;Punteggio 5 *\nScorciatoia: <b>5</b>
FILEBROWSER_RENAMEDLGLABEL;Rinomina il file FILEBROWSER_RENAMEDLGLABEL;Rinomina il file
FILEBROWSER_SELECTDARKFRAME;Seleziona un Dark Frame... FILEBROWSER_SELECTDARKFRAME;Seleziona un Dark Frame...
FILEBROWSER_SELECTFLATFIELD;Seleziona un Flat Field... FILEBROWSER_SELECTFLATFIELD;Seleziona un Flat Field...
@ -150,21 +150,21 @@ FILEBROWSER_SHOWCOLORLABEL3HINT;Mostra le immagini con etichetta Verde.\nScorcia
FILEBROWSER_SHOWCOLORLABEL4HINT;Mostra le immagini con etichetta Blu.\nScorciatoia: <b>Alt-4</b> FILEBROWSER_SHOWCOLORLABEL4HINT;Mostra le immagini con etichetta Blu.\nScorciatoia: <b>Alt-4</b>
FILEBROWSER_SHOWCOLORLABEL5HINT;Mostra le immagini con etichetta Viola.\nScorciatoia: <b>Alt-5</b> FILEBROWSER_SHOWCOLORLABEL5HINT;Mostra le immagini con etichetta Viola.\nScorciatoia: <b>Alt-5</b>
FILEBROWSER_SHOWDIRHINT;Rimuovi tutti i filtri.\nScorciatoia: <b>d</b> FILEBROWSER_SHOWDIRHINT;Rimuovi tutti i filtri.\nScorciatoia: <b>d</b>
FILEBROWSER_SHOWEDITEDHINT;Mostra immagini modificate.\nScorciatoia: <b>7</b> FILEBROWSER_SHOWEDITEDHINT;Mostra immagini modificate.\nScorciatoia: <b>Shift-7</b>
FILEBROWSER_SHOWEDITEDNOTHINT;Mostra immagini non modificate.\nScorciatoia: <b>6</b> FILEBROWSER_SHOWEDITEDNOTHINT;Mostra immagini non modificate.\nScorciatoia: <b>Shift-6</b>
FILEBROWSER_SHOWEXIFINFO;Mostra informazioni Exif.\nScorciatoie:\n<b>i</b> - Modalità a Schede Multiple,\n<b>Alt-i</b> - Modalità a Schede Singole. FILEBROWSER_SHOWEXIFINFO;Mostra informazioni Exif.\nScorciatoie:\n<b>i</b> - Modalità a Schede Multiple,\n<b>Alt-i</b> - Modalità a Schede Singole.
FILEBROWSER_SHOWRANK1HINT;Mostra le immagini classificate con 1 stella.\nScorciatoia: <b>1</b> FILEBROWSER_SHOWRANK1HINT;Mostra le immagini classificate con 1 stella.\nScorciatoia: <b>Shift-1</b>
FILEBROWSER_SHOWRANK2HINT;Mostra le immagini classificate con 2 stelle.\nScorciatoia: <b>2</b> FILEBROWSER_SHOWRANK2HINT;Mostra le immagini classificate con 2 stelle.\nScorciatoia: <b>Shift-2</b>
FILEBROWSER_SHOWRANK3HINT;Mostra le immagini classificate con 3 stelle.\nScorciatoia: <b>3</b> FILEBROWSER_SHOWRANK3HINT;Mostra le immagini classificate con 3 stelle.\nScorciatoia: <b>Shift-3</b>
FILEBROWSER_SHOWRANK4HINT;Mostra le immagini classificate con 4 stelle.\nScorciatoia: <b>4</b> FILEBROWSER_SHOWRANK4HINT;Mostra le immagini classificate con 4 stelle.\nScorciatoia: <b>Shift-4</b>
FILEBROWSER_SHOWRANK5HINT;Mostra le immagini classificate con 5 stelle.\nScorciatoia: <b>5</b> FILEBROWSER_SHOWRANK5HINT;Mostra le immagini classificate con 5 stelle.\nScorciatoia: <b>Shift-5</b>
FILEBROWSER_SHOWRECENTLYSAVEDHINT;Mostra le immagini salvate.\nScorciatoia: <b>Alt-7</b> FILEBROWSER_SHOWRECENTLYSAVEDHINT;Mostra le immagini salvate.\nScorciatoia: <b>Alt-7</b>
FILEBROWSER_SHOWRECENTLYSAVEDNOTHINT;Mostra le immagini non salvate.\nScorciatoia: <b>Alt-6</b> FILEBROWSER_SHOWRECENTLYSAVEDNOTHINT;Mostra le immagini non salvate.\nScorciatoia: <b>Alt-6</b>
FILEBROWSER_SHOWTRASHHINT;Mostra il contenuto del cestino.\nScorciatoia: <b>Ctrl-t</b> FILEBROWSER_SHOWTRASHHINT;Mostra il contenuto del cestino.\nScorciatoia: <b>Ctrl-t</b>
FILEBROWSER_SHOWUNCOLORHINT;Mostra le immagini senza etichetta colorata.\nScorciatoia: <b>Alt-0</b> FILEBROWSER_SHOWUNCOLORHINT;Mostra le immagini senza etichetta colorata.\nScorciatoia: <b>Alt-0</b>
FILEBROWSER_SHOWUNRANKHINT;Mostra le immagini non classificate.\nScorciatoia: <b>0</b> FILEBROWSER_SHOWUNRANKHINT;Mostra le immagini non classificate.\nScorciatoia: <b>Shift-0</b>
FILEBROWSER_THUMBSIZE;Dimensione miniature FILEBROWSER_THUMBSIZE;Dimensione miniature
FILEBROWSER_UNRANK_TOOLTIP;Nessun Punteggio.\nScorciatoia: <b>Shift-0</b> FILEBROWSER_UNRANK_TOOLTIP;Nessun Punteggio.\nScorciatoia: <b>0</b>
FILEBROWSER_ZOOMINHINT;Aumenta la dimensione delle miniature.\n\nScorciatoie:\n<b>+</b> - Modalità a Schede Multiple,\n<b>Alt</b>-<b>+</b> - Modalità a Schede Singole. FILEBROWSER_ZOOMINHINT;Aumenta la dimensione delle miniature.\n\nScorciatoie:\n<b>+</b> - Modalità a Schede Multiple,\n<b>Alt</b>-<b>+</b> - Modalità a Schede Singole.
FILEBROWSER_ZOOMOUTHINT;Diminuisci la dimensione delle miniature.\n\nScorciatoie:\n<b>-</b> - Modalità a Schede Multiple,\n<b>Alt</b>-<b>-</b> - Modalità a Schede Singole. FILEBROWSER_ZOOMOUTHINT;Diminuisci la dimensione delle miniature.\n\nScorciatoie:\n<b>-</b> - Modalità a Schede Multiple,\n<b>Alt</b>-<b>-</b> - Modalità a Schede Singole.
GENERAL_ABOUT;Informazioni GENERAL_ABOUT;Informazioni

28
rtdata/languages/Japanese
View File

@ -171,11 +171,11 @@ FILEBROWSER_POPUPUNTRASH;ゴミ箱から移動
FILEBROWSER_QUERYBUTTONHINT;検索ボックス内のヒントをクリア FILEBROWSER_QUERYBUTTONHINT;検索ボックス内のヒントをクリア
FILEBROWSER_QUERYHINT;ファイルを検索する。<i>ファイル名の一部</i>でも可。複数の場合は、<i>ファイル名をカンマで区切る</i>\n例 <i>1001,1004,1199</i>\n\n入力した名前以外のファイルを検索する場合は、先頭に<i>!=</i>を入れる\n例　<i>!=1001,1004,1199</i>\n\nショートカット：\n<b>Ctrl-F</b> 検索ボックスをフォーカスにする\n<b>Enter</b> 検索を開始\n<b>Esc</b> クリア\n<b>Shift-Esc</b>フォーカスを解除 FILEBROWSER_QUERYHINT;ファイルを検索する。<i>ファイル名の一部</i>でも可。複数の場合は、<i>ファイル名をカンマで区切る</i>\n例 <i>1001,1004,1199</i>\n\n入力した名前以外のファイルを検索する場合は、先頭に<i>!=</i>を入れる\n例　<i>!=1001,1004,1199</i>\n\nショートカット：\n<b>Ctrl-F</b> 検索ボックスをフォーカスにする\n<b>Enter</b> 検索を開始\n<b>Esc</b> クリア\n<b>Shift-Esc</b>フォーカスを解除
FILEBROWSER_QUERYLABEL; 検索: FILEBROWSER_QUERYLABEL; 検索:
FILEBROWSER_RANK1_TOOLTIP;ランク 1 *\nショートカット: <b>Shift-1</b> FILEBROWSER_RANK1_TOOLTIP;ランク 1 *\nショートカット: <b>1</b>
FILEBROWSER_RANK2_TOOLTIP;ランク 2 *\nショートカット: <b>Shift-2</b> FILEBROWSER_RANK2_TOOLTIP;ランク 2 *\nショートカット: <b>2</b>
FILEBROWSER_RANK3_TOOLTIP;ランク 3 *\nショートカット: <b>Shift-3</b> FILEBROWSER_RANK3_TOOLTIP;ランク 3 *\nショートカット: <b>3</b>
FILEBROWSER_RANK4_TOOLTIP;ランク 4 *\nショートカット: <b>Shift-4</b> FILEBROWSER_RANK4_TOOLTIP;ランク 4 *\nショートカット: <b>4</b>
FILEBROWSER_RANK5_TOOLTIP;ランク 5 *\nショートカット: <b>Shift-5</b> FILEBROWSER_RANK5_TOOLTIP;ランク 5 *\nショートカット: <b>5</b>
FILEBROWSER_RENAMEDLGLABEL;ファイル名変更 FILEBROWSER_RENAMEDLGLABEL;ファイル名変更
FILEBROWSER_RESETDEFAULTPROFILE;デフォルトにリセット FILEBROWSER_RESETDEFAULTPROFILE;デフォルトにリセット
FILEBROWSER_SELECTDARKFRAME;ダークフレームの選択... FILEBROWSER_SELECTDARKFRAME;ダークフレームの選択...
@ -186,23 +186,23 @@ FILEBROWSER_SHOWCOLORLABEL3HINT;グリーン・ラベルの画像を表示\nシ
FILEBROWSER_SHOWCOLORLABEL4HINT;ブルー・ラベルの画像を表示\nショートカット: <b>Alt-4</b> FILEBROWSER_SHOWCOLORLABEL4HINT;ブルー・ラベルの画像を表示\nショートカット: <b>Alt-4</b>
FILEBROWSER_SHOWCOLORLABEL5HINT;パープル・ラベルの画像を表示\nショートカット: <b>Alt-5</b> FILEBROWSER_SHOWCOLORLABEL5HINT;パープル・ラベルの画像を表示\nショートカット: <b>Alt-5</b>
FILEBROWSER_SHOWDIRHINT;全ての絞り込みをクリア\nショートカット: <b>d</b> FILEBROWSER_SHOWDIRHINT;全ての絞り込みをクリア\nショートカット: <b>d</b>
FILEBROWSER_SHOWEDITEDHINT;編集済み画像を表示\nショートカット: <b>7</b> FILEBROWSER_SHOWEDITEDHINT;編集済み画像を表示\nショートカット: <b>Shift-7</b>
FILEBROWSER_SHOWEDITEDNOTHINT;未編集画像を表示\nショートカット: <b>6</b> FILEBROWSER_SHOWEDITEDNOTHINT;未編集画像を表示\nショートカット: <b>Shift-6</b>
FILEBROWSER_SHOWEXIFINFO;EXIF情報を表示\nショートカット: <b>i</b>\n\nシングル編集タブのショートカット: <b>Alt-i</b> FILEBROWSER_SHOWEXIFINFO;EXIF情報を表示\nショートカット: <b>i</b>\n\nシングル編集タブのショートカット: <b>Alt-i</b>
FILEBROWSER_SHOWNOTTRASHHINT;ゴミ箱の中にある画像だけを表示 FILEBROWSER_SHOWNOTTRASHHINT;ゴミ箱の中にある画像だけを表示
FILEBROWSER_SHOWORIGINALHINT;元画像だけを表示\n\nファイル名は同じだが拡張子が異なる画像がある場合は、環境設定の中のファイルブラウザタブにある拡張子リストの上位に位置する拡張子を持った画像を元画像とする。 FILEBROWSER_SHOWORIGINALHINT;元画像だけを表示\n\nファイル名は同じだが拡張子が異なる画像がある場合は、環境設定の中のファイルブラウザタブにある拡張子リストの上位に位置する拡張子を持った画像を元画像とする。
FILEBROWSER_SHOWRANK1HINT;１つ星ランクを表示\nショートカット: <b>1</b> FILEBROWSER_SHOWRANK1HINT;１つ星ランクを表示\nショートカット: <b>Shift-1</b>
FILEBROWSER_SHOWRANK2HINT;２つ星ランクを表示\nショートカット: <b>2</b> FILEBROWSER_SHOWRANK2HINT;２つ星ランクを表示\nショートカット: <b>Shift-2</b>
FILEBROWSER_SHOWRANK3HINT;３つ星ランクを表示\nショートカット: <b>3</b> FILEBROWSER_SHOWRANK3HINT;３つ星ランクを表示\nショートカット: <b>Shift-3</b>
FILEBROWSER_SHOWRANK4HINT;４つ星ランクを表示\nショートカット: <b>4</b> FILEBROWSER_SHOWRANK4HINT;４つ星ランクを表示\nショートカット: <b>Shift-4</b>
FILEBROWSER_SHOWRANK5HINT;５つ星ランクを表示\nショートカット: <b>5</b> FILEBROWSER_SHOWRANK5HINT;５つ星ランクを表示\nショートカット: <b>Shift-5</b>
FILEBROWSER_SHOWRECENTLYSAVEDHINT;最近保存された画像を表示\nショートカット: <b>Alt-7</b> FILEBROWSER_SHOWRECENTLYSAVEDHINT;最近保存された画像を表示\nショートカット: <b>Alt-7</b>
FILEBROWSER_SHOWRECENTLYSAVEDNOTHINT;最近保存されていない画像を表示\nショートカット: <b>Alt-6</b> FILEBROWSER_SHOWRECENTLYSAVEDNOTHINT;最近保存されていない画像を表示\nショートカット: <b>Alt-6</b>
FILEBROWSER_SHOWTRASHHINT;ゴミ箱の内容を表示\nショートカット: <b>Ctrl-t</b> FILEBROWSER_SHOWTRASHHINT;ゴミ箱の内容を表示\nショートカット: <b>Ctrl-t</b>
FILEBROWSER_SHOWUNCOLORHINT;カラー・ラベルのない画像を表示\nショートカット: <b>Alt-0</b> FILEBROWSER_SHOWUNCOLORHINT;カラー・ラベルのない画像を表示\nショートカット: <b>Alt-0</b>
FILEBROWSER_SHOWUNRANKHINT;ランクなし画像を表示\nショートカット: <b>0</b> FILEBROWSER_SHOWUNRANKHINT;ランクなし画像を表示\nショートカット: <b>Shift-0</b>
FILEBROWSER_THUMBSIZE;サムネイルのサイズ FILEBROWSER_THUMBSIZE;サムネイルのサイズ
FILEBROWSER_UNRANK_TOOLTIP;ランクなし\nショートカット: <b>Shift-0</b> FILEBROWSER_UNRANK_TOOLTIP;ランクなし\nショートカット: <b>0</b>
FILEBROWSER_ZOOMINHINT;サムネイルサイズの拡大\nショートカット: <b>+</b>\n\nシングル編集タブのショートカット: <b>Alt-+</b> FILEBROWSER_ZOOMINHINT;サムネイルサイズの拡大\nショートカット: <b>+</b>\n\nシングル編集タブのショートカット: <b>Alt-+</b>
FILEBROWSER_ZOOMOUTHINT;サムネイルサイズの縮小\nショートカット: <b>-</b>\n\nシングル編集タブのショートカット: <b>Alt--</b> FILEBROWSER_ZOOMOUTHINT;サムネイルサイズの縮小\nショートカット: <b>-</b>\n\nシングル編集タブのショートカット: <b>Alt--</b>
FILECHOOSER_FILTER_ANY;全てのファイル FILECHOOSER_FILTER_ANY;全てのファイル

1451
rtdata/languages/Magyar
View File

File diff suppressed because it is too large Load Diff

28
rtdata/languages/Nederlands
View File

@ -186,11 +186,11 @@ FILEBROWSER_POPUPUNTRASH;Haal terug uit prullenbak
FILEBROWSER_QUERYBUTTONHINT;Wis zoekopdracht FILEBROWSER_QUERYBUTTONHINT;Wis zoekopdracht
FILEBROWSER_QUERYHINT;Zoeken op bestandsnamen. Ondersteund gedeeltelijke bestandsnamen. Scheidt de zoektermen door komma's, bv.\n<i>1001,1004,1199</i>\n\nSluit zoektermen uit door ze te prefixen met <i>!=</i> bv.\n<i>!=1001,1004,1199</i> \n\nSneltoets:\n<b>Ctrl-f</b> - focus het zoekveld,\n<b>Enter</b> - zoek,\n<b>Esc</b> - verwijder zoekresultaat, \n<b>Shift-Esc</b> - verwijder focus van het zoekveld. FILEBROWSER_QUERYHINT;Zoeken op bestandsnamen. Ondersteund gedeeltelijke bestandsnamen. Scheidt de zoektermen door komma's, bv.\n<i>1001,1004,1199</i>\n\nSluit zoektermen uit door ze te prefixen met <i>!=</i> bv.\n<i>!=1001,1004,1199</i> \n\nSneltoets:\n<b>Ctrl-f</b> - focus het zoekveld,\n<b>Enter</b> - zoek,\n<b>Esc</b> - verwijder zoekresultaat, \n<b>Shift-Esc</b> - verwijder focus van het zoekveld.
FILEBROWSER_QUERYLABEL; Zoeken: FILEBROWSER_QUERYLABEL; Zoeken:
FILEBROWSER_RANK1_TOOLTIP;Waardering 1 *\nSneltoets: Shift-1 FILEBROWSER_RANK1_TOOLTIP;Waardering 1 *\nSneltoets: <b>1</b>
FILEBROWSER_RANK2_TOOLTIP;Waardering 2 *\nSneltoets: Shift-2 FILEBROWSER_RANK2_TOOLTIP;Waardering 2 *\nSneltoets: <b>2</b>
FILEBROWSER_RANK3_TOOLTIP;Waardering 3 *\nSneltoets: Shift-3 FILEBROWSER_RANK3_TOOLTIP;Waardering 3 *\nSneltoets: <b>3</b>
FILEBROWSER_RANK4_TOOLTIP;Waardering 4 *\nSneltoets: Shift-4 FILEBROWSER_RANK4_TOOLTIP;Waardering 4 *\nSneltoets: <b>4</b>
FILEBROWSER_RANK5_TOOLTIP;Waardering 5 *\nSneltoets: Shift-5 FILEBROWSER_RANK5_TOOLTIP;Waardering 5 *\nSneltoets: <b>5</b>
FILEBROWSER_RENAMEDLGLABEL;Hernoem bestand FILEBROWSER_RENAMEDLGLABEL;Hernoem bestand
FILEBROWSER_RESETDEFAULTPROFILE;Terugzetten naar standaardwaarde FILEBROWSER_RESETDEFAULTPROFILE;Terugzetten naar standaardwaarde
FILEBROWSER_SELECTDARKFRAME;Selecteer donkerframe... FILEBROWSER_SELECTDARKFRAME;Selecteer donkerframe...
@ -201,23 +201,23 @@ FILEBROWSER_SHOWCOLORLABEL3HINT;Toon foto's met label Groen\nSneltoets: <b>Alt-3
FILEBROWSER_SHOWCOLORLABEL4HINT;Toon foto's met label Blauw\nSneltoets: <b>Alt-4</b> FILEBROWSER_SHOWCOLORLABEL4HINT;Toon foto's met label Blauw\nSneltoets: <b>Alt-4</b>
FILEBROWSER_SHOWCOLORLABEL5HINT;Toon foto's met label Paars\nSneltoets: <b>Alt-5</b> FILEBROWSER_SHOWCOLORLABEL5HINT;Toon foto's met label Paars\nSneltoets: <b>Alt-5</b>
FILEBROWSER_SHOWDIRHINT;Verwijder alle filters.\nSneltoets: <b>d</b> FILEBROWSER_SHOWDIRHINT;Verwijder alle filters.\nSneltoets: <b>d</b>
FILEBROWSER_SHOWEDITEDHINT;Toon bewerkte foto's\nSneltoets: <b>7</b> FILEBROWSER_SHOWEDITEDHINT;Toon bewerkte foto's\nSneltoets: <b>Shift-7</b>
FILEBROWSER_SHOWEDITEDNOTHINT;Toon niet-bewerkte foto's\nSneltoets: <b>6</b> FILEBROWSER_SHOWEDITEDNOTHINT;Toon niet-bewerkte foto's\nSneltoets: <b>Shift-6</b>
FILEBROWSER_SHOWEXIFINFO;Toon EXIF-info FILEBROWSER_SHOWEXIFINFO;Toon EXIF-info
FILEBROWSER_SHOWNOTTRASHHINT;Toon alleen niet-verwijderde afbeeldingen. FILEBROWSER_SHOWNOTTRASHHINT;Toon alleen niet-verwijderde afbeeldingen.
FILEBROWSER_SHOWORIGINALHINT;Toon alleen originele afbeelding.\n\nAls er meerdere afbeeldingen zijn met dezelfde naam maar verschillende extensies, dan wordt de afbeelding waarvan de extensie het hoogst staat in de lijst met extensies in Voorkeuren > Bestandsnavigator > Extensies FILEBROWSER_SHOWORIGINALHINT;Toon alleen originele afbeelding.\n\nAls er meerdere afbeeldingen zijn met dezelfde naam maar verschillende extensies, dan wordt de afbeelding waarvan de extensie het hoogst staat in de lijst met extensies in Voorkeuren > Bestandsnavigator > Extensies
FILEBROWSER_SHOWRANK1HINT;Toon foto's met 1 ster.\nSneltoets: <b>1</b> FILEBROWSER_SHOWRANK1HINT;Toon foto's met 1 ster.\nSneltoets: <b>Shift-1</b>
FILEBROWSER_SHOWRANK2HINT;Toon foto's met 2 sterren.\nSneltoets: <b>2</b> FILEBROWSER_SHOWRANK2HINT;Toon foto's met 2 sterren.\nSneltoets: <b>Shift-2</b>
FILEBROWSER_SHOWRANK3HINT;Toon foto's met 3 sterren.\nSneltoets: <b>3</b> FILEBROWSER_SHOWRANK3HINT;Toon foto's met 3 sterren.\nSneltoets: <b>Shift-3</b>
FILEBROWSER_SHOWRANK4HINT;Toon foto's met 4 sterren.\nSneltoets: <b>4</b> FILEBROWSER_SHOWRANK4HINT;Toon foto's met 4 sterren.\nSneltoets: <b>Shift-4</b>
FILEBROWSER_SHOWRANK5HINT;Toon foto's met 5 sterren.\nSneltoets: <b>5</b> FILEBROWSER_SHOWRANK5HINT;Toon foto's met 5 sterren.\nSneltoets: <b>Shift-5</b>
FILEBROWSER_SHOWRECENTLYSAVEDHINT;Toon recent opgeslagen/verwerkte foto's.\nSneltoets: <b>Alt-7</b> FILEBROWSER_SHOWRECENTLYSAVEDHINT;Toon recent opgeslagen/verwerkte foto's.\nSneltoets: <b>Alt-7</b>
FILEBROWSER_SHOWRECENTLYSAVEDNOTHINT;Toon niet-opgeslagen/verwerkte foto's.\nSneltoets: <b>Alt-6</b> FILEBROWSER_SHOWRECENTLYSAVEDNOTHINT;Toon niet-opgeslagen/verwerkte foto's.\nSneltoets: <b>Alt-6</b>
FILEBROWSER_SHOWTRASHHINT;Toon inhoud prullenbak\nSneltoets: <b>Ctrl-t</b> FILEBROWSER_SHOWTRASHHINT;Toon inhoud prullenbak\nSneltoets: <b>Ctrl-t</b>
FILEBROWSER_SHOWUNCOLORHINT;Toon foto's zonder kleurlabel.\nSneltoets: <b>Alt-0</b> FILEBROWSER_SHOWUNCOLORHINT;Toon foto's zonder kleurlabel.\nSneltoets: <b>Alt-0</b>
FILEBROWSER_SHOWUNRANKHINT;Toon foto's zonder sterwaardering.\nSneltoets: <b>0</b> FILEBROWSER_SHOWUNRANKHINT;Toon foto's zonder sterwaardering.\nSneltoets: <b>Shift-0</b>
FILEBROWSER_THUMBSIZE;Miniaturen FILEBROWSER_THUMBSIZE;Miniaturen
FILEBROWSER_UNRANK_TOOLTIP;Verwijder sterwaardering\nSneltoets: <b>Shift-0</b> FILEBROWSER_UNRANK_TOOLTIP;Verwijder sterwaardering\nSneltoets: <b>0</b>
FILEBROWSER_ZOOMINHINT;Groter FILEBROWSER_ZOOMINHINT;Groter
FILEBROWSER_ZOOMOUTHINT;Kleiner FILEBROWSER_ZOOMOUTHINT;Kleiner
FILECHOOSER_FILTER_ANY;Alle bestanden FILECHOOSER_FILTER_ANY;Alle bestanden

28
rtdata/languages/Polish
View File

@ -166,11 +166,11 @@ FILEBROWSER_POPUPUNTRASH;Usuń z kosza
FILEBROWSER_QUERYBUTTONHINT;Wyczyść hasło szukania FILEBROWSER_QUERYBUTTONHINT;Wyczyść hasło szukania
FILEBROWSER_QUERYHINT;Wprowadź część nazwy, by zlokalizować plik. Oddziel hasła przecinkami, np.\n<i>1001,1004,1199</i>\n\nWyklucz hasła poprzedzając je znakiem <i>!=</i>\nnp.\n<i>!=1001,1004,1199</i>\n\nSkróty:\n<b>Ctrl-f</b> - przejdź do pola "Znajdź",\n<b>Enter</b> - szukaj,\n<b>Esc</b> - wyczyść pole "Znajdź",\n<b>Shift-Esc</b> - wyjdź z pola "Znajdź". FILEBROWSER_QUERYHINT;Wprowadź część nazwy, by zlokalizować plik. Oddziel hasła przecinkami, np.\n<i>1001,1004,1199</i>\n\nWyklucz hasła poprzedzając je znakiem <i>!=</i>\nnp.\n<i>!=1001,1004,1199</i>\n\nSkróty:\n<b>Ctrl-f</b> - przejdź do pola "Znajdź",\n<b>Enter</b> - szukaj,\n<b>Esc</b> - wyczyść pole "Znajdź",\n<b>Shift-Esc</b> - wyjdź z pola "Znajdź".
FILEBROWSER_QUERYLABEL; Znajdź: FILEBROWSER_QUERYLABEL; Znajdź:
FILEBROWSER_RANK1_TOOLTIP;Oceń 1 *\nSkrót: <b>Shift-1</b> FILEBROWSER_RANK1_TOOLTIP;Oceń 1 *\nSkrót: <b>1</b>
FILEBROWSER_RANK2_TOOLTIP;Oceń 2 *\nSkrót: <b>Shift-2</b> FILEBROWSER_RANK2_TOOLTIP;Oceń 2 *\nSkrót: <b>2</b>
FILEBROWSER_RANK3_TOOLTIP;Oceń 3 *\nSkrót: <b>Shift-3</b> FILEBROWSER_RANK3_TOOLTIP;Oceń 3 *\nSkrót: <b>3</b>
FILEBROWSER_RANK4_TOOLTIP;Oceń 4 *\nSkrót: <b>Shift-4</b> FILEBROWSER_RANK4_TOOLTIP;Oceń 4 *\nSkrót: <b>4</b>
FILEBROWSER_RANK5_TOOLTIP;Oceń 5 *\nSkrót: <b>Shift-5</b> FILEBROWSER_RANK5_TOOLTIP;Oceń 5 *\nSkrót: <b>5</b>
FILEBROWSER_RENAMEDLGLABEL;Zmień nazwę pliku FILEBROWSER_RENAMEDLGLABEL;Zmień nazwę pliku
FILEBROWSER_RESETDEFAULTPROFILE;Przywróć domyślne FILEBROWSER_RESETDEFAULTPROFILE;Przywróć domyślne
FILEBROWSER_SELECTDARKFRAME;Wybierz czarną klatkę... FILEBROWSER_SELECTDARKFRAME;Wybierz czarną klatkę...
@ -181,22 +181,22 @@ FILEBROWSER_SHOWCOLORLABEL3HINT;Pokazuje zdjęcia z zieloną etykietą.\nSkrót:
FILEBROWSER_SHOWCOLORLABEL4HINT;Pokazuje zdjęcia z niebieską etykietą.\nSkrót: <b>Alt-4</b> FILEBROWSER_SHOWCOLORLABEL4HINT;Pokazuje zdjęcia z niebieską etykietą.\nSkrót: <b>Alt-4</b>
FILEBROWSER_SHOWCOLORLABEL5HINT;Pokazuje zdjęcia z purpurową etykietą.\nSkrót: <b>Alt-5</b> FILEBROWSER_SHOWCOLORLABEL5HINT;Pokazuje zdjęcia z purpurową etykietą.\nSkrót: <b>Alt-5</b>
FILEBROWSER_SHOWDIRHINT;Wyłącza wyszstkie filtry.\nSkrót: <b>d</b> FILEBROWSER_SHOWDIRHINT;Wyłącza wyszstkie filtry.\nSkrót: <b>d</b>
FILEBROWSER_SHOWEDITEDHINT;Pokazuje edytowane zdjęcia.\nSkrót: <b>7</b> FILEBROWSER_SHOWEDITEDHINT;Pokazuje edytowane zdjęcia.\nSkrót: <b>Shift-7</b>
FILEBROWSER_SHOWEDITEDNOTHINT;Pokazuje nieedytowane zdjęcia.\nSkrót: <b>6</b> FILEBROWSER_SHOWEDITEDNOTHINT;Pokazuje nieedytowane zdjęcia.\nSkrót: <b>Shift-6</b>
FILEBROWSER_SHOWEXIFINFO;Pokaż dane Exif.\n\nSkróty:\n<b>i</b> - Tryb wielu zakładek,\n<b>Alt-i</b> - Tryb jednej zakładki. FILEBROWSER_SHOWEXIFINFO;Pokaż dane Exif.\n\nSkróty:\n<b>i</b> - Tryb wielu zakładek,\n<b>Alt-i</b> - Tryb jednej zakładki.
FILEBROWSER_SHOWNOTTRASHHINT;Pokazuj tylko obrazy które nie znajdują się w koszu. FILEBROWSER_SHOWNOTTRASHHINT;Pokazuj tylko obrazy które nie znajdują się w koszu.
FILEBROWSER_SHOWRANK1HINT;Pokazuje zdjęcia ocenione na 1 gwiazdkę.\nSkrót: <b>1</b> FILEBROWSER_SHOWRANK1HINT;Pokazuje zdjęcia ocenione na 1 gwiazdkę.\nSkrót: <b>Shift-1</b>
FILEBROWSER_SHOWRANK2HINT;Pokazuje zdjęcia ocenione na 2 gwiazdki.\nSkrót: <b>2</b> FILEBROWSER_SHOWRANK2HINT;Pokazuje zdjęcia ocenione na 2 gwiazdki.\nSkrót: <b>Shift-2</b>
FILEBROWSER_SHOWRANK3HINT;Pokazuje zdjęcia ocenione na 3 gwiazdki.\nSkrót: <b>3</b> FILEBROWSER_SHOWRANK3HINT;Pokazuje zdjęcia ocenione na 3 gwiazdki.\nSkrót: <b>Shift-3</b>
FILEBROWSER_SHOWRANK4HINT;Pokazuje zdjęcia ocenione na 4 gwiazdki.\nSkrót: <b>4</b> FILEBROWSER_SHOWRANK4HINT;Pokazuje zdjęcia ocenione na 4 gwiazdki.\nSkrót: <b>Shift-4</b>
FILEBROWSER_SHOWRANK5HINT;Pokazuje zdjęcia ocenione na 5 gwiazdek.\nSkrót: <b>5</b> FILEBROWSER_SHOWRANK5HINT;Pokazuje zdjęcia ocenione na 5 gwiazdek.\nSkrót: <b>Shift-5</b>
FILEBROWSER_SHOWRECENTLYSAVEDHINT;Pokazuje zapisane zdjęcia.\nSkrót: <b>Alt-7</b> FILEBROWSER_SHOWRECENTLYSAVEDHINT;Pokazuje zapisane zdjęcia.\nSkrót: <b>Alt-7</b>
FILEBROWSER_SHOWRECENTLYSAVEDNOTHINT;Pokazuje niezapisane zdjęcia.\nSkrót: <b>Alt-6</b> FILEBROWSER_SHOWRECENTLYSAVEDNOTHINT;Pokazuje niezapisane zdjęcia.\nSkrót: <b>Alt-6</b>
FILEBROWSER_SHOWTRASHHINT;Pokazuje zawartość kosza.\nSkrót: <b>Ctrl-t</b> FILEBROWSER_SHOWTRASHHINT;Pokazuje zawartość kosza.\nSkrót: <b>Ctrl-t</b>
FILEBROWSER_SHOWUNCOLORHINT;Pokazuje zdjęcia bez kolorowej etykiety.\nSkrót: <b>Alt-0</b> FILEBROWSER_SHOWUNCOLORHINT;Pokazuje zdjęcia bez kolorowej etykiety.\nSkrót: <b>Alt-0</b>
FILEBROWSER_SHOWUNRANKHINT;Pokazuje nieocenione zdjęcia.\nSkrót: <b>0</b> FILEBROWSER_SHOWUNRANKHINT;Pokazuje nieocenione zdjęcia.\nSkrót: <b>Shift-0</b>
FILEBROWSER_THUMBSIZE;Rozmiar minaturek FILEBROWSER_THUMBSIZE;Rozmiar minaturek
FILEBROWSER_UNRANK_TOOLTIP;Usuń ocenę.\nSkrót: <b>Shift-0</b> FILEBROWSER_UNRANK_TOOLTIP;Usuń ocenę.\nSkrót: <b>0</b>
FILEBROWSER_ZOOMINHINT;Zwiększa rozmiar miniaturek.\n\nSkróty:\n<b>+</b> - Tryb wielu zakładek,\n<b>Alt</b>-<b>+</b> - Tryb pojedyńczej zakładki. FILEBROWSER_ZOOMINHINT;Zwiększa rozmiar miniaturek.\n\nSkróty:\n<b>+</b> - Tryb wielu zakładek,\n<b>Alt</b>-<b>+</b> - Tryb pojedyńczej zakładki.
FILEBROWSER_ZOOMOUTHINT;Zmniejsza rozmiar miniaturek.\n\nSkróty:\n<b>-</b> - Tryb wielu zakładek,\n<b>Alt</b>-<b>-</b> - Tryb pojedyńczej zakładki. FILEBROWSER_ZOOMOUTHINT;Zmniejsza rozmiar miniaturek.\n\nSkróty:\n<b>-</b> - Tryb wielu zakładek,\n<b>Alt</b>-<b>-</b> - Tryb pojedyńczej zakładki.
FILECHOOSER_FILTER_ANY;Wszystkie pliki FILECHOOSER_FILTER_ANY;Wszystkie pliki

28
rtdata/languages/Portugues
View File

@ -164,11 +164,11 @@ FILEBROWSER_POPUPUNTRASH;Remover do caixote do lixo
FILEBROWSER_QUERYBUTTONHINT;Limpar a consulta de localizar FILEBROWSER_QUERYBUTTONHINT;Limpar a consulta de localizar
FILEBROWSER_QUERYHINT;Introduzir os nomes de ficheiros a procurar. Suporta nomes de ficheiros parciais. Separar os termos de pesquisa usando vírgulas, por exemplo\n<b>1001,1004,1199</b>\n\nPode-se excluir termos de pesquisa com o prefixo <b>!=</b> como por exemplo:\n<b>!=1001,1004,1199</b>\n\nAtalhos:\n<b>Ctrl-f</b> - selecionar o campo de localizar\n<b>Enter</b> - pesquisar\n<b>Esc</b> - limpar o campo de localizar\n<b>Shift-Esc</b> - desselecionar o campo de localizar FILEBROWSER_QUERYHINT;Introduzir os nomes de ficheiros a procurar. Suporta nomes de ficheiros parciais. Separar os termos de pesquisa usando vírgulas, por exemplo\n<b>1001,1004,1199</b>\n\nPode-se excluir termos de pesquisa com o prefixo <b>!=</b> como por exemplo:\n<b>!=1001,1004,1199</b>\n\nAtalhos:\n<b>Ctrl-f</b> - selecionar o campo de localizar\n<b>Enter</b> - pesquisar\n<b>Esc</b> - limpar o campo de localizar\n<b>Shift-Esc</b> - desselecionar o campo de localizar
FILEBROWSER_QUERYLABEL; Localizar: FILEBROWSER_QUERYLABEL; Localizar:
FILEBROWSER_RANK1_TOOLTIP;Classificação 1 estrela\nAtalho: <b>Shift-1</b> FILEBROWSER_RANK1_TOOLTIP;Classificação 1 estrela\nAtalho: <b>1</b>
FILEBROWSER_RANK2_TOOLTIP;Classificação 2 estrelas\nAtalho: <b>Shift-2</b> FILEBROWSER_RANK2_TOOLTIP;Classificação 2 estrelas\nAtalho: <b>2</b>
FILEBROWSER_RANK3_TOOLTIP;Classificação 3 estrelas\nAtalho: <b>Shift-3</b> FILEBROWSER_RANK3_TOOLTIP;Classificação 3 estrelas\nAtalho: <b>3</b>
FILEBROWSER_RANK4_TOOLTIP;Classificação 4 estrelas\nAtalho: <b>Shift-4</b> FILEBROWSER_RANK4_TOOLTIP;Classificação 4 estrelas\nAtalho: <b>4</b>
FILEBROWSER_RANK5_TOOLTIP;Classificação 5 estrelas\nAtalho: <b>Shift-5</b> FILEBROWSER_RANK5_TOOLTIP;Classificação 5 estrelas\nAtalho: <b>5</b>
FILEBROWSER_RENAMEDLGLABEL;Renomear ficheiro FILEBROWSER_RENAMEDLGLABEL;Renomear ficheiro
FILEBROWSER_RESETDEFAULTPROFILE;Repor padrão FILEBROWSER_RESETDEFAULTPROFILE;Repor padrão
FILEBROWSER_SELECTDARKFRAME;Selecionar fotograma escuro... FILEBROWSER_SELECTDARKFRAME;Selecionar fotograma escuro...
@ -179,22 +179,22 @@ FILEBROWSER_SHOWCOLORLABEL3HINT;Mostrar imagens marcadas com Verde.\nAtalho: <b>
FILEBROWSER_SHOWCOLORLABEL4HINT;Mostrar imagens marcadas com Azul.\nAtalho: <b>Alt-4</b> FILEBROWSER_SHOWCOLORLABEL4HINT;Mostrar imagens marcadas com Azul.\nAtalho: <b>Alt-4</b>
FILEBROWSER_SHOWCOLORLABEL5HINT;Mostrar imagens marcadas com Roxo.\nAtalho: <b>Alt-5</b> FILEBROWSER_SHOWCOLORLABEL5HINT;Mostrar imagens marcadas com Roxo.\nAtalho: <b>Alt-5</b>
FILEBROWSER_SHOWDIRHINT;Limpar todos os filtros.\nAtalho: <b>d</b> FILEBROWSER_SHOWDIRHINT;Limpar todos os filtros.\nAtalho: <b>d</b>
FILEBROWSER_SHOWEDITEDHINT;Mostrar imagens editadas.\nAtalho: <b>7</b> FILEBROWSER_SHOWEDITEDHINT;Mostrar imagens editadas.\nAtalho: <b>Shift-7</b>
FILEBROWSER_SHOWEDITEDNOTHINT;Mostrar imagens não editadas.\nAtalho: <b>6</b> FILEBROWSER_SHOWEDITEDNOTHINT;Mostrar imagens não editadas.\nAtalho: <b>Shift-6</b>
FILEBROWSER_SHOWEXIFINFO;Mostrar informações Exif.\n\nAtalhos:\n<b>i</b> - Modo de editor em várias abas,\n<b>Alt-i</b> - Modo de editor numa só aba. FILEBROWSER_SHOWEXIFINFO;Mostrar informações Exif.\n\nAtalhos:\n<b>i</b> - Modo de editor em várias abas,\n<b>Alt-i</b> - Modo de editor numa só aba.
FILEBROWSER_SHOWORIGINALHINT;Mostrar apenas imagens originais.\n\nQuando existem várias imagens com o mesmo nome de ficheiro mas com extensões diferentes, a única considerada original é aquela cuja extensão está mais próxima da parte superior da lista de extensões analisadas em Preferências > Navegador de ficheiros > Extensões analisadas. FILEBROWSER_SHOWORIGINALHINT;Mostrar apenas imagens originais.\n\nQuando existem várias imagens com o mesmo nome de ficheiro mas com extensões diferentes, a única considerada original é aquela cuja extensão está mais próxima da parte superior da lista de extensões analisadas em Preferências > Navegador de ficheiros > Extensões analisadas.
FILEBROWSER_SHOWRANK1HINT;Mostrar imagens classificadas com 1 estrela.\nAtalho: <b>1</b> FILEBROWSER_SHOWRANK1HINT;Mostrar imagens classificadas com 1 estrela.\nAtalho: <b>Shift-1</b>
FILEBROWSER_SHOWRANK2HINT;Mostrar imagens classificadas com 2 estrelas.\nAtalho: <b>2</b> FILEBROWSER_SHOWRANK2HINT;Mostrar imagens classificadas com 2 estrelas.\nAtalho: <b>Shift-2</b>
FILEBROWSER_SHOWRANK3HINT;Mostrar imagens classificadas com 3 estrelas.\nAtalho: <b>3</b> FILEBROWSER_SHOWRANK3HINT;Mostrar imagens classificadas com 3 estrelas.\nAtalho: <b>Shift-3</b>
FILEBROWSER_SHOWRANK4HINT;Mostrar imagens classificadas com 4 estrelas.\nAtalho: <b>4</b> FILEBROWSER_SHOWRANK4HINT;Mostrar imagens classificadas com 4 estrelas.\nAtalho: <b>Shift-4</b>
FILEBROWSER_SHOWRANK5HINT;Mostrar imagens classificadas com 5 estrelas.\nAtalho: <b>5</b> FILEBROWSER_SHOWRANK5HINT;Mostrar imagens classificadas com 5 estrelas.\nAtalho: <b>Shift-5</b>
FILEBROWSER_SHOWRECENTLYSAVEDHINT;Mostrar imagens guardadas.\nAtalho: <b>Alt-7</b> FILEBROWSER_SHOWRECENTLYSAVEDHINT;Mostrar imagens guardadas.\nAtalho: <b>Alt-7</b>
FILEBROWSER_SHOWRECENTLYSAVEDNOTHINT;Mostrar imagens não guardadas.\nAtalho: <b>Alt-6</b> FILEBROWSER_SHOWRECENTLYSAVEDNOTHINT;Mostrar imagens não guardadas.\nAtalho: <b>Alt-6</b>
FILEBROWSER_SHOWTRASHHINT;Mostrar conteúdo do caixote do lixo.\nAtalho: <b>Ctrl-t</b> FILEBROWSER_SHOWTRASHHINT;Mostrar conteúdo do caixote do lixo.\nAtalho: <b>Ctrl-t</b>
FILEBROWSER_SHOWUNCOLORHINT;Mostrar imagens sem etiqueta de cor.\nAtalho: <b>Alt-0</b> FILEBROWSER_SHOWUNCOLORHINT;Mostrar imagens sem etiqueta de cor.\nAtalho: <b>Alt-0</b>
FILEBROWSER_SHOWUNRANKHINT;Mostrar imagens sem classificação.\nAtalho: <b>0</b> FILEBROWSER_SHOWUNRANKHINT;Mostrar imagens sem classificação.\nAtalho: <b>Shift-0</b>
FILEBROWSER_THUMBSIZE;Tamanho das miniaturas FILEBROWSER_THUMBSIZE;Tamanho das miniaturas
FILEBROWSER_UNRANK_TOOLTIP;Desclassificar.\nAtalho: <b>Shift-0</b> FILEBROWSER_UNRANK_TOOLTIP;Desclassificar.\nAtalho: <b>0</b>
FILEBROWSER_ZOOMINHINT;Aumentar tamanho das miniaturas.\n\nAtalhos:\n<b>+</b> - Modo de editor em várias abas,\n<b>Alt</b>-<b>+</b> - Modo de editor numa só aba. FILEBROWSER_ZOOMINHINT;Aumentar tamanho das miniaturas.\n\nAtalhos:\n<b>+</b> - Modo de editor em várias abas,\n<b>Alt</b>-<b>+</b> - Modo de editor numa só aba.
FILEBROWSER_ZOOMOUTHINT;Diminuir o tamanho das miniaturas.\n\nAtalhos:\n<b>-</b> - Modo de editor em várias abas,\n<b>Alt</b>-<b>-</b> - Modo de editor numa só aba. FILEBROWSER_ZOOMOUTHINT;Diminuir o tamanho das miniaturas.\n\nAtalhos:\n<b>-</b> - Modo de editor em várias abas,\n<b>Alt</b>-<b>-</b> - Modo de editor numa só aba.
FILECHOOSER_FILTER_ANY;Todos os ficheiros FILECHOOSER_FILTER_ANY;Todos os ficheiros

28
rtdata/languages/Portugues (Brasil)
View File

@ -170,11 +170,11 @@ FILEBROWSER_POPUPUNTRASH;Remover da lixeira
FILEBROWSER_QUERYBUTTONHINT;Limpar a consulta Localizar FILEBROWSER_QUERYBUTTONHINT;Limpar a consulta Localizar
FILEBROWSER_QUERYHINT;Digite nomes de arquivos para procurar. Suporta nomes de arquivos parciais. Separe os termos de pesquisa usando vírgulas, por exemplo\n<i>1001,1004,1199</i>\n\nExcluir termos de pesquisa prefixando-os com <i>!=</i>\npor ex.\n<i>!=1001,1004,1199</i>\n\nAtalhos:\n<b>Ctrl-f</b> - foque a caixa Localizar,\n<b>Enter</b> - pesquisa,\n<b>Esc</b> - Limpe a caixa Localizar,\n<b>Shift-Esc</b> - desfoque a caixa Localizar. FILEBROWSER_QUERYHINT;Digite nomes de arquivos para procurar. Suporta nomes de arquivos parciais. Separe os termos de pesquisa usando vírgulas, por exemplo\n<i>1001,1004,1199</i>\n\nExcluir termos de pesquisa prefixando-os com <i>!=</i>\npor ex.\n<i>!=1001,1004,1199</i>\n\nAtalhos:\n<b>Ctrl-f</b> - foque a caixa Localizar,\n<b>Enter</b> - pesquisa,\n<b>Esc</b> - Limpe a caixa Localizar,\n<b>Shift-Esc</b> - desfoque a caixa Localizar.
FILEBROWSER_QUERYLABEL; Localizar: FILEBROWSER_QUERYLABEL; Localizar:
FILEBROWSER_RANK1_TOOLTIP;Classificação 1 *\nAtalho: <b>Shift-1</b> FILEBROWSER_RANK1_TOOLTIP;Classificação 1 *\nAtalho: <b>1</b>
FILEBROWSER_RANK2_TOOLTIP;Classificação 2 *\nAtalho: <b>Shift-2</b> FILEBROWSER_RANK2_TOOLTIP;Classificação 2 *\nAtalho: <b>2</b>
FILEBROWSER_RANK3_TOOLTIP;Classificação 3 *\nAtalho: <b>Shift-3</b> FILEBROWSER_RANK3_TOOLTIP;Classificação 3 *\nAtalho: <b>3</b>
FILEBROWSER_RANK4_TOOLTIP;Classificação 4 *\nAtalho: <b>Shift-4</b> FILEBROWSER_RANK4_TOOLTIP;Classificação 4 *\nAtalho: <b>4</b>
FILEBROWSER_RANK5_TOOLTIP;Classificação 5 *\nAtalho: <b>Shift-5</b> FILEBROWSER_RANK5_TOOLTIP;Classificação 5 *\nAtalho: <b>5</b>
FILEBROWSER_RENAMEDLGLABEL;Renomear arquivo FILEBROWSER_RENAMEDLGLABEL;Renomear arquivo
FILEBROWSER_RESETDEFAULTPROFILE;Restaurar para o padrão FILEBROWSER_RESETDEFAULTPROFILE;Restaurar para o padrão
FILEBROWSER_SELECTDARKFRAME;Selecionar quadro escuro... FILEBROWSER_SELECTDARKFRAME;Selecionar quadro escuro...
@ -185,23 +185,23 @@ FILEBROWSER_SHOWCOLORLABEL3HINT;Mostrar imagens marcadas com Verde.\nAtalho: <b>
FILEBROWSER_SHOWCOLORLABEL4HINT;Mostrar imagens marcadas com Azul.\nAtalho: <b>Alt-4</b> FILEBROWSER_SHOWCOLORLABEL4HINT;Mostrar imagens marcadas com Azul.\nAtalho: <b>Alt-4</b>
FILEBROWSER_SHOWCOLORLABEL5HINT;Mostrar imagens marcadas com Roxo.\nAtalho: <b>Alt-5</b> FILEBROWSER_SHOWCOLORLABEL5HINT;Mostrar imagens marcadas com Roxo.\nAtalho: <b>Alt-5</b>
FILEBROWSER_SHOWDIRHINT;Limpar todos os filtros.\nAtalho: <b>d</b> FILEBROWSER_SHOWDIRHINT;Limpar todos os filtros.\nAtalho: <b>d</b>
FILEBROWSER_SHOWEDITEDHINT;Mostrar imagens editadas.\nAtalho: <b>7</b> FILEBROWSER_SHOWEDITEDHINT;Mostrar imagens editadas.\nAtalho: <b>Shift-7</b>
FILEBROWSER_SHOWEDITEDNOTHINT;Mostrar imagens não editadas.\nAtalho: <b>6</b> FILEBROWSER_SHOWEDITEDNOTHINT;Mostrar imagens não editadas.\nAtalho: <b>Shift-6</b>
FILEBROWSER_SHOWEXIFINFO;Mostrar informações Exif.\n\nAtalhos:\n<b>i</b> - Modo de Guias de Editores Múltiplos,\n<b>Alt-i</b> - Modo de Guia de Editor Único. FILEBROWSER_SHOWEXIFINFO;Mostrar informações Exif.\n\nAtalhos:\n<b>i</b> - Modo de Guias de Editores Múltiplos,\n<b>Alt-i</b> - Modo de Guia de Editor Único.
FILEBROWSER_SHOWNOTTRASHHINT;Mostrar apenas imagens que não estão no lixo. FILEBROWSER_SHOWNOTTRASHHINT;Mostrar apenas imagens que não estão no lixo.
FILEBROWSER_SHOWORIGINALHINT;Mostre somente imagens originais.\n\nQuando existem várias imagens com o mesmo nome de arquivo, mas extensões diferentes, a única considerada original é aquela cuja extensão está mais próxima da parte superior da lista de extensões analisadas em Preferências > Navegador de Arquivos > Extensões Analisadas. FILEBROWSER_SHOWORIGINALHINT;Mostre somente imagens originais.\n\nQuando existem várias imagens com o mesmo nome de arquivo, mas extensões diferentes, a única considerada original é aquela cuja extensão está mais próxima da parte superior da lista de extensões analisadas em Preferências > Navegador de Arquivos > Extensões Analisadas.
FILEBROWSER_SHOWRANK1HINT;Mostrar imagens classificadas com 1 estrela.\nAtalho: <b>1</b> FILEBROWSER_SHOWRANK1HINT;Mostrar imagens classificadas com 1 estrela.\nAtalho: <b>Shift-1</b>
FILEBROWSER_SHOWRANK2HINT;Mostrar imagens classificadas com 2 estrelas.\nAtalho: <b>2</b> FILEBROWSER_SHOWRANK2HINT;Mostrar imagens classificadas com 2 estrelas.\nAtalho: <b>Shift-2</b>
FILEBROWSER_SHOWRANK3HINT;Mostrar imagens classificadas com 3 estrelas.\nAtalho: <b>3</b> FILEBROWSER_SHOWRANK3HINT;Mostrar imagens classificadas com 3 estrelas.\nAtalho: <b>Shift-3</b>
FILEBROWSER_SHOWRANK4HINT;Mostrar imagens classificadas com 4 estrelas.\nAtalho: <b>4</b> FILEBROWSER_SHOWRANK4HINT;Mostrar imagens classificadas com 4 estrelas.\nAtalho: <b>Shift-4</b>
FILEBROWSER_SHOWRANK5HINT;Mostrar imagens classificadas com 5 estrelas.\nAtalho: <b>5</b> FILEBROWSER_SHOWRANK5HINT;Mostrar imagens classificadas com 5 estrelas.\nAtalho: <b>Shift-5</b>
FILEBROWSER_SHOWRECENTLYSAVEDHINT;Mostrar imagens salvas.\nAtalho: <b>Alt-7</b> FILEBROWSER_SHOWRECENTLYSAVEDHINT;Mostrar imagens salvas.\nAtalho: <b>Alt-7</b>
FILEBROWSER_SHOWRECENTLYSAVEDNOTHINT;Mostrar imagens não salvas.\nAtalho: <b>Alt-6</b> FILEBROWSER_SHOWRECENTLYSAVEDNOTHINT;Mostrar imagens não salvas.\nAtalho: <b>Alt-6</b>
FILEBROWSER_SHOWTRASHHINT;Mostrar conteúdo da lixeira.\nAtalho: <b>Ctrl-t</b> FILEBROWSER_SHOWTRASHHINT;Mostrar conteúdo da lixeira.\nAtalho: <b>Ctrl-t</b>
FILEBROWSER_SHOWUNCOLORHINT;Mostrar imagens sem etiqueta colorida.\nAtalho: <b>Alt-0</b> FILEBROWSER_SHOWUNCOLORHINT;Mostrar imagens sem etiqueta colorida.\nAtalho: <b>Alt-0</b>
FILEBROWSER_SHOWUNRANKHINT;Mostrar imagens sem classificação.\nAtalho: <b>0</b> FILEBROWSER_SHOWUNRANKHINT;Mostrar imagens sem classificação.\nAtalho: <b>Shift-0</b>
FILEBROWSER_THUMBSIZE;Tamanho da miniatura FILEBROWSER_THUMBSIZE;Tamanho da miniatura
FILEBROWSER_UNRANK_TOOLTIP;Sem classificação.\nAtalho: <b>Shift-0</b> FILEBROWSER_UNRANK_TOOLTIP;Sem classificação.\nAtalho: <b>0</b>
FILEBROWSER_ZOOMINHINT;Aumentar tamanho da miniatura.\n\nAtalhos:\n<b>+</b> - Modo de Guias de Editores Múltiplos,\n<b>Alt</b>-<b>+</b> - Modo de Guia de Editor Único. FILEBROWSER_ZOOMINHINT;Aumentar tamanho da miniatura.\n\nAtalhos:\n<b>+</b> - Modo de Guias de Editores Múltiplos,\n<b>Alt</b>-<b>+</b> - Modo de Guia de Editor Único.
FILEBROWSER_ZOOMOUTHINT;Diminuir o tamanho da miniatura.\n\nAtalhos:\n<b>-</b> - Modo de Guias de Editores Múltiplos,\n<b>Alt</b>-<b>-</b> - Modo de Guia de Editor Único. FILEBROWSER_ZOOMOUTHINT;Diminuir o tamanho da miniatura.\n\nAtalhos:\n<b>-</b> - Modo de Guias de Editores Múltiplos,\n<b>Alt</b>-<b>-</b> - Modo de Guia de Editor Único.
FILECHOOSER_FILTER_ANY;Todos os arquivos FILECHOOSER_FILTER_ANY;Todos os arquivos

28
rtdata/languages/Slovenian
View File

@ -170,11 +170,11 @@ FILEBROWSER_POPUPUNTRASH;Odstrani iz smetnjaka
FILEBROWSER_QUERYBUTTONHINT;Očisti poizvedbo iskanja FILEBROWSER_QUERYBUTTONHINT;Očisti poizvedbo iskanja
FILEBROWSER_QUERYHINT;Vnesi imena iskanih datotek. Dovolj je že del imena. Loči iskalne termine z vejicami, npr.\n<i>1001,1004,1199</i>\n\nIzloči termine iskanje s predpono <i>!=</i>\nnpr.\n<i>!=1001,1004,1199</i>\n\nBližnjice:\n<b>Ctrl-f</b> - fokusiraj rubriko iskanja,\n<b>Enter</b> - išči,\n<b>Esc</b> - očisti rubriko iskanja,\n<b>Shift-Esc</b> - sprosti fokus na rubriki iskanja. FILEBROWSER_QUERYHINT;Vnesi imena iskanih datotek. Dovolj je že del imena. Loči iskalne termine z vejicami, npr.\n<i>1001,1004,1199</i>\n\nIzloči termine iskanje s predpono <i>!=</i>\nnpr.\n<i>!=1001,1004,1199</i>\n\nBližnjice:\n<b>Ctrl-f</b> - fokusiraj rubriko iskanja,\n<b>Enter</b> - išči,\n<b>Esc</b> - očisti rubriko iskanja,\n<b>Shift-Esc</b> - sprosti fokus na rubriki iskanja.
FILEBROWSER_QUERYLABEL; Išči: FILEBROWSER_QUERYLABEL; Išči:
FILEBROWSER_RANK1_TOOLTIP;Rank 1 *\nBližnjica: <b>Shift-1</b> FILEBROWSER_RANK1_TOOLTIP;Rank 1 *\nBližnjica: <b>1</b>
FILEBROWSER_RANK2_TOOLTIP;Rank 2 *\nBližnjica: <b>Shift-2</b> FILEBROWSER_RANK2_TOOLTIP;Rank 2 *\nBližnjica: <b>2</b>
FILEBROWSER_RANK3_TOOLTIP;Rank 3 *\nBližnjica: <b>Shift-3</b> FILEBROWSER_RANK3_TOOLTIP;Rank 3 *\nBližnjica: <b>3</b>
FILEBROWSER_RANK4_TOOLTIP;Rank 4 *\nBližnjica: <b>Shift-4</b> FILEBROWSER_RANK4_TOOLTIP;Rank 4 *\nBližnjica: <b>4</b>
FILEBROWSER_RANK5_TOOLTIP;Rank 5 *\nBližnjica: <b>Shift-5</b> FILEBROWSER_RANK5_TOOLTIP;Rank 5 *\nBližnjica: <b>5</b>
FILEBROWSER_RENAMEDLGLABEL;Preimenuj datoteko FILEBROWSER_RENAMEDLGLABEL;Preimenuj datoteko
FILEBROWSER_RESETDEFAULTPROFILE;Nastavi na privzeto vrednost FILEBROWSER_RESETDEFAULTPROFILE;Nastavi na privzeto vrednost
FILEBROWSER_SELECTDARKFRAME;Izberi dark-frame... FILEBROWSER_SELECTDARKFRAME;Izberi dark-frame...
@ -185,23 +185,23 @@ FILEBROWSER_SHOWCOLORLABEL3HINT;Prikaži slike označene z zeleno.\nBližnjica:
FILEBROWSER_SHOWCOLORLABEL4HINT;Prikaži slike označene z modro.\nBližnjica: <b>Alt-4</b> FILEBROWSER_SHOWCOLORLABEL4HINT;Prikaži slike označene z modro.\nBližnjica: <b>Alt-4</b>
FILEBROWSER_SHOWCOLORLABEL5HINT;Prikaži slike označene s škrlatno.\nBližnjica: <b>Alt-5</b> FILEBROWSER_SHOWCOLORLABEL5HINT;Prikaži slike označene s škrlatno.\nBližnjica: <b>Alt-5</b>
FILEBROWSER_SHOWDIRHINT;Odstrani vse filtre.\nBližnjica: <b>d</b> FILEBROWSER_SHOWDIRHINT;Odstrani vse filtre.\nBližnjica: <b>d</b>
FILEBROWSER_SHOWEDITEDHINT;Prikaži spremenjene slike.\nBližnjica: <b>7</b> FILEBROWSER_SHOWEDITEDHINT;Prikaži spremenjene slike.\nBližnjica: <b>Shift-7</b>
FILEBROWSER_SHOWEDITEDNOTHINT;Prikaži nespremenjene slike.\nBližnjica: <b>6</b> FILEBROWSER_SHOWEDITEDNOTHINT;Prikaži nespremenjene slike.\nBližnjica: <b>Shift-6</b>
FILEBROWSER_SHOWEXIFINFO;Prikaži Exif informacije.\n\nBližnjice:\n<b>i</b> - Način zavihkov več urejevalnikov,\n<b>Alt-i</b> - Način enega zavihka urejevalnika. FILEBROWSER_SHOWEXIFINFO;Prikaži Exif informacije.\n\nBližnjice:\n<b>i</b> - Način zavihkov več urejevalnikov,\n<b>Alt-i</b> - Način enega zavihka urejevalnika.
FILEBROWSER_SHOWNOTTRASHHINT;Prikaži samo nezbrisane slike. FILEBROWSER_SHOWNOTTRASHHINT;Prikaži samo nezbrisane slike.
FILEBROWSER_SHOWORIGINALHINT;Prikaži samo izvirne slike.\n\nKadar obstaja več slik z enakim imenom a različnimi podaljški imena, smatram za izvirnik tisto, katere podaljšek je najvišje v seznamu podaljškov v nastavitvah > File Browser > Parsed Extensions. FILEBROWSER_SHOWORIGINALHINT;Prikaži samo izvirne slike.\n\nKadar obstaja več slik z enakim imenom a različnimi podaljški imena, smatram za izvirnik tisto, katere podaljšek je najvišje v seznamu podaljškov v nastavitvah > File Browser > Parsed Extensions.
FILEBROWSER_SHOWRANK1HINT;Prikaži slike označene z 1 zvezdico.\nBližnjica: <b>1</b> FILEBROWSER_SHOWRANK1HINT;Prikaži slike označene z 1 zvezdico.\nBližnjica: <b>Shift-1</b>
FILEBROWSER_SHOWRANK2HINT;Prikaži slike označene z 2 zvezdicama.\nBližnjica: <b>2</b> FILEBROWSER_SHOWRANK2HINT;Prikaži slike označene z 2 zvezdicama.\nBližnjica: <b>Shift-2</b>
FILEBROWSER_SHOWRANK3HINT;Prikaži slike označene z 3 zvezdicami.\nBližnjica: <b>3</b> FILEBROWSER_SHOWRANK3HINT;Prikaži slike označene z 3 zvezdicami.\nBližnjica: <b>Shift-3</b>
FILEBROWSER_SHOWRANK4HINT;Prikaži slike označene z 4 zvezdicami.\nBližnjica: <b>4</b> FILEBROWSER_SHOWRANK4HINT;Prikaži slike označene z 4 zvezdicami.\nBližnjica: <b>Shift-4</b>
FILEBROWSER_SHOWRANK5HINT;Prikaži slike označene z 5 zvezdicami.\nBližnjica: <b>5</b> FILEBROWSER_SHOWRANK5HINT;Prikaži slike označene z 5 zvezdicami.\nBližnjica: <b>Shift-5</b>
FILEBROWSER_SHOWRECENTLYSAVEDHINT;Pokaži shranjene slike.\nBližnjica: <b>Alt-7</b> FILEBROWSER_SHOWRECENTLYSAVEDHINT;Pokaži shranjene slike.\nBližnjica: <b>Alt-7</b>
FILEBROWSER_SHOWRECENTLYSAVEDNOTHINT;Pokaži neshranjene slike.\nBližnjica: <b>Alt-6</b> FILEBROWSER_SHOWRECENTLYSAVEDNOTHINT;Pokaži neshranjene slike.\nBližnjica: <b>Alt-6</b>
FILEBROWSER_SHOWTRASHHINT;Pokaži vsebino smetnjaka.\nBližnjica: <b>Ctrl-t</b> FILEBROWSER_SHOWTRASHHINT;Pokaži vsebino smetnjaka.\nBližnjica: <b>Ctrl-t</b>
FILEBROWSER_SHOWUNCOLORHINT;Pokaži slike brez barvne oznake.\nShortcut: <b>Alt-0</b> FILEBROWSER_SHOWUNCOLORHINT;Pokaži slike brez barvne oznake.\nShortcut: <b>Alt-0</b>
FILEBROWSER_SHOWUNRANKHINT;Prikaži nerangirane slike.\nShortcut: <b>0</b> FILEBROWSER_SHOWUNRANKHINT;Prikaži nerangirane slike.\nShortcut: <b>Shift-0</b>
FILEBROWSER_THUMBSIZE;Velikost predogledne sličice FILEBROWSER_THUMBSIZE;Velikost predogledne sličice
FILEBROWSER_UNRANK_TOOLTIP;Odstrani rang.\nShortcut: <b>Shift-0</b> FILEBROWSER_UNRANK_TOOLTIP;Odstrani rang.\nShortcut: <b>0</b>
FILEBROWSER_ZOOMINHINT;Povečaj velikost predogledne sličice.\n\nBližnjice:\n<b>+</b> - Način z več zavihki urejevalnika,\n<b>Alt</b>-<b>+</b> - Način z enim zavihkom in urejevalnikom. FILEBROWSER_ZOOMINHINT;Povečaj velikost predogledne sličice.\n\nBližnjice:\n<b>+</b> - Način z več zavihki urejevalnika,\n<b>Alt</b>-<b>+</b> - Način z enim zavihkom in urejevalnikom.
FILEBROWSER_ZOOMOUTHINT;Pomanjšaj velikost predogledne sličice.\n\nBližnjice:\n<b>-</b> - Način z več zavihki urejevalnika,\n<b>Alt</b>-<b>-</b> - Način z enim zavihkom in urejevalnikom. FILEBROWSER_ZOOMOUTHINT;Pomanjšaj velikost predogledne sličice.\n\nBližnjice:\n<b>-</b> - Način z več zavihki urejevalnika,\n<b>Alt</b>-<b>-</b> - Način z enim zavihkom in urejevalnikom.
FILECHOOSER_FILTER_ANY;Vse datoteke FILECHOOSER_FILTER_ANY;Vse datoteke

26
rtdata/languages/Swedish
View File

@ -138,11 +138,11 @@ FILEBROWSER_POPUPUNTRASH;Ta bort från papperskorgen
FILEBROWSER_QUERYBUTTONHINT;Rensa sökfältet FILEBROWSER_QUERYBUTTONHINT;Rensa sökfältet
FILEBROWSER_QUERYHINT;Skriv en <i>del av ett filnamn</i> för att söka efter en <i>kommaseparerad lista</i>.\nT. ex. <i>1001,1004,1199</i>\n\n<b>Ctrl-F</b> för att komma till sökfältet.\n<b>Enter</b> för att starta sökningen.\n<b>Esc</b> för att rensa.\n<b>Shift-Esc</b> för att ta bort fokus från sökfältet. FILEBROWSER_QUERYHINT;Skriv en <i>del av ett filnamn</i> för att söka efter en <i>kommaseparerad lista</i>.\nT. ex. <i>1001,1004,1199</i>\n\n<b>Ctrl-F</b> för att komma till sökfältet.\n<b>Enter</b> för att starta sökningen.\n<b>Esc</b> för att rensa.\n<b>Shift-Esc</b> för att ta bort fokus från sökfältet.
FILEBROWSER_QUERYLABEL; Hitta: FILEBROWSER_QUERYLABEL; Hitta:
FILEBROWSER_RANK1_TOOLTIP;Betyg 1 *\nKortkommando: <b>Shift-1</b> FILEBROWSER_RANK1_TOOLTIP;Betyg 1 *\nKortkommando: <b>1</b>
FILEBROWSER_RANK2_TOOLTIP;Betyg 2 *\nKortkommando: <b>Shift-2</b> FILEBROWSER_RANK2_TOOLTIP;Betyg 2 *\nKortkommando: <b>2</b>
FILEBROWSER_RANK3_TOOLTIP;Betyg 3 *\nKortkommando: <b>Shift-3</b> FILEBROWSER_RANK3_TOOLTIP;Betyg 3 *\nKortkommando: <b>3</b>
FILEBROWSER_RANK4_TOOLTIP;Betyg 4 *\nKortkommando: <b>Shift-4</b> FILEBROWSER_RANK4_TOOLTIP;Betyg 4 *\nKortkommando: <b>4</b>
FILEBROWSER_RANK5_TOOLTIP;Betyg 5 *\nKortkommando: <b>Shift-5</b> FILEBROWSER_RANK5_TOOLTIP;Betyg 5 *\nKortkommando: <b>5</b>
FILEBROWSER_RENAMEDLGLABEL;Byt namn FILEBROWSER_RENAMEDLGLABEL;Byt namn
FILEBROWSER_SELECTDARKFRAME;Välj svartbild... FILEBROWSER_SELECTDARKFRAME;Välj svartbild...
FILEBROWSER_SELECTFLATFIELD;Välj plattfält... FILEBROWSER_SELECTFLATFIELD;Välj plattfält...
@ -152,22 +152,22 @@ FILEBROWSER_SHOWCOLORLABEL3HINT;Visa bilder märkta som gröna.\nKortkommando:<b
FILEBROWSER_SHOWCOLORLABEL4HINT;Visa bilder märkta som blåa.\nKortkommando:<b>Alt-4</b> FILEBROWSER_SHOWCOLORLABEL4HINT;Visa bilder märkta som blåa.\nKortkommando:<b>Alt-4</b>
FILEBROWSER_SHOWCOLORLABEL5HINT;Visa bilder märkta som lila.\nKortkommando: <b>Alt-5</b> FILEBROWSER_SHOWCOLORLABEL5HINT;Visa bilder märkta som lila.\nKortkommando: <b>Alt-5</b>
FILEBROWSER_SHOWDIRHINT;Återställ alla sökfilter.\nKortkommando: <b>d</b> FILEBROWSER_SHOWDIRHINT;Återställ alla sökfilter.\nKortkommando: <b>d</b>
FILEBROWSER_SHOWEDITEDHINT;Visa redigerade bilder.\nKortkommando: <b>7</b> FILEBROWSER_SHOWEDITEDHINT;Visa redigerade bilder.\nKortkommando: <b>Shift-7</b>
FILEBROWSER_SHOWEDITEDNOTHINT;Visa ickeredigerade bilder.\nKortkommando: <b>6</b> FILEBROWSER_SHOWEDITEDNOTHINT;Visa ickeredigerade bilder.\nKortkommando: <b>Shift-6</b>
FILEBROWSER_SHOWEXIFINFO;Visa EXIF-information.\nKortkommando: <b>i</b>\n\nKortkommando i enkelbildsläget: <b>Alt-i</b> FILEBROWSER_SHOWEXIFINFO;Visa EXIF-information.\nKortkommando: <b>i</b>\n\nKortkommando i enkelbildsläget: <b>Alt-i</b>
FILEBROWSER_SHOWORIGINALHINT;Visa endast ursprungliga bilder.\n\nNär flera bilder finns med samma filnamn men med olika filändelser så anses den bild vara urpsrungsbilden som har sin ändelse närmst toppen i listan över filändelser i Inställningar > Filbläddrare > Hanterade filändelser FILEBROWSER_SHOWORIGINALHINT;Visa endast ursprungliga bilder.\n\nNär flera bilder finns med samma filnamn men med olika filändelser så anses den bild vara urpsrungsbilden som har sin ändelse närmst toppen i listan över filändelser i Inställningar > Filbläddrare > Hanterade filändelser
FILEBROWSER_SHOWRANK1HINT;Visa bilder med betyg 1.\nKortkommando: <b>1</b> FILEBROWSER_SHOWRANK1HINT;Visa bilder med betyg 1.\nKortkommando: <b>Shift-1</b>
FILEBROWSER_SHOWRANK2HINT;Visa bilder med betyg 2.\nKortkommando: <b>2</b> FILEBROWSER_SHOWRANK2HINT;Visa bilder med betyg 2.\nKortkommando: <b>Shift-2</b>
FILEBROWSER_SHOWRANK3HINT;Visa bilder med betyg 3.\nKortkommando: <b>3</b> FILEBROWSER_SHOWRANK3HINT;Visa bilder med betyg 3.\nKortkommando: <b>Shift-3</b>
FILEBROWSER_SHOWRANK4HINT;Visa bilder med betyg 4.\nKortkommando: <b>4</b> FILEBROWSER_SHOWRANK4HINT;Visa bilder med betyg 4.\nKortkommando: <b>Shift-4</b>
FILEBROWSER_SHOWRANK5HINT;Visa bilder med betyg 5.\nKortkommando: <b>5</b> FILEBROWSER_SHOWRANK5HINT;Visa bilder med betyg 5.\nKortkommando: <b>Shift-5</b>
FILEBROWSER_SHOWRECENTLYSAVEDHINT;Visa bilder som nyligen sparats\nKortkommando: <b>Alt-7</b> FILEBROWSER_SHOWRECENTLYSAVEDHINT;Visa bilder som nyligen sparats\nKortkommando: <b>Alt-7</b>
FILEBROWSER_SHOWRECENTLYSAVEDNOTHINT;Visa bilder som inte nyligen sparats\nKortkommando: <b>Alt-6</b> FILEBROWSER_SHOWRECENTLYSAVEDNOTHINT;Visa bilder som inte nyligen sparats\nKortkommando: <b>Alt-6</b>
FILEBROWSER_SHOWTRASHHINT;Visa innehållet i papperskorgen FILEBROWSER_SHOWTRASHHINT;Visa innehållet i papperskorgen
FILEBROWSER_SHOWUNCOLORHINT;Visa bilder utan färgetikett\nKortkommando: <b>Alt-0</b> FILEBROWSER_SHOWUNCOLORHINT;Visa bilder utan färgetikett\nKortkommando: <b>Alt-0</b>
FILEBROWSER_SHOWUNRANKHINT;Visa icke-betygsatta bilder FILEBROWSER_SHOWUNRANKHINT;Visa icke-betygsatta bilder
FILEBROWSER_THUMBSIZE;Miniatyrbildens storlek FILEBROWSER_THUMBSIZE;Miniatyrbildens storlek
FILEBROWSER_UNRANK_TOOLTIP;Ta bort betyg\nKortkommando: <b>Shift-0</b> FILEBROWSER_UNRANK_TOOLTIP;Ta bort betyg\nKortkommando: <b>0</b>
FILEBROWSER_ZOOMINHINT;Förstora miniatyrbilderna.\nKortkommando: <b>+</b>\nKortkommado i enkelbildsläget: <b>Alt-+</b> FILEBROWSER_ZOOMINHINT;Förstora miniatyrbilderna.\nKortkommando: <b>+</b>\nKortkommado i enkelbildsläget: <b>Alt-+</b>
FILEBROWSER_ZOOMOUTHINT;Förminska miniatyrbilderna.\nKortkommando: <b>-</b>\nKortkommado i enkelbildsläget: <b>Alt--</b> FILEBROWSER_ZOOMOUTHINT;Förminska miniatyrbilderna.\nKortkommando: <b>-</b>\nKortkommado i enkelbildsläget: <b>Alt--</b>
FILECHOOSER_FILTER_ANY;Alla filer FILECHOOSER_FILTER_ANY;Alla filer

30
rtdata/languages/default
View File

@ -176,11 +176,11 @@ FILEBROWSER_POPUPUNTRASH;Remove from trash
FILEBROWSER_QUERYBUTTONHINT;Clear the Find query FILEBROWSER_QUERYBUTTONHINT;Clear the Find query
FILEBROWSER_QUERYHINT;Type filenames to search for. Supports partial filenames. Separate the search terms using commas, e.g.\n<i>1001,1004,1199</i>\n\nExclude search terms by prefixing them with <i>!=</i>\ne.g.\n<i>!=1001,1004,1199</i>\n\nShortcuts:\n<b>Ctrl-f</b> - focus the Find box,\n<b>Enter</b> - search,\n<b>Esc</b> - clear the Find box,\n<b>Shift-Esc</b> - defocus the Find box. FILEBROWSER_QUERYHINT;Type filenames to search for. Supports partial filenames. Separate the search terms using commas, e.g.\n<i>1001,1004,1199</i>\n\nExclude search terms by prefixing them with <i>!=</i>\ne.g.\n<i>!=1001,1004,1199</i>\n\nShortcuts:\n<b>Ctrl-f</b> - focus the Find box,\n<b>Enter</b> - search,\n<b>Esc</b> - clear the Find box,\n<b>Shift-Esc</b> - defocus the Find box.
FILEBROWSER_QUERYLABEL; Find: FILEBROWSER_QUERYLABEL; Find:
FILEBROWSER_RANK1_TOOLTIP;Rank 1 *\nShortcut: <b>Shift-1</b> FILEBROWSER_RANK1_TOOLTIP;Rank 1 *\nShortcut: <b>1</b>
FILEBROWSER_RANK2_TOOLTIP;Rank 2 *\nShortcut: <b>Shift-2</b> FILEBROWSER_RANK2_TOOLTIP;Rank 2 *\nShortcut: <b>2</b>
FILEBROWSER_RANK3_TOOLTIP;Rank 3 *\nShortcut: <b>Shift-3</b> FILEBROWSER_RANK3_TOOLTIP;Rank 3 *\nShortcut: <b>3</b>
FILEBROWSER_RANK4_TOOLTIP;Rank 4 *\nShortcut: <b>Shift-4</b> FILEBROWSER_RANK4_TOOLTIP;Rank 4 *\nShortcut: <b>4</b>
FILEBROWSER_RANK5_TOOLTIP;Rank 5 *\nShortcut: <b>Shift-5</b> FILEBROWSER_RANK5_TOOLTIP;Rank 5 *\nShortcut: <b>5</b>
FILEBROWSER_RENAMEDLGLABEL;Rename file FILEBROWSER_RENAMEDLGLABEL;Rename file
FILEBROWSER_RESETDEFAULTPROFILE;Reset to default FILEBROWSER_RESETDEFAULTPROFILE;Reset to default
FILEBROWSER_SELECTDARKFRAME;Select dark-frame... FILEBROWSER_SELECTDARKFRAME;Select dark-frame...
@ -191,23 +191,23 @@ FILEBROWSER_SHOWCOLORLABEL3HINT;Show images labeled Green.\nShortcut: <b>Alt-3</
FILEBROWSER_SHOWCOLORLABEL4HINT;Show images labeled Blue.\nShortcut: <b>Alt-4</b> FILEBROWSER_SHOWCOLORLABEL4HINT;Show images labeled Blue.\nShortcut: <b>Alt-4</b>
FILEBROWSER_SHOWCOLORLABEL5HINT;Show images labeled Purple.\nShortcut: <b>Alt-5</b> FILEBROWSER_SHOWCOLORLABEL5HINT;Show images labeled Purple.\nShortcut: <b>Alt-5</b>
FILEBROWSER_SHOWDIRHINT;Clear all filters.\nShortcut: <b>d</b> FILEBROWSER_SHOWDIRHINT;Clear all filters.\nShortcut: <b>d</b>
FILEBROWSER_SHOWEDITEDHINT;Show edited images.\nShortcut: <b>7</b> FILEBROWSER_SHOWEDITEDHINT;Show edited images.\nShortcut: <b>Shift-7</b>
FILEBROWSER_SHOWEDITEDNOTHINT;Show not edited images.\nShortcut: <b>6</b> FILEBROWSER_SHOWEDITEDNOTHINT;Show not edited images.\nShortcut: <b>Shift-6</b>
FILEBROWSER_SHOWEXIFINFO;Show Exif info.\n\nShortcuts:\n<b>i</b> - Multiple Editor Tabs Mode,\n<b>Alt-i</b> - Single Editor Tab Mode. FILEBROWSER_SHOWEXIFINFO;Show Exif info.\n\nShortcuts:\n<b>i</b> - Multiple Editor Tabs Mode,\n<b>Alt-i</b> - Single Editor Tab Mode.
FILEBROWSER_SHOWNOTTRASHHINT;Show only images not in trash. FILEBROWSER_SHOWNOTTRASHHINT;Show only images not in trash.
FILEBROWSER_SHOWORIGINALHINT;Show only original images.\n\nWhen several images exist with the same filename but different extensions, the one considered original is the one whose extension is nearest the top of the parsed extensions list in Preferences > File Browser > Parsed Extensions. FILEBROWSER_SHOWORIGINALHINT;Show only original images.\n\nWhen several images exist with the same filename but different extensions, the one considered original is the one whose extension is nearest the top of the parsed extensions list in Preferences > File Browser > Parsed Extensions.
FILEBROWSER_SHOWRANK1HINT;Show images ranked as 1-star.\nShortcut: <b>1</b> FILEBROWSER_SHOWRANK1HINT;Show images ranked as 1-star.\nShortcut: <b>Shift-1</b>
FILEBROWSER_SHOWRANK2HINT;Show images ranked as 2-star.\nShortcut: <b>2</b> FILEBROWSER_SHOWRANK2HINT;Show images ranked as 2-star.\nShortcut: <b>Shift-2</b>
FILEBROWSER_SHOWRANK3HINT;Show images ranked as 3-star.\nShortcut: <b>3</b> FILEBROWSER_SHOWRANK3HINT;Show images ranked as 3-star.\nShortcut: <b>Shift-3</b>
FILEBROWSER_SHOWRANK4HINT;Show images ranked as 4-star.\nShortcut: <b>4</b> FILEBROWSER_SHOWRANK4HINT;Show images ranked as 4-star.\nShortcut: <b>Shift-4</b>
FILEBROWSER_SHOWRANK5HINT;Show images ranked as 5-star.\nShortcut: <b>5</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_SHOWRECENTLYSAVEDHINT;Show saved images.\nShortcut: <b>Alt-7</b>
FILEBROWSER_SHOWRECENTLYSAVEDNOTHINT;Show unsaved images.\nShortcut: <b>Alt-6</b> FILEBROWSER_SHOWRECENTLYSAVEDNOTHINT;Show unsaved images.\nShortcut: <b>Alt-6</b>
FILEBROWSER_SHOWTRASHHINT;Show contents of trash.\nShortcut: <b>Ctrl-t</b> 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_SHOWUNCOLORHINT;Show images without a color label.\nShortcut: <b>Alt-0</b>
FILEBROWSER_SHOWUNRANKHINT;Show unranked images.\nShortcut: <b>0</b> FILEBROWSER_SHOWUNRANKHINT;Show unranked images.\nShortcut: <b>Shift-0</b>
FILEBROWSER_THUMBSIZE;Thumbnail size FILEBROWSER_THUMBSIZE;Thumbnail size
FILEBROWSER_UNRANK_TOOLTIP;Unrank.\nShortcut: <b>Shift-0</b> FILEBROWSER_UNRANK_TOOLTIP;Unrank.\nShortcut: <b>0</b>
FILEBROWSER_ZOOMINHINT;Increase thumbnail size.\n\nShortcuts:\n<b>+</b> - Multiple Editor Tabs Mode,\n<b>Alt</b>-<b>+</b> - Single Editor Tab Mode. FILEBROWSER_ZOOMINHINT;Increase thumbnail size.\n\nShortcuts:\n<b>+</b> - Multiple Editor Tabs Mode,\n<b>Alt</b>-<b>+</b> - Single Editor Tab Mode.
FILEBROWSER_ZOOMOUTHINT;Decrease thumbnail size.\n\nShortcuts:\n<b>-</b> - Multiple Editor Tabs Mode,\n<b>Alt</b>-<b>-</b> - Single Editor Tab Mode. FILEBROWSER_ZOOMOUTHINT;Decrease thumbnail size.\n\nShortcuts:\n<b>-</b> - Multiple Editor Tabs Mode,\n<b>Alt</b>-<b>-</b> - Single Editor Tab Mode.
FILECHOOSER_FILTER_ANY;All files FILECHOOSER_FILTER_ANY;All files
@ -2538,9 +2538,11 @@ TP_FILMNEGATIVE_GUESS_TOOLTIP;Automatically set the red and blue ratios by picki
TP_FILMNEGATIVE_LABEL;Film Negative TP_FILMNEGATIVE_LABEL;Film Negative
TP_FILMNEGATIVE_OUT_LEVEL;Output level TP_FILMNEGATIVE_OUT_LEVEL;Output level
TP_FILMNEGATIVE_PICK;Pick neutral spots TP_FILMNEGATIVE_PICK;Pick neutral spots
TP_FILMNEGATIVE_PICK_SIZE;Size:
TP_FILMNEGATIVE_RED;Red ratio TP_FILMNEGATIVE_RED;Red ratio
TP_FILMNEGATIVE_REF_LABEL;Input RGB: %1 TP_FILMNEGATIVE_REF_LABEL;Input RGB: %1
TP_FILMNEGATIVE_REF_PICK;Pick white balance spot TP_FILMNEGATIVE_REF_PICK;Pick white balance spot
TP_FILMNEGATIVE_REF_SIZE;Size:
TP_FILMNEGATIVE_REF_TOOLTIP;Pick a gray patch for white-balancing the output, positive image. TP_FILMNEGATIVE_REF_TOOLTIP;Pick a gray patch for white-balancing the output, positive image.
TP_FILMSIMULATION_LABEL;Film Simulation TP_FILMSIMULATION_LABEL;Film Simulation
TP_FILMSIMULATION_SLOWPARSEDIR;RawTherapee is configured to look for Hald CLUT images, which are used for the Film Simulation tool, in a folder which is taking too long to load.\nGo to Preferences > Image Processing > Film Simulation\nto see which folder is being used. You should either point RawTherapee to a folder which contains only Hald CLUT images and nothing more, or to an empty folder if you don't want to use the Film Simulation tool.\n\nRead the Film Simulation article in RawPedia for more information.\n\nDo you want to cancel the scan now? TP_FILMSIMULATION_SLOWPARSEDIR;RawTherapee is configured to look for Hald CLUT images, which are used for the Film Simulation tool, in a folder which is taking too long to load.\nGo to Preferences > Image Processing > Film Simulation\nto see which folder is being used. You should either point RawTherapee to a folder which contains only Hald CLUT images and nothing more, or to an empty folder if you don't want to use the Film Simulation tool.\n\nRead the Film Simulation article in RawPedia for more information.\n\nDo you want to cancel the scan now?

13
rtengine/camconst.json
View File

@ -2135,7 +2135,7 @@ Camera constants:
{ // Quality C { // Quality C
"make_model": "OLYMPUS E-M10MarkIV", "make_model": "OLYMPUS E-M10MarkIV",
"dcraw_matrix": [ 9476, -3182, -765, -2613, 10958, 1893, -449, 1315, 5268 ], "dcraw_matrix": [ 9476, -3182, -765, -2613, 10958, 1893, -449, 1315, 5268 ],
"range": { "white": 4000, "black": 254 } "ranges": { "white": 4000 }
}, },
{ // Quality A, white level correction { // Quality A, white level correction
@ -2202,6 +2202,17 @@ Camera constants:
] ]
}, },
{ // Quality X
"make_model": ["OM Digital Solutions OM-5"],
"dcraw_matrix": [ 11896, -5110, -1076, -3181, 11378, 2048, -519, 1224, 5166 ], // ColorMatrix2 using illuminant D65 from Adobe DNG Converter 15.0
"ranges": { "white": 3825 },
"raw_crop" : [
{ "frame" : [8200, 6132], "crop": [0, 0, 8172, 6132] },
{ "frame" : [5240, 3912], "crop": [0, 0, 5240, 3912] },
{ "frame" : [10400, 7792], "crop": [0, 0, 10390, 7792] }
]
},
{ // Quality B { // Quality B
"make_model": [ "Panasonic DC-LX100M2" ], "make_model": [ "Panasonic DC-LX100M2" ],
//"dcraw_matrix": [ 11577, -4230, -1106, -3967, 12211, 1957, -759, 1762, 5610 ], // DNG v13.2 //"dcraw_matrix": [ 11577, -4230, -1106, -3967, 12211, 1957, -759, 1762, 5610 ], // DNG v13.2

6
rtengine/dcraw.c
View File

@ -51,7 +51,7 @@
#ifdef __CYGWIN__ #ifdef __CYGWIN__
#include <io.h> #include <io.h>
#endif #endif
#ifdef WIN32 #ifdef _WIN32
#include <sys/utime.h> #include <sys/utime.h>
#include <winsock2.h> #include <winsock2.h>
#pragma comment(lib, "ws2_32.lib") #pragma comment(lib, "ws2_32.lib")
@ -3846,7 +3846,7 @@ void CLASS bad_pixels (const char *cfname)
free (fname); free (fname);
if (errno != ERANGE) return; if (errno != ERANGE) return;
} }
#if defined(WIN32) || defined(DJGPP) #if defined(_WIN32) || defined(DJGPP)
if (fname[1] == ':') if (fname[1] == ':')
memmove (fname, fname+2, len-2); memmove (fname, fname+2, len-2);
for (cp=fname; *cp; cp++) for (cp=fname; *cp; cp++)
@ -9979,7 +9979,7 @@ int CLASS main (int argc, const char **argv)
fprintf (stderr,_("Will not write an image to the terminal!\n")); fprintf (stderr,_("Will not write an image to the terminal!\n"));
return 1; return 1;
} }
#if defined(WIN32) || defined(DJGPP) || defined(__CYGWIN__) #if defined(_WIN32) || defined(DJGPP) || defined(__CYGWIN__)
if (setmode(1,O_BINARY) < 0) { if (setmode(1,O_BINARY) < 0) {
perror ("setmode()"); perror ("setmode()");
return 1; return 1;

4
rtengine/dcraw.cc
View File

@ -86,7 +86,7 @@
#ifdef __CYGWIN__ #ifdef __CYGWIN__
#include <io.h> #include <io.h>
#endif #endif
#ifdef WIN32 #ifdef _WIN32
#include <sys/utime.h> #include <sys/utime.h>
#include <winsock2.h> #include <winsock2.h>
#ifndef strcasecmp #ifndef strcasecmp
@ -4516,7 +4516,7 @@ mask_set:
// free (fname); // free (fname);
// if (errno != ERANGE) return; // if (errno != ERANGE) return;
// } // }
//#if defined(WIN32) || defined(DJGPP) //#if defined(_WIN32) || defined(DJGPP)
// if (fname[1] == ':') // if (fname[1] == ':')
// memmove (fname, fname+2, len-2); // memmove (fname, fname+2, len-2);
// for (cp=fname; *cp; cp++) // for (cp=fname; *cp; cp++)

2
rtengine/dcraw.h
View File

@ -33,7 +33,7 @@ public:
typedef unsigned short ushort; typedef unsigned short ushort;
typedef unsigned char uchar; typedef unsigned char uchar;
typedef unsigned short (*dcrawImage_t)[4]; typedef unsigned short (*dcrawImage_t)[4];
#ifdef WIN32 #ifdef _WIN32
typedef __int64 INT64; typedef __int64 INT64;
typedef unsigned __int64 UINT64; typedef unsigned __int64 UINT64;
#else #else

4
rtengine/dynamicprofile.cc
View File

@ -225,7 +225,7 @@ bool DynamicProfileRules::loadRules()
try { try {
rule.profilepath = kf.get_string (group, "profilepath"); rule.profilepath = kf.get_string (group, "profilepath");
#if defined (WIN32) #if defined (_WIN32)
// if this is Windows, replace any "/" in the path with "\\" // if this is Windows, replace any "/" in the path with "\\"
size_t pos = rule.profilepath.find("/"); size_t pos = rule.profilepath.find("/");
while (pos != Glib::ustring::npos) { while (pos != Glib::ustring::npos) {
@ -233,7 +233,7 @@ bool DynamicProfileRules::loadRules()
pos = rule.profilepath.find("/", pos); pos = rule.profilepath.find("/", pos);
} }
#endif #endif
#if !defined (WIN32) #if !defined (_WIN32)
// if this is not Windows, replace any "\\" in the path with "/" // if this is not Windows, replace any "\\" in the path with "/"
size_t pos = rule.profilepath.find("\\"); size_t pos = rule.profilepath.find("\\");
while (pos != Glib::ustring::npos) { while (pos != Glib::ustring::npos) {

4
rtengine/histmatching.cc
View File

@ -229,7 +229,7 @@ void mappingToCurve(const std::vector<int> &mapping, std::vector<double> &curve)
} // namespace } // namespace
void RawImageSource::getAutoMatchedToneCurve(const ColorManagementParams &cp, StandardObserver observer, std::vector<double> &outCurve) void RawImageSource::getAutoMatchedToneCurve(const ColorManagementParams &cp, const procparams::RAWParams &rawParams, StandardObserver observer, std::vector<double> &outCurve)
{ {
BENCHFUN BENCHFUN
@ -311,7 +311,7 @@ void RawImageSource::getAutoMatchedToneCurve(const ColorManagementParams &cp, St
eSensorType sensor_type; eSensorType sensor_type;
double scale; double scale;
int w = fw / skip, h = fh / skip; int w = fw / skip, h = fh / skip;
const std::unique_ptr<Thumbnail> thumb(Thumbnail::loadFromRaw(getFileName(), sensor_type, w, h, 1, false, observer, false, true)); const std::unique_ptr<Thumbnail> thumb(Thumbnail::loadFromRaw(getFileName(), sensor_type, w, h, 1, false, observer, false, &rawParams, true));
if (!thumb) { if (!thumb) {
if (settings->verbose) { if (settings->verbose) {
std::cout << "histogram matching: raw decoding failed, generating a neutral curve" << std::endl; std::cout << "histogram matching: raw decoding failed, generating a neutral curve" << std::endl;

2
rtengine/iccstore.cc
View File

@ -24,7 +24,7 @@
#include <glibmm/miscutils.h> #include <glibmm/miscutils.h>
#include <glib/gstdio.h> #include <glib/gstdio.h>
#ifdef WIN32 #ifdef _WIN32
#include <winsock2.h> #include <winsock2.h>
#else #else
#include <netinet/in.h> #include <netinet/in.h>

2
rtengine/imagedata.cc
View File

@ -78,7 +78,7 @@ FramesMetaData* FramesMetaData::fromFile(const Glib::ustring& fname)
static struct tm timeFromTS(const time_t ts) static struct tm timeFromTS(const time_t ts)
{ {
#if !defined(WIN32) #if !defined(_WIN32)
struct tm tm; struct tm tm;
return *gmtime_r(&ts, &tm); return *gmtime_r(&ts, &tm);
#else #else

22
rtengine/imageio.cc
View File

@ -31,7 +31,7 @@
#include <tiff.h> #include <tiff.h>
#include <tiffio.h> #include <tiffio.h>
#ifdef WIN32 #ifdef _WIN32
#include <winsock2.h> #include <winsock2.h>
#else #else
#include <netinet/in.h> #include <netinet/in.h>
@ -64,7 +64,7 @@ namespace
FILE* g_fopen_withBinaryAndLock(const Glib::ustring& fname) FILE* g_fopen_withBinaryAndLock(const Glib::ustring& fname)
{ {
#ifdef WIN32 #ifdef _WIN32
// Use native function to disallow sharing, i.e. lock the file for exclusive access. // Use native function to disallow sharing, i.e. lock the file for exclusive access.
// This is important to e.g. prevent Windows Explorer from crashing RT due to concurrently scanning an image file. // This is important to e.g. prevent Windows Explorer from crashing RT due to concurrently scanning an image file.
@ -382,7 +382,7 @@ void my_error_exit (j_common_ptr cinfo)
(*cinfo->err->output_message) (cinfo); (*cinfo->err->output_message) (cinfo);
/* Return control to the setjmp point */ /* Return control to the setjmp point */
#if defined( WIN32 ) && defined( __x86_64__ ) && !defined(__clang__) #if defined( _WIN32 ) && defined( __x86_64__ ) && !defined(__clang__)
__builtin_longjmp(myerr->setjmp_buffer, 1); __builtin_longjmp(myerr->setjmp_buffer, 1);
#else #else
longjmp(myerr->setjmp_buffer, 1); longjmp(myerr->setjmp_buffer, 1);
@ -406,7 +406,7 @@ int ImageIO::loadJPEGFromMemory (const char* buffer, int bufsize)
jerr.pub.error_exit = my_error_exit; jerr.pub.error_exit = my_error_exit;
/* Establish the setjmp return context for my_error_exit to use. */ /* Establish the setjmp return context for my_error_exit to use. */
#if defined( WIN32 ) && defined( __x86_64__ ) && !defined(__clang__) #if defined( _WIN32 ) && defined( __x86_64__ ) && !defined(__clang__)
if (__builtin_setjmp(jerr.setjmp_buffer)) { if (__builtin_setjmp(jerr.setjmp_buffer)) {
#else #else
@ -492,7 +492,7 @@ int ImageIO::loadJPEG (const Glib::ustring &fname)
my_jpeg_stdio_src (&cinfo, file); my_jpeg_stdio_src (&cinfo, file);
#if defined( WIN32 ) && defined( __x86_64__ ) && !defined(__clang__) #if defined( _WIN32 ) && defined( __x86_64__ ) && !defined(__clang__)
if ( __builtin_setjmp((reinterpret_cast<rt_jpeg_error_mgr*>(cinfo.src))->error_jmp_buf) == 0 ) { if ( __builtin_setjmp((reinterpret_cast<rt_jpeg_error_mgr*>(cinfo.src))->error_jmp_buf) == 0 ) {
#else #else
if ( setjmp((reinterpret_cast<rt_jpeg_error_mgr*>(cinfo.src))->error_jmp_buf) == 0 ) { if ( setjmp((reinterpret_cast<rt_jpeg_error_mgr*>(cinfo.src))->error_jmp_buf) == 0 ) {
@ -568,7 +568,7 @@ int ImageIO::loadJPEG (const Glib::ustring &fname)
int ImageIO::getTIFFSampleFormat (const Glib::ustring &fname, IIOSampleFormat &sFormat, IIOSampleArrangement &sArrangement) int ImageIO::getTIFFSampleFormat (const Glib::ustring &fname, IIOSampleFormat &sFormat, IIOSampleArrangement &sArrangement)
{ {
#ifdef WIN32 #ifdef _WIN32
wchar_t *wfilename = (wchar_t*)g_utf8_to_utf16 (fname.c_str(), -1, NULL, NULL, NULL); wchar_t *wfilename = (wchar_t*)g_utf8_to_utf16 (fname.c_str(), -1, NULL, NULL, NULL);
TIFF* in = TIFFOpenW (wfilename, "r"); TIFF* in = TIFFOpenW (wfilename, "r");
g_free (wfilename); g_free (wfilename);
@ -681,7 +681,7 @@ int ImageIO::loadTIFF (const Glib::ustring &fname)
lock.release(); lock.release();
} }
#ifdef WIN32 #ifdef _WIN32
wchar_t *wfilename = (wchar_t*)g_utf8_to_utf16 (fname.c_str(), -1, NULL, NULL, NULL); wchar_t *wfilename = (wchar_t*)g_utf8_to_utf16 (fname.c_str(), -1, NULL, NULL, NULL);
TIFF* in = TIFFOpenW (wfilename, "r"); TIFF* in = TIFFOpenW (wfilename, "r");
g_free (wfilename); g_free (wfilename);
@ -988,7 +988,7 @@ int ImageIO::saveJPEG (const Glib::ustring &fname, int quality, int subSamp) con
jerr.pub.error_exit = my_error_exit; jerr.pub.error_exit = my_error_exit;
/* Establish the setjmp return context for my_error_exit to use. */ /* Establish the setjmp return context for my_error_exit to use. */
#if defined( WIN32 ) && defined( __x86_64__ ) && !defined(__clang__) #if defined( _WIN32 ) && defined( __x86_64__ ) && !defined(__clang__)
if (__builtin_setjmp(jerr.setjmp_buffer)) { if (__builtin_setjmp(jerr.setjmp_buffer)) {
#else #else
@ -1063,7 +1063,7 @@ int ImageIO::saveJPEG (const Glib::ustring &fname, int quality, int subSamp) con
unsigned char *row = new unsigned char [rowlen]; unsigned char *row = new unsigned char [rowlen];
/* To avoid memory leaks we establish a new setjmp return context for my_error_exit to use. */ /* To avoid memory leaks we establish a new setjmp return context for my_error_exit to use. */
#if defined( WIN32 ) && defined( __x86_64__ ) && !defined(__clang__) #if defined( _WIN32 ) && defined( __x86_64__ ) && !defined(__clang__)
if (__builtin_setjmp(jerr.setjmp_buffer)) { if (__builtin_setjmp(jerr.setjmp_buffer)) {
#else #else
@ -1147,7 +1147,7 @@ int ImageIO::saveTIFF (
mode += '8'; mode += '8';
} }
#ifdef WIN32 #ifdef _WIN32
FILE *file = g_fopen_withBinaryAndLock (fname); FILE *file = g_fopen_withBinaryAndLock (fname);
int fileno = _fileno(file); int fileno = _fileno(file);
int osfileno = _get_osfhandle(fileno); int osfileno = _get_osfhandle(fileno);
@ -1245,7 +1245,7 @@ int ImageIO::saveTIFF (
} }
TIFFClose (out); TIFFClose (out);
#ifdef WIN32 #ifdef _WIN32
fclose (file); fclose (file);
#endif #endif

2
rtengine/imagesource.h
View File

@ -167,7 +167,7 @@ public:
} }
// for RAW files, compute a tone curve using histogram matching on the embedded thumbnail // for RAW files, compute a tone curve using histogram matching on the embedded thumbnail
virtual void getAutoMatchedToneCurve(const procparams::ColorManagementParams &cp, StandardObserver observer, std::vector<double> &outCurve) virtual void getAutoMatchedToneCurve(const procparams::ColorManagementParams &cp, const procparams::RAWParams &rawParams, StandardObserver observer, std::vector<double> &outCurve)
{ {
outCurve = { 0.0 }; outCurve = { 0.0 };
} }

2
rtengine/improccoordinator.cc
View File

@ -1037,7 +1037,7 @@ void ImProcCoordinator::updatePreviewImage(int todo, bool panningRelatedChange)
if (params->toneCurve.histmatching) { if (params->toneCurve.histmatching) {
if (!params->toneCurve.fromHistMatching) { if (!params->toneCurve.fromHistMatching) {
imgsrc->getAutoMatchedToneCurve(params->icm, params->wb.observer, params->toneCurve.curve); imgsrc->getAutoMatchedToneCurve(params->icm, params->raw, params->wb.observer, params->toneCurve.curve);
} }
if (params->toneCurve.autoexp) { if (params->toneCurve.autoexp) {

2
rtengine/improcfun.cc
View File

@ -5645,7 +5645,7 @@ double ImProcFunctions::getAutoDistor(const Glib::ustring &fname, int thumb_size
return 0.0; return 0.0;
} }
Thumbnail* raw = rtengine::Thumbnail::loadFromRaw(fname, sensorType, w_raw, h_raw, 1, 1.0, ColorTemp::DEFAULT_OBSERVER, FALSE); Thumbnail* raw = rtengine::Thumbnail::loadFromRaw(fname, sensorType, w_raw, h_raw, 1, 1.0, ColorTemp::DEFAULT_OBSERVER, FALSE, nullptr);
if (!raw) { if (!raw) {
delete thumb; delete thumb;

4
rtengine/jdatasrc.cc
View File

@ -240,7 +240,7 @@ my_error_exit (j_common_ptr cinfo)
j_decompress_ptr dinfo = (j_decompress_ptr)cinfo; j_decompress_ptr dinfo = (j_decompress_ptr)cinfo;
// longjmp (((rt_jpeg_error_mgr*)(dinfo->src))->error_jmp_buf, 1); // longjmp (((rt_jpeg_error_mgr*)(dinfo->src))->error_jmp_buf, 1);
#if defined( WIN32 ) && defined( __x86_64__ ) && !defined(__clang__) #if defined( _WIN32 ) && defined( __x86_64__ ) && !defined(__clang__)
__builtin_longjmp ((reinterpret_cast<rt_jpeg_error_mgr*>(dinfo->src)) ->error_jmp_buf, 1); __builtin_longjmp ((reinterpret_cast<rt_jpeg_error_mgr*>(dinfo->src)) ->error_jmp_buf, 1);
#else #else
longjmp ((reinterpret_cast<rt_jpeg_error_mgr*>(dinfo->src)) ->error_jmp_buf, 1); longjmp ((reinterpret_cast<rt_jpeg_error_mgr*>(dinfo->src)) ->error_jmp_buf, 1);
@ -248,7 +248,7 @@ my_error_exit (j_common_ptr cinfo)
} }
#ifdef WIN32 #ifdef _WIN32
#define JVERSION "6b 27-Mar-1998" #define JVERSION "6b 27-Mar-1998"
#define JCOPYRIGHT_SHORT "(C) 1998, Thomas G. Lane" #define JCOPYRIGHT_SHORT "(C) 1998, Thomas G. Lane"
#define JMESSAGE(code,string) string , #define JMESSAGE(code,string) string ,

4
rtengine/lcp.cc
View File

@ -25,7 +25,7 @@
#include <glibmm/fileutils.h> #include <glibmm/fileutils.h>
#include <glib/gstdio.h> #include <glib/gstdio.h>
#ifdef WIN32 #ifdef _WIN32
#include <shlobj.h> #include <shlobj.h>
#endif #endif
@ -906,7 +906,7 @@ Glib::ustring rtengine::LCPStore::getDefaultCommonDirectory() const
{ {
Glib::ustring dir; Glib::ustring dir;
#ifdef WIN32 #ifdef _WIN32
WCHAR pathW[MAX_PATH] = {0}; WCHAR pathW[MAX_PATH] = {0};
if (SHGetSpecialFolderPathW(NULL, pathW, CSIDL_COMMON_APPDATA, false)) { if (SHGetSpecialFolderPathW(NULL, pathW, CSIDL_COMMON_APPDATA, false)) {

8
rtengine/myfile.cc
View File

@ -22,7 +22,7 @@
// get mmap() sorted out // get mmap() sorted out
#ifdef MYFILE_MMAP #ifdef MYFILE_MMAP
#ifdef WIN32 #ifdef _WIN32
#include <fcntl.h> #include <fcntl.h>
#include <windows.h> #include <windows.h>
@ -59,13 +59,13 @@ int munmap(void *start, size_t length)
#pragma GCC diagnostic pop #pragma GCC diagnostic pop
#endif #endif
#else // WIN32 #else // _WIN32
#include <unistd.h> #include <unistd.h>
#include <fcntl.h> #include <fcntl.h>
#include <sys/mman.h> #include <sys/mman.h>
#endif // WIN32 #endif // _WIN32
#endif // MYFILE_MMAP #endif // MYFILE_MMAP
#ifdef MYFILE_MMAP #ifdef MYFILE_MMAP
@ -74,7 +74,7 @@ rtengine::IMFILE* rtengine::fopen (const char* fname)
{ {
int fd; int fd;
#ifdef WIN32 #ifdef _WIN32
fd = -1; fd = -1;
// First convert UTF8 to UTF16, then use Windows function to open the file and convert back to file descriptor. // First convert UTF8 to UTF16, then use Windows function to open the file and convert back to file descriptor.

8
rtengine/mytime.h
View File

@ -18,7 +18,7 @@
*/ */
#pragma once #pragma once
#ifdef WIN32 #ifdef _WIN32
#include <profileapi.h> #include <profileapi.h>
#elif defined __APPLE__ #elif defined __APPLE__
#include <sys/time.h> #include <sys/time.h>
@ -30,7 +30,7 @@ class MyTime
{ {
public: public:
#ifndef WIN32 #ifndef _WIN32
timespec t; timespec t;
#else #else
LONGLONG t; LONGLONG t;
@ -47,7 +47,7 @@ public:
void set () void set ()
{ {
#ifdef WIN32 #ifdef _WIN32
LARGE_INTEGER ulf; LARGE_INTEGER ulf;
QueryPerformanceCounter(&ulf); QueryPerformanceCounter(&ulf);
t = ulf.QuadPart; t = ulf.QuadPart;
@ -63,7 +63,7 @@ public:
int etime (const MyTime &a) const int etime (const MyTime &a) const
{ {
#ifndef WIN32 #ifndef _WIN32
return (t.tv_sec - a.t.tv_sec) * 1000000 + (t.tv_nsec - a.t.tv_nsec) / 1000; return (t.tv_sec - a.t.tv_sec) * 1000000 + (t.tv_nsec - a.t.tv_nsec) / 1000;
#else #else
return (t - a.t) * 1000 / (baseFrequency / 1000); return (t - a.t) * 1000 / (baseFrequency / 1000);

8
rtengine/procparams.cc
View File

@ -67,7 +67,7 @@ Glib::ustring expandRelativePath(const Glib::ustring &procparams_fname, const Gl
Glib::ustring expandRelativePath2(const Glib::ustring &procparams_fname, const Glib::ustring &procparams_fname2, const Glib::ustring &prefix, Glib::ustring embedded_fname) Glib::ustring expandRelativePath2(const Glib::ustring &procparams_fname, const Glib::ustring &procparams_fname2, const Glib::ustring &prefix, Glib::ustring embedded_fname)
{ {
#if defined (WIN32) #if defined (_WIN32)
// if this is Windows, replace any "/" in the filename with "\\" // if this is Windows, replace any "/" in the filename with "\\"
size_t pos = embedded_fname.find("/"); size_t pos = embedded_fname.find("/");
while (pos != string::npos) { while (pos != string::npos) {
@ -75,7 +75,7 @@ Glib::ustring expandRelativePath2(const Glib::ustring &procparams_fname, const G
pos = embedded_fname.find("/", pos); pos = embedded_fname.find("/", pos);
} }
#endif #endif
#if !defined (WIN32) #if !defined (_WIN32)
// if this is not Windows, replace any "\\" in the filename with "/" // if this is not Windows, replace any "\\" in the filename with "/"
size_t pos = embedded_fname.find("\\"); size_t pos = embedded_fname.find("\\");
while (pos != string::npos) { while (pos != string::npos) {
@ -10244,7 +10244,7 @@ int ProcParams::load(const Glib::ustring& fname, ParamsEdited* pedited)
if (keyFile.has_group("Film Simulation")) { if (keyFile.has_group("Film Simulation")) {
assignFromKeyfile(keyFile, "Film Simulation", "Enabled", pedited, filmSimulation.enabled, pedited->filmSimulation.enabled); assignFromKeyfile(keyFile, "Film Simulation", "Enabled", pedited, filmSimulation.enabled, pedited->filmSimulation.enabled);
assignFromKeyfile(keyFile, "Film Simulation", "ClutFilename", pedited, filmSimulation.clutFilename, pedited->filmSimulation.clutFilename); assignFromKeyfile(keyFile, "Film Simulation", "ClutFilename", pedited, filmSimulation.clutFilename, pedited->filmSimulation.clutFilename);
#if defined (WIN32) #if defined (_WIN32)
// if this is Windows, replace any "/" in the filename with "\\" // if this is Windows, replace any "/" in the filename with "\\"
size_t pos = filmSimulation.clutFilename.find("/"); size_t pos = filmSimulation.clutFilename.find("/");
while (pos != string::npos) { while (pos != string::npos) {
@ -10252,7 +10252,7 @@ int ProcParams::load(const Glib::ustring& fname, ParamsEdited* pedited)
pos = filmSimulation.clutFilename.find("/", pos); pos = filmSimulation.clutFilename.find("/", pos);
} }
#endif #endif
#if !defined (WIN32) #if !defined (_WIN32)
// if this is not Windows, replace any "\\" in the filename with "/" // if this is not Windows, replace any "\\" in the filename with "/"
size_t pos = filmSimulation.clutFilename.find("\\"); size_t pos = filmSimulation.clutFilename.find("\\");
while (pos != string::npos) { while (pos != string::npos) {

2
rtengine/rawimage.cc
View File

@ -5,7 +5,7 @@
*/ */
#include <strings.h> #include <strings.h>
#ifdef WIN32 #ifdef _WIN32
#include <winsock2.h> #include <winsock2.h>
#else #else
#include <netinet/in.h> #include <netinet/in.h>

2
rtengine/rawimagesource.h
View File

@ -186,7 +186,7 @@ public:
} }
void getAutoExpHistogram (LUTu & histogram, int& histcompr) override; void getAutoExpHistogram (LUTu & histogram, int& histcompr) override;
void getRAWHistogram (LUTu & histRedRaw, LUTu & histGreenRaw, LUTu & histBlueRaw) override; void getRAWHistogram (LUTu & histRedRaw, LUTu & histGreenRaw, LUTu & histBlueRaw) override;
void getAutoMatchedToneCurve(const procparams::ColorManagementParams &cp, StandardObserver observer, std::vector<double> &outCurve) override; void getAutoMatchedToneCurve(const procparams::ColorManagementParams &cp, const procparams::RAWParams &rawParams, StandardObserver observer, std::vector<double> &outCurve) override;
DCPProfile *getDCP(const procparams::ColorManagementParams &cmp, DCPProfileApplyState &as) override; DCPProfile *getDCP(const procparams::ColorManagementParams &cmp, DCPProfileApplyState &as) override;
void convertColorSpace(Imagefloat* image, const procparams::ColorManagementParams &cmp, const ColorTemp &wb) override; void convertColorSpace(Imagefloat* image, const procparams::ColorManagementParams &cmp, const ColorTemp &wb) override;

133
rtengine/rtthumbnail.cc
View File

@ -16,6 +16,8 @@
* You should have received a copy of the GNU General Public License * You should have received a copy of the GNU General Public License
* along with RawTherapee. If not, see <https://www.gnu.org/licenses/>. * along with RawTherapee. If not, see <https://www.gnu.org/licenses/>.
*/ */
#include <algorithm>
#include <array>
#include <clocale> #include <clocale>
#include <lcms2.h> #include <lcms2.h>
@ -65,6 +67,84 @@ bool checkRawImageThumb (const rtengine::RawImage& raw_image)
return raw_image.get_thumbOffset() + length <= raw_image.get_file()->size; return raw_image.get_thumbOffset() + length <= raw_image.get_file()->size;
} }
/**
* Apply the black level adjustments in the processing parameters.
*
* @param cblack The original black levels that will be modified.
* @param sensorType Sensor type.
* @param rawParams Subset of processing parameters for raw data.
*/
void adjustBlackLevels(float cblack[4], rtengine::eSensorType sensorType, const rtengine::RAWParams *rawParams)
{
if (!rawParams) {
return;
}
std::array<float, 4> black_adjust{0.f, 0.f, 0.f, 0.f};
switch (sensorType) {
case rtengine::eSensorType::ST_BAYER:
case rtengine::eSensorType::ST_FOVEON:
black_adjust[0] = static_cast<float>(rawParams->bayersensor.black1); // R
black_adjust[1] = static_cast<float>(rawParams->bayersensor.black0); // G1
black_adjust[2] = static_cast<float>(rawParams->bayersensor.black2); // B
black_adjust[3] = static_cast<float>(rawParams->bayersensor.black3); // G2
break;
case rtengine::eSensorType::ST_FUJI_XTRANS:
black_adjust[0] = static_cast<float>(rawParams->xtranssensor.blackred);
black_adjust[1] = static_cast<float>(rawParams->xtranssensor.blackgreen);
black_adjust[2] = static_cast<float>(rawParams->xtranssensor.blackblue);
black_adjust[3] = static_cast<float>(rawParams->xtranssensor.blackgreen);
break;
case rtengine::eSensorType::ST_NONE:
break;
}
for (int i = 0; i < black_adjust.size(); i++) {
cblack[i] = std::max(0.f, cblack[i] + black_adjust[i]);
}
}
/**
* Calculate the new scale multipliers based on new black levels.
*
* @param scale_mul The original scale multipliers to be adjusted.
* @param pre_mul Pre-multipliers.
* @param c_black Updated black levels.
* @param isMono Is the image using mono demosaicing?
* @param ri Pointer to the raw image.
*/
void calculate_scale_mul(float scale_mul[4], const float pre_mul_[4], const float c_black[4], bool isMono, const rtengine::RawImage *ri)
{
std::array<float, 4> c_white;
for (int i = 0; i < c_white.size(); ++i) {
c_white[i] = static_cast<float>(ri->get_white(i));
}
if (isMono || ri->get_colors() == 1) {
for (int c = 0; c < 4; c++) {
scale_mul[c] = 65535.f / (c_white[c] - c_black[c]);
}
} else {
std::array<float, 4> pre_mul;
for (int c = 0; c < 4; c++) {
pre_mul[c] = pre_mul_[c];
}
if (pre_mul[3] == 0) {
pre_mul[3] = pre_mul[1]; // G2 == G1
}
float maxpremul = std::max(std::max(std::max(pre_mul[0], pre_mul[1]), pre_mul[2]), pre_mul[3]);
for (int c = 0; c < 4; c++) {
scale_mul[c] = (pre_mul[c] / maxpremul) * 65535.f / (c_white[c] - c_black[c]);
}
}
}
void scale_colors (rtengine::RawImage *ri, float scale_mul[4], float cblack[4], bool multiThread) void scale_colors (rtengine::RawImage *ri, float scale_mul[4], float cblack[4], bool multiThread)
{ {
@ -519,7 +599,7 @@ Thumbnail* Thumbnail::loadQuickFromRaw (const Glib::ustring& fname, eSensorType
#define FISGREEN(filter,row,col) \ #define FISGREEN(filter,row,col) \
((filter >> ((((row) << 1 & 14) + ((col) & 1)) << 1) & 3)==1 || !filter) ((filter >> ((((row) << 1 & 14) + ((col) & 1)) << 1) & 3)==1 || !filter)
Thumbnail* Thumbnail::loadFromRaw (const Glib::ustring& fname, eSensorType &sensorType, int &w, int &h, int fixwh, double wbEq, StandardObserver wbObserver, bool rotate, bool forHistogramMatching) Thumbnail* Thumbnail::loadFromRaw (const Glib::ustring& fname, eSensorType &sensorType, int &w, int &h, int fixwh, double wbEq, StandardObserver wbObserver, bool rotate, const RAWParams *rawParams, bool forHistogramMatching)
{ {
RawImage *ri = new RawImage (fname); RawImage *ri = new RawImage (fname);
unsigned int tempImageNum = 0; unsigned int tempImageNum = 0;
@ -562,8 +642,15 @@ Thumbnail* Thumbnail::loadFromRaw (const Glib::ustring& fname, eSensorType &sens
tpp->greenMultiplier = ri->get_pre_mul (1); tpp->greenMultiplier = ri->get_pre_mul (1);
tpp->blueMultiplier = ri->get_pre_mul (2); tpp->blueMultiplier = ri->get_pre_mul (2);
bool isMono =
(ri->getSensorType() == ST_FUJI_XTRANS &&
rawParams->xtranssensor.method == RAWParams::XTransSensor::getMethodString(RAWParams::XTransSensor::Method::MONO)) ||
(ri->getSensorType() == ST_BAYER &&
rawParams->bayersensor.method == RAWParams::BayerSensor::getMethodString(RAWParams::BayerSensor::Method::MONO));
float pre_mul[4], scale_mul[4], cblack[4]; float pre_mul[4], scale_mul[4], cblack[4];
ri->get_colorsCoeff (pre_mul, scale_mul, cblack, false); ri->get_colorsCoeff (pre_mul, scale_mul, cblack, false);
adjustBlackLevels(cblack, sensorType, rawParams);
calculate_scale_mul(scale_mul, pre_mul, cblack, isMono, ri);
scale_colors (ri, scale_mul, cblack, forHistogramMatching); // enable multithreading when forHistogramMatching is true scale_colors (ri, scale_mul, cblack, forHistogramMatching); // enable multithreading when forHistogramMatching is true
ri->pre_interpolate(); ri->pre_interpolate();
@ -1434,6 +1521,50 @@ IImage8* Thumbnail::processImage (const procparams::ProcParams& params, eSensorT
ipf.softLight(labView, params.softlight); ipf.softLight(labView, params.softlight);
if (params.icm.workingTRC != ColorManagementParams::WorkingTrc::NONE) {
const int GW = labView->W;
const int GH = labView->H;
std::unique_ptr<LabImage> provis;
const float pres = 0.01f * params.icm.preser;
if (pres > 0.f && params.icm.wprim != ColorManagementParams::Primaries::DEFAULT) {
provis.reset(new LabImage(GW, GH));
provis->CopyFrom(labView);
}
const std::unique_ptr<Imagefloat> tmpImage1(new Imagefloat(GW, GH));
ipf.lab2rgb(*labView, *tmpImage1, params.icm.workingProfile);
const float gamtone = params.icm.workingTRCGamma;
const float slotone = params.icm.workingTRCSlope;
int illum = toUnderlying(params.icm.will);
const int prim = toUnderlying(params.icm.wprim);
Glib::ustring prof = params.icm.workingProfile;
cmsHTRANSFORM dummy = nullptr;
int ill = 0;
ipf.workingtrc(tmpImage1.get(), tmpImage1.get(), GW, GH, -5, prof, 2.4, 12.92310, ill, 0, dummy, true, false, false);
ipf.workingtrc(tmpImage1.get(), tmpImage1.get(), GW, GH, 5, prof, gamtone, slotone, illum, prim, dummy, false, true, true);
ipf.rgb2lab(*tmpImage1, *labView, params.icm.workingProfile);
// labView and provis
if(provis) {
ipf.preserv(labView, provis.get(), GW, GH);
}
if(params.icm.fbw) {
#ifdef _OPENMP
#pragma omp parallel for
#endif
for (int x = 0; x < GH; x++)
for (int y = 0; y < GW; y++) {
labView->a[x][y] = 0.f;
labView->b[x][y] = 0.f;
}
}
}
if (params.colorappearance.enabled) { if (params.colorappearance.enabled) {
CurveFactory::curveLightBrightColor ( CurveFactory::curveLightBrightColor (

2
rtengine/rtthumbnail.h
View File

@ -99,7 +99,7 @@ public:
void getDimensions (int& w, int& h, double& scaleFac); void getDimensions (int& w, int& h, double& scaleFac);
static Thumbnail* loadQuickFromRaw (const Glib::ustring& fname, eSensorType &sensorType, int &w, int &h, int fixwh, bool rotate, bool inspectorMode = false, bool forHistogramMatching = false); static Thumbnail* loadQuickFromRaw (const Glib::ustring& fname, eSensorType &sensorType, int &w, int &h, int fixwh, bool rotate, bool inspectorMode = false, bool forHistogramMatching = false);
static Thumbnail* loadFromRaw (const Glib::ustring& fname, eSensorType &sensorType, int &w, int &h, int fixwh, double wbEq, StandardObserver wbObserver, bool rotate, bool forHistogramMatching=false); static Thumbnail* loadFromRaw (const Glib::ustring& fname, eSensorType &sensorType, int &w, int &h, int fixwh, double wbEq, StandardObserver wbObserver, bool rotate, const RAWParams *rawParams, bool forHistogramMatching=false);
static Thumbnail* loadFromImage (const Glib::ustring& fname, int &w, int &h, int fixwh, double wbEq, StandardObserver wbObserver, bool inspectorMode = false); static Thumbnail* loadFromImage (const Glib::ustring& fname, int &w, int &h, int fixwh, double wbEq, StandardObserver wbObserver, bool inspectorMode = false);
void getCamWB (double& temp, double& green, StandardObserver observer); void getCamWB (double& temp, double& green, StandardObserver observer);

2
rtengine/simpleprocess.cc
View File

@ -782,7 +782,7 @@ private:
if (params.toneCurve.histmatching) { if (params.toneCurve.histmatching) {
if (!params.toneCurve.fromHistMatching) { if (!params.toneCurve.fromHistMatching) {
imgsrc->getAutoMatchedToneCurve(params.icm, params.wb.observer, params.toneCurve.curve); imgsrc->getAutoMatchedToneCurve(params.icm, params.raw, params.wb.observer, params.toneCurve.curve);
} }
if (params.toneCurve.autoexp) { if (params.toneCurve.autoexp) {

2
rtengine/winutils.h
View File

@ -18,7 +18,7 @@
*/ */
#pragma once #pragma once
#ifdef WIN32 #ifdef _WIN32
#include <aclapi.h> #include <aclapi.h>
#include <windows.h> #include <windows.h>

7
rtgui/CMakeLists.txt
View File

@ -251,9 +251,10 @@ else()
endif() endif()
# Excluding libatomic needed by Clang/FreeBSD, #3636 # Excluding libatomic needed by Clang/FreeBSD, #3636
if(OPENMP_FOUND AND NOT APPLE AND NOT ${CMAKE_SYSTEM_NAME} STREQUAL "FreeBSD") # Now handled in cmake/modules/findATOMIC.cmake, #6821
set(EXTRA_LIB_RTGUI "${EXTRA_LIB_RTGUI}" "atomic") # if(OPENMP_FOUND AND NOT APPLE AND NOT ${CMAKE_SYSTEM_NAME} STREQUAL "FreeBSD")
endif() # set(EXTRA_LIB_RTGUI "${EXTRA_LIB_RTGUI}" "atomic")
# endif()
# Create config.h which defines where data are stored # Create config.h which defines where data are stored
configure_file("${CMAKE_CURRENT_SOURCE_DIR}/config.h.in" "${CMAKE_CURRENT_BINARY_DIR}/config.h") configure_file("${CMAKE_CURRENT_SOURCE_DIR}/config.h.in" "${CMAKE_CURRENT_BINARY_DIR}/config.h")

2
rtgui/batchqueue.cc
View File

@ -253,7 +253,7 @@ bool BatchQueue::saveBatchQueue ()
const auto& saveFormat = entry->saveFormat; const auto& saveFormat = entry->saveFormat;
// Warning: for code's simplicity in loadBatchQueue, each field must end by the '|' character, safer than ';' or ',' since it can't be used in paths // Warning: for code's simplicity in loadBatchQueue, each field must end by the '|' character, safer than ';' or ',' since it can't be used in paths
#ifdef WIN32 #ifdef _WIN32
// on windows it crashes if we don't use c_str() and filename etc. contain special (e.g. chinese) characters, see issue 3387 // on windows it crashes if we don't use c_str() and filename etc. contain special (e.g. chinese) characters, see issue 3387
file << entry->filename.c_str() << '|' << entry->savedParamsFile.c_str() << '|' << entry->outFileName.c_str() << '|' << saveFormat.format << '|' file << entry->filename.c_str() << '|' << entry->savedParamsFile.c_str() << '|' << entry->outFileName.c_str() << '|' << saveFormat.format << '|'
#else #else

2
rtgui/batchqueueentry.cc
View File

@ -51,7 +51,7 @@ BatchQueueEntry::BatchQueueEntry (rtengine::ProcessingJob* pjob, const rtengine:
thumbnail = thm; thumbnail = thm;
#if 1 //ndef WIN32 #if 1 //ndef _WIN32
// The BatchQueueEntryIdleHelper tracks if an entry has been deleted while it was sitting waiting for "idle" // The BatchQueueEntryIdleHelper tracks if an entry has been deleted while it was sitting waiting for "idle"
bqih = new BatchQueueEntryIdleHelper; bqih = new BatchQueueEntryIdleHelper;
bqih->bqentry = this; bqih->bqentry = this;

2
rtgui/batchtoolpanelcoord.cc
View File

@ -615,7 +615,7 @@ void BatchToolPanelCoordinator::optionsChanged ()
initSession (); initSession ();
} }
void BatchToolPanelCoordinator::procParamsChanged (Thumbnail* thm, int whoChangedIt) void BatchToolPanelCoordinator::procParamsChanged (Thumbnail* thm, int whoChangedIt, bool upgradeHint)
{ {
if (whoChangedIt != BATCHEDITOR && !blockedUpdate) { if (whoChangedIt != BATCHEDITOR && !blockedUpdate) {

2
rtgui/batchtoolpanelcoord.h
View File

@ -73,7 +73,7 @@ public:
void getCamWB (double& temp, double& green, rtengine::StandardObserver observer) override; void getCamWB (double& temp, double& green, rtengine::StandardObserver observer) override;
// thumbnaillistener interface // thumbnaillistener interface
void procParamsChanged (Thumbnail* thm, int whoChangedIt) override; void procParamsChanged (Thumbnail* thm, int whoChangedIt, bool upgradeHint) override;
// batchpparamschangelistener interface // batchpparamschangelistener interface
void beginBatchPParamsChange(int numberOfEntries) override; void beginBatchPParamsChange(int numberOfEntries) override;

4
rtgui/cachemanager.cc
View File

@ -24,7 +24,7 @@
#include <giomm.h> #include <giomm.h>
#include <glib/gstdio.h> #include <glib/gstdio.h>
#ifdef WIN32 #ifdef _WIN32
#include <fileapi.h> #include <fileapi.h>
#endif #endif
@ -310,7 +310,7 @@ void CacheManager::deleteFiles (const Glib::ustring& fname, const std::string& m
std::string CacheManager::getMD5 (const Glib::ustring& fname) std::string CacheManager::getMD5 (const Glib::ustring& fname)
{ {
#ifdef WIN32 #ifdef _WIN32
std::unique_ptr<wchar_t, GFreeFunc> wfname(reinterpret_cast<wchar_t*>(g_utf8_to_utf16 (fname.c_str (), -1, NULL, NULL, NULL)), g_free); std::unique_ptr<wchar_t, GFreeFunc> wfname(reinterpret_cast<wchar_t*>(g_utf8_to_utf16 (fname.c_str (), -1, NULL, NULL, NULL)), g_free);

4
rtgui/cropwindow.cc
View File

@ -17,7 +17,7 @@
* along with RawTherapee. If not, see <https://www.gnu.org/licenses/>. * along with RawTherapee. If not, see <https://www.gnu.org/licenses/>.
*/ */
#include <iomanip> #include <iomanip>
#ifdef WIN32 #ifdef _WIN32
#include <windows.h> #include <windows.h>
#endif #endif
@ -1499,7 +1499,7 @@ void CropWindow::expose (Cairo::RefPtr<Cairo::Context> cr)
// While the Right-side ALT is pressed, auto-enable highlight and shadow clipping indicators // While the Right-side ALT is pressed, auto-enable highlight and shadow clipping indicators
// TODO: Add linux/MacOS specific functions for alternative // TODO: Add linux/MacOS specific functions for alternative
#ifdef WIN32 #ifdef _WIN32
if (GetKeyState(VK_RMENU) < 0) { if (GetKeyState(VK_RMENU) < 0) {
showcs = true; showcs = true;

2
rtgui/cursormanager.cc
View File

@ -57,7 +57,7 @@ void CursorManager::init (Glib::RefPtr<Gdk::Window> mainWindow)
return cursor; return cursor;
}; };
cAdd = createCursor("crosshair-small", Gdk::PLUS); cAdd = createCursor("crosshair-hicontrast", Gdk::PLUS);
cAddPicker = createCursor("color-picker-add-hicontrast", Gdk::PLUS, -0.333, 0.75); cAddPicker = createCursor("color-picker-add-hicontrast", Gdk::PLUS, -0.333, 0.75);
cCropDraw = createCursor("crop-point-hicontrast", Gdk::DIAMOND_CROSS); cCropDraw = createCursor("crop-point-hicontrast", Gdk::DIAMOND_CROSS);
cCrosshair = createCursor("crosshair-hicontrast", Gdk::CROSSHAIR); cCrosshair = createCursor("crosshair-hicontrast", Gdk::CROSSHAIR);

12
rtgui/dirbrowser.cc
View File

@ -96,7 +96,7 @@ DirBrowser::DirBrowser () : dirTreeModel(),
iremovable("device-usb"), iremovable("device-usb"),
expandSuccess(false) expandSuccess(false)
#ifdef WIN32 #ifdef _WIN32
, volumes(0) , volumes(0)
#endif #endif
{ {
@ -160,7 +160,7 @@ void DirBrowser::fillDirTree ()
dirTreeModel->signal_sort_column_changed().connect(sigc::mem_fun(*this, &DirBrowser::on_sort_column_changed)); dirTreeModel->signal_sort_column_changed().connect(sigc::mem_fun(*this, &DirBrowser::on_sort_column_changed));
} }
#ifdef WIN32 #ifdef _WIN32
void DirBrowser::addRoot (char letter) void DirBrowser::addRoot (char letter)
{ {
@ -246,7 +246,7 @@ int updateVolumesUI (void* br)
void DirBrowser::fillRoot () void DirBrowser::fillRoot ()
{ {
#ifdef WIN32 #ifdef _WIN32
volumes = GetLogicalDrives (); volumes = GetLogicalDrives ();
for (int i = 0; i < 32; i++) for (int i = 0; i < 32; i++)
@ -403,7 +403,7 @@ Gtk::TreePath DirBrowser::expandToDir (const Glib::ustring& absDirPath)
int count = 0; int count = 0;
expandSuccess = true; expandSuccess = true;
#ifndef WIN32 #ifndef _WIN32
Gtk::TreeModel::iterator j = dirTreeModel->get_iter (path); Gtk::TreeModel::iterator j = dirTreeModel->get_iter (path);
path.up (); path.up ();
path.push_back (0); path.push_back (0);
@ -413,7 +413,7 @@ Gtk::TreePath DirBrowser::expandToDir (const Glib::ustring& absDirPath)
while (dir) { while (dir) {
Glib::ustring dirstr = dir; Glib::ustring dirstr = dir;
#ifdef WIN32 #ifdef _WIN32
if (count == 0) { if (count == 0) {
dirstr = dirstr + "\\"; dirstr = dirstr + "\\";
@ -426,7 +426,7 @@ Gtk::TreePath DirBrowser::expandToDir (const Glib::ustring& absDirPath)
while (i && expandSuccess) { while (i && expandSuccess) {
Gtk::TreeModel::Row crow = *i; Gtk::TreeModel::Row crow = *i;
Glib::ustring str = crow[dtColumns.filename]; Glib::ustring str = crow[dtColumns.filename];
#ifdef WIN32 #ifdef _WIN32
if (str.casefold() == dirstr.casefold()) { if (str.casefold() == dirstr.casefold()) {
#else #else

2
rtgui/dirbrowser.h
View File

@ -69,7 +69,7 @@ private:
bool expandSuccess; bool expandSuccess;
#ifdef WIN32 #ifdef _WIN32
unsigned int volumes; unsigned int volumes;
public: public:
void updateVolumes (); void updateVolumes ();

14
rtgui/editorpanel.cc
View File

@ -43,7 +43,7 @@
#include "thumbnail.h" #include "thumbnail.h"
#include "toolpanelcoord.h" #include "toolpanelcoord.h"
#ifdef WIN32 #ifdef _WIN32
#include "windows.h" #include "windows.h"
#include "../rtengine/winutils.h" #include "../rtengine/winutils.h"
@ -70,7 +70,7 @@ void setprogressStrUI(double val, const Glib::ustring str, MyProgressBar* pProgr
#if !defined(__APPLE__) // monitor profile not supported on apple #if !defined(__APPLE__) // monitor profile not supported on apple
bool find_default_monitor_profile (GdkWindow *rootwin, Glib::ustring &defprof, Glib::ustring &defprofname) bool find_default_monitor_profile (GdkWindow *rootwin, Glib::ustring &defprof, Glib::ustring &defprofname)
{ {
#ifdef WIN32 #ifdef _WIN32
HDC hDC = GetDC (nullptr); HDC hDC = GetDC (nullptr);
if (hDC != nullptr) { if (hDC != nullptr) {
@ -151,7 +151,7 @@ bool hasUserOnlyPermission(const Glib::ustring &dirname)
const guint32 mode = file_info->get_attribute_uint32("unix::mode"); const guint32 mode = file_info->get_attribute_uint32("unix::mode");
return (mode & 0777) == 0700 && owner == Glib::get_user_name(); return (mode & 0777) == 0700 && owner == Glib::get_user_name();
#elif defined(WIN32) #elif defined(_WIN32)
const Glib::RefPtr<Gio::File> file = Gio::File::create_for_path(dirname); const Glib::RefPtr<Gio::File> file = Gio::File::create_for_path(dirname);
const Glib::RefPtr<Gio::FileInfo> file_info = file->query_info("owner::user"); const Glib::RefPtr<Gio::FileInfo> file_info = file->query_info("owner::user");
if (!file_info) { if (!file_info) {
@ -254,7 +254,7 @@ void setUserOnlyPermission(const Glib::RefPtr<Gio::File> file, bool execute)
file->set_attribute_uint32("unix::mode", mode, Gio::FILE_QUERY_INFO_NONE); file->set_attribute_uint32("unix::mode", mode, Gio::FILE_QUERY_INFO_NONE);
} catch (Gio::Error &) { } catch (Gio::Error &) {
} }
#elif defined(WIN32) #elif defined(_WIN32)
// Get the current user's SID. // Get the current user's SID.
HANDLE process_token_raw; HANDLE process_token_raw;
if (!OpenProcessToken(GetCurrentProcess(), TOKEN_READ, &process_token_raw)) { if (!OpenProcessToken(GetCurrentProcess(), TOKEN_READ, &process_token_raw)) {
@ -324,7 +324,7 @@ void setUserOnlyPermission(const Glib::RefPtr<Gio::File> file, bool execute)
*/ */
Glib::ustring getTmpDirectory() Glib::ustring getTmpDirectory()
{ {
#if defined(__linux__) || defined(__APPLE__) || defined(WIN32) #if defined(__linux__) || defined(__APPLE__) || defined(_WIN32)
static Glib::ustring recent_dir = ""; static Glib::ustring recent_dir = "";
const Glib::ustring tmp_dir_root = Glib::get_tmp_dir(); const Glib::ustring tmp_dir_root = Glib::get_tmp_dir();
const Glib::ustring subdir_base = const Glib::ustring subdir_base =
@ -1545,7 +1545,7 @@ void EditorPanel::refreshProcessingState (bool inProcessingP)
val = 0.0; val = 0.0;
str = "PROGRESSBAR_READY"; str = "PROGRESSBAR_READY";
#ifdef WIN32 #ifdef _WIN32
// Maybe accessing "parent", which is a Gtk object, can justify to get the Gtk lock... // Maybe accessing "parent", which is a Gtk object, can justify to get the Gtk lock...
if (!firstProcessingDone && static_cast<RTWindow*> (parent)->getIsFullscreen()) { if (!firstProcessingDone && static_cast<RTWindow*> (parent)->getIsFullscreen()) {
@ -1995,7 +1995,7 @@ bool EditorPanel::handleShortcutKey (GdkEventKey* event)
return false; return false;
} }
void EditorPanel::procParamsChanged (Thumbnail* thm, int whoChangedIt) void EditorPanel::procParamsChanged (Thumbnail* thm, int whoChangedIt, bool upgradeHint)
{ {
if (whoChangedIt != EDITOR) { if (whoChangedIt != EDITOR) {

2
rtgui/editorpanel.h
View File

@ -119,7 +119,7 @@ public:
void clearParamChanges() override; void clearParamChanges() override;
// thumbnaillistener interface // thumbnaillistener interface
void procParamsChanged (Thumbnail* thm, int whoChangedIt) override; void procParamsChanged (Thumbnail* thm, int whoChangedIt, bool upgradeHint) override;
// HistoryBeforeLineListener // HistoryBeforeLineListener
void historyBeforeLineChanged (const rtengine::procparams::ProcParams& params) override; void historyBeforeLineChanged (const rtengine::procparams::ProcParams& params) override;

4
rtgui/externaleditorpreferences.cc
View File

@ -262,7 +262,7 @@ void ExternalEditorPreferences::onFileChooserDialogResponse(
false; false;
#endif #endif
row[model_columns.command] = row[model_columns.command] =
#ifdef WIN32 #ifdef _WIN32
'"' + dialog->get_filename() + '"'; '"' + dialog->get_filename() + '"';
#else #else
Glib::shell_quote(dialog->get_filename()); Glib::shell_quote(dialog->get_filename());
@ -311,7 +311,7 @@ void ExternalEditorPreferences::openFileChooserDialog()
const auto exe_filter = Gtk::FileFilter::create(); const auto exe_filter = Gtk::FileFilter::create();
exe_filter->set_name(M("FILECHOOSER_FILTER_EXECUTABLE")); exe_filter->set_name(M("FILECHOOSER_FILTER_EXECUTABLE"));
exe_filter->add_custom(Gtk::FILE_FILTER_MIME_TYPE, [](const Gtk::FileFilter::Info &info) { exe_filter->add_custom(Gtk::FILE_FILTER_MIME_TYPE, [](const Gtk::FileFilter::Info &info) {
#ifdef WIN32 #ifdef _WIN32
return info.mime_type == "application/x-msdownload"; return info.mime_type == "application/x-msdownload";
#else #else
return Gio::content_type_can_be_executable(info.mime_type); return Gio::content_type_can_be_executable(info.mime_type);

18
rtgui/extprog.cc
View File

@ -21,7 +21,7 @@
#include <cstring> #include <cstring>
#include <iostream> #include <iostream>
#ifdef WIN32 #ifdef _WIN32
#include <shlobj.h> #include <shlobj.h>
#include <shellapi.h> #include <shellapi.h>
#endif #endif
@ -79,7 +79,7 @@ void ExtProgStore::init ()
actions.clear (); actions.clear ();
#ifdef WIN32 #ifdef _WIN32
// Please do not add obscure little tools here, only widely used programs. // Please do not add obscure little tools here, only widely used programs.
// They should also have a proper setup program and therefore a standard path. // They should also have a proper setup program and therefore a standard path.
@ -104,7 +104,7 @@ void ExtProgStore::init ()
#endif #endif
} }
#ifdef WIN32 #ifdef _WIN32
bool ExtProgStore::searchProgram (const Glib::ustring& name, bool ExtProgStore::searchProgram (const Glib::ustring& name,
const Glib::ustring& exePath, const Glib::ustring& exePath,
const Glib::ustring& exePath86, const Glib::ustring& exePath86,
@ -240,7 +240,7 @@ bool ExtProgStore::spawnCommandSync (const Glib::ustring& cmd)
bool ExtProgStore::openInGimp (const Glib::ustring& fileName) bool ExtProgStore::openInGimp (const Glib::ustring& fileName)
{ {
#if defined WIN32 #if defined _WIN32
auto executable = Glib::build_filename (options.gimpDir, "bin", "gimp-win-remote"); auto executable = Glib::build_filename (options.gimpDir, "bin", "gimp-win-remote");
auto success = ShellExecute( NULL, "open", executable.c_str(), fileName.c_str(), NULL, SW_SHOWNORMAL ); auto success = ShellExecute( NULL, "open", executable.c_str(), fileName.c_str(), NULL, SW_SHOWNORMAL );
@ -260,7 +260,7 @@ bool ExtProgStore::openInGimp (const Glib::ustring& fileName)
#endif #endif
#ifdef WIN32 #ifdef _WIN32
if (reinterpret_cast<uintptr_t>(success) > 32) { if (reinterpret_cast<uintptr_t>(success) > 32) {
return true; return true;
} }
@ -271,7 +271,7 @@ bool ExtProgStore::openInGimp (const Glib::ustring& fileName)
#endif #endif
#ifdef WIN32 #ifdef _WIN32
for (auto ver = 12; ver >= 0; --ver) { for (auto ver = 12; ver >= 0; --ver) {
@ -300,7 +300,7 @@ bool ExtProgStore::openInGimp (const Glib::ustring& fileName)
bool ExtProgStore::openInPhotoshop (const Glib::ustring& fileName) bool ExtProgStore::openInPhotoshop (const Glib::ustring& fileName)
{ {
#if defined WIN32 #if defined _WIN32
const auto executable = Glib::build_filename(options.psDir, "Photoshop.exe"); const auto executable = Glib::build_filename(options.psDir, "Photoshop.exe");
const auto cmdLine = Glib::ustring("\"") + executable + Glib::ustring("\" \"") + fileName + Glib::ustring("\""); const auto cmdLine = Glib::ustring("\"") + executable + Glib::ustring("\" \"") + fileName + Glib::ustring("\"");
@ -324,7 +324,7 @@ bool ExtProgStore::openInCustomEditor (const Glib::ustring& fileName, const Glib
command = &(options.customEditorProg); command = &(options.customEditorProg);
} }
#if defined WIN32 #if defined _WIN32
const auto cmdLine = Glib::ustring("\"") + *command + Glib::ustring("\""); const auto cmdLine = Glib::ustring("\"") + *command + Glib::ustring("\"");
auto success = ShellExecute( NULL, "open", cmdLine.c_str(), ('"' + fileName + '"').c_str(), NULL, SW_SHOWNORMAL ); auto success = ShellExecute( NULL, "open", cmdLine.c_str(), ('"' + fileName + '"').c_str(), NULL, SW_SHOWNORMAL );
@ -381,7 +381,7 @@ bool ExtProgStore::openInExternalEditor(const Glib::ustring &fileName, const Edi
std::cout << "Unable to launch external editor with Gio. Trying custom launcher." << std::endl; std::cout << "Unable to launch external editor with Gio. Trying custom launcher." << std::endl;
} }
Glib::ustring command = editorInfo.commandline; Glib::ustring command = editorInfo.commandline;
#if defined WIN32 #if defined _WIN32
if (command.length() > 2 && command[0] == '"' && command[command.length() - 1] == '"') { if (command.length() > 2 && command[0] == '"' && command[command.length() - 1] == '"') {
command = command.substr(1, command.length() - 2); command = command.substr(1, command.length() - 2);
} }

2
rtgui/extprog.h
View File

@ -55,7 +55,7 @@ class ExtProgStore
MyMutex mtx; // covers actions MyMutex mtx; // covers actions
std::vector<ExtProgAction> actions; std::vector<ExtProgAction> actions;
#ifdef WIN32 #ifdef _WIN32
bool searchProgram (const Glib::ustring& name, bool searchProgram (const Glib::ustring& name,
const Glib::ustring& exePath, const Glib::ustring& exePath,
const Glib::ustring& exePath86, const Glib::ustring& exePath86,

18
rtgui/filebrowser.cc
View File

@ -272,7 +272,7 @@ FileBrowser::FileBrowser () :
/*********************** /***********************
* external programs * external programs
* *********************/ * *********************/
#if defined(WIN32) #if defined(_WIN32)
Gtk::manage(miOpenDefaultViewer = new Gtk::MenuItem (M("FILEBROWSER_OPENDEFAULTVIEWER"))); Gtk::manage(miOpenDefaultViewer = new Gtk::MenuItem (M("FILEBROWSER_OPENDEFAULTVIEWER")));
#endif #endif
@ -296,7 +296,7 @@ FileBrowser::FileBrowser () :
p++; p++;
Gtk::Menu* submenuExtProg = Gtk::manage (new Gtk::Menu()); Gtk::Menu* submenuExtProg = Gtk::manage (new Gtk::Menu());
#ifdef WIN32 #ifdef _WIN32
if (miOpenDefaultViewer) { if (miOpenDefaultViewer) {
submenuExtProg->attach (*miOpenDefaultViewer, 0, 1, p, p + 1); submenuExtProg->attach (*miOpenDefaultViewer, 0, 1, p, p + 1);
p++; p++;
@ -310,7 +310,7 @@ FileBrowser::FileBrowser () :
submenuExtProg->show_all (); submenuExtProg->show_all ();
menuExtProg->set_submenu (*submenuExtProg); menuExtProg->set_submenu (*submenuExtProg);
} else { } else {
#ifdef WIN32 #ifdef _WIN32
if (miOpenDefaultViewer) { if (miOpenDefaultViewer) {
pmenu->attach (*miOpenDefaultViewer, 0, 1, p, p + 1); pmenu->attach (*miOpenDefaultViewer, 0, 1, p, p + 1);
p++; p++;
@ -482,7 +482,7 @@ FileBrowser::FileBrowser () :
amiExtProg[i]->signal_activate().connect (sigc::bind(sigc::mem_fun(*this, &FileBrowser::menuItemActivated), amiExtProg[i])); amiExtProg[i]->signal_activate().connect (sigc::bind(sigc::mem_fun(*this, &FileBrowser::menuItemActivated), amiExtProg[i]));
} }
#ifdef WIN32 #ifdef _WIN32
if (miOpenDefaultViewer) { if (miOpenDefaultViewer) {
miOpenDefaultViewer->signal_activate().connect (sigc::bind(sigc::mem_fun(*this, &FileBrowser::menuItemActivated), miOpenDefaultViewer)); miOpenDefaultViewer->signal_activate().connect (sigc::bind(sigc::mem_fun(*this, &FileBrowser::menuItemActivated), miOpenDefaultViewer));
} }
@ -1046,7 +1046,7 @@ void FileBrowser::menuItemActivated (Gtk::MenuItem* m)
tbl->clearFromCacheRequested (mselected, true); tbl->clearFromCacheRequested (mselected, true);
//queue_draw (); //queue_draw ();
#ifdef WIN32 #ifdef _WIN32
} else if (miOpenDefaultViewer && m == miOpenDefaultViewer) { } else if (miOpenDefaultViewer && m == miOpenDefaultViewer) {
openDefaultViewer(1); openDefaultViewer(1);
#endif #endif
@ -1157,7 +1157,7 @@ void FileBrowser::partPasteProfile ()
} }
} }
#ifdef WIN32 #ifdef _WIN32
void FileBrowser::openDefaultViewer (int destination) void FileBrowser::openDefaultViewer (int destination)
{ {
bool success = true; bool success = true;
@ -1254,7 +1254,7 @@ bool FileBrowser::keyPressed (GdkEventKey* event)
} }
openRequested(mselected); openRequested(mselected);
#ifdef WIN32 #ifdef _WIN32
} else if (event->keyval == GDK_KEY_F5) { } else if (event->keyval == GDK_KEY_F5) {
int dest = 1; int dest = 1;
@ -1276,7 +1276,7 @@ bool FileBrowser::keyPressed (GdkEventKey* event)
} }
#ifdef __WIN32__ #ifdef __WIN32__
else if (shift && !ctrl && !alt && !altgr) { // rank else if (!shift && !ctrl && !alt && !altgr) { // rank
switch(event->hardware_keycode) { switch(event->hardware_keycode) {
case 0x30: // 0-key case 0x30: // 0-key
requestRanking (0); requestRanking (0);
@ -1331,7 +1331,7 @@ bool FileBrowser::keyPressed (GdkEventKey* event)
} }
#else #else
else if (shift && !ctrl && !alt) { // rank else if (!shift && !ctrl && !alt) { // rank
switch(event->hardware_keycode) { switch(event->hardware_keycode) {
case 0x13: case 0x13:
requestRanking (0); requestRanking (0);

2
rtgui/filebrowser.h
View File

@ -203,7 +203,7 @@ public:
void partPasteProfile (); void partPasteProfile ();
void openNextPreviousEditorImage(const Glib::ustring& fname, eRTNav eNextPrevious); void openNextPreviousEditorImage(const Glib::ustring& fname, eRTNav eNextPrevious);
#ifdef WIN32 #ifdef _WIN32
void openDefaultViewer (int destination); void openDefaultViewer (int destination);
#endif #endif

15
rtgui/filebrowserentry.cc
View File

@ -89,14 +89,19 @@ void FileBrowserEntry::init ()
ps = std::shared_ptr<RTSurface>(new RTSurface("filetype-ps", Gtk::ICON_SIZE_SMALL_TOOLBAR)); ps = std::shared_ptr<RTSurface>(new RTSurface("filetype-ps", Gtk::ICON_SIZE_SMALL_TOOLBAR));
} }
void FileBrowserEntry::refreshThumbnailImage () void FileBrowserEntry::refreshThumbnailImage(bool upgradeHint)
{ {
if (!thumbnail) { if (!thumbnail) {
return; return;
} }
thumbImageUpdater->add (this, &updatepriority, false, this); thumbImageUpdater->add (this, &updatepriority, upgradeHint, upgradeHint, this);
}
void FileBrowserEntry::refreshThumbnailImage ()
{
refreshThumbnailImage(false);
} }
void FileBrowserEntry::refreshQuickThumbnailImage () void FileBrowserEntry::refreshQuickThumbnailImage ()
@ -108,7 +113,7 @@ void FileBrowserEntry::refreshQuickThumbnailImage ()
// Only make a (slow) processed preview if the picture has been edited at all // Only make a (slow) processed preview if the picture has been edited at all
bool upgrade_to_processed = (!options.internalThumbIfUntouched || thumbnail->isPParamsValid()); bool upgrade_to_processed = (!options.internalThumbIfUntouched || thumbnail->isPParamsValid());
thumbImageUpdater->add(this, &updatepriority, upgrade_to_processed, this); thumbImageUpdater->add(this, &updatepriority, upgrade_to_processed, false, this);
} }
void FileBrowserEntry::calcThumbnailSize () void FileBrowserEntry::calcThumbnailSize ()
@ -202,13 +207,13 @@ FileThumbnailButtonSet* FileBrowserEntry::getThumbButtonSet ()
return (static_cast<FileThumbnailButtonSet*>(buttonSet)); return (static_cast<FileThumbnailButtonSet*>(buttonSet));
} }
void FileBrowserEntry::procParamsChanged (Thumbnail* thm, int whoChangedIt) void FileBrowserEntry::procParamsChanged (Thumbnail* thm, int whoChangedIt, bool upgradeHint)
{ {
if ( thumbnail->isQuick() ) { if ( thumbnail->isQuick() ) {
refreshQuickThumbnailImage (); refreshQuickThumbnailImage ();
} else { } else {
refreshThumbnailImage (); refreshThumbnailImage(upgradeHint);
} }
} }

3
rtgui/filebrowserentry.h
View File

@ -69,6 +69,7 @@ class FileBrowserEntry final : public ThumbBrowserEntryBase,
void updateCursor (int x, int y); void updateCursor (int x, int y);
void drawStraightenGuide (Cairo::RefPtr<Cairo::Context> c); void drawStraightenGuide (Cairo::RefPtr<Cairo::Context> c);
void customBackBufferUpdate (Cairo::RefPtr<Cairo::Context> c) override; void customBackBufferUpdate (Cairo::RefPtr<Cairo::Context> c) override;
void refreshThumbnailImage(bool upgradeHint);
public: public:
@ -99,7 +100,7 @@ public:
void getIconSize (int& w, int& h) const override; void getIconSize (int& w, int& h) const override;
// thumbnaillistener interface // thumbnaillistener interface
void procParamsChanged (Thumbnail* thm, int whoChangedIt) override; void procParamsChanged (Thumbnail* thm, int whoChangedIt, bool upgradeHint) override;
// thumbimageupdatelistener interface // thumbimageupdatelistener interface
void updateImage(rtengine::IImage8* img, double scale, const rtengine::procparams::CropParams& cropParams) override; void updateImage(rtengine::IImage8* img, double scale, const rtengine::procparams::CropParams& cropParams) override;
void _updateImage(rtengine::IImage8* img, double scale, const rtengine::procparams::CropParams& cropParams); // inside gtk thread void _updateImage(rtengine::IImage8* img, double scale, const rtengine::procparams::CropParams& cropParams); // inside gtk thread

12
rtgui/filecatalog.cc
View File

@ -1332,11 +1332,11 @@ bool FileCatalog::isInTabMode() const
void FileCatalog::categoryButtonToggled (Gtk::ToggleButton* b, bool isMouseClick) void FileCatalog::categoryButtonToggled (Gtk::ToggleButton* b, bool isMouseClick)
{ {
//was control key pressed //was control key pressed (ignored if was not mouse click)
bool control_down = modifierKey & GDK_CONTROL_MASK; bool control_down = modifierKey & GDK_CONTROL_MASK && isMouseClick;
//was shift key pressed //was shift key pressed (ignored if was not mouse click)
bool shift_down = modifierKey & GDK_SHIFT_MASK; bool shift_down = modifierKey & GDK_SHIFT_MASK && isMouseClick;
// The event is process here, we can clear modifierKey now, it'll be set again on the next even // The event is process here, we can clear modifierKey now, it'll be set again on the next even
modifierKey = 0; modifierKey = 0;
@ -2242,7 +2242,7 @@ bool FileCatalog::handleShortcutKey (GdkEventKey* event)
#ifdef __WIN32__ #ifdef __WIN32__
if (!alt && !shift && !altgr) { // shift is reserved for ranking if (!alt && shift && !altgr) {
switch(event->hardware_keycode) { switch(event->hardware_keycode) {
case 0x30: case 0x30:
categoryButtonToggled(bUnRanked, false); categoryButtonToggled(bUnRanked, false);
@ -2330,7 +2330,7 @@ bool FileCatalog::handleShortcutKey (GdkEventKey* event)
#else #else
if (!alt && !shift && !altgr) { // shift is reserved for ranking if (!alt && shift && !altgr) {
switch(event->hardware_keycode) { switch(event->hardware_keycode) {
case 0x13: case 0x13:
categoryButtonToggled(bUnRanked, false); categoryButtonToggled(bUnRanked, false);

8
rtgui/filepanel.cc
View File

@ -26,7 +26,7 @@
#include "placesbrowser.h" #include "placesbrowser.h"
#include "thumbnail.h" #include "thumbnail.h"
#ifdef WIN32 #ifdef _WIN32
#include "windows.h" #include "windows.h"
#endif #endif
@ -302,7 +302,7 @@ bool FilePanel::imageLoaded( Thumbnail* thm, ProgressConnector<rtengine::Initial
if (options.tabbedUI) { if (options.tabbedUI) {
EditorPanel* epanel; EditorPanel* epanel;
{ {
#ifdef WIN32 #ifdef _WIN32
int winGdiHandles = GetGuiResources( GetCurrentProcess(), GR_GDIOBJECTS); int winGdiHandles = GetGuiResources( GetCurrentProcess(), GR_GDIOBJECTS);
if(winGdiHandles > 0 && winGdiHandles <= 6500) //(old settings 8500) 0 means we don't have the rights to access the function, 8500 because the limit is 10000 and we need about 1500 free handles if(winGdiHandles > 0 && winGdiHandles <= 6500) //(old settings 8500) 0 means we don't have the rights to access the function, 8500 because the limit is 10000 and we need about 1500 free handles
//J.Desmis october 2021 I change 8500 to 6500..Why ? because without while increasing size GUI system crash in multieditor //J.Desmis october 2021 I change 8500 to 6500..Why ? because without while increasing size GUI system crash in multieditor
@ -312,7 +312,7 @@ bool FilePanel::imageLoaded( Thumbnail* thm, ProgressConnector<rtengine::Initial
epanel = Gtk::manage (new EditorPanel ()); epanel = Gtk::manage (new EditorPanel ());
parent->addEditorPanel (epanel, pl->thm->getFileName()); parent->addEditorPanel (epanel, pl->thm->getFileName());
} }
#ifdef WIN32 #ifdef _WIN32
else { else {
Glib::ustring msg_ = Glib::ustring("<b>") + M("MAIN_MSG_CANNOTLOAD") + " \"" + escapeHtmlChars(thm->getFileName()) + "\" .\n" + M("MAIN_MSG_TOOMANYOPENEDITORS") + "</b>"; Glib::ustring msg_ = Glib::ustring("<b>") + M("MAIN_MSG_CANNOTLOAD") + " \"" + escapeHtmlChars(thm->getFileName()) + "\" .\n" + M("MAIN_MSG_TOOMANYOPENEDITORS") + "</b>";
Gtk::MessageDialog msgd (*parent, msg_, true, Gtk::MESSAGE_ERROR, Gtk::BUTTONS_OK, true); Gtk::MessageDialog msgd (*parent, msg_, true, Gtk::MESSAGE_ERROR, Gtk::BUTTONS_OK, true);
@ -339,7 +339,7 @@ bool FilePanel::imageLoaded( Thumbnail* thm, ProgressConnector<rtengine::Initial
Gtk::MessageDialog msgd (*parent, msg_, true, Gtk::MESSAGE_ERROR, Gtk::BUTTONS_OK, true); Gtk::MessageDialog msgd (*parent, msg_, true, Gtk::MESSAGE_ERROR, Gtk::BUTTONS_OK, true);
msgd.run (); msgd.run ();
} }
#ifdef WIN32 #ifdef _WIN32
MAXGDIHANDLESREACHED: MAXGDIHANDLESREACHED:
#endif #endif
delete pl->pc; delete pl->pc;

74
rtgui/filmnegative.cc
View File

@ -209,42 +209,18 @@ FilmNegative::FilmNegative() :
greenExp(createExponentAdjuster(this, M("TP_FILMNEGATIVE_GREEN"), 0.3, 4, 0.01, 1.5)), // master exponent (green channel) greenExp(createExponentAdjuster(this, M("TP_FILMNEGATIVE_GREEN"), 0.3, 4, 0.01, 1.5)), // master exponent (green channel)
redRatio(createExponentAdjuster(this, M("TP_FILMNEGATIVE_RED"), 0.3, 5, 0.01, (2.04 / 1.5))), // ratio of red exponent to master exponent redRatio(createExponentAdjuster(this, M("TP_FILMNEGATIVE_RED"), 0.3, 5, 0.01, (2.04 / 1.5))), // ratio of red exponent to master exponent
blueRatio(createExponentAdjuster(this, M("TP_FILMNEGATIVE_BLUE"), 0.3, 5, 0.01, (1.29 / 1.5))), // ratio of blue exponent to master exponent blueRatio(createExponentAdjuster(this, M("TP_FILMNEGATIVE_BLUE"), 0.3, 5, 0.01, (1.29 / 1.5))), // ratio of blue exponent to master exponent
spotButton(Gtk::manage(new Gtk::ToggleButton(M("TP_FILMNEGATIVE_PICK")))), picker(DEFAULT_SPOT_WIDTH, M("TP_FILMNEGATIVE_PICK"), M("TP_FILMNEGATIVE_GUESS_TOOLTIP"), M("TP_FILMNEGATIVE_PICK_SIZE")),
refInputLabel(Gtk::manage(new Gtk::Label(Glib::ustring::compose(M("TP_FILMNEGATIVE_REF_LABEL"), "- - -")))), refInputLabel(Gtk::manage(new Gtk::Label(Glib::ustring::compose(M("TP_FILMNEGATIVE_REF_LABEL"), "- - -")))),
refSpotButton(Gtk::manage(new Gtk::ToggleButton(M("TP_FILMNEGATIVE_REF_PICK")))), refPicker(DEFAULT_SPOT_WIDTH, M("TP_FILMNEGATIVE_REF_PICK"), M("TP_FILMNEGATIVE_REF_TOOLTIP"), M("TP_FILMNEGATIVE_REF_SIZE")),
activePicker(&picker),
outputLevel(createLevelAdjuster(this, M("TP_FILMNEGATIVE_OUT_LEVEL"))), // ref level outputLevel(createLevelAdjuster(this, M("TP_FILMNEGATIVE_OUT_LEVEL"))), // ref level
greenBalance(createBalanceAdjuster(this, M("TP_FILMNEGATIVE_GREENBALANCE"), -3.0, 3.0, 0.0, "circle-magenta-small", "circle-green-small")), // green balance greenBalance(createBalanceAdjuster(this, M("TP_FILMNEGATIVE_GREENBALANCE"), -3.0, 3.0, 0.0, "circle-magenta-small", "circle-green-small")), // green balance
blueBalance(createBalanceAdjuster(this, M("TP_FILMNEGATIVE_BLUEBALANCE"), -3.0, 3.0, 0.0, "circle-blue-small", "circle-yellow-small")) // blue balance blueBalance(createBalanceAdjuster(this, M("TP_FILMNEGATIVE_BLUEBALANCE"), -3.0, 3.0, 0.0, "circle-blue-small", "circle-yellow-small")) // blue balance
{ {
setExpandAlignProperties(spotButton, true, false, Gtk::ALIGN_FILL, Gtk::ALIGN_CENTER);
spotButton->get_style_context()->add_class("independent");
spotButton->set_tooltip_text(M("TP_FILMNEGATIVE_GUESS_TOOLTIP"));
spotButton->set_image(*Gtk::manage(new RTImage("color-picker-small", Gtk::ICON_SIZE_BUTTON)));
refSpotButton->set_tooltip_text(M("TP_FILMNEGATIVE_REF_TOOLTIP"));
setExpandAlignProperties(refInputLabel, false, false, Gtk::ALIGN_START, Gtk::ALIGN_CENTER); setExpandAlignProperties(refInputLabel, false, false, Gtk::ALIGN_START, Gtk::ALIGN_CENTER);
// refInputLabel->set_justify(Gtk::Justification::JUSTIFY_CENTER); // refInputLabel->set_justify(Gtk::Justification::JUSTIFY_CENTER);
// refInputLabel->set_line_wrap(true); // refInputLabel->set_line_wrap(true);
// TODO make spot size configurable ?
// Gtk::Label* slab = Gtk::manage (new Gtk::Label (M("TP_WBALANCE_SIZE")));
// setExpandAlignProperties(slab, false, false, Gtk::ALIGN_START, Gtk::ALIGN_CENTER);
// Gtk::Grid* wbsizehelper = Gtk::manage(new Gtk::Grid());
// wbsizehelper->set_name("WB-Size-Helper");
// setExpandAlignProperties(wbsizehelper, false, false, Gtk::ALIGN_START, Gtk::ALIGN_CENTER);
// spotsize = Gtk::manage (new MyComboBoxText ());
// setExpandAlignProperties(spotsize, true, false, Gtk::ALIGN_FILL, Gtk::ALIGN_CENTER);
// spotsize->append ("2");
// spotsize->set_active(0);
// spotsize->append ("4");
// spotgrid->attach(*spotButton, 0, 1, 1, 1);
// spotgrid->attach (*slab, 1, 0, 1, 1);
// spotgrid->attach (*wbsizehelper, 2, 0, 1, 1);
colorSpace->append(M("TP_FILMNEGATIVE_COLORSPACE_INPUT")); colorSpace->append(M("TP_FILMNEGATIVE_COLORSPACE_INPUT"));
colorSpace->append(M("TP_FILMNEGATIVE_COLORSPACE_WORKING")); colorSpace->append(M("TP_FILMNEGATIVE_COLORSPACE_WORKING"));
@ -265,9 +241,7 @@ FilmNegative::FilmNegative() :
pack_start(*greenExp, Gtk::PACK_SHRINK, 0); pack_start(*greenExp, Gtk::PACK_SHRINK, 0);
pack_start(*redRatio, Gtk::PACK_SHRINK, 0); pack_start(*redRatio, Gtk::PACK_SHRINK, 0);
pack_start(*blueRatio, Gtk::PACK_SHRINK, 0); pack_start(*blueRatio, Gtk::PACK_SHRINK, 0);
pack_start(*spotButton, Gtk::PACK_SHRINK, 0); pack_start(picker, Gtk::PACK_SHRINK, 0);
// pack_start(*oldMethod, Gtk::PACK_SHRINK, 0);
Gtk::Separator* const sep = Gtk::manage(new Gtk::Separator(Gtk::ORIENTATION_HORIZONTAL)); Gtk::Separator* const sep = Gtk::manage(new Gtk::Separator(Gtk::ORIENTATION_HORIZONTAL));
sep->get_style_context()->add_class("grid-row-separator"); sep->get_style_context()->add_class("grid-row-separator");
@ -283,14 +257,13 @@ FilmNegative::FilmNegative() :
pack_start(*blueBalance, Gtk::PACK_SHRINK, 0); pack_start(*blueBalance, Gtk::PACK_SHRINK, 0);
pack_start(*greenBalance, Gtk::PACK_SHRINK, 0); pack_start(*greenBalance, Gtk::PACK_SHRINK, 0);
pack_start(*refSpotButton, Gtk::PACK_SHRINK, 0); pack_start(refPicker, Gtk::PACK_SHRINK, 0);
spotButton->signal_toggled().connect(sigc::mem_fun(*this, &FilmNegative::editToggled)); picker.add_button_toggled_event(*this, &FilmNegative::editToggled);
// spotsize->signal_changed().connect( sigc::mem_fun(*this, &WhiteBalance::spotSizeChanged) ); refPicker.add_button_toggled_event(*this, &FilmNegative::refSpotToggled);
refSpotButton->signal_toggled().connect(sigc::mem_fun(*this, &FilmNegative::refSpotToggled));
// Editing geometry; create the spot rectangle // Editing geometry; create the spot rectangle
// TODO: Change behaviour to match that of the white balance spot picker (rectangle disappears behind right toolbar)
EditRectangle* const spotRect = new EditRectangle(); EditRectangle* const spotRect = new EditRectangle();
spotRect->filled = false; spotRect->filled = false;
@ -455,8 +428,8 @@ void FilmNegative::setBatchMode(bool batchMode)
ToolPanel::setBatchMode(batchMode); ToolPanel::setBatchMode(batchMode);
if (batchMode) { if (batchMode) {
removeIfThere(this, spotButton, false); picker.remove_if_there(this, false);
removeIfThere(this, refSpotButton, false); refPicker.remove_if_there(this, false);
colorSpace->append(M("GENERAL_UNCHANGED")); colorSpace->append(M("GENERAL_UNCHANGED"));
colorSpace->set_active_text(M("GENERAL_UNCHANGED")); colorSpace->set_active_text(M("GENERAL_UNCHANGED"));
redRatio->showEditedCB(); redRatio->showEditedCB();
@ -565,7 +538,7 @@ bool FilmNegative::mouseOver(int modifierKey)
{ {
EditDataProvider* const provider = getEditProvider(); EditDataProvider* const provider = getEditProvider();
EditRectangle* const spotRect = static_cast<EditRectangle*>(visibleGeometry.at(0)); EditRectangle* const spotRect = static_cast<EditRectangle*>(visibleGeometry.at(0));
spotRect->setXYWH(provider->posImage.x - 16, provider->posImage.y - 16, 32, 32); spotRect->setXYWH(provider->posImage.x - activePicker->get_spot_half_width(), provider->posImage.y - activePicker->get_spot_half_width() ,activePicker->get_spot_full_width(), activePicker->get_spot_full_width());
return true; return true;
} }
@ -577,7 +550,7 @@ bool FilmNegative::button1Pressed(int modifierKey)
EditSubscriber::action = EditSubscriber::Action::NONE; EditSubscriber::action = EditSubscriber::Action::NONE;
if (listener) { if (listener) {
if (spotButton->get_active()) { if (picker.get_active()) {
refSpotCoords.push_back(provider->posImage); refSpotCoords.push_back(provider->posImage);
@ -587,8 +560,8 @@ bool FilmNegative::button1Pressed(int modifierKey)
RGB ref1, ref2, dummy; RGB ref1, ref2, dummy;
if (fnp->getFilmNegativeSpot(refSpotCoords[0], 32, ref1, dummy) && if (fnp->getFilmNegativeSpot(refSpotCoords[0], picker.get_spot_full_width(), ref1, dummy) &&
fnp->getFilmNegativeSpot(refSpotCoords[1], 32, ref2, dummy)) { fnp->getFilmNegativeSpot(refSpotCoords[1], picker.get_spot_full_width(), ref2, dummy)) {
disableListener(); disableListener();
@ -620,7 +593,7 @@ bool FilmNegative::button1Pressed(int modifierKey)
} }
} else if (refSpotButton->get_active()) { } else if (refPicker.get_active()) {
disableListener(); disableListener();
@ -634,7 +607,7 @@ bool FilmNegative::button1Pressed(int modifierKey)
} }
RGB refOut; RGB refOut;
fnp->getFilmNegativeSpot(provider->posImage, 32, refInputValues, refOut); fnp->getFilmNegativeSpot(provider->posImage, refPicker.get_spot_full_width(), refInputValues, refOut);
// Output luminance of the sampled spot // Output luminance of the sampled spot
float spotLum = rtengine::Color::rgbLuminance(refOut.r, refOut.g, refOut.b); float spotLum = rtengine::Color::rgbLuminance(refOut.r, refOut.g, refOut.b);
@ -698,16 +671,17 @@ void FilmNegative::switchOffEditMode()
{ {
refSpotCoords.clear(); refSpotCoords.clear();
unsubscribe(); unsubscribe();
spotButton->set_active(false); picker.set_active(false);
refSpotButton->set_active(false); refPicker.set_active(false);
} }
void FilmNegative::editToggled() void FilmNegative::editToggled()
{ {
if (spotButton->get_active()) { if (picker.get_active()) {
refSpotButton->set_active(false); refPicker.set_active(false);
refSpotCoords.clear(); refSpotCoords.clear();
activePicker = &picker;
subscribe(); subscribe();
@ -727,10 +701,11 @@ void FilmNegative::editToggled()
void FilmNegative::refSpotToggled() void FilmNegative::refSpotToggled()
{ {
if (refSpotButton->get_active()) { if (refPicker.get_active()) {
spotButton->set_active(false); picker.set_active(false);
refSpotCoords.clear(); refSpotCoords.clear();
activePicker = &refPicker;
subscribe(); subscribe();
@ -747,3 +722,4 @@ void FilmNegative::refSpotToggled()
unsubscribe(); unsubscribe();
} }
} }

8
rtgui/filmnegative.h
View File

@ -120,10 +120,14 @@ private:
Adjuster* const redRatio; Adjuster* const redRatio;
Adjuster* const blueRatio; Adjuster* const blueRatio;
Gtk::ToggleButton* const spotButton; static constexpr int DEFAULT_SPOT_WIDTH = 8;
SpotPicker picker;
Gtk::Label* const refInputLabel; Gtk::Label* const refInputLabel;
Gtk::ToggleButton* const refSpotButton; SpotPicker refPicker;
SpotPicker* activePicker;
Adjuster* const outputLevel; Adjuster* const outputLevel;
Adjuster* const greenBalance; Adjuster* const greenBalance;

75
rtgui/guiutils.cc
View File

@ -1953,3 +1953,78 @@ void BackBuffer::copySurface(Cairo::RefPtr<Cairo::Context> crDest, Gdk::Rectangl
crDest->fill(); crDest->fill();
} }
} }
SpotPicker::SpotPicker(int const defaultValue, Glib::ustring const &buttonKey, Glib::ustring const &buttonTooltip, Glib::ustring const &labelKey) :
Gtk::Grid(),
_spotHalfWidth(defaultValue),
_spotLabel(labelSetup(labelKey)),
_spotSizeSetter(MyComboBoxText(selecterSetup())),
_spotButton(spotButtonTemplate(buttonKey, buttonTooltip))
{
this->get_style_context()->add_class("grid-spacing");
setExpandAlignProperties(this, true, false, Gtk::ALIGN_FILL, Gtk::ALIGN_CENTER);
this->attach (_spotButton, 0, 0, 1, 1);
this->attach (_spotLabel, 1, 0, 1, 1);
this->attach (_spotSizeSetter, 2, 0, 1, 1);
_spotSizeSetter.signal_changed().connect( sigc::mem_fun(*this, &SpotPicker::spotSizeChanged));
}
Gtk::Label SpotPicker::labelSetup(Glib::ustring const &key) const
{
Gtk::Label label(key);
setExpandAlignProperties(&label, false, false, Gtk::ALIGN_START, Gtk::ALIGN_CENTER);
return label;
}
MyComboBoxText SpotPicker::selecterSetup() const
{
MyComboBoxText spotSize = MyComboBoxText();
setExpandAlignProperties(&spotSize, false, false, Gtk::ALIGN_START, Gtk::ALIGN_CENTER);
spotSize.append ("2");
if (_spotHalfWidth == 2) {
spotSize.set_active(0);
}
spotSize.append ("4");
if (_spotHalfWidth == 4) {
spotSize.set_active(1);
}
spotSize.append ("8");
if (_spotHalfWidth == 8) {
spotSize.set_active(2);
}
spotSize.append ("16");
if (_spotHalfWidth == 16) {
spotSize.set_active(3);
}
spotSize.append ("32");
if (_spotHalfWidth == 32) {
spotSize.set_active(4);
}
return spotSize;
}
Gtk::ToggleButton SpotPicker::spotButtonTemplate(Glib::ustring const &key, const Glib::ustring &tooltip) const
{
Gtk::ToggleButton spotButton = Gtk::ToggleButton(key);
setExpandAlignProperties(&spotButton, true, false, Gtk::ALIGN_FILL, Gtk::ALIGN_CENTER);
spotButton.get_style_context()->add_class("independent");
spotButton.set_tooltip_text(tooltip);
spotButton.set_image_from_icon_name("color-picker-small");
return spotButton;
}
void SpotPicker::spotSizeChanged()
{
_spotHalfWidth = atoi(_spotSizeSetter.get_active_text().c_str());
}

46
rtgui/guiutils.h
View File

@ -712,7 +712,51 @@ public:
} }
}; };
inline void setActiveTextOrIndex (Gtk::ComboBoxText& comboBox, const Glib::ustring& text, int index) /**
* @brief A gui element for picking spots on an image
*/
class SpotPicker : public Gtk::Grid
{
private:
int _spotHalfWidth;
Gtk::Label _spotLabel;
MyComboBoxText _spotSizeSetter;
Gtk::ToggleButton _spotButton;
public:
SpotPicker(int const defaultValue, Glib::ustring const &buttonKey, Glib::ustring const &buttonTooltip, Glib::ustring const &labelKey);
inline bool get_active() const
{
return _spotButton.get_active();
}
void set_active(bool b)
{
_spotButton.set_active(b);
}
int get_spot_half_width() const
{
return _spotHalfWidth;
}
int get_spot_full_width() const
{
return _spotHalfWidth * 2;
}
template <class T_return, class T_obj> void add_button_toggled_event(T_return& returnv, const T_obj function)
{
_spotButton.signal_toggled().connect(sigc::mem_fun(returnv, function));
}
bool remove_if_there(Gtk::Container* cont, bool increference = true)
{
return removeIfThere(cont, &_spotButton, increference);
}
protected:
Gtk::Label labelSetup(Glib::ustring const &key) const;
MyComboBoxText selecterSetup() const;
Gtk::ToggleButton spotButtonTemplate(Glib::ustring const &key, const Glib::ustring &tooltip) const;
void spotSizeChanged();
};
inline void setActiveTextOrIndex(Gtk::ComboBoxText &comboBox, const Glib::ustring &text, int index)
{ {
bool valueSet = false; bool valueSet = false;
if (!text.empty()) { if (!text.empty()) {

2
rtgui/icmpanel.cc
View File

@ -467,7 +467,7 @@ ICMPanel::ICMPanel() : FoldableToolPanel(this, TOOL_NAME, M("TP_ICM_LABEL")), iu
ipDialog->add_filter(filter_icc); ipDialog->add_filter(filter_icc);
ipDialog->add_filter(filter_iccdng); ipDialog->add_filter(filter_iccdng);
ipDialog->add_filter(filter_any); ipDialog->add_filter(filter_any);
#ifdef WIN32 #ifdef _WIN32
ipDialog->set_show_hidden(true); // ProgramData is hidden on Windows ipDialog->set_show_hidden(true); // ProgramData is hidden on Windows
#endif #endif

3
rtgui/lensprofile.cc
View File

@ -129,7 +129,7 @@ LensProfilePanel::LensProfilePanel() :
const Glib::ustring defDir = LCPStore::getInstance()->getDefaultCommonDirectory(); const Glib::ustring defDir = LCPStore::getInstance()->getDefaultCommonDirectory();
if (!defDir.empty()) { if (!defDir.empty()) {
#ifdef WIN32 #ifdef _WIN32
corrLcpFileChooser->set_show_hidden(true); // ProgramData is hidden on Windows corrLcpFileChooser->set_show_hidden(true); // ProgramData is hidden on Windows
#endif #endif
corrLcpFileChooser->set_current_folder(defDir); corrLcpFileChooser->set_current_folder(defDir);
@ -441,6 +441,7 @@ void LensProfilePanel::setBatchMode(bool yes)
modesGrid->attach_next_to(*corrUnchangedRB, Gtk::POS_TOP, 3, 1); modesGrid->attach_next_to(*corrUnchangedRB, Gtk::POS_TOP, 3, 1);
corrUnchangedRB->signal_toggled().connect(sigc::bind(sigc::mem_fun(*this, &LensProfilePanel::onCorrModeChanged), corrUnchangedRB)); corrUnchangedRB->signal_toggled().connect(sigc::bind(sigc::mem_fun(*this, &LensProfilePanel::onCorrModeChanged), corrUnchangedRB));
corrUnchangedRB->set_active(true); corrUnchangedRB->set_active(true);
corrUnchangedRB->show();
} }
void LensProfilePanel::onLensfunCameraChanged() void LensProfilePanel::onLensfunCameraChanged()

6
rtgui/main-cli.cc
View File

@ -41,7 +41,7 @@
#include "extprog.h" #include "extprog.h"
#include "pathutils.h" #include "pathutils.h"
#ifndef WIN32 #ifndef _WIN32
#include <glibmm/fileutils.h> #include <glibmm/fileutils.h>
#include <glib.h> #include <glib.h>
#include <glib/gstdio.h> #include <glib/gstdio.h>
@ -96,7 +96,7 @@ int main (int argc, char **argv)
char exname[512] = {0}; char exname[512] = {0};
Glib::ustring exePath; Glib::ustring exePath;
// get the path where the rawtherapee executable is stored // get the path where the rawtherapee executable is stored
#ifdef WIN32 #ifdef _WIN32
WCHAR exnameU[512] = {0}; WCHAR exnameU[512] = {0};
GetModuleFileNameW (NULL, exnameU, 511); GetModuleFileNameW (NULL, exnameU, 511);
WideCharToMultiByte (CP_UTF8, 0, exnameU, -1, exname, 511, 0, 0 ); WideCharToMultiByte (CP_UTF8, 0, exnameU, -1, exname, 511, 0, 0 );
@ -182,7 +182,7 @@ int main (int argc, char **argv)
TIFFSetWarningHandler (nullptr); // avoid annoying message boxes TIFFSetWarningHandler (nullptr); // avoid annoying message boxes
#ifndef WIN32 #ifndef _WIN32
// Move the old path to the new one if the new does not exist // Move the old path to the new one if the new does not exist
if (Glib::file_test (Glib::build_filename (options.rtdir, "cache"), Glib::FILE_TEST_IS_DIR) && !Glib::file_test (options.cacheBaseDir, Glib::FILE_TEST_IS_DIR)) { if (Glib::file_test (Glib::build_filename (options.rtdir, "cache"), Glib::FILE_TEST_IS_DIR) && !Glib::file_test (options.cacheBaseDir, Glib::FILE_TEST_IS_DIR)) {

16
rtgui/main.cc
View File

@ -46,7 +46,7 @@
#include "../rtengine/procparams.h" #include "../rtengine/procparams.h"
#include "pathutils.h" #include "pathutils.h"
#ifndef WIN32 #ifndef _WIN32
#include <glibmm/fileutils.h> #include <glibmm/fileutils.h>
#include <glib.h> #include <glib.h>
#include <glib/gstdio.h> #include <glib/gstdio.h>
@ -120,7 +120,7 @@ int processLineParams ( int argc, char **argv )
// GTK --argument, we're skipping it // GTK --argument, we're skipping it
break; break;
#ifdef WIN32 #ifdef _WIN32
case 'w': // This case is handled outside this function case 'w': // This case is handled outside this function
break; break;
@ -166,7 +166,7 @@ int processLineParams ( int argc, char **argv )
printf(" %s <file> Start Image Editor with file.\n\n",Glib::path_get_basename (argv[0]).c_str()); printf(" %s <file> Start Image Editor with file.\n\n",Glib::path_get_basename (argv[0]).c_str());
std::cout << std::endl; std::cout << std::endl;
printf("Options:\n"); printf("Options:\n");
#ifdef WIN32 #ifdef _WIN32
printf(" -w Do not open the Windows console\n"); printf(" -w Do not open the Windows console\n");
#endif #endif
printf(" -v Print RawTherapee version number and exit\n"); printf(" -v Print RawTherapee version number and exit\n");
@ -209,7 +209,7 @@ bool init_rt()
TIFFSetWarningHandler (nullptr); // avoid annoying message boxes TIFFSetWarningHandler (nullptr); // avoid annoying message boxes
} }
#ifndef WIN32 #ifndef _WIN32
// Move the old path to the new one if the new does not exist // Move the old path to the new one if the new does not exist
if (Glib::file_test (Glib::build_filename (options.rtdir, "cache"), Glib::FILE_TEST_IS_DIR) && !Glib::file_test (options.cacheBaseDir, Glib::FILE_TEST_IS_DIR)) { if (Glib::file_test (Glib::build_filename (options.rtdir, "cache"), Glib::FILE_TEST_IS_DIR) && !Glib::file_test (options.cacheBaseDir, Glib::FILE_TEST_IS_DIR)) {
@ -361,7 +361,7 @@ int main (int argc, char **argv)
Glib::init(); // called by Gtk::Main, but this may be important for thread handling, so we call it ourselves now Glib::init(); // called by Gtk::Main, but this may be important for thread handling, so we call it ourselves now
Gio::init (); Gio::init ();
#ifdef WIN32 #ifdef _WIN32
if (GetFileType (GetStdHandle (STD_OUTPUT_HANDLE)) == 0x0003) { if (GetFileType (GetStdHandle (STD_OUTPUT_HANDLE)) == 0x0003) {
// started from msys2 console => do not buffer stdout // started from msys2 console => do not buffer stdout
setbuf(stdout, NULL); setbuf(stdout, NULL);
@ -372,7 +372,7 @@ int main (int argc, char **argv)
char exname[512] = {0}; char exname[512] = {0};
Glib::ustring exePath; Glib::ustring exePath;
// get the path where the rawtherapee executable is stored // get the path where the rawtherapee executable is stored
#ifdef WIN32 #ifdef _WIN32
WCHAR exnameU[512] = {0}; WCHAR exnameU[512] = {0};
GetModuleFileNameW (NULL, exnameU, 511); GetModuleFileNameW (NULL, exnameU, 511);
WideCharToMultiByte (CP_UTF8, 0, exnameU, -1, exname, 511, 0, 0 ); WideCharToMultiByte (CP_UTF8, 0, exnameU, -1, exname, 511, 0, 0 );
@ -415,7 +415,7 @@ int main (int argc, char **argv)
options.rtSettings.lensfunDbBundleDirectory = LENSFUN_DB_PATH; options.rtSettings.lensfunDbBundleDirectory = LENSFUN_DB_PATH;
#endif #endif
#ifdef WIN32 #ifdef _WIN32
bool consoleOpened = false; bool consoleOpened = false;
// suppression of annoying error boxes // suppression of annoying error boxes
@ -556,7 +556,7 @@ int main (int argc, char **argv)
} }
} }
#ifdef WIN32 #ifdef _WIN32
if (consoleOpened) { if (consoleOpened) {
printf ("Press any key to exit RawTherapee\n"); printf ("Press any key to exit RawTherapee\n");

4
rtgui/md5helper.h
View File

@ -23,7 +23,7 @@
#include <glib/gstdio.h> #include <glib/gstdio.h>
#include <giomm.h> #include <giomm.h>
#ifdef WIN32 #ifdef _WIN32
#include <windows.h> #include <windows.h>
#endif #endif
@ -35,7 +35,7 @@ std::string getMD5 (const Glib::ustring& fname)
if (file && file->query_exists ()) { if (file && file->query_exists ()) {
#ifdef WIN32 #ifdef _WIN32
std::unique_ptr<wchar_t, GFreeFunc> wfname (reinterpret_cast<wchar_t*> (g_utf8_to_utf16 (fname.c_str (), -1, NULL, NULL, NULL)), g_free); std::unique_ptr<wchar_t, GFreeFunc> wfname (reinterpret_cast<wchar_t*> (g_utf8_to_utf16 (fname.c_str (), -1, NULL, NULL, NULL)), g_free);

6
rtgui/multilangmgr.cc
View File

@ -22,7 +22,7 @@
#include <glib.h> #include <glib.h>
#include <iostream> #include <iostream>
#include <utility> #include <utility>
#ifdef WIN32 #ifdef _WIN32
#include <windows.h> #include <windows.h>
#include <winnls.h> #include <winnls.h>
#endif #endif
@ -315,7 +315,7 @@ const TranslationMetadata *MultiLangMgr::getMetadata(const Glib::ustring &fname)
bool MultiLangMgr::isOSLanguageDetectSupported () bool MultiLangMgr::isOSLanguageDetectSupported ()
{ {
#if defined (WIN32) || defined (__linux__) || defined (__APPLE__) #if defined (_WIN32) || defined (__linux__) || defined (__APPLE__)
return true; return true;
#else #else
return false; return false;
@ -326,7 +326,7 @@ Glib::ustring MultiLangMgr::getOSUserLanguage ()
{ {
Glib::ustring langName ("default"); Glib::ustring langName ("default");
#if defined (WIN32) #if defined (_WIN32)
const LCID localeID = GetUserDefaultLCID (); const LCID localeID = GetUserDefaultLCID ();
TCHAR localeName[18]; TCHAR localeName[18];

2
rtgui/navigator.cc
View File

@ -157,7 +157,7 @@ Navigator::Navigator() :
/* /*
Glib::ustring fontname; Glib::ustring fontname;
#ifdef WIN32 #ifdef _WIN32
fontname = "Droid Sans Mono Slashed"; // font file is provided in the source tree in rtdata/fonts to be installed by the windows installer fontname = "Droid Sans Mono Slashed"; // font file is provided in the source tree in rtdata/fonts to be installed by the windows installer
#endif #endif

16
rtgui/options.cc
View File

@ -42,7 +42,7 @@
#ifdef WIN32 #ifdef _WIN32
#include <windows.h> #include <windows.h>
// for GCC32 // for GCC32
#ifndef _WIN32_IE #ifndef _WIN32_IE
@ -367,7 +367,7 @@ void Options::setDefaults()
fbShowDateTime = true; fbShowDateTime = true;
fbShowBasicExif = true; fbShowBasicExif = true;
fbShowExpComp = false; fbShowExpComp = false;
#ifdef WIN32 #ifdef _WIN32
// use windows setting for visibility of hidden files/folders // use windows setting for visibility of hidden files/folders
SHELLFLAGSTATE sft = { 0 }; SHELLFLAGSTATE sft = { 0 };
SHGetSettings(&sft, SSF_SHOWALLOBJECTS); SHGetSettings(&sft, SSF_SHOWALLOBJECTS);
@ -576,7 +576,7 @@ void Options::setDefaults()
rtSettings.cameraProfilesPath = ""; rtSettings.cameraProfilesPath = "";
rtSettings.lensProfilesPath = ""; rtSettings.lensProfilesPath = "";
#ifdef WIN32 #ifdef _WIN32
const gchar* sysRoot = g_getenv("SystemRoot"); // Returns e.g. "c:\Windows" const gchar* sysRoot = g_getenv("SystemRoot"); // Returns e.g. "c:\Windows"
if (sysRoot != NULL) { if (sysRoot != NULL) {
@ -932,7 +932,7 @@ void Options::readFromFile(Glib::ustring fname)
// GIMP == 1, Photoshop == 2, Custom == 3. // GIMP == 1, Photoshop == 2, Custom == 3.
editorToSendTo = keyFile.get_integer("External Editor", "EditorKind"); editorToSendTo = keyFile.get_integer("External Editor", "EditorKind");
#ifdef WIN32 #ifdef _WIN32
auto getIconSerialized = [](const Glib::ustring &executable) { auto getIconSerialized = [](const Glib::ustring &executable) {
// Backslashes and quotes must be escaped in the text representation of GVariant strings. // Backslashes and quotes must be escaped in the text representation of GVariant strings.
// See https://www.freedesktop.org/software/gstreamer-sdk/data/docs/2012.5/glib/gvariant-text.html#gvariant-text-strings // See https://www.freedesktop.org/software/gstreamer-sdk/data/docs/2012.5/glib/gvariant-text.html#gvariant-text-strings
@ -1227,7 +1227,7 @@ void Options::readFromFile(Glib::ustring fname)
fbShowExpComp = keyFile.get_boolean("File Browser", "BrowserShowsExpComp"); fbShowExpComp = keyFile.get_boolean("File Browser", "BrowserShowsExpComp");
} }
#ifndef WIN32 #ifndef _WIN32
if (keyFile.has_key("File Browser", "BrowserShowsHidden")) { if (keyFile.has_key("File Browser", "BrowserShowsHidden")) {
fbShowHidden = keyFile.get_boolean("File Browser", "BrowserShowsHidden"); fbShowHidden = keyFile.get_boolean("File Browser", "BrowserShowsHidden");
} }
@ -2394,7 +2394,7 @@ void Options::saveToFile(Glib::ustring fname)
keyFile.set_boolean("File Browser", "BrowserShowsDate", fbShowDateTime); keyFile.set_boolean("File Browser", "BrowserShowsDate", fbShowDateTime);
keyFile.set_boolean("File Browser", "BrowserShowsExif", fbShowBasicExif); keyFile.set_boolean("File Browser", "BrowserShowsExif", fbShowBasicExif);
keyFile.set_boolean("File Browser", "BrowserShowsExpComp", fbShowExpComp); keyFile.set_boolean("File Browser", "BrowserShowsExpComp", fbShowExpComp);
#ifndef WIN32 #ifndef _WIN32
keyFile.set_boolean("File Browser", "BrowserShowsHidden", fbShowHidden); keyFile.set_boolean("File Browser", "BrowserShowsHidden", fbShowHidden);
#endif #endif
keyFile.set_integer("File Browser", "ThumbnailSize", thumbSize); keyFile.set_integer("File Browser", "ThumbnailSize", thumbSize);
@ -2782,7 +2782,7 @@ void Options::load(bool lightweight)
} }
} else { } else {
#ifdef WIN32 #ifdef _WIN32
WCHAR pathW[MAX_PATH] = {0}; WCHAR pathW[MAX_PATH] = {0};
if (SHGetSpecialFolderPathW(NULL, pathW, CSIDL_LOCAL_APPDATA, false)) { if (SHGetSpecialFolderPathW(NULL, pathW, CSIDL_LOCAL_APPDATA, false)) {
@ -2832,7 +2832,7 @@ void Options::load(bool lightweight)
// No environment variable provided, so falling back to the multi user mode, if enabled // No environment variable provided, so falling back to the multi user mode, if enabled
else if (options.multiUser) { else if (options.multiUser) {
#ifdef WIN32 #ifdef _WIN32
cacheBaseDir = Glib::build_filename(rtdir, "cache"); cacheBaseDir = Glib::build_filename(rtdir, "cache");
#else #else
#ifdef __APPLE__ #ifdef __APPLE__

2
rtgui/options.h
View File

@ -40,7 +40,7 @@
#define THEMEREGEXSTR "^(.+)\\.css$" #define THEMEREGEXSTR "^(.+)\\.css$"
// Default bundled profile name to use for Raw images // Default bundled profile name to use for Raw images
#ifdef WIN32 #ifdef _WIN32
#define DEFPROFILE_RAW "${G}\\Auto-Matched Curve - ISO Low" #define DEFPROFILE_RAW "${G}\\Auto-Matched Curve - ISO Low"
#else #else
#define DEFPROFILE_RAW "${G}/Auto-Matched Curve - ISO Low" #define DEFPROFILE_RAW "${G}/Auto-Matched Curve - ISO Low"

2
rtgui/pathutils.cc
View File

@ -55,7 +55,7 @@ Glib::ustring getExtension (const Glib::ustring& filename)
// so we're using Glib::filename_to_utf8 for Linux/Apple and Glib::locale_to_utf8 for Windows. // so we're using Glib::filename_to_utf8 for Linux/Apple and Glib::locale_to_utf8 for Windows.
Glib::ustring fname_to_utf8(const std::string &fname) Glib::ustring fname_to_utf8(const std::string &fname)
{ {
#ifdef WIN32 #ifdef _WIN32
try { try {
return Glib::locale_to_utf8(fname); return Glib::locale_to_utf8(fname);

8
rtgui/placesbrowser.cc
View File

@ -18,7 +18,7 @@
*/ */
#include "placesbrowser.h" #include "placesbrowser.h"
#ifdef WIN32 #ifdef _WIN32
#include <windows.h> #include <windows.h>
#include <shlobj.h> #include <shlobj.h>
#include <Shlwapi.h> #include <Shlwapi.h>
@ -231,7 +231,7 @@ void PlacesBrowser::refreshPlacesList ()
// (Drives in Windows) // (Drives in Windows)
std::vector<Glib::RefPtr<Gio::Mount> > mounts = vm->get_mounts (); std::vector<Glib::RefPtr<Gio::Mount> > mounts = vm->get_mounts ();
#ifdef WIN32 #ifdef _WIN32
// on Windows, it's usual to sort by drive letter, not by name // on Windows, it's usual to sort by drive letter, not by name
std::sort (mounts.begin(), mounts.end(), compareMountByRoot); std::sort (mounts.begin(), mounts.end(), compareMountByRoot);
#endif #endif
@ -353,7 +353,7 @@ void PlacesBrowser::delPressed ()
Glib::ustring PlacesBrowser::userHomeDir () Glib::ustring PlacesBrowser::userHomeDir ()
{ {
#ifdef WIN32 #ifdef _WIN32
// get_home_dir crashes on some Windows configurations, // get_home_dir crashes on some Windows configurations,
// so we rather use the safe native functions here. // so we rather use the safe native functions here.
@ -378,7 +378,7 @@ Glib::ustring PlacesBrowser::userHomeDir ()
Glib::ustring PlacesBrowser::userPicturesDir () Glib::ustring PlacesBrowser::userPicturesDir ()
{ {
#ifdef WIN32 #ifdef _WIN32
// get_user_special_dir crashes on some Windows configurations, // get_user_special_dir crashes on some Windows configurations,
// so we rather use the safe native functions here. // so we rather use the safe native functions here.

6
rtgui/preferences.cc
View File

@ -130,7 +130,7 @@ Preferences::Preferences(RTWindow *rtwindow)
nb->append_page(*getBatchProcPanel(), M("PREFERENCES_BATCH_PROCESSING")); nb->append_page(*getBatchProcPanel(), M("PREFERENCES_BATCH_PROCESSING"));
nb->append_page(*getPerformancePanel(), M("PREFERENCES_TAB_PERFORMANCE")); nb->append_page(*getPerformancePanel(), M("PREFERENCES_TAB_PERFORMANCE"));
// Sounds only on Windows and Linux // Sounds only on Windows and Linux
#if defined(WIN32) || defined(__linux__) #if defined(_WIN32) || defined(__linux__)
nb->append_page(*getSoundsPanel(), M("PREFERENCES_TAB_SOUND")); nb->append_page(*getSoundsPanel(), M("PREFERENCES_TAB_SOUND"));
#endif #endif
nb->set_current_page(0); nb->set_current_page(0);
@ -1964,7 +1964,7 @@ void Preferences::storePreferences()
moptions.rtSettings.thumbnail_inspector_mode = static_cast<rtengine::Settings::ThumbnailInspectorMode>(thumbnailInspectorMode->get_active_row_number()); moptions.rtSettings.thumbnail_inspector_mode = static_cast<rtengine::Settings::ThumbnailInspectorMode>(thumbnailInspectorMode->get_active_row_number());
// Sounds only on Windows and Linux // Sounds only on Windows and Linux
#if defined(WIN32) || defined(__linux__) #if defined(_WIN32) || defined(__linux__)
moptions.sndEnable = ckbSndEnable->get_active(); moptions.sndEnable = ckbSndEnable->get_active();
moptions.sndBatchQueueDone = txtSndBatchQueueDone->get_text(); moptions.sndBatchQueueDone = txtSndBatchQueueDone->get_text();
moptions.sndLngEditProcDone = txtSndLngEditProcDone->get_text(); moptions.sndLngEditProcDone = txtSndLngEditProcDone->get_text();
@ -2221,7 +2221,7 @@ void Preferences::fillPreferences()
chOverwriteOutputFile->set_active(moptions.overwriteOutputFile); chOverwriteOutputFile->set_active(moptions.overwriteOutputFile);
// Sounds only on Windows and Linux // Sounds only on Windows and Linux
#if defined(WIN32) || defined(__linux__) #if defined(_WIN32) || defined(__linux__)
ckbSndEnable->set_active(moptions.sndEnable); ckbSndEnable->set_active(moptions.sndEnable);
txtSndBatchQueueDone->set_text(moptions.sndBatchQueueDone); txtSndBatchQueueDone->set_text(moptions.sndBatchQueueDone);
txtSndLngEditProcDone->set_text(moptions.sndLngEditProcDone); txtSndLngEditProcDone->set_text(moptions.sndLngEditProcDone);

2
rtgui/rtappchooserdialog.cc
View File

@ -18,7 +18,7 @@
*/ */
#include "rtappchooserdialog.h" #include "rtappchooserdialog.h"
#if !(defined WIN32 || defined __APPLE__) #if !(defined _WIN32 || defined __APPLE__)
#define GTKMM_APPCHOOSERDIALOG #define GTKMM_APPCHOOSERDIALOG
#endif #endif

2
rtgui/rtwindow.cc
View File

@ -191,7 +191,7 @@ RTWindow::RTWindow ()
FileBrowserEntry::init(); FileBrowserEntry::init();
// For UNIX system, set app icon // For UNIX system, set app icon
#ifndef WIN32 #ifndef _WIN32
try { try {
set_default_icon_name("rawtherapee"); set_default_icon_name("rawtherapee");
} catch (Glib::Exception& ex) { } catch (Glib::Exception& ex) {

6
rtgui/soundman.cc
View File

@ -21,7 +21,7 @@
#include "soundman.h" #include "soundman.h"
#include "options.h" #include "options.h"
#ifdef WIN32 #ifdef _WIN32
#include <windows.h> #include <windows.h>
#include <mmsystem.h> #include <mmsystem.h>
#endif #endif
@ -33,7 +33,7 @@
void SoundManager::init() void SoundManager::init()
{ {
#ifdef WIN32 #ifdef _WIN32
// TODO: On Windows Vista/7 RT should register with the OS sound system, so it can enjoy application specific // TODO: On Windows Vista/7 RT should register with the OS sound system, so it can enjoy application specific
// volume, safed, process independent etc. from the start. // volume, safed, process independent etc. from the start.
// Function call is IAudioClient::Initialize // Function call is IAudioClient::Initialize
@ -53,7 +53,7 @@ void SoundManager::playSoundAsync(const Glib::ustring &sound)
return; return;
} }
#ifdef WIN32 #ifdef _WIN32
DWORD sndParam = SND_ASYNC | SND_NODEFAULT; DWORD sndParam = SND_ASYNC | SND_NODEFAULT;
if (sound.find('.') != Glib::ustring::npos) { if (sound.find('.') != Glib::ustring::npos) {

6
rtgui/threadutils.cc
View File

@ -21,7 +21,7 @@
#include <csignal> #include <csignal>
#include <iostream> #include <iostream>
#ifdef WIN32 #ifdef _WIN32
#include <windows.h> #include <windows.h>
#endif #endif
@ -34,7 +34,7 @@ void MyMutex::checkLock ()
if (locked) { if (locked) {
std::cerr << "MyMutex already locked!" << std::endl; std::cerr << "MyMutex already locked!" << std::endl;
#ifdef WIN32 #ifdef _WIN32
DebugBreak (); DebugBreak ();
#else #else
raise (SIGTRAP); raise (SIGTRAP);
@ -49,7 +49,7 @@ void MyMutex::checkUnlock ()
if (!locked) { if (!locked) {
std::cerr << "MyMutex already unlocked!" << std::endl; std::cerr << "MyMutex already unlocked!" << std::endl;
#ifdef WIN32 #ifdef _WIN32
DebugBreak (); DebugBreak ();
#else #else
raise (SIGTRAP); raise (SIGTRAP);

16
rtgui/thumbimageupdater.cc
View File

@ -45,12 +45,13 @@ public:
struct Job { struct Job {
Job(ThumbBrowserEntryBase* tbe, bool* priority, bool upgrade, Job(ThumbBrowserEntryBase* tbe, bool* priority, bool upgrade,
ThumbImageUpdateListener* listener): bool forceUpgrade, ThumbImageUpdateListener* listener):
tbe_(tbe), tbe_(tbe),
/*pparams_(pparams), /*pparams_(pparams),
height_(height), */ height_(height), */
priority_(priority), priority_(priority),
upgrade_(upgrade), upgrade_(upgrade),
force_upgrade_(forceUpgrade),
listener_(listener) listener_(listener)
{} {}
@ -58,6 +59,7 @@ public:
tbe_(nullptr), tbe_(nullptr),
priority_(nullptr), priority_(nullptr),
upgrade_(false), upgrade_(false),
force_upgrade_(false),
listener_(nullptr) listener_(nullptr)
{} {}
@ -66,6 +68,7 @@ public:
int height_;*/ int height_;*/
bool* priority_; bool* priority_;
bool upgrade_; bool upgrade_;
bool force_upgrade_;
ThumbImageUpdateListener* listener_; ThumbImageUpdateListener* listener_;
}; };
@ -153,8 +156,8 @@ public:
Thumbnail* thm = j.tbe_->thumbnail; Thumbnail* thm = j.tbe_->thumbnail;
if ( j.upgrade_ ) { if ( j.upgrade_ ) {
if ( thm->isQuick() ) { if ( thm->isQuick() || j.force_upgrade_ ) {
img = thm->upgradeThumbImage(thm->getProcParams(), j.tbe_->getPreviewHeight(), scale); img = thm->upgradeThumbImage(thm->getProcParams(), j.tbe_->getPreviewHeight(), scale, j.force_upgrade_);
} }
} else { } else {
img = thm->processThumbImage(thm->getProcParams(), j.tbe_->getPreviewHeight(), scale); img = thm->processThumbImage(thm->getProcParams(), j.tbe_->getPreviewHeight(), scale);
@ -191,7 +194,7 @@ ThumbImageUpdater::~ThumbImageUpdater() {
delete impl_; delete impl_;
} }
void ThumbImageUpdater::add(ThumbBrowserEntryBase* tbe, bool* priority, bool upgrade, ThumbImageUpdateListener* l) void ThumbImageUpdater::add(ThumbBrowserEntryBase* tbe, bool* priority, bool upgrade, bool forceUpgrade, ThumbImageUpdateListener* l)
{ {
// nobody listening? // nobody listening?
if ( l == nullptr ) { if ( l == nullptr ) {
@ -206,7 +209,8 @@ void ThumbImageUpdater::add(ThumbBrowserEntryBase* tbe, bool* priority, bool upg
for ( ; i != impl_->jobs_.end(); ++i ) { for ( ; i != impl_->jobs_.end(); ++i ) {
if ( i->tbe_ == tbe && if ( i->tbe_ == tbe &&
i->listener_ == l && i->listener_ == l &&
i->upgrade_ == upgrade ) { i->upgrade_ == upgrade &&
i->force_upgrade_ == forceUpgrade) {
DEBUG("updating job %s", tbe->shortname.c_str()); DEBUG("updating job %s", tbe->shortname.c_str());
// we have one, update queue entry, will be picked up by thread when processed // we have one, update queue entry, will be picked up by thread when processed
/*i->pparams_ = params; /*i->pparams_ = params;
@ -218,7 +222,7 @@ void ThumbImageUpdater::add(ThumbBrowserEntryBase* tbe, bool* priority, bool upg
// create a new job and append to queue // create a new job and append to queue
DEBUG("queueing job %s", tbe->shortname.c_str()); DEBUG("queueing job %s", tbe->shortname.c_str());
impl_->jobs_.push_back(Impl::Job(tbe, priority, upgrade, l)); impl_->jobs_.push_back(Impl::Job(tbe, priority, upgrade, forceUpgrade, l));
DEBUG("adding run request %s", tbe->shortname.c_str()); DEBUG("adding run request %s", tbe->shortname.c_str());
impl_->threadPool_->push(sigc::mem_fun(*impl_, &ThumbImageUpdater::Impl::processNextJob)); impl_->threadPool_->push(sigc::mem_fun(*impl_, &ThumbImageUpdater::Impl::processNextJob));

2
rtgui/thumbimageupdater.h
View File

@ -78,7 +78,7 @@ public:
* @param priority if \c true then run as soon as possible * @param priority if \c true then run as soon as possible
* @param l listener waiting on update * @param l listener waiting on update
*/ */
void add(ThumbBrowserEntryBase* tbe, bool* priority, bool upgrade, ThumbImageUpdateListener* l); void add(ThumbBrowserEntryBase* tbe, bool* priority, bool upgrade, bool forceUpgrade, ThumbImageUpdateListener* l);
/** /**
* @brief Remove jobs associated with listener \c l. * @brief Remove jobs associated with listener \c l.

27
rtgui/thumbnail.cc
View File

@ -15,7 +15,7 @@
* You should have received a copy of the GNU General Public License * You should have received a copy of the GNU General Public License
* along with RawTherapee. If not, see <https://www.gnu.org/licenses/>. * along with RawTherapee. If not, see <https://www.gnu.org/licenses/>.
*/ */
#ifdef WIN32 #ifdef _WIN32
#include <windows.h> #include <windows.h>
#endif #endif
@ -240,7 +240,7 @@ void Thumbnail::_generateThumbnailImage ()
if ( tpp == nullptr ) { if ( tpp == nullptr ) {
quick = false; quick = false;
tpp = rtengine::Thumbnail::loadFromRaw (fname, sensorType, tw, th, 1, pparams->wb.equal, pparams->wb.observer, TRUE); tpp = rtengine::Thumbnail::loadFromRaw (fname, sensorType, tw, th, 1, pparams->wb.equal, pparams->wb.observer, TRUE, &(pparams->raw));
} }
cfs.sensortype = sensorType; cfs.sensortype = sensorType;
@ -387,7 +387,7 @@ rtengine::procparams::ProcParams* Thumbnail::createProcParamsForUpdate(bool retu
void Thumbnail::notifylisterners_procParamsChanged(int whoChangedIt) void Thumbnail::notifylisterners_procParamsChanged(int whoChangedIt)
{ {
for (size_t i = 0; i < listeners.size(); i++) { for (size_t i = 0; i < listeners.size(); i++) {
listeners[i]->procParamsChanged (this, whoChangedIt); listeners[i]->procParamsChanged (this, whoChangedIt, false);
} }
} }
@ -490,7 +490,7 @@ void Thumbnail::clearProcParams (int whoClearedIt)
} // end of mutex lock } // end of mutex lock
for (size_t i = 0; i < listeners.size(); i++) { for (size_t i = 0; i < listeners.size(); i++) {
listeners[i]->procParamsChanged (this, whoClearedIt); listeners[i]->procParamsChanged (this, whoClearedIt, false);
} }
} }
@ -502,8 +502,18 @@ bool Thumbnail::hasProcParams () const
void Thumbnail::setProcParams (const ProcParams& pp, ParamsEdited* pe, int whoChangedIt, bool updateCacheNow, bool resetToDefault) void Thumbnail::setProcParams (const ProcParams& pp, ParamsEdited* pe, int whoChangedIt, bool updateCacheNow, bool resetToDefault)
{ {
const bool blackLevelChanged =
pparams->raw.bayersensor.black0 != pp.raw.bayersensor.black0
|| pparams->raw.bayersensor.black1 != pp.raw.bayersensor.black1
|| pparams->raw.bayersensor.black2 != pp.raw.bayersensor.black2
|| pparams->raw.bayersensor.black3 != pp.raw.bayersensor.black3
|| pparams->raw.xtranssensor.blackred != pp.raw.xtranssensor.blackred
|| pparams->raw.xtranssensor.blackgreen != pp.raw.xtranssensor.blackgreen
|| pparams->raw.xtranssensor.blackblue != pp.raw.xtranssensor.blackblue;
const bool needsReprocessing = const bool needsReprocessing =
resetToDefault resetToDefault
|| blackLevelChanged
|| pparams->raw.expos != pp.raw.expos
|| pparams->toneCurve != pp.toneCurve || pparams->toneCurve != pp.toneCurve
|| pparams->locallab != pp.locallab || pparams->locallab != pp.locallab
|| pparams->labCurve != pp.labCurve || pparams->labCurve != pp.labCurve
@ -538,6 +548,7 @@ void Thumbnail::setProcParams (const ProcParams& pp, ParamsEdited* pe, int whoCh
|| pparams->filmNegative != pp.filmNegative || pparams->filmNegative != pp.filmNegative
|| whoChangedIt == FILEBROWSER || whoChangedIt == FILEBROWSER
|| whoChangedIt == BATCHEDITOR; || whoChangedIt == BATCHEDITOR;
const bool upgradeHint = blackLevelChanged;
{ {
MyMutex::MyLock lock(mutex); MyMutex::MyLock lock(mutex);
@ -573,7 +584,7 @@ void Thumbnail::setProcParams (const ProcParams& pp, ParamsEdited* pe, int whoCh
if (needsReprocessing) { if (needsReprocessing) {
for (size_t i = 0; i < listeners.size(); i++) { for (size_t i = 0; i < listeners.size(); i++) {
listeners[i]->procParamsChanged (this, whoChangedIt); listeners[i]->procParamsChanged (this, whoChangedIt, upgradeHint);
} }
} }
} }
@ -747,12 +758,12 @@ rtengine::IImage8* Thumbnail::processThumbImage (const rtengine::procparams::Pro
return image; return image;
} }
rtengine::IImage8* Thumbnail::upgradeThumbImage (const rtengine::procparams::ProcParams& pparams, int h, double& scale) rtengine::IImage8* Thumbnail::upgradeThumbImage (const rtengine::procparams::ProcParams& pparams, int h, double& scale, bool forceUpgrade)
{ {
MyMutex::MyLock lock(mutex); MyMutex::MyLock lock(mutex);
if ( cfs.thumbImgType != CacheImageData::QUICK_THUMBNAIL ) { if ( cfs.thumbImgType != CacheImageData::QUICK_THUMBNAIL && !forceUpgrade ) {
return nullptr; return nullptr;
} }
@ -1142,7 +1153,7 @@ void Thumbnail::removeThumbnailListener (ThumbnailListener* tnl)
bool Thumbnail::openDefaultViewer(int destination) bool Thumbnail::openDefaultViewer(int destination)
{ {
#ifdef WIN32 #ifdef _WIN32
Glib::ustring openFName; Glib::ustring openFName;
if (destination == 1) { if (destination == 1) {

2
rtgui/thumbnail.h
View File

@ -124,7 +124,7 @@ public:
// unsigned char* getThumbnailImage (int &w, int &h, int fixwh=1); // fixwh = 0: fix w and calculate h, =1: fix h and calculate w // unsigned char* getThumbnailImage (int &w, int &h, int fixwh=1); // fixwh = 0: fix w and calculate h, =1: fix h and calculate w
rtengine::IImage8* processThumbImage (const rtengine::procparams::ProcParams& pparams, int h, double& scale); rtengine::IImage8* processThumbImage (const rtengine::procparams::ProcParams& pparams, int h, double& scale);
rtengine::IImage8* upgradeThumbImage (const rtengine::procparams::ProcParams& pparams, int h, double& scale); rtengine::IImage8* upgradeThumbImage (const rtengine::procparams::ProcParams& pparams, int h, double& scale, bool forceUpgrade);
void getThumbnailSize (int &w, int &h, const rtengine::procparams::ProcParams *pparams = nullptr); void getThumbnailSize (int &w, int &h, const rtengine::procparams::ProcParams *pparams = nullptr);
void getFinalSize (const rtengine::procparams::ProcParams& pparams, int& w, int& h); void getFinalSize (const rtengine::procparams::ProcParams& pparams, int& w, int& h);
void getOriginalSize (int& w, int& h) const; void getOriginalSize (int& w, int& h) const;

2
rtgui/thumbnaillistener.h
View File

@ -24,5 +24,5 @@ class ThumbnailListener
{ {
public: public:
virtual ~ThumbnailListener() = default; virtual ~ThumbnailListener() = default;
virtual void procParamsChanged(Thumbnail* thm, int whoChangedIt) = 0; virtual void procParamsChanged(Thumbnail* thm, int whoChangedIt, bool upgradeHint) = 0;
}; };