GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-06-04 11:14:21 +08:00
Code Issues Packages Projects Releases Wiki Activity
16,749 Commits 295 Branches 268 Tags
Commit Graph

16749 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Diego Prado Gesto
6f2e8d726d Remove functions that are only used once. 
Contributes to CURA-5786.
 2018-11-02 16:52:17 +01:00
Diego Prado Gesto
2dfd354b25 Remove function and property that are only used once. 
Contributes to CURA-5786.
 2018-11-02 16:49:31 +01:00
Diego Prado Gesto
059e681de5 Remove unused code. 
Contributes to CURA-5786.
 2018-11-02 16:44:50 +01:00
Diego Prado Gesto
dba31c3af4 Add documentation. 
Contributes to CURA-5786.
 2018-11-02 16:20:04 +01:00
Jaime van Kessel
e2a166ca83 Merge branch 'master' of github.com:Ultimaker/Cura 2018-11-02 16:14:37 +01:00
Diego Prado Gesto
a39449c48b
Merge pull request #4704 from Ultimaker/CURA-5842_update_update_text 
CURA-5842 Set CuraApplication display name
 2018-11-02 16:03:10 +01:00
Diego Prado Gesto
b6e35df030
Merge pull request #4709 from fieldOfView/fix_add_printer_layout 
Add Printer dialog codestyle and readability
 2018-11-02 15:29:32 +01:00
Jaime van Kessel
de8e56ae19 Merge branch 'feature_support_interface_offset' of https://github.com/DesktopMetal/Cura 2018-11-02 15:21:39 +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
ac9cfd8873 Merge branch 'cura4.0_header' of github.com:Ultimaker/Cura into cura4.0_header 2018-11-02 13:39:05 +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
Diego Prado Gesto
c08a90faac Merge branch 'cura4.0_header' into cura4.0_action_panel 2018-11-02 13:37:27 +01:00
Diego Prado Gesto
53872f9a5b Merge branch 'ui_rework_4_0' into cura4.0_header 2018-11-02 13:36:47 +01:00
Diego Prado Gesto
ef7ac3b089 Create the new component that gathers all the printjob information 
(times and material usage) in a popup that is shown when the "i" icon is
pressed.

Contributes to CURA-5786.
 2018-11-02 13:29:55 +01:00
Diego Prado Gesto
c862e72514 Add the print panel information as a popup that shows when the "i" icon 
is clicked.

Contributes to CURA-5786.
 2018-11-02 11:10:23 +01:00
Diego Prado Gesto
310539cb6d In the main action panel, only show the total amount of material weight 
and length (addition of all extruders). The information panel will show
each cost separately.

Contributes to CURA-5786.
 2018-11-02 09:58:35 +01:00
Diego Prado Gesto
b03695dec6 Add print time information and material costs to the action panel. 
Contributes to CURA-5786.
 2018-11-02 09:33:27 +01:00
Ghostkeeper
2852674499
Adjust state of API call 
It can just be an arbitrary string, as long as it is kept consistent I suppose.

Discovered during test of CURA-5784.
 2018-11-01 15:50:18 +01:00
Jaime van Kessel
90726ecbff Fix situation where the setting visibility model could cause a crash. 
Yay for crash logging
 2018-11-01 15:28:08 +01:00
Ghostkeeper
bd97aed1c7
Merge branch '3.6' 2018-11-01 14:43:47 +01:00
Ghostkeeper
4dc248a631
Rename Open Marketplace to just Marketplace 
Because Open Marketplace has to be translated (the 'open' part) but the Marketplace can just be called marketplace.

Contributes to issue 5870.
 2018-11-01 14:43:22 +01:00
fieldOfView
e61a6e7a5c Fix codestyle 2018-11-01 14:41:33 +01:00
Jaime van Kessel
44954c4cad Fixes required for semantic versioning 
CURA-5840
 2018-11-01 14:15:16 +01:00
Diego Prado Gesto
dcad95aab9 Rename Toolbox button to Marketplace. 
Contributes to CURA-5784.
 2018-11-01 12:44:14 +01:00
Lipu Fei
ff4dfcf9a6 Make Cura app display name configurable 
CURA-5842
 2018-11-01 12:15:00 +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
Diego Prado Gesto
9215bb11f0 Merge branch '3.6' 2018-11-01 09:11:20 +01:00
Diego Prado Gesto
e884605cc3 Fix typo. 2018-11-01 08:47:44 +01:00
Lipu Fei
cb24549d7d Set CuraApplication display name 
CURA-5842
 2018-11-01 08:29:54 +01:00
Diego Prado Gesto
3a7ae58563 Small changes in the buttons to fit with the designs. 
Contributes to CURA-5786.
 2018-10-31 17:23:38 +01:00
Diego Prado Gesto
ec0d9f09b7 Create a component for selecting the output device before output the 
file.

Contributes to CURA-5786.
 2018-10-31 17:03:09 +01:00
Jaime van Kessel
6256e3f24b Merge branch 'feature_add_printer_layout' of https://github.com/fieldOfView/Cura 2018-10-31 14:23:42 +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
Ghostkeeper
a5c2a73487
Fix adhesion type checkbox if default is skirt 
The remove-unused-values feature doesn't work with settings that are resolved, because we try to remove them at the appropriate position in the stack but then we check at that position in the stack if the value is not the same as what it was, but with this check the resolve function is no longer evaluated. It's complex, but hard to solve because we can't try to remove it at this location and predict that this will change the actual final value after the resolve function has done its thing.

Contributes to issue CURA-5877.
 2018-10-31 13:09:15 +01:00
Remco Burema
e963fd2d85
Merge pull request #4445 from fieldOfView/fix_setting_float_precision 
Reduce the maximum precision of floats in SettingTextField inputs
 2018-10-31 12:26:34 +01:00
Lipu Fei
c27713c88a Merge remote-tracking branch 'origin/3.6' 2018-10-31 11:58:16 +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
Diego Prado Gesto
843cb9e09c Merge branch '3.6' of github.com:Ultimaker/Cura into 3.6 2018-10-31 11:32:18 +01:00
Diego Prado Gesto
3548f9f23c Fix typo in the bundled packages. 2018-10-31 11:31:05 +01:00
Ian Paschal
903054190d Fixing some spacing issues with camera button 
Contributes to CL-1063
 2018-10-31 11:23:57 +01:00
Lipu Fei
50d92df8a8 Merge remote-tracking branch 'origin/3.6' 2018-10-31 11:01:16 +01:00
Jaime van Kessel
1e9aff44f6 Fix QML warnings & errors 
CURA-5829
 2018-10-31 10:55:05 +01:00
Lipu Fei
d5806d145d
Merge pull request #4690 from Ultimaker/rename_ToolBox_to_Marketplace 
Rename user visible entries of ToolBox to Marketplace
 2018-10-31 10:42:27 +01:00
Ghostkeeper
779496f846
Don't require MirrorTool, RotateTool, ScaleTool or SimulationView 
This was changed last April without consulting the rest of the team. We're reverting it because there is really no reason why these should not be disabled.
 2018-10-31 10:37:25 +01:00
Ghostkeeper
8a52fd2c2c
Document why these plug-ins are required 
For the SimulationView, MirrorTool, RotateTool, ScaleTool and TranslateTool I couldn't really find a reason why this is required, so I can't document it.
 2018-10-31 10:34:26 +01:00