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

8170 commits

Author SHA1 Message Date
Diego Prado Gesto
6f12197cea Don't use an image to create a mask but a circle. 
Contributes to CURA-5772.
 2018-10-19 13:41:32 +02:00
THeijmans
2512800340 Support - Brim interactions 
Enable Support - brims and disable 'brim replaces support' for all support materials.
 2018-10-19 09:25:13 +02:00
Diego Prado Gesto
54f32a1d82 Merge branch 'ui_rework_4_0' into cura4.0_header 2018-10-18 19:33:39 +02:00
Diego Prado Gesto
405e4c5bbd Correct year, we live now in 2018 (keep it in mind) 
Contributes to CURA-5772.
 2018-10-18 17:52:42 +02:00
Diego Prado Gesto
66147f4172 Remove unused style button. 
Contributes to CURA-5772.
 2018-10-18 17:49:56 +02:00
Diego Prado Gesto
176c7bfc22 Small fixes in the CustomConfigurationSelector file 
Contributes to CURA-5772.
 2018-10-18 17:48:03 +02:00
Diego Prado Gesto
bf6817ce7a Reduce the size of the ApplicationMenu.qml file by moving some 
components out to different files.

Contributes to CURA-5772.
 2018-10-18 17:38:23 +02:00
Diego Prado Gesto
84adfa14ee Add license to the top of a file 
Contributes to CURA-5772.
 2018-10-18 17:26:10 +02:00
Diego Prado Gesto
93b04190f8 Change name of some components to make them more indicative of what they 
do.

Contributes to CURA-5772.
 2018-10-18 17:13:15 +02:00
Diego Prado Gesto
8df3eb33d4 Minor changes: remove empty lines, small changes in the anchors, ... 
Contributes to CURA-5772.
 2018-10-18 16:51:32 +02:00
Diego Prado Gesto
1cc7e0e586 Set the height of the stage menu in the theme instead of hardcoded. 
I also adjusted a bit the design to fulfill the requirments from UX/UI
team.

Contributes to CURA-5772.
 2018-10-18 16:33:13 +02:00
Diego Prado Gesto
fdfa81b2b8 Make some items' size dependent on parent's. Also make the ActionButton 
more themable.

Contributes to CURA-5784.
 2018-10-18 16:06:21 +02:00
Diego Prado Gesto
0a07f48375 Fix typo in a theme's key. 
Contributes to CURA-5784.
 2018-10-18 15:38:24 +02:00
Diego Prado Gesto
119638efa1 Adjust outline color for the avatar image. Following the colors in the 
designs.

Contributes to CURA-5784.
 2018-10-18 15:35:21 +02:00
Diego Prado Gesto
b82dacbe19 Merge branch 'cura4.0_header' of github.com:Ultimaker/Cura into cura4.0_header 2018-10-18 15:19:07 +02:00
Diego Prado Gesto
237c360a88 The size of the avatar image is now themed. 
Some other small fixes in the AccountDetails componenent were done.

Contributes to CURA-5784.
 2018-10-18 15:18:00 +02:00
Ghostkeeper
3888d79b34
Merge branch 'CURA-5734-rework-and-unit-test-setting-visibility-preset' 2018-10-18 14:59:41 +02:00
Ghostkeeper
1bcd134f85
Fix code style 
Most stuff here was recently changed. Some of it was where I found a pattern in something that was likely copy-pasted from somewhere else, so I did a global search and replace on that.

Contributes to issue CURA-5784.
 2018-10-18 14:30:33 +02:00
Diego Prado Gesto
a4c609d514 Remove email label from the account widget. 
It's not needed and it's not currently public data that is published
with the user token.

Contributes to CURA-5784.
 2018-10-18 14:28:00 +02:00
Diego Prado Gesto
11693aad36 Change the behaviour of the Popup, that now closes when clicking the 
widget if it is open.

Contributes to CURA-5784.
 2018-10-18 09:51:42 +02:00
Diego Prado Gesto
54554bff89 Adjust colors to work with dark theme. 
Contributes to CURA-5784.
 2018-10-18 09:51:04 +02:00
Diego Prado Gesto
7fb72a1a58 Change Skeleton folder name to MainWindow. 
This folder is intended to store the files that construct the main
window. All the parts. The rest of the components are stored in more
specific folders.

Contributes to CURA-5784.
 2018-10-17 16:13:43 +02:00
Diego Prado Gesto
b670cd82c4 Merge branch 'master' into cura4.0_header 2018-10-17 16:10:45 +02:00
Diego Prado Gesto
f013450195 Merge branch 'master' of github.com:Ultimaker/Cura 2018-10-17 10:52:56 +02:00
Diego Prado Gesto
e9e95b85e7 Remove support_roof_enable to True in Tevo Black Widow quality profiles, 
since the support interface is already enabled.

Fixes #4587.
 2018-10-17 10:51:28 +02:00
Jaime van Kessel
4c5bf3297c Merge branch 'master' of github.com:Ultimaker/Cura into CURA-5734-rework-and-unit-test-setting-visibility-preset 2018-10-17 10:49:29 +02:00
Jaime van Kessel
d086e6fa86 Fix review comments 
CURA-5734
 2018-10-17 10:47:34 +02:00
