16674 Commits

Author SHA1 Message Date
Jaime van Kessel
a9fdd455eb Add seperator lines for the stageMenu's
CURA-5785
2018-11-13 16:47:39 +01:00
Jaime van Kessel
551bc2fbd4 Removed line around the headerbar
I was checking an old design, the new one doesn't have a line around it

CURA-5785
2018-11-13 16:40:51 +01:00
Jaime van Kessel
b83175a380 Add rounded corners to stage menus
CURA-5785
2018-11-13 16:32:24 +01:00
Jaime van Kessel
20e2f317de Add background to viewModeSelection
CURA-5785
2018-11-13 16:02:45 +01:00
Jaime van Kessel
c9389dd9ab Codestyle fixes 2018-11-13 15:58:34 +01:00
Jaime van Kessel
785c2661a2 Make SimulationViewMenuComponent also use the ExpandableComponent
CURA-5785
2018-11-13 15:57:00 +01:00
Jaime van Kessel
deb5fd1926 Fix PrintSetupSelector for previewStage
CURA-5785
2018-11-13 15:35:05 +01:00
Jaime van Kessel
c18b8241f5 Change MachineSelection so that it also uses the ExpandableComponent
CURA-5785
2018-11-13 14:00:00 +01:00
Jaime van Kessel
fe4ed46496 Show material name instead of just color
CURA-5785
2018-11-12 16:55:42 +01:00
Jaime van Kessel
4c1a45f904 Added sizes to the stage menu
This isn't themed, but right now it does adhere to the sizes I got from UX

CURA-5785
2018-11-12 15:53:09 +01:00
Jaime van Kessel
783fe9ab73 Updated the look of the extruder buttons
CURA-5785
2018-11-12 15:23:58 +01:00
Jaime van Kessel
f14687a749 Merge branch 'ui_rework_4_0' of github.com:Ultimaker/Cura into CURA-5785-Restyle_stage_menu 2018-11-12 14:32:06 +01:00
Jaime van Kessel
4be33031d7 Added icons to ExpandableComponent
This also makes the entire header react to mouse events instead of just the icon/button

CURA-5785
2018-11-12 14:30:55 +01:00
Jaime van Kessel
54685c983a Make PrintSetupSelector use layout instead of fixed width
This makes the components autoscale a bit when needed.

CURA-5785
2018-11-12 13:29:21 +01:00
alekseisasin
5094e45331
Merge pull request #4780 from Ultimaker/toolbar_4_0
Toolbar 4.0
2018-11-12 13:20:27 +01:00
Jaime van Kessel
ca63733827 Updated header of the settingbar
CURA-5785
2018-11-12 13:06:12 +01:00
Jaime van Kessel
987ff1737f Remove unused background from PrintSetupSelector
CURA-5785
2018-11-12 11:27:54 +01:00
Jaime van Kessel
88b57518d9 Fix codestyle
CURA-5785
2018-11-12 11:24:11 +01:00
Jaime van Kessel
b60977e435 Convert PrintSetupSelector to an ExpandableComponent
CURA-5785
2018-11-12 11:14:39 +01:00
Jaime van Kessel
e641584021 Made strings in ConfigurationSelector translatable.
CURA-5785
2018-11-12 09:45:55 +01:00
Diego Prado Gesto
f534885e34 Modify the color behavior of the toolbar buttons. 2018-11-12 09:35:32 +01:00
Diego Prado Gesto
9bf18031ce Apply restyle of the toolbar according to the new designs. 2018-11-11 19:15:02 +01:00
Diego Prado Gesto
38a80ecae5 Make some tweaks in the UI for the preview stage.
Clean up the default theme a bit by removing unused entries.

Contributes to CURA-5829.
2018-11-11 14:06:52 +01:00
Diego Prado Gesto
8a63a79896 Add soft animation to the entire popup and not only in the background.
This prevents the content to show before the background.

Contributes to CURA-5786.
2018-11-11 13:17:59 +01:00
Diego Prado Gesto
f65b1f8fbc Add soft animation to the entire popup and not only in the background.
This prevents the content to show before the background.

Contributes to CURA-5784.
2018-11-11 13:16:38 +01:00
Diego Prado Gesto
3669a3791d Hide the Preview shortcut in the action panel when the active stage is the PreviewStage.
Also adjust the size of the output button when the Preview button is not visible.

