[-]
[+]
|
Changed |
_service:tar_git:harbour-scribble.spec
|
|
|
Changed |
_service
^
|
[-]
[+]
|
Changed |
_service:tar_git:harbour-scribble-0.6.tar.bz2/README.md
^
|
@@ -1,7 +1,10 @@
# harbour-scribble
Scribble is a fast and lightweight app for hand drawings and sketches.
-It offers some tweaks like painting on background images, adjusting colors / strokewidth or two-finger clicks for straight lines. You may even disable system gestures, if they get in your way while drawing. A small lock symbol reminds you to re-enable them in order to close the app later.
+It offers some tweaks like painting on background images, adjusting colors / strokewidth or two-finger clicks for straight lines.
+
+## Deprecated
+You may even disable system gestures, if they get in your way while drawing. A small lock symbol reminds you to re-enable them in order to close the app later.
## Contribute
@@ -13,4 +16,4 @@
Tobias wrote Imageworks and poetaster is developing and maintaining in future.
-2021 - Mark Washeim <blueprint@poetaster.de>
+2021-22 - Mark Washeim <blueprint@poetaster.de>
|
[-]
[+]
|
Changed |
_service:tar_git:harbour-scribble-0.6.tar.bz2/harbour-scribble.desktop
^
|
@@ -4,6 +4,12 @@
Icon=harbour-scribble
Exec=harbour-scribble
Name=Scribble
+
+[X-Sailjail]
+OrganizationName=de.poetaster
+ApplicationName=harbour-scribble
+Permissions=UserDirs;MediaIndexing;RemovableMedia
+
# translation example:
# your app name in German locale (de)
#
|
[-]
[+]
|
Changed |
_service:tar_git:harbour-scribble-0.6.tar.bz2/harbour-scribble.pro
^
|
@@ -19,14 +19,12 @@
DISTFILES += qml/harbour-scribble.qml \
qml/cover/CoverPage.qml \
qml/pages/FirstPage.qml \
+ qml/symbols/*.svg \
rpm/harbour-scribble.changes.in \
rpm/harbour-scribble.changes.run.in \
rpm/harbour-scribble.spec \
- rpm/harbour-scribble.yaml \
translations/*.ts \
- harbour-scribble.desktop \
- translations/harbour-scribble-zh_CN. ts \
- translations/harbour-scribble-zh_CN. ts
+ harbour-scribble.desktop
SAILFISHAPP_ICONS = 86x86 108x108 128x128 172x172
@@ -38,6 +36,7 @@
# planning to localize your app, remember to comment out the
# following TRANSLATIONS line. And also do not forget to
# modify the localized app name in the the .desktop file.
-TRANSLATIONS += translations/harbour-scribble-de.ts
+TRANSLATIONS += translations/harbour-scribble-de.ts \
+ translations/harbour-scribble-zh_CN.ts \
HEADERS +=
|
[-]
[+]
|
Changed |
_service:tar_git:harbour-scribble-0.6.tar.bz2/harbour-scribble.pro.user
^
|
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE QtCreatorProject>
-<!-- Written by QtCreator 4.12.2, 2021-04-06T14:58:31. -->
+<!-- Written by QtCreator 4.15.2, 2022-02-19T17:56:44. -->
<qtcreator>
<data>
<variable>EnvironmentId</variable>
@@ -37,6 +37,7 @@
<value type="bool" key="EditorConfiguration.MouseHiding">true</value>
<value type="bool" key="EditorConfiguration.MouseNavigation">true</value>
<value type="int" key="EditorConfiguration.PaddingMode">1</value>
+ <value type="bool" key="EditorConfiguration.PreferSingleLineComments">false</value>
<value type="bool" key="EditorConfiguration.ScrollWheelZooming">true</value>
<value type="bool" key="EditorConfiguration.ShowMargin">false</value>
<value type="int" key="EditorConfiguration.SmartBackspaceBehavior">0</value>
@@ -45,20 +46,35 @@
<value type="int" key="EditorConfiguration.TabKeyBehavior">0</value>
<value type="int" key="EditorConfiguration.TabSize">8</value>
<value type="bool" key="EditorConfiguration.UseGlobal">true</value>
+ <value type="bool" key="EditorConfiguration.UseIndenter">false</value>
<value type="int" key="EditorConfiguration.Utf8BomBehavior">1</value>
<value type="bool" key="EditorConfiguration.addFinalNewLine">true</value>
<value type="bool" key="EditorConfiguration.cleanIndentation">true</value>
<value type="bool" key="EditorConfiguration.cleanWhitespace">true</value>
+ <value type="QString" key="EditorConfiguration.ignoreFileTypes">*.md, *.MD, Makefile</value>
<value type="bool" key="EditorConfiguration.inEntireDocument">false</value>
+ <value type="bool" key="EditorConfiguration.skipTrailingWhitespace">true</value>
</valuemap>
</data>
<data>
<variable>ProjectExplorer.Project.PluginSettings</variable>
<valuemap type="QVariantMap">
+ <valuemap type="QVariantMap" key="AutoTest.ActiveFrameworks">
+ <value type="bool" key="AutoTest.Framework.Boost">true</value>
+ <value type="bool" key="AutoTest.Framework.CTest">false</value>
+ <value type="bool" key="AutoTest.Framework.Catch">true</value>
+ <value type="bool" key="AutoTest.Framework.GTest">true</value>
+ <value type="bool" key="AutoTest.Framework.QtQuickTest">true</value>
+ <value type="bool" key="AutoTest.Framework.QtTest">true</value>
+ </valuemap>
+ <valuemap type="QVariantMap" key="AutoTest.CheckStates"/>
+ <value type="int" key="AutoTest.RunAfterBuild">0</value>
+ <value type="bool" key="AutoTest.UseGlobal">true</value>
<valuelist type="QVariantList" key="ClangCodeModel.CustomCommandLineKey"/>
<value type="bool" key="ClangCodeModel.UseGlobalConfig">true</value>
<value type="QString" key="ClangCodeModel.WarningConfigId">Builtin.Questionable</value>
<valuemap type="QVariantMap" key="ClangTools">
+ <value type="bool" key="ClangTools.AnalyzeOpenFiles">false</value>
<value type="bool" key="ClangTools.BuildBeforeAnalysis">true</value>
<value type="QString" key="ClangTools.DiagnosticConfig">Builtin.DefaultTidyAndClazy</value>
<value type="int" key="ClangTools.ParallelJobs">2</value>
@@ -72,19 +88,22 @@
<data>
<variable>ProjectExplorer.Project.Target.0</variable>
<valuemap type="QVariantMap">
- <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">SailfishOS-4.0.1.48-i486 (in Sailfish OS Build Engine)</value>
- <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName">SailfishOS-4.0.1.48-i486 (in Sailfish OS Build Engine)</value>
- <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">SailfishOS-4.0.1.48-i486</value>
+ <value type="QString" key="DeviceType">Mer.Device.Type</value>
+ <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">SailfishOS-4.3.0.12-armv7hl (in Sailfish SDK Build Engine)</value>
+ <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName">SailfishOS-4.3.0.12-armv7hl (in Sailfish SDK Build Engine)</value>
+ <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">{3af74a5d-ebf1-4d97-8bad-0a4dfbc1c285}</value>
<value type="int" key="ProjectExplorer.Target.ActiveBuildConfiguration">1</value>
- <value type="int" key="ProjectExplorer.Target.ActiveDeployConfiguration">1</value>
- <value type="int" key="ProjectExplorer.Target.ActiveRunConfiguration">1</value>
+ <value type="int" key="ProjectExplorer.Target.ActiveDeployConfiguration">0</value>
+ <value type="int" key="ProjectExplorer.Target.ActiveRunConfiguration">0</value>
<valuemap type="QVariantMap" key="ProjectExplorer.Target.BuildConfiguration.0">
- <value type="bool">true</value>
<value type="int" key="EnableQmlDebugging">0</value>
+ <value type="bool" key="MerBuildConfiguration.SignPackages">false</value>
+ <value type="QString" key="MerBuildConfiguration.SigningPassphraseFile"></value>
+ <value type="QString" key="MerBuildConfiguration.SigningUser">mark washeim <blueprint@poetaster.de> [1E9C8B72D3BFF67F6B2C729CDCCDDCEE92836931]</value>
<value type="QString" key="MerSfdkConfigurationAspect.Options"></value>
<value type="QString" key="MerSpecFileAspect.Path"></value>
- <value type="QString" key="ProjectExplorer.BuildConfiguration.BuildDirectory">/home/mwa/src/sailfish/build-harbour-scribble-SailfishOS_4_0_1_48_i486_in_Sailfish_OS_Build_Engine-Debug</value>
- <value type="QString" key="ProjectExplorer.BuildConfiguration.BuildDirectory.shadowDir">/home/mwa/src/sailfish/build-harbour-scribble-SailfishOS_4_0_1_48_i486_in_Sailfish_OS_Build_Engine-Debug</value>
+ <value type="QString" key="ProjectExplorer.BuildConfiguration.BuildDirectory">/home/mwa/src/sailfish/build-harbour-scribble-SailfishOS_4_3_0_12_armv7hl_in_Sailfish_SDK_Build_Engine-Debug</value>
+ <value type="QString" key="ProjectExplorer.BuildConfiguration.BuildDirectory.shadowDir">/home/mwa/src/sailfish/build-harbour-scribble-SailfishOS_4_3_0_12_armv7hl_in_Sailfish_SDK_Build_Engine-Debug</value>
<valuemap type="QVariantMap" key="ProjectExplorer.BuildConfiguration.BuildStepList.0">
<valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.0">
<value type="bool" key="ProjectExplorer.BuildStep.Enabled">true</value>
@@ -93,18 +112,12 @@
<valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.1">
<value type="bool" key="ProjectExplorer.BuildStep.Enabled">true</value>
<value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">QtProjectManager.QMakeBuildStep</value>
- <value type="QString" key="QtProjectManager.QMakeBuildStep.QMakeArguments"></value>
<value type="bool" key="QtProjectManager.QMakeBuildStep.QMakeForced">false</value>
<valuelist type="QVariantList" key="QtProjectManager.QMakeBuildStep.SelectedAbis"/>
</valuemap>
<valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.2">
<value type="bool" key="ProjectExplorer.BuildStep.Enabled">true</value>
<value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.MakeStep</value>
- <valuelist type="QVariantList" key="Qt4ProjectManager.MakeStep.BuildTargets"/>
- <value type="bool" key="Qt4ProjectManager.MakeStep.Clean">false</value>
- <value type="QString" key="Qt4ProjectManager.MakeStep.MakeArguments"></value>
- <value type="QString" key="Qt4ProjectManager.MakeStep.MakeCommand"></value>
- <value type="bool" key="Qt4ProjectManager.MakeStep.OverrideMakeflags">false</value>
</valuemap>
<value type="int" key="ProjectExplorer.BuildStepList.StepsCount">3</value>
<value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Build</value>
@@ -117,35 +130,37 @@
<value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">Mer.MerSdkStartStep</value>
</valuemap>
<valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.1">
+ <value type="QString" key="MerClearBuildEnvironmentStep.Arguments">reset</value>
+ <value type="bool" key="ProjectExplorer.BuildStep.Enabled">true</value>
+ <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">Mer.MerClearBuildEnvironmentStep</value>
+ </valuemap>
+ <valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.2">
<value type="bool" key="ProjectExplorer.BuildStep.Enabled">true</value>
<value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.MakeStep</value>
- <valuelist type="QVariantList" key="Qt4ProjectManager.MakeStep.BuildTargets"/>
- <value type="bool" key="Qt4ProjectManager.MakeStep.Clean">true</value>
<value type="QString" key="Qt4ProjectManager.MakeStep.MakeArguments">clean</value>
- <value type="QString" key="Qt4ProjectManager.MakeStep.MakeCommand"></value>
- <value type="bool" key="Qt4ProjectManager.MakeStep.OverrideMakeflags">false</value>
</valuemap>
- <value type="int" key="ProjectExplorer.BuildStepList.StepsCount">2</value>
+ <value type="int" key="ProjectExplorer.BuildStepList.StepsCount">3</value>
<value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Clean</value>
<value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName">Clean</value>
<value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">ProjectExplorer.BuildSteps.Clean</value>
</valuemap>
<value type="int" key="ProjectExplorer.BuildConfiguration.BuildStepListCount">2</value>
<value type="bool" key="ProjectExplorer.BuildConfiguration.ClearSystemEnvironment">false</value>
+ <valuelist type="QVariantList" key="ProjectExplorer.BuildConfiguration.CustomParsers"/>
<valuelist type="QVariantList" key="ProjectExplorer.BuildConfiguration.UserEnvironmentChanges"/>
<value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName">Debug</value>
<value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.Qt4BuildConfiguration</value>
<value type="int" key="Qt4ProjectManager.Qt4BuildConfiguration.BuildConfiguration">2</value>
- <value type="int" key="QtQuickCompiler">2</value>
- <value type="int" key="SeparateDebugInfo">2</value>
+ <value type="int" key="RunSystemFunction">1</value>
</valuemap>
<valuemap type="QVariantMap" key="ProjectExplorer.Target.BuildConfiguration.1">
- <value type="bool">true</value>
- <value type="int" key="EnableQmlDebugging">2</value>
+ <value type="bool" key="MerBuildConfiguration.SignPackages">false</value>
+ <value type="QString" key="MerBuildConfiguration.SigningPassphraseFile"></value>
+ <value type="QString" key="MerBuildConfiguration.SigningUser">mark washeim <blueprint@poetaster.de> [1E9C8B72D3BFF67F6B2C729CDCCDDCEE92836931]</value>
<value type="QString" key="MerSfdkConfigurationAspect.Options"></value>
<value type="QString" key="MerSpecFileAspect.Path"></value>
- <value type="QString" key="ProjectExplorer.BuildConfiguration.BuildDirectory">/home/mwa/src/sailfish/build-harbour-scribble-SailfishOS_4_0_1_48_i486_in_Sailfish_OS_Build_Engine-Release</value>
- <value type="QString" key="ProjectExplorer.BuildConfiguration.BuildDirectory.shadowDir">/home/mwa/src/sailfish/build-harbour-scribble-SailfishOS_4_0_1_48_i486_in_Sailfish_OS_Build_Engine-Release</value>
+ <value type="QString" key="ProjectExplorer.BuildConfiguration.BuildDirectory">/home/mwa/src/sailfish/build-harbour-scribble-SailfishOS_4_3_0_12_armv7hl_in_Sailfish_SDK_Build_Engine-Release</value>
+ <value type="QString" key="ProjectExplorer.BuildConfiguration.BuildDirectory.shadowDir">/home/mwa/src/sailfish/build-harbour-scribble-SailfishOS_4_3_0_12_armv7hl_in_Sailfish_SDK_Build_Engine-Release</value>
<valuemap type="QVariantMap" key="ProjectExplorer.BuildConfiguration.BuildStepList.0">
<valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.0">
<value type="bool" key="ProjectExplorer.BuildStep.Enabled">true</value>
@@ -154,18 +169,12 @@
<valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.1">
<value type="bool" key="ProjectExplorer.BuildStep.Enabled">true</value>
<value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">QtProjectManager.QMakeBuildStep</value>
- <value type="QString" key="QtProjectManager.QMakeBuildStep.QMakeArguments"></value>
<value type="bool" key="QtProjectManager.QMakeBuildStep.QMakeForced">false</value>
<valuelist type="QVariantList" key="QtProjectManager.QMakeBuildStep.SelectedAbis"/>
</valuemap>
<valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.2">
<value type="bool" key="ProjectExplorer.BuildStep.Enabled">true</value>
<value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.MakeStep</value>
- <valuelist type="QVariantList" key="Qt4ProjectManager.MakeStep.BuildTargets"/>
- <value type="bool" key="Qt4ProjectManager.MakeStep.Clean">false</value>
- <value type="QString" key="Qt4ProjectManager.MakeStep.MakeArguments"></value>
- <value type="QString" key="Qt4ProjectManager.MakeStep.MakeCommand"></value>
- <value type="bool" key="Qt4ProjectManager.MakeStep.OverrideMakeflags">false</value>
</valuemap>
<value type="int" key="ProjectExplorer.BuildStepList.StepsCount">3</value>
<value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Build</value>
@@ -178,341 +187,38 @@
<value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">Mer.MerSdkStartStep</value>
</valuemap>
<valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.1">
+ <value type="QString" key="MerClearBuildEnvironmentStep.Arguments">reset</value>
<value type="bool" key="ProjectExplorer.BuildStep.Enabled">true</value>
- <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.MakeStep</value>
- <valuelist type="QVariantList" key="Qt4ProjectManager.MakeStep.BuildTargets"/>
- <value type="bool" key="Qt4ProjectManager.MakeStep.Clean">true</value>
- <value type="QString" key="Qt4ProjectManager.MakeStep.MakeArguments">clean</value>
- <value type="QString" key="Qt4ProjectManager.MakeStep.MakeCommand"></value>
- <value type="bool" key="Qt4ProjectManager.MakeStep.OverrideMakeflags">false</value>
- </valuemap>
- <value type="int" key="ProjectExplorer.BuildStepList.StepsCount">2</value>
- <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Clean</value>
- <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName">Clean</value>
- <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">ProjectExplorer.BuildSteps.Clean</value>
- </valuemap>
- <value type="int" key="ProjectExplorer.BuildConfiguration.BuildStepListCount">2</value>
- <value type="bool" key="ProjectExplorer.BuildConfiguration.ClearSystemEnvironment">false</value>
- <valuelist type="QVariantList" key="ProjectExplorer.BuildConfiguration.UserEnvironmentChanges"/>
- <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName">Release</value>
- <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.Qt4BuildConfiguration</value>
- <value type="int" key="Qt4ProjectManager.Qt4BuildConfiguration.BuildConfiguration">0</value>
- <value type="int" key="QtQuickCompiler">2</value>
- <value type="int" key="SeparateDebugInfo">2</value>
- </valuemap>
- <valuemap type="QVariantMap" key="ProjectExplorer.Target.BuildConfiguration.2">
- <value type="bool">true</value>
- <value type="int" key="EnableQmlDebugging">0</value>
|
[-]
[+]
|
Changed |
_service:tar_git:harbour-scribble-0.6.tar.bz2/qml/pages/FirstPage.qml
^
|
@@ -7,7 +7,7 @@
Page {
id: page
allowedOrientations: Orientation.Portrait
-
+ property bool debug: false
// drawing variables
property var myThickness: [ 0.8, 1.1, 1.3, 1.6, 1.9, 2.1 ]
property var myColors: [
@@ -26,7 +26,9 @@
// path variables
property var backImageFilePath : ""
property string fileName : idFilenameNew.text.toString()
- property var savePath : ""
+ // this is a workaround until we get file picker working.
+
+ property var savePath : StandardPaths.home + '/Pictures/' //.writableLocation(StandardPaths.DocumentsLocation) //StandardPaths.PicturesLocation
// UI variables
property bool displayLock : false
@@ -36,9 +38,11 @@
property bool toolColorsPageVisible: false
property bool toolImageVisible : false
property bool toolThicknessVisible : false
+ property bool toolLineCapVisible : false
property bool toolSaveVisible : false
property var zoomFactorRotation : 1
property var firstDown
+ property string lineCapStyle : 'butt'
// undo variables
property var imageData : []
@@ -75,6 +79,7 @@
id: savePickerPage
ImagePickerPage {
onSelectedContentPropertiesChanged: {
+ if (debug) console.debug(savePath)
savePath = selectedContentProperties.filePath
}
}
@@ -116,12 +121,12 @@
id: idHeaderGrid
width: page.width
height: Theme.itemSizeSmall
- columns: 8
+ columns: 9
IconButton {
id: idUndoButton
enabled: ( (cStep+1) > 0 ) ? true : false
- width: parent.width / 8
+ width: parent.width / 9
height: parent.height
icon.source: "../symbols/icon-m-undo.svg"
icon.width: Theme.iconSizeMedium
@@ -139,6 +144,7 @@
toolImageVisible = false
toolColorsPenVisible = false
toolColorsPageVisible = false
+ toolLineCapVisible = false
freeDrawCanvas.undo_draw()
}
onPressAndHold: {
@@ -153,13 +159,35 @@
}
}
Item {
- width: parent.width / 8
+ width: parent.width / 9
height: parent.height
}
IconButton {
+ id:toolLineCap
+ down: (toolLineCapVisible === true)
+ width: parent.width / 9
+ icon.source: "../symbols/icon-m-line.svg"
+ icon.width: Theme.iconSizeMedium
+ icon.height: Theme.iconSizeMedium
+ icon.scale: 0.85
+ onClicked: {
+ if (toolLineCapVisible === false) {
+ toolLineCapVisible = true
+ }
+ else {
+ toolLineCapVisible = false
+ }
+ toolColorsPenVisible = false
+ toolColorsPageVisible = false
+ toolImageVisible = false
+ toolSaveVisible = false
+ }
+ }
+
+ IconButton {
down: (toolColorsPenVisible === true)
- width: parent.width / 8
+ width: parent.width / 9
icon.width: Theme.iconSizeMedium * 0.6
icon.height: Theme.iconSizeMedium * 0.6
//icon.scale: 0.5
@@ -168,6 +196,7 @@
toolImageVisible = false
toolColorsPageVisible = false
toolSaveVisible = false
+ toolLineCapVisible = false
if (toolColorsPenVisible === false) {
toolColorsPenVisible = true
}
@@ -192,9 +221,10 @@
color: (toolColorsPenVisible === true) ? Theme.highlightColor : paintToolColor
}
}
+
IconButton {
down: (toolThicknessVisible === true)
- width: parent.width / 8
+ width: parent.width / 9
icon.source: "image://theme/icon-m-edit"
icon.width: Theme.iconSizeMedium
icon.height: Theme.iconSizeMedium
@@ -210,6 +240,7 @@
toolColorsPageVisible = false
toolImageVisible = false
toolSaveVisible = false
+ toolLineCapVisible = false
}
Label {
id: idPenSizeLabel
@@ -223,7 +254,7 @@
}
IconButton {
down: (toolImageVisible === true)
- width: parent.width / 8
+ width: parent.width / 9
icon.source: "../symbols/icon-m-backimage.svg"
icon.width: Theme.iconSizeMedium
icon.height: Theme.iconSizeMedium
@@ -233,6 +264,7 @@
toolColorsPenVisible = false
toolColorsPageVisible = false
toolSaveVisible = false
+ toolLineCapVisible = false
if (toolImageVisible === false) {
toolImageVisible = true
}
@@ -243,7 +275,7 @@
}
IconButton {
down: (toolColorsPageVisible === true)
- width: parent.width / 8
+ width: parent.width / 9
icon.source: "../symbols/icon-m-backcolor.svg"
icon.width: Theme.iconSizeMedium
icon.height: Theme.iconSizeMedium
@@ -254,6 +286,7 @@
toolImageVisible = false
toolColorsPenVisible = false
toolSaveVisible = false
+ toolLineCapVisible = false
if (toolColorsPageVisible === false) {
toolColorsPageVisible = true
}
@@ -273,12 +306,12 @@
}
Item {
- width: parent.width / 8
+ width: parent.width / 9
height: parent.height
}
IconButton {
down: (toolSaveVisible === true)
- width: parent.width / 8
+ width: parent.width / 9
icon.source: "image://theme/icon-m-developer-mode"
icon.width: Theme.iconSizeMedium
icon.height: Theme.iconSizeMedium
@@ -293,6 +326,7 @@
toolThicknessVisible = false
toolColorsPenVisible = false
toolColorsPageVisible = false
+ toolLineCapVisible = false
toolImageVisible = false
}
Icon {
@@ -403,7 +437,7 @@
function draw_line() {
var ctx = getContext('2d')
- ctx.lineJoin = ctx.lineCap = 'round'
+ ctx.lineJoin = ctx.lineCap = lineCapStyle
ctx.strokeStyle = paintToolColor
ctx.lineWidth = paintToolSize * paintToolSize * 2
ctx.beginPath()
@@ -415,7 +449,7 @@
function draw_point() {
var ctx = getContext('2d')
- ctx.lineJoin = ctx.lineCap = 'round'
|
[-]
[+]
|
Added |
_service:tar_git:harbour-scribble-0.6.tar.bz2/qml/symbols/icon-m-area.svg
^
|
@@ -0,0 +1,65 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Generator: Adobe Illustrator 19.1.0, 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"
+ viewBox="0 0 64 64"
+ style="enable-background:new 0 0 64 64;"
+ xml:space="preserve"
+ sodipodi:docname="icon-m-area.svg"
+ inkscape:version="0.92.3 (2405546, 2018-03-11)"><metadata
+ id="metadata15"><rdf:RDF><cc:Work
+ rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
+ rdf:resource="http://purl.org/dc/dcmitype/StillImage" /></cc:Work></rdf:RDF></metadata><defs
+ id="defs13">
+
+
+
+
+</defs><sodipodi:namedview
+ pagecolor="#ffffff"
+ bordercolor="#666666"
+ borderopacity="1"
+ objecttolerance="10"
+ gridtolerance="10"
+ guidetolerance="10"
+ inkscape:pageopacity="0"
+ inkscape:pageshadow="2"
+ inkscape:window-width="1920"
+ inkscape:window-height="1055"
+ id="namedview11"
+ showgrid="false"
+ inkscape:zoom="2.6074563"
+ inkscape:cx="-41.74592"
+ inkscape:cy="53.397453"
+ inkscape:window-x="1920"
+ inkscape:window-y="0"
+ inkscape:window-maximized="1"
+ inkscape:current-layer="Layer_1" />
+<rect
+ y="0"
+ x="0"
+ height="64"
+ width="64"
+ style="opacity:0;fill:#ffffff"
+ id="icon-m-file-image_1_" /><path
+ inkscape:connector-curvature="0"
+ id="path7"
+ d="M 50.125,56 H 13.875 C 11.738,56 10,54.262 10,52.125 V 11.875 C 10,9.738 11.738,8 13.875,8 h 36.25 C 52.262,8 54,9.738 54,11.875 v 40.25 C 54,54.262 52.262,56 50.125,56 Z M 13.875,10 C 12.841,10 12,10.841 12,11.875 v 40.25 C 12,53.159 12.841,54 13.875,54 h 36.25 C 51.159,54 52,53.159 52,52.125 V 11.875 C 52,10.841 51.159,10 50.125,10 Z"
+ style="opacity:0.6;fill:#ffffff" />
+<path
+ inkscape:connector-curvature="0"
+ id="path3"
+ d="M 42.005611,43.199328 H 21.995048 c -0.658785,0 -1.194376,-0.535592 -1.194376,-1.194376 V 21.995048 c 0,-0.658785 0.535591,-1.194376 1.194376,-1.194376 h 20.010563 c 0.658126,0 1.193717,0.535591 1.193717,1.194376 v 20.010563 c 0,0.658125 -0.535591,1.193717 -1.193717,1.193717 z"
+ style="fill:#ffffff;stroke-width:1"
+ sodipodi:nodetypes="sssssssss" /></svg>
\ No newline at end of file
|
[-]
[+]
|
Added |
_service:tar_git:harbour-scribble-0.6.tar.bz2/qml/symbols/icon-m-line.svg
^
|
@@ -0,0 +1,143 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Generator: Adobe Illustrator 17.0.1, 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="64px"
+ height="64px"
+ viewBox="0 0 64 64"
+ style="enable-background:new 0 0 64 64;"
+ xml:space="preserve"
+ sodipodi:docname="icon-m-line.svg"
+ inkscape:version="0.92.3 (2405546, 2018-03-11)"><metadata
+ id="metadata15"><rdf:RDF><cc:Work
+ rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
+ rdf:resource="http://purl.org/dc/dcmitype/StillImage" /><dc:title /></cc:Work></rdf:RDF></metadata><defs
+ id="defs13"><inkscape:path-effect
+ effect="spiro"
+ id="path-effect884"
+ is_visible="true" /><marker
+ inkscape:stockid="TriangleInM"
+ orient="auto"
+ refY="0.0"
+ refX="0.0"
+ id="TriangleInM"
+ style="overflow:visible"
+ inkscape:isstock="true"><path
+ id="path980"
+ d="M 5.77,0.0 L -2.88,5.0 L -2.88,-5.0 L 5.77,0.0 z "
+ style="fill-rule:evenodd;stroke:#ffffff;stroke-width:1pt;stroke-opacity:1;fill:#ffffff;fill-opacity:1"
+ transform="scale(-0.4)" /></marker><marker
+ inkscape:stockid="TriangleOutM"
+ orient="auto"
+ refY="0.0"
+ refX="0.0"
+ id="TriangleOutM"
+ style="overflow:visible"
+ inkscape:isstock="true"><path
+ id="path989"
+ d="M 5.77,0.0 L -2.88,5.0 L -2.88,-5.0 L 5.77,0.0 z "
+ style="fill-rule:evenodd;stroke:#ffffff;stroke-width:1pt;stroke-opacity:1;fill:#ffffff;fill-opacity:1"
+ transform="scale(0.4)" /></marker><marker
+ inkscape:stockid="TriangleInS"
+ orient="auto"
+ refY="0.0"
+ refX="0.0"
+ id="TriangleInS"
+ style="overflow:visible"
+ inkscape:isstock="true"><path
+ id="path983"
+ d="M 5.77,0.0 L -2.88,5.0 L -2.88,-5.0 L 5.77,0.0 z "
+ style="fill-rule:evenodd;stroke:#ffffff;stroke-width:1pt;stroke-opacity:1;fill:#ffffff;fill-opacity:1"
+ transform="scale(-0.2)" /></marker><marker
+ inkscape:stockid="Arrow2Send"
+ orient="auto"
+ refY="0.0"
+ refX="0.0"
+ id="Arrow2Send"
+ style="overflow:visible;"
+ inkscape:isstock="true"><path
+ id="path877"
+ style="fill-rule:evenodd;stroke-width:0.625;stroke-linejoin:round;stroke:#ffffff;stroke-opacity:1;fill:#ffffff;fill-opacity:1"
+ d="M 8.7185878,4.0337352 L -2.2072895,0.016013256 L 8.7185884,-4.0017078 C 6.9730900,-1.6296469 6.9831476,1.6157441 8.7185878,4.0337352 z "
+ transform="scale(0.3) rotate(180) translate(-2.3,0)" /></marker><inkscape:path-effect
+ effect="spiro"
+ id="path-effect840"
+ is_visible="true" /><inkscape:path-effect
+ effect="spiro"
+ id="path-effect833"
+ is_visible="true" />
+
+
+
+</defs><sodipodi:namedview
+ pagecolor="#ffffff"
+ bordercolor="#666666"
+ borderopacity="1"
+ objecttolerance="10"
+ gridtolerance="10"
+ guidetolerance="10"
+ inkscape:pageopacity="0"
+ inkscape:pageshadow="2"
+ inkscape:window-width="1920"
+ inkscape:window-height="1055"
+ id="namedview11"
+ showgrid="false"
+ inkscape:zoom="3.6875"
+ inkscape:cx="30.717516"
+ inkscape:cy="46.724294"
+ inkscape:window-x="0"
+ inkscape:window-y="0"
+ inkscape:window-maximized="1"
+ inkscape:current-layer="Layer_1" />
+<rect
+ y="0"
+ x="0"
+ height="64"
+ width="64"
+ style="opacity:0;fill:#ffffff"
+ id="icon-m-battery_1_" /><g
+ id="g7"
+ style="opacity:0.6"
+ transform="rotate(-180,31.999999,32)">
+ <path
+ inkscape:connector-curvature="0"
+ id="path5"
+ d="M 49.729,54 H 14.272 C 11.917,54 10,52.083 10,49.728 V 14.272 C 10,11.917 11.917,10 14.272,10 H 49.729 C 52.084,10 54,11.917 54,14.272 V 49.727 C 54,52.083 52.084,54 49.729,54 Z M 14.272,12 C 13.019,12 12,13.02 12,14.272 V 49.727 C 12,50.98 13.019,52 14.272,52 H 49.729 C 50.981,52 52,50.98 52,49.728 V 14.272 C 52,13.02 50.981,12 49.729,12 Z"
+ style="fill:#ffffff" />
+ </g>
+<rect
+ height="64"
+ width="64"
+ style="opacity:0;fill:#ffffff"
+ id="icon-m-call-recording-off_1_"
+ x="-31.18644"
+ y="-8.1355934" /><rect
+ y="5.9209433"
+ x="9.803196"
+ height="64"
+ width="64"
+ style="opacity:0;fill:#ffffff"
+ id="icon-m-battery_1_-3" /><path
+ inkscape:connector-curvature="0"
+ id="path18"
+ d="M 22.045586,19.734478 43.457692,42.839947 41.990902,44.199322 20.578789,21.093853 Z"
+ style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;font-variant-ligatures:normal;font-variant-position:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-alternates:normal;font-feature-settings:normal;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;writing-mode:lr-tb;direction:ltr;text-orientation:mixed;dominant-baseline:auto;baseline-shift:baseline;text-anchor:start;white-space:normal;shape-padding:0;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;vector-effect:none;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#ffffff;stroke-width:1.2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" /><path
+ inkscape:connector-curvature="0"
+ id="path1868-5"
+ d="m 40.901683,44.911235 a 2.9761507,2.9761507 0 0 1 2.976151,-2.976151 2.9761507,2.9761507 0 0 1 2.976151,2.976151 2.9761507,2.9761507 0 0 1 -2.976151,2.976151 2.9761507,2.9761507 0 0 1 -2.976151,-2.976151 z"
+ style="opacity:1;fill:#ffffff;fill-opacity:1;stroke:#ffffff;stroke-width:1.5;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" /><path
+ inkscape:connector-curvature="0"
+ id="path1868-5-7"
+ d="m 23.098313,19.088765 a 2.9761507,2.9761507 0 0 1 -2.976151,2.976151 2.9761507,2.9761507 0 0 1 -2.976151,-2.976151 2.9761507,2.9761507 0 0 1 2.976151,-2.976151 2.9761507,2.9761507 0 0 1 2.976151,2.976151 z"
+ style="opacity:1;fill:#ffffff;fill-opacity:1;stroke:#ffffff;stroke-width:1.5;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" /></svg>
\ No newline at end of file
|
[-]
[+]
|
Added |
_service:tar_git:harbour-scribble-0.6.tar.bz2/qml/symbols/icon-m-point.svg
^
|
@@ -0,0 +1,125 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Generator: Adobe Illustrator 17.0.1, 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="64px"
+ height="64px"
+ viewBox="0 0 64 64"
+ style="enable-background:new 0 0 64 64;"
+ xml:space="preserve"
+ sodipodi:docname="icon-m-point.svg"
+ inkscape:version="0.92.3 (2405546, 2018-03-11)"><metadata
+ id="metadata15"><rdf:RDF><cc:Work
+ rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
+ rdf:resource="http://purl.org/dc/dcmitype/StillImage" /><dc:title /></cc:Work></rdf:RDF></metadata><defs
+ id="defs13"><marker
+ inkscape:stockid="TriangleInM"
+ orient="auto"
+ refY="0.0"
+ refX="0.0"
+ id="TriangleInM"
+ style="overflow:visible"
+ inkscape:isstock="true"><path
+ id="path980"
+ d="M 5.77,0.0 L -2.88,5.0 L -2.88,-5.0 L 5.77,0.0 z "
+ style="fill-rule:evenodd;stroke:#ffffff;stroke-width:1pt;stroke-opacity:1;fill:#ffffff;fill-opacity:1"
+ transform="scale(-0.4)" /></marker><marker
+ inkscape:stockid="TriangleOutM"
+ orient="auto"
+ refY="0.0"
+ refX="0.0"
+ id="TriangleOutM"
+ style="overflow:visible"
+ inkscape:isstock="true"><path
+ id="path989"
+ d="M 5.77,0.0 L -2.88,5.0 L -2.88,-5.0 L 5.77,0.0 z "
+ style="fill-rule:evenodd;stroke:#ffffff;stroke-width:1pt;stroke-opacity:1;fill:#ffffff;fill-opacity:1"
+ transform="scale(0.4)" /></marker><marker
+ inkscape:stockid="TriangleInS"
+ orient="auto"
+ refY="0.0"
+ refX="0.0"
+ id="TriangleInS"
+ style="overflow:visible"
+ inkscape:isstock="true"><path
+ id="path983"
+ d="M 5.77,0.0 L -2.88,5.0 L -2.88,-5.0 L 5.77,0.0 z "
+ style="fill-rule:evenodd;stroke:#ffffff;stroke-width:1pt;stroke-opacity:1;fill:#ffffff;fill-opacity:1"
+ transform="scale(-0.2)" /></marker><marker
+ inkscape:stockid="Arrow2Send"
+ orient="auto"
+ refY="0.0"
+ refX="0.0"
+ id="Arrow2Send"
+ style="overflow:visible;"
+ inkscape:isstock="true"><path
+ id="path877"
+ style="fill-rule:evenodd;stroke-width:0.625;stroke-linejoin:round;stroke:#ffffff;stroke-opacity:1;fill:#ffffff;fill-opacity:1"
+ d="M 8.7185878,4.0337352 L -2.2072895,0.016013256 L 8.7185884,-4.0017078 C 6.9730900,-1.6296469 6.9831476,1.6157441 8.7185878,4.0337352 z "
+ transform="scale(0.3) rotate(180) translate(-2.3,0)" /></marker><inkscape:path-effect
+ effect="spiro"
+ id="path-effect840"
+ is_visible="true" /><inkscape:path-effect
+ effect="spiro"
+ id="path-effect833"
+ is_visible="true" />
+
+
+
+</defs><sodipodi:namedview
+ pagecolor="#ffffff"
+ bordercolor="#666666"
+ borderopacity="1"
+ objecttolerance="10"
+ gridtolerance="10"
+ guidetolerance="10"
+ inkscape:pageopacity="0"
+ inkscape:pageshadow="2"
+ inkscape:window-width="1920"
+ inkscape:window-height="1055"
+ id="namedview11"
+ showgrid="false"
+ inkscape:zoom="10.429825"
+ inkscape:cx="30.386139"
+ inkscape:cy="32.424724"
+ inkscape:window-x="0"
+ inkscape:window-y="0"
+ inkscape:window-maximized="1"
+ inkscape:current-layer="Layer_1" />
+<rect
+ y="0"
+ x="0"
+ height="64"
+ width="64"
+ style="opacity:0;fill:#ffffff"
+ id="icon-m-battery_1_" /><g
+ id="g7"
+ style="opacity:0.6">
+ <path
+ inkscape:connector-curvature="0"
+ id="path5"
+ d="M 49.729,54 H 14.272 C 11.917,54 10,52.083 10,49.728 V 14.272 C 10,11.917 11.917,10 14.272,10 H 49.729 C 52.084,10 54,11.917 54,14.272 V 49.727 C 54,52.083 52.084,54 49.729,54 Z M 14.272,12 C 13.019,12 12,13.02 12,14.272 V 49.727 C 12,50.98 13.019,52 14.272,52 H 49.729 C 50.981,52 52,50.98 52,49.728 V 14.272 C 52,13.02 50.981,12 49.729,12 Z"
+ style="fill:#ffffff" />
+ </g>
+<path
+ id="path4"
+ d="M 33.995,22.767 C 33.301,22.618 32.648,22.545 32,22.545 c -0.648,0 -1.302,0.072 -1.995,0.222 -4.259,0.916 -7.352,4.743 -7.37,9.107 -0.001,0.046 -0.002,0.086 -0.002,0.126 0,0.04 0.001,0.08 0.002,0.126 0.019,4.364 3.111,8.191 7.37,9.107 0.693,0.149 1.347,0.222 1.995,0.222 0.648,0 1.301,-0.072 1.995,-0.222 4.259,-0.916 7.352,-4.743 7.37,-9.107 10e-4,-0.046 0.002,-0.086 0.002,-0.126 0,-0.039 -10e-4,-0.08 -0.002,-0.126 -0.019,-4.364 -3.111,-8.191 -7.37,-9.107 z"
+ style="opacity:1;fill:#ffffff"
+ inkscape:connector-curvature="0" /><rect
+ height="64"
+ width="64"
+ style="opacity:0;fill:#ffffff"
+ id="icon-m-call-recording-off_1_"
+ x="-31.18644"
+ y="-8.1355934" /></svg>
\ No newline at end of file
|
|
Changed |
_service:tar_git:harbour-scribble-0.6.tar.bz2/screenshot-01_0.png
^
|
|
Changed |
_service:tar_git:harbour-scribble-0.6.tar.bz2/screenshot-02_0.png
^
|
|
Changed |
_service:tar_git:harbour-scribble-0.6.tar.bz2/screenshot-03_0.png
^
|
[-]
[+]
|
Deleted |
_service:tar_git:harbour-scribble.yaml
^
|
@@ -1,44 +0,0 @@
-Name: harbour-scribble
-Summary: Scribble
-Version: 0.4
-Release: 2
-# The contents of the Group field should be one of the groups listed here:
-# https://github.com/mer-tools/spectacle/blob/master/data/GROUPS
-Group: Qt/Qt
-URL: https://github.com/poetaster/harbour-scribble
-License: GPLv3
-# This must be generated before uploading a package to a remote build service.
-# Usually this line does not need to be modified.
-Sources:
-- '%{name}-%{version}.tar.bz2'
-Description: |
- Simple drawing application.
-Configure: none
-Builder: qmake5
-
-# This section specifies build dependencies that are resolved using pkgconfig.
-# This is the preferred way of specifying build dependencies for your package.
-PkgConfigBR:
- - sailfishapp >= 1.0.2
- - Qt5Core
- - Qt5Qml
- - Qt5Quick
-
-# Build dependencies without a pkgconfig setup can be listed here
-# PkgBR:
-# - package-needed-to-build
-
-# Runtime dependencies which are not automatically detected
-Requires:
- - sailfishsilica-qt5 >= 0.10.9
-
-# All installed files
-Files:
- - '%{_bindir}'
- - '%{_datadir}/%{name}'
- - '%{_datadir}/applications/%{name}.desktop'
- - '%{_datadir}/icons/hicolor/*/apps/%{name}.png'
-
-
-# For more information about yaml and what's supported in Sailfish OS
-# build system, please see https://wiki.merproject.org/wiki/Spectacle
|