3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-07-14 10:17:52 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

Resolve merge conflicts

Browse source 
CURA-6483
This commit is contained in:
Lipu Fei 2019-05-02 07:45:40 +02:00
commit 71e32d94f7
30 changed files with 348 additions and 211 deletions
Download patch file Download diff file Expand all files Collapse all files

2
cura/Machines/MaterialManager.py
View file

@ -103,6 +103,8 @@ class MaterialManager(QObject):
continue continue
root_material_id = material_metadata.get("base_file", "") root_material_id = material_metadata.get("base_file", "")
if root_material_id not in material_metadatas: #Not a registered material profile. Don't store this in the look-up tables.
continue
if root_material_id not in self._material_group_map: if root_material_id not in self._material_group_map:
self._material_group_map[root_material_id] = MaterialGroup(root_material_id, MaterialNode(material_metadatas[root_material_id])) self._material_group_map[root_material_id] = MaterialGroup(root_material_id, MaterialNode(material_metadatas[root_material_id]))
self._material_group_map[root_material_id].is_read_only = self._container_registry.isReadOnly(root_material_id) self._material_group_map[root_material_id].is_read_only = self._container_registry.isReadOnly(root_material_id)

2
cura/Machines/Models/GlobalStacksModel.py
View file

@ -73,5 +73,5 @@ class GlobalStacksModel(ListModel):
"hasRemoteConnection": has_remote_connection, "hasRemoteConnection": has_remote_connection,
"metadata": container_stack.getMetaData().copy(), "metadata": container_stack.getMetaData().copy(),
"discoverySource": section_name}) "discoverySource": section_name})
items.sort(key = lambda i: not i["hasRemoteConnection"]) items.sort(key = lambda i: (not i["hasRemoteConnection"], i["name"]))
self.setItems(items) self.setItems(items)

4
plugins/SliceInfoPlugin/MoreInfoWindow.qml
View file

@ -71,7 +71,7 @@ Window
left: parent.left left: parent.left
right: parent.right right: parent.right
} }
text: catalog.i18nc("@text:window", "Cura sends anonymous data to Ultimaker in order to improve the print quality and user experience. Below is an example of all the data that is sent.") text: catalog.i18nc("@text:window", "Ultimaker Cura collects anonymous data in order to improve the print quality and user experience. Below is an example of all the data that is sent:")
wrapMode: Text.WordWrap wrapMode: Text.WordWrap
renderType: Text.NativeRendering renderType: Text.NativeRendering
} }
@ -89,6 +89,8 @@ Window
} }
textArea.text: manager.getExampleData() textArea.text: manager.getExampleData()
textArea.textFormat: Text.RichText
textArea.wrapMode: Text.Wrap
textArea.readOnly: true textArea.readOnly: true
} }
} }

2
plugins/SliceInfoPlugin/SliceInfo.py
View file

@ -77,7 +77,7 @@ class SliceInfo(QObject, Extension):
if not plugin_path: if not plugin_path:
Logger.log("e", "Could not get plugin path!", self.getPluginId()) Logger.log("e", "Could not get plugin path!", self.getPluginId())
return None return None
file_path = os.path.join(plugin_path, "example_data.json") file_path = os.path.join(plugin_path, "example_data.html")
if file_path: if file_path:
with open(file_path, "r", encoding = "utf-8") as f: with open(file_path, "r", encoding = "utf-8") as f:
self._example_data_content = f.read() self._example_data_content = f.read()

64
plugins/SliceInfoPlugin/example_data.html Normal file
View file

@ -0,0 +1,64 @@
<html>
<body>
<b>Cura Version:</b> 4.0<br/>
<b>Operating System:</b> Windows 10<br/>
<b>Language:</b> en_US<br/>
<b>Machine Type:</b> Ultimaker S5<br/>
<b>Quality Profile:</b> Fast<br/>
<b>Using Custom Settings:</b> No
<h3>Extruder 1:</h3>
<ul>
<li><b>Material Type:</b> PLA</li>
<li><b>Print Core:</b> AA 0.4</li>
<li><b>Material Used:</b> 1240 mm</li>
</ul>
<h3>Extruder 2:</h3>
<ul>
<li><b>Material Type:</b> PVA</li>
<li><b>Print Core:</b> BB 0.4</li>
<li><b>Material Used:</b> 432 mm</li>
</ul>
<h3>Print Settings:</h3>
<ul>
<li><b>Layer Height:</b> 0.15</li>
<li><b>Wall Line Count:</b> 3</li>
<li><b>Enable Retraction:</b> no</li>
<li><b>Infill Density:</b> 20%</li>
<li><b>Infill Pattern:</b> triangles</li>
<li><b>Gradual Infill Steps:</b> 0</li>
<li><b>Printing Temperature:</b> 220 °C</li>
<li><b>Generate Support:</b> yes</li>
<li><b>Support Extruder:</b> 1</li>
<li><b>Build Plate Adhesion Type:</b> brim</li>
<li><b>Enable Prime Tower:</b> yes</li>
<li><b>Print Sequence:</b> All at once</li>
<li>...</li>
</ul>
<h3>Model Information:</h3>
<ul>
<li>
<b>Model 1</b>
<ul>
<li><b>Hash:</b> b72789b9b...</li>
<li><b>Transformation:</b> [transformation matrix]</li>
<li><b>Bounding Box:</b> [minimum x, y, z; maximum x, y, z]</li>
<li><b>Is Helper Mesh:</b> no</li>
<li><b>Helper Mesh Type:</b> support mesh</li>
</ul>
</li>
</ul>
<h3>Print Times:</h3>
<ul>
<li>Infill: 61200 sec.</li>
<li>Support: 25480 sec.</li>
<li>Travel: 6224 sec.</li>
<li>Walls: 10225 sec.</li>
<li>Total: 103129 sec.</li>
</ul>
</body>
</html>

114
plugins/SliceInfoPlugin/example_data.json
View file

