GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-06-01 22:35:03 +08:00
Code Issues Packages Projects Releases Wiki Activity
17,706 Commits 295 Branches 267 Tags
Commit Graph

5311 Commits

Author SHA1 Message Date
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
Ghostkeeper
e2b6a3f411
Add white background to thumbnails 
Regardless of the theme, the thumbnail should always have a white background so that the author can base their colours on that. Also this properly renders transparent images with a white background so that the Ultimaker robot is visible again in the dark theme.
 2018-10-30 10:39:29 +01:00
Mark
fda0f59c70 Rename user visible entries of ToolBox to Marketplace 
CURA-5874
 2018-10-30 10:27:22 +01:00
Lipu Fei
39158a643c Revert "Ignore per-meshgroup settings in per object stack" 
CURA-5767

This reverts commit 54afa799c54bf3727481241e5e5f45dffb7e3442.
 2018-10-30 07:33:55 +01:00
Jaime van Kessel
0a3803d665 Add CuraView, which does something similar to CuraStage 
So instead of relying on strange activeViewProxy, it's up to the CuraView to provide a set of components.
These can subsequently be used by the active stage again.

CURA-5829
 2018-10-29 16:21:16 +01:00
Lipu Fei
54afa799c5 Ignore per-meshgroup settings in per object stack 
CURA-5767
 2018-10-29 15:05:49 +01:00
Jaime van Kessel
d8dd9bf363 Set SolidView to invisible. 
Since we don't have a selector in the prepare stage anymore, solidview must be invisible

CURA-5829
 2018-10-29 14:54:42 +01:00
Lipu Fei
248bf0f61e Merge remote-tracking branch 'origin/3.6' into CURA-5767_disable_per_meshgroup_settings_for_one_at_a_time 2018-10-29 14:32:44 +01:00
Lipu Fei
1623f66c93
Merge pull request #4656 from fieldOfView/fix_network_camera_memory_leak 
[3.6] Fix memory leak in print monitor
 2018-10-29 14:12:31 +01:00
Jaime van Kessel
cfa962311b Fixed typing 
CURA-5829
 2018-10-29 13:54:20 +01:00
Jaime van Kessel
ebe533bdc8 Move active view panel to previewStage 
CURA-5829
 2018-10-29 13:39:00 +01:00
Jaime van Kessel
9cc7a7ca23 Moved view selection to previewStage 
CURA-5829
 2018-10-29 13:27:47 +01:00
Lipu Fei
02681a5700 Change camera URL to non-optional QUrl 
Otherwise pyqt property will complain when it tries to convert a None to
a QUrl.
 2018-10-29 13:25:23 +01:00
Jaime van Kessel
3248a05819 Add PreviewStagePlugin stubs 
Since we are going to move all the views into a seperate stage, we need to add another stage to do that.

CURA-5829
 2018-10-29 11:28:08 +01:00
fieldOfView
e0d6bac37d Fix remaining references to NetworkCamera and OutputDevice.activeCamera 2018-10-29 11:18:54 +01:00
fieldOfView
c187b6a25c Replace NetworkCamera with NetworkMJPGImage 2018-10-29 11:18:39 +01:00
Diego Prado Gesto
5de367bcc4 Merge branch 'ui_rework_4_0' into cura4.0_header 
Conflicts:
plugins/UM3NetworkPrinting/resources/qml/UM3InfoComponents.qml
resources/qml/Menus/ViewMenu.qml
resources/themes/cura-dark/theme.json
resources/themes/cura-light/theme.json
 2018-10-29 11:10:25 +01:00
Lipu Fei
2223ff14f7 Fix extruder index for material diameter box in MachineSettings dialog 
CURA-5857
 2018-10-29 10:40:25 +01:00
Diego Prado Gesto
90e8a05aab Remove all the entries in the theme that make reference to the sidebar, 
because there is no sidebar anymore.

Several different margins and linings were created depending on the
side, not depending on where it belongs.

Contributes to CURA-5784.
 2018-10-26 17:51:28 +02:00
Remco Burema
5133b6300a
Merge pull request #4650 from Ultimaker/CURA-5857_fix_machine_settings_set_diameter 
[3.6] [CURA-5857] Fix setting extruder material diameter in Machine Settings dialog
 2018-10-26 17:35:50 +02:00
Diego Prado Gesto
c8bdf7321c Move the visible check within the component. 
Contributes to CURA-5772.
 2018-10-26 16:31:03 +02:00
Diego Prado Gesto
5a5adb71cd Make the height of the Print setup selector themable. 
Contributes to CURA-5772.
 2018-10-26 16:16:33 +02:00
Remco Burema
de680f4aac
Merge pull request #4669 from Ultimaker/CURA-5821_fix_camera_memory_leak 
Cura 5821 fix camera memory leak
 2018-10-26 15:00:03 +02:00