GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-06-30 02:45:30 +08:00
Code Issues Packages Projects Releases Wiki Activity
18,132 Commits 295 Branches 268 Tags
Commit Graph

18132 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Ian Paschal
e19323d38b Fix mising theme key 2019-01-23 14:47:59 +01:00
Ian Paschal
9de3fb9bb4
Merge pull request #5187 from Ultimaker/CL-1165_missing_cloud_info 
CL-1165 missing cloud info
 2019-01-23 12:12:12 +01:00
Ian Paschal
e204696b61 Add dark theme 
Contributes to CL-1165
 2019-01-23 12:10:06 +01:00
Ian Paschal
1097f16011 Add theme (and dark mode) 
Contributes to CL-1165
 2019-01-23 12:08:20 +01:00
Ian Paschal
32072e3bfe Merge remote-tracking branch 'origin/4.0' into CL-1165_missing_cloud_info 2019-01-23 12:05:06 +01:00
Ian Paschal
776410e5d9
Merge pull request #5208 from Ultimaker/CL-1212_monitor_dark_theme 
CL-1212 Monitor tab dark theme
 2019-01-23 11:37:19 +01:00
Diego Prado Gesto
551111bd60 Close the configuration panel when the user syncs with a configuration 2019-01-23 11:24:28 +01:00
Jaime van Kessel
fa3e4fe69a Merge branch 'CURA-6094_brim_width_crash_4_0' of github.com:Ultimaker/Cura into 4.0 2019-01-23 09:52:07 +01:00
ChrisTerBeke
92eb361ba1 Make cloud API error a generic message to not scare the user 2019-01-23 09:37:32 +01:00
Jaime van Kessel
0942bebaf8 Move troubleshoot link to help menu 2019-01-22 16:19:29 +01:00
Ian Paschal
283de789c2 Remove comment 
Contributes to CL-1212
 2019-01-22 12:00:50 +01:00
Lipu Fei
9bc748ffa1 Fix scrolling with configurations 
CURA-6125
 2019-01-22 11:48:41 +01:00
Ian Paschal
76240bb458 Remove unused comment 
Contributes to CL-1212
 2019-01-22 11:13:27 +01:00
Remco Burema
aae06fe0fa Prevent calculations with brim width larger than build-plate. [CURA-6094] 2019-01-21 17:47:13 +01:00
Remco Burema
ccfa6ebb92 Set proper maximum values for brim width and line-count. [CURA-6094] 2019-01-21 17:47:01 +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 2e5eb611442b992ca0da60dc22a9e16538c48fa9.
 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
Ian Paschal
f3d0010b87 Add cloud connection condition 
Contributes to CL-1165
 2019-01-17 15:44:37 +01:00
Ian Paschal
495115c9f7 Merge remote-tracking branch 'origin/4.0' into CL-1165_missing_cloud_info 2019-01-17 15:11:38 +01:00
Jaime van Kessel
894dbcf6f6 Revert "Added skip mark to failing cloud tests" 
This reverts commit 665c33156468270e53fb2702f7d60f0deab0618a.
 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