GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-07-11 01:31:50 +08:00
Code Issues Packages Projects Releases Wiki Activity
19,026 Commits 295 Branches 268 Tags
Commit Graph

19026 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Ghostkeeper
d5d49fcec8
Disable extruder enabled checkbox if it's the last one 
You can't disable the last extruder.

Contributes to issue CURA-5876.
 2018-11-30 16:43:48 +01:00
Ghostkeeper
82d4897ba4
Use MouseArea to catch click instead of onClicked 
This is necessary because when you click it, the 'checked' property no longer depends on the active extruder. So prevent it from being clicked at all and handle the click separately in this MouseArea.

Contributes to issue CURA-5876.
 2018-11-30 16:18:46 +01:00
Jaime van Kessel
36a86adc0f Remove spammy log 2018-11-30 16:08:19 +01:00
Marijn Deé
8b42b84618 Made a start with uploading jobs to the printer 2018-11-30 16:07:20 +01:00
Jaime van Kessel
ad26962cb9 Fix setting visibility not working in settingVisibilityPage 
CURA-5981
 2018-11-30 15:49:50 +01:00
Ghostkeeper
ed37e692a3
Don't disable enable checkbox before machine is loaded 
It is unnecessary because you can't see it or click on it before adding a machine.

Contributes to issue CURA-5876.
 2018-11-30 15:45:04 +01:00
Ghostkeeper
ede50ef3ca
Simplify dependencies on activeStack 
The properties, being formulas, were not properly updated when the active stack changed.

Contributes to issue CURA-5876.
 2018-11-30 15:44:15 +01:00
Ghostkeeper
18bb403413
No longer switch away from extruder when disabling 
It feels confusing when this happens.

Contributes to issue CURA-5876.
 2018-11-30 15:42:46 +01:00
Ghostkeeper
1d9a13cac2
Reset tab index when repeater's model is rebuilt 
We can't prevent the model from being rebuilt. At least, not without a major refactor.

Contributes to issue CURA-5876.
 2018-11-30 15:40:59 +01:00
Diego Prado Gesto
2c5f5170c2 Add the labels of the layer height to the slider 
Contributes to CURA-5941.
 2018-11-30 15:38:28 +01:00
Jaime van Kessel
384c359db1 Merge branch 'master' of github.com:Ultimaker/Cura into ui_rework_4_0 2018-11-30 15:34:47 +01:00
Jaime van Kessel
a4a619370e Fix QML warnings 2018-11-30 15:33:57 +01:00
Jaime van Kessel
205b939b99 Merge branch 'remove_transitions' of github.com:Ultimaker/Cura 2018-11-30 15:30:53 +01:00
Diego Prado Gesto
47b7d7bed8 Make the slider available for clicking 
This was accidentally removed in the previous commit.

Contributes to CURA-5941.
 2018-11-30 15:17:59 +01:00
Diego Prado Gesto
a675d6c353 Merge branch 'CURA-5941_restyle_setting_dropdown' of github.com:Ultimaker/Cura into CURA-5941_restyle_setting_dropdown 2018-11-30 15:17:42 +01:00
Jaime van Kessel
1a79372afd Fixed name of cocoon create 
For some reason it was added as if it was 2 machines at once. Since we already have a wanhao I3, i've changed this one to only be a profile for the Cocoon.
 2018-11-30 15:16:37 +01:00
Diego Prado Gesto
1fbcff2cb9 Fix the tooltips in the profile selector in the recommended mode 
Contributes to CURA-5941.
 2018-11-30 15:06:53 +01:00
Ghostkeeper
e93bbf07a4
Fix circular dependency with tab index and active stack 
Only when actually clicking the tab should it change the active extruder index; not when the current index is changed for any other reason.
Next up: Don't change the current index for any other reason.

Contributes to issue CURA-5876.
 2018-11-30 14:53:10 +01:00
Aleksei S
73568d7473 Added icon to the search field which filters settings 
CURA-5941
 2018-11-30 14:51:55 +01:00
Diego Prado Gesto
1a778b3078 Fix qualiy slider alignments 
Contributes to CURA-5941.
 2018-11-30 14:18:07 +01:00
Jaime van Kessel
59a81be65c Fixed some leftover graphical issues 
CURA-5943
 2018-11-30 14:10:42 +01:00
Jaime van Kessel
48bdb735f2 Added MachineSelector to monitor menu 
CURA-5943
 2018-11-30 13:58:44 +01:00
Jaime van Kessel
6d4a460e58 Move USB sidebar into the main view of the monitorstage 
CURA-5943
 2018-11-30 13:53:53 +01:00
