GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-07-05 22:15:14 +08:00
Code Issues Packages Projects Releases Wiki Activity
17,119 Commits 295 Branches 268 Tags
Commit Graph

17119 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Ghostkeeper
56a383814b
Code style: Spaces around binary operators 
Contributes to issue CURA-5483.
 2018-10-15 14:48:18 +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
f32aadf39c
Merge branch '3.5' 2018-10-15 14:00:59 +02:00
Ghostkeeper
d7a7cf3003
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.
3.5.1 		2018-10-15 14:00:47 +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
Remco Burema
931143ceaa Added FirmwareUpdateCheckerMessage, so no variables have to be hidden in the action of a plain Message. 2018-10-13 20:05:20 +02:00
Remco Burema
8c71a8855c FirmwareUpdateChecker: Remove superfluous 'version_parser' as a setting, since it broke lean principles. 2018-10-13 19:36:11 +02:00
Remco Burema
60408c14bc FirmwareUpdateChecker: Small refactors due to code review. 2018-10-13 19:21:22 +02:00
Ghostkeeper
6cf2e89f6b
Document CameraImageProvider 
Makes it easier than looking up the Qt documentation online.
 2018-10-13 16:40:26 +02:00
Ghostkeeper
1b7055f0f3
Fix spelling of error message 
Loopup -> Lookup.

Contributes to issue CURA-5483.
 2018-10-12 17:03:48 +02:00
Ghostkeeper
e3b05f0867
Code style: Spaces around binary operators 
Also removed the unused machines_json value.

Contributes to issue CURA-5483.
 2018-10-12 16:46:39 +02:00
Ghostkeeper
6ac10db582
Code style: Use double quotes for strings 
Contributes to issue CURA-5483.
 2018-10-12 15:37:43 +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
Ghostkeeper
99fc372b32
Update printer information when switching global container stacks 
This was just evaluated once during the creating of a USB connection. But you can switch out the printer without breaking/making a USB connection, so in that case we have to update it here.

Contributes to issue CURA-5749.
 2018-10-12 14:55:13 +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
7d5472b09f Moved the prepareMenu into the prepare stage plugin 
CURA-5772
 2018-10-12 13:29:57 +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
287689a073
Don't cache the automatic firmware name 
The QML property was not updated when you change the printer. By not caching it, it gets the current printer's firmware file upon clicking the button. Simple and effective, and not that tough on computational power that it needs caching.

Contributes to issue CURA-5749.
 2018-10-12 13:25:34 +02:00
Ghostkeeper
85b835118d
Log which firmware file you're about to upload 
Kind of critical information, really.

Contributes to issue CURA-5749.
 2018-10-12 13:24:09 +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
f7bef851db
Remove code duplication for recreate network timer 2018-10-12 11:09:46 +02:00
Remco Burema
69cef98c30 FirmwareUpdateChecker: Small fixes (typing and lowercase input). 2018-10-12 10:11:46 +02:00
Remco Burema
f2b50c748c Fix typing in the FirmwareUpdateChecker plugin. 2018-10-11 21:54:27 +02:00
fieldOfView
6a50487bf0 Catch the one that got away 2018-10-11 19:16:10 +02:00
Remco Burema
839016d2f3 Merge branch 'master' into CURA-5483_add_s5_to_firmware_checker 2018-10-11 18:25:40 +02:00
Remco Burema
4ecac6e27f Set the right firmware-download-URL in the actual update-firmware-message. 2018-10-11 18:24:07 +02:00
Remco Burema
472d012c08 Move firmware-update-checker json-parsing to its own class (also don't repeat parsing each time). 2018-10-11 17:52:06 +02:00
Remco Burema
6c2791f382 Parse the firmware-update-check lookup-tables from a (new) .json instead of hardcoded. 2018-10-11 17:16:01 +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
Remco Burema
12999f48c8 FirmwareUpdateCheckerJob: Move introduced hardcoded values to static variables. 2018-10-11 15:27:04 +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
Remco Burema
d8ed3d6074 Check the whole list for firmware-updates instead of just the first added container. 2018-10-11 14:56:07 +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