GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-07-11 06:21:48 +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
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
Simon Edwards
8262c2dfd6
Merge pull request #4889 from Ultimaker/CL-1150_restyle_monitor_printer_tile 
CL-1150 restyle monitor printer tile
 2018-11-28 11:31:11 +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
Ian Paschal
9029d10ed0 Remove debug statement 
Contributes to CL-1150
 2018-11-28 10:47: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
Ian Paschal
370fa0fd14 Remove old sidebar 
Contributes to CL-1150
 2018-11-28 10:46:22 +01:00
Ian Paschal
d54a1cb41b Handle null print job more elegantly 
Contributes to CL-1150
 2018-11-28 10:46:12 +01:00
Jaime van Kessel
bfa2ff5f5e Invert visibility of bottom & topsquare 
It got derped.
 2018-11-28 10:46:07 +01:00
Ian Paschal
255a7fa1fb Fix binding loop 
Contributes to CL-1150
 2018-11-28 10:45:46 +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
Jaime van Kessel
94c4366194 Merge branch 'master' of github.com:Ultimaker/Cura into ui_rework_4_0 2018-11-27 17:55:13 +01:00
Jaime van Kessel
d8c430abf6 Fix typing 2018-11-27 17:54:53 +01:00
Artem Leshchev
6f5dfc4677 Added definitions for Wanhao Duplicator 9 2018-11-27 19:46:49 +03: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
ChrisTerBeke
26f107d176 Use cluster_id as dict key, remove unneeded white space 2018-11-27 17:03:19 +01:00
ChrisTerBeke
4e150fb4bf Merge branch 'master' into cloud-output-device 2018-11-27 16:59:28 +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
Diego Prado Gesto
dad2031e4b Switch to the preview stage before to switch to simulation view 
... since now the list of views are in a different stage.

Contributes to CURA-5979.
 2018-11-27 16:06:37 +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
Mark
b98df0f22f Show one website link where to get the material 2018-11-27 15:46:23 +01:00
Mark
f8f498b90c Increase the lines that are shown to 12 2018-11-27 15:45:58 +01:00
Marijn Deé
fd4d1113b9 use right plural in variable name 2018-11-27 15:42:26 +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
Mark
c7fd147f59 Show website for support 2018-11-27 14:55:06 +01:00
Jaime van Kessel
82ea562dc3 Add missing hoverEnabled property 2018-11-27 14:54:49 +01:00
Marijn Deé
172e003e1b Removed the inital call to clusters 2018-11-27 14:53:23 +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
Marijn Deé
fb019ba987 In CloudOutputDeviceManager start a thread to periodically check for changes in the connected clusters 2018-11-27 14:48:47 +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