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

Merge branch '2.1'

Browse source 
Conflicts:
	plugins/RemovableDriveOutputDevice/OSXRemovableDrivePlugin.py
	plugins/RemovableDriveOutputDevice/WindowsRemovableDrivePlugin.py
	plugins/USBPrinting/PrinterConnection.py
	resources/machines/fdmprinter.json
	resources/profiles/ultimaker2+/abs_0.4_high.curaprofile
This commit is contained in:
Ghostkeeper 2016-03-17 15:24:00 +01:00
commit de9a66e1f4
47 changed files with 248 additions and 154 deletions
Download patch file Download diff file Expand all files Collapse all files

17
resources/themes/cura/icons/notice.svg Normal file
View file

@ -0,0 +1,17 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- Generator: Adobe Illustrator 16.2.0, SVG Export Plug-In . SVG Version: 6.00 Build 0) -->
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
width="1792px" height="1792px" viewBox="0 0 1792 1792" enable-background="new 0 0 1792 1792" xml:space="preserve">
<path d="M896,2.071c162.18,0,311.75,39.963,448.71,119.889c136.961,79.926,245.403,188.37,325.33,325.33
C1749.966,584.25,1789.929,733.82,1789.929,896s-39.963,311.749-119.889,448.71c-79.927,136.961-188.369,245.403-325.33,325.33
c-136.96,79.926-286.53,119.889-448.71,119.889c-162.179,0-311.75-39.963-448.71-119.889
c-136.96-79.927-245.404-188.369-325.33-325.33C42.035,1207.749,2.071,1058.18,2.071,896S42.035,584.25,121.96,447.29
c79.926-136.96,188.369-245.404,325.33-325.33C584.25,42.034,733.821,2.071,896,2.071z M1044.988,1453.541v-221.154
c0-10.863-3.492-19.981-10.476-27.353c-6.984-7.372-15.52-11.058-25.607-11.058H785.423c-10.088,0-19.011,3.879-26.771,11.64
c-7.76,7.76-11.64,16.683-11.64,26.771v221.154c0,10.089,3.88,19.012,11.64,26.771c7.76,7.761,16.684,11.64,26.771,11.64h223.482
c10.088,0,18.623-3.686,25.607-11.058C1041.496,1473.523,1044.988,1464.404,1044.988,1453.541z M1042.66,1053.136l20.951-722.825
c0-9.312-3.879-16.295-11.64-20.951c-7.76-6.208-17.071-9.312-27.935-9.312H767.963c-10.863,0-20.175,3.104-27.935,9.312
c-7.76,4.656-11.64,11.64-11.64,20.951l19.788,722.825c0,7.761,3.879,14.55,11.64,20.369c7.76,5.82,17.072,8.73,27.936,8.73h215.334
c10.863,0,19.982-2.91,27.354-8.73C1037.81,1067.686,1041.884,1060.896,1042.66,1053.136z"/>
</svg>
Side by side

After

Width:  |  Height:  |  Size: 1.7 KiB

1
resources/themes/cura/icons/warning.svg Normal file
View file

@ -0,0 +1 @@
<svg width="1792" height="1792" viewBox="0 0 1792 1792" xmlns="http://www.w3.org/2000/svg"><path d="M1024 1375v-190q0-14-9.5-23.5t-22.5-9.5h-192q-13 0-22.5 9.5t-9.5 23.5v190q0 14 9.5 23.5t22.5 9.5h192q13 0 22.5-9.5t9.5-23.5zm-2-374l18-459q0-12-10-19-13-11-24-11h-220q-11 0-24 11-10 7-10 21l17 457q0 10 10 16.5t24 6.5h185q14 0 23.5-6.5t10.5-16.5zm-14-934l768 1408q35 63-2 126-17 29-46.5 46t-63.5 17h-1536q-34 0-63.5-17t-46.5-46q-37-63-2-126l768-1408q17-31 47-49t65-18 65 18 47 49z"/></svg>
Side by side

After

Width:  |  Height:  |  Size: 488 B

8
resources/themes/cura/theme.json
View file

@ -18,6 +18,12 @@
"size": 1.0,
"family": "Open Sans"
},
"small_bold":
{
"size": 1.0,
"family": "Open Sans",
"bold": true
},
"very_small": {
"size": 0.75,
"family": "Open Sans"
@ -68,7 +74,7 @@
"text_hover": [70, 84, 113, 255],
"text_pressed": [12, 169, 227, 255],
"text_white": [255, 255, 255, 255],
"text_subtext": [127, 127, 127, 255],
"text_subtext": [100, 100, 100, 255],
"error": [255, 140, 0, 255],
"sidebar_header_bar": [24, 41, 77, 255],