GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-05-11 15:49:00 +08:00
Code Issues Packages Projects Releases Wiki Activity
17,119 Commits 290 Branches 260 Tags
Commit Graph

17119 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Marijn Deé
7e3f86f091 Moved some of the mocks to class level because they are used in every test method 2018-11-22 09:37:47 +01:00
Jaime van Kessel
a9f0402f63 Made size of viewselector themable 
CURA-5785
 2018-11-22 09:37:36 +01:00
Diego Prado Gesto
3434b30ee0 Merge branch 'CURA-5785-Restyle_stage_menu' into CURA-5942_printer_selector 2018-11-21 17:08:15 +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
fe7d1825d4 Add styling to the buttons in the printer list. 
Contributes to CURA-5942.
 2018-11-21 16:54:57 +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
Diego Prado Gesto
406fac9e60 Remove duplicate entries of renderType. 
Contributes to CURA-5942.
 2018-11-21 13:38:08 +01:00
Jaime van Kessel
c7dbaa3a00 Add rendertype for labels in quickConfigurationSelector 
CURA-5785
 2018-11-21 13:22:03 +01:00
Diego Prado Gesto
7c9cd75cf9 Merge branch 'CURA-5785-Restyle_stage_menu' into CURA-5942_printer_selector 2018-11-21 13:19:23 +01:00
Jaime van Kessel
bd636e61a0 Minor changes suggested in review 
CURA-5785
 2018-11-21 13:17:36 +01:00
Aleksei S
bfd8e66657 Removed margins and unused arches 
CURA-5941
 2018-11-21 12:50:18 +01:00
Diego Prado Gesto
4772972145 Merge branch 'CURA-5785-Restyle_stage_menu' into CURA-5942_printer_selector 2018-11-21 12:18:51 +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
Diego Prado Gesto
64bbab9d40 Use the group name to show in the printer list if it's a network 
connected printer.

Contributes to CURA-5942.
 2018-11-21 11:50:00 +01:00
Diego Prado Gesto
de650300e2 Add the buttons to add printer and manage printers in the bottom of the 
print selector panel.

Contributes to CURA-5942.
 2018-11-21 11:43:20 +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
Diego Prado Gesto
8e47d04756 Adjust sizes and alignments to the print selector panel. 
Contributes to CURA-5942.
 2018-11-21 11:12:59 +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
Marijn Deé
7b0f8882a2 Reverted models to namedtuples from collections because 
NamedTuple is a Python3.6 feature
 2018-11-21 11:01:26 +01:00
Marijn Deé
9e8be286af Used NamedTuple from typing iso namedtuple from collections so we can at least give type hints 2018-11-21 10:12:53 +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
Diego Prado Gesto
23744e42d1 Remove SaveButton file, since it's not used anymore. 
Contributes to CURA-5942
 2018-11-21 09:15:18 +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
Aleksei S
4bccd2b7b5 Restyle printer settings dropdown 
CURA-5941
 2018-11-20 23:46:03 +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
ChrisTerBeke
c1c3f3abf3
Merge branch 'master' into tests-for-um3networkplugin 
* master:
  Fix the title's top margin size in the add machine dialog.
  Use generated Makefiles to run tests
  Add option test-verbose build option to CuraTests
 2018-11-20 18:59:31 +01:00
Marijn Deé
f3338aa187 Fixed the failing tests 2018-11-20 16:53:01 +01:00
Marijn Deé
ca60744292 Made the tests work with the named tuples 
Tests only use the _onGetRemoteMaterial
 2018-11-20 16:34:11 +01:00
Marijn Deé
481ca8cd2f Fixed some bugs and added the color_code field to the named tuple 2018-11-20 16:33:52 +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
ChrisTerBeke
1c5adb5a72 Merge branch 'master' into tests-for-um3networkplugin 2018-11-19 17:03:37 +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
ChrisTerBeke
2497325d60 Test with named tuples, not working yet 2018-11-19 16:35:19 +01:00