GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-05-20 09:39:09 +08:00
Code Issues Packages Projects Releases Wiki Activity
16,707 Commits 291 Branches 260 Tags
Commit Graph

2979 Commits

Author SHA1 Message Date
Jaime van Kessel
878b743232 Add elide to machine selector label. 
CURA-5785
 2018-11-14 10:39:03 +01:00
Jaime van Kessel
c35b4f1d31 Removed old unusued code 
CURA-5785
 2018-11-14 10:00:44 +01:00
Jaime van Kessel
fb72f9a059 Fixed size of expandableItem not being the correct width 
CURA-5785
 2018-11-14 09:59:56 +01:00
Jaime van Kessel
1569fd7396 Merge branch 'ui_rework_4_0' of github.com:Ultimaker/Cura into CURA-5785-Restyle_stage_menu 2018-11-14 09:34:08 +01:00
Ghostkeeper
4b8d20cad7
Correct the link to create a new account 
Previously this button just took you to the log-in page.

Fixes issue CURA-5921.
 2018-11-13 16:27:19 +01:00
Ghostkeeper
266e08fdff
Merge branch 'master' into ui_rework_4_0 
Conflicts:
	plugins/Toolbox/resources/qml/ToolboxCompatibilityChart.qml - The compatibility chart being added in 3.6 which was kind of hacky.
	resources/qml/SidebarHeader.qml - Removed in UI rework, edited on master.
 2018-11-13 16:23:36 +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
Ghostkeeper
bfe5ae6f9c
Merge branch '3.6' 2018-11-12 15:48:22 +01:00
Ghostkeeper
fe66d15b9e
Disable Polish language 
The translation didn't arrive in time for the 3.6 release.

Contributes to issue CURA-5870.
 2018-11-12 15:47:42 +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
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
9bf18031ce Apply restyle of the toolbar according to the new designs. 2018-11-11 19:15:02 +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
Ghostkeeper
161b200a67
Fix typo in label ID 2018-11-09 11:41:43 +01:00
Jaime van Kessel
88234f7e21 Change ExtruderIcon to match the new design 
CURA-5785
 2018-11-09 10:48:22 +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
Remco Burema
aef5c67652 Merge branch 'cura4.0_action_panel' into cura4.0_header 2018-11-08 11:50:14 +01:00
Diego Prado Gesto
2c59419dbb Merge branch 'cura4.0_header' into CURA-5829-Add-preview-stage 2018-11-06 17:01:18 +01:00
Diego Prado Gesto
5dddcbd666 Add a new property to the ActionButton to indicate whether the button 
has a fixed width or the width will be dependant on the content.

Contributes to CURA-5786.
 2018-11-06 15:14:27 +01:00
Diego Prado Gesto
b6b60702c0 Make the action panel to have a fixed width. Remove the animations when 
switching states.

Contributes to CURA-5786.
 2018-11-06 14:32:48 +01:00
Diego Prado Gesto
f41ae128c2 Modify alignments to avoid binding loop logs. 
Contributes to CURA-5786.
 2018-11-06 11:24:41 +01:00
Jaime van Kessel
11a3da3068 Removed color animation from stage buttons 
This caused laggy updates and it didn't add that much anyway

CURA-5772
 2018-11-06 11:06:20 +01:00
Jaime van Kessel
8117c087aa Merge branch 'cura4.0_header' of github.com:Ultimaker/Cura into cura4.0_header 2018-11-06 09:52:22 +01:00
Jaime van Kessel
317447aa54 Fix multi-buildplate panel location 
CURA-5772
 2018-11-06 09:52:01 +01:00
Diego Prado Gesto
f1f1b9f168 Center icon an label vertically. 
Contributes to CURA-5786.
 2018-11-06 09:45:40 +01:00
Diego Prado Gesto
257d482184 Merge branch 'cura4.0_header' into cura4.0_action_panel 2018-11-06 09:23:39 +01:00
Diego Prado Gesto
18c9e9f05a Merge branch 'ui_rework_4_0' into cura4.0_header 2018-11-06 09:23:15 +01:00
Jaime van Kessel
08917c37a1 Improve rendering of scaled avatar image 
CURA-5772
 2018-11-06 09:21:27 +01:00
Jaime van Kessel
9f246910bc Make avatar image border a bit wider 
This prevents a white edge from showing

CURA-5772
 2018-11-06 09:18:20 +01:00
Jaime van Kessel
99bac25ab2 Show default avatar if user has no avatar picture set 
CURA-5784
 2018-11-05 14:55:22 +01:00