Diego Prado Gesto
17945c6b16 [WIP] Separate components in different files 
Contributes to CURA-5941
 2018-11-30 11:32:24 +01:00
Ghostkeeper
4e2f51e7e8
Use public activeExtruderIndex rather than internal _activeExtruderIndex 
So that this getter still does what it needs to do if we ever decide to add side-effects.

Contributes to issue CURA-5876.
 2018-11-30 11:13:04 +01:00
Ghostkeeper
1c96c81ba9
Remove unnecessary extra setMetaDataEntry 
This is a relic from when you first had to add the metadata entry. Now it does nothing any more because it's being set directly afterwards to the actual value that is desired in the end.

Contributes to issue CURA-5876.
 2018-11-30 11:11:17 +01:00
Marijn Deé
763291821f Added models to process the data from the api results 
Added code to update the UI models
 2018-11-29 17:03:11 +01:00
Diego Prado Gesto
bc8bf87809 Align the buttons at the bottom of the panel 
Contributes to CURA-5941.
 2018-11-29 15:54:02 +01:00
Ghostkeeper
14a7b7b2ce
Merge branch 'update_example_postprocessing_script' 2018-11-29 15:33:03 +01:00
Mark
90aa8c1264 point people to a good example 2018-11-29 15:29:51 +01:00
Lipu Fei
6db52dde46 Fix merge conflicts from ui_rework_40 
CURA-5943
 2018-11-29 15:27:06 +01:00
Lipu Fei
c545d9df77 Add key check before accessing in ƒStartSliceJob 
CURA-5901
 2018-11-29 15:17:43 +01:00
Mark
d88a465737 Increase possible visible description lines in the Marketplace 2018-11-29 14:45:42 +01:00
Diego Prado Gesto
f67c725b2a Merge branch 'CURA-5941_restyle_setting_dropdown' of github.com:Ultimaker/Cura into CURA-5941_restyle_setting_dropdown 2018-11-29 14:03:39 +01:00
Marijn Deé
8a72ba3cfa Merge branch 'cloud-output-device' of github.com:Ultimaker/Cura into cloud-output-device 2018-11-29 10:00:57 +01:00
Lipu Fei
5df7cdde48 Merge remote-tracking branch 'origin/master' into ui_rework_4_0 2018-11-29 08:54:22 +01:00
Diego Prado Gesto
7639983925 Clean the recommended mode print setup 
Contributes to CURA-5941
 2018-11-29 08:54:04 +01:00
Lipu Fei
b1b773e464
Merge pull request #4891 from Ultimaker/show_website_as_support_in_marketplace 
Show website for support
 2018-11-29 08:50:32 +01:00
Lipu Fei
b44ddec01f Change normal layer height of cocoon to 0.10 
CURA-5902

So it's different from Fine 0.15, otherwise you get duplicates.
 2018-11-29 08:35:40 +01:00
Aleksei S
706fc311bc Added margins to the setting list 
CURA-5941
 2018-11-29 00:47:25 +01:00
Aleksei S
b9d9a35868 Move profile dropdown to another file 
CURA-5941
 2018-11-29 00:00:22 +01:00
Diego Prado Gesto
990c653af4 Refactor the code a bit more to better align the components in the 
recommended mode.

Contributes to CURA-5941.
 2018-11-28 17:29:25 +01:00
Aleksei S
0fdaebaaf8 Updated action button 
CURA-5941
 2018-11-28 13:51:54 +01:00
Ian Paschal
1f17896e78
Merge pull request #4899 from Ultimaker/monitor_tab_scroll_tweak 
Improve monitor tab temporary scroll bar
 2018-11-28 13:24:27 +01:00
Diego Prado Gesto
85b34d6005 Refactor the PrintSetupSelector 
The file was splitted in several other files to improve readability.
There is a new folder called PrintSetupSelector where all those files
will be.

Contributes to CURA-5941.
 2018-11-28 13:07:39 +01:00
Ian Paschal
14cee32cec Improve monitor tab temporary scroll bar 2018-11-28 12:20:09 +01:00
Diego Prado Gesto
56f20648f5 Merge branch 'ui_rework_4_0' into CURA-5941_restyle_setting_dropdown 2018-11-28 11:58:55 +01:00
Jaime van Kessel
7d42fdf183 Add missing typing 2018-11-28 11:52:30 +01:00
Jaime van Kessel
0baa4d20b3 Gracefully handle the case where machine definition is no in the map 2018-11-28 11:42:54 +01:00
Jaime van Kessel
c0d1c35a2b Removed accidental copy paste 2018-11-28 11:35:48 +01:00