@ -1,114 +0,0 @@
{
"time_stamp": 1523973715.486928,
"schema_version": 0,
"cura_version": "3.3",
"active_mode": "custom",
"machine_settings_changed_by_user": true,
"language": "en_US",
"os": {
"type": "Linux",
"version": "#43~16.04.1-Ubuntu SMP Wed Mar 14 17:48:43 UTC 2018"
},
"active_machine": {
"definition_id": "ultimaker3",
"manufacturer": "Ultimaker B.V."
},
"extruders": [
{
"active": true,
"material": {
"GUID": "506c9f0d-e3aa-4bd4-b2d2-23e2425b1aa9",
"type": "PLA",
"brand": "Generic"
},
"material_used": 0.84,
"variant": "AA 0.4",
"nozzle_size": 0.4,
"extruder_settings": {
"wall_line_count": 3,
"retraction_enable": true,
"infill_sparse_density": 30,
"infill_pattern": "triangles",
"gradual_infill_steps": 0,
"default_material_print_temperature": 200,
"material_print_temperature": 200
}
},
{
"active": false,
"material": {
"GUID": "86a89ceb-4159-47f6-ab97-e9953803d70f",
"type": "PVA",
"brand": "Generic"
},
"material_used": 0.5,
"variant": "BB 0.4",
"nozzle_size": 0.4,
"extruder_settings": {
"wall_line_count": 3,
"retraction_enable": true,
"infill_sparse_density": 20,
"infill_pattern": "triangles",
"gradual_infill_steps": 0,
"default_material_print_temperature": 215,
"material_print_temperature": 220
}
}
],
"quality_profile": "fast",
"user_modified_setting_keys": ["layer_height", "wall_line_width", "infill_sparse_density"],
"models": [
{
"hash": "b72789b9beb5366dff20b1cf501020c3d4d4df7dc2295ecd0fddd0a6436df070",
"bounding_box": {
"minimum": {
"x": -10.0,
"y": 0.0,
"z": -5.0
},
"maximum": {
"x": 9.999999046325684,
"y": 40.0,
"z": 5.0
}
},
"transformation": {
"data": "[[ 1. 0. 0. 0.] [ 0. 1. 0. 20.] [ 0. 0. 1. 0.] [ 0. 0. 0. 1.]]"
},
"extruder": 0,
"model_settings": {
"support_enabled": true,
"support_extruder_nr": 1,
"infill_mesh": false,
"cutting_mesh": false,
"support_mesh": false,
"anti_overhang_mesh": false,
"wall_line_count": 3,
"retraction_enable": true,
"infill_sparse_density": 30,
"infill_pattern": "triangles",
"gradual_infill_steps": 0
}
}
],
"print_times": {
"travel": 187,
"support": 825,
"infill": 351,
"total": 7234
},
"print_settings": {
"layer_height": 0.15,
"support_enabled": true,
"support_extruder_nr": 1,
"adhesion_type": "brim",
"wall_line_count": 3,
"retraction_enable": true,
"prime_tower_enable": true,
"infill_sparse_density": 20,
"infill_pattern": "triangles",
"gradual_infill_steps": 0,
"print_sequence": "all_at_once"
},
"output_to": "LocalFileOutputDevice"
}

1
plugins/UM3NetworkPrinting/resources/qml/MonitorBuildplateConfiguration.qml
View file

@ -69,6 +69,7 @@ Item
// FIXED-LINE-HEIGHT: // FIXED-LINE-HEIGHT:
height: 18 * screenScaleFactor // TODO: Theme! height: 18 * screenScaleFactor // TODO: Theme!
verticalAlignment: Text.AlignVCenter verticalAlignment: Text.AlignVCenter
renderType: Text.NativeRendering
} }
} }
} }

1
plugins/UM3NetworkPrinting/resources/qml/MonitorConfigOverrideDialog.qml
View file

@ -52,6 +52,7 @@ UM.Dialog
bottomMargin: 56 * screenScaleFactor // TODO: Theme! bottomMargin: 56 * screenScaleFactor // TODO: Theme!
} }
wrapMode: Text.WordWrap wrapMode: Text.WordWrap
renderType: Text.NativeRendering
text: text:
{ {
if (!printer || !printer.activePrintJob) if (!printer || !printer.activePrintJob)

1
plugins/UM3NetworkPrinting/resources/qml/MonitorContextMenuButton.qml
View file

@ -23,6 +23,7 @@ Button
horizontalAlignment: Text.AlignHCenter horizontalAlignment: Text.AlignHCenter
text: base.text text: base.text
verticalAlignment: Text.AlignVCenter verticalAlignment: Text.AlignVCenter
renderType: Text.NativeRendering;
} }
height: width height: width
hoverEnabled: enabled hoverEnabled: enabled

2
plugins/UM3NetworkPrinting/resources/qml/MonitorExtruderConfiguration.qml
View file

@ -66,6 +66,7 @@ Item
// FIXED-LINE-HEIGHT: // FIXED-LINE-HEIGHT:
height: parent.height height: parent.height
verticalAlignment: Text.AlignVCenter verticalAlignment: Text.AlignVCenter
renderType: Text.NativeRendering
} }
} }
@ -95,6 +96,7 @@ Item
// FIXED-LINE-HEIGHT: // FIXED-LINE-HEIGHT:
height: parent.height height: parent.height
verticalAlignment: Text.AlignVCenter verticalAlignment: Text.AlignVCenter
renderType: Text.NativeRendering
} }
} }
} }

1
plugins/UM3NetworkPrinting/resources/qml/MonitorIconExtruder.qml
View file

@ -48,5 +48,6 @@ Item
x: Math.round(size * 0.25) x: Math.round(size * 0.25)
y: Math.round(size * 0.15625) y: Math.round(size * 0.15625)
visible: position >= 0 visible: position >= 0
renderType: Text.NativeRendering
} }
} }

1
plugins/UM3NetworkPrinting/resources/qml/MonitorInfoBlurb.qml
View file

@ -40,6 +40,7 @@ Item
width: 240 * screenScaleFactor // TODO: Theme! width: 240 * screenScaleFactor // TODO: Theme!
color: UM.Theme.getColor("monitor_tooltip_text") color: UM.Theme.getColor("monitor_tooltip_text")
font: UM.Theme.getFont("default") font: UM.Theme.getFont("default")
renderType: Text.NativeRendering
} }
} }
} }

4
plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobCard.qml
View file

@ -71,6 +71,7 @@ Item
// FIXED-LINE-HEIGHT: // FIXED-LINE-HEIGHT:
height: parent.height height: parent.height
verticalAlignment: Text.AlignVCenter verticalAlignment: Text.AlignVCenter
renderType: Text.NativeRendering
} }
} }
@ -98,6 +99,7 @@ Item
// FIXED-LINE-HEIGHT: // FIXED-LINE-HEIGHT:
height: 18 * screenScaleFactor // TODO: Theme! height: 18 * screenScaleFactor // TODO: Theme!
verticalAlignment: Text.AlignVCenter verticalAlignment: Text.AlignVCenter
renderType: Text.NativeRendering
} }
} }
@ -143,6 +145,7 @@ Item
// FIXED-LINE-HEIGHT: // FIXED-LINE-HEIGHT:
height: parent.height height: parent.height
verticalAlignment: Text.AlignVCenter verticalAlignment: Text.AlignVCenter
renderType: Text.NativeRendering
} }
Row Row
@ -197,6 +200,7 @@ Item
// FIXED-LINE-HEIGHT: // FIXED-LINE-HEIGHT:
height: 18 * screenScaleFactor // TODO: Theme! height: 18 * screenScaleFactor // TODO: Theme!
verticalAlignment: Text.AlignVCenter verticalAlignment: Text.AlignVCenter
renderType: Text.NativeRendering
} }
} }
} }

