181 Commits

Author SHA1 Message Date
Thomas-Karl Pietrowski
429e54bc8a Removing unused import 2016-03-14 17:15:57 +01:00
fieldOfView
51ad894711 Properly disable Per Object Settings toolbutton on first start
On an empty profile, the cura/active_mode preference is not set so the code disabling the button was not called.

Fixes CURA-901
2016-03-01 10:34:00 +01:00
Jaime van Kessel
636d6af2de Removed reference to removed profile selection 2016-02-29 14:18:00 +01:00
fieldOfView
bbd77ee998 Revert "Fix Per Object Settings toolbutton enabled state on startup"
This reverts commit 8d7df76aa19009192247d5fb14babbdf9d7c6202.

Contributes to CURA-901
2016-02-25 16:31:53 +01:00
fieldOfView
8d7df76aa1 Fix Per Object Settings toolbutton enabled state on startup
Contributes to CURA-901
2016-02-25 09:40:12 +01:00
Ghostkeeper
64aa977696 Properly update global_only on profile switch
In the setting override model for per-object settings now gets its global_only property also updated on a profile switch. This is needed because the settings also change during a profile switch but the change event is not triggered.

Contributes to issue CURA-458.
2016-02-24 13:05:52 +01:00
fieldOfView
390dc7e2c6 Merge branch '2.1' of https://github.com/Ultimaker/Cura into 2.1 2016-02-24 00:15:22 +01:00
fieldOfView
de28561152 Remove Profiles from Per Object Settings panel
Also disables Per Object Settings tool button when sidebar is in simple mode.

Contributes to CURA-901
2016-02-24 00:14:54 +01:00
Jaime van Kessel
2a938f7504 Merge branch '2.1' of https://github.com/Ultimaker/Cura into 2.1 2016-02-23 12:55:50 +01:00
Jaime van Kessel
c15709936b Grouping and per object settings now work correctly again 2016-02-23 12:55:41 +01:00
Ghostkeeper
3e4f728281 Merge pull request #638 from Ultimaker/performance_fixes
Performance fixes
2016-02-23 12:31:16 +01:00
Arjen Hiemstra
e6ef4405c3 Replace a bunch of Theme property accessors with getThing calls 2016-02-23 12:24:26 +01:00
Jaime van Kessel
ee1c16d1fc Grouped objects now correctly get per-object settings
Instead of the first object, the group gets the settings.
2016-02-23 11:27:59 +01:00
Ghostkeeper
12bace54b1 Update per-object settings list when a setting changes
The event triggers a refresh of the global_only property. I think it shouldn't affect the computation time too much but it feels sluggish when you change a setting. Does it feel sluggish for you too, reviewer? It has been feeling sluggish for a while so I don't know if that's due to this change.

Contributes to issue CURA-458.
2016-02-22 12:55:10 +01:00
Ghostkeeper
6e59f49bd5 Fix per-object setting categories hiding when folding them
When the categories were folded closed, they were suddenly hidden because then the settings' height became 0. Now it uses the actual height of the children regardless of whether they are visible or not, which makes them properly remain visible while closed.

Contributes to issue CURA-548.
2016-02-08 16:18:45 +01:00
Ghostkeeper
72125d84bf Fix problem with casting to QVariant
This is a magical fix that Nallath and I found for a problem that shouldn't exist in the first place and sometimes doesn't exist at all and in the same time is a superposition of existing and not existing and it's all very complicated and an extremely weird hack. Casting this object to itself properly makes it castable to QVariant.

Contributes to issue CURA-458.
2016-02-08 15:29:15 +01:00
Jaime van Kessel
ede0cbcfe6 Removed old code in per object settings that caused crash. 2016-02-04 16:04:52 +01:00
Ghostkeeper
736d04ba8d Fix getting container properties
Due to an optimisation earlier, the model and selected index in the per-object settings panel couldn't be found. This was giving errors and making the per-object settings unusable.

Contributes to issue CURA-458.
2016-02-04 12:33:39 +01:00
Ghostkeeper
a658140997 Remove more remnants of print sequence message
I found this other place that was helping to display the message that warns that print sequcence is set per-object. Since the latter is no longer possible, this message shouldn't be displayed any more.

Contributes to issue CURA-458.
2016-02-04 12:14:59 +01:00
Ghostkeeper
44872ade43 Remove superfluous warning for printsequence
Print sequence can no longer be chosen per-object, so the warning that displays when you choose print sequence per-object is no longer necessary.

Contributes to issue CURA-458.
2016-02-04 12:08:57 +01:00
Ghostkeeper
bf03d71427 Hide setting if global-only
In the per-object-setting panel, a setting is no longer displayed as settable per-object if it is global-only.

Contributes to issue CURA-458.
2016-02-04 11:43:43 +01:00
Arjen Hiemstra
5d136a1da7 ActiveTool.properties now returns a ContainerProxy object 2016-01-29 15:18:19 +01:00
Tamara Hogenhout
6711cd3070 Fixin some i18n function calls and such
because some strings could not be translated

Contributes to #CURA-526
2016-01-12 15:24:47 +01:00
fieldOfView
4bf4a20d44 Add small hover-effect to small buttons 2015-12-30 09:53:25 +01:00
fieldOfView
5fe1de2153 Add warning to PerObjectSettingsPanel when Print Sequence is set to All at Once 2015-12-09 15:05:39 +01:00
fieldOfView
03e9694e32 Fix PerObjectSettingsPanel layout 2015-12-09 13:02:30 +01:00
fieldOfView
2ebeb72fac Rework Per Object Settings selection mechanism 2015-12-03 12:09:32 +01:00
fieldOfView
6af05b8af7 Add order to PerObjectSettings tool 2015-12-03 12:09:29 +01:00
Arjen Hiemstra
15747dedec Update Per Object Settings tool with changes made in 15.10 2015-11-13 11:32:43 +01:00
Ghostkeeper
e7f2c9de70 Move PerObjectSettings to Cura
This was already done in master.
2015-10-16 17:06:06 +02:00
Ghostkeeper
1bda2ff220 Move PerObjectSettings from Uranium to Cura
This tool is deemed Cura-specific, so it is moved to Cura. This prevents it from being included in other Uranium applications.
2015-10-01 15:41:36 +02:00