From 8f8516199f7208fd19ae3e44e02a3dea7bf96d24 Mon Sep 17 00:00:00 2001 From: Hombre Date: Wed, 26 Apr 2017 00:41:57 +0200 Subject: [PATCH 1/3] Making Filter tab the default one in File Browser tab (#3843) --- rtgui/filepanel.cc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/rtgui/filepanel.cc b/rtgui/filepanel.cc index ed9b70e8d..a8c24e83d 100644 --- a/rtgui/filepanel.cc +++ b/rtgui/filepanel.cc @@ -122,9 +122,9 @@ FilePanel::FilePanel () : parent(nullptr) tpcPaned->pack1 (*tpc->toolPanelNotebook, false, true); tpcPaned->pack2 (*history, true, true); - rightNotebook->append_page (*tpcPaned, *devLab); - rightNotebook->append_page (*inspectorPanel, *inspectLab); rightNotebook->append_page (*sFilterPanel, *filtLab); + rightNotebook->append_page (*inspectorPanel, *inspectLab); + rightNotebook->append_page (*tpcPaned, *devLab); //rightNotebook->append_page (*taggingBox, *tagLab); commented out: currently the tab is empty ... rightNotebook->append_page (*sExportPanel, *exportLab); rightNotebook->set_name ("RightNotebook"); From 3724c38e84b877ab1416eace5ccef02f01ca6516 Mon Sep 17 00:00:00 2001 From: Hombre Date: Fri, 28 Apr 2017 21:04:46 +0200 Subject: [PATCH 2/3] Updated label for Batch Editor's tab in File Browser (#3843) --- rtdata/languages/Deutsch | 8 ++++---- rtdata/languages/Francais | 6 +++--- rtdata/languages/Italiano | 6 +++--- rtdata/languages/default | 8 ++++---- 4 files changed, 14 insertions(+), 14 deletions(-) diff --git a/rtdata/languages/Deutsch b/rtdata/languages/Deutsch index ede5032ad..51298101f 100644 --- a/rtdata/languages/Deutsch +++ b/rtdata/languages/Deutsch @@ -842,13 +842,13 @@ MAIN_TAB_COLOR;Farbe MAIN_TAB_COLOR_TOOLTIP;Taste: Alt + c MAIN_TAB_DETAIL;Details MAIN_TAB_DETAIL_TOOLTIP;Taste: Alt + d -MAIN_TAB_DEVELOP;Entwickeln +MAIN_TAB_DEVELOP; Batchbearbeitung MAIN_TAB_EXIF;Exif -MAIN_TAB_EXPORT;Exportieren +MAIN_TAB_EXPORT; Exportieren MAIN_TAB_EXPOSURE;Belichtung MAIN_TAB_EXPOSURE_TOOLTIP;Taste: Alt + e -MAIN_TAB_FILTER; Filter -MAIN_TAB_INSPECT; Prüfen +MAIN_TAB_FILTER; Filter +MAIN_TAB_INSPECT; Prüfen MAIN_TAB_IPTC;IPTC MAIN_TAB_METADATA;Metadaten MAIN_TAB_METADATA_TOOLTIP;Taste: Alt + m diff --git a/rtdata/languages/Francais b/rtdata/languages/Francais index 0ba7a19b4..21ca46fab 100644 --- a/rtdata/languages/Francais +++ b/rtdata/languages/Francais @@ -757,13 +757,13 @@ MAIN_TAB_COLOR;Couleur MAIN_TAB_COLOR_TOOLTIP;Raccourci:Alt-c MAIN_TAB_DETAIL;Détail MAIN_TAB_DETAIL_TOOLTIP;Raccourci:Alt-d -MAIN_TAB_DEVELOP; Développer +MAIN_TAB_DEVELOP; Édition Par Lot MAIN_TAB_EXIF;EXIF -MAIN_TAB_EXPORT;Export Rapide +MAIN_TAB_EXPORT; Export Rapide MAIN_TAB_EXPOSURE;Exposition MAIN_TAB_EXPOSURE_TOOLTIP;Raccourci:Alt-e MAIN_TAB_FILTER; Filtrer -MAIN_TAB_INSPECT; Inspecter +MAIN_TAB_INSPECT; Inspecter MAIN_TAB_IPTC;IPTC MAIN_TAB_METADATA;Métadonnées MAIN_TAB_METADATA_TOOLTIP;Raccourci:Alt-m diff --git a/rtdata/languages/Italiano b/rtdata/languages/Italiano index 986ef4c9a..8318d7947 100644 --- a/rtdata/languages/Italiano +++ b/rtdata/languages/Italiano @@ -528,12 +528,12 @@ MAIN_TAB_COLOR;Colore MAIN_TAB_COLOR_TOOLTIP;Scorciatoia: Alt-c MAIN_TAB_DETAIL;Dettaglio MAIN_TAB_DETAIL_TOOLTIP;Scorciatoia: Alt-d -MAIN_TAB_DEVELOP;Sviluppo +MAIN_TAB_DEVELOP; Modifiche Batch MAIN_TAB_EXIF;Exif -MAIN_TAB_EXPORT; Esportazione Rapida +MAIN_TAB_EXPORT; Esportazione Rapida MAIN_TAB_EXPOSURE;Esposizione MAIN_TAB_EXPOSURE_TOOLTIP;Scorciatoia: Alt-e -MAIN_TAB_FILTER;Filtro +MAIN_TAB_FILTER; Filtro MAIN_TAB_IPTC;IPTC MAIN_TAB_METADATA;Metadati MAIN_TAB_METADATA_TOOLTIP;Scorciatoia: Alt-m diff --git a/rtdata/languages/default b/rtdata/languages/default index 594040476..b9b8426a0 100644 --- a/rtdata/languages/default +++ b/rtdata/languages/default @@ -805,13 +805,13 @@ MAIN_TAB_COLOR;Color MAIN_TAB_COLOR_TOOLTIP;Shortcut: Alt-c MAIN_TAB_DETAIL;Detail MAIN_TAB_DETAIL_TOOLTIP;Shortcut: Alt-d -MAIN_TAB_DEVELOP; Develop +MAIN_TAB_DEVELOP; Batch Edit MAIN_TAB_EXIF;Exif -MAIN_TAB_EXPORT; Fast Export +MAIN_TAB_EXPORT; Fast Export MAIN_TAB_EXPOSURE;Exposure MAIN_TAB_EXPOSURE_TOOLTIP;Shortcut: Alt-e -MAIN_TAB_FILTER; Filter -MAIN_TAB_INSPECT; Inspect +MAIN_TAB_FILTER; Filter +MAIN_TAB_INSPECT; Inspect MAIN_TAB_IPTC;IPTC MAIN_TAB_METADATA;Metadata MAIN_TAB_METADATA_TOOLTIP;Shortcut: Alt-m From 55d342ade3e3c28690b3756a1ae116e0e52b2d78 Mon Sep 17 00:00:00 2001 From: Morgan Hardwood Date: Wed, 3 May 2017 20:02:51 +0200 Subject: [PATCH 3/3] Changed repo path in tools/generateDirtyFiles --- tools/generateDirtyFiles | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/generateDirtyFiles b/tools/generateDirtyFiles index 28b95514b..2a272a2c4 100755 --- a/tools/generateDirtyFiles +++ b/tools/generateDirtyFiles @@ -2,7 +2,7 @@ # Search files for keywords, then do something to the files which don't match # Path to the RawTherapee repository -pushd $HOME/rawtherapee >/dev/null +pushd $HOME/programs/code-rawtherapee >/dev/null unset uses match m u # Key to search for, e.g. an include IFS=" " read -a match <<< $(grep -rni iomanip rt* | cut -d ":" -f1 | sort -uV)