Skip to content

Krita
Krita
Commit 8d7b4418 authored by Wolthera van Hövell's avatar Wolthera van Hövell 🛍
Browse files
Options

Merge remote-tracking branch 'origin/master' into krita-testing-wolthera

parents e2ee9ff5 d58645ed
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 8275 additions and 618 deletions
krita/data/aboutdata/credits.txt
View file @ 8d7b4418
......@@ -3,4 +3,6 @@ Ramon Miranda:Artist, Muses author, brush and preset creator
David Revoy:Brushes and Palettes
Ilya Portnov:MyPaint shade selector
Martin Renold:MyPaint shade selector
Saisho Kazuki:Japanese Animation template
Pasquale D'Antuono:Donor
krita/data/templates/CMakeLists.txt
View file @ 8d7b4418
add_subdirectory( animation )
add_subdirectory( comics )
add_subdirectory( design )
add_subdirectory( dslr )
......
krita/data/templates/animation/Anim-Jp-EN.desktop 0 → 100644
View file @ 8d7b4418
[Desktop Entry]
Type=Link
URL=.source/Anim-Jp-EN.kra
Icon=template_animation
Name=Animation-Japanese-En
Name[ca]=Animació-Japonès-EN
Name[es]=Animación-Japonés-En
Name[nl]=Animatie-Japans-En
Name[pl]=Animacja-Japońska-En
Name[pt]=Animação-Japonês-EN
Name[sv]=Animering-japanska-en
Name[uk]=Японська анімація (англійською)
Name[x-test]=xxAnimation-Japanese-Enxx
krita/data/templates/animation/Anim-Jp-JP.desktop 0 → 100644
View file @ 8d7b4418
[Desktop Entry]
Type=Link
URL=.source/Anim-Jp-JP.kra
Icon=template_animation
Name=Animation-Japanese-JP
Name[ca]=Animació-Japonès-JP
Name[es]=Animación-Japonés-JP
Name[nl]=Animatie-Japans-JP
Name[pl]=Animacja-Japońska-JP
Name[pt]=Animação-Japonês-JP
Name[sv]=Animering-japanska-jp
Name[uk]=Японська анімація (японською)
Name[x-test]=xxAnimation-Japanese-JPxx
krita/data/templates/animation/CMakeLists.txt 0 → 100644
View file @ 8d7b4418
install( FILES
template_animation.png
DESTINATION
${DATA_INSTALL_DIR}/krita/pics
)
install( FILES
Anim-Jp-EN.kra
Anim-Jp-JP.kra
DESTINATION ${DATA_INSTALL_DIR}/krita/templates/animation/.source)
install( FILES
Anim-Jp-EN.desktop
Anim-Jp-JP.desktop
DESTINATION ${DATA_INSTALL_DIR}/krita/templates/animation)
krita/data/templates/animation/template_animation.svg 0 → 100644
View file @ 8d7b4418
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<svg
xmlns:dc="http://purl.org/dc/elements/1.1/"
xmlns:cc="http://creativecommons.org/ns#"
xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
xmlns:svg="http://www.w3.org/2000/svg"
xmlns="http://www.w3.org/2000/svg"
xmlns:xlink="http://www.w3.org/1999/xlink"
xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
viewBox="0 0 64 64"
id="svg2"
version="1.1"
inkscape:version="0.91 r13725"
sodipodi:docname="template_animation.svg"
width="64"
height="64"
inkscape:export-filename="template_animation.png"
inkscape:export-xdpi="180"
inkscape:export-ydpi="180">
<metadata
id="metadata84">
<rdf:RDF>
<cc:Work
rdf:about="">
<dc:format>image/svg+xml</dc:format>
<dc:type
rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
<dc:title />
</cc:Work>
</rdf:RDF>
</metadata>
<sodipodi:namedview
pagecolor="#ffffff"
bordercolor="#666666"
borderopacity="1"
objecttolerance="10"
gridtolerance="10"
guidetolerance="10"
inkscape:pageopacity="0"
inkscape:pageshadow="2"
inkscape:window-width="1880"
inkscape:window-height="1051"
id="namedview82"
showgrid="true"
inkscape:showpageshadow="false"
inkscape:zoom="12.06501"
inkscape:cx="4.2056391"
inkscape:cy="26.118814"
inkscape:window-x="0"
inkscape:window-y="0"
inkscape:window-maximized="1"
inkscape:current-layer="svg2"
showguides="true">
<inkscape:grid
type="xygrid"
id="grid3413" />
<sodipodi:guide
position="0,64"
orientation="64,0"
id="guide3482" />
<sodipodi:guide
position="0,0"
orientation="0,64"
id="guide3484" />
<sodipodi:guide
position="64,0"
orientation="-64,0"
id="guide3486" />
<sodipodi:guide
position="64,64"
orientation="0,-64"
id="guide3488" />
<sodipodi:guide
position="10,61"
orientation="58,0"
id="guide3492" />
<sodipodi:guide
position="10,3"
orientation="0,44"
id="guide3494" />
<sodipodi:guide
position="54,3"
orientation="-58,0"
id="guide3496" />
<sodipodi:guide
position="54,61"
orientation="0,-44"
id="guide3498" />
<sodipodi:guide
position="54,47"
orientation="-14,0"
id="guide4310" />
<sodipodi:guide
position="54,61"
orientation="0,-14"
id="guide4312" />
<sodipodi:guide
position="21,43"
orientation="22,0"
id="guide4250" />
<sodipodi:guide
position="21,21"
orientation="0,22"
id="guide4252" />
<sodipodi:guide
position="43,21"
orientation="-22,0"
id="guide4254" />
<sodipodi:guide
position="43,43"
orientation="0,-22"
id="guide4256" />
</sodipodi:namedview>
<defs
id="defs4">
<linearGradient
inkscape:collect="always"
id="linearGradient4290">
<stop
style="stop-color:#ffffff;stop-opacity:0.94901961"
offset="0"
id="stop4292" />
<stop
style="stop-color:#ffffff;stop-opacity:0.65581393"
offset="1"
id="stop4294" />
</linearGradient>
<linearGradient
inkscape:collect="always"
xlink:href="#linearGradient4290"
id="linearGradient4296"
x1="28"
y1="53"
x2="28"
y2="10"
gradientUnits="userSpaceOnUse" />
</defs>
<path
style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#4d4d4d;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
d="M 2 10 L 2 54 L 62 54 L 62 10 L 2 10 z M 32 14 A 1 1 0 0 1 33 15 A 1 1 0 0 1 32 16 A 1 1 0 0 1 31 15 A 1 1 0 0 1 32 14 z M 11 15 L 15 15 L 15 16 L 11 16 L 11 15 z M 49 15 L 53 15 L 53 16 L 49 16 L 49 15 z "
id="rect4178" />
<path
style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:url(#linearGradient4296);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
d="M 3 11 L 3 53 L 61 53 L 61 11 L 3 11 z M 32 14 A 1 1 0 0 1 33 15 A 1 1 0 0 1 32 16 A 1 1 0 0 1 31 15 A 1 1 0 0 1 32 14 z M 11 15 L 15 15 L 15 16 L 11 16 L 11 15 z M 49 15 L 53 15 L 53 16 L 49 16 L 49 15 z "
id="rect4165" />
<path
style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#4d4d4d;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
d="M 30 13 L 30 17 L 34 17 L 34 13 L 30 13 z M 32 14 A 1 1 0 0 1 33 15 A 1 1 0 0 1 32 16 A 1 1 0 0 1 31 15 A 1 1 0 0 1 32 14 z "
id="rect4180" />
<path
style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#4d4d4d;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
d="M 10 14 L 10 17 L 16 17 L 16 14 L 10 14 z M 11 15 L 15 15 L 15 16 L 11 16 L 11 15 z "
id="rect4184" />
<path
style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#4d4d4d;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
d="M 48 14 L 48 17 L 54 17 L 54 14 L 48 14 z M 49 15 L 53 15 L 53 16 L 49 16 L 49 15 z "
id="rect4184-3" />
<path
style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:0.491;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#4d4d4d;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
d="M 7 21 L 7 49 L 57 49 L 57 21 L 7 21 z M 8 22 L 56 22 L 56 48 L 8 48 L 8 22 z "
id="rect4206" />
<path
style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:0.25;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#4d4d4d;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
d="M 10 24 L 10 46 L 54 46 L 54 24 L 10 24 z M 11 25 L 53 25 L 53 45 L 11 45 L 11 25 z "
id="rect4211" />
</svg>
krita/data/themes/BreezeDark.colors 0 → 100644
View file @ 8d7b4418
[ColorEffects:Disabled]
Color=56,56,56
ColorAmount=0
ColorEffect=0
ContrastAmount=0.65
ContrastEffect=1
IntensityAmount=0.1
IntensityEffect=2
[ColorEffects:Inactive]
ChangeSelectionColor=true
Color=112,111,110
ColorAmount=0.025
ColorEffect=2
ContrastAmount=0.1
ContrastEffect=2
Enable=false
IntensityAmount=0
IntensityEffect=0
[Colors:Button]
BackgroundAlternate=77,77,77
BackgroundNormal=49,54,59
DecorationFocus=61,174,233
DecorationHover=61,174,233
ForegroundActive=61,174,233
ForegroundInactive=189,195,199
ForegroundLink=41,128,185
ForegroundNegative=218,68,83
ForegroundNeutral=246,116,0
ForegroundNormal=239,240,241
ForegroundPositive=39,174,96
ForegroundVisited=127,140,141
[Colors:Selection]
BackgroundAlternate=29,153,243
BackgroundNormal=61,174,233
DecorationFocus=61,174,233
DecorationHover=61,174,233
ForegroundActive=252,252,252
ForegroundInactive=239,240,241
ForegroundLink=253,188,75
ForegroundNegative=218,68,83
ForegroundNeutral=246,116,0
ForegroundNormal=239,240,241
ForegroundPositive=39,174,96
ForegroundVisited=189,195,199
[Colors:Tooltip]
BackgroundAlternate=77,77,77
BackgroundNormal=49,54,59
DecorationFocus=61,174,233
DecorationHover=61,174,233
ForegroundActive=61,174,233
ForegroundInactive=189,195,199
ForegroundLink=41,128,185
ForegroundNegative=218,68,83
ForegroundNeutral=246,116,0
ForegroundNormal=239,240,241
ForegroundPositive=39,174,96
ForegroundVisited=127,140,141
[Colors:View]
BackgroundAlternate=49,54,59
BackgroundNormal=35,38,41
DecorationFocus=61,174,233
DecorationHover=61,174,233
ForegroundActive=61,174,233
ForegroundInactive=189,195,199
ForegroundLink=41,128,185
ForegroundNegative=218,68,83
ForegroundNeutral=246,116,0
ForegroundNormal=239,240,241
ForegroundPositive=39,174,96
ForegroundVisited=127,140,141
[Colors:Window]
BackgroundAlternate=77,77,77
BackgroundNormal=49,54,59
DecorationFocus=61,174,233
DecorationHover=61,174,233
ForegroundActive=61,174,233
ForegroundInactive=189,195,199
ForegroundLink=41,128,185
ForegroundNegative=218,68,83
ForegroundNeutral=246,116,0
ForegroundNormal=239,240,241
ForegroundPositive=39,174,96
ForegroundVisited=127,140,141
[Colors:Complementary]
BackgroundAlternate=59,64,69
BackgroundNormal=49,54,59
DecorationFocus=30,146,255
DecorationHover=61,174,230
ForegroundActive=246,116,0
ForegroundInactive=175,176,179
ForegroundLink=61,174,230
ForegroundNegative=237,21,21
ForegroundNeutral=201,206,59
ForegroundNormal=239,240,241
ForegroundPositive=17,209,22
ForegroundVisited=61,174,230
[General]
ColorScheme=Breeze Dark
Name=Breeze Dark
shadeSortColumn=true
[KDE]
contrast=4
[WM]
activeBackground=49,54,59
activeBlend=255,255,255
activeForeground=239,240,241
inactiveBackground=49,54,59
inactiveBlend=75,71,67
inactiveForeground=127,140,141
krita/data/themes/BreezeHighContrast.colors 0 → 100644
View file @ 8d7b4418
[ColorEffects:Disabled]
Color=56,56,56
ColorAmount=0
ColorEffect=0
ContrastAmount=0.65
ContrastEffect=1
IntensityAmount=0.1
IntensityEffect=2
[ColorEffects:Inactive]
ChangeSelectionColor=true
Color=112,111,110
ColorAmount=0.025
ColorEffect=2
ContrastAmount=0.1
ContrastEffect=2
Enable=false
IntensityAmount=0
IntensityEffect=0
[Colors:Button]
BackgroundAlternate=189,195,199
BackgroundNormal=77,77,77
DecorationFocus=29,153,243
DecorationHover=77,77,77
ForegroundActive=61,174,233
ForegroundInactive=127,140,141
ForegroundLink=41,128,185
ForegroundNegative=218,68,83
ForegroundNeutral=246,116,0
ForegroundNormal=252,252,252
ForegroundPositive=39,174,96
ForegroundVisited=127,140,141
[Colors:Selection]
BackgroundAlternate=29,153,243
BackgroundNormal=52,73,94
DecorationFocus=29,153,243
DecorationHover=77,77,77
ForegroundActive=252,252,252
ForegroundInactive=252,252,252
ForegroundLink=253,188,75
ForegroundNegative=218,68,83
ForegroundNeutral=246,116,0
ForegroundNormal=239,240,241
ForegroundPositive=39,174,96
ForegroundVisited=189,195,199
[Colors:Tooltip]
BackgroundAlternate=77,77,77
BackgroundNormal=29,153,243
DecorationFocus=29,153,243
DecorationHover=77,77,77
ForegroundActive=61,174,233
ForegroundInactive=127,140,141
ForegroundLink=41,128,185
ForegroundNegative=218,68,83
ForegroundNeutral=246,116,0
ForegroundNormal=252,252,252
ForegroundPositive=39,174,96
ForegroundVisited=127,140,141
[Colors:View]
BackgroundAlternate=41,44,48
BackgroundNormal=35,38,41
DecorationFocus=29,153,243
DecorationHover=77,77,77
ForegroundActive=61,174,233
ForegroundInactive=127,140,141
ForegroundLink=41,128,185
ForegroundNegative=218,68,83
ForegroundNeutral=246,116,0
ForegroundNormal=252,252,252
ForegroundPositive=39,174,96
ForegroundVisited=127,140,141
[Colors:Window]
BackgroundAlternate=189,195,199
BackgroundNormal=49,54,59
DecorationFocus=29,153,243
DecorationHover=77,77,77
ForegroundActive=61,174,233
ForegroundInactive=127,140,141
ForegroundLink=41,128,185
ForegroundNegative=218,68,83
ForegroundNeutral=246,116,0
ForegroundNormal=252,252,252
ForegroundPositive=39,174,96
ForegroundVisited=127,140,141
[Colors:Complementary]
BackgroundAlternate=41,44,48
BackgroundNormal=35,38,41
DecorationFocus=29,153,243
DecorationHover=77,77,77
ForegroundActive=61,174,233
ForegroundInactive=127,140,141
ForegroundLink=41,128,185
ForegroundNegative=218,68,83
ForegroundNeutral=246,116,0
ForegroundNormal=252,252,252
ForegroundPositive=39,174,96
ForegroundVisited=127,140,141
[General]
ColorScheme=Breeze High Conttrast
Name=Breeze High Contrast
shadeSortColumn=true
[KDE]
contrast=9
[WM]
activeBackground=29,153,243
activeBlend=29,153,243
activeForeground=252,252,252
inactiveBackground=49,54,59
inactiveBlend=26,188,156
inactiveForeground=252,252,252
krita/data/themes/BreezeLight.colors 0 → 100644
View file @ 8d7b4418
[ColorEffects:Disabled]
Color=56,56,56
ColorAmount=0
ColorEffect=0
ContrastAmount=0.65
ContrastEffect=1
IntensityAmount=0.1
IntensityEffect=2
[ColorEffects:Inactive]
ChangeSelectionColor=true
Color=112,111,110
ColorAmount=0.025
ColorEffect=2
ContrastAmount=0.1
ContrastEffect=2
Enable=false
IntensityAmount=0
IntensityEffect=0
[Colors:Button]
BackgroundAlternate=224,223,222
BackgroundNormal=239,240,241
DecorationFocus=61,174,233
DecorationHover=142,203,233
ForegroundActive=255,128,224
ForegroundInactive=136,135,134
ForegroundLink=0,87,174
ForegroundNegative=191,3,3
ForegroundNeutral=176,128,0
ForegroundNormal=49,54,59
ForegroundPositive=0,110,40
ForegroundVisited=69,40,134
[Colors:Selection]
BackgroundAlternate=62,138,204
BackgroundNormal=61,174,233
DecorationFocus=61,174,233
DecorationHover=142,203,233
ForegroundActive=255,128,224
ForegroundInactive=142,203,233
ForegroundLink=0,49,110
ForegroundNegative=156,14,14
ForegroundNeutral=255,221,0
ForegroundNormal=252,252,252
ForegroundPositive=128,255,128
ForegroundVisited=69,40,134
[Colors:Tooltip]
BackgroundAlternate=196,224,255
BackgroundNormal=252,252,252
DecorationFocus=61,174,233
DecorationHover=142,203,233
ForegroundActive=255,128,224
ForegroundInactive=96,112,128
ForegroundLink=0,87,174
ForegroundNegative=191,3,3
ForegroundNeutral=176,128,0
ForegroundNormal=49,54,59
ForegroundPositive=0,110,40
ForegroundVisited=69,40,134
[Colors:View]
BackgroundAlternate=248,247,246
BackgroundNormal=252,252,252
DecorationFocus=61,174,233
DecorationHover=142,203,233
ForegroundActive=255,128,224
ForegroundInactive=136,135,134
ForegroundLink=0,87,174
ForegroundNegative=191,3,3
ForegroundNeutral=176,128,0
ForegroundNormal=49,54,59
ForegroundPositive=0,110,40
ForegroundVisited=69,40,134
[Colors:Window]
BackgroundAlternate=218,217,216
BackgroundNormal=239,240,241
DecorationFocus=61,174,233
DecorationHover=142,203,233
ForegroundActive=255,128,224
ForegroundInactive=136,135,134
ForegroundLink=0,87,174
ForegroundNegative=191,3,3
ForegroundNeutral=176,128,0
ForegroundNormal=49,54,59
ForegroundPositive=0,110,40
ForegroundVisited=69,40,134
[Colors:Complementary]
BackgroundAlternate=59,64,69
BackgroundNormal=49,54,59
DecorationFocus=30,146,255
DecorationHover=61,174,230
ForegroundActive=246,116,0
ForegroundInactive=175,176,179
ForegroundLink=61,174,230
ForegroundNegative=237,21,21
ForegroundNeutral=201,206,59
ForegroundNormal=239,240,241
ForegroundPositive=17,209,22
ForegroundVisited=61,174,230
[General]
ColorScheme=Breeze Light
Name=Breeze Light
shadeSortColumn=true
[KDE]
contrast=4
[WM]
activeBackground=239,240,241
activeBlend=255,255,255
activeForeground=49,54,59
inactiveBackground=239,240,241
inactiveBlend=75,71,67
inactiveForeground=137,142,146
krita/data/themes/CMakeLists.txt
View file @ 8d7b4418
########### install files ###############
install(FILES
BreezeDark.colors
BreezeHighContrast.colors
BreezeLight.colors
KritaNeutral.colors
KritaBlender.colors
KritaBright.colors
......
krita/pics/Breeze-dark/breeze-dark-icons.qrc
View file @ 8d7b4418
......@@ -27,7 +27,7 @@
<file>dark_document-open-recent.svg</file>
<file>dark_document-open.svg</file>
<file>dark_document-print-preview.svg</file>
<file>dark_document-print.svg</file>
<file>dark_document-properties.svg</file>
<file>dark_document-save-as.svg</file>
<file>dark_document-save.svg</file>
<file>dark_download.svg</file>
......
krita/pics/Breeze-dark/dark_document-properties.svg 0 → 120000
View file @ 8d7b4418
dark_configure.svg
\ No newline at end of file
krita/pics/Breeze-light/breeze-light-icons.qrc
View file @ 8d7b4418
......@@ -28,6 +28,7 @@
<file>light_document-open.svg</file>
<file>light_document-print-preview.svg</file>
<file>light_document-print.svg</file>
<file>light_document-properties.svg</file>
<file>light_document-save-as.svg</file>
<file>light_document-save.svg</file>
<file>light_download.svg</file>
......
krita/pics/Breeze-light/light_document-properties.svg 0 → 120000
View file @ 8d7b4418
light_configure.svg
\ No newline at end of file
krita/pics/mimetypes/sources/application-x-krita-16.svg 0 → 100644
View file @ 8d7b4418
This diff is collapsed.
krita/pics/mimetypes/sources/application-x-krita-22.svg 0 → 100644
View file @ 8d7b4418
This diff is collapsed.
krita/pics/mimetypes/sources/application-x-krita.svg 0 → 100644
View file @ 8d7b4418
This diff is collapsed.
libs/flake/KoTosContainer.cpp
View file @ 8d7b4418
......@@ -225,7 +225,7 @@ void KoTosContainer::setTextAlignment(Qt::Alignment alignment)
bf.setAlignment(alignment & Qt::AlignHorizontal_Mask);
QTextCursor cursor(shapeData->document());
cursor.setPosition(QTextCursor::End, QTextCursor::KeepAnchor);
cursor.movePosition(QTextCursor::End, QTextCursor::KeepAnchor);
cursor.mergeBlockFormat(bf);
d->alignment = alignment;
......
libs/image/brushengine/kis_paintop.cc
View file @ 8d7b4418
......@@ -51,8 +51,6 @@
struct Q_DECL_HIDDEN KisPaintOp::Private {
Private(KisPaintOp *_q)
: q(_q), dab(0),
currentScale(1.0),
currentRotation(0),
fanCornersEnabled(false),
fanCornersStep(1.0) {}
......@@ -60,8 +58,6 @@ struct Q_DECL_HIDDEN KisPaintOp::Private {
KisFixedPaintDeviceSP dab;
KisPainter* painter;
qreal currentScale;
qreal currentRotation;
bool fanCornersEnabled;
qreal fanCornersStep;
......@@ -173,24 +169,3 @@ KisPaintDeviceSP KisPaintOp::source() const
{
return d->painter->device();
}
qreal KisPaintOp::currentRotation() const
{
return d->currentRotation;
}
qreal KisPaintOp::currentScale() const
{
return d->currentScale;
}
void KisPaintOp::setCurrentRotation(qreal rotation)
{
d->currentRotation = rotation;
}
void KisPaintOp::setCurrentScale(qreal scale)
{
d->currentScale = scale;