mirror of
https://github.com/Ultimaker/Cura.git
synced 2025-07-06 22:47:29 -06:00
removal of preference to not open the save dialog for ucp again
CURA-11403
This commit is contained in:
parent
3e23ce1c37
commit
0e70b80446
4 changed files with 3 additions and 80 deletions
|
@ -601,9 +601,7 @@ class CuraApplication(QtApplication):
|
||||||
preferences.addPreference("mesh/scale_to_fit", False)
|
preferences.addPreference("mesh/scale_to_fit", False)
|
||||||
preferences.addPreference("mesh/scale_tiny_meshes", True)
|
preferences.addPreference("mesh/scale_tiny_meshes", True)
|
||||||
preferences.addPreference("cura/dialog_on_project_save", True)
|
preferences.addPreference("cura/dialog_on_project_save", True)
|
||||||
preferences.addPreference("cura/dialog_on_ucp_project_save", True)
|
|
||||||
preferences.addPreference("cura/asked_dialog_on_project_save", False)
|
preferences.addPreference("cura/asked_dialog_on_project_save", False)
|
||||||
preferences.addPreference("cura/asked_dialog_on_ucp_project_save", False)
|
|
||||||
preferences.addPreference("cura/choice_on_profile_override", "always_ask")
|
preferences.addPreference("cura/choice_on_profile_override", "always_ask")
|
||||||
preferences.addPreference("cura/choice_on_open_project", "always_ask")
|
preferences.addPreference("cura/choice_on_open_project", "always_ask")
|
||||||
preferences.addPreference("cura/use_multi_build_plate", False)
|
preferences.addPreference("cura/use_multi_build_plate", False)
|
||||||
|
|
|
@ -462,40 +462,5 @@ class ThreeMFWriter(MeshWriter):
|
||||||
return extra_settings
|
return extra_settings
|
||||||
|
|
||||||
def exportUcp(self):
|
def exportUcp(self):
|
||||||
preferences = CuraApplication.getInstance().getPreferences()
|
self._config_dialog = UCPDialog()
|
||||||
if preferences.getValue("cura/dialog_on_ucp_project_save"):
|
self._config_dialog.show()
|
||||||
self._config_dialog = UCPDialog()
|
|
||||||
self._config_dialog.show()
|
|
||||||
else:
|
|
||||||
application = CuraApplication.getInstance()
|
|
||||||
workspace_handler = application.getInstance().getWorkspaceFileHandler()
|
|
||||||
|
|
||||||
# Set the model to the workspace writer
|
|
||||||
mesh_writer = workspace_handler.getWriter("3MFWriter")
|
|
||||||
mesh_writer.setExportModel(SettingsExportModel())
|
|
||||||
|
|
||||||
# Open file dialog and write the file
|
|
||||||
device = application.getOutputDeviceManager().getOutputDevice("local_file")
|
|
||||||
nodes = [application.getController().getScene().getRoot()]
|
|
||||||
|
|
||||||
file_name = CuraApplication.getInstance().getPrintInformation().baseName
|
|
||||||
|
|
||||||
try:
|
|
||||||
device.requestWrite(
|
|
||||||
nodes,
|
|
||||||
file_name,
|
|
||||||
["application/vnd.ms-package.3dmanufacturing-3dmodel+xml"],
|
|
||||||
workspace_handler,
|
|
||||||
preferred_mimetype_list="application/vnd.ms-package.3dmanufacturing-3dmodel+xml"
|
|
||||||
)
|
|
||||||
except OutputDeviceError.UserCanceledError:
|
|
||||||
self._onRejected()
|
|
||||||
except Exception as e:
|
|
||||||
message = Message(
|
|
||||||
catalog.i18nc("@info:error", "Unable to write to file: {0}", file_name),
|
|
||||||
title=catalog.i18nc("@info:title", "Error"),
|
|
||||||
message_type=Message.MessageType.ERROR
|
|
||||||
)
|
|
||||||
message.show()
|
|
||||||
Logger.logException("e", "Unable to write to file %s: %s", file_name, e)
|
|
||||||
self._onRejected()
|
|
||||||
|
|
|
@ -19,21 +19,6 @@ UM.Dialog
|
||||||
minimumHeight: UM.Theme.getSize("modal_window_minimum").height
|
minimumHeight: UM.Theme.getSize("modal_window_minimum").height
|
||||||
|
|
||||||
backgroundColor: UM.Theme.getColor("detail_background")
|
backgroundColor: UM.Theme.getColor("detail_background")
|
||||||
property bool dontShowAgain: false
|
|
||||||
|
|
||||||
function storeDontShowAgain()
|
|
||||||
{
|
|
||||||
UM.Preferences.setValue("cura/dialog_on_ucp_project_save", !dontShowAgainCheckbox.checked)
|
|
||||||
UM.Preferences.setValue("cura/asked_dialog_on_ucp_project_save", false)
|
|
||||||
}
|
|
||||||
|
|
||||||
onVisibleChanged:
|
|
||||||
{
|
|
||||||
if(visible && UM.Preferences.getValue("cura/asked_dialog_on_ucp_project_save"))
|
|
||||||
{
|
|
||||||
dontShowAgain = !UM.Preferences.getValue("cura/dialog_on_ucp_project_save")
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
headerComponent: Rectangle
|
headerComponent: Rectangle
|
||||||
{
|
{
|
||||||
|
@ -90,15 +75,7 @@ UM.Dialog
|
||||||
delegate: SettingsSelectionGroup { Layout.margins: 0 }
|
delegate: SettingsSelectionGroup { Layout.margins: 0 }
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
leftButtons:
|
|
||||||
[
|
|
||||||
UM.CheckBox
|
|
||||||
{
|
|
||||||
id: dontShowAgainCheckbox
|
|
||||||
text: catalog.i18nc("@action:label", "Don't show project summary on save again")
|
|
||||||
checked: dontShowAgain
|
|
||||||
}
|
|
||||||
]
|
|
||||||
rightButtons:
|
rightButtons:
|
||||||
[
|
[
|
||||||
Cura.TertiaryButton
|
Cura.TertiaryButton
|
||||||
|
@ -117,9 +94,6 @@ UM.Dialog
|
||||||
|
|
||||||
onClosing:
|
onClosing:
|
||||||
{
|
{
|
||||||
storeDontShowAgain()
|
|
||||||
manager.notifyClosed()
|
manager.notifyClosed()
|
||||||
}
|
}
|
||||||
onRejected: storeDontShowAgain()
|
|
||||||
onAccepted: storeDontShowAgain()
|
|
||||||
}
|
}
|
||||||
|
|
|
@ -784,20 +784,6 @@ UM.PreferencesPage
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
UM.TooltipArea
|
|
||||||
{
|
|
||||||
width: childrenRect.width
|
|
||||||
height: childrenRect.height
|
|
||||||
text: catalog.i18nc("@info:tooltip", "Should a summary be shown when saving a UCP project file?")
|
|
||||||
|
|
||||||
UM.CheckBox
|
|
||||||
{
|
|
||||||
text: catalog.i18nc("@option:check", "Show summary dialog when saving a UCP project")
|
|
||||||
checked: boolCheck(UM.Preferences.getValue("cura/dialog_on_ucp_project_save"))
|
|
||||||
onCheckedChanged: UM.Preferences.setValue("cura/dialog_on_ucp_project_save", checked)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
UM.TooltipArea
|
UM.TooltipArea
|
||||||
{
|
{
|
||||||
width: childrenRect.width
|
width: childrenRect.width
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue