GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-08-16 13:05:55 +08:00
Code Issues Packages Projects Releases Wiki Activity
16,849 Commits 295 Branches 268 Tags
Commit Graph

16849 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jaime van Kessel
e25a61d4d6 Merge branch 'CURA-5785-Restyle_stage_menu' of github.com:Ultimaker/Cura into CURA-5785-Restyle_stage_menu 2018-11-21 09:43:09 +01:00
Jaime van Kessel
d74393498b Fixed view selector header not updating correctly 
CURA-5785
 2018-11-21 09:35:35 +01:00
ChrisTerBeke
60ed0ddc24
Revert "Revert "Merge branch 'fix-oauth2-client' into CURA-5785-Restyle_stage_menu"" 
This reverts commit 791929d6897942e971a112a26839c0fa6f94f847.
 2018-11-20 23:49:33 +01:00
ChrisTerBeke
791929d689
Revert "Merge branch 'fix-oauth2-client' into CURA-5785-Restyle_stage_menu" 
This reverts commit 4caf770a62f07b71a646b7f09a08623485b89582, reversing
changes made to 0cdcd61ff2dfe2677e636cc2f1ee993cbd9d641d.
 2018-11-20 23:47:46 +01:00
ChrisTerBeke
8b085aa877
Revert "Switch Ultimaker Account OAuth2 client" 
This reverts commit 4e8979334e0d794b2cd8cae72ce9c351890577c8.
 2018-11-20 23:47:25 +01:00
ChrisTerBeke
4caf770a62
Merge branch 'fix-oauth2-client' into CURA-5785-Restyle_stage_menu 
* fix-oauth2-client:
  Switch Ultimaker Account OAuth2 client
  Fix the title's top margin size in the add machine dialog.
 2018-11-20 20:48:52 +01:00
ChrisTerBeke
4e8979334e
Switch Ultimaker Account OAuth2 client 
The new client has access to more permissions and is labeled as "Ultimaker Cura" instead of "Cura Backups Plugin".
Also removes `self._cloud_api_root` as that's not used anymore now that `self._oauth_root` is used for the redirect URLs.
 2018-11-20 19:18:48 +01:00
Diego Prado Gesto
669648d3e1 Improve the toolbar style by modifying the rectangles and the behavior 
to get a rounded rectangle on the right-top and right-bottom.

Contributes to CURA-5962.
 2018-11-20 16:28:21 +01:00
Ian Paschal
2f84339f5c Finalize queue 
Contributes to CL-1148
 2018-11-20 15:58:09 +01:00
Jaime van Kessel
0cdcd61ff2 Merge branch 'CURA-5785-Restyle_stage_menu' of github.com:Ultimaker/Cura into CURA-5785-Restyle_stage_menu 2018-11-20 14:36:41 +01:00
Jaime van Kessel
3b4d728d6a Fix Simulation view popup not sizing down 
I have no idea why implictHeight does work and childrenRect.height doesn't (eg;
childrenRect.height only scales up for some reason, never down)

CURA-5785
 2018-11-20 14:35:13 +01:00
Diego Prado Gesto
895590c3d0 Change the size of the progress bar control. Also add the rounded 
rectangle.

Contributes to the new Cura UI-Flow.
 2018-11-20 14:28:54 +01:00
Ian Paschal
fb3cb67da0 Add printer configuration components 
Contributes to CL-1148
 2018-11-20 13:46:41 +01:00
Diego Prado Gesto
fab0d5a4b7 Rename the color of the sidebar to main_background, since it was deleted 
but not updated in the usages.

Contributes to CURA-5785.
 2018-11-20 13:25:15 +01:00
Diego Prado Gesto
76f2aeb43c Fix the title's top margin size in the add machine dialog. 2018-11-20 11:27:45 +01:00
Diego Prado Gesto
20285f26d6 Merge branch 'ui_rework_4_0' into CURA-5785-Restyle_stage_menu 2018-11-20 11:20:26 +01:00
Diego Prado Gesto
1844a9bed2 Merge branch 'master' into ui_rework_4_0 2018-11-20 11:08:05 +01:00
Lipu Fei
e6d9ad31ab Use generated Makefiles to run tests 2018-11-20 09:53:17 +01:00
Jaime van Kessel
2b88e82a2a Add option test-verbose build option to CuraTests 2018-11-19 16:52:02 +01:00
Ian Paschal
421a64c7b0 Replace queued print job cards with new design 
Contributes to CL-1148
 2018-11-19 16:42:36 +01:00
Jaime van Kessel
10621aacee Merge branch 'CURA-5785-Restyle_stage_menu' of github.com:Ultimaker/Cura into CURA-5785-Restyle_stage_menu 2018-11-19 16:17:07 +01:00
Jaime van Kessel
8683a1e07e Add previewStage to bundled cura package list 
CURA-5785
 2018-11-19 16:16:41 +01:00
