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

3755 Commits

Author SHA1 Message Date
Diego Prado Gesto
4154ec2fe8 Add enable gradual checkbox to the infill panel 
Contributes to CURA-5941.
 2018-12-02 12:39:52 +01:00
Diego Prado Gesto
5c5d99c548 Merge branch 'CURA-5941_restyle_setting_dropdown' of github.com:Ultimaker/Cura into CURA-5941_restyle_setting_dropdown 2018-12-02 12:21:03 +01:00
Diego Prado Gesto
260c0a04ca Merge branch 'ui_rework_4_0' into CURA-5941_restyle_setting_dropdown 2018-12-02 12:13:28 +01:00
Diego Prado Gesto
e73a91e746 Merge branch 'master' into ui_rework_4_0 2018-12-02 12:11:12 +01:00
Diego Prado Gesto
1238aa7304 Format the slider for the infill in the recommended mode 
Contributes to CURA-5941
 2018-12-02 12:03:58 +01:00
Aleksei S
29b7f42e0e Chaged settings visibility icon 
CURA-5941
 2018-11-30 18:33:53 +01:00
Ghostkeeper
0a6e420710
Make active tab white 
Contributes to issue CURA-5876.
 2018-11-30 17:05:25 +01:00
Jaime van Kessel
6ab2ce7690 Decrease padding between time & material specification headers 2018-11-30 16:44:55 +01:00
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
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
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
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
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
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
Lipu Fei
6db52dde46 Fix merge conflicts from ui_rework_40 
CURA-5943
 2018-11-29 15:27:06 +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
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
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
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
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
d9c3faaae2 Codestyle 
CURA-5879
 2018-11-28 11:19:37 +01:00
Jaime van Kessel
d09d8a6ae3 Minor codestyle fixes 
CURA-5879
 2018-11-28 11:18:36 +01:00
Jaime van Kessel
1d013dc1e7
Merge pull request #4893 from Ultimaker/fix_toolbar_style 
Fix toolbar style
 2018-11-28 10:47:05 +01:00
Jaime van Kessel
bfa2ff5f5e Invert visibility of bottom & topsquare 
It got derped.
 2018-11-28 10:46:07 +01:00
Jaime van Kessel
d0da70a7ee
Change visibility of the rectangle 
CURA-5984

Co-Authored-By: diegopradogesto <d.pradogesto@ultimaker.com>
 2018-11-28 10:29:53 +01:00
Jaime van Kessel
454b47e3a0
Change visibility behavior of the rectangle 
CURA-5984

Co-Authored-By: diegopradogesto <d.pradogesto@ultimaker.com>
 2018-11-28 10:29:35 +01:00
Jaime van Kessel
bfebb33123
Code style 
CURA-5984

Co-Authored-By: diegopradogesto <d.pradogesto@ultimaker.com>
 2018-11-28 10:28:16 +01:00
Jaime van Kessel
aeb2887796 Merge branch 'CURA-5979_gcode_loading_new_ui' of github.com:Ultimaker/Cura into ui_rework_4_0 2018-11-28 10:15:07 +01:00
Diego Prado Gesto
c1c5eb2219 Rename the properties to quickly identify that they are a boolean 
Contributes to CURA-5984.
 2018-11-28 09:44:37 +01:00
Diego Prado Gesto
14b460a626 Remove unused styles 2018-11-27 17:25:10 +01:00
Diego Prado Gesto
309061ce31 Add a new ToolbarButton 
Now also the Extruder button is a toolbar button since it will show in
the toolbar.
 2018-11-27 17:16:52 +01:00
Ghostkeeper
0b8a56458d
Remove unused CustomConfigurationSelector 
I checked. It is no longer used.

Contributes to issue CURA-5876.
 2018-11-27 17:11:32 +01:00