Commit graph

18100 commits

Author SHA1 Message Date
Ian Paschal
283de789c2 Remove comment
Contributes to CL-1212
2019-01-22 12:00:50 +01:00
Ian Paschal
76240bb458 Remove unused comment
Contributes to CL-1212
2019-01-22 11:13:27 +01:00
Ian Paschal
e212bbfb01 Add some translations which were forgotten 2019-01-21 17:13:34 +01:00
Ian Paschal
bc9831abd1 Add color theming to monitor tab
Contributes to CL-1212
2019-01-21 17:10:41 +01:00
Ian Paschal
406ef20802 Revert "Add theme colors"
This reverts commit 2e5eb61144.
2019-01-21 14:05:24 +01:00
Ian Paschal
2e5eb61144 Add theme colors
Contributes to CL-1212
2019-01-21 13:07:16 +01:00
Ian Paschal
1369c98ea6 Center extruder numbers on Ubuntu
This one is for you @christerbeke
2019-01-18 16:02:23 +01:00
Lipu Fei
c602c1cf15 Use MachineManager.activeMachine instead of Application.globalstack
CURA-6117
2019-01-18 14:08:53 +01:00
Ghostkeeper
4cb7ee5fc7
Give tabs a height
It is used in the profile assistant. I don't know if it should be used, but it is.

Contributes to issue CURA-6086.
2019-01-17 17:23:21 +01:00
Remco Burema
e7ba543fec
Merge pull request #5172 from Ultimaker/resize_bar_ui_changes
Change the style of the resize bar
2019-01-17 16:59:18 +01:00
Ghostkeeper
13c1a70677
Fix margin
The theme entry didn't exist.

Discovered during work on CURA-6086, but for the rest unrelated.
2019-01-17 16:31:50 +01:00
Remco Burema
98ce0caaef
Merge pull request #5158 from Ultimaker/marketplace_use_busy_indicator
Remove loading gif
2019-01-17 16:17:00 +01:00
Jaime van Kessel
894dbcf6f6 Revert "Added skip mark to failing cloud tests"
This reverts commit 665c331564.
2019-01-17 14:43:43 +01:00
Jaime van Kessel
c6628560bb Merge branch 'STAR-322_cloud-connection' of github.com:Ultimaker/Cura into 4.0 2019-01-17 14:42:56 +01:00
Jaime van Kessel
aff2ffc67a Merge branch 'preference_qml_early_out' of github.com:Ultimaker/Cura into 4.0 2019-01-17 14:23:06 +01:00
Jaime van Kessel
12a120f044 Slightly modify the variant label to match more with the monitor tab
CURA-6100
2019-01-17 14:21:11 +01:00
Jaime van Kessel
0ce0228f76 Merge branch 'feature_configuration_menu_variant' of https://github.com/fieldOfView/Cura into 4.0 2019-01-17 14:03:43 +01:00
Jaime van Kessel
900e0183ca Merge branch 'CURA-6117_remove_hardcoded_account_urls' of github.com:Ultimaker/Cura into 4.0 2019-01-17 13:16:12 +01:00
Jaime van Kessel
665c331564 Added skip mark to failing cloud tests 2019-01-17 13:04:04 +01:00
Daniel Schiavini
2b27c8c1a9 Revert incorrect change to run_mypy 2019-01-17 13:00:42 +01:00
Daniel Schiavini
badb0b0ca9 Use patch.object to allow relative imports
Issue STAR-322.
2019-01-17 12:58:23 +01:00
Lipu Fei
3b3baeac03 Remove hard-coded account URLs in QMLs
CURA-6117
2019-01-17 11:20:21 +01:00
ChrisTerBeke
b51317b4f3 Merge branch '4.0' of https://github.com/Ultimaker/Cura into 4.0 2019-01-17 10:23:38 +01:00
ChrisTerBeke
aab1fbc73f Try other patch values for relative imports 2019-01-17 10:22:37 +01:00
Diego Prado Gesto
c28aefac4e Add the maximum backups message to the backups plugin
It didn't work after previous changes, so now it will show again when the user already has 5 backups.

