Commit graph

8318 commits

Author SHA1 Message Date
Ghostkeeper
c0c45519a0
Change another useless rectangle into an item
It's more efficient to render. Also changed some code style.

Contributes to issue CURA-6032.
2018-12-18 16:49:41 +01:00
ChrisTerBeke
4bf24671a2 Use the (not final) cloud icon when cloud connected 2018-12-18 16:33:39 +01:00
ChrisTerBeke
0588c54035 Start work on cloud icon 2018-12-18 16:29:13 +01:00
Ghostkeeper
c66257bf4d
Use item instead of transparent rectangle
This is faster to render.

Contributes to issue CURA-6032.
2018-12-18 16:18:01 +01:00
ChrisTerBeke
25caf1a087 Fix merge conflicts 2018-12-18 14:44:13 +01:00
Ghostkeeper
279812e4ff
Round width of buttons
They were getting rendered a bit weird if your pixel scale was not an integer (for me it's 1.25).
2018-12-18 13:58:21 +01:00
Jaime van Kessel
a181ffe79d Merge branch 'fix_print_monitor_dark_theme' of https://github.com/fieldOfView/Cura into 4.0 2018-12-18 13:54:45 +01:00
Lipu Fei
71e71e0a4f
Merge pull request #4975 from Ultimaker/CURA-6011_connection_types
[4.0] Every output device should define its connection type
2018-12-18 13:23:02 +01:00
Lipu Fei
bf5559167e
Merge pull request #5015 from Ultimaker/CURA-5994_umop_firmware_update
[4.0] CURA-5994 Cura used wrong firmware version for UMO+. The firmware was from UMO.
2018-12-18 11:33:40 +01:00
Diego Prado Gesto
cc462ef3a6 Add a placeholder for a pattern in the header, if the theme wants to add one. 2018-12-18 10:29:44 +01:00
Jaime van Kessel
be9d35d45f Fix some minor layout issues
CURA-6011
2018-12-18 09:47:51 +01:00
Lipu Fei
6017c2b4d2 Replace isProfileUserCreated with hasCustomQuality
CURA-6028
2018-12-18 08:56:56 +01:00
Diego Prado Gesto
3c99b69724 Merge branch '4.0' into CURA-6005_cura_drive_plugin
Remove unused file.

Contributes to CURA-6005.
2018-12-18 07:17:37 +01:00
ChrisTerBeke
b2f32f81e4 Merge branch '4.0' into STAR-322_cloud-connection 2018-12-17 18:23:55 +01:00
Diego Prado Gesto
08458df873 Merge branch '4.0' of github.com:Ultimaker/Cura into 4.0 2018-12-17 17:56:22 +01:00
Diego Prado Gesto
62d20ac773 Change the base color of the tooltips to align with the designs
Contributes to CURA-6004.
2018-12-17 17:55:40 +01:00
Jaime van Kessel
d395c38436 Removed collapse / expand all
I don't think it ever worked.
2018-12-17 17:47:33 +01:00
ChrisTerBeke
c75fa5de3d Fix merge conflict 2018-12-17 17:39:30 +01:00
fieldOfView
7d6e698f43 Fix (USB) print monitor in dark theme 2018-12-17 17:37:21 +01:00
Jaime van Kessel
a7c1a45d44 Merge branch '4.0' of github.com:Ultimaker/Cura into 4.0 2018-12-17 17:32:31 +01:00
Jaime van Kessel
0e294481ff Improve readability of printer_type_label for dark theme 2018-12-17 17:32:11 +01:00
Diego Prado Gesto
d6212d5a39 Add elide in the showcase title and reduce the height a bit so there are
only 2 lines for the title.
2018-12-17 17:29:24 +01:00
alekseisasin
4d135c13bb Cura used wrong firmware version for UMO+. The firmware was from UMO.
The reason of this issue because it used a heated firmware from his
parent(UMO) printer. To avoid this case we need to define externally
the firmware_hbk_file property in umo+ defintion file
CURA-5994
2018-12-17 16:46:02 +01:00
Diego Prado Gesto
b5d8db6a77 Merge branch '4.0' into CURA-6011_connection_types 2018-12-17 15:44:02 +01:00
Lipu Fei
1440c7d996
Merge pull request #5005 from Ultimaker/sdk_version_6
Increment API version to 6
2018-12-17 15:43:09 +01:00
Diego Prado Gesto
02825a062f Change the remove and the info buttons
Contributes to CURA-6005.
2018-12-17 13:38:41 +01:00
Jaime van Kessel
aad7540366 Fix situation where multiple connect configurations would cause issues
CURA-6011
2018-12-17 13:31:38 +01:00
Diego Prado Gesto
b7904d6e05 Unify the CuraDrive plugin with the rest of the items in Cura
For instance, the buttons were converted to either primary buttons or secondary buttons. A new CheckBox component was created in Cura in order to reuse it in the future.

Contributes to CURA-6005.
2018-12-17 13:04:23 +01:00
ChrisTerBeke
02a2585ad1 Merge branch '4.0' into STAR-322_cloud-connection 2018-12-17 12:33:15 +01:00
Diego Prado Gesto
e62a570210 Merge branch '4.0' into CURA-6005_cura_drive_plugin 2018-12-17 11:25:19 +01:00
Diego Prado Gesto
ed4d339dee Change the margin in the view orientation buttons to aling the pixels correctly 2018-12-17 11:00:49 +01:00
Jaime van Kessel
938287095f Use connection type instead of um_network_key to see if a printer has a network connection
CURA-6011
2018-12-17 10:47:14 +01:00
Diego Prado Gesto
cbd8e72bd5 Add fixed width to the preview button
Doing that, the elide will work. Also increase the size of the panel a bit so it will fit better in other languages. Adding also the tooltip in case the text is too long in other languages.
2018-12-17 10:42:52 +01:00
Ghostkeeper
8d6a281070
Increment SDK version in bundled packages file
And increment the version number of every package.

Contributes to issue CURA-6019.
2018-12-17 09:58:38 +01:00
ChrisTerBeke
d900648f99 Merge branch '4.0' into STAR-322_cloud-connection 2018-12-17 09:28:22 +01:00
Lipu Fei
4ab123eb87 Merge remote-tracking branch 'origin/CURA-6028_stage_button_fixes' into 4.0 2018-12-17 08:48:31 +01:00
Lipu Fei
efb832702b
Merge pull request #4976 from Ultimaker/CURA-6013-rate-packages
Cura 6013 rate packages
2018-12-17 08:32:18 +01:00
Danny Tuppeny
46c950a5b9
Add Monoprice Ultimate based on Wanhao D6
The default values on my Monoprice Ultimate are way different to what Cura has the Wanhao Duplicator 6 as. I'm guessing that Monoprice have changed these (if not, then maybe the Duplicator 6 file is wrong?). Without this profile, I had a 4hr print estimate for a piece that's only 55% through after 4hours. With this profile, it estimates 7:22 (which seems very accurate).

I got the default values from the printer when I connected Octoprint to it:

```
  21:20:56: Attempting to connect to printer
  21:20:56: Connection opened
< 21:20:57: start
> 21:20:57: N1 M110 *2
< 21:20:57: echo:Marlin 1.0.0
> 21:20:57: N2 M110 *1
< 21:20:57: echo: Last Updated: Jun 26 2016 12:14:19 | Author: Version DEV 3.01
> 21:20:57: N3 M115 *5
< 21:20:57: Compiled: Jun 26 2016
< 21:20:57: echo: Free Memory: 1961  PlannerBufferBytes: 1232
< 21:20:57: echo:Stored settings retrieved
< 21:20:57: echo:Steps per unit:
< 21:20:57: echo:  M92 X80.04 Y80.04 Z400.48 E94.30
< 21:20:57: echo:Maximum feedrates (mm/s):
< 21:20:57: echo:  M203 X300.00 Y300.00 Z5.00 E25.00
< 21:20:57: echo:Maximum Acceleration (mm/s2):
< 21:20:57: echo:  M201 X3000 Y3000 Z100 E500
< 21:20:57: echo:Acceleration: S=acceleration, T=retract acceleration
< 21:20:57: echo:  M204 S800.00 T800.00
< 21:20:57: echo:Advanced variables: S=Min feedrate (mm/s), T=Min travel feedrate (mm/s), B=minimum segment time (ms), X=maximum XY jerk (mm/s),  Z=maximum Z jerk (mm/s),  E=maximum E jerk (mm/s)
< 21:20:57: echo:  M205 S0.00 T0.00 B20000 X10.00 Z0.40 E1.00
< 21:20:57: echo:Home offset (mm):
< 21:20:57: echo:  M206 X0.00 Y0.00 Z0.40
```
2018-12-16 19:57:43 +00:00
Jaime van Kessel
226d052468 Move the machines from machinelist into their own model
CURA-6011
2018-12-14 17:10:58 +01:00
ChrisTerBeke
08ab28a23a Merge branch '4.0' into STAR-322_cloud-connection 2018-12-14 16:41:52 +01:00
Jaime van Kessel
ef6f666c3e Remove duplicate alias definition
Yay. Merges.
2018-12-14 16:41:07 +01:00
ChrisTerBeke
0bbd77e0f0 Merge branch '4.0' into STAR-322_cloud-connection 2018-12-14 16:34:52 +01:00
Ian Paschal
38ca23a22f
Merge pull request #4997 from Ultimaker/prevent_monitor_stage_overlap
Quick fix to prevent monitor stage from overlapping header
2018-12-14 16:29:39 +01:00
Ghostkeeper
78a5f95c43
Merge branch 'CURA-5876_fixes' into 4.0 2018-12-14 16:28:04 +01:00
Ian Paschal
74af11d609 Anchor loader to stage menu vertical center 2018-12-14 16:20:08 +01:00
Aleksei S
9146a775a4 After resetting the custom settings the quality slider did not update selected value
CURA-6028
2018-12-14 16:17:05 +01:00
Ian Paschal
ffccbcea2f Anchor to bottom of header background 2018-12-14 16:13:49 +01:00
ChrisTerBeke
2772b3bcbd Merge branch '4.0' into STAR-322_cloud-connection 2018-12-14 16:10:20 +01:00
Ghostkeeper
3a74511d23
Remove padding from views selector
This padding made it break the height of the item for some reason. I guess that is a Qt bug.
In any case, the padding shouldn't be there either since the lining is on the inside of the child buttons so the padding only causes a gap to appear on the left and right sides, which looks weird.

Contributes to issue CURA-6029.
2018-12-14 15:02:14 +01:00
Jaime van Kessel
b70a4ae0a2 Merge branch 'CURA-6015_fix_osx_crash' of github.com:Ultimaker/Cura into 4.0 2018-12-14 13:35:37 +01:00