Jaime van Kessel
304a9e11f3 Moved view selection back into Cura QML 
It didn't make a whole lot of sense for it to be a seperate component, since it's probably going to change in the future

CURA-5772
 2018-10-17 09:50:24 +02:00
Remco Burema
25000e8a6b Fix typo's. [CURA-5760] Feature support brim. 2018-10-16 16:10:30 +02:00
Remco Burema
58490343f7
Merge pull request #4363 from BagelOrb/feat_support_brim 
Feat: support brim
 2018-10-16 16:07:33 +02:00
Diego Prado Gesto
4a0808378b Allow whitespaces in the job name. 
Fixes #4530.
 2018-10-16 13:23:35 +02:00
Ghostkeeper
b5d8c1af6f
Merge branch 'master' into fieldOfView-feature_firmware_updater 
Conflicts:
	cura/PrinterOutput/PrinterOutputModel.py - Bunch of code that was moved.
	plugins/USBPrinting/USBPrinterOutputDevice.py - Collisions with code style fixes.
	plugins/UltimakerMachineActions/UpgradeFirmwareMachineAction.qml - Bunch of code that was moved.
 2018-10-15 16:52:22 +02:00
Jaime van Kessel
553e29b9b8 Fix QML warnings 
CURA-5772
 2018-10-15 15:42:17 +02:00
Ghostkeeper
95f89044c0
Merge branch 'CURA-5483_add_s5_to_firmware_checker' 2018-10-15 15:25:29 +02:00
Jaime van Kessel
2455961ac7 Vertically allign the toolbar 
CURA-5772
 2018-10-15 15:16:28 +02:00
Ghostkeeper
53dc28db89
Change URL of firmware update page for Ultimaker 3 and S5 
I just got word of a new page to read up about the firmware update. Apparently we now have to link to this one.

Contributes to issue CURA-5483.
 2018-10-15 15:12:42 +02:00
Jaime van Kessel
1c70a62df6 Fix typo 
Derp. CURA-5772
 2018-10-15 15:10:50 +02:00
Jaime van Kessel
a7edd893d7 Change the order in which ViewOrientationControls and ProgressAndSaveWidget are drawn. 
This will ensure that if a stage sets a mainComponent that it won't have any other items drawn over it.

CURA-5772
 2018-10-15 15:08:58 +02:00
Jaime van Kessel
a473a46a35 Add a bit more documentation to explain what the elements do 
CURA-5772
 2018-10-15 15:07:46 +02:00
Jaime van Kessel
1e3a9ff57c Removed the expandSidebar action 
Since we don't even have a sidebar anymore, there is no point in expanding it.
 2018-10-15 14:23:42 +02:00
Jaime van Kessel
4e432a5f06 Remove SidebarHeader 
It has been replaced by others, so we don't need it anymore

CURA-5772
 2018-10-15 14:21:03 +02:00
Jaime van Kessel
f6ae19003b The AccountDetails Panel is now an actual popup 
This ensures that it's always visible (previously it was ocluded by the StageMenu)

CURA-5772
 2018-10-15 14:07:30 +02:00
Jaime van Kessel
62c9980438 Move SidebarTooltip so that it's no longer ocluded by other objects 
CURA-5772
 2018-10-15 14:07:01 +02:00
Ghostkeeper
02efd7a1f5
Correct some printers to use 1.75mm filament 
This should fix some underextrusion problems... Hmm.

Sources:
* https://alya3dp.com/pages/teknik-ozellikler
* https://www.creality3d.cn/creality-cr-10-s4-3d-printer-p00098p1.html
* https://www.creality3d.cn/creality-cr-10-s5-3d-printer-p00099p1.html
* https://3dprint.com/3643/german-repraps-neo-3d-printer-now-available-in-the-us-uk/
* https://somosmaker.com/pegasus-impresora-3d/
* http://www.3dmaker.vn/3d-printer-3dmaker-starter/?lang=en# (assuming the filaments they sell on that website are compatible)
* https://makezine.com/product-review/printrbot-play/

I could not find a source for the Deltabot, but got that information from here: https://github.com/Ultimaker/Cura/issues/4573

Contributes to issue CURA-5817.
 2018-10-15 13:55:47 +02:00
Jaime van Kessel
0a1dad92ea Change AvatarImage so it uses aliases instead of properties 
I've changed this because it makes for much cleaner QML

CURA-5772
 2018-10-15 13:41:44 +02:00
Jaime van Kessel
167c6fbb76 Merge branch '3.5' of github.com:Ultimaker/Cura 2018-10-15 11:47:45 +02:00
Jaime van Kessel
d2baef97c4 Fix tooltips for settings 
CURA-5772
 2018-10-15 11:07:03 +02:00
Jaime van Kessel
8cac5e1de2 Removed the components qml dir 
We can consider putting components into their own folder, but we first should have a clear definition of what they are / should be.

CURA-5772
 2018-10-15 10:34:19 +02:00
Jaime van Kessel
fc1faf79f5 Cleanup unused code 
CURA-5772
 2018-10-15 09:52:48 +02:00
Jaime van Kessel
2fce1e433a Fix the tooltips for time estimations 
CURA-5772
 2018-10-15 09:49:08 +02:00