3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-07-18 04:07:57 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 7
17030 commits 305 branches 270 tags 779 MiB
Commit graph

7343 commits

Author SHA1 Message Date
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
Lipu Fei
73de720947 Change material diameter to 1.75 for monoprice machines 
CURA-5817
 2018-10-15 09:27:55 +02:00
Ghostkeeper
e747219bbe
Let Makerbot Replicator use Replicator's X3G variant 2018-10-15 01:30:36 +02:00
Remco Burema
2e3abbc904 Put the firmware-update meta-data in the 'normal' printer definitions and make the code handle that. 2018-10-13 21:55:33 +02:00
Ghostkeeper
9e4fcd820e
Update outputDevice when the global container changed 
And directly link the active printer name to it, so that that also gets updated. With the property var it just gets evaluated upon creating the rectangle.

Contributes to issue CURA-5749.
 2018-10-12 14:56:27 +02:00
Jaime van Kessel
11a08d0e47 Move whole bunch of QML components to their new locations 
The tooltips are still not working correctly, it might be that it needs rework

CURA-5772
 2018-10-12 13:32:23 +02:00
Jaime van Kessel
10de312647 Added QMLDIR so we can specify cura specific QML components for plugins 
This ensures that we can be way more explicit with what QML components we see as re-usable

CURA-5772
 2018-10-12 13:28:08 +02:00
Jaime van Kessel
6ea03d27a4 Merge branch 'cura4.0_header' of github.com:Ultimaker/Cura into cura4.0_header 2018-10-12 13:26:53 +02:00
Ghostkeeper
3c626453a6
Fix spelling 2018-10-12 11:28:30 +02:00
Tim Kuipers
ad80ea6dd4 fix: limit to extruder of top/bottom polygon connector 2018-10-12 11:16:24 +02:00
Ghostkeeper
7c6970bec3
Merge branch 'feature_firmware_updater' of https://github.com/fieldOfView/Cura into fieldOfView-feature_firmware_updater 2018-10-11 16:42:11 +02:00
Ghostkeeper
bb75821599
Fix some code style 
Contributes to issue CURA-5784.
 2018-10-11 15:29:28 +02:00
Jaime van Kessel
9ab0fdfb68 Move most of the sidebarHeader items to materialAndVariantSelector 
CURA-5772
 2018-10-11 15:05:40 +02:00
Jaime van Kessel
a861b88de1 Move most of the sidebarHeader items to materialAndVariantSelector 
CURA-5772
 2018-10-11 15:03:37 +02:00
Jaime van Kessel
f18d490ca1 Move extruderIcon to it's own location 
This also simplifies the qml that actually handles the display

CURA-5772
 2018-10-11 13:08:57 +02:00
Jaime van Kessel
cc6d5617ee Update documentation & typing 
CURA-5772
 2018-10-11 10:41:29 +02:00
Jaime van Kessel
4743bd8bd5 Merge branch 'cura4.0_header' of github.com:Ultimaker/Cura into cura4.0_header 2018-10-11 10:30:51 +02:00
Jaime van Kessel
85436c1469 Move machine selector to own component & new location 
This also simplifies & cleans up the actually used QML

CURA-5772
 2018-10-11 10:29:59 +02:00
Diego Prado Gesto
d49a4f1179 Merge branch 'cura4.0_header' of github.com:Ultimaker/Cura into cura4.0_header 2018-10-10 16:36:11 +02:00
Diego Prado Gesto
5befc0b256 Restyle the dropdown of the accounts, with information about the user 
and available operations that can be done when the user is logged in or
not.

Contributes to CURA-5784.
 2018-10-10 16:34:55 +02:00
Jaime van Kessel
1ed3558b9a Move ViewOrientationControl to lower left corner 
This also renames the component to better reflect what it is (the old name implied that it
had something to do with orientation views, wheres it's actually a set of controls to change orientation)

CURA-5772
 2018-10-10 14:21:09 +02:00
Ghostkeeper
b37252f124
Minor code style fixes 
Contributes to issue CURA-5734.
 2018-10-10 14:18:37 +02:00
Jaime van Kessel
b3fc76092d Removed unused EngineLog 2018-10-10 14:01:34 +02:00
Diego Prado Gesto
b89c220a4d Add linings between tabs in the top header. 
Contributes to CURA-5784.
 2018-10-10 11:17:09 +02:00
Diego Prado Gesto
0df7fa1a6c Add style to the top header tabs. 
Contributes to CURA-5784.
 2018-10-10 11:04:08 +02:00
Lipu Fei
01d95f51c8 Fix prime blob enabled for S5 
Still need that enabled = true...
 2018-10-10 09:34:30 +02:00
Lipu Fei
6d852228e3
Update ultimaker_s5.def.json 2018-10-10 09:29:42 +02:00
THeijmans
d3101b2fd9 Fixed prim blob visibility 
Changed the wrong prime_blob setting, now it should be visible but disabled.
 2018-10-10 09:26:16 +02:00