Commit graph

3676 commits

Author SHA1 Message Date
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
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
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
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
fieldOfView
a2db4740b9 Fix removing custom (quality) profiles
CURA-1585
2016-06-06 15:09:21 +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
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
Jaime van Kessel
783134031b Settings can now be set by extruder
CURA-340
2016-06-05 12:17:35 +02:00
Jaime van Kessel
1e44abb9be Added activeExtruder stack to machineManager model
CURA-340
2016-06-05 12:01:46 +02:00
Arjen Hiemstra
0a9382aa11 Fix exclusiveGroup for machine selection in the menu
Contributes to CURA-1278
2016-06-04 21:22:21 +02:00
Arjen Hiemstra
6a3b321e5a Re-enable commented code 2016-06-04 19:23:46 +02:00
Arjen Hiemstra
b33ce573c1 Also filter materials and profiles preference pages by machine etc. when desired
Contriubtes to CURA-1612
2016-06-04 19:22:42 +02:00
Jaime van Kessel
490a8724e5 Fixed duplication of profiles
CURA-1427
2016-06-03 16:29:46 +02:00
Jaime van Kessel
fdbd6d7c5f Updating profile now also works in profile page
CURA-1585
2016-06-03 15:29:41 +02:00
Jaime van Kessel
01999f7ddd Custom profiles can now be renamed 2016-06-03 15:00:09 +02:00
Jaime van Kessel
cd8df44812 Changed multiple properties in profile page to new API
CURA-1285
2016-06-03 14:40:28 +02:00
Jaime van Kessel
0dece95f0f Updating non-readonly profiles is now possible again
CURA-1585
2016-06-03 13:03:56 +02:00
Jaime van Kessel
d29cc37d6b Adds way to convert user settings into quality settings
CURA-1585
2016-06-03 11:58:59 +02:00
Jaime van Kessel
4fc565711d Added read-only property to profiles
CURA-1585
2016-06-03 11:19:33 +02:00
Jaime van Kessel
113da81db5 Added isValidGlobalStack property to MachineManager
CURA-1585
2016-06-03 10:29:19 +02:00
Jaime van Kessel
ad35c9f070 Added reload profile (simply clears user instance container)
CURA-1278
2016-06-03 10:06:08 +02:00
fieldOfView
184247ced6 Merge branch 'master' of https://github.com/Ultimaker/Cura 2016-06-02 16:38:41 +02:00
fieldOfView
bb18bf6a30 Fix creating a jobname after loading a file
Moves jobname creation out of qml and into python.
CURA-1619
2016-06-02 16:38:06 +02:00
Ghostkeeper
7146c9ab7d
Make a drop-down box for selecting an extruder
For use by settings such as infill_extruder_nr.

Contributes to issues CURA-351 and CURA-1278.
2016-06-02 16:09:10 +02:00
Jaime van Kessel
64e4cd0041 Added properties to make setting items more customisable
CURA-1278
2016-06-02 15:52:25 +02:00
Ghostkeeper
b9f2d498b4
Fix typo in documentation 2016-06-02 14:17:12 +02:00
fieldOfView
14a8b8a1a4 Fix showing formatted tooltip when exiting reset-value-icon
CURA-1278
2016-06-02 13:30:26 +02:00
fieldOfView
02b8fa9043 Add missing tooltip
CURA-1643
2016-06-02 12:46:01 +02:00
Arjen Hiemstra
070e791b94 Add a preference to change LayerView top layers between 1 and 5
Fixes CURA-1643
2016-06-02 11:23:18 +02:00
fieldOfView
e03f65c471 Remove stray debug print
CURA-1278
2016-06-02 11:12:37 +02:00
Arjen Hiemstra
ceb21ce89b Filter material/quality by machine only when we should filter
Contributes to CURA-1612
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
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
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
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
fieldOfView
2a288cd7a2 Fix typo causing a minor error when opening MaterialsPage.qml
CURA-339
2016-06-01 11:51:42 +02:00