mirror of
https://github.com/Ultimaker/Cura.git
synced 2025-08-10 15:25:09 -06:00
Merge branch 'master' into feature_model_list
This commit is contained in:
Diego Prado Gesto
commit
9e5e57e6c5
514 changed files with 80530 additions and 9839 deletions
|
|
@ -94,8 +94,8 @@
|
|||
"action_button_active": [39, 44, 48, 30],
|
||||
"action_button_active_text": [255, 255, 255, 255],
|
||||
"action_button_active_border": [255, 255, 255, 100],
|
||||
"action_button_disabled": [39, 44, 48, 255],
|
||||
"action_button_disabled_text": [255, 255, 255, 80],
|
||||
"action_button_disabled": [19, 24, 28, 255],
|
||||
"action_button_disabled_text": [200, 200, 200, 80],
|
||||
"action_button_disabled_border": [255, 255, 255, 30],
|
||||
|
||||
"scrollbar_background": [39, 44, 48, 0],
|
||||
|
|
@ -214,7 +214,6 @@
|
|||
|
||||
"toolbox_header_button_text_active": [255, 255, 255, 255],
|
||||
"toolbox_header_button_text_inactive": [128, 128, 128, 255],
|
||||
"toolbox_header_button_text_hovered": [255, 255, 255, 255],
|
||||
|
||||
"monitor_printer_family_tag": [86, 86, 106, 255],
|
||||
"monitor_text_primary": [229, 229, 229, 255],
|
||||
|
|
|
|||
|
|
@ -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>
|
||||
|
After Width: | Height: | Size: 5.2 KiB |
|
|
@ -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>
|
||||
|
After Width: | Height: | Size: 6.2 KiB |
|
|
@ -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>
|
||||
|
After Width: | Height: | Size: 2.6 KiB |
|
|
@ -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>
|
||||
|
After Width: | Height: | Size: 2.7 KiB |
|
|
@ -0,0 +1,12 @@
|
|||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<svg width="200px" height="135px" viewBox="0 0 200 135" 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-cloud</title>
|
||||
<desc>Created with Sketch.</desc>
|
||||
<g stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
|
||||
<path d="M184.645934,101.269713 C184.402632,95.7100464 182.987439,90.4490704 180.637153,85.7196609 L184.851695,85.7196609 C187.817797,85.7196609 190.254237,83.3353195 190.254237,80.4326431 L190.36017,80.4326431 L190.36017,16.262763 C190.36017,15.1224259 189.40678,14.2930898 188.347457,14.2930898 L149.933791,14.2930898 L149.933791,63.9459005 C148.198887,63.7202321 146.428947,63.6037711 144.631348,63.6037711 C142.750807,63.6037711 140.900537,63.7312272 139.088982,63.9778345 L139.088982,14.2930898 L138.930084,14.2930898 L138.930084,11.4224041 C138.588831,10.5826557 137.742066,10.0297833 136.824681,10.0297833 L63.0561437,10.0297833 C61.7452327,10.0297833 60.7918428,11.0794119 60.7918428,12.2456657 L60.7918428,84.4367811 C60.7918428,87.7022917 63.5328385,90.3846758 66.8697029,90.3846758 L106.674877,90.3846758 C105.315869,94.3430337 104.579138,98.5831707 104.579138,102.99253 C104.579138,104.646987 104.68286,106.27762 104.884257,107.878484 L65.082097,107.878484 C63.771186,107.995109 62.460275,108.461611 61.5068852,109.277988 L60.7918428,109.977741 C60.0768004,111.143995 58.6467157,111.377246 57.216631,111.377246 L50.7812497,111.377246 C50.4237285,111.377246 50.0662073,111.027369 50.0662073,110.677493 L50.0662073,101.269713 L13.3474575,101.269713 C12.1822033,101.373379 11.0169491,101.788048 10.1694914,102.513717 L9.53389824,103.135719 C8.89830503,104.172389 7.62711862,104.379723 6.35593214,104.379723 L0.635593219,104.379723 C0.317796608,104.379723 -6.39488462e-14,104.068722 -6.39488462e-14,103.757721 C-6.39488462e-14,5.68872783 0.317796608,5.3777268 0.635593219,5.3777268 L50.0662073,5.3777268 L50.0662073,0.699752327 C50.0662073,0.349876165 50.4237285,-1.63424829e-13 50.7812497,-1.63424829e-13 C149.57627,-1.63424829e-13 149.933791,0.349876165 149.933791,0.699752327 L149.933791,5.3777268 L199.364407,5.3777268 C199.682204,5.3777268 200,5.68872783 200,5.99972886 L200,103.757721 C200,104.068722 199.682204,104.379723 199.364407,104.379723 L193.644068,104.379723 C192.478814,104.276056 191.313559,103.861388 190.466102,103.135719 L189.830509,102.513717 C189.194915,101.477046 187.923729,101.269713 186.652543,101.269713 L184.645934,101.269713 Z M50.0662073,14.2930898 L11.5466101,14.2930898 C10.3813559,14.2930898 9.53389824,15.2260929 9.53389824,16.262763 L9.53389824,80.4326431 C9.53389824,83.3353195 11.9703389,85.7196609 14.9364406,85.7196609 L50.0662073,85.7196609 L50.0662073,14.2930898 Z" fill="#08073F" fill-rule="nonzero"></path>
|
||||
<g transform="translate(112.574850, 70.658683)" fill="#3282FF">
|
||||
<path d="M32.3080573,64.1243454 C14.46481,64.1243454 1.42108547e-14,49.7696217 1.42108547e-14,32.0621727 C1.42108547e-14,14.3547237 14.46481,-4.26325641e-14 32.3080573,-4.26325641e-14 C50.1513046,-4.26325641e-14 64.6161146,14.3547237 64.6161146,32.0621727 C64.6161146,49.7696217 50.1513046,64.1243454 32.3080573,64.1243454 Z M46.2852901,26.9720257 C45.8876525,23.478071 42.9053703,20.8062233 39.3266316,20.8062233 C38.3325376,20.8062233 37.5372623,21.0117501 36.741987,21.4228035 C34.9526177,18.5454291 31.7715167,16.6956884 28.3915969,16.6956884 C22.8246701,16.6956884 18.4506561,21.2172768 18.4506561,26.9720257 C18.4506561,26.9720257 18.4506561,26.9720257 18.4506561,27.1775525 C15.0707363,27.588606 12.4860917,30.6715072 12.4860917,34.165462 C12.4860917,38.0704701 15.6671927,41.3588981 19.4447502,41.3588981 C22.4270324,41.3588981 41.7124574,41.3588981 45.2911961,41.3588981 C49.0687535,41.3588981 52.2498546,38.0704701 52.2498546,34.165462 C52.2498546,30.4659805 49.66521,27.588606 46.2852901,26.9720257 Z"></path>
|
||||
</g>
|
||||
</g>
|
||||
</svg>
|
||||
|
After Width: | Height: | Size: 3.9 KiB |
|
|
@ -0,0 +1,11 @@
|
|||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<svg width="120px" height="72px" viewBox="0 0 120 72" 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>cura</title>
|
||||
<desc>Created with Sketch.</desc>
|
||||
<g id="Iteration-4" stroke="none" stroke-width="1" fill="#000000" fill-rule="nonzero">
|
||||
<path d="M114.3,63.1 C112.104248,65.5577268 108.994324,67.0042033 105.7,67.1 L14.3,67.1 C11.0056762,67.0042033 7.89575168,65.5577268 5.7,63.1 L114.3,63.1 Z M120,59.1 L0,59.1 L0,59.9 C0,64.5 6.3,71.1 14.3,71.1 L105.7,71.1 C113.7,71.1 120,64.4 120,59.9 L120,59.1 Z" />
|
||||
<path d="M106,4.9 L106,59.1 L14,59.1 L14,4.9 L106,4.9 Z M110,0.9 L10,0.9 L10,63.1 L110,63.1 L110,0.9 Z" />
|
||||
<path d="M60.5,36.5 L72.3,36.5 L72.3,43.1 L60.5,43.1 C52.8,43.1 48,37.8 48,30.3 C48,22.8 52.7,17.6 60.5,17.6 L72.3,17.6 L72.3,24.2 L60.5,24.2 C56.6,24.2 54.6,27 54.6,30.3 C54.6,33.7 56.6,36.5 60.5,36.5 Z M52.3,8.9 L36.9,24.5 L36.9,55.1 L67.6,55.1 L83.2,39.5 L83.2,8.9 L52.3,8.9 Z" />
|
||||
</g>
|
||||
</svg>
|
||||
|
After Width: | Height: | Size: 1.1 KiB |
|
|
@ -103,33 +103,29 @@ QtObject
|
|||
// This property will be back-propagated when the width of the label is calculated
|
||||
property var buttonWidth: 0
|
||||
|
||||
background: Item
|
||||
background: Rectangle
|
||||
{
|
||||
id: backgroundRectangle
|
||||
implicitHeight: control.height
|
||||
implicitWidth: buttonWidth
|
||||
Rectangle
|
||||
{
|
||||
id: buttonFace
|
||||
implicitHeight: parent.height
|
||||
implicitWidth: parent.width
|
||||
radius: UM.Theme.getSize("action_button_radius").width
|
||||
radius: UM.Theme.getSize("action_button_radius").width
|
||||
|
||||
color:
|
||||
color:
|
||||
{
|
||||
if (control.checked)
|
||||
{
|
||||
if (control.checked)
|
||||
return UM.Theme.getColor("main_window_header_button_background_active")
|
||||
}
|
||||
else
|
||||
{
|
||||
if (control.hovered)
|
||||
{
|
||||
return UM.Theme.getColor("main_window_header_button_background_active")
|
||||
}
|
||||
else
|
||||
{
|
||||
if (control.hovered)
|
||||
{
|
||||
return UM.Theme.getColor("main_window_header_button_background_hovered")
|
||||
}
|
||||
return UM.Theme.getColor("main_window_header_button_background_inactive")
|
||||
return UM.Theme.getColor("main_window_header_button_background_hovered")
|
||||
}
|
||||
return UM.Theme.getColor("main_window_header_button_background_inactive")
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
label: Item
|
||||
|
|
@ -168,6 +164,8 @@ QtObject
|
|||
buttonWidth = width
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -398,73 +396,6 @@ QtObject
|
|||
}
|
||||
}
|
||||
|
||||
// Combobox with items with colored rectangles
|
||||
property Component combobox_color: Component
|
||||
{
|
||||
|
||||
ComboBoxStyle
|
||||
{
|
||||
|
||||
background: Rectangle
|
||||
{
|
||||
color: !enabled ? UM.Theme.getColor("setting_control_disabled") : control._hovered ? UM.Theme.getColor("setting_control_highlight") : UM.Theme.getColor("setting_control")
|
||||
border.width: UM.Theme.getSize("default_lining").width
|
||||
border.color: !enabled ? UM.Theme.getColor("setting_control_disabled_border") : control._hovered ? UM.Theme.getColor("setting_control_border_highlight") : UM.Theme.getColor("setting_control_border")
|
||||
radius: UM.Theme.getSize("setting_control_radius").width
|
||||
}
|
||||
|
||||
label: Item
|
||||
{
|
||||
Label
|
||||
{
|
||||
anchors.left: parent.left
|
||||
anchors.leftMargin: UM.Theme.getSize("default_lining").width
|
||||
anchors.right: swatch.left
|
||||
anchors.rightMargin: UM.Theme.getSize("default_lining").width
|
||||
anchors.verticalCenter: parent.verticalCenter
|
||||
|
||||
text: control.currentText
|
||||
font: UM.Theme.getFont("default")
|
||||
color: !enabled ? UM.Theme.getColor("setting_control_disabled_text") : UM.Theme.getColor("setting_control_text")
|
||||
|
||||
elide: Text.ElideRight
|
||||
verticalAlignment: Text.AlignVCenter
|
||||
}
|
||||
|
||||
UM.RecolorImage
|
||||
{
|
||||
id: swatch
|
||||
height: Math.round(control.height / 2)
|
||||
width: height
|
||||
anchors.right: downArrow.left
|
||||
anchors.verticalCenter: parent.verticalCenter
|
||||
anchors.rightMargin: UM.Theme.getSize("default_margin").width
|
||||
|
||||
sourceSize.width: width
|
||||
sourceSize.height: height
|
||||
source: UM.Theme.getIcon("extruder_button")
|
||||
color: (control.color_override !== "") ? control.color_override : control.color
|
||||
}
|
||||
|
||||
UM.RecolorImage
|
||||
{
|
||||
id: downArrow
|
||||
anchors.right: parent.right
|
||||
anchors.rightMargin: UM.Theme.getSize("default_lining").width * 2
|
||||
anchors.verticalCenter: parent.verticalCenter
|
||||
|
||||
source: UM.Theme.getIcon("arrow_bottom")
|
||||
width: UM.Theme.getSize("standard_arrow").width
|
||||
height: UM.Theme.getSize("standard_arrow").height
|
||||
sourceSize.width: width + 5 * screenScaleFactor
|
||||
sourceSize.height: width + 5 * screenScaleFactor
|
||||
|
||||
color: UM.Theme.getColor("setting_control_button")
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
property Component checkbox: Component
|
||||
{
|
||||
CheckBoxStyle
|
||||
|
|
|
|||
|
|
@ -29,6 +29,11 @@
|
|||
"weight": 63,
|
||||
"family": "Noto Sans"
|
||||
},
|
||||
"huge": {
|
||||
"size": 1.8,
|
||||
"weight": 50,
|
||||
"family": "Noto Sans"
|
||||
},
|
||||
"medium": {
|
||||
"size": 1.16,
|
||||
"weight": 40,
|
||||
|
|
@ -187,10 +192,16 @@
|
|||
|
||||
"action_panel_secondary": [27, 95, 202, 255],
|
||||
|
||||
"first_run_shadow": [50, 50, 50, 255],
|
||||
|
||||
"toolbar_background": [255, 255, 255, 255],
|
||||
|
||||
"notification_icon": [255, 0, 0, 255],
|
||||
|
||||
"printer_type_label_background": [228, 228, 242, 255],
|
||||
|
||||
"window_disabled_background": [0, 0, 0, 255],
|
||||
|
||||
"text": [25, 25, 25, 255],
|
||||
"text_detail": [174, 174, 174, 128],
|
||||
"text_link": [50, 130, 255, 255],
|
||||
|
|
@ -382,9 +393,7 @@
|
|||
"printer_config_matched": [50, 130, 255, 255],
|
||||
"printer_config_mismatch": [127, 127, 127, 255],
|
||||
|
||||
"toolbox_header_button_text_active": [0, 0, 0, 255],
|
||||
"toolbox_header_button_text_inactive": [0, 0, 0, 255],
|
||||
"toolbox_header_button_text_hovered": [0, 0, 0, 255],
|
||||
|
||||
"favorites_header_bar": [245, 245, 245, 255],
|
||||
"favorites_header_hover": [245, 245, 245, 255],
|
||||
|
|
@ -424,7 +433,7 @@
|
|||
"monitor_skeleton_loading": [238, 238, 238, 255],
|
||||
"monitor_placeholder_image": [230, 230, 230, 255],
|
||||
"monitor_image_overlay": [0, 0, 0, 255],
|
||||
"monitor_shadow": [220, 220, 220, 255],
|
||||
"monitor_shadow": [200, 200, 200, 255],
|
||||
|
||||
"monitor_carousel_dot": [216, 216, 216, 255],
|
||||
"monitor_carousel_dot_current": [119, 119, 119, 255]
|
||||
|
|
@ -509,6 +518,8 @@
|
|||
"action_button_icon": [1.0, 1.0],
|
||||
"action_button_radius": [0.15, 0.15],
|
||||
|
||||
"radio_button": [1.3, 1.3],
|
||||
|
||||
"small_button": [2, 2],
|
||||
"small_button_icon": [1.5, 1.5],
|
||||
|
||||
|
|
@ -552,6 +563,7 @@
|
|||
"save_button_specs_icons": [1.4, 1.4],
|
||||
|
||||
"job_specs_button": [2.7, 2.7],
|
||||
"first_run_shadow_radius": [1.2, 1.2],
|
||||
|
||||
"monitor_preheat_temperature_control": [4.5, 2.0],
|
||||
|
||||
|
|
@ -579,10 +591,8 @@
|
|||
"toolbox_thumbnail_large": [12.0, 10.0],
|
||||
"toolbox_footer": [1.0, 4.5],
|
||||
"toolbox_footer_button": [8.0, 2.5],
|
||||
"toolbox_showcase_spacing": [1.0, 1.0],
|
||||
"toolbox_header_tab": [8.0, 4.0],
|
||||
"toolbox_header_tab": [12.0, 4.0],
|
||||
"toolbox_detail_header": [1.0, 14.0],
|
||||
"toolbox_detail_tile": [1.0, 8.0],
|
||||
"toolbox_back_column": [6.0, 1.0],
|
||||
"toolbox_back_button": [6.0, 2.0],
|
||||
"toolbox_installed_tile": [1.0, 8.0],
|
||||
|
|
@ -590,11 +600,12 @@
|
|||
"toolbox_heading_label": [1.0, 3.8],
|
||||
"toolbox_header": [1.0, 4.0],
|
||||
"toolbox_header_highlight": [0.25, 0.25],
|
||||
"toolbox_progress_bar": [8.0, 0.5],
|
||||
"toolbox_chart_row": [1.0, 2.0],
|
||||
"toolbox_action_button": [8.0, 2.5],
|
||||
"toolbox_loader": [2.0, 2.0],
|
||||
|
||||
"notification_icon": [1.5, 1.5],
|
||||
|
||||
"avatar_image": [6.8, 6.8],
|
||||
|
||||
"monitor_config_override_box": [1.0, 14.0],
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue