Merge branch 'dev' of https://github.com/Beep6581/RawTherapee into dev
This commit is contained in:
commit
7397f8494f
@ -60,6 +60,7 @@
|
|||||||
#59 29.05.2018 Erweiterung (TooWaBoo) RT 5.4
|
#59 29.05.2018 Erweiterung (TooWaBoo) RT 5.4
|
||||||
#60 14.06.2018 Erweiterung (TooWaBoo) RT 5.4
|
#60 14.06.2018 Erweiterung (TooWaBoo) RT 5.4
|
||||||
#61 14.06.2018 Korrektur (TooWaBoo) RT 5.4
|
#61 14.06.2018 Korrektur (TooWaBoo) RT 5.4
|
||||||
|
#62 22.06.2018 Korrektur (TooWaBoo) RT 5.4
|
||||||
|
|
||||||
ABOUT_TAB_BUILD;Version
|
ABOUT_TAB_BUILD;Version
|
||||||
ABOUT_TAB_CREDITS;Danksagungen
|
ABOUT_TAB_CREDITS;Danksagungen
|
||||||
@ -1318,7 +1319,7 @@ THRESHOLDSELECTOR_HINT;<b>Umschalt</b>-Taste halten, um individuelle\nKontrollpu
|
|||||||
THRESHOLDSELECTOR_T;Oben
|
THRESHOLDSELECTOR_T;Oben
|
||||||
THRESHOLDSELECTOR_TL;Oben-Links
|
THRESHOLDSELECTOR_TL;Oben-Links
|
||||||
THRESHOLDSELECTOR_TR;Oben-Rechts
|
THRESHOLDSELECTOR_TR;Oben-Rechts
|
||||||
TOOLBAR_TOOLTIP_COLORPICKER;<b>Farbwähler</b>\n\nWenn eingeschaltet:\n- Mit der linken Maustaste können Sie einen Farbwähler setzen.\n- Zum Verschieben, linke Maustaste festhalten.\n- Umschalttaste + Rechts-Klick entfernt alle Farbwähler.\n- Rechts-Klick auf den Farbwählerbutton blendet die Farbwähler ein/aus\n- Rechts-Klick in einen freien Bereich schaltet auf das Hand-Werkzeug zurück.
|
TOOLBAR_TOOLTIP_COLORPICKER;Farbwähler\n\nWenn eingeschaltet:\n- Mit der linken Maustaste können Sie einen Farbwähler setzen.\n- Zum Verschieben, linke Maustaste festhalten.\n- Umschalttaste + Rechts-Klick entfernt alle Farbwähler.\n- Rechts-Klick auf den Farbwählerbutton blendet die Farbwähler ein/aus\n- Rechts-Klick in einen freien Bereich schaltet auf das Hand-Werkzeug zurück.
|
||||||
TOOLBAR_TOOLTIP_CROP;Ausschnitt wählen\nTaste: <b>c</b>\n\nZum Verschieben des Ausschnitts,\nUmschalttaste festhalten.
|
TOOLBAR_TOOLTIP_CROP;Ausschnitt wählen\nTaste: <b>c</b>\n\nZum Verschieben des Ausschnitts,\nUmschalttaste festhalten.
|
||||||
TOOLBAR_TOOLTIP_HAND;Hand-Werkzeug\nTaste: <b>h</b>
|
TOOLBAR_TOOLTIP_HAND;Hand-Werkzeug\nTaste: <b>h</b>
|
||||||
TOOLBAR_TOOLTIP_STRAIGHTEN;Ausrichten / Drehen\nTaste: <b>s</b>\n\nRichtet das Bild entlang einer Leitlinie aus.
|
TOOLBAR_TOOLTIP_STRAIGHTEN;Ausrichten / Drehen\nTaste: <b>s</b>\n\nRichtet das Bild entlang einer Leitlinie aus.
|
||||||
@ -2301,4 +2302,4 @@ ZOOMPANEL_ZOOMOUT;Herauszoomen\nTaste: <b>-</b>
|
|||||||
! Untranslated keys follow; remove the ! prefix after an entry is translated.
|
! Untranslated keys follow; remove the ! prefix after an entry is translated.
|
||||||
!!!!!!!!!!!!!!!!!!!!!!!!!
|
!!!!!!!!!!!!!!!!!!!!!!!!!
|
||||||
|
|
||||||
!MAIN_TOOLTIP_PREVIEWSHARPMASK;Preview the <b>Sharpening Contrast Mask</b>.\nShortcut: <b>None</b>\n\nOnly works when sharpening is enabled and zoom >= 100%.
|
MAIN_TOOLTIP_PREVIEWSHARPMASK;Schärfungs-Kontroll-Maske ein-/ausschalten\n\nFunktioniert nur bei aktivierter Schärfung\nund Zoom >= 100%.
|
||||||
|
@ -2,7 +2,7 @@
|
|||||||
This file is part of RawTherapee.
|
This file is part of RawTherapee.
|
||||||
|
|
||||||
Copyright (c) 2016-2017 TooWaBoo
|
Copyright (c) 2016-2017 TooWaBoo
|
||||||
Version 2.62
|
Version 2.66
|
||||||
|
|
||||||
RawTherapee is free software: you can redistribute it and/or modify
|
RawTherapee is free software: you can redistribute it and/or modify
|
||||||
it under the terms of the GNU General Public License as published by
|
it under the terms of the GNU General Public License as published by
|
||||||
@ -164,7 +164,7 @@ filechooser frame {
|
|||||||
}
|
}
|
||||||
|
|
||||||
#PlacesPaned frame {
|
#PlacesPaned frame {
|
||||||
margin: -8px 0 0;
|
margin: -5px 0 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
frame > border {
|
frame > border {
|
||||||
@ -215,7 +215,7 @@ dialog frame > label {
|
|||||||
|
|
||||||
frame > label {
|
frame > label {
|
||||||
margin: 0;
|
margin: 0;
|
||||||
padding: 0.5em 0;
|
padding: 0.41667em 0 0.33334em 0.08334em;
|
||||||
color: @headline-frame;
|
color: @headline-frame;
|
||||||
}
|
}
|
||||||
frame > checkbutton label{
|
frame > checkbutton label{
|
||||||
@ -245,19 +245,22 @@ textview:selected, treeview:selected {
|
|||||||
}
|
}
|
||||||
|
|
||||||
#PlacesPaned > box:nth-child(1) treeview {
|
#PlacesPaned > box:nth-child(1) treeview {
|
||||||
padding: 0.08334em 0 0.08334em 0.5em;
|
padding: 0.08334em 0 0.08334em 0.416667em;
|
||||||
-gtk-icon-style: symbolic;
|
-gtk-icon-style: symbolic;
|
||||||
}
|
}
|
||||||
|
|
||||||
#HistoryPanel {
|
#HistoryPanel {
|
||||||
margin-top: 0.5em;
|
margin-top: 0.25em;
|
||||||
|
}
|
||||||
|
#RightNotebook #HistoryPanel {
|
||||||
|
margin-top: 0.33334em;
|
||||||
}
|
}
|
||||||
#HistoryPanel > border {
|
#HistoryPanel > border {
|
||||||
margin-top: 1.75em;
|
margin-top: 1.75em;
|
||||||
}
|
}
|
||||||
#HistoryPanel > label {
|
#HistoryPanel > label {
|
||||||
margin: 0 0 -1.33334em 0;
|
margin: 0 0 -1.5em 0;
|
||||||
padding: 0;
|
padding: 0 0 0 0.08334em;
|
||||||
}
|
}
|
||||||
|
|
||||||
#Snapshots > border {
|
#Snapshots > border {
|
||||||
@ -284,24 +287,24 @@ textview:selected, treeview:selected {
|
|||||||
|
|
||||||
/*Corrects the space of the snapshot view to the paned separator*/
|
/*Corrects the space of the snapshot view to the paned separator*/
|
||||||
#Snapshots {
|
#Snapshots {
|
||||||
margin-top: -0.33334em;
|
margin-top: 0.16667em;
|
||||||
}
|
}
|
||||||
/**/
|
/**/
|
||||||
|
|
||||||
/*** end ***************************************************************************************/
|
/*** end ***************************************************************************************/
|
||||||
|
|
||||||
/*** Navigator *********************************************************************************/
|
/*** Navigator *********************************************************************************/
|
||||||
#Navigator .drawingarea {
|
|
||||||
border-top: 0.41667em solid @bg-dark-grey;
|
|
||||||
border-bottom: 0.25em solid @bg-dark-grey;
|
|
||||||
}
|
|
||||||
#Navigator {
|
#Navigator {
|
||||||
background-color: @bg-dark-grey;
|
padding-top: 0.75em;
|
||||||
padding-bottom: 0.25em;
|
padding-bottom: 0.25em;
|
||||||
|
background-color: @bg-dark-grey;
|
||||||
}
|
}
|
||||||
#Navigator box label {
|
#Navigator box label {
|
||||||
padding: 0.16667em 0;
|
padding: 0.16667em 0;
|
||||||
}
|
}
|
||||||
|
#Navigator > label:nth-child(2) {
|
||||||
|
margin-top: 0.5em;
|
||||||
|
}
|
||||||
|
|
||||||
/*** end ***************************************************************************************/
|
/*** end ***************************************************************************************/
|
||||||
|
|
||||||
@ -356,9 +359,34 @@ filechooser list row:selected {
|
|||||||
|
|
||||||
/*** Histogram *********************************************************************************/
|
/*** Histogram *********************************************************************************/
|
||||||
#HistogramPanel {
|
#HistogramPanel {
|
||||||
|
min-height: 0;
|
||||||
margin: -2px 0;
|
margin: -2px 0;
|
||||||
border: none;
|
border: none;
|
||||||
|
background-color: transparent;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#HistogramPanel > :nth-child(2) {
|
||||||
|
border: none;
|
||||||
|
border-left: 0.08334em solid @bg-light-grey;
|
||||||
|
background-color: @bg-dark-grey;
|
||||||
|
}
|
||||||
|
|
||||||
|
#HistogramPanel > :nth-child(1) {
|
||||||
|
border: none;
|
||||||
|
background-color: transparent;
|
||||||
|
}
|
||||||
|
|
||||||
|
#EditorLeftPaned #HistogramPanel > :nth-child(1) {
|
||||||
|
border: none;
|
||||||
|
border-right: 0.08334em solid @bg-light-grey;
|
||||||
|
background-color: @bg-dark-grey;
|
||||||
|
}
|
||||||
|
|
||||||
|
#EditorLeftPaned #HistogramPanel > :nth-child(2) {
|
||||||
|
border: none;
|
||||||
|
background-color: transparent;
|
||||||
|
}
|
||||||
|
|
||||||
#HistogramArea,
|
#HistogramArea,
|
||||||
#HistogramRGBArea {
|
#HistogramRGBArea {
|
||||||
border: 0.08334em solid @bg-dark-grey;
|
border: 0.08334em solid @bg-dark-grey;
|
||||||
@ -367,25 +395,24 @@ filechooser list row:selected {
|
|||||||
|
|
||||||
#fullButton,
|
#fullButton,
|
||||||
#histButton {
|
#histButton {
|
||||||
padding: 0.47em 0.41667em;
|
padding: 0;
|
||||||
margin: 0;
|
margin: 0;
|
||||||
border-color: @bg-light-grey;
|
border:none;
|
||||||
border-style: solid;
|
|
||||||
border-width: 0 0 0 0.08334em;
|
|
||||||
background-color: @bg-dark-grey;
|
background-color: @bg-dark-grey;
|
||||||
background-image: none;
|
background-image: none;
|
||||||
box-shadow: none;
|
box-shadow: none;
|
||||||
min-height: 0;
|
min-height: 1.58334em;
|
||||||
min-width: 0;
|
min-width: 1.5em;
|
||||||
border-radius: 0;
|
border-radius: 0;
|
||||||
}
|
}
|
||||||
#fullButton {
|
|
||||||
padding: 0.47em 0.41667em 0.58334em;
|
#histButton:first-child {
|
||||||
|
margin-top: 1px;
|
||||||
}
|
}
|
||||||
#EditorLeftPaned #fullButton,
|
#histButton:last-child {
|
||||||
#EditorLeftPaned #histButton {
|
margin-bottom: 1px;
|
||||||
border-width: 0 0.08334em 0 0;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/*** end ***************************************************************************************/
|
/*** end ***************************************************************************************/
|
||||||
|
|
||||||
/*** Separator *********************************************************************************/
|
/*** Separator *********************************************************************************/
|
||||||
@ -413,6 +440,7 @@ popover separator:not(:only-child) {
|
|||||||
|
|
||||||
paned.horizontal > separator {
|
paned.horizontal > separator {
|
||||||
background-color: transparent;
|
background-color: transparent;
|
||||||
|
background-image: none;
|
||||||
min-width: 0.41667em;
|
min-width: 0.41667em;
|
||||||
border-left: 0.25em solid @bg-light-grey;
|
border-left: 0.25em solid @bg-light-grey;
|
||||||
border-right: 0.25em solid @bg-light-grey;
|
border-right: 0.25em solid @bg-light-grey;
|
||||||
@ -426,9 +454,16 @@ paned.vertical > separator {
|
|||||||
min-height: 0.5em;
|
min-height: 0.5em;
|
||||||
border-top: 1px solid @bg-light-grey;
|
border-top: 1px solid @bg-light-grey;
|
||||||
border-bottom: 1px solid @bg-light-grey;
|
border-bottom: 1px solid @bg-light-grey;
|
||||||
margin: 0.25em 0 0;
|
margin: 0.25em 0 -0.5em;
|
||||||
padding: 0.2em 0 0;
|
padding: 0.2em 0 0;
|
||||||
}
|
}
|
||||||
|
/*Filmstrip*/
|
||||||
|
#EditorRightPaned > paned.horizontal > paned.vertical > separator {
|
||||||
|
margin-bottom: 0;
|
||||||
|
}
|
||||||
|
#EditorRightPaned > paned.horizontal:nth-child(1) > paned.vertical:nth-child(1) > separator {
|
||||||
|
margin-bottom: -0.5em;
|
||||||
|
}
|
||||||
|
|
||||||
dialog paned.horizontal > separator {
|
dialog paned.horizontal > separator {
|
||||||
background-color: @bg-grey;
|
background-color: @bg-grey;
|
||||||
@ -451,8 +486,8 @@ menu separator {
|
|||||||
#IopsPanel separator,
|
#IopsPanel separator,
|
||||||
#FileBrowser separator {
|
#FileBrowser separator {
|
||||||
background-color: shade(@bg-light-grey,.75);
|
background-color: shade(@bg-light-grey,.75);
|
||||||
margin-top: 0.33334em;
|
margin-top: 0.16667em;
|
||||||
margin-bottom: 0.33334em;
|
margin-bottom: 0.16667em;
|
||||||
}
|
}
|
||||||
|
|
||||||
#MyExpander separator {
|
#MyExpander separator {
|
||||||
@ -1388,6 +1423,9 @@ button.MiddleH {
|
|||||||
margin-bottom: -2px;
|
margin-bottom: -2px;
|
||||||
padding-bottom: 0.41667em;
|
padding-bottom: 0.41667em;
|
||||||
}
|
}
|
||||||
|
#ProfilePanel > label {
|
||||||
|
margin-bottom: 0.08334em;
|
||||||
|
}
|
||||||
#ProfilePanel combobox {
|
#ProfilePanel combobox {
|
||||||
margin-left: 0.16667em;
|
margin-left: 0.16667em;
|
||||||
}
|
}
|
||||||
|
Loading…
x
Reference in New Issue
Block a user