Ghostkeeper
1d34f1ecb4
Merge branch 'master' of ssh://github.com/Ultimaker/Cura
2020-01-30 15:47:46 +01:00
Ghostkeeper
c00004b1c0
Correct capitalisation of Geeetech printer names
...
Contributes to issue CURA-7132.
2020-01-30 15:47:18 +01:00
amitlobo
004ddb3e2c
Add Geeetech printer and extruder definitions
2020-01-30 15:46:08 +01:00
Jaime van Kessel
37471b7861
Merge branch 'CURA-7152_unreadable_license_dialog' of github.com:Ultimaker/Cura
2020-01-30 15:32:21 +01:00
Remco Burema
99680db819
Merge branch 'master' of https://github.com/Ultimaker/Cura
2020-01-30 15:07:06 +01:00
Remco Burema
c6b6af14cf
Fix typo.
2020-01-30 15:06:47 +01:00
Nino van Hooff
eec7d2f0cd
Use default timeout for sync dialog
2020-01-30 14:56:19 +01:00
Nino van Hooff
8ea3004c73
Fix some dark theme styling (MoreInfoWindow, ToolboxLicenseDialog
...
CURA-7152
2020-01-30 12:51:13 +01:00
Jaime van Kessel
d15e64cc5b
Remove unused import
2020-01-30 09:44:15 +01:00
Jaime van Kessel
18163af5a3
Ensure that the default default marketplace URL is used when not defined
...
CURA-7071
2020-01-30 09:42:51 +01:00
Jaime van Kessel
e79b3beed1
Remove unused URL
...
CURA-7071
2020-01-30 09:42:23 +01:00
Nino van Hooff
8c250cfbbc
Process review comments
...
CURA-7099
2020-01-29 11:28:29 +01:00
fieldOfView
5a4661db98
Add valueFromContainer() and extruderValueFromContainer() functions
2020-01-28 16:36:06 +01:00
Nino van Hooff
4e33f6849c
Merge remote-tracking branch 'origin/master'
2020-01-28 15:44:23 +01:00
Nino van Hooff
82e24c1ac3
Register the 44 to 45 version upgrade as a bundled plugin
2020-01-28 15:44:14 +01:00
Matt Jani
155408d77d
Merge branch 'master' of https://github.com/Ultimaker/Cura
2020-01-28 15:28:26 +01:00
Matt Jani
f62312449b
Fixed wrong extrusion (issue #6730 )
2020-01-28 15:26:43 +01:00
Ghostkeeper
242da1b3aa
Give web marketplace button a hover colour
...
It needs to be the same as the bar beneath the marketplace tab buttons when highlit.
Contributes to issue CURA-7071.
2020-01-28 14:47:00 +01:00
Ghostkeeper
6553443f3b
Make marketplace materials link slightly smaller
...
Contributes to issue CURA-7071.
2020-01-28 14:41:29 +01:00
Ghostkeeper
38e7a9e4df
Turn Marketplace link into an actual link
...
With consistent styling. The original design didn't have the link underlined but since the rest of the Cura UI has it underlined I let that happen here too.
Contributes to issue CURA-7071.
2020-01-28 14:37:59 +01:00
Ghostkeeper
e51a1b18be
Add link text to marketplace search page
...
Contributes to issue CURA-7071.
2020-01-28 14:19:33 +01:00
Ghostkeeper
1c79193f9a
Always go to plug-ins page regardless of active tab
...
This was a requirement from UX. Apparently we're adding a link to the materials elsewhere.
Contributes to issue CURA-7071.
2020-01-28 13:25:27 +01:00
Nino van Hooff
d4eb463f2d
Always subscribe to packages after installing them
...
Now that we subscribe for all situations where a package is installed,
it makes sense to watch package installs and create a 1:1 relation that
way. Prevents code duplication.
CURA-7099
2020-01-28 13:08:57 +01:00
Ghostkeeper
13644f7e41
Load different pages of Marketplace depending on current tab
...
Feels intuitive actually, but if you think about it it's weird that the link should change depending on the tab that's next to it.
Contributes to issue CURA-7071.
2020-01-28 11:58:56 +01:00
Ghostkeeper
ad2b8f140e
Make Marketplace link configurable from the build system
...
This way you could set it to marketplace-staging if you like.
Contributes to issue CURA-7071.
2020-01-28 11:52:46 +01:00
Ghostkeeper
654a28450d
Fix dark theme icon colour
...
Contributes to issue CURA-7071.
2020-01-28 11:36:42 +01:00
Ghostkeeper
e6856b02a4
Make entire tooltip area clickable
...
Also saves on another component. And it's more logical, easier to use and fault-tolerant.
Contributes to issue CURA-7071.
2020-01-28 11:33:25 +01:00
Ghostkeeper
1d110c2c33
Reduce size of web marketplace link button
...
Contributes to issue CURA-7071.
2020-01-28 11:31:10 +01:00
Ghostkeeper
812017c814
Switch out shop icon
...
The sourceSize needs to be adjusted because this is an SVG that we don't necessarily want to stretch but just want to render directly at the correct size.
Contributes to issue CURA-7071.
2020-01-28 11:29:01 +01:00
Dirk O. Kaar
58d737a9a9
Retraction hop enable has default value, the height value is fine by default, too.
2020-01-28 11:00:11 +01:00
Jaime van Kessel
9a9e715e2f
Merge branch 'CURA-6914_Reset_print_sequence_when_reactivating_2nd_extruder' of github.com:Ultimaker/Cura
2020-01-28 09:36:29 +01:00
Nino van Hooff
5cedb2933e
Only subscribe when logged in. (When installing a package from toolbox)
2020-01-28 09:31:36 +01:00
Ghostkeeper
305bce5a78
Enforce Cura API to be a singleton
...
If it's not used that way we want to know about it and fail.
If plug-ins use it this way, the plug-in won't get initialised so it'll be as if the plug-in is disabled or that function doesn't work.
Contributes to issue CURA-7135.
2020-01-27 16:28:26 +01:00
Jaime van Kessel
a706b42782
Disable create & import on materialpage if machine does not support materials
2020-01-27 16:12:26 +01:00
ninovanhooff
3a0bd48e1b
Merge pull request #7011 from Ultimaker/CURA-7090-addition
...
CURA-7090/Added check to reevaluate dismissed incompatible packages
2020-01-27 14:33:13 +01:00
Kostas Karmas
a720939e64
Fix max layer to correspond to starting layer
...
When the starting layer was set to 0 the max layer was not adjusted
to be max_layer-1.
This commit makes the extra adjustment.
2020-01-27 14:21:51 +01:00
konskarm
e128dadbf5
Merge pull request #6930 from jtychu/master
...
Update DisplayFilenameAndLayerOnLCD.py
2020-01-27 14:08:26 +01:00
Dimitriovski
a08bea1376
String translate improvements
...
CURA-7090
2020-01-27 14:00:47 +01:00
Dimitriovski
2e0fef3bd4
Merge branch 'master' of github.com:Ultimaker/Cura into CURA-7090-addition
2020-01-27 13:25:35 +01:00
Dimitriovski
aa2c612925
PR review changes
2020-01-27 13:25:29 +01:00
Kostas Karmas
bcec433f53
Update description of the Print Sequence setting
...
Update description to clearly state that Print Sequence is not
possible if more than one extruders are enabled.
CURA-6914
2020-01-24 17:30:46 +01:00
Kostas Karmas
9266c753c3
Reset print_sequence when reactivating extruder 2
...
The setting print_sequence was not being resetted to all at once
whenever the 2nd extruder was reactivated.
This commit fixes that by explicitly resetting print_sequence
when reenabling an extruder, if it has been changed by the user.
CURA-6914
2020-01-24 17:12:00 +01:00
Jaime van Kessel
61a3122a78
Merge branch 'CURA-7129_license_window_design' of github.com:Ultimaker/Cura
2020-01-24 16:56:23 +01:00
Ghostkeeper
db41a83aa6
Fix mix of whitespace styles: Use spaces instead of tabs
...
Contributes to issue CURA-7140.
2020-01-24 16:13:15 +01:00
Ghostkeeper
20e410694b
Merge branch 'master' of ssh://github.com/Ultimaker/Cura
2020-01-24 16:11:49 +01:00
Ghostkeeper
61d5ace952
Merge branch 'rf100_config' of https://github.com/dok-net/Cura into dok-net-rf100_config
2020-01-24 16:09:09 +01:00
Dimitriovski
537891d80b
Further improvements and refactors to the CloudPackageChecker
2020-01-24 16:05:35 +01:00
Dimitriovski
526cdac200
fixed silly merge conflict
2020-01-24 15:41:13 +01:00
Dimitriovski
38c7d80f82
Refactored the onConfirmClicked function. Added the ability to auto-dismiss the incompatible packages. Changed the button text depending on the displayed list
2020-01-24 15:39:58 +01:00
Remco Burema
40ec88ab70
Merge pull request #7005 from Ultimaker/CURA-6627_Store_extra_data_project_files
...
CURA-6627_Store_extra_data_project_files
2020-01-24 15:21:04 +01:00