Lipu Fei
b0f3fedc94 Fix import QtQuick versions to suit Qt 5.10 
CURA-5785
 2018-11-19 13:42:22 +01:00
Jaime van Kessel
a490e420f0 Prevent the setting items from being recreated every stage switch 
CURA-5785
 2018-11-19 11:42:04 +01:00
Jaime van Kessel
6fe89e3d54 Fix width of simulationView component not being set correctly 
CURA-5785
 2018-11-19 10:33:19 +01:00
Jaime van Kessel
e3ebf89092 Ensure that width of popup does not get set to 0 
CURA-5785
 2018-11-16 17:26:10 +01:00
Ghostkeeper
f10bd28c4a
Improve grammar and do similar fix for extruder end g-code 
Contributes to issue CURA-5906.
 2018-11-16 17:25:32 +01:00
Jaime van Kessel
6b55490af8 Fix final QML warnings 
CURA-5785
 2018-11-16 16:30:47 +01:00
Jaime van Kessel
bc5a2ce5b0 Make ViewSelector panel close upon selecting different view 
CURA-5785
 2018-11-16 16:16:15 +01:00
Jaime van Kessel
52b2f4579a Fix a number of QML warnings 
CURA-5785
 2018-11-16 16:13:09 +01:00
Jaime van Kessel
7f99ed1af3 ExtruderIcon will now display that it's disabled correctly 
CURA-5785
 2018-11-16 16:04:11 +01:00
Jaime van Kessel
d661a8e626 Merge branch 'CURA-5785-Restyle_stage_menu' of github.com:Ultimaker/Cura into CURA-5785-Restyle_stage_menu 2018-11-16 15:23:38 +01:00
Jaime van Kessel
42399ecb24 Let headerItem fill entire component if no icon is set 
CURA-5785
 2018-11-16 15:17:34 +01:00
Jaime van Kessel
b72f1bb314 Add missing screenScaleFactor for implicit sizes 
CURA-5785
 2018-11-16 15:15:44 +01:00
Ghostkeeper
816d844258
Use textwidth instead of round 
CURA-5785

Co-Authored-By: nallath <nallath@gmail.com>
 2018-11-16 15:14:08 +01:00
Jaime van Kessel
fe15a0a513 Made width of machineSelector popup depend on size of the element 
CURA-5785
 2018-11-16 15:09:47 +01:00
Jaime van Kessel
5972bfaf03 Add round to minContentWidth 
This prevents text from getting a weird width

CURA-5785
 2018-11-16 15:06:21 +01:00
Jaime van Kessel
320efa443e Merge branch 'CURA-5785-Restyle_stage_menu' of github.com:Ultimaker/Cura into CURA-5785-Restyle_stage_menu 2018-11-16 14:58:47 +01:00
Jaime van Kessel
3fd1cc0e8c Ensure that the added labels are also themable 
CURA-5785
 2018-11-16 14:58:11 +01:00
Ghostkeeper
3ef6d0544a
Fix spelling and indents 
Ant-fuckery, as they say in the low lands.

Contributes to issue CURA-5785.
 2018-11-16 14:11:23 +01:00
Ghostkeeper
e087db7c2e
Code style and fixes to comments 
Contributes to issue CURA-5785.
 2018-11-16 14:11:22 +01:00
Ghostkeeper
514fc13045
Remove redundant documentation 
CURA-5875

Co-Authored-By: nallath <nallath@gmail.com>
 2018-11-16 14:04:33 +01:00
Ghostkeeper
81b6f3ab11
Update unclear qml ID's 
CURA-5785

Co-Authored-By: nallath <nallath@gmail.com>
 2018-11-16 14:03:39 +01:00
Ghostkeeper
de020b4c75
Remove commented out code 
Co-Authored-By: nallath <nallath@gmail.com>
 2018-11-16 14:02:00 +01:00
Ghostkeeper
e3dd5f1c39
Add documentation about qml z fix 
Co-Authored-By: nallath <nallath@gmail.com>
 2018-11-16 13:59:51 +01:00
Jaime van Kessel
93bd5fee53 Fix wrong push free shadow for one at a time. 
It was applying the size twice. CURA-5822
 2018-11-16 13:44:46 +01:00
Jaime van Kessel
240ac1f06b Clarify some setting descriptions 2018-11-16 13:03:45 +01:00
Ghostkeeper
bee563f01b
Merge branch 'ui_rework_4_0' into CURA-5785-Restyle_stage_menu 2018-11-16 13:02:24 +01:00
Jaime van Kessel
401a6b5f8b
Merge pull request #4794 from fieldOfView/fix_adhesion_type_error 
Fix adhesion type error during startup
 2018-11-16 11:24:29 +01:00
Aleksei S
846d608a03 Merge branch 'master' of github.com:Ultimaker/Cura 2018-11-15 15:59:00 +01:00