Preparing to merge back to dev

This commit is contained in:
Morgan Hardwood
2022-11-27 20:29:39 +01:00
parent 9b85839884
commit ea7c811b9b
3 changed files with 379 additions and 700 deletions

File diff suppressed because it is too large Load Diff

Before

Width:  |  Height:  |  Size: 58 KiB

After

Width:  |  Height:  |  Size: 65 KiB

View File

@@ -882,9 +882,9 @@
borderopacity="1.0"
inkscape:pageopacity="0.0"
inkscape:pageshadow="2"
inkscape:zoom="2.6078167"
inkscape:cx="546.43411"
inkscape:cy="219.91576"
inkscape:zoom="2.6083441"
inkscape:cx="546.32363"
inkscape:cy="219.8713"
inkscape:document-units="px"
inkscape:current-layer="layer1"
showgrid="false"
@@ -922,7 +922,22 @@
fit-margin-bottom="0"
width="157.40977mm"
inkscape:showpageshadow="2"
inkscape:deskcolor="#d1d1d1" />
inkscape:deskcolor="#d1d1d1">
<sodipodi:guide
position="13.081061,8.9833331"
orientation="0,1"
id="guide6595"
inkscape:locked="false"
inkscape:label=""
inkscape:color="rgb(0,134,229)" />
<sodipodi:guide
position="153.15072,8.9833384"
orientation="-1,0"
id="guide15125"
inkscape:locked="false"
inkscape:label=""
inkscape:color="rgb(0,134,229)" />
</sodipodi:namedview>
<metadata
id="metadata780">
<rdf:RDF>
@@ -1157,162 +1172,162 @@
xml:space="preserve"
style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:4.23333px;line-height:1.25;font-family:'Eras BQ';-inkscape-font-specification:'Eras BQ';letter-spacing:0px;word-spacing:-0.132292px;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:0.0495763px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;filter:url(#filter4749);enable-background:new"
x="5.3633847"
y="277.27142"
y="277.12344"
id="text45159"><tspan
sodipodi:role="line"
id="tspan45157"
style="font-style:normal;font-variant:normal;font-weight:500;font-stretch:normal;font-size:4.23333px;font-family:'ITC Eras Std';-inkscape-font-specification:'ITC Eras Std Medium';fill:#ffffff;fill-opacity:1;stroke-width:0.0495763px"
x="5.3633847"
y="277.27142">GNU GPLv3</tspan></text>
y="277.12344">GNU GPLv3</tspan></text>
<text
xml:space="preserve"
transform="matrix(0.26458333,0,0,0.26458333,-4.6433668,186.15341)"
id="text181036"
style="font-size:21.3333px;line-height:1.25;font-family:'Eras BQ';-inkscape-font-specification:'Eras BQ';white-space:pre;shape-inside:url(#rect181038)" />
style="font-size:21.3333px;line-height:1.25;font-family:'Eras BQ';-inkscape-font-specification:'Eras BQ';white-space:pre;shape-inside:url(#rect181038);display:inline" />
<text
xml:space="preserve"
transform="matrix(0.26458333,0,0,0.26458333,280.11612,189.68435)"
id="text183258"
style="font-size:16px;line-height:1.25;font-family:'Eras BQ';-inkscape-font-specification:'Eras BQ';white-space:pre;shape-inside:url(#rect183260)"><tspan
style="font-size:16px;line-height:1.25;font-family:'Eras BQ';-inkscape-font-specification:'Eras BQ';white-space:pre;shape-inside:url(#rect183260);display:inline"><tspan
x="-430.18945"
y="2.7826123"
id="tspan708"><tspan
id="tspan17773"><tspan
style="font-weight:bold;font-family:sans-serif;-inkscape-font-specification:sans-serif"
id="tspan704">Prerequisites</tspan><tspan
id="tspan17769">Prerequisites</tspan><tspan
style="font-family:sans-serif;-inkscape-font-specification:sans-serif"
id="tspan706">
id="tspan17771">
</tspan></tspan><tspan
x="-430.18945"
y="22.782612"
id="tspan712"><tspan
id="tspan17777"><tspan
style="font-family:sans-serif;-inkscape-font-specification:sans-serif"
id="tspan710">Obtain and install the font family ITC Eras Std.
id="tspan17775">Obtain and install the font family ITC Eras Std.
</tspan></tspan><tspan
x="-430.18945"
y="42.782612"
id="tspan716"><tspan
id="tspan17781"><tspan
style="font-family:sans-serif;-inkscape-font-specification:sans-serif"
id="tspan714">
id="tspan17779">
</tspan></tspan><tspan
x="-430.18945"
y="62.782612"
id="tspan722"><tspan
id="tspan17787"><tspan
style="font-weight:bold"
id="tspan718">Details</tspan><tspan
id="tspan17783">Details</tspan><tspan
style="font-family:sans-serif;-inkscape-font-specification:sans-serif"
id="tspan720">
id="tspan17785">
</tspan></tspan><tspan
x="-430.18945"
y="82.782612"
id="tspan726"><tspan
id="tspan17791"><tspan
style="font-family:sans-serif;-inkscape-font-specification:sans-serif"
id="tspan724">The color wheel is copied from rt-logo.svg and a glow filter is added
id="tspan17789">The color wheel is copied from rt-logo.svg and a glow filter is added
</tspan></tspan><tspan
x="-430.18945"
y="102.78261"
id="tspan730"><tspan
id="tspan17795"><tspan
style="font-family:sans-serif;-inkscape-font-specification:sans-serif"
id="tspan728">to each segment and the wheel as a whole.
id="tspan17793">to each segment and the wheel as a whole.
</tspan></tspan><tspan
x="-430.18945"
y="122.78261"
id="tspan734"><tspan
id="tspan17799"><tspan
style="font-family:sans-serif;-inkscape-font-specification:sans-serif"
id="tspan732">&quot;Raw&quot;: font ITC Eras Ultra-Bold, 60 pt, -3 px letter spacing
id="tspan17797">&quot;Raw&quot;: font ITC Eras Ultra-Bold, 60 pt, -3 px letter spacing
</tspan></tspan><tspan
x="-430.18945"
y="142.78261"
id="tspan738"><tspan
id="tspan17803"><tspan
style="font-family:sans-serif;-inkscape-font-specification:sans-serif"
id="tspan736">&quot;Therapee&quot;: font ITC Eras Medium, 60 pt, +1,5 pt letter spacing
id="tspan17801">&quot;Therapee&quot;: font ITC Eras Medium, 60 pt, +1,5 pt letter spacing
</tspan></tspan><tspan
x="-430.18945"
y="162.78261"
id="tspan742"><tspan
id="tspan17807"><tspan
style="font-family:sans-serif;-inkscape-font-specification:sans-serif"
id="tspan740">Version (big number): ITC Eras Bold, 58 pt, skewed -3°
id="tspan17805">Version (big number): ITC Eras Bold, 58 pt, skewed -3°
</tspan></tspan><tspan
x="-430.18945"
y="182.78261"
id="tspan746"><tspan
id="tspan17811"><tspan
style="font-family:sans-serif;-inkscape-font-specification:sans-serif"
id="tspan744">Version (period + small number): ITC Eras Bold, 34 pt, skewed -3°
id="tspan17809">Version (period + small number): ITC Eras Bold, 34 pt, skewed -3°
</tspan></tspan><tspan
x="-430.18945"
y="202.78261"
id="tspan750"><tspan
id="tspan17815"><tspan
style="font-family:sans-serif;-inkscape-font-specification:sans-serif"
id="tspan748">Release-type: ITC Eras Bold, 16 pt, skewed -3°
id="tspan17813">Release-type: ITC Eras Bold, 16 pt, skewed -3°
</tspan></tspan><tspan
x="-430.18945"
y="222.78261"
id="tspan754"><tspan
id="tspan17819"><tspan
style="font-family:sans-serif;-inkscape-font-specification:sans-serif"
id="tspan752">
id="tspan17817">
</tspan></tspan><tspan
x="-430.18945"
y="242.78261"
id="tspan760"><tspan
id="tspan17825"><tspan
style="font-weight:bold"
id="tspan756">Publishing</tspan><tspan
id="tspan17821">Publishing</tspan><tspan
style="font-family:sans-serif;-inkscape-font-specification:sans-serif"
id="tspan758">
id="tspan17823">
</tspan></tspan><tspan
x="-430.18945"
y="262.78261"
id="tspan766"><tspan
id="tspan17831"><tspan
style="font-family:sans-serif;-inkscape-font-specification:sans-serif"
id="tspan762">1. To prepare a splash screen for deployment, select all text and </tspan><tspan
id="tspan17827">1. To prepare a splash screen for deployment, select all text and </tspan><tspan
style="font-family:sans-serif;-inkscape-font-specification:sans-serif"
id="tspan764">choose </tspan></tspan><tspan
id="tspan17829">choose </tspan></tspan><tspan
x="-430.18945"
y="282.78261"
id="tspan770"><tspan
id="tspan17835"><tspan
style="font-family:sans-serif;-inkscape-font-specification:sans-serif"
id="tspan768">Path &gt; Object to Path.
id="tspan17833">Path &gt; Object to Path.
</tspan></tspan><tspan
x="-430.18945"
y="302.78261"
id="tspan774"><tspan
id="tspan17839"><tspan
style="font-family:sans-serif;-inkscape-font-specification:sans-serif"
id="tspan772">2. Change release type text to whatever is required, or hide the layer </tspan></tspan><tspan
id="tspan17837">2. Change release type text to whatever is required, or hide the layer </tspan></tspan><tspan
x="-430.18945"
y="322.78261"
id="tspan778"><tspan
id="tspan17843"><tspan
style="font-family:sans-serif;-inkscape-font-specification:sans-serif"
id="tspan776">&quot;Release type&quot; entirely.
id="tspan17841">&quot;Release type&quot; entirely.
</tspan></tspan><tspan
x="-430.18945"
y="342.78261"
id="tspan782"><tspan
id="tspan17847"><tspan
style="font-family:sans-serif;-inkscape-font-specification:sans-serif"
id="tspan780">3. Remove this text field.
id="tspan17845">3. Remove this text field.
</tspan></tspan><tspan
x="-430.18945"
y="362.78261"
id="tspan788"><tspan
id="tspan17853"><tspan
style="font-family:sans-serif;-inkscape-font-specification:sans-serif"
id="tspan784">4</tspan><tspan
id="tspan17849">4</tspan><tspan
style="font-family:sans-serif;-inkscape-font-specification:sans-serif"
id="tspan786">. Save as &quot;splash.svg&quot; into &quot;./rtdata/images/svg&quot;.
id="tspan17851">. Save as &quot;splash.svg&quot; into &quot;./rtdata/images/svg&quot;.
</tspan></tspan><tspan
x="-430.18945"
y="382.78261"
id="tspan792"><tspan
id="tspan17857"><tspan
style="font-family:sans-serif;-inkscape-font-specification:sans-serif"
id="tspan790">
id="tspan17855">
</tspan></tspan><tspan
x="-430.18945"
y="402.78261"
id="tspan796"><tspan
id="tspan17861"><tspan
style="font-style:italic"
id="tspan794">RawTherapee splash screen design 1.5 (March 2022)
id="tspan17859">RawTherapee splash screen design 1.5 (March 2022)
</tspan></tspan><tspan
x="-430.18945"
y="422.78261"
id="tspan800"><tspan
id="tspan17865"><tspan
style="font-style:italic"
id="tspan798">www.rawtherapee.com</tspan></tspan></text>
id="tspan17863">www.rawtherapee.com</tspan></tspan></text>
</g>
<g
inkscape:groupmode="layer"
@@ -1325,7 +1340,7 @@
x="99.720383"
y="268.50891"
id="text119139"
transform="matrix(1,0,0.05240778,1,4.4229627,-187.87494)"><tspan
transform="matrix(1,0,0.05240778,1,8.1272209,-177.55141)"><tspan
sodipodi:role="line"
id="tspan119137"
style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:4.93889px;font-family:'ITC Eras Std';-inkscape-font-specification:'ITC Eras Std Bold';fill:#ffffff;fill-opacity:1;stroke-width:0.211231"

Before

Width:  |  Height:  |  Size: 53 KiB

After

Width:  |  Height:  |  Size: 54 KiB