3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-07-24 23:23:57 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 9
16836 commits 307 branches 272 tags 787 MiB
Commit graph

16836 commits

This branch
This branch
All branches
Author SHA1 Message Date
Jaime van Kessel
1fe6501358 Removed unused entries from theme 2018-11-26 13:35:41 +01:00
Jaime van Kessel
098714254d Remove unused code 
CURA-5959
 2018-11-26 13:35:02 +01:00
Jaime van Kessel
eea6490e75 Hover of output device now spans the popup 
CURA-5959
 2018-11-26 13:27:26 +01:00
Diego Prado Gesto
5397cda2b4 Add a label to the action panel when auto slice is ON, indicating that the process runs automatically. 
Contributes to CURA-5942.
 2018-11-26 12:00:06 +01:00
Jaime van Kessel
09af7a9435 Slice button will now be disabled on error 
CURA-5959
 2018-11-26 09:34:27 +01:00
Jaime van Kessel
b82ea58bc8 Changed all the action buttons to either use primary or secondary button 
CURA-5959
 2018-11-23 18:07:50 +01:00
Jaime van Kessel
af1ee53578 Fix the hover effect of action button 
CURA-5959
 2018-11-23 17:41:58 +01:00
Jaime van Kessel
e1f3e07f04 Changed Marketplace button to no longer use the action button 
The actionButton is weirdly named and overly used. That being said, the marketplace button is unique, so
there is little sense in re-using it
 2018-11-23 17:11:20 +01:00
Jaime van Kessel
1a8df9e10e Removed blue border if slicing is not possible 
CURA-5959
 2018-11-23 11:46:38 +01:00
Jaime van Kessel
3ba4b9fd81 Add shadows to various used actionbuttons 
CURA-5959
 2018-11-23 11:20:53 +01:00
Jaime van Kessel
a71e75508c Merge branch 'ui_rework_4_0' of github.com:Ultimaker/Cura into CURA-5959-action-panel-ui-fixes 2018-11-23 11:00:11 +01:00
Diego Prado Gesto
81c776213a Merge branch 'master' into ui_rework_4_0 2018-11-22 16:11:06 +01:00
Jaime van Kessel
3f4d379908 Added shadow to slice button 
CURA-5959
 2018-11-22 15:35:40 +01:00
Simon Edwards
ee7355c2bb
Merge pull request #4841 from Ultimaker/CL-1148_restyling_monitor_queue_tiles 
CL-1148 Re-styling monitor queue tiles
 2018-11-22 15:08:42 +01:00
Ian Paschal
963b8aa974 Fix QML warnings 
Contributes to CL-1148
 2018-11-22 13:56:01 +01:00
Ian Paschal
55554c62a9 Use array for extruder configurations 
Contributes to CL-1148
 2018-11-22 13:55:43 +01:00
Ian Paschal
da834d6a1f Silence binding loop 
Contributes to CL-1148
 2018-11-22 13:55:22 +01:00
Jaime van Kessel
a1613c7f81 Set the variable types of the Action button to the right kind. 
Because of boyscouting; these must be colors (and not generic vars)
 2018-11-22 13:53:27 +01:00
Ian Paschal
1de21c1d94 Remove unnecessary "else" 
Contributes to CL-1148
 2018-11-22 13:13:06 +01:00
Ian Paschal
3c3343a407 Use bool for expanded or collapsed state 
Contributes to CL-1148
 2018-11-22 13:11:59 +01:00
alekseisasin
b091e3a52c
Merge pull request #4854 from Ultimaker/fix_version_upgrade_returning_none 
Fix version upgrade returning none
 2018-11-22 11:44:36 +01:00
Aleksei S
088b2f6f28 Added an extra import module, did not pass coding style test 
CURA-5936
 2018-11-22 11:36:32 +01:00
Aleksei S
c765615f1a Merge branch 'master' into fix_version_upgrade_returning_none 2018-11-22 11:17:44 +01:00
Ian Paschal
ba7863c9d9 Fix type error for hovering manage queue link 
Contributes to CL-1148
 2018-11-22 11:09:35 +01:00
Jaime van Kessel
bf8a04fa40 Fix some minor display issues for simulation view 
CURA-5785
 2018-11-22 11:08:46 +01:00
Jaime van Kessel
d4e4e50741 Fix typo 2018-11-22 10:55:53 +01:00
Jaime van Kessel
7a8522ce72 Merge branch 'CURA-5785-Restyle_stage_menu' of github.com:Ultimaker/Cura into CURA-5785-Restyle_stage_menu 2018-11-22 09:38:06 +01:00
Jaime van Kessel
a9f0402f63 Made size of viewselector themable 
CURA-5785
 2018-11-22 09:37:36 +01:00
Diego Prado Gesto
cbee18597e Merge branch 'ui_rework_4_0' into CURA-5785-Restyle_stage_menu 2018-11-21 16:59:03 +01:00
Diego Prado Gesto
f866390c7b Fix an issue in the action panel. 
When the panel is created while the user is in the preview stage, the
row has no width.

Contributes to CURA-5786.
 2018-11-21 16:56:25 +01:00
Diego Prado Gesto
a1f3ebc25b Fix typo. 
Contributes to CURA-5785.
 2018-11-21 13:58:21 +01:00
Jaime van Kessel
a9672458fd Update extruderIcon to be more in line with the design 
CURA-5785
 2018-11-21 13:46:50 +01:00
Jaime van Kessel
c7dbaa3a00 Add rendertype for labels in quickConfigurationSelector 
CURA-5785
 2018-11-21 13:22:03 +01:00
Jaime van Kessel
bd636e61a0 Minor changes suggested in review 
CURA-5785
 2018-11-21 13:17:36 +01:00
Jaime van Kessel
eef6ad662d Added enum for the roundedCorner property 
This makes it a whole lot easier to read what is being set.

CURA-5785
 2018-11-21 11:50:39 +01:00
Jaime van Kessel
b826a42026 Add the RoundedRectangle as background to the ExpandableComponent 
This way the expandable components can have rounded corners only on one side,
thus preventing the need to do add backgrounds to the rows that they are in.

CURA-5785
 2018-11-21 11:37:58 +01:00
Lipu Fei
0e17e54420
Merge pull request #4842 from Ultimaker/improve_toolbar_styling 
Improve the toolbar style
 2018-11-21 11:09:13 +01:00
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 791929d689.
 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 4caf770a62, reversing
changes made to 0cdcd61ff2.
 2018-11-20 23:47:46 +01:00
ChrisTerBeke
8b085aa877
Revert "Switch Ultimaker Account OAuth2 client" 
This reverts commit 4e8979334e.
 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