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

1757 Commits

Author SHA1 Message Date
Jaime van Kessel
8df5bba6e9 Removing auto rename if certain properties are changed 2016-08-24 17:11:29 +02:00
Jaime van Kessel
221da85783 Backend state is now set to processing when cura frontend is done sending 
This is instead of waiting for the backend to send it's first progress message.
This gives the feel of a more snappy response.
 2016-08-24 16:59:12 +02:00
Jaime van Kessel
3b9a642d02 Disabled renaming if type of material is changed by user 
CURA-1968
 2016-08-24 16:30:13 +02:00
Jaime van Kessel
3a921264fc Explicitly check label xml element if it's none 
For some stupid reason, an XML element evaluates to false.
CURA-1968
 2016-08-24 16:10:21 +02:00
Jaime van Kessel
a904067d7a Added label property to XML profile (as per 1.2 spec) 
CURA-1968
 2016-08-24 15:50:12 +02:00
Ghostkeeper
d046cd764a
Update version upgrade system for new quality-changes profiles 
The quality profile now sometimes gets updated to a quality profile, and sometimes to a quality-changes profile, depending on whether the profile is built-in or not.

Contributes to issue CURA-2006.
 2016-08-24 14:35:40 +02:00
Ghostkeeper
368a836ff2
Move material translations to separate dictionary 
This prevents a mix-up of how material names should be translated for quality profiles and how material names should be translated for material profiles.

Contributes to issue CURA-844.
 2016-08-24 14:35:40 +02:00
Ghostkeeper
b836311d67
Remove double type-metadata 
One was in metadata. That is the correct one. The other is unnecessary and was being ignored, but we don't need to write it.

Contributes to issue CURA-844.
 2016-08-24 14:35:40 +02:00
Jaime van Kessel
114899dc91 Merge branch 'cura-2007' of github.com:Ultimaker/Cura 2016-08-24 12:39:33 +02:00
fieldOfView
d3a0c0fa77 Add documentation 
CURA-2138
 2016-08-24 09:09:09 +02:00
fieldOfView
6b6d763657 Make globally incompatible materials not show up in menus 
CURA-2138
 2016-08-23 22:58:37 +02:00
fieldOfView
eb176847be Implement "hardware compatible" for XmlMaterialProfile 
CURA-2138
 2016-08-23 22:09:56 +02:00
fieldOfView
f1ee6b2b15 Update VersionUpgrade21to22 for new materials 2016-08-23 13:56:20 +02:00
fieldOfView
49ab5d0457 Merge branch 'master' of https://github.com/Ultimaker/Cura 2016-08-23 13:54:38 +02:00
fieldOfView
86ad1777af Fix setting weight of upgraded profile 
self._weight sometimes becomes an int, and ConfigParser does not like ints.
 2016-08-23 13:54:03 +02:00
Jaime van Kessel
e495534219 Rapid succesion of tool operations no longer freeze interface on Ubuntu 
CURA-2158
 2016-08-23 11:50:28 +02:00
Jack Ha
090b8d4f50 Solved merge conflict. 2016-08-23 10:35:20 +02:00
fieldOfView
1c87c17d77 Fix MachineSettingsAction after CURA-2006 2016-08-22 18:45:18 +02:00
fieldOfView
9981cfbf6a Simplify interface of UMOUpgradeSelection 2016-08-22 18:44:46 +02:00
fieldOfView
3671d241d5 Show color + material in menus and Materials page 
CURA-2108
 2016-08-22 17:34:33 +02:00
Jaime van Kessel
fc5900c05a Width of the scrollview is now a bit wider, so minus signs don't fall off 
CURA-2131
 2016-08-22 16:30:56 +02:00
Jaime van Kessel
ea324eadc0 Added scroll bar to per object panel 
If there are too many per object settings a scrollbar is now displayed

CURA-2131
 2016-08-22 15:14:10 +02:00
Jaime van Kessel
bfc01827c2 We now always create a new socket on terminate 
CURA-2127
 2016-08-22 10:32:49 +02:00
Jaime van Kessel
e3d4a33954 Fixed legacy profile reader 
Updated some settings that were changed from 2.1 to 2.2. Also fixed some
architecture changes that were not changed correctly (or at all)

CURA-1493 and CURA-1779
 2016-08-19 10:38:18 +02:00
