3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-07-17 11:47:50 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 6
25644 commits 305 branches 270 tags 779 MiB
Commit graph

7988 commits

Author SHA1 Message Date
Daniel Schiavini
134f97d5f1 STAR-322: Finishing the output device manager tests 2018-12-10 11:30:02 +01:00
Jaime van Kessel
82322d8575 Show that a downloaded plugin has a user rating or not 
CURA-6013
 2018-12-10 11:12:25 +01:00
Jaime van Kessel
99f0e96131 Ensure that the local model is updated correctly on local vote 
CURA-6013
 2018-12-10 11:01:55 +01:00
Daniel Schiavini
bfe04a55f9 Merge branch 'ui_rework_4_0' of github.com:Ultimaker/Cura into STAR-322_cloud-connection 2018-12-10 10:45:37 +01:00
Daniel Schiavini
75c2e25a01 STAR-322: Testing more of the device manager 2018-12-10 10:43:22 +01:00
Jaime van Kessel
098adc45ff Move the rating logic outside of the rating widget 
That way it's easier to re-use the component if that's ever required.

CURA-6013
 2018-12-10 10:40:54 +01:00
Jaime van Kessel
04f3601c27 Ensure that local votes are displayed right away 
So even before an update is received, ensure that the data is updated

CURA-6013
 2018-12-10 09:54:26 +01:00
Daniel Schiavini
c495ade2d3 STAR-322: Documenting the network manager mock 2018-12-10 09:42:26 +01:00
Daniel Schiavini
45f51c3588 STAR-322: First test cloud output device manager 2018-12-07 18:09:20 +01:00
Daniel Schiavini
e0b159e2ad STAR-322: Creating a network manager mock 2018-12-07 17:46:35 +01:00
Jaime van Kessel
e92bd01fb2 Removed the rating from the download grid 
It felt a bit weird to already have it in the grid layout

CURA-6013
 2018-12-07 17:28:42 +01:00
Daniel Schiavini
63c5b77959 STAR-322: Fixing finished jobs 2018-12-07 16:43:53 +01:00
Marijn Deé
74028c4fa1 Merge branch 'STAR-322_cloud-connection' of github.com:Ultimaker/Cura into STAR-322_cloud-connection 2018-12-07 16:21:38 +01:00
Marijn Deé
07801b5394 First test for CloudDevices 2018-12-07 16:21:08 +01:00
Jaime van Kessel
50099ab753 Make a few missed items themeable as well 
CURA-6013
 2018-12-07 16:02:21 +01:00
Jaime van Kessel
4742db6fec Cleanup gridTile 
CURA-6013
 2018-12-07 15:57:52 +01:00
Jaime van Kessel
fed9e2b623 Move the click area of the download tile to just the icon 
CURA-6013
 2018-12-07 15:42:46 +01:00
Jaime van Kessel
8b25e6946a Prevent attempting to rate when not logged in 
CURA-6013
 2018-12-07 15:33:44 +01:00
Jaime van Kessel
f4220da550 Adds rough first version of rating stars 
It's not fully polished just yet

CURA-6013
 2018-12-07 15:31:33 +01:00
Daniel Schiavini
5b963de2ea STAR-322: Checking if response changed before updating cluster 2018-12-07 13:19:45 +01:00
Diego Prado Gesto
46fa33fda5 Merge branch 'ui_rework_4_0' into place_print_info_back 2018-12-07 13:19:19 +01:00
Diego Prado Gesto
9c873faace Merge branch 'ui_rework_4_0' into place_print_info_back 2018-12-07 13:11:15 +01:00
Daniel Schiavini
2b8358fda8 STAR-322: Improvements to date calculation and signalling 2018-12-07 12:39:37 +01:00
Diego Prado Gesto
1d33fe081f Clean up the code 
Remove all the references to the sidebar and use the term print_setup instead.

Contributes to CURA-5941.
 2018-12-07 12:07:41 +01:00
