GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-05-29 09:38:21 +08:00
Code Issues Packages Projects Releases Wiki Activity
17,662 Commits 294 Branches 267 Tags
Commit Graph

7713 Commits

Author SHA1 Message Date
Diego Prado Gesto
7639983925 Clean the recommended mode print setup 
Contributes to CURA-5941
 2018-11-29 08:54:04 +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
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
c0d1c35a2b Removed accidental copy paste 2018-11-28 11:35:48 +01:00
Jaime van Kessel
adf16310c7
Merge pull request #4883 from Ultimaker/CURA-5879_experimental_qualities 
CURA-5879 experimental qualities
 2018-11-28 11:34:21 +01:00
Diego Prado Gesto
fb152728e0 Merge branch 'master' into ui_rework_4_0 2018-11-28 11:19:43 +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
5ed2acadd0 Re-add wizard_progress size 
I was a bit over enthosiastic deleting it as it was still used for the UMO first run wizard
 2018-11-28 11:09:34 +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
Diego Prado Gesto
709750c9e2 Add global quality to the Anycubic i3 Mega 
Fixes #4876.
 2018-11-28 10:39:32 +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
Lipu Fei
c9c7ef7d67 Add "is_experimental" for experimental qualities 
CURA-5879
 2018-11-27 15:50:02 +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
Diego Prado Gesto
077b34b433 Fix size of the extruder icon 
Now it should look the same in all places.
 2018-11-27 14:49:01 +01:00
Ghostkeeper
0a71a9dd3e
Increase margins around configuration item 
As per the design.

Contributes to issue CURA-5876.
 2018-11-27 14:47:18 +01:00
Ghostkeeper
956741922d
Make elements retain their position if hotend or material is missing 
Just a space makes it keep the correct height.

Contributes to issue CURA-5876.
 2018-11-27 14:41:48 +01:00
Ghostkeeper
609f07399e
Show extruder as disabled if either material or core is missing 
It basically just means you can't print with it.

Contributes to issue CURA-5876.
 2018-11-27 14:20:47 +01:00
Aleksei S
8784ecd49a Change native rendering 
CURA-5941
 2018-11-27 14:09:47 +01:00
Ghostkeeper
b0e9f23eee
Correct line colour when hovered 
A detail that I almost missed in the design examples.

Contributes to issue CURA-5876.
 2018-11-27 14:06:07 +01:00
Ghostkeeper
1555a1ab17
Make manufacturer and extruder labels lighter 
The proper colour would've been 'detail' but that seems to not be used much at all, and it's too light. In other places, 'inactive' is used in this place more often.

Contributes to issue CURA-5876.
 2018-11-27 14:03:05 +01:00
Ghostkeeper
bb9598afd1
Redesign layout of configuration item contents 
This is the new design.

Contributes to issue CURA-5876.
 2018-11-27 13:55:54 +01:00
Aleksei S
6956a732a0 Use tapbar component from UM, change the print_setup_widget width 2018-11-27 13:49:04 +01:00
Diego Prado Gesto
e863c34f68 Align the text to the center of the button 
Contributes to CURA-5942.
 2018-11-27 13:33:35 +01:00
Ghostkeeper
cf8d88054d
Use proper colour for material in configuration item 
No idea this would be so easy.

Contributes to issue CURA-5876.
 2018-11-27 13:29:57 +01:00