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

18800 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
b7ea075fa9 Merge branch 'fix_toolbutton_style' of github.com:Ultimaker/Cura into 4.0 2018-12-13 13:26:35 +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
Jaime van Kessel
0a6c1a7c14 Fix CLIENT_ID (again) 
It got messed up in a merge again. Ugh.
 2018-12-13 13:12:57 +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
ChrisTerBeke
f72b58386b Also use CuraConstants for account API root 2018-12-13 11:46:11 +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
e7fe7571aa Change the behaviour of the output device selector 
Now the behavior is the following:
- The active output device is the one that shows up in the button (same as before)
- The list of the output devices don't show the active device
- When clicking in one item of the list, it becomes the active output and automatically it performs the action.

Contributes to CURA-6026.
 2018-12-13 09:02:14 +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
Jaime van Kessel
880526749e Merge branch '4.0' of github.com:Ultimaker/Cura 2018-12-12 17:39:57 +01:00
Daniel Schiavini
fed779d0d2 STAR-322: Implementing multi-part upload (doesnt always work) 2018-12-12 17:31:08 +01:00
Diego Prado Gesto
a1d7fa893d Change the style for the toolbuttons that appear in the popup panel of some tools 
Contributes to CURA-6024
 2018-12-12 17:26:13 +01:00
Diego Prado Gesto
f38f140430 Merge branch '4.0' into CURA-5876_fixes 2018-12-12 17:06:59 +01:00
Diego Prado Gesto
17173aba06 Add a component to show when no configurations are available because lack of connection. 
Contributes to CURA-5876.
 2018-12-12 17:04:17 +01:00
Diego Prado Gesto
1d3da3244f Remember the previous selected method in the configuration 
The current behavior now is to open the configuration panel in the previous state, in case it was manually selected. That means that after selecting a printer, the manual state is reset so it will open the auto configuration if it is a connected printer. It will open the custom state in case it's not connected or the printer has no connection.

Contributes to CURA-5876.
 2018-12-12 14:09:15 +01:00
ChrisTerBeke
6150bd665a Merge branch 'master' into STAR-322_cloud-connection 2018-12-12 14:04:59 +01:00
Diego Prado Gesto
4ba448077e Add an empty state, when there are no configurations, showing a label indicating that the list is empty 
Contributes to CURA-5876.
 2018-12-12 13:33:46 +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
Diego Prado Gesto
b1244b6bde Remove file MonitorSidebar 
It's not used anymore.

Contributes to CURA-5876.
 2018-12-12 11:22:35 +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
Diego Prado Gesto
a6a16a682d Fix some alignments 
Also modify a bit the code in the ConfigurationItem, trying to get rid of a binding loop, but I couldn't (so weird)

Contributes to CURA-5876.
 2018-12-12 11:17:44 +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
Diego Prado Gesto
31331e36d2 Revert "Use the capitalized version of the buildplate name" 
This reverts commit 11d8831d7a.

Contributes to CURA-6021.
 2018-12-12 10:41:01 +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
Diego Prado Gesto
0b6841e5d9 Revert "Use the capitalized version of the buildplate name" 
This reverts commit 11d8831d7a.

Contributes to CURA-6021.
 2018-12-12 09:20:35 +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
Remco Burema
b413b4cdb6 Correct a typo in typing. [CURA-6016] 2018-12-11 17:21:14 +01:00
Diego Prado Gesto
ed8292c472 Adjust size and margins of the icon in the action button 
Contributes to CURA-5876.
 2018-12-11 17:00:02 +01:00
ChrisTerBeke
47c6321e27 Merge branch 'master' into STAR-322_cloud-connection 2018-12-11 16:59:47 +01:00
Simon Edwards
f6935ee08b
Merge pull request #4971 from Ultimaker/CL-1173_use_short_printer_family_tags 
CL-1173 Use short printer family tags
 2018-12-11 16:52:55 +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
Diego Prado Gesto
f99c788eb6 Change some colors for the arrows in some setting selectors 
Contributes to CURA-5876.
 2018-12-11 16:35:59 +01:00
Diego Prado Gesto
b993a7b0d9 Change the header color and font in the configuration popup 
Also fix some alignments with the printer type selector.

Contributes to CURA-5876.
 2018-12-11 16:05:24 +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
ChrisTerBeke
64dc73aed3 remove incorrect __init__.py 2018-12-11 15:47:57 +01:00
ChrisTerBeke
21a0517d79 Merge branch 'master' into STAR-322_cloud-connection 2018-12-11 15:22:18 +01:00