Commit graph

2267 commits

Author SHA1 Message Date
Ghostkeeper
eaa7d716f5 Revert "Properly send global settings to the global stack"
This reverts commit 9d0acf5b03.
It was not so proper after all.

Contributes to issue CURA-2006.
2016-08-19 15:48:35 +02:00
Jaime van Kessel
286949dad1 Merge branch 'master' of github.com:Ultimaker/Cura 2016-08-19 09:36:56 +02:00
fieldOfView
6e422e611c Change Simple Mode "print brim" to print a brim or raft
CURA-2135
2016-08-18 13:11:14 +02:00
Jaime van Kessel
eae2e0da90 Merge branch 'master' of github.com:Ultimaker/Cura 2016-08-18 12:44:53 +02:00
fieldOfView
ad001c71be Simplify use of ExtrudersModel 2016-08-18 12:30:13 +02:00
fieldOfView
9b0e5f5a8d Simplify checking if a plugin exists 2016-08-18 11:53:10 +02:00
Jaime van Kessel
37e4b9e940 Duplicating a container no longer forces unique GUID
CURA-1969
2016-08-18 10:55:51 +02:00
Jack Ha
8c0837d75d Merge master. CURA-2006 2016-08-16 15:08:25 +02:00
fieldOfView
105541ed07 Hide "0%" progress while in pre_print state
CURA-1963
2016-08-16 11:19:50 +02:00
fieldOfView
8c63216fdf Get how we name variants from the machine definition
CURA-2116
2016-08-16 10:18:57 +02:00
fieldOfView
c60ddbecfb Make sure a machine is always selected on the Printers page
CURA-2085
2016-08-15 18:07:00 +02:00
fieldOfView
fcfcfa37fb Tweak monitor items for long jobnames
CURA-2125
2016-08-15 17:09:29 +02:00
fieldOfView
b7b0faf44a Fix sorting of settings on Profile manager page
CURA-2123
2016-08-15 15:17:59 +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
fieldOfView
633e37713c Update Printer manager details pane after removing a printer
CURA-2085
2016-08-15 11:32:09 +02:00
Jack Ha
5a92269a08 Testing. CURA-2007 2016-08-15 09:32:51 +02:00
Jack Ha
4ea9276682 Merge branch 'master' into cura-2007 2016-08-15 09:16:04 +02:00
Thomas Karl Pietrowski
bfe97a1eca Using ~ only for the amount of material in grams 2016-08-11 21:10:16 +02:00
Thomas Karl Pietrowski
1ab0637d11 Adding "approximately equal" to the amount of material needed
I think it makes sense to add this character here, because the amount needed is only a approximated value, and without the end-user might expect a more accurate value.
2016-08-11 20:34:01 +02:00
Arjen Hiemstra
2969aafb6d Update profile page with the renamed functions
Contributes to CURA-2006
2016-08-11 17:51:16 +02:00
Arjen Hiemstra
6778020d56 Remove duplicated code
Contributes to CURA-2006
2016-08-11 17:47:30 +02:00
Arjen Hiemstra
e1ddb878ad Fix copyright header
Contributes to CURA-2006
2016-08-11 17:47:15 +02:00
fieldOfView
6075536497 Fix settingtextfield validator in PerObjectSettings
CURA-2115
2016-08-11 14:37:58 +02:00
fieldOfView
71a9f2dd7a Clean up conversion to string
CURA-2071
2016-08-11 11:53:55 +02:00
fieldOfView
6d64d11c2e Change Simple Mode adhesion/support label to "Helper Parts"
UXD-76
2016-08-10 17:57:06 +02:00
fieldOfView
85a58a22cb Change "Bed"/"Platform" to "Build Plate"
UXD-76
2016-08-10 17:57:05 +02:00
fieldOfView
505da1a9a7 Change "Hotend temperature" to the name of the extruder
UXD-79
2016-08-10 17:55:52 +02:00
fieldOfView
2963a64fc2 Change "Bed Temperature" to "Build Plate Temperature"
UXD-80
2016-08-10 17:55:52 +02:00
fieldOfView
7aab8ad397 Change "object" to "model"
UXD-83
2016-08-10 17:55:51 +02:00
fieldOfView
b6bf02e0a0 Update swatch colors when changing materials
CURA-1971
2016-08-10 14:37:59 +02:00
Arjen Hiemstra
be4db899a6 Change the active quality if we remove the active quality
Contributes to CURA-2006
2016-08-10 12:02:11 +02:00
Arjen Hiemstra
5edeaa1c93 Reduce the amount of QML warning showing up
Contributes to CURA-2006
2016-08-10 12:00:03 +02:00
Arjen Hiemstra
7ba49b4f88 Remove code that is obsolete and moved to ContainerManager
Contributes to CURA-2006
2016-08-10 11:58:40 +02:00
Arjen Hiemstra
2a81d25bf9 Fix removing container after rejecting a rename
Contributes to CURA-2006
2016-08-10 11:05:56 +02:00
Arjen Hiemstra
783d395fbc Use containermanager for operations on Quality
Contributes to CURA-2006
2016-08-10 11:04:15 +02:00
Arjen Hiemstra
975a60bec3 Display all the extruder settings and global settings in profile manager
Contributes to CURA-2006
2016-08-10 11:03:00 +02:00
Arjen Hiemstra
03252c69dc List all the qualities and quality changes in the profiles page
Contributes to CURA-2006
2016-08-10 11:01:50 +02:00
Arjen Hiemstra
6de7d0170a Expose quality changes id and quality type and make the profile menu work correctly
Contributes to CURA-2006
2016-08-10 10:58:44 +02:00
Jack Ha
decf998d68 Code style, semicolons 2016-08-10 09:17:10 +02:00
fieldOfView
e551898e04 Add a connection string to the printmonitor
CURA-2091
2016-08-09 18:43:09 +02:00
Jaime van Kessel
433db40e9c Merge branch 'master' of github.com:Ultimaker/Cura 2016-08-09 17:11:23 +02:00
Jaime van Kessel
c381b82ac1 Extruder nr is now sent as string
CURA-2071
2016-08-09 17:09:48 +02:00
Jack Ha
223b8f28bb Update print monitor button labels and enabled. CURA-2060 2016-08-09 16:20:40 +02:00
Jack Ha
2d723cbb57 Comments CURA-2064 2016-08-09 14:54:09 +02:00
Jack Ha
fc462cdf6f Merge branch 'master' of github.com:Ultimaker/Cura 2016-08-09 10:57:42 +02:00
Jack Ha
f60ba6ddf0 Enable Abort Print button while in pre_print. 2016-08-09 10:57:28 +02:00
fieldOfView
c7a120edd5 Merge branch 'master' of https://github.com/Ultimaker/Cura 2016-08-09 09:56:40 +02:00
fieldOfView
f817d30abc Change colour to color for consistency 2016-08-09 09:56:23 +02:00
Jack Ha
6d52319ee4 Adjusted visibility of printer monitor progress bar + percentage.
CURA-2064
2016-08-08 17:08:01 +02:00
Jack Ha
1bd0d65e0a Added user feedback after pressing Pause / Resume in network printer.
The button displays Pausing... or Resuming... until a new status update.

CURA-2060
2016-08-08 16:25:01 +02:00