3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-07-06 22:47:29 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Remove Profiles from Per Object Settings panel

Browse source 
Also disables Per Object Settings tool button when sidebar is in simple mode.

Contributes to CURA-901
This commit is contained in:
fieldOfView 2016-02-24 00:14:54 +01:00
parent 8eb6fecacf
commit de28561152
3 changed files with 11 additions and 25 deletions
Download patch file Download diff file Expand all files Collapse all files

22
plugins/PerObjectSettingsTool/PerObjectSettingsPanel.qml
View file

@ -24,28 +24,6 @@ Item {
spacing: UM.Theme.getSize("default_margin").height; spacing: UM.Theme.getSize("default_margin").height;
UM.SettingItem {
id: profileSelection
width: UM.Theme.getSize("setting").width;
height: UM.Theme.getSize("setting").height;
name: catalog.i18nc("@label", "Object profile")
type: "enum"
indent: false
style: UM.Theme.styles.setting_item;
options: UM.ProfilesModel { addUseGlobal: true }
value: UM.ActiveTool.properties.getValue("Model").getItem(base.currentIndex).profile
onItemValueChanged: {
var item = UM.ActiveTool.properties.getValue("Model").getItem(base.currentIndex);
UM.ActiveTool.properties.getValue("Model").setObjectProfile(item.id, value)
}
}
Column { Column {
id: customisedSettings id: customisedSettings
spacing: UM.Theme.getSize("default_lining").height; spacing: UM.Theme.getSize("default_lining").height;

10
plugins/PerObjectSettingsTool/PerObjectSettingsTool.py
View file

@ -5,6 +5,7 @@ from UM.Tool import Tool
from UM.Scene.Selection import Selection from UM.Scene.Selection import Selection
from UM.Application import Application from UM.Application import Application
from UM.Qt.ListModel import ListModel from UM.Qt.ListModel import ListModel
from UM.Preferences import Preferences
from . import PerObjectSettingsModel from . import PerObjectSettingsModel
@ -15,6 +16,8 @@ class PerObjectSettingsTool(Tool):
self.setExposedProperties("Model", "SelectedIndex") self.setExposedProperties("Model", "SelectedIndex")
Preferences.getInstance().preferenceChanged.connect(self._onPreferenceChanged)
def event(self, event): def event(self, event):
return False return False
@ -35,4 +38,9 @@ class PerObjectSettingsTool(Tool):
selected_object = None selected_object = None
selected_object_id = id(selected_object) selected_object_id = id(selected_object)
index = self.getModel().find("id", selected_object_id) index = self.getModel().find("id", selected_object_id)
return index return index
def _onPreferenceChanged(self, preference):
if preference == "cura/active_mode":
enabled = Preferences.getInstance().getValue(preference)==1
Application.getInstance().getController().toolEnabledChanged.emit(self._plugin_id, enabled)

4
resources/qml/Toolbar.qml
View file

@ -33,7 +33,7 @@ Item {
checkable: true; checkable: true;
checked: model.active; checked: model.active;
enabled: UM.Selection.hasSelection && UM.Controller.toolsEnabled; enabled: model.enabled && UM.Selection.hasSelection && UM.Controller.toolsEnabled;
style: UM.Theme.styles.tool_button; style: UM.Theme.styles.tool_button;
@ -72,7 +72,7 @@ Item {
} }
height: panel.item ? panel.height + 2 * UM.Theme.getSize("default_margin").height : 0; height: panel.item ? panel.height + 2 * UM.Theme.getSize("default_margin").height : 0;
opacity: panel.item ? 1 : 0 opacity: panel.item && panel.width > 0 ? 1 : 0
Behavior on opacity { NumberAnimation { duration: 100 } } Behavior on opacity { NumberAnimation { duration: 100 } }
color: UM.Theme.getColor("lining"); color: UM.Theme.getColor("lining");