3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-07-08 23:46:22 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 6
18800 commits 302 branches 270 tags 770 MiB
Commit graph

5880 commits

Author SHA1 Message Date
ChrisTerBeke
e1f95c6ec1 Merge branch 'master' into STAR-322_cloud-connection 2018-12-14 09:24:56 +01:00
Ghostkeeper
bb45680b98
Merge branch '4.0' 2018-12-13 16:49:57 +01:00
Ghostkeeper
3f3cd5e334
Remove broken load of PrepareSidebar.qml 
This file no longer exists. Loading it gives a warning.
 2018-12-13 16:32:49 +01:00
Aleksei S
973970a895 Every print ouput device should define its connection type(usb, network, cluster and etc) 
CURA-6011
 2018-12-13 16:00:12 +01:00
Lipu Fei
3225512851 Fix typing 
CURA-6013
 2018-12-13 15:48:06 +01:00
Lipu Fei
17c93dea80 Fix merge conflicts with 4.0 2018-12-13 14:39:28 +01:00
Diego Prado Gesto
aa2fa371c4 Merge branch '4.0' of github.com:Ultimaker/Cura into 4.0 2018-12-13 14:32:28 +01:00
Diego Prado Gesto
17f0c12858 Make the middle component to have zero width if there is no component to 
fill the gap.

Contributes to CURA-6020.
 2018-12-13 14:31:34 +01:00
Lipu Fei
620790ae3d Reduce the creations of ExtrudersModels 
CURA-6015
 2018-12-13 14:12:23 +01:00
Lipu Fei
2cf80b4578 Remove unused simpleNames flag 
CURA-6015
 2018-12-13 14:12:04 +01:00
ChrisTerBeke
518d7fac51 Fix merge conflict 2018-12-13 13:44:33 +01:00
Jaime van Kessel
b64882bb1e Merge branch 'quit_cura_button' of github.com:Ultimaker/Cura into 4.0 2018-12-13 13:23:47 +01:00
ChrisTerBeke
819f8531a2 Use CuraConstants for Cloud printing API root 2018-12-13 11:54:10 +01:00
ChrisTerBeke
36f5150d94 Fix merge conflict 2018-12-13 11:48:35 +01:00
Diego Prado Gesto
121af7ad60 Reuse the primary button in the toolbox for the "Quit Cura" button 2018-12-13 09:41:07 +01:00
Diego Prado Gesto
635115a879
Merge pull request #4982 from Ultimaker/fix_preview_stage_menu 
Fix preview stage menu
 2018-12-13 09:32:01 +01:00
Diego Prado Gesto
77ede1ae6b Unify the fonts to only have 8 instead of 13. 
Contributes to CURA-6025.
 2018-12-12 17:50:21 +01:00
Daniel Schiavini
fed779d0d2 STAR-322: Implementing multi-part upload (doesnt always work) 2018-12-12 17:31:08 +01:00
ChrisTerBeke
6150bd665a Merge branch 'master' into STAR-322_cloud-connection 2018-12-12 14:04:59 +01:00
Lipu Fei
b6ea61612e Fix merge conflicts 2018-12-12 13:26:01 +01:00
Jaime van Kessel
901c19e270 Prevent QML warning 
CURA-6013
 2018-12-12 11:52:04 +01:00
Jaime van Kessel
e30ca20c54 Merge branch '4.0' of github.com:Ultimaker/Cura into CURA-6013-rate-packages 2018-12-12 11:50:26 +01:00
Jaime van Kessel
dbf91fca7f Re-added hover on showcase tiles 
CURA-6013
 2018-12-12 11:40:51 +01:00
alekseisasin
a505adbf40
Merge pull request #4945 from Ultimaker/CURA-6006-login-required 
[4.0] CURA-6006 login required
 2018-12-12 11:31:38 +01:00
alekseisasin
64104e47c6
Merge pull request #4970 from Ultimaker/fix_preview_stage_menu 
Fix preview stage menu
 2018-12-12 11:22:08 +01:00
