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

3315 Commits

Author SHA1 Message Date
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
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
Ghostkeeper
b15c272d23
Fix applying configuration when clicking 
Also no longer use that signal for it. It was completely unnecessary.

Contributes to issue CURA-5876.
 2018-11-27 13:24:13 +01:00
Ghostkeeper
89126c7323
Use background instead of contentItem 
This way the padding and such doesn't matter any more. And the original background disappears, which was unthemed and still behind the original contentItem.

Contributes to issue CURA-5876.
 2018-11-27 13:08:41 +01:00
Ghostkeeper
c6a9aca346
Switch checked and hovered themes 
I misunderstood the theme as it was in the screenshots.

Contributes to issue CURA-5876.
 2018-11-27 13:05:32 +01:00
Ghostkeeper
81cadf702c
Give configuration items a rounded radius 
Contributes to issue CURA-5876.
 2018-11-27 13:00:51 +01:00
Jaime van Kessel
fb84b344ec Add gradient to header bar 2018-11-27 12:58:06 +01:00
Ghostkeeper
0be2453daf
Update style of border of configuration items 
Contributes to issue CURA-5876.
 2018-11-27 12:55:07 +01:00
Ghostkeeper
e58409b1ef
Correct colours for the selected configuration 
This should always be the same as the ExpandableComponent's background, so white when it's not active and light blue when it's active, regardless of theme.
The naming of this theme entry is a bit weird because the ActionButton theme is used for ExpandableComponent and now for ConfigurationItem as well, but that's why we should NEVER name these theme entries to something specific to one item. Oh well, I'm not about to refactor that now with all the branches going on everywhere.

Contributes to issue CURA-5876.
 2018-11-27 12:51:52 +01:00
Jaime van Kessel
44c415ff78 Add shadow to ExpandableComponent 2018-11-27 11:58:32 +01:00
Ghostkeeper
a2b1f53979
Use normal text colour instead of specialised configuration item text 
They were the same anyway, and they should always be the same.

Contributes to issue CURA-5876.
 2018-11-27 11:53:17 +01:00
Ghostkeeper
6876c12106
Remove weird padding from button 
I don't know why the default Button has padding everywhere, but I don't want it.

Contributes to issue CURA-5876.
 2018-11-27 11:43:32 +01:00
Diego Prado Gesto
75b827d373 Modify the hover behavior by removing the mouse area. 
Contributes to CURA-5942.
 2018-11-27 11:26:20 +01:00
Diego Prado Gesto
e2f85fcdc4 Add extra space to printer button. 
Contributes to CURA-5942.
 2018-11-27 11:25:43 +01:00
Aleksei S
e6c2238fd5 Added popup spacing by Y coordinate 
CURA-5941
 2018-11-27 11:24:09 +01:00
Ghostkeeper
e05566865a
Use ExtruderIcon component to display extruder icon 
Since we already have that component pre-designed, let's use it.

Contributes to issue CURA-5876.
 2018-11-27 11:19:03 +01:00