Contributes to CURA-6005
2019-01-16 17:33:14 +01:00
ChrisTerBeke
d9a8bb0eb7 Remove empty init py in plugins dir 2019-01-16 15:18:04 +01:00
Ian Paschal
5ed7f6f6ce
Merge pull request #4926 from Ultimaker/STAR-322_cloud-connection
[4.0] STAR-322: Cloud connection
2019-01-16 10:20:01 +01:00
Diego Prado Gesto
86b0ac320b Increase the padding with the button
Add more padding when the draggable area is visible
2019-01-16 08:47:01 +01:00
Remco Burema
f057c9a7df Prevent spurious updates to 'onPreferenceChanged's if the preference doesn't match. 2019-01-15 17:15:12 +01:00
ChrisTerBeke
a702661b5d Decrease the API call intervals to get quicker UI updates 2019-01-15 14:17:38 +01:00
ChrisTerBeke
3d6710d5b6 Merge branch '4.0' into STAR-322_cloud-connection 2019-01-15 13:08:54 +01:00
Lipu Fei
c991741a45
Merge pull request #5167 from Ultimaker/CURA-6087-Allow-multiple-sdk-versions-for-plugins
Ensure that the toolbox correctly handles multiple supported SDK vers…
2019-01-15 12:20:18 +01:00
Diego Prado Gesto
26564363d7 Merge branch '4.0' of github.com:Ultimaker/Cura into 4.0 2019-01-15 12:15:34 +01:00
Diego Prado Gesto
2435b97ef7 Change the style of the resize bar at the bottom of the print setup panel
Make it wider and more visible to the user.
Change icon.
Keep margins according to the other panels.
2019-01-15 12:12:47 +01:00
Jaime van Kessel
d4b47c75ab Fix typo in multiply message 2019-01-15 11:15:37 +01:00
ChrisTerBeke
ed96d32aca trigger re-build 2019-01-15 09:59:17 +01:00
ChrisTerBeke
b7fb969524 Fixes for review 2019-01-15 09:37:38 +01:00
ChrisTerBeke
de24c7d9c3 Revert "Remove mock changes used locally"
This reverts commit 7785555a94.
2019-01-15 09:35:28 +01:00
Daniel Schiavini
7785555a94 Remove mock changes used locally 2019-01-15 08:21:17 +01:00
Daniel Schiavini
77c30c891f Fix tests 2019-01-15 08:20:39 +01:00
Diego Prado Gesto
fa7b38243c Add VersionUpgrade35to40 as a bundled package
Otherwise it will show up as an old plugin and the uninstall button will appear in the Markeplace.
2019-01-14 17:02:02 +01:00
ChrisTerBeke
f478653c37 Uncomment code that was needed for testing 2019-01-14 14:56:14 +01:00
ChrisTerBeke
7bf319dfd1 Better fix for circular dependency 2019-01-14 14:17:36 +01:00
ChrisTerBeke
f2922e2405 Merge branch '4.0' into STAR-322_cloud-connection 2019-01-14 14:16:35 +01:00
Jaime van Kessel
b1b61fa466 Add missing return 2019-01-14 14:14:47 +01:00
Jaime van Kessel
5ae05acd2c Merge branch 'fix_non_connect_networkprinters' of https://github.com/fieldOfView/Cura into 4.0 2019-01-14 14:12:36 +01:00
Jaime van Kessel
9d94b55596 Ensure that the toolbox correctly handles multiple supported SDK versions
CURA-6087
2019-01-14 13:35:10 +01:00
Lipu Fei
71036abd87 Add troubleshooting link for recommended
CURA-6114
2019-01-14 12:11:45 +01:00
ChrisTerBeke
cd19eec98a Remove weird argument for timer 2019-01-14 11:06:16 +01:00
Lipu Fei
0ecd00fa1f
Merge pull request #5150 from Ultimaker/CURA-6054-2_fix_resize_panel_on_window_change
Fix resizable Settings-Panel for change in window size. [CURA-6054]
2019-01-14 11:01:46 +01:00