Jaime van Kessel
5fd0f2b5f6 Add tooltip to rating if the rating is disabled 
This makes it clearer what the user needs to do in order to rate (install package or login)

CURA-6013
 2018-12-12 11:09:58 +01:00
Remco Burema
1b2ef91c13 Merge branch 'CURA-6016_Improve_UI_Speed' into 4.0 2018-12-12 10:54:36 +01:00
Lipu Fei
a6663ea0e8 Fix typing issues 
CURA-6005
 2018-12-12 10:51:13 +01:00
Lipu Fei
f302a76d3a Fix typing issue in Toolbox 
CURA-6006
 2018-12-12 10:47:18 +01:00
Jaime van Kessel
95f70a75d8 Ensure that package name has margins in showcase tile 
CURA-6013
 2018-12-12 10:39:56 +01:00
Lipu Fei
8c07a6e89b Fix typing issues 
CURA-6005
 2018-12-12 10:35:39 +01:00
Jaime van Kessel
a6dbba7090 Minor UI tweaks 
CURA-6013
 2018-12-12 09:41:35 +01:00
Jaime van Kessel
4d57aa8ea4 Simplify the rating widget 
CURA-6013
 2018-12-12 09:28:15 +01:00
Remco Burema
65f1c9a304
Merge pull request #4969 from Ultimaker/CURA-6016_Improve_UI_Speed 
Cura 6016 improve ui speed
 2018-12-11 17:26:15 +01:00
ChrisTerBeke
47c6321e27 Merge branch 'master' into STAR-322_cloud-connection 2018-12-11 16:59:47 +01:00
Ian Paschal
1ababf38ad Use full printer name if no tag is known 
Contributes to CL-1173
 2018-12-11 16:42:44 +01:00
Daniel Schiavini
0467756ed6 STAR-322: Adding return type to init method 2018-12-11 16:01:52 +01:00
Ian Paschal
daeb86bdb1 Use short printer family tags 
Contributes to CL-1173
 2018-12-11 15:55:03 +01:00
Diego Prado Gesto
c804610fa6 Make the stage menu in the preview using 85 percent of the total width in order to prevent the print setup panel to be in the middle 2018-12-11 15:19:40 +01:00
Jaime van Kessel
fcaa23ed0a Added smallRating widget to featured plugins 
CURA-6013
 2018-12-11 15:16:21 +01:00
Diego Prado Gesto
742fc34e75 Change labels in the layer view legend 2018-12-11 14:31:12 +01:00
Daniel Schiavini
f04db63594 Merge branch 'STAR-322_cloud-connection' of github.com:Ultimaker/Cura into STAR-322_cloud-connection 2018-12-11 14:28:07 +01:00
Daniel Schiavini
a5d8e6ceb8 STAR-322: Removing the print job after it was done 2018-12-11 14:28:00 +01:00
Jaime van Kessel
7a5701b001 Made smallrating widget re-usable 
Also added it to the details page

CURA-6013
 2018-12-11 14:12:34 +01:00
Diego Prado Gesto
db56aa028c Change the swatch from a circle to the extruder icon 2018-12-11 13:59:36 +01:00
Diego Prado Gesto
faa3f42acc Modify the header in the simulation view menu component 
This is needed to align with the designs.
 2018-12-11 13:53:05 +01:00
Jaime van Kessel
30057e2fcd Use user_rating instead of user 
In the end it was implemented as user_rating (and not as user)

CURA-6013
 2018-12-11 13:49:45 +01:00
Jaime van Kessel
4baf0d1bdb Always show average rating 
CURA-6013
 2018-12-11 13:49:20 +01:00
Jaime van Kessel
75ff03f3c8 Use setState instead of emitting the backend state 
CURA-6016
 2018-12-11 13:13:20 +01:00
ChrisTerBeke
7b7c687db7 Remove dismissable = False from messages as it's the default 2018-12-11 12:46:05 +01:00