2
plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobProgressBar.qml
View file

@ -47,6 +47,7 @@ Item
// FIXED-LINE-HEIGHT: // FIXED-LINE-HEIGHT:
height: 18 * screenScaleFactor // TODO: Theme! height: 18 * screenScaleFactor // TODO: Theme!
verticalAlignment: Text.AlignVCenter verticalAlignment: Text.AlignVCenter
renderType: Text.NativeRendering
} }
Label Label
{ {
@ -99,5 +100,6 @@ Item
// FIXED-LINE-HEIGHT: // FIXED-LINE-HEIGHT:
height: 18 * screenScaleFactor // TODO: Theme! height: 18 * screenScaleFactor // TODO: Theme!
verticalAlignment: Text.AlignVCenter verticalAlignment: Text.AlignVCenter
renderType: Text.NativeRendering
} }
} }

6
plugins/UM3NetworkPrinting/resources/qml/MonitorPrinterCard.qml
View file

@ -112,6 +112,7 @@ Item
// FIXED-LINE-HEIGHT: // FIXED-LINE-HEIGHT:
height: parent.height height: parent.height
verticalAlignment: Text.AlignVCenter verticalAlignment: Text.AlignVCenter
renderType: Text.NativeRendering
} }
} }
@ -315,6 +316,7 @@ Item
return "" return ""
} }
visible: text !== "" visible: text !== ""
renderType: Text.NativeRendering
} }
Item Item
@ -356,6 +358,7 @@ Item
// FIXED-LINE-HEIGHT: // FIXED-LINE-HEIGHT:
height: 18 * screenScaleFactor // TODO: Theme! height: 18 * screenScaleFactor // TODO: Theme!
verticalAlignment: Text.AlignVCenter verticalAlignment: Text.AlignVCenter
renderType: Text.NativeRendering
} }
Label Label
@ -376,6 +379,7 @@ Item
// FIXED-LINE-HEIGHT: // FIXED-LINE-HEIGHT:
height: 18 * screenScaleFactor // TODO: Theme! height: 18 * screenScaleFactor // TODO: Theme!
verticalAlignment: Text.AlignVCenter verticalAlignment: Text.AlignVCenter
renderType: Text.NativeRendering
} }
} }
@ -403,6 +407,7 @@ Item
// FIXED-LINE-HEIGHT: // FIXED-LINE-HEIGHT:
height: 18 * screenScaleFactor // TODO: Theme! height: 18 * screenScaleFactor // TODO: Theme!
verticalAlignment: Text.AlignVCenter verticalAlignment: Text.AlignVCenter
renderType: Text.NativeRendering
} }
} }
@ -437,6 +442,7 @@ Item
verticalAlignment: Text.AlignVCenter verticalAlignment: Text.AlignVCenter
horizontalAlignment: Text.AlignHCenter horizontalAlignment: Text.AlignHCenter
height: 18 * screenScaleFactor // TODO: Theme! height: 18 * screenScaleFactor // TODO: Theme!
renderType: Text.NativeRendering
} }
implicitHeight: 32 * screenScaleFactor // TODO: Theme! implicitHeight: 32 * screenScaleFactor // TODO: Theme!
implicitWidth: 96 * screenScaleFactor // TODO: Theme! implicitWidth: 96 * screenScaleFactor // TODO: Theme!

1
plugins/UM3NetworkPrinting/resources/qml/MonitorPrinterPill.qml
View file

@ -43,5 +43,6 @@ Item
text: tagText text: tagText
font.pointSize: 10 // TODO: Theme! font.pointSize: 10 // TODO: Theme!
visible: text !== "" visible: text !== ""
renderType: Text.NativeRendering
} }
} }

5
plugins/UM3NetworkPrinting/resources/qml/MonitorQueue.qml
View file

@ -29,6 +29,7 @@ Item
color: UM.Theme.getColor("monitor_text_primary") color: UM.Theme.getColor("monitor_text_primary")
font: UM.Theme.getFont("large") font: UM.Theme.getFont("large")
text: catalog.i18nc("@label", "Queued") text: catalog.i18nc("@label", "Queued")
renderType: Text.NativeRendering
} }
Item Item
@ -109,6 +110,7 @@ Item
// FIXED-LINE-HEIGHT: // FIXED-LINE-HEIGHT:
height: 18 * screenScaleFactor // TODO: Theme! height: 18 * screenScaleFactor // TODO: Theme!
verticalAlignment: Text.AlignVCenter verticalAlignment: Text.AlignVCenter
renderType: Text.NativeRendering
} }
Label Label
@ -123,6 +125,7 @@ Item
// FIXED-LINE-HEIGHT: // FIXED-LINE-HEIGHT:
height: 18 * screenScaleFactor // TODO: Theme! height: 18 * screenScaleFactor // TODO: Theme!
verticalAlignment: Text.AlignVCenter verticalAlignment: Text.AlignVCenter
renderType: Text.NativeRendering
} }
Label Label
@ -137,6 +140,7 @@ Item
// FIXED-LINE-HEIGHT: // FIXED-LINE-HEIGHT:
height: 18 * screenScaleFactor // TODO: Theme! height: 18 * screenScaleFactor // TODO: Theme!
verticalAlignment: Text.AlignVCenter verticalAlignment: Text.AlignVCenter
renderType: Text.NativeRendering
} }
} }
@ -213,6 +217,7 @@ Item
text: i18n.i18nc("@info", "All jobs are printed.") text: i18n.i18nc("@info", "All jobs are printed.")
color: UM.Theme.getColor("monitor_text_primary") color: UM.Theme.getColor("monitor_text_primary")
font: UM.Theme.getFont("medium") // 14pt, regular font: UM.Theme.getFont("medium") // 14pt, regular
renderType: Text.NativeRendering
} }
Item Item

1
plugins/UM3NetworkPrinting/resources/qml/PrintJobContextMenuItem.qml
View file

@ -16,6 +16,7 @@ Button {
text: parent.text text: parent.text
horizontalAlignment: Text.AlignLeft; horizontalAlignment: Text.AlignLeft;
verticalAlignment: Text.AlignVCenter; verticalAlignment: Text.AlignVCenter;
renderType: Text.NativeRendering;
} }
height: visible ? 39 * screenScaleFactor : 0; // TODO: Theme! height: visible ? 39 * screenScaleFactor : 0; // TODO: Theme!
hoverEnabled: true; hoverEnabled: true;

1
plugins/UM3NetworkPrinting/resources/qml/PrintWindow.qml
View file