Daniel Schiavini
4f82a2759a STAR-322: Improving configuration models interface 2018-12-07 12:04:02 +01:00
Jaime van Kessel
ab8a2a9b2b Merge branch 'ui_rework_4_0' of github.com:Ultimaker/Cura into CURA-6006-login-required 2018-12-07 10:51:48 +01:00
Daniel Schiavini
a1c252d3a2 Revert "Revert "fix merge conflict"" 
This reverts commit 4bffa6d90f.
 2018-12-07 10:25:46 +01:00
Daniel Schiavini
4bffa6d90f Revert "fix merge conflict" 
This reverts commit ec03b012a7, reversing
changes made to 2af33738d1.
 2018-12-07 10:22:32 +01:00
Jaime van Kessel
eaf413997d Changed the installed button to be a secondary button 
CURA-6006
 2018-12-07 09:44:09 +01:00
Jaime van Kessel
9eb09132d6 Fix minor layout issue installed page 
CURA-6006
 2018-12-07 09:38:02 +01:00
Jaime van Kessel
b33ce7a50f Fix alignment of download grid tile 
CURA-6006
 2018-12-07 09:35:08 +01:00
Jaime van Kessel
eddf4e7f3d Simplify QML 2018-12-06 19:38:12 +01:00
Jaime van Kessel
d4a255c9e5 Also add the login required label at the installed plugin list 
CURA-6006
 2018-12-06 17:35:58 +01:00
Jaime van Kessel
2c9c9d8c96 Handle non-happy path for downloading 
CURA-6006
 2018-12-06 17:23:02 +01:00
ChrisTerBeke
3ebefa4f8a Add more TODO comments to clarify 2018-12-06 16:59:09 +01:00
Jaime van Kessel
717fb260c1 Change toolbox tabs to controls2 
CURA-6006
 2018-12-06 16:58:40 +01:00
ChrisTerBeke
ec03b012a7 fix merge conflict 2018-12-06 16:39:58 +01:00
Jaime van Kessel
4b8e3c32cb Also show the login required if an update is needed 
CURA-6006
 2018-12-06 16:37:47 +01:00
Diego Prado Gesto
3b8b70bddf Merge branch 'ui_rework_4_0' into CURA-5941_restyle_setting_dropdown 2018-12-06 16:35:07 +01:00
Marijn Deé
2af33738d1 Don't look at the timer 2018-12-06 16:32:00 +01:00
Marijn Deé
373c953dbf Showing print queue, works with multiple printers in cluster, Add TODO 2018-12-06 16:25:04 +01:00
Jaime van Kessel
4e2ab163ed Add login fequired link to packages that have the login-required tag 
CURA-6006
 2018-12-06 16:24:12 +01:00
alekseisasin
e29baf0cec
Merge pull request #4943 from Ultimaker/small_ui_fixes 
Small ui fixes
 2018-12-06 15:23:35 +01:00
Jaime van Kessel
62c5398933 Change buttons to use either secondary or primary 
CURA-6006
 2018-12-06 14:58:46 +01:00
Jaime van Kessel
a77ad32999 Move all the seperate tiles into loaders instead of the entire page 
Otherwise the details selection didn't work anymore and I didn't want to add more hacks.

CURA-6006
 2018-12-06 14:35:07 +01:00
Diego Prado Gesto
3ca749cdcb Add a bunch of renderTypes to labels in the DiscoverUM3Action. 2018-12-06 14:31:52 +01:00
Jaime van Kessel
54def4edee Revert "Moved qml pages of toolbox to a loader" 
This reverts commit 838949dac7.
 2018-12-06 14:12:35 +01:00
Marijn Deé
05ca0b372a Updated TODO, printjobs are not displayed in the monitor page because 
data returned from cura connect api contains None's instead of printer
uuid's
 2018-12-06 14:04:12 +01:00
Diego Prado Gesto
76acb13f59 Change the play/pause button colors 2018-12-06 13:50:58 +01:00
Jaime van Kessel
2602d5bf02 Add changed checks to prevent unneeded signals from being fired 
CURA-6006
 2018-12-06 10:46:19 +01:00