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

17241 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Ghostkeeper
dca286cea5
Give action button a sane default height 
We don't want to give it a default width since that should just adjust to its contents by default, which is fine.

Contributes to issue CURA-5876.
 2018-11-20 14:34:06 +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
Ghostkeeper
a1068a3ef2
Rename action_panel_button theme entry to action_button 
Because it's not just used in the save panel.

Contributes to issue CURA-5876.
 2018-11-20 14:24:09 +01:00
Ghostkeeper
42d73836f4
Move default margin by default to Cura's action buttons 
So we don't have to repeat that every time you create a new button.

Contributes to issue CURA-5876.
 2018-11-20 14:19:55 +01:00
Ghostkeeper
cbd5238738
Don't show custom/auto toggle buttons when not connected 
In order to prevent suddenly switching to the other side when the connection is lost or restored, we only evaluate this upon opening the popup. This way you might be surprised that closing and then opening it can show something else, but it will never surprise you while working on the popup itself as a user.

Contributes to issue CURA-5876.
 2018-11-20 13:55:28 +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
Ghostkeeper
a04db164e6
Make it possible to swap between auto and custom configuration 
We're going to need to make this disappear when the printer is not connected. But that is for later.

Contributes to issue CURA-5876.
 2018-11-19 17:11:51 +01:00
Ghostkeeper
16deeb0951
Remove old QuickConfigurationSelector 
It doesn't exist any more.

Contributes to issue CURA-5876.
 2018-11-19 17:10:29 +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
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
ChrisTerBeke
c04ce7fce8 Use call_count on specific method to be more precise 2018-11-19 15:44:07 +01:00
ChrisTerBeke
60dd130393 Use logException where possible 2018-11-19 15:39:12 +01:00
ChrisTerBeke
66fbadf2de Convert all single quotes to double quotes 2018-11-19 15:37:56 +01:00
ChrisTerBeke
9d8583a3b6 Revert "Fix running tests in plugin using pytest" 
This reverts commit f8f133d2ef92dfabb636eac70b09e681bd4b4d63.
 2018-11-19 15:10:35 +01:00
ChrisTerBeke
d65114bd56 use call_count to assert device was not called 2018-11-19 15:08:58 +01:00
ChrisTerBeke
0b1ac87354 Fix some formatting, cleanup import 2018-11-19 15:03:43 +01:00
Ghostkeeper
00a49fff26
Rename QuickConfigurationSelector to ConfigurationMenu 
This is going to function as our main item for the configuration menu. It contains the part in the top bar and the glue item for the part in the popup.

Contributes to issue CURA-5876.
 2018-11-19 14:39:19 +01:00
Ghostkeeper
7a210087ff
Add header for configuration selector 
It currently always says 'Custom', but we will want to make that dynamic at some point.

Contributes to issue CURA-5876.
 2018-11-19 14:35:34 +01:00
ChrisTerBeke
dc17bd8499 Fix the first tests 2018-11-19 13:54:45 +01:00
Ghostkeeper
30b20b4aa5
Add borders to expandable components 
This adds a lining to all of the drop-downs from the stage menus.

Contributes to issue CURA-5876.
 2018-11-19 13:50:32 +01:00
ChrisTerBeke
f8f133d2ef Fix running tests in plugin using pytest 2018-11-19 13:42:28 +01:00
Lipu Fei
b0f3fedc94 Fix import QtQuick versions to suit Qt 5.10 
CURA-5785
 2018-11-19 13:42:22 +01:00
Dario Minnucci
2f624cc78f Add BIBO2 printer (dual and single extruder settings) 2018-11-19 12:37:57 +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
ChrisTerBeke
951a21ead7 Merge branch 'master' into tests-for-um3networkplugin 2018-11-19 10:58:07 +01:00
ChrisTerBeke
ee9210d8d1 Rewrite tests 2018-11-19 10:57:47 +01:00
ChrisTerBeke
23e957e1c5 Some more refactoring, splitting up methods 2018-11-19 10:44:24 +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
Marijn Deé
22aac7b566 Renamed TestContainerRegistry to ContainerRegistryMock 2018-11-16 16:35:08 +01:00
Marijn Deé
565f009e9b Added comments 2018-11-16 16:34:44 +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
Marijn Deé
1000625d69 Added spaces around all = 2018-11-16 16:07:17 +01:00
Marijn Deé
0062250238 Moved the test to the plugin directory 2018-11-16 16:06:36 +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
Marijn Deé
695d45ffbe Initialize the models with None 2018-11-16 15:54:07 +01:00