@ -78,6 +78,7 @@ UM.Dialog {
height: 20 * screenScaleFactor; height: 20 * screenScaleFactor;
text: catalog.i18nc("@label", "Printer selection"); text: catalog.i18nc("@label", "Printer selection");
wrapMode: Text.Wrap; wrapMode: Text.Wrap;
renderType: Text.NativeRendering;
} }
ComboBox { ComboBox {

12
resources/qml/WelcomePages/AddNetworkOrLocalPrinterContent.qml
View file

@ -41,10 +41,7 @@ Item
onClicked: onClicked:
{ {
if (contentShown) addLocalPrinterDropDown.contentShown = !contentShown
{
addLocalPrinterDropDown.contentShown = false
}
} }
contentComponent: networkPrinterListComponent contentComponent: networkPrinterListComponent
@ -79,16 +76,13 @@ Item
anchors.top: addNetworkPrinterDropDown.bottom anchors.top: addNetworkPrinterDropDown.bottom
anchors.left: parent.left anchors.left: parent.left
anchors.right: parent.right anchors.right: parent.right
anchors.topMargin: UM.Theme.getSize("wide_margin").height anchors.topMargin: UM.Theme.getSize("default_margin").height
title: catalog.i18nc("@label", "Add a non-networked printer") title: catalog.i18nc("@label", "Add a non-networked printer")
onClicked: onClicked:
{ {
if (contentShown) addNetworkPrinterDropDown.contentShown = !contentShown
{
addNetworkPrinterDropDown.contentShown = false
}
} }
contentComponent: localPrinterListComponent contentComponent: localPrinterListComponent

2
resources/qml/WelcomePages/AddNetworkPrinterScrollView.qml
View file

@ -56,7 +56,7 @@ Item
ScrollBar.vertical.policy: ScrollBar.AsNeeded ScrollBar.vertical.policy: ScrollBar.AsNeeded
property int maxItemCountAtOnce: 8 // show at max 8 items at once, otherwise you need to scroll. property int maxItemCountAtOnce: 8 // show at max 8 items at once, otherwise you need to scroll.
height: maxItemCountAtOnce * UM.Theme.getSize("action_button").height height: Math.min(contentHeight, maxItemCountAtOnce * UM.Theme.getSize("action_button").height)
visible: networkPrinterListView.count > 0 visible: networkPrinterListView.count > 0

59
resources/qml/WelcomePages/DataCollectionsContent.qml
View file

@ -48,40 +48,69 @@ Item
spacing: UM.Theme.getSize("wide_margin").height spacing: UM.Theme.getSize("wide_margin").height
Image Label
{ {
id: curaImage id: topLabel
width: parent.width
anchors.horizontalCenter: parent.horizontalCenter anchors.horizontalCenter: parent.horizontalCenter
source: UM.Theme.getImage("first_run_share_data") horizontalAlignment: Text.AlignHCenter
text: catalog.i18nc("@text", "Ultimaker Cura collects anonymous data to improve print quality and user experience, including:")
wrapMode: Text.WordWrap
font: UM.Theme.getFont("medium")
color: UM.Theme.getColor("text")
renderType: Text.NativeRendering
}
Grid {
columns: 2
spacing: UM.Theme.getSize("wide_margin").height
anchors.horizontalCenter: parent.horizontalCenter
ImageTile
{
text: catalog.i18nc("@text", "Machine types")
imageSource: UM.Theme.getImage("first_run_machine_types")
}
ImageTile
{
text: catalog.i18nc("@text", "Material usage")
imageSource: UM.Theme.getImage("first_run_material_usage")
}
ImageTile
{
text: catalog.i18nc("@text", "Number of slices")
imageSource: UM.Theme.getImage("first_run_number_slices")
}
ImageTile
{
text: catalog.i18nc("@text", "Print settings")
imageSource: UM.Theme.getImage("first_run_print_settings")
}
} }
Label Label
{ {
id: textLabel id: bottomLabel
width: parent.width width: parent.width
anchors.horizontalCenter: parent.horizontalCenter anchors.horizontalCenter: parent.horizontalCenter
horizontalAlignment: Text.AlignHCenter horizontalAlignment: Text.AlignHCenter
text: text:
{ {
var t = catalog.i18nc("@text", "Ultimaker Cura collects anonymous data to improve print quality and user experience.") var t = catalog.i18nc("@text", "Data collected by Ultimaker Cura will not contain any personal information.")
var t2 = catalog.i18nc("@text", "More information") var t2 = catalog.i18nc("@text", "More information")
t += " <span style=\"color: rgb(0,0,255)\">" + t2 + "</span>" t += " <a href='https://notusedref'>" + t2 + "</a>"
return t return t
} }
textFormat: Text.RichText textFormat: Text.RichText
wrapMode: Text.WordWrap wrapMode: Text.WordWrap
font: UM.Theme.getFont("medium") font: UM.Theme.getFont("medium")
color: UM.Theme.getColor("text") color: UM.Theme.getColor("text")
linkColor: UM.Theme.getColor("text_link")
onLinkActivated: CuraApplication.showMoreInformationDialogForAnonymousDataCollection()
renderType: Text.NativeRendering renderType: Text.NativeRendering
MouseArea
{
anchors.fill: parent
onClicked:
{
CuraApplication.showMoreInformationDialogForAnonymousDataCollection()
}
}
} }
} }
} }

3
resources/qml/WelcomePages/DropDownWidget.qml
View file

