GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-05-18 00:16:40 +08:00
Code Issues Packages Projects Releases Wiki Activity
17,731 Commits 290 Branches 260 Tags
Commit Graph

5336 Commits

Author SHA1 Message Date
Ghostkeeper
e5154e90a7
Merge branch '3.5' 2018-09-18 17:19:03 +02:00
Ghostkeeper
e41361a053
Fan speed override is about supported areas, not bridged areas 
This is a correction suggested by Smartavionics (the author of that setting) on the Ultimaker forum thread about the 3.5 beta.
 2018-09-18 17:18:37 +02:00
Diego Prado Gesto
13cab3653e Remove unworking code that I forgot to remove after explaining a 
possible solution to myself.

Contributes to CURA-5725
 2018-09-18 17:09:57 +02:00
Diego Prado Gesto
c31f584e5b Fix my own mistake. The keys act throught the labels and the function in 
the labels is called setValue that then points to the setValueManually.

Contributes to CURA-5725.
 2018-09-18 17:04:24 +02:00
Diego Prado Gesto
0ef46feeae Fix code style. 
Contributes to CURA-5725.
 2018-09-18 16:53:25 +02:00
Diego Prado Gesto
f965b66c87 Stop the simulation also when the range slider is used. Reuse some code. 
Contributes to CURA-5725.
 2018-09-18 16:30:15 +02:00
Lipu Fei
3b62284276 Merge remote-tracking branch 'origin/3.5' 2018-09-18 16:15:55 +02:00
Lipu Fei
a33ce8178a Support mulitple bundled_packages JSON files 
CURA-5718
 2018-09-18 15:53:56 +02:00
Aleksei S
1b1ca8a53b Fix, simulation did not play after second layer 
CURA-5725
 2018-09-18 14:39:43 +02:00
Aleksei S
f33576cc81 Stop simulation after pressing Up or Down in simulation layer textfield 
CURA-5725
 2018-09-18 13:56:20 +02:00
Ghostkeeper
e5778be887
Corrections to change log 
One was missing. One was confusing. One was incomplete.

Contributes to issue CURA-5710.
 2018-09-18 12:41:44 +02:00
Ghostkeeper
3a096cdb23
Add confirmation dialogue for deleting jobs 
Re-using MessageDialog again.

Contributes to issues CL-1053 and CURA-5729.
 2018-09-18 11:42:34 +02:00
Ghostkeeper
83528ffb48
Add confirmation dialogue for sending prints to top of queue 
Very simple. Just re-use the MessageDialog component.

Contributes to issues CL-1053 and CURA-5729.
 2018-09-18 11:41:51 +02:00
Ghostkeeper
a7a022eca0
Add confirmation dialogue before aborting a print 
It's a destructive operation so we should ask first.

Contributes to issue CL-1053 and CURA-5729.
 2018-09-18 11:24:30 +02:00
Ghostkeeper
51d342678e
Merge branch '3.5' of ssh://github.com/Ultimaker/Cura into 3.5 2018-09-18 09:38:55 +02:00
Lipu Fei
b723621fda
Merge pull request #4370 from fieldOfView/fix_usb_printing_port_access 
[3.5][regression]Fix opening port after baudrate detection
 2018-09-17 17:38:12 +02:00
Lipu Fei
4777c3f41d Merge remote-tracking branch 'origin/CURA-5718_fix_upgrade_for_bundled_plugins' 2018-09-17 17:27:32 +02:00
Lipu Fei
da047ea674 isInstalled() should check old plugins as a fallback 2018-09-17 17:26:38 +02:00
Lipu Fei
15657f4cfc Remove unneeded code 2018-09-17 17:26:19 +02:00
Lipu Fei
4db213c55a Fix missing import 2018-09-17 16:24:10 +02:00
Lipu Fei
a4b20e046d Merge remote-tracking branch 'origin/3.5' into CURA-5718_fix_upgrade_for_bundled_plugins 2018-09-17 16:22:22 +02:00
Lipu Fei
6929d96119 Merge remote-tracking branch 'origin/3.5' 2018-09-17 16:14:49 +02:00
Lipu Fei
6d1db55072 Fix SDK version comparison 2018-09-17 16:14:28 +02:00
Ghostkeeper
816c3cbd11
Fix forgotten separation between header and body 
I copied these over from a piece where they had a different layout.

Contributes to issue CURA-5710.
 2018-09-17 14:43:17 +02:00
Ghostkeeper
c6fa9474d6
Merge branch '3.5' 2018-09-17 14:41:45 +02:00
Diego Prado Gesto
dfae4a9a86 Add a property that indicates when the layer slider or the path slider 
has changed manually.

With this we can differentiate when the layer changed automatically
(during simulation) or manually (by user interaction). In case it was
changed manually, the simulation will stop.

Contributes to CURA-5725.
 2018-09-17 14:02:04 +02:00
Lipu Fei
3ac5a316d3 Check package upgradable using PM first, old plugins later 
CURA-5718

For package upgradable, we need to check if a package is installed
local. For that, we first check in the package manager, if nothing, then
we fall back to check the old plugins.
 2018-09-17 12:05:10 +02:00
Lipu Fei
1064d837ed Exclude bundled plugins in the old plugins list 2018-09-17 12:05:10 +02:00
Ghostkeeper
9e21af65b4
Merge branch '3.5' 2018-09-17 10:54:44 +02:00
Ghostkeeper
ade2b565bc
Add 3.5 change log 
Contributes to issue CURA-5710.
 2018-09-17 10:30:08 +02:00
fieldOfView
9c865e80d1 Remove debug print 2018-09-14 19:15:23 +02:00
Jaime van Kessel
4c460b6fa5 Prevent crash if sdk_version is "dev" 2018-09-14 16:15:56 +02:00
Ghostkeeper
177f5dc7db
Merge branch '3.5' 2018-09-14 15:34:02 +02:00
Remco Burema
5c73921943 [CURA-5725] Revert "Set simulation path to 0 after updating layer" 
This reverts commit 3da6e3c4535db85a921bf5770903bd1a729946e1.
 2018-09-14 14:35:10 +02:00
fieldOfView
66aeb95e28 Fix opening port after baudrate detection 2018-09-14 14:06:55 +02:00
fieldOfView
6bf91d2b3a Fix updating temperature while preheating bed or extruder 
While preheating the bed/extruder with M190 or M109, the firmware keeps outputting temperature lines, but these do not contain "ok" because no new command was acknowledged.

Fixes #3741
 2018-09-14 13:59:05 +02:00
Ghostkeeper
3b36223681
Merge branch '3.5' 2018-09-14 12:40:29 +02:00
Ghostkeeper
2e6401b7dc
Don't depend on the name of resource folders not changing 
If we choose to rename the resource folders, then this plug-in should still look in the old resource folders. So hard-code these resource folders in the state that they were in at version 2.5 so that we can freely change them in a modern version.
 2018-09-14 11:36:31 +02:00
Ghostkeeper
572afb052e
Remove unused import 
This import was actually causing the test to fail on my computer due to a dependency on the order of importing libArcus vs. PyQt.
 2018-09-14 11:30:25 +02:00
Ian Paschal
942d20a8d8 Monitor Tab - Fix pause button 
Contributes to CL-1050
 2018-09-13 16:31:07 +02:00
Ghostkeeper
5a374f31ef
Merge branch '3.5' 2018-09-13 16:27:49 +02:00
Jaime van Kessel
757c8754b1 Merge branch '3.5' of github.com:Ultimaker/Cura 2018-09-13 16:23:55 +02:00
Lipu Fei
ccef0843c2
Merge pull request #4273 from Kriechi/pause-at-height-rrf 
add PauseAtHeight post-processing script for RRF
 2018-09-13 15:11:30 +02:00
Ian Paschal
f93413d3a3 Monitor Tab - Context menu improvements 
Fixed:
- In the Queued jobs area, the context menu doesn't close when clicking on the right half of the card.
- Context menu trigger button should be more in the corner for both the print job tiles and the printer tiles
- Context menu text should not be centered
- Context menu should be closer to the context menu trigger button
- Context menu should be aligned further right in relation to the context menu trigger button
- Context menu options that are not available should not be shown.
- Context button dots should be grey.

Contributes to CL-1050
 2018-09-13 14:52:52 +02:00
Lipu Fei
b39d6c7d87 Package upgrade should also check SDK version 2018-09-13 13:42:53 +02:00
Ghostkeeper
cc77632357
Merge branch 'master' into refactor_singleton_settingsbase 2018-09-13 11:52:13 +02:00
Ian Paschal
7226bc45b5 Monitor Tab - Queued header is properly aligned 
Contributes to CL-1052
 2018-09-13 10:35:31 +02:00
Lipu Fei
efdec50614 Fix typo 2018-09-12 17:08:58 +02:00
Ian Paschal
0b66bf0448 Monitor Tab - Use camera button on camera stream 
- Fixes: Video feed close button is always out of sight
- Makes improvement to camera icon

Contributes to CL-1049
 2018-09-12 17:07:10 +02:00
Lipu Fei
d1301d16a9 Skip the do-not-handle URLs instead of returning 
CURA-5718

The request-url dict is not ordered so you cannot garuantee the ordering
when you use .items(). This can cause a problem that if a do-not-handle
item occurs first then nothing will be handled at all.
 2018-09-12 16:58:22 +02:00