Skip to content

GitLab

Q
qtdesign-studio
Source
Select Git revision
...
Target
Select Git revision
 
Commits (2)
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 985 additions and 973 deletions
testdata/2d_asset_import_data/v1.1/plugins/sketch/master/expected/master/Button.ui.qml
View file @ 7032f156
......@@ -22,9 +22,10 @@ Item {
height: 68
color: "#ff000000"
text: "Label"
verticalAlignment: Text.AlignVCenter
font.family: "Helvetica"
horizontalAlignment: Text.AlignHCenter
wrapMode: Text.WordWrap
font.family: "Helvetica"
verticalAlignment: Text.AlignVCenter
font.pixelSize: 18
}
......
testdata/2d_asset_import_data/v1.1/plugins/sketch/text/expected/text/Main_page.ui.qml → testdata/2d_asset_import_data/v1.1/plugins/sketch/master/expected/master/Texttest.ui.qml
View file @ 7032f156
import QtQuick 2.8
Item {
id: main_page
width: 307
height: 398
id: texttest
width: 414
height: 896
Image {
id: main_pageAsset
source: "assets/main_page.png"
id: texttestAsset
x: 0
y: 0
source: "assets/texttest.png"
}
Text {
id: this_is_multiline_te
x: 11
y: 293
x: 72
y: 540
width: 270
height: 85
color: "#ff1f1515"
text: "This is multiline text and this \nshould work as expected\näüö ÄÜÖ\nA clever fox jump the the lazy dog. The clever fox jump over the lazy dog. "
font.pixelSize: 14
wrapMode: Text.WordWrap
horizontalAlignment: Text.AlignJustify
wrapMode: Text.WordWrap
font.family: "Helvetica"
verticalAlignment: Text.AlignTop
font.pixelSize: 14
}
Text {
id: a_clever_fox_jump_th
x: 24
y: 201
x: 85
y: 448
width: 233
height: 75
color: "#ff1f1515"
text: "A clever fox jump the the lazy dog. The clever fox jump over the lazy dog. "
horizontalAlignment: Text.AlignJustify
lineHeight: 25
font.pixelSize: 14
wrapMode: Text.WordWrap
font.letterSpacing: 2.5
lineHeightMode: Text.FixedHeight
horizontalAlignment: Text.AlignJustify
wrapMode: Text.WordWrap
font.family: "Helvetica"
verticalAlignment: Text.AlignBottom
font.letterSpacing: 2.5
font.pixelSize: 14
}
Text {
id: element
x: 19
y: 24
x: 80
y: 271
width: 108
height: 49
color: "#ff1f1515"
text: "Left"
font.pixelSize: 14
wrapMode: Text.WordWrap
horizontalAlignment: Text.AlignLeft
wrapMode: Text.WordWrap
font.family: "Helvetica"
verticalAlignment: Text.AlignVCenter
font.pixelSize: 14
}
Text {
id: element1
x: 156
y: 133
x: 217
y: 380
width: 108
height: 49
color: "#ff1f1515"
text: "Bottom"
font.pixelSize: 14
wrapMode: Text.WordWrap
horizontalAlignment: Text.AlignJustify
wrapMode: Text.WordWrap
font.family: "Helvetica"
verticalAlignment: Text.AlignBottom
font.pixelSize: 14
}
Text {
id: middle
x: 156
y: 75
x: 217
y: 322
width: 108
height: 49
color: "#ff1f1515"
text: "Middle"
font.pixelSize: 14
wrapMode: Text.WordWrap
horizontalAlignment: Text.AlignJustify
wrapMode: Text.WordWrap
font.family: "Helvetica"
verticalAlignment: Text.AlignVCenter
font.pixelSize: 14
}
Text {
id: element2
x: 19
y: 144
x: 80
y: 391
width: 108
height: 49
color: "#ff1f1515"
text: "Right"
font.pixelSize: 14
wrapMode: Text.WordWrap
horizontalAlignment: Text.AlignRight
opacity: 0.248
wrapMode: Text.WordWrap
font.family: "Helvetica"
verticalAlignment: Text.AlignVCenter
opacity: 0.248
font.pixelSize: 14
}
Text {
id: middle1
x: 19
y: 79
x: 80
y: 326
width: 108
height: 49
color: "#ff1f1515"
text: "Middle"
font.pixelSize: 14
wrapMode: Text.WordWrap
horizontalAlignment: Text.AlignHCenter
opacity: 0.504
wrapMode: Text.WordWrap
font.family: "Helvetica"
verticalAlignment: Text.AlignVCenter
opacity: 0.504
font.pixelSize: 14
}
Text {
id: element3
x: 156
y: 34
x: 217
y: 281
width: 108
height: 49
color: "#ff1f1515"
text: "Top"
font.pixelSize: 14
wrapMode: Text.WordWrap
horizontalAlignment: Text.AlignJustify
wrapMode: Text.WordWrap
font.family: "Helvetica"
verticalAlignment: Text.AlignTop
font.pixelSize: 14
}
}
/*##^## Designer {
D{i:0;UUID:"5F5B7C90-D445-48A2-97C9-0C3CBF189372"}D{i:1;UUID:"5F5B7C90-D445-48A2-97C9-0C3CBF189372_asset"}
D{i:2;UUID:"E7FCB250-3932-4DED-A300-DC8E6F21A40A"}D{i:3;UUID:"C6C456E8-D2D2-4DA2-BD2D-FF7D4C5D5641"}
D{i:4;UUID:"E25485FC-0810-4C8A-8A1E-17BB89D203FB"}D{i:5;UUID:"42662E35-6808-45E6-A15A-E5A578E25363"}
D{i:6;UUID:"9DACD46E-1EB5-4F8E-A082-F9B73BFD9ABC"}D{i:7;UUID:"9C06B0EA-0C91-457F-8EAC-F054777DD44F"}
D{i:8;UUID:"5E2EC91F-3D23-43C5-A80A-7B733B47E78E"}D{i:9;UUID:"885A8EB5-7489-44C3-9D64-2FF81531B966"}
/*##^##
Designer {
D{i:0;UUID:"7694DDA0-5FFA-4193-B121-92E5C6901C03"}D{i:1;UUID:"7694DDA0-5FFA-4193-B121-92E5C6901C03_asset"}
D{i:2;UUID:"F3A0CE31-25CA-48D3-9D60-505D81D11305"}D{i:3;UUID:"D086D238-3BB3-48A3-A3B9-1DC13F4268FD"}
D{i:4;UUID:"F47CCDD3-84B8-415A-B353-A99F107FDAD8"}D{i:5;UUID:"C8B9E949-A180-48E9-9836-FCF3463DC1EF"}
D{i:6;UUID:"3FAE4EE3-8BD5-43F7-9C27-5242FAA1FB88"}D{i:7;UUID:"38D1C1ED-A617-46BB-BE37-C2B732FC6775"}
D{i:8;UUID:"487BD6A2-BE54-4C4F-9147-59366C3587DB"}D{i:9;UUID:"76A17C96-A678-4D07-B62F-9802EA247806"}
}
##^##*/
##^##*/
testdata/2d_asset_import_data/v1.1/plugins/sketch/transform/expected/transform/Artboard.ui.qml → testdata/2d_asset_import_data/v1.1/plugins/sketch/master/expected/master/Transformpage.ui.qml
View file @ 7032f156
import QtQuick 2.8
Item {
id: artboard
width: 482
height: 614
id: transformpage
width: 414
height: 896
Image {
id: artboardAsset
source: "assets/artboard.png"
id: transformpageAsset
x: 0
y: 0
source: "assets/transformpage.png"
}
Text {
id: gadget
x: 211
y: 394
width: 50
height: 41
color: "#ff000000"
text: "180"
font.pixelSize: 14
font.italic: true
horizontalAlignment: Text.AlignHCenter
font.family: "Helvetica"
verticalAlignment: Text.AlignVCenter
rotation: 180
}
Text {
id: _90
x: 47
y: 275
width: 50
height: 41
color: "#ff000000"
text: "-90"
font.pixelSize: 14
font.italic: true
horizontalAlignment: Text.AlignHCenter
font.family: "Helvetica"
verticalAlignment: Text.AlignVCenter
rotation: -90
Item {
id: circle
x: 124
y: 364
width: 167
height: 168
Image {
id: circleAsset
x: -1
y: -1
source: "assets/circle.png"
}
}
Text {
id: gadget1
x: 119
y: 186
width: 50
height: 41
id: gadget
x: 278
y: 512
width: 24
height: 17
color: "#ff000000"
text: "315"
font.pixelSize: 14
font.italic: true
horizontalAlignment: Text.AlignHCenter
font.styleName: "Light Oblique"
font.family: "Helvetica"
verticalAlignment: Text.AlignVCenter
rotation: 315
font.pixelSize: 14
}
Text {
id: _45
x: 87
y: 154
width: 50
height: 41
id: gadget1
x: 88
y: 439
width: 24
height: 17
color: "#ff000000"
text: "-45"
font.pixelSize: 14
font.italic: true
text: "180"
horizontalAlignment: Text.AlignHCenter
font.styleName: "Oblique"
font.family: "Helvetica"
verticalAlignment: Text.AlignVCenter
rotation: -45
rotation: 180
font.pixelSize: 14
}
Text {
id: gadget2
x: 124
y: 357
width: 50
height: 41
x: 302
y: 439
width: 8
height: 17
color: "#ff000000"
text: "225"
font.pixelSize: 14
font.italic: true
text: "0"
horizontalAlignment: Text.AlignHCenter
font.styleName: "Bold Oblique"
font.family: "Helvetica"
verticalAlignment: Text.AlignVCenter
rotation: 225
font.pixelSize: 14
}
Text {
id: gadget3
x: 293
y: 356
width: 50
height: 41
x: 271
y: 378
width: 16
height: 16
color: "#ff000000"
text: "135"
font.pixelSize: 14
font.italic: true
text: "45"
horizontalAlignment: Text.AlignHCenter
font.family: "Helvetica"
font.styleName: "Bold"
font.family: "Arial"
verticalAlignment: Text.AlignVCenter
rotation: 135
rotation: 45
font.pixelSize: 14
}
Text {
id: gadget4
x: 294
y: 187
width: 50
height: 41
x: 199
y: 341
width: 16
height: 17
color: "#ff000000"
text: "45"
font.pixelSize: 14
font.italic: true
text: "90"
horizontalAlignment: Text.AlignHCenter
font.styleName: "Light Oblique"
font.family: "Helvetica"
verticalAlignment: Text.AlignVCenter
rotation: 45
rotation: 90
font.pixelSize: 14
}
Text {
id: gadget5
x: 85
y: 271
width: 50
height: 41
x: 114
y: 380
width: 24
height: 17
color: "#ff000000"
text: "270"
font.pixelSize: 14
font.italic: true
text: "135"
horizontalAlignment: Text.AlignHCenter
font.styleName: "Light Oblique"
font.family: "Helvetica"
verticalAlignment: Text.AlignVCenter
rotation: 270
rotation: 135
font.pixelSize: 14
}
Text {
id: gadget6
x: 328
y: 270
width: 50
height: 41
x: 191
y: 548
width: 28
height: 14
color: "#ff000000"
text: "90"
font.pixelSize: 14
font.italic: true
text: "270"
horizontalAlignment: Text.AlignHCenter
font.family: "Helvetica"
font.styleName: "L1S"
font.family: "Lfont1605a"
verticalAlignment: Text.AlignVCenter
rotation: 90
rotation: 270
font.pixelSize: 14
}
Text {
id: gadget7
x: 205
y: 150
width: 50
height: 41
x: 104
y: 514
width: 29
height: 19
color: "#ff000000"
text: "0"
font.pixelSize: 14
font.italic: true
text: "225"
horizontalAlignment: Text.AlignHCenter
font.family: "Helvetica"
font.family: "Arial Black"
verticalAlignment: Text.AlignVCenter
rotation: 225
font.pixelSize: 14
}
}
/*##^## Designer {
D{i:0;UUID:"23691724-326A-465F-AE98-1B318B6602E7"}D{i:1;UUID:"23691724-326A-465F-AE98-1B318B6602E7_asset"}
D{i:2;UUID:"6B4BFFBA-24B1-4E87-AAD4-4FC0AC626EF6"}D{i:3;UUID:"18AA3553-5DCE-4039-AACA-D5F5862A020A"}
D{i:4;UUID:"A102DE30-D339-4B44-A387-C8C42356C1FE"}D{i:5;UUID:"43EEE7F9-2E4B-4263-8D89-F3C907BA51CA"}
D{i:6;UUID:"2FAFFF5D-42B3-4700-8B2C-9F3649810677"}D{i:7;UUID:"5EE507C8-EA8D-4F1A-AE3C-707DAE9F0679"}
D{i:8;UUID:"7DDFCFE2-2303-4D67-A540-F5B843860A54"}D{i:9;UUID:"F58E879D-536A-4DF0-9348-CCFBFAA044B7"}
D{i:10;UUID:"E8DB082C-7170-4E84-9B16-86E1FA8A3437"}D{i:11;UUID:"140678C4-1223-4EE3-A536-EB260B1363B7"}
/*##^##
Designer {
D{i:0;UUID:"57DC6017-2C74-4441-AC9C-15B8FA82DFA5"}D{i:1;UUID:"57DC6017-2C74-4441-AC9C-15B8FA82DFA5_asset"}
D{i:3;UUID:"D78B55C8-D62A-44AA-8C05-F17FF78740BE_asset"}D{i:2;UUID:"D78B55C8-D62A-44AA-8C05-F17FF78740BE"}
D{i:4;UUID:"4FF462EF-F0F1-47D7-AF59-F3D704673D77"}D{i:5;UUID:"C5597E5E-F636-445F-91D4-D70AA10C91C2"}
D{i:6;UUID:"ED4F2FFB-6C84-44EE-94E6-2C32625ABEE6"}D{i:7;UUID:"7EBDFF49-D76B-49CC-8FF4-8A1C1AFDF68E"}
D{i:8;UUID:"6AE8D1FA-C0F3-4F6E-A614-5A46D804ACB4"}D{i:9;UUID:"A9601DB3-894D-4536-B223-14B79C1D79FB"}
D{i:10;UUID:"105EED85-D517-4B90-B323-A053055215AD"}D{i:11;UUID:"A05FD529-29E5-4A6A-9591-296871875FD0"}
}
##^##*/
##^##*/
testdata/2d_asset_import_data/v1.1/plugins/sketch/overrides/expected/overrides/Button.ui.qml
View file @ 7032f156
......@@ -5,17 +5,19 @@ Item {
width: 162
height: 58
property alias elementText: element.text
property alias okFontBold: ok.font.bold
property alias okFontItalic: ok.font.italic
property alias okFontPixelSize: ok.font.pixelSize
property alias okFontFamily: ok.font.family
property alias okText: ok.text
property alias okFontPixelSize: ok.font.pixelSize
property alias okFontItalic: ok.font.italic
property alias okHorizontalAlignment: ok.horizontalAlignment
property alias okVerticalAlignment: ok.verticalAlignment
property alias okColor: ok.color
property alias okText: ok.text
property alias okVerticalAlignment: ok.verticalAlignment
property alias okFontBold: ok.font.bold
Image {
id: buttonAsset
x: 0
y: 0
source: "assets/button.png"
}
......@@ -27,10 +29,10 @@ Item {
height: 17
color: "#ff2de1b9"
text: "OK"
verticalAlignment: Text.AlignVCenter
font.italic: true
font.family: "Arial"
horizontalAlignment: Text.AlignLeft
font.styleName: "Italic"
font.family: "Arial"
verticalAlignment: Text.AlignVCenter
font.pixelSize: 16
}
......@@ -42,9 +44,9 @@ Item {
height: 12
color: "#ff1f1515"
text: "Default"
verticalAlignment: Text.AlignBottom
font.family: "Helvetica"
horizontalAlignment: Text.AlignRight
font.family: "Helvetica"
verticalAlignment: Text.AlignBottom
font.pixelSize: 10
}
......@@ -57,10 +59,11 @@ Item {
}
}
/*##^## Designer {
/*##^##
Designer {
D{i:0;UUID:"328AA181-446F-43F6-9BD7-C050233F7908"}D{i:1;UUID:"328AA181-446F-43F6-9BD7-C050233F7908_asset"}
D{i:2;UUID:"9F3D16FE-E524-4BDE-9A95-C00ECC46ACFB"}D{i:3;UUID:"F8A7F931-E01C-4CC1-AF60-87DB05F1D200"}
D{i:4;UUID:"4ED615DE-3CE5-45A6-8F4D-9BC8AD09F4CF"}
}
##^##*/
##^##*/
testdata/2d_asset_import_data/v1.1/plugins/sketch/overrides/expected/overrides/Main.ui.qml
View file @ 7032f156
......@@ -7,6 +7,8 @@ Item {
Image {
id: mainAsset
x: 0
y: 0
source: "assets/main.png"
}
......@@ -29,9 +31,10 @@ Item {
}
}
/*##^## Designer {
/*##^##
Designer {
D{i:0;UUID:"9D8B3BFA-FA35-4D61-93B0-E503FF7398AD"}D{i:1;UUID:"9D8B3BFA-FA35-4D61-93B0-E503FF7398AD_asset"}
D{i:2;UUID:"C6FA1056-47D3-4DD0-A5F2-E6049F0DEF78"}D{i:3;UUID:"D459576E-054E-47CD-B270-7818D4063081"}
}
##^##*/
##^##*/
testdata/2d_asset_import_data/v1.1/plugins/sketch/overrides/expected/overrides/Settings.ui.qml
View file @ 7032f156
......@@ -8,6 +8,8 @@ Item {
Image {
id: settingsAsset
x: 0
y: 0
source: "assets/settings.png"
}
......@@ -36,17 +38,18 @@ Item {
height: 17
color: "#ff000000"
text: "Settings"
verticalAlignment: Text.AlignTop
font.italic: true
font.family: "Helvetica"
horizontalAlignment: Text.AlignHCenter
font.styleName: "Bold Oblique"
font.family: "Helvetica"
verticalAlignment: Text.AlignTop
font.pixelSize: 14
}
}
/*##^## Designer {
/*##^##
Designer {
D{i:0;UUID:"08AC0A99-A496-46F0-86F8-AFFAA67EFAE5"}D{i:1;UUID:"08AC0A99-A496-46F0-86F8-AFFAA67EFAE5_asset"}
D{i:2;UUID:"3F9897F8-6702-43FB-8F4A-6F713353D746"}D{i:3;UUID:"11C1BAEB-1B10-4E3A-816A-4223D942A13A"}
}
##^##*/
##^##*/
testdata/2d_asset_import_data/v1.1/plugins/sketch/overrides/metadata/overrides.metadata
View file @ 7032f156
{
"pluginInfo": {
"applicationId": "SketechApp",
"applicationVersion": "56.2",
"extensionVersion": "1.3",
"applicationVersion": "64",
"extensionVersion": "1.5.0",
"metadataVersion": "1.1"
},
"documentInfo": {
"name": "overrides",
"metadata": {
"jsonExportPath": "/Volumes/Data/code/qtdesign-studio/testdata/v1.2/plugins/sketch/overrides/src/overrides",
"jsonExportPath": "/Users/Shared/common/code/qtdesign-studio/testdata/2d_asset_import_data/v1.1/plugins/sketch/overrides/src/overrides",
"scaleFormat": [
{
"formats": "png",
......@@ -46,7 +46,13 @@
"qmlVisible": true,
"opacity": 1,
"assetData": {
"assetPath": "/Volumes/Data/code/qtdesign-studio/testdata/v1.2/plugins/sketch/overrides/src/overrides/08AC0A99-A496-46F0-86F8-AFFAA67EFAE5.png"
"assetPath": "/Users/Shared/common/code/qtdesign-studio/testdata/2d_asset_import_data/v1.1/plugins/sketch/overrides/src/overrides/08AC0A99-A496-46F0-86F8-AFFAA67EFAE5.png",
"assetBounds": {
"x": 0,
"y": 0,
"width": 360,
"height": 362
}
}
},
"layerIndex": 0,
......@@ -136,11 +142,17 @@
"lineHeight": null,
"horizontalAlignment": "center",
"verticalAlignment": "top",
"fontDisplayName": "Helvetica Bold Oblique",
"contents": "Settings",
"multiline": false
},
"qmlVisible": true,
"opacity": 1
"opacity": 1,
"transformation": {
"rotation": 0,
"flippedHorizontally": false,
"flippedVertically": false
}
},
"layerIndex": 1
}
......@@ -159,7 +171,13 @@
"qmlVisible": true,
"opacity": 1,
"assetData": {
"assetPath": "/Volumes/Data/code/qtdesign-studio/testdata/v1.2/plugins/sketch/overrides/src/overrides/9D8B3BFA-FA35-4D61-93B0-E503FF7398AD.png"
"assetPath": "/Users/Shared/common/code/qtdesign-studio/testdata/2d_asset_import_data/v1.1/plugins/sketch/overrides/src/overrides/9D8B3BFA-FA35-4D61-93B0-E503FF7398AD.png",
"assetBounds": {
"x": 0,
"y": 0,
"width": 390,
"height": 369
}
}
},
"layerIndex": 1,
......@@ -225,7 +243,13 @@
"qmlVisible": true,
"opacity": 1,
"assetData": {
"assetPath": "/Volumes/Data/code/qtdesign-studio/testdata/v1.2/plugins/sketch/overrides/src/overrides/44EE9217-6562-485C-877F-F97F33BC8547.png"
"assetPath": "/Users/Shared/common/code/qtdesign-studio/testdata/2d_asset_import_data/v1.1/plugins/sketch/overrides/src/overrides/44EE9217-6562-485C-877F-F97F33BC8547.png",
"assetBounds": {
"x": 0,
"y": 0,
"width": 162,
"height": 58
}
}
},
"layerIndex": 0,
......@@ -248,11 +272,17 @@
"lineHeight": null,
"horizontalAlignment": "left",
"verticalAlignment": "center",
"fontDisplayName": "Arial Italic",
"contents": "OK",
"multiline": false
},
"qmlVisible": true,
"opacity": 1,
"transformation": {
"rotation": 0,
"flippedHorizontally": false,
"flippedVertically": false
},
"aliases": [
"text",
"color",
......@@ -283,11 +313,17 @@
"lineHeight": null,
"horizontalAlignment": "right",
"verticalAlignment": "bottom",
"fontDisplayName": "Helvetica",
"contents": "Default",
"multiline": false
},
"qmlVisible": true,
"opacity": 1,
"transformation": {
"rotation": 0,
"flippedHorizontally": false,
"flippedVertically": false
},
"aliases": [
"text"
]
......@@ -305,11 +341,17 @@
"uuid": "4ED615DE-3CE5-45A6-8F4D-9BC8AD09F4CF",
"exportType": "child",
"externalReference": "MouseArea",
"qmlVisible": true
"qmlVisible": true,
"transformation": {
"rotation": 0,
"flippedHorizontally": false,
"flippedVertically": false
}
},
"layerIndex": 2
}
]
}
]
],
"dependencies": []
}
\ No newline at end of file