Jaime van Kessel
286949dad1 Merge branch 'master' of github.com:Ultimaker/Cura 2016-08-19 09:36:56 +02:00
fieldOfView
86ead22143 Make machine identifiers consistent 
CURA-2136
 2016-08-18 17:18:03 +02:00
Jaime van Kessel
eae2e0da90 Merge branch 'master' of github.com:Ultimaker/Cura 2016-08-18 12:44:53 +02:00
Jaime van Kessel
7744ee5f13 Duplicating a material forces unique ID 
CURA-1969
 2016-08-18 12:44:16 +02:00
fieldOfView
efbb2ed081 Code style 2016-08-18 11:54:24 +02:00
Jaime van Kessel
7075e438d9 Changing metadata now only targets profiles that share basefile 
CURA-1874
 2016-08-18 11:40:01 +02:00
Jaime van Kessel
37e4b9e940 Duplicating a container no longer forces unique GUID 
CURA-1969
 2016-08-18 10:55:51 +02:00
fieldOfView
0061e1329c Code-style 2016-08-18 09:28:38 +02:00
Aldo Hoeben
0e7893f71b Merge pull request #926 from thopiekar/master-CURA-2079 
[CURA-2079] Adding detailed error messages to firmware updater dialog
 2016-08-18 09:27:22 +02:00
Thomas Karl Pietrowski
c174ce4396 CURA-2079: Rework on adding detailed error messages to firmware updater 2016-08-17 22:34:04 +02:00
Thomas Karl Pietrowski
e72a10c97a CURA-2079: Using errorCode (WIP) 
Sadly I don't see any reason why errorCode doesn't get updated in QML.
self._errorCode is accessible, but changes to it don't take any effect.
 2016-08-17 01:09:07 +02:00
Thomas Karl Pietrowski
b42ef49a4e Typo 2016-08-16 23:27:54 +02:00
fieldOfView
8b0587e75a Add logging with reason why printers don't have MachineSettings action 2016-08-16 21:10:58 +02:00
fieldOfView
42549df1f1 Fix setting the printhead polygon 2016-08-16 21:02:30 +02:00
fieldOfView
9b048efe22 Fixed copyrights 2016-08-16 18:19:25 +02:00
Thomas Karl Pietrowski
0435706736 CURA-2079: Adding error messages to the firmware update dialog 
Adds messages for IO errors, communication errors, missing firmware and
a general message for unknown problems.
 2016-08-16 12:25:55 +02:00
Thomas Karl Pietrowski
9a34f6b067 CURA-2079: First concept 2016-08-16 11:36:13 +02:00
fieldOfView
7d37cbd5d2 Merge branch 'master' into feature_machinesettings 2016-08-15 16:07:53 +02:00
fieldOfView
9e7e469df8 Move plugin files into main repo location 2016-08-15 16:06:34 +02:00
fieldOfView
dbaa6190be Add firmware upload for umo_dual 
CURA-1774
 2016-08-15 13:43:16 +02:00
Aldo Hoeben
db4a198a1c Merge pull request #922 from thopiekar/master-CURA-2079 
CURA-2079: Finish firmware upload process on errors
 2016-08-15 12:22:00 +02:00
Aldo Hoeben
f2d35cd57d Merge pull request #918 from Ultimaker/feature_terminology 
Update UI texts to be compliant to Ultimaker dictionary
 2016-08-15 11:35:19 +02:00
Jack Ha
4ea9276682 Merge branch 'master' into cura-2007 2016-08-15 09:16:04 +02:00
Thomas Karl Pietrowski
8179fabf1d Merge remote-tracking branch 'upstream/master' into master-CURA-2079 2016-08-14 17:43:26 +02:00
Thomas Karl Pietrowski
f915092f83 CURA-2079: Finish firmware upload process on errors 
Looking at the old code shows that the download process was never
completely finished. The according function was only return'ed, but no
signal was emitted to the window to give the user the possibility to
close it again.

Optionally, it would be useful here to pass messages to the window
dialog to inform the user about problems.

However, this code is untested because:
1. I don't know where put my printers *.hex-file, when coding here with
my editor,
2. Have no idea how to reproduce the IO errors reported at JIRA, so
fingers crossed here.

Contributes to CURA-2079
 2016-08-14 17:37:36 +02:00
fieldOfView
5c63e5e13f Fix a typo in a comment 
CURA-2113
 2016-08-11 17:18:43 +02:00