[prev in list] [next in list] [prev in thread] [next in thread]
List: kde-commits
Subject: [gcompris/gsoc-tuxPaint] src/activities/paint: tuxPaint, select brush icon completed
From: Stefan Toncu <stefan.toncu () cti ! pub ! ro>
Date: 2016-08-14 17:00:39
Message-ID: E1bYym7-0007Jt-DZ () code ! kde ! org
[Download RAW message or body]
Git commit 7b57fbec0802202dccfff2f16697ec7365223572 by Stefan Toncu.
Committed on 14/08/2016 at 17:00.
Pushed by stefant into branch 'gsoc-tuxPaint'.
tuxPaint, select brush icon completed
M +255 -327 src/activities/paint/Paint.qml
M +9 -3 src/activities/paint/ToolItem.qml
M +28 -16 src/activities/paint/paint.js
M +6 -43 src/activities/paint/resource/README
M +154 -251 src/activities/paint/resource/back.svg
D +0 -9 src/activities/paint/resource/brush2.svg
D +- -- src/activities/paint/resource/dot.jpg
D +0 -9 src/activities/paint/resource/dot.svg
M +52 -13 src/activities/paint/resource/fill.svg
M +151 -247 src/activities/paint/resource/forward.svg
M +69 -94 src/activities/paint/resource/load.svg
D +0 -9 src/activities/paint/resource/pattern2.svg
D +0 -9 src/activities/paint/resource/pattern3.svg
D +0 -9 src/activities/paint/resource/pencil.svg
M +215 -284 src/activities/paint/resource/save.svg
D +0 -9 src/activities/paint/resource/spray.svg
D +0 -9 src/activities/paint/resource/tools.svg
http://commits.kde.org/gcompris/7b57fbec0802202dccfff2f16697ec7365223572
diff --git a/src/activities/paint/Paint.qml b/src/activities/paint/Paint.qml
index 0df4f2c..6296e32 100644
--- a/src/activities/paint/Paint.qml
+++ b/src/activities/paint/Paint.qml
@@ -36,7 +36,7 @@ ActivityBase {
pageComponent: Rectangle {
id: background
anchors.fill: parent
- color: "lightblue"
+ color: "#add8e6"
signal start
signal stop
@@ -81,9 +81,12 @@ ActivityBase {
stop()
brushSelectCanvas.requestPaint()
-
}
+ }
+ function reloadSelectedPen() {
+ timer.index = 0
+ timer.start()
}
SaveToFilePrompt {
@@ -217,11 +220,10 @@ ActivityBase {
}
function hideExpandedTools () {
- selectSize.z = -1
- selectSize.opacity = 0
-
- selectBrush.z = -1
- selectBrush.opacity = 0
+ if (selectBrush.z > 0)
+ hideAnimation.start()
+ if (selectSize.z > 0)
+ hideSelectSizeAnimation.start()
// hide the inputTextFrame
inputTextFrame.opacity = 0
@@ -234,7 +236,7 @@ ActivityBase {
width: parent.width
height: parent.height
- color: "lightblue"
+ color: background.color
Behavior on x {
@@ -277,7 +279,7 @@ ActivityBase {
font.pointSize: 32
}
- //ok button
+ // ok button
Image {
id: okButton
source:"qrc:/gcompris/src/core/resource/bar_ok.svg"
@@ -358,7 +360,6 @@ ActivityBase {
}
function paintWhite() {
- print("painted canvas in white")
canvas.ctx = getContext("2d")
canvas.ctx.fillStyle = "#ffffff"
canvas.ctx.beginPath()
@@ -373,7 +374,6 @@ ActivityBase {
onImageLoaded: {
// load images from files
if (canvas.url != "") {
- print("url != vid ")
canvas.clearCanvas()
if (items.loadSavedImage) {
@@ -385,8 +385,6 @@ ActivityBase {
// mark the loadSavedImage as finished
items.loadSavedImage = false
requestPaint()
- items.toolSelected = ""
- print("requestPaint onImageLoaded from FILE " + \
items.toolSelected) items.lastUrl = canvas.url
unloadImage(canvas.url)
items.mainAnimationOnX = true
@@ -396,7 +394,6 @@ ActivityBase {
} else if (items.undoRedo) {
ctx.drawImage(items.urlImage,0,0)
requestPaint()
- print("requestPaint onImageLoaded UNDO REDO ")
items.lastUrl = canvas.url
unloadImage(items.urlImage)
items.undoRedo = false
@@ -443,57 +440,7 @@ ActivityBase {
}
onPaint: {
-
- if (items.toolSelected == "pattern") {
- if (items.patternType == "dot")
- Activity.getPattern()
- if (items.patternType == "horizLine")
- Activity.getPattern2()
- if (items.patternType == "vertLine")
- Activity.getPattern3()
- }
-
- // |
- //TODO: remove this \|/
canvas.ctx = getContext('2d')
- canvas.ctx.strokeStyle = items.toolSelected == "eraser" ? \
"#ffffff" :
-// items.toolSelected == "pattern" ? \
ctx.createPattern(Activity.url + items.patternType, 'repeat') :
- items.toolSelected == "pattern" ? \
ctx.createPattern(shape.toDataURL(), 'repeat') :
- items.toolSelected == "brush4" ? \
"black" :
- \
items.paintColor
-
- if (items.toolSelected == "pencil" || items.toolSelected == \
"eraser") {
-
- } else if (items.toolSelected == "rectangle" || \
items.toolSelected == "lineShift") {
-
- } else if (items.toolSelected == "circle") {
-
- } else if (items.toolSelected == "line") {
-
- } else if (items.toolSelected == "fill") {
-
- } else if (items.toolSelected == "text") {
-
- } else if (items.toolSelected == "tools" ) {
-
- } else if (items.toolSelected == "brush" ) {
-
- } else if (items.toolSelected == "pattern" ) {
-
- } else if (items.toolSelected == "spray" ) {
-
- } else if (items.toolSelected == "brush3" ) {
-
- } else if (items.toolSelected == "brush4"){
-
- } else if (items.toolSelected == "brush5"){
-
- } else if (items.toolSelected == "blur"){
- print("blur")
- } else {
- print("tool not known, resetting to Pencil")
- items.toolSelected = "pencil"
- }
}
MouseArea {
@@ -557,11 +504,6 @@ ActivityBase {
} else if (items.toolSelected == "text") {
canvas.lastX = mouseX
canvas.lastY = mouseY
- } else if (items.toolSelected == "tools") {
- Activity.points.push({x: mouseX, y: mouseY})
- } else if (items.toolSelected == "brush") {
- canvas.currentPoint = { x: mouseX, y: mouseY }
- canvas.lastPoint = { x: mouseX, y: mouseY }
} else if (items.toolSelected == "pattern") {
canvas.ctx.strokeStyle = "#ffffff" // very \
important! canvas.lastX = mouseX
@@ -574,15 +516,9 @@ ActivityBase {
canvas.lastX = mouseX
canvas.lastY = mouseY
canvas.ctx.strokeStyle = "#ffefff"
- // enable the hover so the points will be closer one \
to the other
- area.hoverEnabled = true
} else if (items.toolSelected == "pencil"){
canvas.lastX = mouseX
canvas.lastY = mouseY
- // enable the hover so the points will be closer one \
to the other
-// area.hoverEnabled = true
-// canvas.ctx.lineCap = 'butt'
-// canvas.ctx.lineJoin = 'bevel'
} else if (items.toolSelected == "brush3"){
canvas.lastX = mouseX
canvas.lastY = mouseY
@@ -598,7 +534,7 @@ ActivityBase {
} else {
canvas.lastX = mouseX
canvas.lastY = mouseY
- print("ON Pressed - tool not known? ")
+ print("ON Pressed - tool not known")
}
}
@@ -609,7 +545,7 @@ ActivityBase {
area.endX = mappedMouse.x
area.endY = mappedMouse.y
- ///////// reset text elements
+ // Reset text elements:
// hide the text
onBoardText.opacity = 0
onBoardText.z = -1
@@ -620,17 +556,13 @@ ActivityBase {
// disable hover
area.hoverEnabled = false
- ///////// reset text elements
if (items.toolSelected == "line" ) {
canvas.removeShadow()
- print("line")
-
canvas.ctx.fillStyle = items.paintColor
canvas.ctx.beginPath()
var angleRad = (360 - area.currentShape.rotationn) * \
Math.PI / 180
-
var auxX = items.sizeS * Math.sin(angleRad)
var auxY = items.sizeS * Math.cos(angleRad)
@@ -647,7 +579,6 @@ ActivityBase {
if (items.toolSelected == "circle") {
canvas.removeShadow()
- print("circle")
canvas.ctx = canvas.getContext('2d')
canvas.ctx.beginPath();
canvas.ctx.arc(area.currentShape.x + \
area.currentShape.width / 2, @@ -662,7 +593,6 @@ ActivityBase {
if (items.toolSelected == "rectangle" || \
items.toolSelected == "lineShift") { canvas.removeShadow()
- print("rectangle")
canvas.ctx.fillStyle = items.paintColor
canvas.ctx.beginPath()
\
canvas.ctx.moveTo(area.currentShape.x,area.currentShape.y) @@ -677,10 +607,8 @@ \
ActivityBase {
if (items.toolSelected == "text" && onBoardText.text != \
"") { canvas.removeShadow()
- print("text")
-
canvas.ctx.fillStyle = items.paintColor
- // canvas.ctx.font = "" + onBoardText.fontSize + "px \
" + GCSingletonFontLoader.fontLoader.name + // \
canvas.ctx.font = "" + onBoardText.fontSize + "px " + \
GCSingletonFontLoader.fontLoader.name
canvas.ctx.font = items.sizeS * 10 + "pt sans-serif"
\
canvas.ctx.fillText(onBoardText.text,area.realMouseX,area.realMouseY) \
onBoardText.text = "" @@ -689,9 +617,8 @@ ActivityBase {
}
// reset the "points" array
- if (items.toolSelected == "tools" ||
- items.toolSelected == "pattern" ||
- items.toolSelected == "brush4")
+ if (items.toolSelected == "pattern" ||
+ items.toolSelected == "brush4")
Activity.points = []
if (items.toolSelected == "brush5")
@@ -704,7 +631,7 @@ ActivityBase {
Activity.undo = Activity.undo.concat(items.urlImage)
if (Activity.redo.length != 0) {
- print(" reset redo")
+ print("resetting redo array!")
Activity.redo = []
}
@@ -715,12 +642,17 @@ ActivityBase {
items.next = true
else items.next = false
- print("undo: " + Activity.undo.length + " redo: " + \
Activity.redo.length)
-
+ // print("undo: " + Activity.undo.length + " redo: " + \
Activity.redo.length) area.hoverEnabled = false
}
onPositionChanged: {
+ canvas.ctx = canvas.getContext('2d')
+ canvas.ctx.strokeStyle = items.toolSelected == "eraser" \
? "#ffffff" : + \
items.toolSelected == "pattern" ? canvas.ctx.createPattern(shape.toDataURL(), \
'repeat') : + items.toolSelected \
== "brush4" ? "black" : + \
items.paintColor +
if (items.toolSelected == "pencil" || items.toolSelected \
== "eraser") { canvas.removeShadow()
canvas.ctx = canvas.getContext('2d')
@@ -835,47 +767,6 @@ ActivityBase {
currentShape.height = Math.abs(height)
currentShape.width = items.sizeS
}
- } else if (items.toolSelected == "tools") {
- canvas.removeShadow()
- Activity.points.push({ x: mouseX, y: mouseY })
- canvas.ctx = canvas.getContext('2d')
- canvas.ctx.lineWidth = items.sizeS
- canvas.ctx.lineJoin = canvas.ctx.lineCap = 'round'
-
- var p1 = Activity.points[0]
- var p2 = Activity.points[1]
-
- if (!p1 || !p2)
- return
-
- canvas.ctx.beginPath()
- canvas.ctx.moveTo(p1.x, p1.y)
-
- for (var i = 1, len = Activity.points.length; i < \
len; i++) {
- var midPoint = canvas.midPointBtw(p1, p2)
- canvas.ctx.quadraticCurveTo(p1.x, p1.y, \
midPoint.x, midPoint.y)
- p1 = Activity.points[i]
- p2 = Activity.points[i+1]
- }
- canvas.ctx.lineTo(p1.x, p1.y)
- canvas.ctx.stroke()
- canvas.requestPaint()
- } else if (items.toolSelected == "brush") {
- canvas.currentPoint = { x: mouseX, y: mouseY }
- canvas.removeShadow()
- canvas.ctx = canvas.getContext('2d')
- canvas.ctx.lineJoin = canvas.ctx.lineCap = 'round'
-
- var dist = canvas.distanceBetween(canvas.lastPoint, \
canvas.currentPoint)
- var angle = canvas.angleBetween(canvas.lastPoint, \
canvas.currentPoint)
-
- for (var i = 0; i < dist; i++) {
- var xx = canvas.lastPoint.x + (Math.sin(angle) * \
i) - 25;
- var yy = canvas.lastPoint.y + (Math.cos(angle) * \
i) - 25;
- canvas.ctx.drawImage(Activity.url + "brush.png", \
xx, yy, items.sizeS * 5, items.sizeS * 10);
- }
- canvas.lastPoint = {x: canvas.currentPoint.x, y: \
canvas.currentPoint.y}
- canvas.requestPaint()
} else if (items.toolSelected == "pattern") {
canvas.removeShadow()
Activity.points.push({x: mouseX, y: mouseY})
@@ -923,7 +814,6 @@ ActivityBase {
canvas.removeShadow()
canvas.lastX = mouseX
canvas.lastY = mouseY
- print("brush3")
canvas.ctx.lineWidth = items.sizeS * 1.2
canvas.ctx.lineJoin = canvas.ctx.lineCap = 'round';
@@ -956,7 +846,6 @@ ActivityBase {
} else if(items.toolSelected == "brush4" ) {
canvas.removeShadow()
Activity.points.push({x: mouseX, y: mouseY})
- print("brush4")
canvas.ctx.lineJoin = canvas.ctx.lineCap = 'round'
canvas.ctx.fillStyle = items.paintColor
canvas.ctx.lineWidth = items.sizeS / 4
@@ -1111,13 +1000,15 @@ ActivityBase {
MouseArea {
anchors.fill :parent
+
+ // choose other color:
onDoubleClicked: {
- print("choose a color: ")
items.index = index
colorDialog.visible = true
}
+
+ // set this color as current paint color
onClicked: {
- print("root.width: ",root.width)
root.active = true
items.paintColor = root.color
@@ -1126,16 +1017,16 @@ ActivityBase {
colorRepeater.itemAt(i).active = false
background.hideExpandedTools()
+
+ // choose other color
if (color == "#c2c2d6") {
- print("choose a color: ")
items.index = index
colorDialog.visible = true
} else {
items.paintColor = color
}
- timer.index = 0
- timer.start()
+ background.reloadSelectedPen()
}
}
}
@@ -1148,15 +1039,43 @@ ActivityBase {
height: row.height * 1.1
width: row.width * 1.2
- x: rightPannelFrame.x - width
+ x: rightPannelFrame.x + rightPannelFrame.width
y: rightPannelFrame.y - height / 2 + sizeTool.height * 1.5 +
rightPannel.spacing * 2 + rightPannel.anchors.topMargin
+ z: -10
radius: width * 0.05
opacity: 0
+ color: background.color
- z: 100
- color: "lightblue"
+ SequentialAnimation {
+ id: hideSelectSizeAnimation
+ PropertyAction { target: selectSize; property: "z"; value: 2 }
+ NumberAnimation {
+ target: selectSize
+ property: "x"
+ duration: 500
+ easing.type: Easing.InOutQuad
+ from: rightPannelFrame.x - selectSize.width
+ to: rightPannelFrame.x + rightPannelFrame.width
+ }
+ PropertyAction { target: selectSize; property: "opacity"; value: \
0 } + PropertyAction { target: selectSize; property: "z"; value: \
-10 } + }
+
+ SequentialAnimation {
+ id: showSelectSizeAnimation
+ PropertyAction { target: selectSize; property: "opacity"; value: \
0.9 } + PropertyAction { target: selectSize; property: "z"; value: \
2 } + NumberAnimation {
+ target: selectSize
+ property: "x"
+ duration: 500
+ easing.type: Easing.InOutQuad
+ from: rightPannelFrame.x + rightPannelFrame.width
+ to: rightPannelFrame.x - selectSize.width
+ }
+ }
Row {
id: row
@@ -1180,15 +1099,57 @@ ActivityBase {
height: row2.height * 1.15
width: row2.width * 1.05
- x: rightPannelFrame.x - width
+ x: rightPannelFrame.x + rightPannelFrame.width
y: rightPannelFrame.y - height / 2 + eraser.height * 3.5 +
- rightPannel.spacing * 2 + rightPannel.anchors.topMargin
+ rightPannel.spacing * 3 + rightPannel.anchors.topMargin
radius: width * 0.02
opacity: 0
- z: 100
- color: "lightblue"
+ z: -10
+ color: background.color
+
+ SequentialAnimation {
+ id: hideAnimation
+ PropertyAction { target: selectBrush; property: "z"; value: 2 }
+ NumberAnimation {
+ target: selectBrush
+ property: "x"
+ duration: 500
+ easing.type: Easing.InOutQuad
+ from: rightPannelFrame.x - selectBrush.width
+ to: rightPannelFrame.x + rightPannelFrame.width
+ }
+ PropertyAction { target: selectBrush; property: "opacity"; \
value: 0 } + PropertyAction { target: selectBrush; property: "z"; \
value: -10 } + }
+
+ SequentialAnimation {
+ id: showAnimation
+ PropertyAction { target: selectBrush; property: "opacity"; \
value: 0.9 } + PropertyAction { target: selectBrush; property: \
"z"; value: 2 } + NumberAnimation {
+ target: selectBrush
+ property: "x"
+ duration: 500
+ easing.type: Easing.InOutQuad
+ from: rightPannelFrame.x + rightPannelFrame.width
+ to: rightPannelFrame.x - selectBrush.width
+ }
+ }
+
+ property alias showSelected: showSelected
+
+ Rectangle {
+ id: showSelected
+ width: 70; height: 70
+ color: "#ffffb3"
+ opacity: 0.7
+ x: pencil.x + row2.spacing; y: pencil.y + row2.spacing / 2
+ z: 3
+ radius: width * 0.1
+ }
+
Row {
id: row2
@@ -1198,6 +1159,7 @@ ActivityBase {
anchors.leftMargin: 10
anchors.verticalCenter: parent.verticalCenter
+ z: 5
spacing: 10
ToolItem { id: pencil; source: Activity.url + "pencil.png"; \
name: "pencil" } @@ -1209,9 +1171,8 @@ ActivityBase {
items.toolSelected = "pattern"
items.patternType = "dot"
items.lastToolSelected = "pattern"
- Activity.getPattern(1)
- timer.index = 0
- timer.start()
+ Activity.getPattern()
+ background.reloadSelectedPen()
}
}
ToolItem {
@@ -1222,12 +1183,10 @@ ActivityBase {
items.toolSelected = "pattern"
items.patternType = "horizLine"
items.lastToolSelected = "pattern"
- Activity.getPattern2(1)
- timer.index = 0
- timer.start()
+ Activity.getPattern2()
+ background.reloadSelectedPen()
}
}
-
ToolItem {
name: "pattern3"
source: Activity.url + "pattern3.png"
@@ -1236,14 +1195,11 @@ ActivityBase {
items.toolSelected = "pattern"
items.patternType = "vertLine"
items.lastToolSelected = "pattern"
- Activity.getPattern3(1)
- timer.index = 0
- timer.start()
+ Activity.getPattern3()
+ background.reloadSelectedPen()
}
}
- ToolItem { name: "tools" }
- ToolItem { name: "brush"; source: Activity.url + \
"brush_paint.png"}
ToolItem { name: "spray"; source: Activity.url + "spray.png"}
ToolItem { name: "brush3";source: Activity.url + "brush3.png"}
ToolItem { name: "brush4";source: Activity.url + "brush4.png"}
@@ -1270,17 +1226,18 @@ ActivityBase {
anchors {
right: parent.right
top: parent.top
- topMargin: background.height - colorTools.height > \
rightPannel.height ?
- (background.height - colorTools.height - \
rightPannel.height) / 2 : 0 + bottom: parent.bottom
margins: 8
}
- spacing: 5
+ property real dime: (background.height - colorTools.height) / 14 \
- 10 +
+ spacing: 15
// eraser tool
Image {
id: eraser
- width: 48; height: 48
+ width: rightPannel.dime; height: rightPannel.dime
source: Activity.url + "eraser.svg"
opacity: items.toolSelected == "eraser" ? 1 : 0.6
@@ -1289,6 +1246,7 @@ ActivityBase {
onClicked: {
items.toolSelected = "eraser"
background.hideExpandedTools()
+ background.reloadSelectedPen()
}
}
}
@@ -1298,7 +1256,7 @@ ActivityBase {
// select size
Image {
id: sizeTool
- width: 48; height: 48
+ width: rightPannel.dime; height: rightPannel.dime
source: Activity.url + "size.PNG"
opacity: 0.6
@@ -1306,28 +1264,43 @@ ActivityBase {
id: toolArea
anchors.fill: parent
onClicked: {
- if (selectSize.opacity == 0) {
- sizeTool.opacity = 1
- selectSize.opacity = 0.9
- selectSize.z = 100
- }
- else {
- selectSize.opacity = 0
- selectSize.z = -1
- sizeTool.opacity = 0.6
- }
- selectBrush.opacity = 0
- selectBrush.z = -1
+ if (selectSize.z > 0) {
+ hideSelectSizeAnimation.start()
+ } else showSelectSizeAnimation.start()
+
+ hideAnimation.start()
}
}
}
+ Image {
+ id: button
+ sourceSize.width: rightPannel.dime; sourceSize.height: \
rightPannel.dime + width: rightPannel.dime; height: \
rightPannel.dime + source: Activity.url + "fill.svg"
+ opacity: items.toolSelected == "fill" ? 1 : 0.6
+
+ MouseArea {
+ anchors.fill: parent
+ onClicked: {
+ items.toolSelected = "fill"
+ background.hideExpandedTools()
- ToolItem { name: "fill"; width: 48; height: 48 }
+ // make the hover over the canvas false
+ area.hoverEnabled = false
+
+ // change the selectBrush tool
+ timer.index = 0
+ timer.start()
+
+ background.reloadSelectedPen()
+ }
+ }
+ }
Canvas {
id: brushSelectCanvas
- width: 48; height: 48
+ width: rightPannel.dime; height: rightPannel.dime
function c(x) {
return width * x / 510
}
@@ -1338,19 +1311,36 @@ ActivityBase {
brushContext.save()
- brushContext.strokeStyle = ''
+ brushContext.strokeStyle = 'transparent'
+
+ if (items.toolSelected == "blur") {
+ brushContext.shadowBlur = 10
+ brushContext.shadowColor = items.paintColor
+ brushContext.strokeStyle = items.paintColor
+ brushContext.lineWidth = 8
+ } else {
+ brushContext.shadowColor = 'rgba(0,0,0,0)'
+ brushContext.shadowBlur = 0
+ brushContext.shadowOffsetX = 0
+ brushContext.shadowOffsetY = 0
+ }
+
// create a triangle as clip region
brushContext.beginPath()
+
brushContext.moveTo( c(17), c(494))
- brushContext.lineTo( c(53), c(327))
- brushContext.lineTo(c(336), c(40))
- brushContext.lineTo(c(390), c(11))
- brushContext.lineTo(c(457), c(41))
- brushContext.lineTo(c(497), c(107))
- brushContext.lineTo(c(475), c(155))
- brushContext.lineTo(c(133), c(438))
+ brushContext.lineTo( c(53), c(320))
+ if (items.toolSelected != "pencil") {
+ brushContext.lineTo(c(336), c(40))
+ brushContext.lineTo(c(390), c(11))
+ brushContext.lineTo(c(457), c(41))
+ brushContext.lineTo(c(497), c(107))
+ brushContext.lineTo(c(475), c(155))
+ }
+ brushContext.lineTo(c(160), c(405))
brushContext.lineTo( c(17), c(494))
+
brushContext.closePath()
brushContext.stroke()
@@ -1358,152 +1348,111 @@ ActivityBase {
if (items.toolSelected == "pattern") {
if (items.patternType == "dot")
- Activity.getPattern(1)
+ Activity.getPattern()
if (items.patternType == "horizLine")
- Activity.getPattern2(1)
+ Activity.getPattern2()
if (items.patternType == "vertLine")
- Activity.getPattern3(1)
+ Activity.getPattern3()
brushContext.fillStyle = \
brushContext.createPattern(items.shape.toDataURL(), 'repeat') } else if \
(items.toolSelected == "pencil") { brushContext.fillStyle = items.paintColor
- } else if (items.toolSelected == "tools") {
-
- brushContext.fillStyle = "#ffffff"
- } else if (items.toolSelected == "brush") {
- // image with a brush
- brushContext.fillStyle = "#ffffff"
} else if (items.toolSelected == "spray") {
- brushContext.fillStyle = "#ffffff"
+ Activity.getSprayPattern()
+ brushContext.fillStyle = \
brushContext.createPattern(items.shape.toDataURL(), 'repeat') } else if \
(items.toolSelected == "brush3") {
- brushContext.fillStyle = "#ffffff"
+ brushContext.fillStyle = items.paintColor
} else if (items.toolSelected == "brush4") {
- brushContext.fillStyle = "#ffffff"
+ Activity.getCirclePattern()
+ brushContext.fillStyle = \
brushContext.createPattern(items.shape.toDataURL(), "repeat") } else if \
(items.toolSelected == "brush5") {
- brushContext.fillStyle = "#ffffff"
+ brushContext.strokeStyle = items.paintColor
+ brushContext.lineWidth = 2
+ brushContext.beginPath()
+ brushContext.moveTo(0,0)
+ \
brushContext.lineTo(brushSelectCanvas.width,brushSelectCanvas.height) + \
brushContext.lineTo(brushSelectCanvas.width/2,0) + \
brushContext.lineTo(0, brushSelectCanvas.height) + \
brushContext.lineTo(brushSelectCanvas.width, brushSelectCanvas.height * 0.1) + \
brushContext.lineTo(0, brushSelectCanvas.height * 0.5) + \
brushContext.lineTo(brushSelectCanvas.width,brushSelectCanvas.height * 0.5) + \
brushContext.lineTo(brushSelectCanvas.width * 0.5, 0) + \
brushContext.lineTo(brushSelectCanvas.width * 0.5, brushSelectCanvas.height) + \
brushContext.closePath() + brushContext.stroke()
} else if (items.toolSelected == "blur") {
- brushContext.fillStyle = "#ffffff"
- } else {
- print("else default color")
brushContext.fillStyle = items.paintColor
+ } else {
+ // set the color of the tool to white
+ brushContext.fillStyle = "#ffffff"
}
- brushContext.fillRect(0, 0, 500,500)
+ if (items.toolSelected != "brush5") {
+ brushContext.fillRect(0, 0, 100,100)
+ }
brushContext.restore()
- brushContext.drawImage(Activity.url + "pen.svg", 0, \
0,48,48) + brushContext.drawImage(Activity.url + \
"pen.svg", 0, 0,rightPannel.dime,rightPannel.dime) }
MouseArea {
anchors.fill: parent
- onDoubleClicked: {
- selectBrush.opacity = 0.9
- selectBrush.z = 100
-
- selectSize.opacity = 0
- selectSize.z = -1
- }
onPressAndHold: {
- selectBrush.opacity = 0.9
- selectBrush.z = 100
+ showAnimation.start()
selectSize.opacity = 0
selectSize.z = -1
}
- /*onClicked: {
- if ( selectBrush.opacity == 0) {
- selectBrush.opacity = 0.9
- selectBrush.z = 100
- } else {
- selectBrush.opacity = 0
- selectBrush.z = -1
- }
- selectSize.opacity = 0
- selectSize.z = -1
- }*/
onClicked: {
items.toolSelected = items.lastToolSelected
background.hideExpandedTools()
+ background.reloadSelectedPen()
}
}
+
Image {
x: 0; y: 0
source: Activity.url + "pen.svg"
- sourceSize.width: 48; sourceSize.height: 48
- width: 48; height: 48
+ sourceSize.width: rightPannel.dime; sourceSize.height: \
rightPannel.dime + width: rightPannel.dime; height: \
rightPannel.dime }
}
-/*
- Image {
- id: brushSelector2
- width: 48; height: 48
- source: Activity.url + "pencil.svg"
- opacity: items.toolSelected == "" ? 1 : 0.6
-
- MouseArea {
- anchors.fill: parent
- onDoubleClicked: {
- selectBrush.opacity = 0.9
- selectBrush.z = 100
- selectSize.opacity = 0
- selectSize.z = -1
- }
-
- onPressAndHold: {
- selectBrush.opacity = 0.9
- selectBrush.z = 100
-
- selectSize.opacity = 0
- selectSize.z = -1
- }
-// onClicked: {
-// if ( selectBrush.opacity == 0) {
-// selectBrush.opacity = 0.9
-// selectBrush.z = 100
-// } else {
-// selectBrush.opacity = 0
-// selectBrush.z = -1
-// }
-// selectSize.opacity = 0
-// selectSize.z = -1
-// }
-
- onClicked: {
- items.toolSelected = items.lastToolSelected
- background.hideExpandedTools()
- }
- }
- }
-*/
// draw a circle
- Rectangle {
- width: 48; height: 48
- radius: width / 2
- color: items.toolSelected == "circle" ? items.paintColor : \
"white"
- border.color: "black"
- border.width: 2
+ Rectangle { // border of the circle
+ width: rightPannel.dime; height: rightPannel.dime
+ color: "transparent"
opacity: items.toolSelected == "circle" ? 1 : 0.6
+ Rectangle {
+ width: parent.width * 0.9; height: parent.height * 0.9
+ radius: width / 2
+ color: items.toolSelected == "circle" ? items.paintColor \
: "white" + border.color: "black"
+ border.width: 2
+ anchors.centerIn: parent
+ }
+
MouseArea {
anchors.fill: parent
onClicked: {
items.toolSelected = "circle"
background.hideExpandedTools()
+ background.reloadSelectedPen()
}
}
}
// draw a rectangle
Rectangle { // border of the rectangle
- width: 48; height: 48
+ width: rightPannel.dime; height: rightPannel.dime
color: "transparent"
opacity: items.toolSelected == "rectangle" ? 1 : 0.6
Rectangle { // actual rectangle
- width: 42; height: 27
+ width: parent.width * 0.9; height: parent.height * 0.65
border.color: "black"
border.width: 2
color: items.toolSelected == "rectangle" ? \
items.paintColor : "white" @@ -1515,22 +1464,23 @@ ActivityBase {
onClicked: {
items.toolSelected = "rectangle"
background.hideExpandedTools()
+ background.reloadSelectedPen()
}
}
}
// draw a line
Rectangle { // border of the line
- width: 48; height: 48
+ width: rightPannel.dime; height: rightPannel.dime * 0.7
color: "transparent"
opacity: items.toolSelected == "line" ? 1 : 0.6
Rectangle { // actual line
- width: 42; height: 10
+ width: parent.width * 0.9; height: parent.height * 0.3
rotation: -30
border.color: "black"
border.width: 2
- color: items.toolSelected == "line" ? items.paintColor : \
"grey" + color: items.toolSelected == "line" ? \
items.paintColor : "#ffffff" anchors.centerIn: parent
}
@@ -1539,21 +1489,22 @@ ActivityBase {
onClicked: {
items.toolSelected = "line"
background.hideExpandedTools()
+ background.reloadSelectedPen()
}
}
}
// draw a line
Rectangle { // border of the line
- width: 48; height: 48
+ width: rightPannel.dime; height: rightPannel.dime * 0.7
color: "transparent"
opacity: items.toolSelected == "lineShift" ? 1 : 0.6
Rectangle { // actual line
- width: 42; height: 10
+ width: parent.width * 0.9; height: parent.height * 0.3
border.color: "black"
border.width: 2
- color: items.toolSelected == "lineShift" ? \
items.paintColor : "grey" + color: items.toolSelected == \
"lineShift" ? items.paintColor : "#ffffff" anchors.centerIn: parent
}
@@ -1562,19 +1513,20 @@ ActivityBase {
onClicked: {
items.toolSelected = "lineShift"
background.hideExpandedTools()
+ background.reloadSelectedPen()
}
}
}
// write text
Rectangle { // background of text
- width: 48; height: 48
+ width: rightPannel.dime; height: rightPannel.dime
color: "transparent"
opacity: items.toolSelected == "text" ? 1 : 0.6
GCText { // text
text: "A"
- color: items.toolSelected == "text" ? items.paintColor : \
"grey" + color: items.toolSelected == "text" ? \
items.paintColor : "#ffffff"
anchors.horizontalCenter: parent.horizontalCenter
anchors.verticalCenter: parent.verticalCenter
}
@@ -1584,6 +1536,7 @@ ActivityBase {
onClicked: {
items.toolSelected = "text"
background.hideExpandedTools()
+ background.reloadSelectedPen()
// enable the text to follow the cursor movement
area.hoverEnabled = true
@@ -1601,9 +1554,9 @@ ActivityBase {
// undo button
Image {
id: undoButton
- sourceSize.width: 48
- sourceSize.height: 48
- width: 48; height: 48
+ sourceSize.width: rightPannel.dime
+ sourceSize.height: rightPannel.dime
+ width: rightPannel.dime; height: rightPannel.dime
source: Activity.url + "back.svg"
opacity: 0.6
@@ -1618,10 +1571,7 @@ ActivityBase {
Activity.undo.length > 1 && items.next == \
false) { items.undoRedo = true
- // if \
(Activity.undo[Activity.undo.length - 1] == items.urlImage) {
- // if \
(Activity.redo.length == 0) { if (items.next) {
- print("items.next: ",items.next)
Activity.redo = \
Activity.redo.concat(Activity.undo.pop()) }
@@ -1637,7 +1587,7 @@ ActivityBase {
// save the image into the "redo" array
Activity.redo = \
Activity.redo.concat(items.urlImage)
- print("undo: " + Activity.undo.length + " \
redo: " + Activity.redo.length + " undo Pressed") + \
// print("undo: " + Activity.undo.length + " redo: " + Activity.redo.length + " \
undo Pressed") }
}
}
@@ -1646,9 +1596,9 @@ ActivityBase {
// redo button
Image {
id: redoButton
- sourceSize.width: 48
- sourceSize.height: 48
- width: 48; height: 48
+ sourceSize.width: rightPannel.dime
+ sourceSize.height: rightPannel.dime
+ width: rightPannel.dime; height: rightPannel.dime
source: Activity.url + "forward.svg"
opacity: 0.6
@@ -1663,7 +1613,6 @@ ActivityBase {
items.undoRedo = true
if (items.next2) {
- print("=======items.next: ",items.next)
Activity.undo = \
Activity.undo.concat(Activity.redo.pop()) }
@@ -1676,7 +1625,7 @@ ActivityBase {
canvas.loadImage(items.urlImage)
Activity.undo = \
Activity.undo.concat(items.urlImage)
- print("undo: " + Activity.undo.length + " \
redo: " + Activity.redo.length + " redo Pressed") + \
// print("undo: " + Activity.undo.length + " redo: " + Activity.redo.length + " \
redo Pressed") }
}
}
@@ -1685,9 +1634,9 @@ ActivityBase {
// load button
Image {
id: loadButton
- sourceSize.width: 48
- sourceSize.height: 48
- width: 48; height: 48
+ sourceSize.width: rightPannel.dime
+ sourceSize.height: rightPannel.dime
+ width: rightPannel.dime; height: rightPannel.dime
source: Activity.url + "load.svg"
opacity: 0.6
@@ -1706,9 +1655,6 @@ ActivityBase {
// move the main screen to right
main.x = background.width
- print("background.width: ",background.width)
- print("main.x: ", main.x)
- print("load pressed")
}
}
}
@@ -1716,9 +1662,9 @@ ActivityBase {
// save button
Image {
id: saveButton
- sourceSize.width: 48
- sourceSize.height: 48
- width: 48; height: 48
+ sourceSize.width: rightPannel.dime
+ sourceSize.height: rightPannel.dime
+ width: rightPannel.dime; height: rightPannel.dime
source: Activity.url + "save.svg"
opacity: 0.6
@@ -1729,20 +1675,6 @@ ActivityBase {
onClicked: Activity.saveToFile(true)
}
}
-
- // save button
- Image {
- sourceSize.width: 48
- sourceSize.height: 48
- width: 48; height: 48
- source: Activity.url + "save.svg"
- opacity: 0.6
-
- MouseArea {
- anchors.fill: parent
- onClicked: print("=================================: \
" + canvas.toDataURL())
- }
- }
}
}
}
@@ -1750,7 +1682,7 @@ ActivityBase {
// load images screen
Rectangle {
id: load
- color: "lightblue"
+ color: background.color
width: background.width
height: background.height
opacity: 0
@@ -1815,7 +1747,6 @@ ActivityBase {
GCButtonCancel {
id: exitButton
onClose: {
- print("onClose")
items.mainAnimationOnX = true
main.x = 0
}
@@ -1871,7 +1802,7 @@ ActivityBase {
height: 80
width: height
radius: width / 2
- color: "lightblue"
+ color: background.color
}
groove: Rectangle {
@@ -1897,7 +1828,7 @@ ActivityBase {
// load screen 2
Rectangle {
id: loadSavedPainting
- color: "lightblue"
+ color: background.color
width: background.width
height: background.height
opacity: 0
@@ -2026,7 +1957,7 @@ ActivityBase {
height: 80
width: height
radius: width / 2
- color: "lightblue"
+ color: background.color
}
groove: Rectangle {
@@ -2072,10 +2003,7 @@ ActivityBase {
Canvas {
id: shape
- width: 300; height: 300
opacity: 0
- onPaint: {
- }
}
}
}
diff --git a/src/activities/paint/ToolItem.qml b/src/activities/paint/ToolItem.qml
index d37d9c8..41b542d 100644
--- a/src/activities/paint/ToolItem.qml
+++ b/src/activities/paint/ToolItem.qml
@@ -20,10 +20,11 @@ import QtQuick 2.1
import "paint.js" as Activity
Image {
- id: button
- width: 60; height: 60
+ id: toolItem
+ sourceSize.width: 70; sourceSize.height: 70
+ width: 70; height: 70
source: Activity.url + name + ".svg"
- opacity: items.toolSelected == name ? 1 : 0.6
+ opacity: items.toolSelected == name ? 1 : 0.4
property string name
signal click
@@ -35,6 +36,9 @@ Image {
items.lastToolSelected = name
background.hideExpandedTools()
+ showSelected.x = toolItem.x + row2.spacing
+ showSelected.y = toolItem.y + row2.spacing * 0.5
+
// make the hover over the canvas false
area.hoverEnabled = false
@@ -42,6 +46,8 @@ Image {
timer.index = 0
timer.start()
+ background.reloadSelectedPen()
+
click()
}
}
diff --git a/src/activities/paint/paint.js b/src/activities/paint/paint.js
index c1ad3be..b3bbc65 100644
--- a/src/activities/paint/paint.js
+++ b/src/activities/paint/paint.js
@@ -69,6 +69,8 @@ var connectedPoints = []
function start(items_) {
items = items_
currentLevel = 0
+ items.toolSelected = "pencil"
+ items.paintColor = colors[0]
initLevel()
}
@@ -97,8 +99,6 @@ function initLevel() {
ctx.fill()
items.canvas.requestPaint()
- items.toolSelected = ""
- items.paintColor = colors[0]
items.next = false
items.next2 = false
@@ -121,13 +121,11 @@ function initLevel() {
getPattern()
items.background.started = true
+ items.background.hideExpandedTools()
}
-function getPattern(size) {
+function getPattern() {
var dotWidth = 20, dotDistance = 5
- if (size) {
- dotWidth = 10; dotDistance = 2.5
- }
var patternCtx = items.shape.getContext("2d")
patternCtx.clearRect(0, 0, items.shape.width, items.shape.height)
items.shape.width = items.shape.height = dotWidth + dotDistance
@@ -139,12 +137,8 @@ function getPattern(size) {
items.shape.requestPaint()
}
-function getPattern2(size) {
+function getPattern2() {
var lineSize = 10, lineWidth = 5
- if (size) {
- lineSize = 5; lineWidth = 2.5
- }
-
var patternCtx = items.shape.getContext("2d")
patternCtx.clearRect(0, 0, items.shape.width, items.shape.height)
items.shape.width = items.shape.height = lineSize
@@ -157,11 +151,8 @@ function getPattern2(size) {
patternCtx.stroke()
}
-function getPattern3(size) {
+function getPattern3() {
var lineSize = 20, lineWidth = 10
- if (size) {
- lineSize = 10; lineWidth = 5
- }
var ctx = items.shape.getContext("2d")
ctx.clearRect(0, 0, items.shape.width, items.shape.height)
items.shape.width = lineWidth; items.shape.height = lineSize;
@@ -169,6 +160,27 @@ function getPattern3(size) {
ctx.fillRect(lineWidth / 2, 0, lineWidth, lineSize);
}
+function getSprayPattern() {
+ var patternCtx = items.shape.getContext("2d")
+ patternCtx.clearRect(0, 0, items.shape.width, items.shape.height)
+ items.shape.width = items.shape.height = 3
+ patternCtx.fillStyle = items.paintColor
+ patternCtx.fillRect(0, 0, 2, 2);
+}
+
+function getCirclePattern() {
+ var dotWidth = 10, dotDistance = 2.5
+ var patternCtx = items.shape.getContext("2d")
+ patternCtx.clearRect(0, 0, items.shape.width, items.shape.height)
+ items.shape.width = items.shape.height = dotWidth * 0.6 + dotDistance * 2
+ patternCtx.strokeStyle = items.paintColor
+ patternCtx.lineWidth = 1
+ patternCtx.beginPath()
+ patternCtx.arc(dotWidth / 2, dotWidth / 2, dotWidth / 2, 0, Math.PI * 2, false);
+ patternCtx.closePath()
+ patternCtx.stroke()
+}
+
// parse the content of the paintings saved by the user
function parseImageSaved() {
dataset = items.parser.parseFromUrl(userFile)
@@ -188,7 +200,7 @@ function saveToFile(showMessage) {
console.error("Could not create directory " + path)
else
console.debug("Created directory " + path)
- } else print("else")
+ }
// add current painting to the dataset
if (showMessage)
diff --git a/src/activities/paint/resource/README \
b/src/activities/paint/resource/README index d9544bb..d84e8cc 100644
--- a/src/activities/paint/resource/README
+++ b/src/activities/paint/resource/README
@@ -1,49 +1,12 @@
Arrows left/right:
-https://openclipart.org/detail/16963/arrowgoleft
-https://openclipart.org/detail/16965/arrowgoright
+ https://openclipart.org/detail/16963/arrowgoleft
+ https://openclipart.org/detail/16965/arrowgoright
load:
-https://openclipart.org/detail/244696/modern-load-symbol-2
+ https://openclipart.org/detail/119905/load-cedric-bosdonnat-01
save:
-https://openclipart.org/detail/38959/save
+ https://openclipart.org/detail/38959/save
-another icon:
-https://openclipart.org/detail/12125/green-menu-icon-set
-
-tool:
-https://openclipart.org/detail/210626/tools-awesome-pot
-
-patterns:
-https://openclipart.org/detail/247586/prismatic-waves-background-no-background
-https://openclipart.org/detail/231025/colorful-stitched-ducks-seamless-pattern
-https://openclipart.org/detail/214475/color-braids
-
-
-blur:
-https://openclipart.org/detail/225289/antialiasing-3
-
-brush4:
-https://openclipart.org/detail/2606/brush
-
-brush5:
-https://openclipart.org/detail/256801/red-jewel
-
-
-pen
-https://openclipart.org/detail/245366/Paint-Brush-with-Dye-17
-
-
-
-
-
-
-
-
-
-
-
-
-
-brush:
-https://openclipart.org/detail/12041/brush
\ No newline at end of file
+eraser:
+ https://openclipart.org/detail/3981/eraser
\ No newline at end of file
diff --git a/src/activities/paint/resource/back.svg \
b/src/activities/paint/resource/back.svg index 2f327c2..5608f8f 100644
--- a/src/activities/paint/resource/back.svg
+++ b/src/activities/paint/resource/back.svg
@@ -1,275 +1,178 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
<svg
- xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
- xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
- xmlns="http://www.w3.org/2000/svg"
- xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
- xmlns:cc="http://creativecommons.org/ns#"
- xmlns:xlink="http://www.w3.org/1999/xlink"
- xmlns:dc="http://purl.org/dc/elements/1.1/"
- xmlns:svg="http://www.w3.org/2000/svg"
- xmlns:ns1="http://sozi.baierouge.fr"
- id="svg2"
- sodipodi:docname="arrow_go_left.svg"
- inkscape:export-filename="/datas/wiki/arrow_go_left.png"
- viewBox="0 0 50 40"
- sodipodi:version="0.32"
- inkscape:export-xdpi="90.000000"
- version="1.0"
- inkscape:output_extension="org.inkscape.output.svg.inkscape"
- inkscape:export-ydpi="90.000000"
- inkscape:version="0.46"
- sodipodi:docbase="G:\Projs\Cliparts Stocker\released"
- >
+ 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:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+ xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+ id="svg2"
+ sodipodi:docname="back.svg"
+ inkscape:export-filename="/datas/wiki/arrow_go_left.png"
+ viewBox="0 0 50 40"
+ sodipodi:version="0.32"
+ inkscape:export-xdpi="90.000000"
+ version="1.0"
+ inkscape:output_extension="org.inkscape.output.svg.inkscape"
+ inkscape:export-ydpi="90.000000"
+ inkscape:version="0.91 r13725">
<defs
- id="defs4"
- >
+ id="defs4">
<linearGradient
- id="linearGradient2520"
- y2="42.613"
- gradientUnits="userSpaceOnUse"
- x2="44.702"
- gradientTransform="matrix(0 1 -1 0 63.627 7.4347)"
- y1="34.687"
- x1="5.068"
- inkscape:collect="always"
- >
+ id="linearGradient2520"
+ y2="42.613"
+ gradientUnits="userSpaceOnUse"
+ x2="44.702"
+ gradientTransform="matrix(0,1,-1,0,63.627,-4.5653)"
+ y1="34.687"
+ x1="5.068"
+ inkscape:collect="always">
<stop
- id="stop2129"
- style="stop-color:#1b611f"
- offset="0"
- />
+ id="stop2129"
+ style="stop-color:#1b611f"
+ offset="0" />
<stop
- id="stop2131"
- style="stop-color:#103f14"
- offset="1"
- />
- </linearGradient
- >
+ id="stop2131"
+ style="stop-color:#103f14"
+ offset="1" />
+ </linearGradient>
<linearGradient
- id="linearGradient2522"
- y2="62.81"
- gradientUnits="userSpaceOnUse"
- x2="16.504"
- gradientTransform="matrix(0 1 -1 0 63.627 7.4347)"
- y1="15.406"
- x1="32.382"
- inkscape:collect="always"
- >
+ id="linearGradient2522"
+ y2="62.81"
+ gradientUnits="userSpaceOnUse"
+ x2="16.504"
+ gradientTransform="matrix(0,1,-1,0,63.627,-4.5653)"
+ y1="15.406"
+ x1="32.382"
+ inkscape:collect="always">
<stop
- id="stop1354"
- style="stop-color:#179907"
- offset="0"
- />
+ id="stop1354"
+ style="stop-color:#179907"
+ offset="0" />
<stop
- id="stop1356"
- style="stop-color:#0f7402"
- offset="1"
- />
- </linearGradient
- >
+ id="stop1356"
+ style="stop-color:#0f7402"
+ offset="1" />
+ </linearGradient>
<linearGradient
- id="linearGradient2524"
- y2="62.974"
- gradientUnits="userSpaceOnUse"
- x2="20.353"
- gradientTransform="matrix(0 1 -1 0 63.641 7.6164)"
- y1="16.25"
- x1="28.414"
- inkscape:collect="always"
- >
+ id="linearGradient2524"
+ y2="62.974"
+ gradientUnits="userSpaceOnUse"
+ x2="20.353"
+ gradientTransform="matrix(0,1,-1,0,63.641,-4.3836)"
+ y1="16.25"
+ x1="28.414"
+ inkscape:collect="always">
<stop
- id="stop1408"
- style="stop-color:#56d760;stop-opacity:.58863"
- offset="0"
- />
+ id="stop1408"
+ style="stop-color:#56d760;stop-opacity:.58863"
+ offset="0" />
<stop
- id="stop1410"
- style="stop-color:#18b01f;stop-opacity:.39216"
- offset="1"
- />
- </linearGradient
- >
- <linearGradient
- id="linearGradient2526"
- y2="59.484"
- gradientUnits="userSpaceOnUse"
- x2="23.255"
- gradientTransform="matrix(0 1 -1 0 63.703 7.1282)"
- y1="16.125"
- x1="23.255"
- inkscape:collect="always"
- >
- <stop
- id="stop1418"
- style="stop-color:#3ec549;stop-opacity:.50836"
- offset="0"
- />
- <stop
- id="stop1420"
- style="stop-color:#4fe756;stop-opacity:.11706"
- offset="1"
- />
- </linearGradient
- >
- </defs
- >
+ id="stop1410"
+ style="stop-color:#18b01f;stop-opacity:.39216"
+ offset="1" />
+ </linearGradient>
+ </defs>
<sodipodi:namedview
- id="base"
- bordercolor="#666666"
- inkscape:grid-points="false"
- inkscape:pageshadow="2"
- inkscape:window-y="-4"
- pagecolor="#ffffff"
- inkscape:window-height="1003"
- inkscape:grid-bbox="false"
- inkscape:zoom="20.175"
- inkscape:window-x="-4"
- showgrid="false"
- borderopacity="1.0"
- inkscape:current-layer="layer1"
- inkscape:cx="31.815366"
- inkscape:cy="20"
- showguides="false"
- inkscape:window-width="1680"
- inkscape:pageopacity="0.0"
- inkscape:document-units="px"
- >
+ id="base"
+ bordercolor="#666666"
+ inkscape:grid-points="false"
+ inkscape:pageshadow="2"
+ inkscape:window-y="24"
+ pagecolor="#ffffff"
+ inkscape:window-height="1176"
+ inkscape:grid-bbox="false"
+ inkscape:zoom="20.175"
+ inkscape:window-x="65"
+ showgrid="false"
+ borderopacity="1.0"
+ inkscape:current-layer="layer1"
+ inkscape:cx="31.815366"
+ inkscape:cy="20"
+ showguides="false"
+ inkscape:window-width="1855"
+ inkscape:pageopacity="0.0"
+ inkscape:document-units="px"
+ inkscape:window-maximized="1">
<inkscape:grid
- id="GridFromPre046Settings"
- opacity=".2"
- visible="true"
- color="#0000ff"
- enabled="true"
- originy="0px"
- originx="0px"
- empspacing="4"
- spacingy="1px"
- spacingx="1px"
- empopacity="0.4"
- type="xygrid"
- empcolor="#0000ff"
- />
- </sodipodi:namedview
- >
+ id="GridFromPre046Settings"
+ opacity=".2"
+ visible="true"
+ color="#0000ff"
+ enabled="true"
+ originy="0px"
+ originx="0px"
+ empspacing="4"
+ spacingy="1px"
+ spacingx="1px"
+ empopacity="0.4"
+ type="xygrid"
+ empcolor="#0000ff" />
+ </sodipodi:namedview>
<g
- id="layer1"
- inkscape:label="Calque 1"
- inkscape:groupmode="layer"
- >
- <g
- id="g2514"
- transform="translate(3.2246e-8 -12)"
- >
- <path
- id="path1388"
- sodipodi:nodetypes="cccsccccscccccssccc"
- style="fill:url(#linearGradient2520)"
- d="m32.471 18.591h-14.063c-0.049-1 0-5 \
0-5-0.009-0.447-0.117-0.83-0.531-1s-0.867-0.093-1.188 0.219l-16 16c-0.42138 \
0.435-0.42138 1.127 0.00043 1.562l16 16c0.321 0.312 0.774 0.42 1.188 0.25 0.414-0.169 \
0.522-0.584 0.531-1.031v-5h7.938c2.281-0.156 3.281 0.844 3.281 3.844v6.062s0 1 1 1c6 \
0 12-0.062 18-0.062 1 0 1-1 1-1v-12.5c0-14.5-8-19.5-17.156-19.344z"
- />
- <path
- id="path2147"
- style="fill:url(#linearGradient2522)"
- d="m48.221 \
37.872c0-7.003-1.917-11.445-4.75-14.187-2.834-2.743-6.705-3.887-11.032-3.813h-0.031-14.062c-0.719 \
0.001-1.311-0.563-1.344-1.281-0.05-1.031-0.012-3.439 0-4.313l-15.25 15.25 15.25 \
15.282v-4.282c0-0.742 0.602-1.343 1.344-1.343h7.843c0.032-0.002 0.062 0.001 0.094 0 \
1.318-0.073 2.637 0.211 3.5 1.187 0.884 1 1.125 2.351 1.125 4v5.719c5.762-0.002 \
11.533-0.06 17.313-0.063v-12.156z"
- />
- <path
- id="path1412"
- style="fill:url(#linearGradient2524)"
- d="m47.391 \
38.054c0-6.849-1.857-11.036-4.5-13.594-2.642-2.557-6.268-3.633-10.438-3.562h-0.031-14.063c-1.161 \
0.001-2.133-0.934-2.187-2.094-0.029-0.594-0.007-1.421 0-2.313l-13.219 13.219 13.219 \
13.25v-2.25c0-1.198 0.989-2.187 2.187-2.187h7.782c0.068-0.005 0.045-0.001 0.062 0 \
0.018 0 0.096-0.002 0.063 0 1.469-0.082 3.064 0.233 4.156 1.468 1.083 1.226 1.344 \
2.831 1.344 4.563v4.875c5.197-0.007 10.405-0.056 \
15.625-0.063v-11.312z"
- />
- <path
- id="path4351"
- sodipodi:nodetypes="cssssscccsc"
- style="fill:url(#linearGradient2526)"
- d="m47.365 \
39.79c0.266-6.44-0.593-11.681-4.352-15.246-2.682-2.544-5.504-3.643-10.622-3.572h-0.032-14.062c-1.13 \
0.001-2.073-0.903-2.125-2.031-0.031-0.624-0.012-1.545 0-2.438l-13.214 13.214 9.793 \
9.794c1.932-7.883 9.08-13.39 17.952-13.39 7.152 0 12.298 2.105 16.662 \
13.669z"
- />
- </g
- >
- </g
- >
+ id="layer1"
+ inkscape:label="Calque 1"
+ inkscape:groupmode="layer">
+ <path
+ inkscape:connector-curvature="0"
+ d="m 32.471,6.591 -14.063,0 c -0.049,-1 0,-5 0,-5 -0.009,-0.447 -0.117,-0.83 \
-0.531,-1 C 17.463,0.421 17.01,0.498 16.689,0.81 l -15.99999997,16 c -0.42138,0.435 \
-0.42138,1.127 4.3e-4,1.562 l 15.99999997,16 c 0.321,0.312 0.774,0.42 1.188,0.25 \
0.414,-0.169 0.522,-0.584 0.531,-1.031 l 0,-5 7.938,0 c 2.281,-0.156 3.281,0.844 \
3.281,3.844 l 0,6.062 c 0,0 0,1 1,1 6,0 12,-0.062 18,-0.062 1,0 1,-1 1,-1 l 0,-12.5 c \
0,-14.5 -8,-19.5 -17.156,-19.344 z" + style="fill:url(#linearGradient2520)"
+ sodipodi:nodetypes="cccsccccscccccssccc"
+ id="path1388" />
+ <path
+ inkscape:connector-curvature="0"
+ d="m 48.221,25.872 c 0,-7.003 -1.917,-11.445 -4.75,-14.187 C 40.637,8.942 \
36.766,7.798 32.439,7.872 l -0.031,0 -14.062,0 C 17.627,7.873 17.035,7.309 \
17.002,6.591 16.952,5.56 16.99,3.152 17.002,2.278 l -15.25,15.25 15.25,15.282 \
0,-4.282 c 0,-0.742 0.602,-1.343 1.344,-1.343 l 7.843,0 c 0.032,-0.002 0.062,0.001 \
0.094,0 1.318,-0.073 2.637,0.211 3.5,1.187 0.884,1 1.125,2.351 1.125,4 l 0,5.719 c \
5.762,-0.002 11.533,-0.06 17.313,-0.063 l 0,-12.156 z" + \
style="fill:url(#linearGradient2522)" + id="path2147" />
+ <path
+ inkscape:connector-curvature="0"
+ d="m 47.391,26.054 c 0,-6.849 -1.857,-11.036 -4.5,-13.594 C 40.249,9.903 \
36.623,8.827 32.453,8.898 l -0.031,0 -14.063,0 C 17.198,8.899 16.226,7.964 \
16.172,6.804 16.143,6.21 16.165,5.383 16.172,4.491 L 2.953,17.71 l 13.219,13.25 \
0,-2.25 c 0,-1.198 0.989,-2.187 2.187,-2.187 l 7.782,0 c 0.068,-0.005 0.045,-0.001 \
0.062,0 0.018,0 0.096,-0.002 0.063,0 1.469,-0.082 3.064,0.233 4.156,1.468 1.083,1.226 \
1.344,2.831 1.344,4.563 l 0,4.875 c 5.197,-0.007 10.405,-0.056 15.625,-0.063 l \
0,-11.312 z" + style="fill:url(#linearGradient2524)"
+ id="path1412" />
+ </g>
<metadata
- >
- <rdf:RDF
- >
- <cc:Work
- >
- <dc:format
- >image/svg+xml</dc:format
- >
+ id="metadata24">
+ <rdf:RDF>
+ <cc:Work>
+ <dc:format>image/svg+xml</dc:format>
<dc:type
- rdf:resource="http://purl.org/dc/dcmitype/StillImage"
- />
+ rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
<cc:license
- rdf:resource="http://creativecommons.org/licenses/publicdomain/"
- />
- <dc:publisher
- >
- <cc:Agent
- rdf:about="http://openclipart.org/"
- >
- <dc:title
- >Openclipart</dc:title
- >
- </cc:Agent
- >
- </dc:publisher
- >
- <dc:title
- >arrow_go_left</dc:title
- >
- <dc:date
- >2008-05-26T11:32:36</dc:date
- >
- <dc:description
- />
- <dc:source
- >https://openclipart.org/detail/16963/arrow_go_left-by-jean_victor_balin</dc:source
- >
- <dc:creator
- >
+ rdf:resource="http://creativecommons.org/licenses/publicdomain/" />
+ <dc:publisher>
<cc:Agent
- >
- <dc:title
- >jean_victor_balin</dc:title
- >
- </cc:Agent
- >
- </dc:creator
- >
- <dc:subject
- >
- <rdf:Bag
- >
- <rdf:li
- >arrow</rdf:li
- >
- <rdf:li
- >icon</rdf:li
- >
- </rdf:Bag
- >
- </dc:subject
- >
- </cc:Work
- >
+ rdf:about="http://openclipart.org/">
+ <dc:title>Openclipart</dc:title>
+ </cc:Agent>
+ </dc:publisher>
+ <dc:title>arrow_go_left</dc:title>
+ <dc:date>2008-05-26T11:32:36</dc:date>
+ <dc:description />
+ <dc:source>https://openclipart.org/detail/16963/arrow_go_left-by-jean_victor_balin</dc:source>
+ <dc:creator>
+ <cc:Agent>
+ <dc:title>jean_victor_balin</dc:title>
+ </cc:Agent>
+ </dc:creator>
+ <dc:subject>
+ <rdf:Bag>
+ <rdf:li>arrow</rdf:li>
+ <rdf:li>icon</rdf:li>
+ </rdf:Bag>
+ </dc:subject>
+ </cc:Work>
<cc:License
- rdf:about="http://creativecommons.org/licenses/publicdomain/"
- >
+ rdf:about="http://creativecommons.org/licenses/publicdomain/">
<cc:permits
- rdf:resource="http://creativecommons.org/ns#Reproduction"
- />
+ rdf:resource="http://creativecommons.org/ns#Reproduction" />
<cc:permits
- rdf:resource="http://creativecommons.org/ns#Distribution"
- />
+ rdf:resource="http://creativecommons.org/ns#Distribution" />
<cc:permits
- rdf:resource="http://creativecommons.org/ns#DerivativeWorks"
- />
- </cc:License
- >
- </rdf:RDF
- >
- </metadata
- >
-</svg
->
+ rdf:resource="http://creativecommons.org/ns#DerivativeWorks" />
+ </cc:License>
+ </rdf:RDF>
+ </metadata>
+</svg>
diff --git a/src/activities/paint/resource/brush2.svg \
b/src/activities/paint/resource/brush2.svg deleted file mode 100644
index 7173b2c..0000000
--- a/src/activities/paint/resource/brush2.svg
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generated by IcoMoon.io -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" \
"http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
-<svg version="1.1" xmlns="http://www.w3.org/2000/svg" \
xmlns:xlink="http://www.w3.org/1999/xlink" width="512" height="512" viewBox="0 0 512 \
512">
-<g>
-</g>
- <path d="M67.133 37.755l7.219-6c21.586-19.221 55.214-16.825 73.82 5.376l43.797 \
50.402-86.436 75.038-43.797-50.422c-19.21-21.596-16.794-55.194 \
5.396-74.394v0zM204.585 101.929l-13.814 12.001 204.053 234.68 \
13.783-12.002-204.022-234.68zM383.385 358.205l-204.022-234.66-11.397 10.22 204.053 \
234.639 11.366-10.199zM359.998 378.614l-203.417-234.639-13.834 12.001 204.042 234.66 \
13.209-12.022zM334.776 400.21l-13.179 11.418-203.448-234.66 13.2-11.417 203.428 \
234.66zM421.202 351.007l42.025 142.224-129.044-67.205 87.019-75.018z" fill="#000000" \
/>
- <path d="M154.931 144.333l18.309-16.2 203.643 233.933-23.931 21.842z" \
fill="#000000" />
-</svg>
diff --git a/src/activities/paint/resource/dot.jpg \
b/src/activities/paint/resource/dot.jpg deleted file mode 100644
index 7d8dd78..0000000
Binary files a/src/activities/paint/resource/dot.jpg and /dev/null differ
diff --git a/src/activities/paint/resource/dot.svg \
b/src/activities/paint/resource/dot.svg deleted file mode 100644
index 7173b2c..0000000
--- a/src/activities/paint/resource/dot.svg
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generated by IcoMoon.io -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" \
"http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
-<svg version="1.1" xmlns="http://www.w3.org/2000/svg" \
xmlns:xlink="http://www.w3.org/1999/xlink" width="512" height="512" viewBox="0 0 512 \
512">
-<g>
-</g>
- <path d="M67.133 37.755l7.219-6c21.586-19.221 55.214-16.825 73.82 5.376l43.797 \
50.402-86.436 75.038-43.797-50.422c-19.21-21.596-16.794-55.194 \
5.396-74.394v0zM204.585 101.929l-13.814 12.001 204.053 234.68 \
13.783-12.002-204.022-234.68zM383.385 358.205l-204.022-234.66-11.397 10.22 204.053 \
234.639 11.366-10.199zM359.998 378.614l-203.417-234.639-13.834 12.001 204.042 234.66 \
13.209-12.022zM334.776 400.21l-13.179 11.418-203.448-234.66 13.2-11.417 203.428 \
234.66zM421.202 351.007l42.025 142.224-129.044-67.205 87.019-75.018z" fill="#000000" \
/>
- <path d="M154.931 144.333l18.309-16.2 203.643 233.933-23.931 21.842z" \
fill="#000000" />
-</svg>
diff --git a/src/activities/paint/resource/fill.svg \
b/src/activities/paint/resource/fill.svg index fa89dad..73b6140 100644
--- a/src/activities/paint/resource/fill.svg
+++ b/src/activities/paint/resource/fill.svg
@@ -1,13 +1,52 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 15.0.2, SVG Export Plug-In . SVG Version: 6.00 \
Build 0) -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" \
"http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
-<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" \
xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
- width="512px" height="404.906px" viewBox="0 0 512 404.906" enable-background="new \
0 0 512 404.906" xml:space="preserve">
-<path d="M236.19,0l168.716,185.578L185.578,404.906L0,219.312l88.572-88.566c0,0,194.007,59.052,215.109,16.872
- c33.734-50.612-50.613-63.266-50.613-46.393c16.857,16.867,29.511,37.959,29.511,37.959S67.48,134.966,33.74,50.612
- C16.867-16.873,215.104,21.087,215.104,21.087L236.19,0z \
M185.578,46.394c0,0-105.445-8.434-105.445,8.434
- c0,16.872,63.267,25.306,63.267,25.306L185.578,46.394z \
M404.906,168.705L286.804,33.74c0,0,93.649,66.366,109.653,71.699
- c12.653,4.22,42.18-21.087,75.914-4.214c33.756,16.867,0,54.827,0,37.959c0-16.872-50.612-4.219-50.612-4.219
- c84.368,16.872,101.225,50.612,84.368,67.49c-16.878,16.856-37.96,16.856-37.96,0C468.167,185.578,404.906,168.705,404.906,168.705z
- "/>
-</svg>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Generator: Adobe Illustrator 15.0.2, SVG Export Plug-In . SVG Version: 6.00 \
Build 0) --> +
+<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:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+ xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+ version="1.1"
+ id="Layer_1"
+ x="0px"
+ y="0px"
+ width="443.27536"
+ height="443.26999"
+ viewBox="0 0 443.27536 443.26998"
+ enable-background="new 0 0 512 404.906"
+ xml:space="preserve"
+ inkscape:version="0.91 r13725"
+ sodipodi:docname="fill.svg"><metadata
+ id="metadata9"><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></dc:title></cc:Work></rdf:RDF></metadata><defs + id="defs7" \
/><sodipodi:namedview + pagecolor="#ffffff"
+ bordercolor="#666666"
+ borderopacity="1"
+ objecttolerance="10"
+ gridtolerance="10"
+ guidetolerance="10"
+ inkscape:pageopacity="0"
+ inkscape:pageshadow="2"
+ inkscape:window-width="1855"
+ inkscape:window-height="1176"
+ id="namedview5"
+ showgrid="false"
+ fit-margin-top="0"
+ fit-margin-left="0"
+ fit-margin-right="0"
+ fit-margin-bottom="0"
+ inkscape:zoom="0.58203125"
+ inkscape:cx="221.63758"
+ inkscape:cy="202.453"
+ inkscape:window-x="65"
+ inkscape:window-y="24"
+ inkscape:window-maximized="1"
+ inkscape:current-layer="Layer_1" /><path
+ d="M 204.48665,21.182786 350.55622,206.76078 160.66821,426.08878 0,240.49478 l \
76.683144,-88.566 c 0,0 167.965796,59.052 186.235316,16.872 29.20595,-50.612 \
-43.81931,-63.266 -43.81931,-46.393 14.59432,16.867 25.54979,37.959 25.54979,37.959 \
0,0 -186.226654,-4.218 -215.437797,-88.571994 -14.608169,-67.4850001 \
157.019847,-29.525 157.019847,-29.525 l 18.25566,-21.087 z m -43.81844,46.394 c 0,0 \
-91.291316,-8.434 -91.291316,8.434 0,16.871996 54.774786,25.305994 \
54.774786,25.305994 L 160.66821,67.576786 Z M 350.55622,189.88778 248.30683,54.922786 \
c 0,0 81.07867,66.365994 94.93448,71.698994 10.95461,4.22 36.51826,-21.087 \
65.72421,-4.214 29.22499,16.867 0,54.827 0,37.959 0,-16.872 -43.81845,-4.219 \
-43.81845,-4.219 73.04344,16.872 87.63776,50.612 73.04344,67.49 -14.61249,16.856 \
-32.8647,16.856 -32.8647,0 0,-16.877 -54.76959,-33.75 -54.76959,-33.75 z" + \
id="path3" + inkscape:connector-curvature="0" /></svg>
\ No newline at end of file
diff --git a/src/activities/paint/resource/forward.svg \
b/src/activities/paint/resource/forward.svg index 91520b1..2709953 100644
--- a/src/activities/paint/resource/forward.svg
+++ b/src/activities/paint/resource/forward.svg
@@ -1,275 +1,179 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
<svg
- xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
- xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
- xmlns="http://www.w3.org/2000/svg"
- xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
- xmlns:cc="http://creativecommons.org/ns#"
- xmlns:xlink="http://www.w3.org/1999/xlink"
- xmlns:dc="http://purl.org/dc/elements/1.1/"
- xmlns:svg="http://www.w3.org/2000/svg"
- xmlns:ns1="http://sozi.baierouge.fr"
- id="svg2"
- sodipodi:docname="arrow_go_right.svg"
- inkscape:export-filename="/datas/wiki/arrow_go_right.png"
- viewBox="0 0 50 40"
- sodipodi:version="0.32"
- inkscape:export-xdpi="90.000000"
- version="1.0"
- inkscape:output_extension="org.inkscape.output.svg.inkscape"
- inkscape:export-ydpi="90.000000"
- inkscape:version="0.46"
- sodipodi:docbase="G:\Projs\Cliparts Stocker\released"
- >
+ 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:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+ xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+ id="svg2"
+ sodipodi:docname="forward.svg"
+ inkscape:export-filename="/datas/wiki/arrow_go_right.png"
+ viewBox="0 0 50 40"
+ sodipodi:version="0.32"
+ inkscape:export-xdpi="90.000000"
+ version="1.0"
+ inkscape:output_extension="org.inkscape.output.svg.inkscape"
+ inkscape:export-ydpi="90.000000"
+ inkscape:version="0.91 r13725">
<defs
- id="defs4"
- >
+ id="defs4">
<linearGradient
- id="linearGradient1480"
- y2="59.484"
- gradientUnits="userSpaceOnUse"
- x2="23.255"
- gradientTransform="matrix(0 1 1 0 -6.703 7.1282)"
- y1="16.125"
- x1="23.255"
- inkscape:collect="always"
- >
+ id="linearGradient1483"
+ y2="62.974"
+ gradientUnits="userSpaceOnUse"
+ x2="20.353"
+ gradientTransform="matrix(0 1 1 0 -6.6406 7.6164)"
+ y1="16.25"
+ x1="28.414"
+ inkscape:collect="always">
<stop
- id="stop1418"
- style="stop-color:#3ec549;stop-opacity:.50836"
- offset="0"
- />
+ id="stop1408"
+ style="stop-color:#56d760;stop-opacity:.58863"
+ offset="0" />
<stop
- id="stop1420"
- style="stop-color:#4fe756;stop-opacity:.11706"
- offset="1"
- />
- </linearGradient
- >
+ id="stop1410"
+ style="stop-color:#18b01f;stop-opacity:.39216"
+ offset="1" />
+ </linearGradient>
<linearGradient
- id="linearGradient1483"
- y2="62.974"
- gradientUnits="userSpaceOnUse"
- x2="20.353"
- gradientTransform="matrix(0 1 1 0 -6.6406 7.6164)"
- y1="16.25"
- x1="28.414"
- inkscape:collect="always"
- >
+ id="linearGradient1486"
+ y2="62.81"
+ gradientUnits="userSpaceOnUse"
+ x2="16.504"
+ gradientTransform="matrix(0 1 1 0 -6.6269 7.4347)"
+ y1="15.406"
+ x1="32.382"
+ inkscape:collect="always">
<stop
- id="stop1408"
- style="stop-color:#56d760;stop-opacity:.58863"
- offset="0"
- />
+ id="stop1354"
+ style="stop-color:#179907"
+ offset="0" />
<stop
- id="stop1410"
- style="stop-color:#18b01f;stop-opacity:.39216"
- offset="1"
- />
- </linearGradient
- >
+ id="stop1356"
+ style="stop-color:#0f7402"
+ offset="1" />
+ </linearGradient>
<linearGradient
- id="linearGradient1486"
- y2="62.81"
- gradientUnits="userSpaceOnUse"
- x2="16.504"
- gradientTransform="matrix(0 1 1 0 -6.6269 7.4347)"
- y1="15.406"
- x1="32.382"
- inkscape:collect="always"
- >
+ id="linearGradient1489"
+ y2="42.613"
+ gradientUnits="userSpaceOnUse"
+ x2="44.702"
+ gradientTransform="matrix(0 1 1 0 -6.6269 7.4347)"
+ y1="34.687"
+ x1="5.068"
+ inkscape:collect="always">
<stop
- id="stop1354"
- style="stop-color:#179907"
- offset="0"
- />
+ id="stop2129"
+ style="stop-color:#1b611f"
+ offset="0" />
<stop
- id="stop1356"
- style="stop-color:#0f7402"
- offset="1"
- />
- </linearGradient
- >
- <linearGradient
- id="linearGradient1489"
- y2="42.613"
- gradientUnits="userSpaceOnUse"
- x2="44.702"
- gradientTransform="matrix(0 1 1 0 -6.6269 7.4347)"
- y1="34.687"
- x1="5.068"
- inkscape:collect="always"
- >
- <stop
- id="stop2129"
- style="stop-color:#1b611f"
- offset="0"
- />
- <stop
- id="stop2131"
- style="stop-color:#103f14"
- offset="1"
- />
- </linearGradient
- >
- </defs
- >
+ id="stop2131"
+ style="stop-color:#103f14"
+ offset="1" />
+ </linearGradient>
+ </defs>
<sodipodi:namedview
- id="base"
- bordercolor="#666666"
- inkscape:grid-points="false"
- inkscape:pageshadow="2"
- inkscape:window-y="26"
- pagecolor="#ffffff"
- inkscape:window-height="693"
- inkscape:grid-bbox="false"
- inkscape:zoom="12.425"
- inkscape:window-x="1"
- showgrid="false"
- borderopacity="1.0"
- inkscape:current-layer="layer1"
- inkscape:cx="36.066398"
- inkscape:cy="20"
- showguides="false"
- inkscape:window-width="1156"
- inkscape:pageopacity="0.0"
- inkscape:document-units="px"
- >
+ id="base"
+ bordercolor="#666666"
+ inkscape:grid-points="false"
+ inkscape:pageshadow="2"
+ inkscape:window-y="24"
+ pagecolor="#ffffff"
+ inkscape:window-height="1176"
+ inkscape:grid-bbox="false"
+ inkscape:zoom="12.425"
+ inkscape:window-x="65"
+ showgrid="false"
+ borderopacity="1.0"
+ inkscape:current-layer="g1408"
+ inkscape:cx="16.468812"
+ inkscape:cy="20"
+ showguides="false"
+ inkscape:window-width="1855"
+ inkscape:pageopacity="0.0"
+ inkscape:document-units="px"
+ inkscape:window-maximized="1">
<inkscape:grid
- id="GridFromPre046Settings"
- opacity=".2"
- visible="true"
- color="#0000ff"
- enabled="true"
- originy="0px"
- originx="0px"
- empspacing="4"
- spacingy="1px"
- spacingx="1px"
- empopacity="0.4"
- type="xygrid"
- empcolor="#0000ff"
- />
- </sodipodi:namedview
- >
+ id="GridFromPre046Settings"
+ opacity=".2"
+ visible="true"
+ color="#0000ff"
+ enabled="true"
+ originy="0px"
+ originx="0px"
+ empspacing="4"
+ spacingy="1px"
+ spacingx="1px"
+ empopacity="0.4"
+ type="xygrid"
+ empcolor="#0000ff" />
+ </sodipodi:namedview>
<g
- id="layer1"
- inkscape:label="Calque 1"
- inkscape:groupmode="layer"
- >
+ id="layer1"
+ inkscape:label="Calque 1"
+ inkscape:groupmode="layer">
<g
- id="g1408"
- transform="translate(-7 -12)"
- >
+ id="g1408"
+ transform="translate(-7 -12)">
<path
- id="path1388"
- sodipodi:nodetypes="cccsccccscccccssccc"
- style="fill:url(#linearGradient1489)"
- d="m24.529 18.591h14.063c0.049-1 0-5 0-5 0.009-0.447 0.117-0.83 \
0.531-1s0.867-0.093 1.188 0.219l16 16c0.421 0.435 0.421 1.127 0 1.562l-16 16c-0.321 \
0.312-0.774 0.42-1.188 \
0.25-0.414-0.169-0.522-0.584-0.531-1.031v-5h-7.938c-2.281-0.156-3.281 0.844-3.281 \
3.844v6.062s0 1-1 1c-6 0-12-0.062-18-0.062-0.9999 0-0.9999-1-0.9999-1v-12.5c0-14.5 \
7.9999-19.5 17.156-19.344z"
- />
+ id="path1388"
+ sodipodi:nodetypes="cccsccccscccccssccc"
+ style="fill:url(#linearGradient1489)"
+ d="m24.529 18.591h14.063c0.049-1 0-5 0-5 0.009-0.447 0.117-0.83 \
0.531-1s0.867-0.093 1.188 0.219l16 16c0.421 0.435 0.421 1.127 0 1.562l-16 16c-0.321 \
0.312-0.774 0.42-1.188 \
0.25-0.414-0.169-0.522-0.584-0.531-1.031v-5h-7.938c-2.281-0.156-3.281 0.844-3.281 \
3.844v6.062s0 1-1 1c-6 0-12-0.062-18-0.062-0.9999 0-0.9999-1-0.9999-1v-12.5c0-14.5 \
7.9999-19.5 17.156-19.344z" /> <path
- id="path2147"
- style="fill:url(#linearGradient1486)"
- d="m8.7793 37.872c0-7.003 1.9167-11.445 4.7497-14.187 2.834-2.743 \
6.705-3.887 11.032-3.813h0.031 14.062c0.719 0.001 1.311-0.563 1.344-1.281 0.05-1.031 \
0.012-3.439 0-4.313l15.25 15.25-15.25 \
15.282v-4.282c0-0.742-0.602-1.343-1.344-1.343h-7.843c-0.032-0.002-0.062 0.001-0.094 \
0-1.318-0.073-2.637 0.211-3.5 1.187-0.884 1-1.125 2.351-1.125 \
4v5.719c-5.762-0.002-11.533-0.06-17.313-0.063 0.0003-0.603 0.0003-11.275 \
0.0003-12.156z"
- />
+ id="path2147"
+ style="fill:url(#linearGradient1486)"
+ d="m8.7793 37.872c0-7.003 1.9167-11.445 4.7497-14.187 2.834-2.743 \
6.705-3.887 11.032-3.813h0.031 14.062c0.719 0.001 1.311-0.563 1.344-1.281 0.05-1.031 \
0.012-3.439 0-4.313l15.25 15.25-15.25 \
15.282v-4.282c0-0.742-0.602-1.343-1.344-1.343h-7.843c-0.032-0.002-0.062 0.001-0.094 \
0-1.318-0.073-2.637 0.211-3.5 1.187-0.884 1-1.125 2.351-1.125 \
4v5.719c-5.762-0.002-11.533-0.06-17.313-0.063 0.0003-0.603 0.0003-11.275 \
0.0003-12.156z" /> <path
- id="path1412"
- style="fill:url(#linearGradient1483)"
- d="m9.6094 38.054c0-6.849 1.8566-11.036 4.4996-13.594 2.642-2.557 \
6.268-3.633 10.438-3.562h0.031 14.063c1.161 0.001 2.133-0.934 2.187-2.094 0.029-0.594 \
0.007-1.421 0-2.313l13.219 13.219-13.219 \
13.25v-2.25c0-1.198-0.989-2.187-2.187-2.187h-7.782c-0.068-0.005-0.045-0.001-0.062 \
0-0.018 0-0.096-0.002-0.063 0-1.469-0.082-3.064 0.233-4.156 1.468-1.083 1.226-1.344 \
2.831-1.344 4.563v4.875c-5.197-0.007-10.405-0.056-15.625-0.063 0.0004-1.773 \
0.0004-10.492 0.0004-11.312z"
- />
- <path
- id="path4351"
- sodipodi:nodetypes="cssssscccsc"
- style="fill:url(#linearGradient1480)"
- d="m9.6345 39.79c-0.2657-6.44 0.5935-11.681 4.3525-15.246 2.682-2.544 \
5.504-3.643 10.622-3.572h0.032 14.062c1.13 0.001 2.073-0.903 2.125-2.031 0.031-0.624 \
0.012-1.545 0-2.438l13.214 13.214-9.793 \
9.794c-1.932-7.883-9.08-13.39-17.952-13.39-7.152 0-12.298 \
2.105-16.662 13.669z"
- />
- </g
- >
- </g
- >
+ id="path1412"
+ style="fill:url(#linearGradient1483)"
+ d="m9.6094 38.054c0-6.849 1.8566-11.036 4.4996-13.594 2.642-2.557 \
6.268-3.633 10.438-3.562h0.031 14.063c1.161 0.001 2.133-0.934 2.187-2.094 0.029-0.594 \
0.007-1.421 0-2.313l13.219 13.219-13.219 \
13.25v-2.25c0-1.198-0.989-2.187-2.187-2.187h-7.782c-0.068-0.005-0.045-0.001-0.062 \
0-0.018 0-0.096-0.002-0.063 0-1.469-0.082-3.064 0.233-4.156 1.468-1.083 1.226-1.344 \
2.831-1.344 4.563v4.875c-5.197-0.007-10.405-0.056-15.625-0.063 0.0004-1.773 \
0.0004-10.492 0.0004-11.312z" /> + </g>
+ </g>
<metadata
- >
- <rdf:RDF
- >
- <cc:Work
- >
- <dc:format
- >image/svg+xml</dc:format
- >
+ id="metadata48">
+ <rdf:RDF>
+ <cc:Work>
+ <dc:format>image/svg+xml</dc:format>
<dc:type
- rdf:resource="http://purl.org/dc/dcmitype/StillImage"
- />
+ rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
<cc:license
- rdf:resource="http://creativecommons.org/licenses/publicdomain/"
- />
- <dc:publisher
- >
- <cc:Agent
- rdf:about="http://openclipart.org/"
- >
- <dc:title
- >Openclipart</dc:title
- >
- </cc:Agent
- >
- </dc:publisher
- >
- <dc:title
- >arrow_go_right</dc:title
- >
- <dc:date
- >2008-05-26T11:33:25</dc:date
- >
- <dc:description
- />
- <dc:source
- >https://openclipart.org/detail/16965/arrow_go_right-by-jean_victor_balin</dc:source
- >
- <dc:creator
- >
+ rdf:resource="http://creativecommons.org/licenses/publicdomain/" />
+ <dc:publisher>
<cc:Agent
- >
- <dc:title
- >jean_victor_balin</dc:title
- >
- </cc:Agent
- >
- </dc:creator
- >
- <dc:subject
- >
- <rdf:Bag
- >
- <rdf:li
- >arrow</rdf:li
- >
- <rdf:li
- >icon</rdf:li
- >
- </rdf:Bag
- >
- </dc:subject
- >
- </cc:Work
- >
+ rdf:about="http://openclipart.org/">
+ <dc:title>Openclipart</dc:title>
+ </cc:Agent>
+ </dc:publisher>
+ <dc:title>arrow_go_right</dc:title>
+ <dc:date>2008-05-26T11:33:25</dc:date>
+ <dc:description />
+ <dc:source>https://openclipart.org/detail/16965/arrow_go_right-by-jean_victor_balin</dc:source>
+ <dc:creator>
+ <cc:Agent>
+ <dc:title>jean_victor_balin</dc:title>
+ </cc:Agent>
+ </dc:creator>
+ <dc:subject>
+ <rdf:Bag>
+ <rdf:li>arrow</rdf:li>
+ <rdf:li>icon</rdf:li>
+ </rdf:Bag>
+ </dc:subject>
+ </cc:Work>
<cc:License
- rdf:about="http://creativecommons.org/licenses/publicdomain/"
- >
+ rdf:about="http://creativecommons.org/licenses/publicdomain/">
<cc:permits
- rdf:resource="http://creativecommons.org/ns#Reproduction"
- />
+ rdf:resource="http://creativecommons.org/ns#Reproduction" />
<cc:permits
- rdf:resource="http://creativecommons.org/ns#Distribution"
- />
+ rdf:resource="http://creativecommons.org/ns#Distribution" />
<cc:permits
- rdf:resource="http://creativecommons.org/ns#DerivativeWorks"
- />
- </cc:License
- >
- </rdf:RDF
- >
- </metadata
- >
-</svg
->
+ rdf:resource="http://creativecommons.org/ns#DerivativeWorks" />
+ </cc:License>
+ </rdf:RDF>
+ </metadata>
+</svg>
diff --git a/src/activities/paint/resource/load.svg \
b/src/activities/paint/resource/load.svg index 2543dd8..ec7be27 100644
--- a/src/activities/paint/resource/load.svg
+++ b/src/activities/paint/resource/load.svg
@@ -9,126 +9,101 @@
xmlns="http://www.w3.org/2000/svg"
xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
- width="15.862905mm"
- height="15.132608mm"
- viewBox="0 0 56.207142 53.619478"
- id="svg2"
+ id="svg1363"
+ sodipodi:docname="load.svg"
+ viewBox="0 0 24.999999 24.999999"
+ sodipodi:version="0.32"
version="1.1"
inkscape:version="0.91 r13725"
- sodipodi:docname="joede-load2-symbol.svg">
- <title
- id="title4238">Modern Load Symbol #2</title>
+ width="25"
+ height="25">
<defs
- id="defs4" />
+ id="defs3" />
<sodipodi:namedview
id="base"
- pagecolor="#ffffff"
bordercolor="#666666"
+ inkscape:pageshadow="2"
+ inkscape:window-y="24"
+ pagecolor="#ffffff"
+ inkscape:window-maximized="1"
+ inkscape:window-width="1855"
+ inkscape:zoom="38.508391"
+ inkscape:window-x="65"
+ showgrid="false"
borderopacity="1.0"
+ inkscape:current-layer="g1222"
+ inkscape:cx="12.660377"
+ inkscape:cy="12.867925"
+ inkscape:window-height="1176"
inkscape:pageopacity="0.0"
- inkscape:pageshadow="2"
- inkscape:zoom="5.6"
- inkscape:cx="32.312506"
- inkscape:cy="18.725495"
- inkscape:document-units="mm"
- inkscape:current-layer="layer1"
- showgrid="true"
- showguides="true"
- inkscape:window-width="1146"
- inkscape:window-height="773"
- inkscape:window-x="981"
- inkscape:window-y="150"
- inkscape:window-maximized="0"
+ inkscape:document-units="px"
fit-margin-top="0"
fit-margin-left="0"
fit-margin-right="0"
- fit-margin-bottom="0">
- <inkscape:grid
- type="xygrid"
- id="grid4136"
- originx="-211.19102"
- originy="-601.90513" />
- </sodipodi:namedview>
+ fit-margin-bottom="0" />
+ <g
+ id="layer1"
+ inkscape:label="Layer 1"
+ inkscape:groupmode="layer"
+ transform="translate(-1.7408655,0.296892)">
+ <g
+ id="g1222"
+ inkscape:export-ydpi="72.000000"
+ inkscape:export-xdpi="72.000000"
+ inkscape:export-filename="/home/chef/eclipse/devOO/ressources/btnSauver.png"
+ transform="translate(-134.6,-204.78528)">
+ <g
+ id="g4145">
+ <path
+ id="rect5637"
+ style="fill:#ada915;fill-rule:evenodd;stroke:#898c19;stroke-width:1.00282276;stroke-linecap:round;stroke-linejoin:round;fill-opacity:1"
+ d="m 138.6549,210.3965 3.19982,0 c 0.59524,0.0355 0.90962,0.50315 \
0.90662,1.16614 0.003,0.59787 0.39276,0.9116 0.86535,0.9116 l 11.35775,-0.071 c \
0.93041,0 1.66299,0.89976 1.64968,2.01263 l -0.0461,11.2648 c -0.0133,1.11287 \
-0.77234,2.01263 -1.69783,2.01263 l -16.44215,0 c -0.92549,0 -1.66299,-0.89976 \
-1.64968,-2.01263 l 0.15874,-13.27151 c 0.0133,-1.11287 0.77234,-2.01263 \
1.69782,-2.01263 z" + sodipodi:nodetypes="cccccccccccc"
+ inkscape:connector-curvature="0" />
+ <rect
+ id="rect5015"
+ style="fill:#ccc818;fill-rule:evenodd;stroke:#898c19;stroke-width:0.87982941;stroke-linecap:round;stroke-linejoin:round;fill-opacity:1"
+ ry="1.5510825"
+ transform="matrix(1,0,-0.35733888,0.9339748,0,0)"
+ width="19.79064"
+ y="230.45377"
+ x="223.9101"
+ height="13.313995" />
+ <path
+ d="m 155.33,205.93 -4.7,0 0,3.73 -2.2,0 4.66,4.35 4.51,-4.24 -2.27,-0.02 \
0,-3.82 z" + \
style="fill:#2fd20b;fill-rule:evenodd;stroke:#238c19;stroke-width:0.98565;stroke-linecap:round;stroke-linejoin:round"
+ sodipodi:nodetypes="cccccccc"
+ inkscape:connector-curvature="0"
+ id="path7824" />
+ </g>
+ </g>
+ </g>
<metadata
- id="metadata7">
+ id="metadata19">
<rdf:RDF>
- <cc:Work
- rdf:about="">
+ <cc:Work>
<dc:format>image/svg+xml</dc:format>
<dc:type
rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
- <dc:title>Modern Load Symbol #2</dc:title>
<cc:license
- rdf:resource="http://creativecommons.org/licenses/by-sa/3.0/" />
- <dc:source>https://openclipart.org/user-detail/joede</dc:source>
- <dc:description>A simple but more modern "Load" symbol (variant \
#2) for designing keypad buttons. Remember, who knows disc drives \
today...</dc:description>
- <dc:subject>
- <rdf:Bag>
- <rdf:li>keypad</rdf:li>
- <rdf:li>store</rdf:li>
- <rdf:li>save</rdf:li>
- </rdf:Bag>
- </dc:subject>
+ rdf:resource="http://creativecommons.org/publicdomain/zero/1.0/" />
+ <dc:publisher>
+ <cc:Agent
+ rdf:about="http://openclipart.org/">
+ <dc:title>Openclipart</dc:title>
+ </cc:Agent>
+ </dc:publisher>
+ <dc:title />
</cc:Work>
<cc:License
- rdf:about="http://creativecommons.org/licenses/by-sa/3.0/">
+ rdf:about="http://creativecommons.org/publicdomain/zero/1.0/">
<cc:permits
rdf:resource="http://creativecommons.org/ns#Reproduction" />
<cc:permits
rdf:resource="http://creativecommons.org/ns#Distribution" />
- <cc:requires
- rdf:resource="http://creativecommons.org/ns#Notice" />
- <cc:requires
- rdf:resource="http://creativecommons.org/ns#Attribution" />
<cc:permits
rdf:resource="http://creativecommons.org/ns#DerivativeWorks" />
- <cc:requires
- rdf:resource="http://creativecommons.org/ns#ShareAlike" />
</cc:License>
</rdf:RDF>
</metadata>
- <g
- inkscape:label="Ebene 1"
- inkscape:groupmode="layer"
- id="layer1"
- transform="translate(-211.19102,-396.83757)">
- <g
- id="g4256">
- <path
- inkscape:connector-curvature="0"
- id="rect4140"
- d="m 265.62633,432.93954 0,7.87298 c 0,4.36157 -2.93599,7.87288 \
-6.58294,7.87288 l -39.4976,0 c -3.64695,0 -6.58294,-3.51131 -6.58294,-7.87288 l \
0,-7.87298"
- style="fill:none;fill-opacity:1;stroke:#000000;stroke-width:3.54330683;stroke-linecap:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" \
/>
- <path
- inkscape:connector-curvature="0"
- id="path4153"
- d="m 218.2336,442.58437 42.12198,0"
- style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:1.77165365;st \
roke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" \
/>
- <path
- inkscape:connector-curvature="0"
- id="path4153-2"
- d="m 218.2336,437.70445 42.12198,0"
- style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:1.77165365;st \
roke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" \
/>
- <g
- transform="matrix(1.4118814,0,0,-1.4118814,-606.07332,1656.9417)"
- id="g7883">
- <path
- inkscape:connector-curvature="0"
- style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:none"
- d="m 598.58794,889.75054 0.0659,-0.1417 c 0.97995,-2.08545 \
1.95973,-4.17081 2.93963,-6.25616 l 0.0528,-0.11242 -0.11433,0 c -1.85373,0 \
-3.70899,0 -5.56278,0 l -0.10987,0 0.044,0.11242 c 0.87389,2.08535 1.74931,4.17071 \
2.6232,6.25616 l 0.0619,0.1417 z"
- id="path3507-6-8-1-6-5-3"
- sodipodi:nodetypes="cccccccccc" />
- <path
- style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:2.07747102; \
stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
- d="m 598.75275,872.19645 0,12.46483"
- id="path5153-5"
- inkscape:connector-curvature="0" />
- </g>
- <path
- inkscape:connector-curvature="0"
- id="path4153-2-1"
- d="m 218.2336,397.72349 42.12198,0"
- style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:1.77165365;st \
roke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" \
/>
- </g>
- </g>
</svg>
diff --git a/src/activities/paint/resource/pattern2.svg \
b/src/activities/paint/resource/pattern2.svg deleted file mode 100644
index 7173b2c..0000000
--- a/src/activities/paint/resource/pattern2.svg
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generated by IcoMoon.io -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" \
"http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
-<svg version="1.1" xmlns="http://www.w3.org/2000/svg" \
xmlns:xlink="http://www.w3.org/1999/xlink" width="512" height="512" viewBox="0 0 512 \
512">
-<g>
-</g>
- <path d="M67.133 37.755l7.219-6c21.586-19.221 55.214-16.825 73.82 5.376l43.797 \
50.402-86.436 75.038-43.797-50.422c-19.21-21.596-16.794-55.194 \
5.396-74.394v0zM204.585 101.929l-13.814 12.001 204.053 234.68 \
13.783-12.002-204.022-234.68zM383.385 358.205l-204.022-234.66-11.397 10.22 204.053 \
234.639 11.366-10.199zM359.998 378.614l-203.417-234.639-13.834 12.001 204.042 234.66 \
13.209-12.022zM334.776 400.21l-13.179 11.418-203.448-234.66 13.2-11.417 203.428 \
234.66zM421.202 351.007l42.025 142.224-129.044-67.205 87.019-75.018z" fill="#000000" \
/>
- <path d="M154.931 144.333l18.309-16.2 203.643 233.933-23.931 21.842z" \
fill="#000000" />
-</svg>
diff --git a/src/activities/paint/resource/pattern3.svg \
b/src/activities/paint/resource/pattern3.svg deleted file mode 100644
index 7173b2c..0000000
--- a/src/activities/paint/resource/pattern3.svg
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generated by IcoMoon.io -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" \
"http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
-<svg version="1.1" xmlns="http://www.w3.org/2000/svg" \
xmlns:xlink="http://www.w3.org/1999/xlink" width="512" height="512" viewBox="0 0 512 \
512">
-<g>
-</g>
- <path d="M67.133 37.755l7.219-6c21.586-19.221 55.214-16.825 73.82 5.376l43.797 \
50.402-86.436 75.038-43.797-50.422c-19.21-21.596-16.794-55.194 \
5.396-74.394v0zM204.585 101.929l-13.814 12.001 204.053 234.68 \
13.783-12.002-204.022-234.68zM383.385 358.205l-204.022-234.66-11.397 10.22 204.053 \
234.639 11.366-10.199zM359.998 378.614l-203.417-234.639-13.834 12.001 204.042 234.66 \
13.209-12.022zM334.776 400.21l-13.179 11.418-203.448-234.66 13.2-11.417 203.428 \
234.66zM421.202 351.007l42.025 142.224-129.044-67.205 87.019-75.018z" fill="#000000" \
/>
- <path d="M154.931 144.333l18.309-16.2 203.643 233.933-23.931 21.842z" \
fill="#000000" />
-</svg>
diff --git a/src/activities/paint/resource/pencil.svg \
b/src/activities/paint/resource/pencil.svg deleted file mode 100644
index 7173b2c..0000000
--- a/src/activities/paint/resource/pencil.svg
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generated by IcoMoon.io -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" \
"http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
-<svg version="1.1" xmlns="http://www.w3.org/2000/svg" \
xmlns:xlink="http://www.w3.org/1999/xlink" width="512" height="512" viewBox="0 0 512 \
512">
-<g>
-</g>
- <path d="M67.133 37.755l7.219-6c21.586-19.221 55.214-16.825 73.82 5.376l43.797 \
50.402-86.436 75.038-43.797-50.422c-19.21-21.596-16.794-55.194 \
5.396-74.394v0zM204.585 101.929l-13.814 12.001 204.053 234.68 \
13.783-12.002-204.022-234.68zM383.385 358.205l-204.022-234.66-11.397 10.22 204.053 \
234.639 11.366-10.199zM359.998 378.614l-203.417-234.639-13.834 12.001 204.042 234.66 \
13.209-12.022zM334.776 400.21l-13.179 11.418-203.448-234.66 13.2-11.417 203.428 \
234.66zM421.202 351.007l42.025 142.224-129.044-67.205 87.019-75.018z" fill="#000000" \
/>
- <path d="M154.931 144.333l18.309-16.2 203.643 233.933-23.931 21.842z" \
fill="#000000" />
-</svg>
diff --git a/src/activities/paint/resource/save.svg \
b/src/activities/paint/resource/save.svg index c53cbd6..69f8efc 100644
--- a/src/activities/paint/resource/save.svg
+++ b/src/activities/paint/resource/save.svg
@@ -1,303 +1,234 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
<svg
- xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
- xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
- xmlns="http://www.w3.org/2000/svg"
- xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
- xmlns:cc="http://creativecommons.org/ns#"
- xmlns:xlink="http://www.w3.org/1999/xlink"
- xmlns:dc="http://purl.org/dc/elements/1.1/"
- xmlns:svg="http://www.w3.org/2000/svg"
- xmlns:ns1="http://sozi.baierouge.fr"
- id="svg2"
- sodipodi:docname="Save.svg"
- inkscape:export-filename="C:\Users\Joshua\Documents\Visual Studio \
2005\Projects\Flash-cards_share_code\Flash-Cards Wpf\Flash-Cards Wpf\Svg \
Package\Save.png"
- viewBox="0 0 394.49 397.34"
- sodipodi:version="0.32"
- inkscape:export-xdpi="22.650465"
- version="1.0"
- inkscape:output_extension="org.inkscape.output.svg.inkscape"
- inkscape:export-ydpi="22.650465"
- inkscape:version="0.46"
- >
+ 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"
+ id="svg2"
+ sodipodi:docname="save.svg"
+ inkscape:export-filename="C:\Users\Joshua\Documents\Visual Studio \
2005\Projects\Flash-cards_share_code\Flash-Cards Wpf\Flash-Cards Wpf\Svg \
Package\Save.png" + viewBox="0 0 394.49 397.34"
+ sodipodi:version="0.32"
+ inkscape:export-xdpi="22.650465"
+ version="1.0"
+ inkscape:output_extension="org.inkscape.output.svg.inkscape"
+ inkscape:export-ydpi="22.650465"
+ inkscape:version="0.91 r13725">
<defs
- id="defs4"
- >
+ id="defs4">
<linearGradient
- id="linearGradient3176"
- >
+ id="linearGradient3176">
<stop
- id="stop3178"
- style="stop-color:#dddddd"
- offset="0"
- />
+ id="stop3178"
+ style="stop-color:#dddddd"
+ offset="0" />
<stop
- id="stop3180"
- style="stop-color:#b3b3b3"
- offset="1"
- />
- </linearGradient
- >
+ id="stop3180"
+ style="stop-color:#b3b3b3"
+ offset="1" />
+ </linearGradient>
<linearGradient
- id="linearGradient2405"
- y2="1155.5"
- xlink:href="#linearGradient3176"
- gradientUnits="userSpaceOnUse"
- x2="745.71"
- gradientTransform="matrix(1.0114 0 0 .99960 -478.41 -660.99)"
- y1="983.5"
- x1="745.71"
- inkscape:collect="always"
- />
+ id="linearGradient2405"
+ y2="1155.5"
+ xlink:href="#linearGradient3176"
+ gradientUnits="userSpaceOnUse"
+ x2="745.71"
+ gradientTransform="matrix(1.0114,0,0,0.9996,-478.41,-660.99)"
+ y1="983.5"
+ x1="745.71"
+ inkscape:collect="always" />
<linearGradient
- id="linearGradient2415"
- y2="1155.5"
- xlink:href="#linearGradient3176"
- gradientUnits="userSpaceOnUse"
- x2="745.71"
- gradientTransform="matrix(.76799 0 0 .73304 -274.12 -149.77)"
- y1="983.5"
- x1="745.71"
- inkscape:collect="always"
- />
- </defs
- >
+ id="linearGradient2415"
+ y2="1155.5"
+ xlink:href="#linearGradient3176"
+ gradientUnits="userSpaceOnUse"
+ x2="745.71"
+ gradientTransform="matrix(0.76799,0,0,0.73304,-274.12,-149.77)"
+ y1="983.5"
+ x1="745.71"
+ inkscape:collect="always" />
+ </defs>
<sodipodi:namedview
- id="base"
- bordercolor="#666666"
- inkscape:pageshadow="2"
- guidetolerance="10"
- pagecolor="#ffffff"
- gridtolerance="10000"
- inkscape:window-height="914"
- inkscape:zoom="0.175"
- objecttolerance="10"
- showgrid="false"
- borderopacity="1.0"
- inkscape:current-layer="layer1"
- inkscape:cx="-998.84691"
- inkscape:cy="1764.1992"
- inkscape:window-y="-8"
- inkscape:window-x="-8"
- inkscape:window-width="1280"
- inkscape:pageopacity="0.0"
- inkscape:document-units="px"
- />
+ id="base"
+ bordercolor="#666666"
+ inkscape:pageshadow="2"
+ guidetolerance="10"
+ pagecolor="#ffffff"
+ gridtolerance="10000"
+ inkscape:window-height="1176"
+ inkscape:zoom="0.175"
+ objecttolerance="10"
+ showgrid="false"
+ borderopacity="1.0"
+ inkscape:current-layer="layer1"
+ inkscape:cx="-2390.2755"
+ inkscape:cy="1764.1992"
+ inkscape:window-y="24"
+ inkscape:window-x="65"
+ inkscape:window-width="1855"
+ inkscape:pageopacity="0.0"
+ inkscape:document-units="px"
+ inkscape:window-maximized="1" />
<g
- id="layer1"
- inkscape:label="Layer 1"
- inkscape:groupmode="layer"
- transform="translate(-89.197 -310.55)"
- >
- <path
- id="path3223"
- style="fill-rule:evenodd;stroke:#1532c6;stroke-width:10.2;fill:#999eff"
- d="m94.297 315.65v345.71l41.433 41.43h342.85v-385.71l-384.28-1.43z"
- />
- <rect
- id="rect3219"
- ry="7.3214"
- style="fill-rule:evenodd;fill:#eef8f1"
- rx="0"
- transform="scale(-1)"
- height="14.643"
- width="373.53"
- y="-336.47"
- x="-473.24"
- />
- <rect
- id="rect3211"
- style="stroke:#4c48ff;stroke-width:12.144;fill:none"
- rx="0"
- ry="46.388"
- height="157"
- width="267"
- y="342.51"
- x="142.02"
- />
- <rect
- id="rect2396"
- style="fill-rule:evenodd;stroke:#ffffff;stroke-width:11.839;fill:url(#linearGradient2405)"
- rx="0"
- ry="47.322"
- height="160.16"
- width="248.73"
- y="328.01"
- x="151.4"
- />
- <rect
- id="rect3184"
- style="fill-rule:evenodd;fill:url(#linearGradient2415)"
- rx="0"
- ry="34.703"
- height="117.45"
- width="188.88"
- y="575.5"
- x="204.14"
- />
- <rect
- id="rect3188"
- style="fill-rule:evenodd;fill:#395bff"
- rx="0"
- ry="17.143"
- height="68.571"
- width="54.286"
- y="594.22"
- x="226.87"
- />
- <rect
- id="rect3190"
- style="fill-rule:evenodd;fill:#c6c6c6"
- rx="0"
- ry="7.3214"
- height="14.643"
- width="56.429"
- y="656.72"
- x="225.8"
- />
- <rect
- id="rect3192"
- style="fill-rule:evenodd;fill:#c6c6c6"
- transform="rotate(-90)"
- rx="0"
- ry="7.3214"
- height="14.643"
- width="117.04"
- y="390.42"
- x="-693.15"
- />
- <rect
- id="rect3194"
- style="fill-rule:evenodd;fill:#c6c6c6"
- transform="rotate(-90)"
- rx="0"
- ry="7.3214"
- height="14.643"
- width="117.04"
- y="190.39"
- x="-693.13"
- />
- <rect
- id="rect3196"
- style="fill-rule:evenodd;fill:#dedede"
- transform="scale(-1)"
- rx="0"
- ry="7.3214"
- height="14.643"
- width="214.6"
- y="-581.3"
- x="-405.02"
- />
- <rect
- id="rect3198"
- style="stroke:#161616;stroke-width:13.897;fill:none"
- rx="0"
- ry="35.37"
- height="139.78"
- width="227.43"
- y="559.74"
- x="184.27"
- />
- </g
- >
+ id="layer1"
+ inkscape:label="Layer 1"
+ inkscape:groupmode="layer"
+ transform="translate(-89.197 -310.55)">
+ <g
+ id="g4150"
+ transform="matrix(1,0,0,-1,0,1018.44)">
+ <path
+ d="m 94.297,315.65 0,345.71 41.433,41.43 342.85,0 0,-385.71 -384.28,-1.43 \
z" + style="fill:#999eff;fill-rule:evenodd;stroke:#1532c6;stroke-width:10.19999981"
+ id="path3223"
+ inkscape:connector-curvature="0" />
+ <rect
+ x="-473.23999"
+ y="-336.47"
+ width="373.53"
+ height="14.643"
+ transform="scale(-1,-1)"
+ rx="0"
+ style="fill:#eef8f1;fill-rule:evenodd"
+ ry="7.3214002"
+ id="rect3219" />
+ <rect
+ x="142.02"
+ y="342.51001"
+ width="267"
+ height="157"
+ ry="46.388"
+ rx="0"
+ style="fill:none;stroke:#4c48ff;stroke-width:12.14400005"
+ id="rect3211" />
+ <rect
+ x="151.39999"
+ y="328.01001"
+ width="248.73"
+ height="160.16"
+ ry="47.321999"
+ rx="0"
+ style="fill:url(#linearGradient2405);fill-rule:evenodd;stroke:#ffffff;stroke-width:11.83899975"
+ id="rect2396" />
+ <rect
+ x="204.14"
+ y="575.5"
+ width="188.88"
+ height="117.45"
+ ry="34.702999"
+ rx="0"
+ style="fill:url(#linearGradient2415);fill-rule:evenodd"
+ id="rect3184" />
+ <rect
+ x="226.87"
+ y="594.21997"
+ width="54.285999"
+ height="68.570999"
+ ry="17.143"
+ rx="0"
+ style="fill:#395bff;fill-rule:evenodd"
+ id="rect3188" />
+ <rect
+ x="225.8"
+ y="656.71997"
+ width="56.429001"
+ height="14.643"
+ ry="7.3214002"
+ rx="0"
+ style="fill:#c6c6c6;fill-rule:evenodd"
+ id="rect3190" />
+ <rect
+ x="-693.15002"
+ y="390.42001"
+ width="117.04"
+ height="14.643"
+ ry="7.3214002"
+ rx="0"
+ transform="matrix(0,-1,1,0,0,0)"
+ style="fill:#c6c6c6;fill-rule:evenodd"
+ id="rect3192" />
+ <rect
+ x="-693.13"
+ y="190.39"
+ width="117.04"
+ height="14.643"
+ ry="7.3214002"
+ rx="0"
+ transform="matrix(0,-1,1,0,0,0)"
+ style="fill:#c6c6c6;fill-rule:evenodd"
+ id="rect3194" />
+ <rect
+ x="-405.01999"
+ y="-581.29999"
+ width="214.60001"
+ height="14.643"
+ ry="7.3214002"
+ rx="0"
+ transform="scale(-1,-1)"
+ style="fill:#dedede;fill-rule:evenodd"
+ id="rect3196" />
+ <rect
+ x="184.27"
+ y="559.73999"
+ width="227.42999"
+ height="139.78"
+ ry="35.369999"
+ rx="0"
+ style="fill:none;stroke:#161616;stroke-width:13.89700031"
+ id="rect3198" />
+ </g>
+ </g>
<metadata
- >
- <rdf:RDF
- >
- <cc:Work
- >
- <dc:format
- >image/svg+xml</dc:format
- >
+ id="metadata22">
+ <rdf:RDF>
+ <cc:Work>
+ <dc:format>image/svg+xml</dc:format>
<dc:type
- rdf:resource="http://purl.org/dc/dcmitype/StillImage"
- />
+ rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
<cc:license
- rdf:resource="http://creativecommons.org/licenses/publicdomain/"
- />
- <dc:publisher
- >
+ rdf:resource="http://creativecommons.org/publicdomain/zero/1.0/" />
+ <dc:publisher>
<cc:Agent
- rdf:about="http://openclipart.org/"
- >
- <dc:title
- >Openclipart</dc:title
- >
- </cc:Agent
- >
- </dc:publisher
- >
- <dc:title
- >Save</dc:title
- >
- <dc:date
- >2010-04-07T19:41:46</dc:date
- >
- <dc:description
- />
- <dc:source
- >https://openclipart.org/detail/38959/save-by-mightyman</dc:source
- >
- <dc:creator
- >
- <cc:Agent
- >
- <dc:title
- >mightyman</dc:title
- >
- </cc:Agent
- >
- </dc:creator
- >
- <dc:subject
- >
- <rdf:Bag
- >
- <rdf:li
- >button icon</rdf:li
- >
- <rdf:li
- >floppy disk</rdf:li
- >
- <rdf:li
- >icon</rdf:li
- >
- <rdf:li
- >save</rdf:li
- >
- <rdf:li
- >save file</rdf:li
- >
- <rdf:li
- >toolbar</rdf:li
- >
- <rdf:li
- >toolbar icon</rdf:li
- >
- </rdf:Bag
- >
- </dc:subject
- >
- </cc:Work
- >
+ rdf:about="http://openclipart.org/">
+ <dc:title>Openclipart</dc:title>
+ </cc:Agent>
+ </dc:publisher>
+ <dc:title>Save</dc:title>
+ <dc:date>2010-04-07T19:41:46</dc:date>
+ <dc:description />
+ <dc:source>https://openclipart.org/detail/38959/save-by-mightyman</dc:source>
+ <dc:creator>
+ <cc:Agent>
+ <dc:title>mightyman</dc:title>
+ </cc:Agent>
+ </dc:creator>
+ <dc:subject>
+ <rdf:Bag>
+ <rdf:li>button icon</rdf:li>
+ <rdf:li>floppy disk</rdf:li>
+ <rdf:li>icon</rdf:li>
+ <rdf:li>save</rdf:li>
+ <rdf:li>save file</rdf:li>
+ <rdf:li>toolbar</rdf:li>
+ <rdf:li>toolbar icon</rdf:li>
+ </rdf:Bag>
+ </dc:subject>
+ </cc:Work>
<cc:License
- rdf:about="http://creativecommons.org/licenses/publicdomain/"
- >
+ rdf:about="http://creativecommons.org/publicdomain/zero/1.0/">
<cc:permits
- rdf:resource="http://creativecommons.org/ns#Reproduction"
- />
+ rdf:resource="http://creativecommons.org/ns#Reproduction" />
<cc:permits
- rdf:resource="http://creativecommons.org/ns#Distribution"
- />
+ rdf:resource="http://creativecommons.org/ns#Distribution" />
<cc:permits
- rdf:resource="http://creativecommons.org/ns#DerivativeWorks"
- />
- </cc:License
- >
- </rdf:RDF
- >
- </metadata
- >
-</svg
->
+ rdf:resource="http://creativecommons.org/ns#DerivativeWorks" />
+ </cc:License>
+ </rdf:RDF>
+ </metadata>
+</svg>
diff --git a/src/activities/paint/resource/spray.svg \
b/src/activities/paint/resource/spray.svg deleted file mode 100644
index 7173b2c..0000000
--- a/src/activities/paint/resource/spray.svg
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generated by IcoMoon.io -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" \
"http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
-<svg version="1.1" xmlns="http://www.w3.org/2000/svg" \
xmlns:xlink="http://www.w3.org/1999/xlink" width="512" height="512" viewBox="0 0 512 \
512">
-<g>
-</g>
- <path d="M67.133 37.755l7.219-6c21.586-19.221 55.214-16.825 73.82 5.376l43.797 \
50.402-86.436 75.038-43.797-50.422c-19.21-21.596-16.794-55.194 \
5.396-74.394v0zM204.585 101.929l-13.814 12.001 204.053 234.68 \
13.783-12.002-204.022-234.68zM383.385 358.205l-204.022-234.66-11.397 10.22 204.053 \
234.639 11.366-10.199zM359.998 378.614l-203.417-234.639-13.834 12.001 204.042 234.66 \
13.209-12.022zM334.776 400.21l-13.179 11.418-203.448-234.66 13.2-11.417 203.428 \
234.66zM421.202 351.007l42.025 142.224-129.044-67.205 87.019-75.018z" fill="#000000" \
/>
- <path d="M154.931 144.333l18.309-16.2 203.643 233.933-23.931 21.842z" \
fill="#000000" />
-</svg>
diff --git a/src/activities/paint/resource/tools.svg \
b/src/activities/paint/resource/tools.svg deleted file mode 100644
index 7173b2c..0000000
--- a/src/activities/paint/resource/tools.svg
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generated by IcoMoon.io -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" \
"http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
-<svg version="1.1" xmlns="http://www.w3.org/2000/svg" \
xmlns:xlink="http://www.w3.org/1999/xlink" width="512" height="512" viewBox="0 0 512 \
512">
-<g>
-</g>
- <path d="M67.133 37.755l7.219-6c21.586-19.221 55.214-16.825 73.82 5.376l43.797 \
50.402-86.436 75.038-43.797-50.422c-19.21-21.596-16.794-55.194 \
5.396-74.394v0zM204.585 101.929l-13.814 12.001 204.053 234.68 \
13.783-12.002-204.022-234.68zM383.385 358.205l-204.022-234.66-11.397 10.22 204.053 \
234.639 11.366-10.199zM359.998 378.614l-203.417-234.639-13.834 12.001 204.042 234.66 \
13.209-12.022zM334.776 400.21l-13.179 11.418-203.448-234.66 13.2-11.417 203.428 \
234.66zM421.202 351.007l42.025 142.224-129.044-67.205 87.019-75.018z" fill="#000000" \
/>
- <path d="M154.931 144.333l18.309-16.2 203.643 233.933-23.931 21.842z" \
fill="#000000" />
-</svg>
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic