GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-05-31 18:46:02 +08:00
Code Issues Packages Projects Releases Wiki Activity
16,828 Commits 295 Branches 267 Tags
Commit Graph

4983 Commits

Author SHA1 Message Date
Jaime van Kessel
68512a2184 Merge branch '3.6' of github.com:Ultimaker/Cura into 3.6 2018-11-07 12:35:25 +01:00
Jaime van Kessel
9a93f6866a Fix crash of toolbox when metadata got corrupted 2018-11-07 12:03:32 +01:00
Diego Prado Gesto
44ab6dee77
Merge pull request #4748 from Ultimaker/CURA-5900_rename_cc_red_06_to_cc_06 
[3.6] [CURA-5900] Rename "CC Red 0.6" to "CC 0.6"
 2018-11-07 11:21:09 +01:00
Diego Prado Gesto
2c28e931ea Rename CC Red 0.6 to CC 0.6 in the Changelog. 
Contributes to CURA-5900.
 2018-11-07 11:06:40 +01:00
Simon Edwards
7ecffdef3d Merge branch 'CL-1126_monitor_tab_context_menu_improvements' into 3.6 2018-11-06 17:06:04 +01:00
Diego Prado Gesto
2c59419dbb Merge branch 'cura4.0_header' into CURA-5829-Add-preview-stage 2018-11-06 17:01:18 +01:00
Diego Prado Gesto
2d59ca02ca Merge branch 'ui_rework_4_0' into cura4.0_header 2018-11-06 16:59:07 +01:00
Ian Paschal
4c831de06c Remove console logs 
Contributes to CL-1126
 2018-11-06 16:41:59 +01:00
Ian Paschal
dc4b69c386 Show context menu at the right times 
Contributes to CL-1126
 2018-11-06 16:37:47 +01:00
Diego Prado Gesto
ce7d2c36d0 Fix the width of the slider label when the number of layers was exactly 
10, 100, 1000 and so on.

The calculation was using the maximumValue that is 9 in case we have 10
layers, since we start counting from 0 but showing from 1. Now it uses
maximumValue + 1.
 2018-11-06 16:15:32 +01:00
Lipu Fei
8e33a19ca7 Fix quality changes lookup in project loading 
CURA-5899

Should always use custom quality profile names to look up.
 2018-11-06 13:31:04 +01:00
Ian Paschal
c84aa9cf21 Use default font for configuration override 
Contributes to CL-1124
 2018-11-05 17:19:22 +01:00
Jaime van Kessel
319d52a2f9 Make collapsible simulation view collapse to right height 
CURA-5829
 2018-11-05 16:59:06 +01:00
Jaime van Kessel
8106df1ae2 Bit of QML cleanup 2018-11-05 16:45:12 +01:00
Ian Paschal
1abd0b3499 Show "Pausing...", "Aborting...", and "Resuming..." texts 
Contributes to CL-1126
 2018-11-05 15:45:17 +01:00
Lipu Fei
88f3325972 Add typing for _createMaterialOutputModel() 
CURA-5887
 2018-11-05 13:11:58 +01:00
Ian Paschal
4f10b7809a Configuration override improvements 
Contributes to CL-1124
 2018-11-05 12:15:17 +01:00
Jaime van Kessel
406dd68aa4 Made path slider widht themable. 
CURA-5829
 2018-11-05 11:54:55 +01:00
Lipu Fei
fa693aef2b Fix material shown in print jobs 
CURA-5887

 - Use MaterialManager to get materials
 - For a GUID with mulitple matches, show the read-only materials first
   if any. Otherwise, show non-read-only materials.
 2018-11-05 11:48:19 +01:00
Jaime van Kessel
9f13de9f0d No longer create two instances of the setting view. 
This caused a bunch of issues with the getPluginId, as one of the instances
didn't got added to the registry (and as such, never got an ID)

CURA-5829
 2018-11-05 11:48:19 +01:00
Jaime van Kessel
f0e205423f Pause simulation view when preferences have been changed. 
I accidentally removed this feature when working on CURA-5829, but
it was spotted in the review.
 2018-11-05 11:47:22 +01:00
Jaime van Kessel
4659b0d387 Fix codestyle 2018-11-05 11:36:58 +01:00
Ghostkeeper
20b3b6da79
Document PreviewStage.py 
Some stuff I had to ask the original implementer to explain to me. So I wrote that down so that the next guy doesn't have to do that.

Contributes to issue CURA-5829.
 2018-11-02 15:11:49 +01:00
Jaime van Kessel
300d109cfe Set the Z of the machine selector so the tooltip doesn't get hidden 
CURA-5772
 2018-11-02 13:37:57 +01:00
