GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-05-10 21:59:01 +08:00
Code Issues Packages Projects Releases Wiki Activity
2,972 Commits 290 Branches 260 Tags
Commit Graph

2972 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jaime van Kessel
51ea6779df Merge branch 'master' of github.com:Ultimaker/Cura 2016-06-07 12:53:24 +02:00
Jaime van Kessel
68837a089a Moved some properties to bindings due to bug in qt 5.5.1 
CURA-1494
 2016-06-07 12:50:57 +02:00
fieldOfView
3257d949eb Merge branch 'master' of https://github.com/Ultimaker/Cura 2016-06-07 12:00:03 +02:00
fieldOfView
4fb66afe06 Mark duplicated profiles as non-read-only 
CURA-1585
 2016-06-07 11:58:44 +02:00
Ghostkeeper
66bf0831f3
Document _uniqueName 
This function should really just be moved to ContainerRegistry... I'll do that later.

Contributes to issues CURA-340 and CURA-1278.
 2016-06-07 11:55:14 +02:00
Ghostkeeper
dff94b4559
Make ExtruderManager a QML context item 
There were two singletons of this manager: One created by QML and managed by QML, and one created by us and managed by our own singleton pattern. That won't work! So we now manage just our own singleton type, and make it a context item for QML so it can use the manager too.

Contributes to issues CURA-340 and CURA-1278.
 2016-06-07 11:55:14 +02:00
Ghostkeeper
9fe5435963
Rename parameter in _uniqueName 
Original means the original name. That's better.

Contributes to issues CURA-1278 and CURA-340.
 2016-06-07 11:55:14 +02:00
Ghostkeeper
890303da14
Add function to add all extruder trains of a machine 
This function only adds extruder trains if they have not been added already.

Contributes to issues CURA-340 and CURA-1278.
 2016-06-07 11:55:14 +02:00
fieldOfView
ce388c4b23 Show settings in profile as a sorted list with section headers 
CURA-1585
 2016-06-07 11:18:09 +02:00
fieldOfView
bbc33f5d70 Merge branch 'master' of https://github.com/Ultimaker/Cura 2016-06-07 11:01:24 +02:00
Simon Edwards
a6870b555b Fix up my comment, make it clearer. 
Fixes CURA-1630 Settings disappear after selecting all options of Experimental Modes
 2016-06-07 10:34:08 +02:00
Jaime van Kessel
0a84867132 Fixed multiple typos / missing things in extrudermanager 2016-06-07 09:33:29 +02:00
fieldOfView
05643eca11 Fix renaming profiles from the Profiles page 
CURA-1585
 2016-06-07 08:11:53 +02:00
fieldOfView
35706734e6 Show settings on Profile page 
CURA-1585
 2016-06-06 23:13:25 +02:00
fieldOfView
efe3f5e4ee Remove dependency on QtQml.Models 
CURA-1278
 2016-06-06 17:53:34 +02:00
fieldOfView
5235f74adf Prevent unique names like "profile #10 #2" 
CURA-1606, CURA-1585
 2016-06-06 17:47:33 +02:00
fieldOfView
a0bbf98fba Merge branch 'master' of https://github.com/Ultimaker/Cura 2016-06-06 17:11:17 +02:00
fieldOfView
a2def606c6 Fix Profile (application-)menu and add separators to profiles dropdown 
CURA-1585
 2016-06-06 17:10:56 +02:00
Ghostkeeper
bcf7e0459b Merge branch 'master' of github.com:Ultimaker/Cura 
Conflicts:
	cura/MachineManagerModel.py
 2016-06-06 16:41:34 +02:00
Simon Edwards
03914674c7 Cache all of the settings list items instead of recreating them all the time. 
Fixes CURA-1630 Settings disappear after selecting all options of Experimental Modes
 2016-06-06 16:04:26 +02:00
fieldOfView
df71269f82 Mark custom profiles as not read-only 
CURA-1585
 2016-06-06 15:56:45 +02:00
fieldOfView
0b57728d9d Fix creating a unique name for profiles 
CURA-1585
 2016-06-06 15:55:14 +02:00
Ghostkeeper
84a9166241 Make extrudersChanged into a pyqtSignal 
This way we can listen for it on the cute side.

Contributes to issues CURA-340 and CURA-1278.
 2016-06-06 15:15:33 +02:00
Ghostkeeper
64c92caa58 Update documentation of ExtruderManager class 
Contributes to issues CURA-1278 and CURA-340.
 2016-06-06 15:15:33 +02:00
Ghostkeeper
77c918a0a7 Remove superfluous singleton pattern 
The qmlRegisterSingletonType function already makes sure it is a singleton.

Contributes to issues CURA-340 and CURA-1278.
 2016-06-06 15:15:33 +02:00
