Ghostkeeper
9581257df5
Don't bind provider when setting is per mesh
...
This causes settings which are settable per mesh but not per extruder to be configurable per extruder even though they have a linked icon.
Contributes to issue CURA-2006.
2016-08-23 11:53:57 +02:00
Jack Ha
090b8d4f50
Solved merge conflict.
2016-08-23 10:35:20 +02:00
fieldOfView
0f998c6e2e
Fix qml warnings
...
CURA-2006
2016-08-22 19:25:42 +02:00
fieldOfView
62e815a3d8
Fix qml warning
...
CURA-2006
2016-08-22 19:16:59 +02:00
fieldOfView
b9af9dce1f
Tweak profile overview layout
...
CURA-2006
2016-08-22 19:00:49 +02:00
fieldOfView
3671d241d5
Show color + material in menus and Materials page
...
CURA-2108
2016-08-22 17:34:33 +02:00
fieldOfView
320cddb073
Don't show "nozzle" on Materials page when there are no variants
2016-08-22 16:41:21 +02:00
fieldOfView
c32700b7b4
Fix "Set as Active Extruder" menu item
2016-08-22 16:30:34 +02:00
fieldOfView
900f953298
Make sure extruder menus are only shown if there the machine extruders
2016-08-22 16:15:59 +02:00
Ghostkeeper
bb90c593b9
Merge branch 'feature_quality_changes'
2016-08-22 15:13:27 +02:00
Ghostkeeper
f296b77d2c
Fix check for presence of global_inherits_stack
...
My mistake.
Contributes to issue CURA-2006.
2016-08-22 14:17:47 +02:00
Ghostkeeper
42399e82fb
)
...
Contributes to issue CURA-2006.
2016-08-22 11:36:33 +02:00
Ghostkeeper
1c1bfbe114
Fix providing of global_inherits_stack settings
...
I've rewritten this part and documented what each case catches. There is a base case which is not required any more since we removed the global tab, but I left it in for defense.
Contributes to issue CURA-2006.
2016-08-22 11:34:17 +02:00
fieldOfView
1003066ce1
Show qualities for the material associated with the currently selected quality
...
CURA-2095
2016-08-22 11:31:31 +02:00
fieldOfView
7efde6b164
Prevent qml warning when no printer is connected
2016-08-20 23:42:51 +02:00
fieldOfView
2f3f57c43d
Code-style
2016-08-20 23:40:43 +02:00
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