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

3590 Commits

Author SHA1 Message Date
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
Ghostkeeper
26c7558a53
Don't show labels if controls themselves are not shown 
The height of the popup is luckily automatically adjusted now.

Contributes to issue CURA-5876.
 2018-11-27 16:44:16 +01:00
Aleksei S
ff851b0382 Added margins 
CURA-5941
 2018-11-27 16:36:27 +01:00
Ghostkeeper
41a5f05391
Remove SyncButton 
It hasn't been used now for a while.

Contributes to issue CURA-5876.
 2018-11-27 15:57:26 +01:00
Lipu Fei
2c8ed99281 Add is_experimental to Qt models and QMLs 
CURA-5879
 2018-11-27 15:50:03 +01:00
Ghostkeeper
3ad2e4f62a
Re-use PrinterTypeLabel component and use abbreviated name 
Contributes to issue CURA-5876.
 2018-11-27 15:24:58 +01:00
Ghostkeeper
c1bb1a9b98
Use normal font size for shorthand label 
This element had been designed when very_small was in the theme equal to default. I changed the entire application to use default instead of very_small and made very_small a smaller font, but didn't change that on the branch that this element was designed on. So now also change it here.

Contributes to issue CURA-5876.
 2018-11-27 15:12:44 +01:00
Ghostkeeper
55dd9be062
Move PrinterTypeLabel to a more central location 
So that we can re-use it in other places too.

Contributes to issue CURA-5876.
 2018-11-27 15:11:13 +01:00
Aleksei S
d47806de50 Change style, added close popitem close behaviour 
CURA-5941
 2018-11-27 15:05:35 +01:00
Ghostkeeper
289399825b
Merge branch 'ui_rework_4_0' into CURA-5876-Configuration_dropdown 
Conflicts:
	plugins/PrepareStage/PrepareMenu.qml: Git was wrong, this was not really a conflict.
	resources/qml/ActionButton.qml: With iconSource being modified on ui_rework_4_0 and me modifying the icon to be able to display it on the left hand side.
	resources/qml/ActionPanel/OutputProcessWidget.qml: Git was wrong, not really a conflict.
	resources/qml/ActionPanel/SliceProcessWidget.qml: Git was wrong, not really a conflict.
	resources/qml/ExpandableComponent.qml: Both ui_rework_4_0 and me implemented a border around popups.
	resources/qml/MainWindow/MainWindowHeader.qml: Git was wrong, not really a conflict.
	resources/themes/cura-light/theme.json: Theme item was added in a place where I added whitespace.
 2018-11-27 15:01:48 +01:00
Jaime van Kessel
4fab546425 Fix codestyle issues 
Boyscouting
 2018-11-27 15:00:57 +01:00
Diego Prado Gesto
92d0717096 Hide the toolbar and don't show time and material information when loading a gcode 
Contributes to CURA-5979.
 2018-11-27 15:00:50 +01:00
Jaime van Kessel
352bfb15ce Merge branch 'ui_rework_4_0' of github.com:Ultimaker/Cura into ui_rework_4_0 2018-11-27 14:55:07 +01:00
Jaime van Kessel
82ea562dc3 Add missing hoverEnabled property 2018-11-27 14:54:49 +01:00