Ghostkeeper
7950dfaa07 Document activeExtruderStackId 
Contributes to issues CURA-340, CURA-351 and CURA-1278.
 2016-06-06 15:15:33 +02:00
Ghostkeeper
70e6c8093e Explicitly return None if no global container stack 
That's what it does. This is more clear than doing 'pass' or something.

Contributes to issues CURA-340 and CURA-1278.
 2016-06-06 15:15:33 +02:00
Ghostkeeper
d1be5b6c02 Create extruder train for each train in a machine 
We had the functionality, but this function was not yet called!

Contributes to issues CURA-1278 and CURA-340.
 2016-06-06 15:15:33 +02:00
Ghostkeeper
927d33145f Move creating extruder manager logic to ExtruderManager 
This logic was both in Extruder.py and in MachineManagerModel.py due to a planning mishap.

Contributes to issues CURA-1278 and CURA-340.
 2016-06-06 15:15:33 +02:00
Ghostkeeper
79c37d667e Add extruder stack only when it's completely built 
Probably better for concurrency reasons, though that is not a problem yet at this moment.

Contributes to issues CURA-1278 and CURA-351.
 2016-06-06 15:14:58 +02:00
Ghostkeeper
bfc880b61a Add extruder container stack to registry 
Contributes to issues CURA-1278 and CURA-351.
 2016-06-06 15:14:58 +02:00
Ghostkeeper
357997c984 Add user profile to container registry 
This will allow it to be saved when restarting Cura and such.

Contributes to issues CURA-1278 and CURA-351.
 2016-06-06 15:14:58 +02:00
Ghostkeeper
2660b2a68f Give default empty machine_extruder_ids 
Works also if the machine has no machine_extruder_ids metadata.

Contributes to issues CURA-1278 and CURA-351.
 2016-06-06 15:14:58 +02:00
fieldOfView
a2db4740b9 Fix removing custom (quality) profiles 
CURA-1585
 2016-06-06 15:09:21 +02:00
fieldOfView
a139809b75 Fix showing profiles created using the dropdown menu in the dropdown and on the profiles manager 
CURA-1585
 2016-06-06 13:39:11 +02:00
fieldOfView
3752a6bbef Show rename profile dialog after creating a profile from the profiles dropdown 
CURA-1585
 2016-06-06 13:02:20 +02:00
fieldOfView
22857bf3e1 Disable export profile button when no profile is selected 
CURA-1585
 2016-06-06 12:14:10 +02:00
Jaime van Kessel
ffd309f816 Merge branch 'master' of github.com:Ultimaker/Cura 2016-06-06 10:19:14 +02:00
Jaime van Kessel
c7340c3b21 Temporary removed multi extruder stack so slicing works again 2016-06-06 10:18:19 +02:00
Thomas Karl Pietrowski
a3e5c06572
Adding debian to gitignore 
Got a link here my packaging files. As Cura does not come with packaging
files itself, we can add this ignore here.
 2016-06-06 08:55:36 +02:00
fieldOfView
b7a441d263 Merge branch 'master' of https://github.com/Ultimaker/Cura 2016-06-06 08:40:14 +02:00
fieldOfView
b88f2847ef Fix saving machine instances to the cura profile 
CURA-340, see c79b7bdd7a
 2016-06-06 08:39:38 +02:00
Ghostkeeper
e8b66b919a Merge pull request #771 from thopiekar/master-buildtype-in-splashscreen 
Splashscreen: Another (and last) correction
 2016-06-06 08:34:07 +02:00
Ghostkeeper
5d840e6430 Merge pull request #770 from thopiekar/master-eclipse-pydev 
Ignoring Eclipse+PyDev project files
 2016-06-06 08:29:44 +02:00
Thomas Karl Pietrowski
1171bf112c Ignoring Eclipse+PyDev project files 2016-06-06 06:43:07 +01:00
Thomas Karl Pietrowski
e03c3b95c5 Splashscreen: Another (and last) correction 
Now all the needed changes should be done.
 2016-06-06 06:36:30 +01:00
Ghostkeeper
a948c7bcc6
Set colours of extruder selection to material colour 
Ubuntu Unity doesn't seem to listen to these colours at all though.

Contributes to issues CURA-1278 and CURA-351.
 2016-06-05 16:18:07 +02:00
Ghostkeeper
c50d0a97da
Load extruder combobox synchronously 
Asynchronously causes Qt 5.4 to give a segfault.

Contributes to issues CURA-351 and CURA-1278.
 2016-06-05 16:18:07 +02:00
Ghostkeeper
b4782e9b12
Pass definition to _uniqueName instead of name 
This function expects the entire definition.

Contributes to issueS CURA-1278 and CURA-351.
 2016-06-05 16:18:07 +02:00
Ghostkeeper
9b2acf0317
Remove print statement 
Contributes to issues CURA-1278 and CURA-351.
 2016-06-05 16:18:06 +02:00