Jaime van Kessel
44954c4cad Fixes required for semantic versioning 
CURA-5840
 2018-11-01 14:15:16 +01:00
Diego Prado Gesto
a85fa6b9ad Merge branch 'cura4.0_header' into CURA-5829-Add-preview-stage 2018-11-01 09:24:05 +01:00
Diego Prado Gesto
ef0ba81564 Merge branch 'ui_rework_4_0' into cura4.0_header 2018-11-01 09:21:33 +01:00
Jaime van Kessel
61442545cb Fix codestyle 
CURA-5829
 2018-10-31 13:56:55 +01:00
Ian Paschal
1ba8eff7fa Don't show camera icon unless printer details are expanded 
Contributes to CL-1063
 2018-10-31 13:52:31 +01:00
Jaime van Kessel
6083eda3fa Merge branch 'cura4.0_header' of github.com:Ultimaker/Cura into CURA-5829-Add-preview-stage 2018-10-31 13:45:03 +01:00
Remco Burema
5cb72e298d
Merge pull request #4700 from Ultimaker/CURA-5873_fix_duplicated_generic_materials 
Fix duplicated generic materials
 2018-10-31 11:47:09 +01:00
Ian Paschal
7960772ac8 Do show "delete" on print jobs waiting for configuration change 
Contributes to CL-1118
 2018-10-31 11:46:19 +01:00
Ian Paschal
ac7a566ae1 Do not show "move to top" on print jobs waiting for configuration change 
Contributes to CL-1118
 2018-10-31 11:45:30 +01:00
Ian Paschal
903054190d Fixing some spacing issues with camera button 
Contributes to CL-1063
 2018-10-31 11:23:57 +01:00
Jaime van Kessel
1e9aff44f6 Fix QML warnings & errors 
CURA-5829
 2018-10-31 10:55:05 +01:00
Diego Prado Gesto
3e37f2a09d Reset the list of generic materials to emtpy when creating the models. 
Contributes to CURA-5873.
 2018-10-31 10:31:20 +01:00
Jaime van Kessel
15f586ffae Fix the location of the simulation slider label 
CURA-5829
 2018-10-31 10:30:11 +01:00
Diego Prado Gesto
2c7e7a4ad7 Merge branch '3.6' into rename_ToolBox_to_Marketplace 2018-10-31 09:47:33 +01:00
Jaime van Kessel
3fc399a644 Moved default values into components 
CURA-5829
 2018-10-31 09:46:41 +01:00
Diego Prado Gesto
33da50df26 Rename other entries of the Toolbox to Marketplace. 
Add a line in the Changelog indicating that the Toolbox was renamed.

Contributes to CURA-5874.
 2018-10-31 09:45:29 +01:00
Jaime van Kessel
f773030218 Add main stage to previewStage so that SimulationView can use it 
CURA-5829
 2018-10-31 09:37:21 +01:00
Remco Burema
e887c260ab Add contributors to printer-defs section in the 3.6-changelog. 
part of [CURA-5871] Release notes Cura 3.6 Beta
 2018-10-31 09:30:41 +01:00
Diego Prado Gesto
e2254fe039 Merge branch '3.6' into rename_ToolBox_to_Marketplace 2018-10-31 09:20:38 +01:00
Simon Edwards
03dd26e6e2
Merge pull request #4692 from Ultimaker/monitor_tab_spacing_improvements 
Monitor tab spacing improvements
 2018-10-30 14:57:18 +01:00
Ian Paschal
30c7a2cbe5 Monitor tab spacing improvements 
Fixing CL-1063 (adding camera button at all times) introduced a few small spacing issues. This PR fixes them.
 2018-10-30 13:58:42 +01:00
Ian Paschal
0273cd2a0e Don't show the context menu for printed jobs (only active ones and queued ones) 
Contributes to CL-1118
 2018-10-30 13:44:24 +01:00
Ian Paschal
1680548a39 Remove extra empty line 2018-10-30 13:36:52 +01:00
Simon Edwards
d64465ca48
Merge pull request #4689 from Ultimaker/CL-1063_always_show_camera_monitor 
CL-1063 Always show camera icon in monitor tab
 2018-10-30 11:49:58 +01:00
Ghostkeeper
ab7f69bc1b
Add change log for Cura 3.6 
Implements CURA-5871.
 2018-10-30 11:10:45 +01:00
Ian Paschal
adac66b3f7 Always show camera icon in monitor tab 
Contributes to CL-1063
 2018-10-30 10:53:43 +01:00