Contributes to CURA-5786.
2018-11-11 12:56:30 +01:00
Diego Prado Gesto
69daa0d91a Rename Toolbox menu to Marketplace. It was remove by mistake in a merge conflict.
Contributes to CURA-5784.
2018-11-11 12:44:56 +01:00
Jaime van Kessel
1602bf0999 Re-Add the material & printcore selection to the configuration selector
CURA-5785
2018-11-09 16:59:10 +01:00
Jaime van Kessel
2c7bdba7d0 Update ConfigurationSelector header to that it looks more like the new design
CURA-5785
2018-11-09 15:23:10 +01:00
Jaime van Kessel
1d775c984e Added background padding to expandable component
CURA-5785
2018-11-09 14:31:06 +01:00
Jaime van Kessel
2adb79aa39 Added re-usable expandable component
CURA-5785
2018-11-09 13:45:51 +01:00
Jaime van Kessel
88234f7e21 Change ExtruderIcon to match the new design
CURA-5785
2018-11-09 10:48:22 +01:00
Diego Prado Gesto
7a12cc53cc Merge branch 'master' into ui_rework_4_0 2018-11-09 08:53:31 +01:00
Diego Prado Gesto
3ab8568a87
Merge pull request #4679 from fieldOfView/fix_create_new_material
Use preferred material instead of generic PLA when creating a new material
2018-11-08 17:16:36 +01:00
Diego Prado Gesto
5b72fab2c1 Merge branch 'stelgenhof-master' 2018-11-08 16:30:25 +01:00
Diego Prado Gesto
3b8bc88a4d Merge branch 'master' of git://github.com/stelgenhof/Cura into stelgenhof-master 2018-11-08 16:29:40 +01:00
Diego Prado Gesto
ad73cda215
Merge pull request #4739 from Ultimaker/reduce_buildplate_resolutions
Reduce resolution of heavy build plate meshes
2018-11-08 16:12:58 +01:00
Remco Burema
67fd0dd494 Merge branch 'cura4.0_header' into ui_rework_4_0 2018-11-08 15:34:58 +01:00
Remco Burema
d0ffab53ca Merge branch 'cura4.0_header' of https://github.com/Ultimaker/Cura into cura4.0_header 2018-11-08 15:34:07 +01:00
Remco Burema
2f2a960c0e
Merge pull request #4715 from Ultimaker/cura4.0_action_panel
Redesign of the Action Panel
2018-11-08 15:31:48 +01:00
Lipu Fei
369747d106 Merge remote-tracking branch 'origin/3.6' 2018-11-08 15:28:42 +01:00
Remco Burema
e66dd2be0b Action-Panel (CURA-5786) can now know about Preview-Stage (CURA-5829). 2018-11-08 15:03:24 +01:00
Remco Burema
215fc4e8ec Merge branch 'CURA-5829-Add-preview-stage' into ui_rework_4_0 2018-11-08 13:23:56 +01:00
Ghostkeeper
6d66060222
Don't allow support interface offset greater than support offset
The support interface can't exceed the volume of the support now, so this is now a technical limitation.

Contributes to issue CURA-5880.
2018-11-08 13:03:37 +01:00
Ghostkeeper
f132adc135
Rename 'Offset' to 'Horizontal Expansion'
This is more consistent with other similar settings.

Contributes to issue CURA-5880.
2018-11-08 12:59:24 +01:00
Ghostkeeper
dcc6003a92
Allow negative support interface offsets
There is no technical reason why this is not allowed. You could save some material with this.

Contributes to issue CURA-5880.
2018-11-08 12:50:09 +01:00
Simon Edwards
69c9ffaf61
Merge pull request #4755 from Ultimaker/CL-1040_show_print_time_in_monitor
CL-1140 Show print time in monitor tab
2018-11-08 11:53:47 +01:00
Remco Burema
aef5c67652 Merge branch 'cura4.0_action_panel' into cura4.0_header 2018-11-08 11:50:14 +01:00
Ian Paschal
aa6ec9e44b Make text black
Contributes to CL-1040
2018-11-08 11:48:22 +01:00
Lipu Fei
de6ab02422 Merge pull request #4678 from fieldOfView/fix_networkprinter_post
Fix type error in NetworkedPrinterOutputDevice.post
2018-11-08 11:05:47 +01:00