Commit graph

3514 commits

Author SHA1 Message Date
Arjen Hiemstra
90ac1c1380 Add support for hotend-specfic overrides to XmlMaterialProfile
Contributes to CURA-339
2016-06-02 08:10:55 +02:00
Arjen Hiemstra
f491405eb1 Use a copy of the metadata for Xml materials
Contributes to CURA-339
2016-06-02 08:10:55 +02:00
Arjen Hiemstra
e0fab7aa11 Add some logging and documentation to XmlMaterialProfile
Contributes to CURA-339
2016-06-02 08:10:55 +02:00
Arjen Hiemstra
803dcdcec7 Stop the Item's hover timer when showing a different tooltip 2016-06-02 08:10:55 +02:00
Arjen Hiemstra
d5aa75f2cf Remove obsolete file 2016-06-02 08:10:55 +02:00
fieldOfView
ed3d01ed7b Add icon to Machine category to squelch some warnings
CURA-1278
2016-06-02 06:38:57 +02:00
fieldOfView
907de8b586 Improve performance of advanced sidebar
Prevent a delegate being loaded when the item is "filtered out" by the model.
CURA-1278
2016-06-02 00:01:08 +02:00
fieldOfView
7d65475bf9 Fix mouseover highlight of checkbox settings
CURA-1278
2016-06-01 23:59:09 +02:00
fieldOfView
12fe6d8fe7 Merge branch 'master' of https://github.com/Ultimaker/Cura 2016-06-01 22:21:32 +02:00
fieldOfView
c6dd9d2c8c Fix codestyle and change faux-"hovered" property mechanism
hovered_ex was a bool property that was set in onEntered and onExited, and has been replaced with an alias to the mouseArea.containsMouse that necessitated the clutch.

CURA-790
2016-06-01 22:21:12 +02:00
fieldOfView
ffa6a0376d Fix typo
Contributes to CURA-1540, CURA-1278
2016-06-01 21:44:56 +02:00
Arjen Hiemstra
49e5b1938a Reduce number of top layer to increase processing speed 2016-06-01 15:45:54 +02:00
Ghostkeeper
faf647dca0
Git ignore resources/firmware
It is also compiled and will only be included by including the cura-binary-data repository. However it is also useful to have this in your testing environment.
2016-06-01 15:14:03 +02:00
Ghostkeeper
0e108f0c04
Document filtering nozzles by extruder better
Contributes to issues CURA-1278 and CURA-351.
2016-06-01 15:12:20 +02:00
Ghostkeeper
91fc90a423
Link extruder stack to global container stack
Each extruder stack is linked to the same global container stack.

Contributes to issues CURA-1278 and CURA-351.
2016-06-01 15:05:14 +02:00
Ghostkeeper
d1566ef637
Also reload extruders at init
Not a reload really, just a load.

Contributes to issues CURA-1278 and CURA-351.
2016-06-01 14:55:15 +02:00
Ghostkeeper
60a71fcc33
Only list extruders in extruder manager
Let the extruders themselves take care of which profiles are attached to each.

Contributes to issues CURA-1278 and CURA-351.
2016-06-01 14:54:30 +02:00
Ghostkeeper
377fed206c
Remove extruder creation logic from manager
This logic is now in cura/Extruder.py.

Contributes to issues CURA-1278 and CURA-351.
2016-06-01 13:52:57 +02:00
Ghostkeeper
48eb8de9a1
Add basic extruder implementation
This implementation can load an extruder from a definition container, but doesn't expose anything (yet). It is intended to function in much the same way as a definition model, so it must expose its relevant properties to QML.

Contributes to issues CURA-1278 and CURA-351.
2016-06-01 13:52:57 +02:00
Jaime van Kessel
6164112bf2 Setting textfield now updates correctly, even when mouse is hovering another text field.
CURA-1278
2016-06-01 13:35:09 +02:00
Ghostkeeper
a08e71774d
Make ExtruderManagerModel no longer a PyQt model
It is still a model according to the MVC paradigm but not according to Qt. To be consistent with the rest, don't call it a model any more.