@ -56,7 +56,8 @@ Item
Cura.RoundedRectangle Cura.RoundedRectangle
{ {
id: contentRectangle id: contentRectangle
anchors.top: header.bottom // Move up a bit (exaclty the width of the border) to avoid double line
y: header.height - UM.Theme.getSize("default_lining").width
anchors.left: header.left anchors.left: header.left
anchors.right: header.right anchors.right: header.right
// Add 2x lining, because it needs a bit of space on the top and the bottom. // Add 2x lining, because it needs a bit of space on the top and the bottom.

39
resources/qml/WelcomePages/ImageTile.qml Normal file
View file

@ -0,0 +1,39 @@
// Copyright (c) 2019 Ultimaker B.V.
// Cura is released under the terms of the LGPLv3 or higher.
import QtQuick 2.10
import QtQuick.Controls 2.3
import UM 1.3 as UM
//
// This component places a text on top of an image.
//
Column
{
leftPadding: UM.Theme.getSize("default_margin").width
rightPadding: UM.Theme.getSize("default_margin").width
spacing: UM.Theme.getSize("default_margin").height
property alias text: label.text
property alias imageSource: image.source
Label
{
id: label
width: image.width
anchors.horizontalCenter: image.horizontalCenter
horizontalAlignment: Text.AlignHCenter
text: ""
wrapMode: Text.WordWrap
font: UM.Theme.getFont("default")
color: UM.Theme.getColor("text")
renderType: Text.NativeRendering
}
Image
{
id: image
source: ""
}
}

2
resources/qml/WelcomePages/WelcomeContent.qml
View file

@ -19,7 +19,7 @@ Item
{ {
anchors.centerIn: parent anchors.centerIn: parent
width: parent.width width: parent.width
spacing: UM.Theme.getSize("wide_margin").height spacing: 2 * UM.Theme.getSize("wide_margin").height
Label Label
{ {

33
resources/themes/cura-light/images/first_run_machine_types.svg Normal file
View file

@ -0,0 +1,33 @@
<?xml version="1.0" encoding="UTF-8"?>
<svg width="107px" height="81px" viewBox="0 0 107 81" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
<!-- Generator: Sketch 53.2 (72643) - https://sketchapp.com -->
<title>Machine types</title>
<desc>Created with Sketch.</desc>
<g id="0419-data-collection-update" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
<g id="4.-collect-data-updated" transform="translate(-410.000000, -330.000000)">
<g id="Machine-types" transform="translate(410.000000, 330.000000)">
<rect id="Rectangle-Copy-4" fill="#CCCCCC" x="8" y="3" width="99" height="78"></rect>
<rect id="Rectangle-Copy-8" fill="#E5E5E5" x="0" y="0" width="103" height="78"></rect>
<rect id="Rectangle-Copy-18" fill="#104CAA" x="19" y="52" width="10" height="16"></rect>
<rect id="Rectangle-Copy-21" fill="#0063FF" x="19" y="45" width="10" height="17"></rect>
<rect id="Rectangle-Copy-24" fill="#E8F2FC" x="19" y="40" width="10" height="6"></rect>
<rect id="Rectangle-Copy-19" fill="#104CAA" x="49" y="56" width="10" height="12"></rect>
<rect id="Rectangle-Copy-22" fill="#0063FF" x="49" y="53" width="10" height="4"></rect>
<rect id="Rectangle-Copy-25" fill="#E8F2FC" x="49" y="48" width="10" height="6"></rect>
<rect id="Rectangle-Copy-20" fill="#104CAA" x="79" y="59" width="10" height="9"></rect>
<rect id="Rectangle-Copy-23" fill="#0063FF" x="79" y="46" width="10" height="16"></rect>
<rect id="Rectangle-Copy-26" fill="#E8F2FC" x="79" y="43" width="10" height="4"></rect>
<g id="UMS5" transform="translate(14.000000, 14.000000)" fill="#7E7E7E" fill-rule="nonzero">
<path d="M18.9321429,0 L0.0508928571,0 L0,0.0333611343 L0,19.9666389 L0.0339285714,20 L1.25535714,20 C1.62857143,19.4328607 2.54464286,19.5162636 2.54464286,19.5162636 L16.4553571,19.5162636 C16.4553571,19.5162636 17.3714286,19.4495413 17.7446429,20 L18.9660714,20 L19,19.9666389 L19,0.0333611343 L18.9321429,0 Z M17.7276786,15.5963303 C17.7276786,16.2301918 17.2017857,16.7306088 16.5741071,16.7306088 L2.42589286,16.7306088 C1.78125,16.7306088 1.27232143,16.2301918 1.27232143,15.5963303 L1.27232143,2.03502919 C1.27232143,1.93494579 1.35714286,1.83486239 1.47589286,1.83486239 L17.5410714,1.83486239 C17.6428571,1.83486239 17.7446429,1.91826522 17.7446429,2.03502919 L17.7276786,15.5963303 Z" id="Shape"></path>
<polygon id="Path" points="9.21212121 0 9.78787879 0 9.78787879 17.6470588 9.21212121 17.6470588"></polygon>
</g>
<g id="UM3" transform="translate(47.000000, 17.000000)" fill="#7E7E7E" fill-rule="nonzero">
<path d="M13.8997613,0 L0.100238663,0 C0.0501193317,0 0,0.0534031414 0,0.106806283 L0,16.8931937 C0,16.9465969 0.0501193317,17 0.100238663,17 L1.00238663,17 C1.20286396,17 1.40334129,16.9643979 1.50357995,16.7863874 L1.60381862,16.6795812 C1.73747017,16.5549738 1.92124105,16.4837696 2.10501193,16.4659686 L11.8949881,16.4659686 C12.0954654,16.4659686 12.2959427,16.5015707 12.3961814,16.6795812 L12.49642,16.7863874 C12.6300716,16.9109948 12.8138425,16.982199 12.9976134,17 L13.8997613,17 C13.9498807,17 14,16.9465969 14,16.8931937 L14,0.106806283 C14,0.0534031414 13.9498807,0 13.8997613,0 Z M12.4630072,12.8879581 C12.4630072,13.3863874 12.0787589,13.7958115 11.6109785,13.7958115 L2.35560859,13.7958115 C1.88782816,13.7958115 1.50357995,13.3863874 1.50357995,12.8879581 L1.50357995,1.86910995 C1.50357995,1.69109948 1.6372315,1.53089005 1.82100239,1.53089005 L12.1622912,1.53089005 C12.3293556,1.53089005 12.4797136,1.67329843 12.4797136,1.86910995 L12.4797136,12.8879581 L12.4630072,12.8879581 Z" id="Shape"></path>
</g>
<g id="UM2e" transform="translate(76.000000, 12.000000)" fill="#7E7E7E" fill-rule="nonzero">
<path d="M13.8392857,0.55 C13.625,0.55 13.4107143,0.513333333 13.3035714,0.33 L13.1964286,0.22 C13.0464936,0.087818331 12.8580799,0.0104431035 12.6607143,0 L2.26785714,0 C2.05357143,0 1.83928571,0.0366666667 1.73214286,0.22 L1.625,0.33 C1.47506501,0.462181669 1.28665131,0.539556897 1.08928571,0.55 L0.0178571429,0.55 L0.0178571429,22 L1.08928571,22 C1.30357143,22 1.51785714,21.9633333 1.625,21.78 L1.73214286,21.67 C1.88207784,21.5378183 2.07049155,21.460443 2.26785714,21.45 L12.7321429,21.45 C12.9464286,21.45 13.1607143,21.4866667 13.2678571,21.67 L13.375,21.78 C13.524935,21.9121817 13.7133487,21.989557 13.9107143,22 L14.9821429,22 L14.9821429,0.55 L13.8392857,0.55 Z M13.3035714,18.0216667 C13.2678571,18.1316667 13.1607143,18.1683333 13.0535714,18.2416667 L10.5714286,18.6083333 C8.44642857,18.755 6.42857143,18.755 4.32142857,18.6083333 L1.83928571,18.2416667 C1.73214286,18.2416667 1.625,18.1316667 1.625,18.0216667 L1.625,1.90666667 C1.625,1.76 1.76785714,1.57666667 1.94642857,1.57666667 L13.0892857,1.57666667 C13.1964286,1.57666667 13.3392857,1.72333333 13.3392857,1.90666667 L13.3392857,18.0033333 L13.3035714,18.0033333 L13.3035714,18.0216667 Z" id="Shape"></path>
</g>
</g>
</g>
</g>
</svg>
Side by side

After

Width:  |  Height:  |  Size: 5.2 KiB

67
resources/themes/cura-light/images/first_run_material_usage.svg Normal file
View file

@ -0,0 +1,67 @@
<?xml version="1.0" encoding="UTF-8"?>
<svg width="108px" height="81px" viewBox="0 0 108 81" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
<!-- Generator: Sketch 53.2 (72643) - https://sketchapp.com -->
<title>material usage</title>
<desc>Created with Sketch.</desc>
<defs>
<path d="M28.3343328,11.6408451 L38.7978142,21.943662 L24.0437158,21.943662 C24.0437158,17.9287715 25.6811506,14.2904521 28.3343328,11.6408451 Z" id="path-1"></path>
<filter x="-47.4%" y="-87.4%" width="194.9%" height="235.9%" filterUnits="objectBoundingBox" id="filter-2">
<feOffset dx="0" dy="-2" in="SourceAlpha" result="shadowOffsetOuter1"></feOffset>
<feGaussianBlur stdDeviation="2" in="shadowOffsetOuter1" result="shadowBlurOuter1"></feGaussianBlur>
<feColorMatrix values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0.5 0" type="matrix" in="shadowBlurOuter1"></feColorMatrix>
</filter>
<path d="M73.7704918,23.9363958 C73.7704918,16.4229813 79.8868204,10.3321555 87.431694,10.3321555 L87.431694,23.9363958 L73.7704918,23.9363958 Z" id="path-3"></path>
<filter x="-51.2%" y="-36.8%" width="202.5%" height="202.9%" filterUnits="objectBoundingBox" id="filter-4">
<feOffset dx="0" dy="2" in="SourceAlpha" result="shadowOffsetOuter1"></feOffset>
<feGaussianBlur stdDeviation="2" in="shadowOffsetOuter1" result="shadowBlurOuter1"></feGaussianBlur>
<feColorMatrix values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0.5 0" type="matrix" in="shadowBlurOuter1"></feColorMatrix>
</filter>
<path d="M56.3253101,64.2459325 C56.3253101,56.7325181 62.4416387,50.6416922 69.9865123,50.6416922 L69.9865123,64.2459325 L56.3253101,64.2459325 Z" id="path-5"></path>
<filter x="-51.2%" y="-36.8%" width="202.5%" height="202.9%" filterUnits="objectBoundingBox" id="filter-6">
<feOffset dx="0" dy="2" in="SourceAlpha" result="shadowOffsetOuter1"></feOffset>
<feGaussianBlur stdDeviation="2" in="shadowOffsetOuter1" result="shadowBlurOuter1"></feGaussianBlur>
<feColorMatrix values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0.5 0" type="matrix" in="shadowBlurOuter1"></feColorMatrix>
</filter>
<path d="M65.3544106,46.0289046 L74.9454459,55.579949 L61.4215457,55.579949 C61.4215457,51.8580157 62.922451,48.4851759 65.3544106,46.0289046 Z" id="path-7"></path>
<filter x="-51.8%" y="-52.4%" width="203.5%" height="246.6%" filterUnits="objectBoundingBox" id="filter-8">
<feOffset dx="0" dy="2" in="SourceAlpha" result="shadowOffsetOuter1"></feOffset>
<feGaussianBlur stdDeviation="2" in="shadowOffsetOuter1" result="shadowBlurOuter1"></feGaussianBlur>
<feColorMatrix values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0.5 0" type="matrix" in="shadowBlurOuter1"></feColorMatrix>
</filter>
</defs>
<g id="0419-data-collection-update" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
<g id="4.-collect-data-updated" transform="translate(-585.000000, -330.000000)">
<g id="material-usage" transform="translate(585.000000, 330.000000)">
<rect id="Rectangle-Copy-14" fill="#CCCCCC" x="8" y="3" width="100" height="78"></rect>
<g id="Group">
<rect id="Rectangle" fill="#E5E5E5" x="0" y="0" width="103" height="78"></rect>
<ellipse id="Oval-Copy-3" fill="#2671E7" cx="26.7759563" cy="23.664311" rx="13.6612022" ry="13.6042403"></ellipse>
<rect id="Rectangle" fill="#CCCCCC" x="25.136612" y="57.130742" width="10.1092896" height="1.90459364" rx="0.95229682"></rect>
<rect id="Rectangle-Copy-7" fill="#CCCCCC" x="25.136612" y="52.7773852" width="7.37704918" height="1.90459364" rx="0.95229682"></rect>
<rect id="Rectangle-Copy-6" fill="#CCCCCC" x="25.136612" y="61.2120141" width="6.83060109" height="1.90459364" rx="0.95229682"></rect>
<ellipse id="Oval" fill="#E8F2FC" cx="21.7213115" cy="62.164311" rx="1.2295082" ry="1.22438163"></ellipse>
<ellipse id="Oval-Copy-6" fill="#2671E7" cx="21.7213115" cy="58.0830389" rx="1.2295082" ry="1.22438163"></ellipse>
<ellipse id="Oval-Copy-7" fill="#104CAA" cx="21.7213115" cy="53.729682" rx="1.2295082" ry="1.22438163"></ellipse>
<ellipse id="Oval-Copy-4" fill="#2671E7" cx="73.7704918" cy="23.9363958" rx="13.6612022" ry="13.6042403"></ellipse>
<ellipse id="Oval-Copy-5" fill="#2671E7" cx="72.9508197" cy="57.6749117" rx="13.6612022" ry="13.6042403"></ellipse>
<g id="Combined-Shape" transform="translate(31.420765, 16.792254) rotate(90.000000) translate(-31.420765, -16.792254) ">
<use fill="black" fill-opacity="1" filter="url(#filter-2)" xlink:href="#path-1"></use>
<use fill="#E8F2FC" fill-rule="evenodd" xlink:href="#path-1"></use>
</g>
<g id="Combined-Shape-Copy" transform="translate(80.601093, 17.134276) scale(-1, 1) translate(-80.601093, -17.134276) ">
<use fill="black" fill-opacity="1" filter="url(#filter-4)" xlink:href="#path-3"></use>
<use fill="#E8F2FC" fill-rule="evenodd" xlink:href="#path-3"></use>
</g>
<g id="Combined-Shape-Copy-2" transform="translate(63.155911, 57.443812) scale(1, -1) rotate(-46.000000) translate(-63.155911, -57.443812) ">
<use fill="black" fill-opacity="1" filter="url(#filter-6)" xlink:href="#path-5"></use>
<use fill="#E8F2FC" fill-rule="evenodd" xlink:href="#path-5"></use>
</g>
<g id="Combined-Shape-Copy-3" transform="translate(68.183496, 50.804427) scale(-1, 1) rotate(90.000000) translate(-68.183496, -50.804427) ">
<use fill="black" fill-opacity="1" filter="url(#filter-8)" xlink:href="#path-7"></use>
<use fill="#104CAA" fill-rule="evenodd" xlink:href="#path-7"></use>
</g>
</g>
</g>
</g>
</g>
</svg>
Side by side

After

Width:  |  Height:  |  Size: 6.2 KiB

31
resources/themes/cura-light/images/first_run_number_slices.svg Normal file
View file

@ -0,0 +1,31 @@
<?xml version="1.0" encoding="UTF-8"?>
<svg width="108px" height="81px" viewBox="0 0 108 81" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
<!-- Generator: Sketch 53.2 (72643) - https://sketchapp.com -->
<title>number of slices</title>
<desc>Created with Sketch.</desc>
<g id="0419-data-collection-update" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
<g id="4.-collect-data-updated" transform="translate(-762.000000, -330.000000)">
<g id="number-of-slices" transform="translate(762.000000, 330.000000)">
<rect id="Rectangle" fill="#CCCCCC" x="8" y="3" width="100" height="78"></rect>
<rect id="Rectangle" fill="#E5E5E5" x="0" y="0" width="103" height="78"></rect>
<rect id="Rectangle" fill="#104CAA" x="13" y="49" width="3" height="16"></rect>
<rect id="Rectangle-Copy-9" fill="#104CAA" x="26" y="39" width="3" height="26"></rect>
<rect id="Rectangle-Copy-10" fill="#104CAA" x="39" y="59" width="3" height="6"></rect>
<rect id="Rectangle-Copy-11" fill="#104CAA" x="52" y="56" width="3" height="9"></rect>
<rect id="Rectangle-Copy-12" fill="#104CAA" x="65" y="49" width="3" height="16"></rect>
<rect id="Rectangle-Copy-13" fill="#104CAA" x="78" y="51" width="3" height="14"></rect>
<rect id="Rectangle-Copy-15" fill="#104CAA" x="91" y="30" width="3" height="35"></rect>
<polyline id="Path-2" stroke="#0063FF" points="14 44.1328507 27.5 30.5 40.5 42.5 53.5 48.5 66.5 35.5 79.4294479 32.5 92.5 20.5"></polyline>
<circle id="Oval" stroke="#0063FF" fill="#FFFFFF" cx="14.5" cy="43.5" r="2"></circle>
<circle id="Oval-Copy-8" stroke="#0063FF" fill="#FFFFFF" cx="27.5" cy="30.5" r="2"></circle>
<circle id="Oval-Copy-9" stroke="#0063FF" fill="#FFFFFF" cx="40.5" cy="42.5" r="2"></circle>
<circle id="Oval-Copy-10" stroke="#0063FF" fill="#FFFFFF" cx="53.5" cy="48.5" r="2"></circle>
<circle id="Oval-Copy-11" stroke="#0063FF" fill="#FFFFFF" cx="66.5" cy="35.5" r="2"></circle>
<circle id="Oval-Copy-12" stroke="#0063FF" fill="#FFFFFF" cx="79.5" cy="32.5" r="2"></circle>
<circle id="Oval-Copy-13" stroke="#0063FF" fill="#FFFFFF" cx="92.5" cy="20.5" r="2"></circle>
<rect id="Rectangle" fill="#CCCCCC" x="7" y="10" width="1" height="56"></rect>
<rect id="Rectangle" fill="#CCCCCC" x="7" y="65" width="92" height="1"></rect>
</g>
</g>
</g>
</svg>
Side by side

After

Width:  |  Height:  |  Size: 2.6 KiB

29
resources/themes/cura-light/images/first_run_print_settings.svg Normal file
View file

@ -0,0 +1,29 @@
<?xml version="1.0" encoding="UTF-8"?>
<svg width="108px" height="81px" viewBox="0 0 108 81" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
<!-- Generator: Sketch 53.2 (72643) - https://sketchapp.com -->
<title>Print settings</title>
<desc>Created with Sketch.</desc>
<g id="0419-data-collection-update" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
<g id="4.-collect-data-updated" transform="translate(-672.000000, -447.000000)">
<g id="Print-settings" transform="translate(672.000000, 447.000000)">
<rect id="Rectangle" fill="#CCCCCC" x="8" y="3" width="100" height="78"></rect>
<rect id="Rectangle" fill="#E5E5E5" x="0" y="0" width="103" height="78"></rect>
<rect id="Rectangle" fill="#2671E7" x="29" y="40" width="1" height="13"></rect>
<rect id="Rectangle" fill="#2671E7" x="18" y="53" width="12" height="1"></rect>
<rect id="Rectangle-Copy-5" fill="#999999" x="18" y="55" width="29" height="1"></rect>
<rect id="Rectangle-Copy-27" fill="#999999" x="18" y="57" width="29" height="1"></rect>
<rect id="Rectangle-Copy-28" fill="#999999" x="64" y="23" width="2" height="32" rx="1"></rect>
<rect id="Rectangle-Copy-29" fill="#999999" x="74" y="23" width="2" height="32" rx="1"></rect>
<rect id="Rectangle-Copy-30" fill="#999999" x="84" y="23" width="2" height="32" rx="1"></rect>
<rect id="Rectangle" fill="#999999" x="25" y="25" width="14" height="12"></rect>
<path d="M19.618034,25 L24,25 L24,37 L18.7236068,26.4472136 C18.4766175,25.9532351 18.6768419,25.3525621 19.1708204,25.1055728 C19.3096758,25.0361451 19.4627889,25 19.618034,25 Z" id="Path-4" fill="#999999"></path>
<path d="M41.618034,25 L46,25 L46,37 L40.7236068,26.4472136 C40.4766175,25.9532351 40.6768419,25.3525621 41.1708204,25.1055728 C41.3096758,25.0361451 41.4627889,25 41.618034,25 Z" id="Path-4" fill="#999999" transform="translate(43.000000, 31.000000) scale(-1, 1) translate(-43.000000, -31.000000) "></path>
<path d="M28,37 L28.7,37.9333333 C29.0313708,38.3751611 29.6581722,38.4647042 30.1,38.1333333 C30.1758057,38.0764791 30.2431458,38.009139 30.3,37.9333333 L31,37 L28,37 Z" id="Path-5" fill="#999999"></path>
<polygon id="Path-6" fill="#999999" points="25 24 39 24 37 20 27 20"></polygon>
<circle id="Oval-Copy" fill="#104CAA" cx="65" cy="27" r="3"></circle>
<circle id="Oval-Copy-2" fill="#4E93FF" cx="75" cy="43" r="3"></circle>
<circle id="Oval-Copy-16" fill="#2671E7" cx="85" cy="50" r="3"></circle>
</g>
</g>
</g>
</svg>
Side by side

After

Width:  |  Height:  |  Size: 2.7 KiB

67
resources/themes/cura-light/images/first_run_share_data.svg
View file

@ -1,67 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<svg width="200px" height="157px" viewBox="0 0 200 157" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
<!-- Generator: Sketch 52.6 (67491) - http://www.bohemiancoding.com/sketch -->
<title>Group 2</title>
<desc>Created with Sketch.</desc>
<defs>
<path id="path-1" d="M53.7324653,27.9792746 L73.5751295,47.6683938 L45.5958549,47.6683938 C45.5958549,39.9957681 48.7010421,33.0427857 53.7324653,27.9792746 Z" />
<filter x="-25.0%" y="-45.7%" width="150.0%" height="171.1%" filterUnits="objectBoundingBox" id="filter-2">
<feOffset dx="0" dy="-2" in="SourceAlpha" result="shadowOffsetOuter1"></feOffset>
<feGaussianBlur stdDeviation="2" in="shadowOffsetOuter1" result="shadowBlurOuter1"></feGaussianBlur>
<feColorMatrix values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0.5 0" type="matrix" in="shadowBlurOuter1"></feColorMatrix>
</filter>
<path id="path-3" d="M139.896373,51.4765924 C139.896373,37.1181394 151.495214,25.4783134 165.803109,25.4783134 L165.803109,51.4765924 L139.896373,51.4765924 Z" />
<filter x="-27.0%" y="-19.2%" width="154.0%" height="153.8%" filterUnits="objectBoundingBox" id="filter-4">
<feOffset dx="0" dy="2" in="SourceAlpha" result="shadowOffsetOuter1"></feOffset>
<feGaussianBlur stdDeviation="2" in="shadowOffsetOuter1" result="shadowBlurOuter1"></feGaussianBlur>
<feColorMatrix values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0.5 0" type="matrix" in="shadowBlurOuter1"></feColorMatrix>
</filter>
<path id="path-5" d="M106.813801,128.509823 C106.813801,114.15137 118.412641,102.511544 132.720536,102.511544 L132.720536,128.509823 L106.813801,128.509823 Z" />
<filter x="-27.0%" y="-19.2%" width="154.0%" height="153.8%" filterUnits="objectBoundingBox" id="filter-6">
<feOffset dx="0" dy="2" in="SourceAlpha" result="shadowOffsetOuter1"></feOffset>
<feGaussianBlur stdDeviation="2" in="shadowOffsetOuter1" result="shadowBlurOuter1"></feGaussianBlur>
<feColorMatrix values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0.5 0" type="matrix" in="shadowBlurOuter1"></feColorMatrix>
</filter>
<path id="path-7" d="M123.936343,93.6963118 L142.124524,111.948762 L116.478164,111.948762 C116.478164,104.83599 119.324441,98.3903503 123.936343,93.6963118 Z" />
<filter x="-27.3%" y="-27.4%" width="154.6%" height="176.7%" filterUnits="objectBoundingBox" id="filter-8">
<feOffset dx="0" dy="2" in="SourceAlpha" result="shadowOffsetOuter1"></feOffset>
<feGaussianBlur stdDeviation="2" in="shadowOffsetOuter1" result="shadowBlurOuter1"></feGaussianBlur>
<feColorMatrix values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0.5 0" type="matrix" in="shadowBlurOuter1"></feColorMatrix>
</filter>
</defs>
<g id="Iteration-4" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
<rect fill="#CCCCCC" x="13.4715026" y="14.507772" width="186.528497" height="141.968912"></rect>
<g>
<rect fill="#E5E5E5" x="0" y="11.4392428" width="189.637306" height="135.711016"></rect>
<rect fill="#E5E5E5" x="0" y="0" width="189.637306" height="10.3993116" rx="1"></rect>
<ellipse fill="#FFFFFF" cx="7.25388601" cy="5.1996558" rx="3.10880829" ry="3.11979348"></ellipse>
<ellipse fill="#FFFFFF" cx="16.5803109" cy="5.1996558" rx="3.10880829" ry="3.11979348"></ellipse>
<ellipse fill="#FFFFFF" cx="25.9067358" cy="5.1996558" rx="3.10880829" ry="3.11979348"></ellipse>
<ellipse fill="#2671E7" cx="50.7772021" cy="50.9566268" rx="25.9067358" ry="25.998279"></ellipse>
<rect fill="#CCCCCC" x="47.6683938" y="114.912393" width="19.1709845" height="3.63975906" rx="1"></rect>
<rect fill="#CCCCCC" x="47.6683938" y="106.592944" width="13.9896373" height="3.63975906" rx="1"></rect>
<rect fill="#CCCCCC" x="47.6683938" y="122.711877" width="12.9533679" height="3.63975906" rx="1"></rect>
<ellipse fill="#E8F2FC" cx="41.1917098" cy="124.531756" rx="2.33160622" ry="2.33984511"></ellipse>
<ellipse fill="#2671E7" cx="41.1917098" cy="116.732273" rx="2.33160622" ry="2.33984511"></ellipse>
<ellipse fill="#104CAA" cx="41.1917098" cy="108.412823" rx="2.33160622" ry="2.33984511"></ellipse>
<ellipse fill="#2671E7" cx="139.896373" cy="51.4765924" rx="25.9067358" ry="25.998279"></ellipse>
<ellipse fill="#2671E7" cx="138.341969" cy="115.952324" rx="25.9067358" ry="25.998279"></ellipse>
<g transform="translate(59.585492, 37.823834) rotate(90.000000) translate(-59.585492, -37.823834) ">
<use fill="black" fill-opacity="1" filter="url(#filter-2)" xlink:href="#path-1"></use>
<use fill="#E8F2FC" fill-rule="evenodd" xlink:href="#path-1"></use>
</g>
<g transform="translate(152.849741, 38.477453) scale(-1, 1) translate(-152.849741, -38.477453) ">
<use fill="black" fill-opacity="1" filter="url(#filter-4)" xlink:href="#path-3"></use>
<use fill="#E8F2FC" fill-rule="evenodd" xlink:href="#path-3"></use>
</g>
<g transform="translate(119.767168, 115.510684) scale(1, -1) rotate(-46.000000) translate(-119.767168, -115.510684) ">
<use fill="black" fill-opacity="1" filter="url(#filter-6)" xlink:href="#path-5"></use>
<use fill="#E8F2FC" fill-rule="evenodd" xlink:href="#path-5"></use>
</g>
<g transform="translate(129.301344, 102.822537) scale(-1, 1) rotate(90.000000) translate(-129.301344, -102.822537) ">
<use fill="black" fill-opacity="1" filter="url(#filter-8)" xlink:href="#path-7"></use>
<use fill="#104CAA" fill-rule="evenodd" xlink:href="#path-7"></use>
</g>
</g>
</g>
</svg>
Side by side

Before

Width:  |  Height:  |  Size: 5.9 KiB