Contributes to issues CURA-1278 and CURA-351.
2016-06-01 12:03:01 +02:00
fieldOfView
2a288cd7a2 Fix typo causing a minor error when opening MaterialsPage.qml
CURA-339
2016-06-01 11:51:42 +02:00
fieldOfView
38c9d9e4a1 Fix highlighting the currently active (printer|quality|material) on their management pages
CURA-1278
2016-06-01 10:47:04 +02:00
Jaime van Kessel
969a1ccc05 Merge pull request #759 from thopiekar/patch-5
[2.1] Set default version to 2.1.2
2016-06-01 09:38:53 +02:00
Tim Kuipers
3953da7a50 JSON fix: support roof speed was visible when roof enabled but support not (CURA-1498) 2016-05-31 18:13:47 +02:00
Arjen Hiemstra
3b51c3d339 Remove qmldir from qml resources and use proper Cura namespace for everything
Since we now properly expose all the qml files in the Cura namespace
we should also use it from there.
2016-05-31 18:07:33 +02:00
Arjen Hiemstra
f21e48adbb Register all QML files in Cura's QML directory as part of the Cura module
Jaime asked for it.
2016-05-31 18:07:33 +02:00
Arjen Hiemstra
4dffc414fb Make convex hull decorator respond properly to property change events
Fixes CURA-1460
2016-05-31 18:07:33 +02:00
Thomas Karl Pietrowski
15f84c758b Merge pull request #2 from Ultimaker/master
Merging master from upstream
2016-05-31 17:45:28 +02:00
Thomas Karl Pietrowski
23cb386b7c Set default version to 2.1.2
While discussing on #718 I noticed that the splash screen still shows "master" when built from [2.1].

This sets the version to 2.1.2.
2016-05-31 17:41:36 +02:00
fieldOfView
21e8dd151e Prevent removing the last printer, disable Activate button for current active printer
Fixes CURA-1631
2016-05-31 15:48:08 +02:00
fieldOfView
3638890138 Renaming a printer in the Manage Printers dialog is now reflected in the sidebar again
Contributes to CURA-1632
2016-05-31 15:26:38 +02:00
Jaime van Kessel
29ed8c2f5b Increased width of per-object settings panel
CURA-1278
2016-05-31 11:33:02 +02:00
Jaime van Kessel
152f362562 Hide button is now in correct location
CURA-1278
2016-05-31 11:12:22 +02:00
Jaime van Kessel
72d7bd5769 Added hide button to per object settings
CURA-1278
2016-05-31 11:06:26 +02:00
Jaime van Kessel
5289d5b4ac Codestyle
CURA-1278
2016-05-31 11:02:22 +02:00
Ghostkeeper
d7eda39cb0 Basic extruder manager model implementation
This implementation is currently not used, and also still leaves its container stacks empty. But still...

Contributes to issues CURA-1278 and CURA-351.
2016-05-30 17:05:15 +02:00
Ghostkeeper
932eefeb0e Correct data type for extruder number setting
This caused a crash. Stupid mistake.
2016-05-30 17:05:15 +02:00
fieldOfView
0c7b417244 Merge branch 'master' of https://github.com/Ultimaker/Cura 2016-05-30 16:45:57 +02:00
fieldOfView
b1419d8028 Fix activating (quality)profiles on the profiles page
CURA-1278
2016-05-30 16:45:36 +02:00
Arjen Hiemstra
d616a72bb1 Display affects/affected by in the tooltip again
Contributes to CURA-1278
2016-05-30 16:25:20 +02:00
Ghostkeeper
7e33b76fe2 Increment version number
Contributes to issue CURA-1583.
2016-05-30 16:18:54 +02:00
Arjen Hiemstra
581b9ce11f Update AutoSave plugin to work with the new settings API
Contributes to CURA-1615
2016-05-30 15:29:10 +02:00
Arjen Hiemstra
bdc8fdf508 Turn CuraApplication::_onExit into public api as saveSettings
Since we need it for the autosave plugin

Contributes to CURA-1615
2016-05-30 15:29:10 +02:00
Arjen Hiemstra
79892daa5e Bump API version of plugins that do not need extra porting
Contributes to CURA-1615
2016-05-30 15:29:10 +02:00
Ghostkeeper
4f7e199158
Merge branch 'master' of github.com:Ultimaker/Cura 2016-05-30 15:15:24 +02:00
Tim Kuipers
2932558a90 Merge branch 'master' into feature_accelerations_and_jerk_per_feature_settigns_rework 2016-05-30 14:56:44 +02:00
Tim Kuipers
b8df3825f6 JSON fix: remove visible property (and add visibility defaults (CURA-1443)
for acceleration and jerk settings
2016-05-30 14:54:33 +02:00
Tim Kuipers
d67bd1015e JSON fix: visible wasn't inside metadata (CURA-1443) 2016-05-30 14:50:09 +02:00
Tim Kuipers
6b5e72de72 JSON refactor: inherit_function ==> default for acceleration and jerk (CURA-1443) 2016-05-30 14:42:01 +02:00