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

Merge pull request #3663 from Ultimaker/feature_material_marketplace

Browse source 
Feature material toolbox; all changes made
This commit is contained in:
Ian Paschal 2018-05-02 12:23:13 +02:00 • committed by GitHub
commit 87e1f98156
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
502 changed files with 3595 additions and 1862 deletions
Download patch file Download diff file Expand all files Collapse all files

6
resources/qml/Actions.qml
View file

@ -68,7 +68,7 @@ Item
property alias configureSettingVisibility: configureSettingVisibilityAction
property alias browsePlugins: browsePluginsAction
property alias browsePackages: browsePackagesAction
UM.I18nCatalog{id: catalog; name:"cura"}
@ -429,8 +429,8 @@ Item
Action
{
id: browsePluginsAction
text: catalog.i18nc("@action:menu", "Browse plugins...")
id: browsePackagesAction
text: catalog.i18nc("@action:menu", "Browse packages...")
iconName: "plugins_browse"
}

41
resources/qml/Cura.qml
View file

@ -271,9 +271,9 @@ UM.MainWindow
Menu
{
id: plugin_menu
title: catalog.i18nc("@title:menu menubar:toplevel", "P&lugins")
title: catalog.i18nc("@title:menu menubar:toplevel", "&Toolbox")
MenuItem { action: Cura.Actions.browsePlugins }
MenuItem { action: Cura.Actions.browsePackages }
}
Menu
@ -323,31 +323,6 @@ UM.MainWindow
{
if (drop.urls.length > 0)
{
// As the drop area also supports plugins, first check if it's a plugin that was dropped.
if (drop.urls.length == 1)
{
if (PluginRegistry.isPluginFile(drop.urls[0]))
{
// Try to install plugin & close.
var result = PluginRegistry.installPlugin(drop.urls[0]);
pluginInstallDialog.text = result.message;
if (result.status == "ok")
{
pluginInstallDialog.icon = StandardIcon.Information;
}
else if (result.status == "duplicate")
{
pluginInstallDialog.icon = StandardIcon.Warning;
}
else
{
pluginInstallDialog.icon = StandardIcon.Critical;
}
pluginInstallDialog.open();
return;
}
}
openDialog.handleOpenFileUrls(drop.urls);
}
}
@ -669,9 +644,9 @@ UM.MainWindow
// show the plugin browser dialog
Connections
{
target: Cura.Actions.browsePlugins
target: Cura.Actions.browsePackages
onTriggered: {
curaExtensions.callExtensionMethod("Plugin Browser", "browsePlugins")
curaExtensions.callExtensionMethod("Toolbox", "browsePackages")
}
}
@ -814,14 +789,6 @@ UM.MainWindow
}
}
MessageDialog
{
id: pluginInstallDialog
title: catalog.i18nc("@window:title", "Install Plugin");
standardButtons: StandardButton.Ok
modality: Qt.ApplicationModal
}
MessageDialog {
id: infoMultipleFilesWithGcodeDialog
title: catalog.i18nc("@title:window", "Open File(s)")

2
resources/quality/abax_pri3/apri3_pla_fast.inst.cfg
View file

@ -1,5 +1,5 @@
[general]
version = 3
version = 4
name = Fine
definition = abax_pri3

2
resources/quality/abax_pri3/apri3_pla_high.inst.cfg
View file

@ -1,5 +1,5 @@
[general]
version = 3
version = 4
name = Extra Fine
definition = abax_pri3

2
resources/quality/abax_pri3/apri3_pla_normal.inst.cfg
View file

@ -1,5 +1,5 @@
[general]
version = 3
version = 4
name = Fine
definition = abax_pri3

2
resources/quality/abax_pri5/apri5_pla_fast.inst.cfg
View file

@ -1,5 +1,5 @@
[general]
version = 3
version = 4
name = Fine
definition = abax_pri5

2
resources/quality/abax_pri5/apri5_pla_high.inst.cfg
View file

@ -1,5 +1,5 @@
[general]
version = 3
version = 4
name = Extra Fine
definition = abax_pri5

2
resources/quality/abax_pri5/apri5_pla_normal.inst.cfg
View file

@ -1,5 +1,5 @@
[general]
version = 3
version = 4
name = Fine
definition = abax_pri5

2
resources/quality/abax_titan/atitan_pla_fast.inst.cfg
View file

@ -1,5 +1,5 @@
[general]
version = 3
version = 4
name = Fine
definition = abax_titan

2
resources/quality/abax_titan/atitan_pla_high.inst.cfg
View file

@ -1,5 +1,5 @@
[general]
version = 3
version = 4
name = Extra Fine
definition = abax_titan

2
resources/quality/abax_titan/atitan_pla_normal.inst.cfg
View file

@ -1,5 +1,5 @@
[general]
version = 3
version = 4
name = Fine
definition = abax_titan

2
resources/quality/anycubic_i3_mega/anycubic_i3_mega_draft.inst.cfg
View file

@ -1,5 +1,5 @@
[general]
version = 3
version = 4
name = Draft
definition = anycubic_i3_mega

2
resources/quality/anycubic_i3_mega/anycubic_i3_mega_high.inst.cfg
View file

@ -1,5 +1,5 @@
[general]
version = 3
version = 4
name = High
definition = anycubic_i3_mega

2
resources/quality/anycubic_i3_mega/anycubic_i3_mega_normal.inst.cfg
View file

@ -1,5 +1,5 @@
[general]
version = 3
version = 4
name = Normal
definition = anycubic_i3_mega

2
resources/quality/builder_premium/bp_BVOH_Coarse_Quality.inst.cfg
View file

@ -1,5 +1,5 @@
[general]
version = 3
version = 4
name = Coarse
definition = builder_premium_small

2
resources/quality/builder_premium/bp_BVOH_High_Quality.inst.cfg
View file

@ -1,5 +1,5 @@
[general]
version = 3
version = 4
name = High Quality
definition = builder_premium_small

2
resources/quality/builder_premium/bp_BVOH_Normal_Quality.inst.cfg
View file

@ -1,5 +1,5 @@
[general]
version = 3
version = 4
name = Normal
definition = builder_premium_small

2
resources/quality/builder_premium/bp_Innoflex60_Coarse_Quality.inst.cfg
View file

@ -1,5 +1,5 @@
[general]
version = 3
version = 4
name = Coarse
definition = builder_premium_small

2
resources/quality/builder_premium/bp_Innoflex60_High_Quality.inst.cfg
View file

@ -1,5 +1,5 @@
[general]
version = 3
version = 4
name = High Quality
definition = builder_premium_small

2
resources/quality/builder_premium/bp_Innoflex60_Normal_Quality.inst.cfg
View file

@ -1,5 +1,5 @@
[general]
version = 3
version = 4
name = Normal
definition = builder_premium_small

2
resources/quality/builder_premium/bp_PET_Coarse_Quality.inst.cfg
View file

@ -1,5 +1,5 @@
[general]
version = 3
version = 4
name = Coarse
definition = builder_premium_small

2
resources/quality/builder_premium/bp_PET_High_Quality.inst.cfg
View file

@ -1,5 +1,5 @@
[general]
version = 3
version = 4
name = High Quality
definition = builder_premium_small

2
resources/quality/builder_premium/bp_PET_Normal_Quality.inst.cfg
View file

@ -1,5 +1,5 @@
[general]
version = 3
version = 4
name = Normal
definition = builder_premium_small

2
resources/quality/builder_premium/bp_PLA_Coarse_Quality.inst.cfg
View file

@ -1,5 +1,5 @@
[general]
version = 3
version = 4
name = Coarse
definition = builder_premium_small

2
resources/quality/builder_premium/bp_PLA_High_Quality.inst.cfg
View file

@ -1,5 +1,5 @@
[general]
version = 3
version = 4
name = High Quality
definition = builder_premium_small

2
resources/quality/builder_premium/bp_PLA_Normal_Quality.inst.cfg
View file

@ -1,5 +1,5 @@
[general]
version = 3
version = 4
name = Normal
definition = builder_premium_small

2
resources/quality/builder_premium/bp_PVA_Coarse_Quality.inst.cfg
View file

@ -1,5 +1,5 @@
[general]
version = 3
version = 4
name = Coarse
definition = builder_premium_small

2
resources/quality/builder_premium/bp_PVA_High_Quality.inst.cfg
View file

@ -1,5 +1,5 @@
[general]
version = 3
version = 4
name = High Quality
definition = builder_premium_small

2
resources/quality/builder_premium/bp_PVA_Normal_Quality.inst.cfg
View file

@ -1,5 +1,5 @@
[general]
version = 3
version = 4
name = Normal
definition = builder_premium_small

2
resources/quality/builder_premium/bp_global_Coarse_Quality.inst.cfg
View file

@ -1,5 +1,5 @@
[general]
version = 3
version = 4
name = Coarse
definition = builder_premium_small

2
resources/quality/builder_premium/bp_global_High_Quality.inst.cfg
View file

@ -1,5 +1,5 @@
[general]
version = 3
version = 4
name = High Quality
definition = builder_premium_small

2
resources/quality/builder_premium/bp_global_Normal_Quality.inst.cfg
View file

@ -1,5 +1,5 @@
[general]
version = 3
version = 4
name = Normal
definition = builder_premium_small

2
resources/quality/cartesio/abs/cartesio_0.25_abs_high.inst.cfg
View file

@ -1,5 +1,5 @@
[general]
version = 3
version = 4
name = High
definition = cartesio

2
resources/quality/cartesio/abs/cartesio_0.25_abs_normal.inst.cfg
View file

@ -1,5 +1,5 @@
[general]
version = 3
version = 4
name = Normal
definition = cartesio

2
resources/quality/cartesio/abs/cartesio_0.4_abs_high.inst.cfg
View file

@ -1,5 +1,5 @@
[general]
version = 3
version = 4
name = High
definition = cartesio

2
resources/quality/cartesio/abs/cartesio_0.4_abs_normal.inst.cfg
View file

@ -1,5 +1,5 @@
[general]
version = 3
version = 4
name = Normal
definition = cartesio

2
resources/quality/cartesio/abs/cartesio_0.8_abs_coarse.inst.cfg
View file

@ -1,5 +1,5 @@
[general]
version = 3
version = 4
name = Coarse
definition = cartesio

2
resources/quality/cartesio/abs/cartesio_0.8_abs_extra_coarse.inst.cfg
View file

@ -1,5 +1,5 @@
[general]
version = 3
version = 4
name = Extra Coarse
definition = cartesio

2
resources/quality/cartesio/abs/cartesio_0.8_abs_high.inst.cfg
View file

@ -1,5 +1,5 @@
[general]
version = 3
version = 4
name = High
definition = cartesio

2
resources/quality/cartesio/abs/cartesio_0.8_abs_normal.inst.cfg
View file

@ -1,5 +1,5 @@
[general]
version = 3
version = 4
name = Normal
definition = cartesio

2
resources/quality/cartesio/arnitel/cartesio_0.4_arnitel2045_high.inst.cfg
View file

@ -1,5 +1,5 @@
[general]
version = 3
version = 4
name = High
definition = cartesio

2
resources/quality/cartesio/arnitel/cartesio_0.4_arnitel2045_normal.inst.cfg
View file

@ -1,5 +1,5 @@
[general]
version = 3
version = 4
name = Normal
definition = cartesio

2
resources/quality/cartesio/cartesio_global_Coarse_Quality.inst.cfg
View file

@ -1,5 +1,5 @@
[general]
version = 3
version = 4
name = Coarse
definition = cartesio

2
resources/quality/cartesio/cartesio_global_Extra_Coarse_Quality.inst.cfg
View file

@ -1,5 +1,5 @@
[general]
version = 3
version = 4
name = Extra Coarse
definition = cartesio

2
resources/quality/cartesio/cartesio_global_High_Quality.inst.cfg
View file

@ -1,5 +1,5 @@
[general]
version = 3
version = 4
name = High
definition = cartesio

2
resources/quality/cartesio/cartesio_global_Normal_Quality.inst.cfg
View file

@ -1,5 +1,5 @@
[general]
version = 3
version = 4
name = Normal
definition = cartesio

2
resources/quality/cartesio/hips/cartesio_0.25_hips_high.inst.cfg
View file

@ -1,5 +1,5 @@
[general]
version = 3
version = 4
name = High
definition = cartesio

2
resources/quality/cartesio/hips/cartesio_0.25_hips_normal.inst.cfg
View file

@ -1,5 +1,5 @@
[general]
version = 3
version = 4
name = Normal
definition = cartesio

2
resources/quality/cartesio/hips/cartesio_0.4_hips_high.inst.cfg
View file

@ -1,5 +1,5 @@
[general]
version = 3
version = 4
name = High
definition = cartesio

2
resources/quality/cartesio/hips/cartesio_0.4_hips_normal.inst.cfg
View file

@ -1,5 +1,5 @@
[general]
version = 3
version = 4
name = Normal
definition = cartesio

2
resources/quality/cartesio/hips/cartesio_0.8_hips_coarse.inst.cfg
View file

@ -1,5 +1,5 @@
[general]
version = 3
version = 4
name = Coarse
definition = cartesio

2
resources/quality/cartesio/hips/cartesio_0.8_hips_extra_coarse.inst.cfg
View file

@ -1,5 +1,5 @@
[general]
version = 3
version = 4
name = Extra Coarse
definition = cartesio

2
resources/quality/cartesio/hips/cartesio_0.8_hips_high.inst.cfg
View file

@ -1,5 +1,5 @@
[general]
version = 3
version = 4
name = High
definition = cartesio

2
resources/quality/cartesio/hips/cartesio_0.8_hips_normal.inst.cfg
View file

@ -1,5 +1,5 @@
[general]
version = 3
version = 4
name = Normal
definition = cartesio

2
resources/quality/cartesio/nylon/cartesio_0.25_nylon_high.inst.cfg
View file

@ -1,5 +1,5 @@
[general]
version = 3
version = 4
name = High
definition = cartesio

2
resources/quality/cartesio/nylon/cartesio_0.25_nylon_normal.inst.cfg
View file

@ -1,5 +1,5 @@
[general]
version = 3
version = 4
name = Normal
definition = cartesio

2
resources/quality/cartesio/nylon/cartesio_0.4_nylon_high.inst.cfg
View file

@ -1,5 +1,5 @@
[general]
version = 3
version = 4
name = High
definition = cartesio

2
resources/quality/cartesio/nylon/cartesio_0.4_nylon_normal.inst.cfg
View file

@ -1,5 +1,5 @@
[general]
version = 3
version = 4
name = Normal
definition = cartesio

2
resources/quality/cartesio/nylon/cartesio_0.8_nylon_coarse.inst.cfg
View file

@ -1,5 +1,5 @@
[general]
version = 3
version = 4
name = Coarse
definition = cartesio

2
resources/quality/cartesio/nylon/cartesio_0.8_nylon_extra_coarse.inst.cfg
View file

@ -1,5 +1,5 @@
[general]
version = 3
version = 4
name = Extra Coarse
definition = cartesio

2
resources/quality/cartesio/nylon/cartesio_0.8_nylon_high.inst.cfg
View file

@ -1,5 +1,5 @@
[general]
version = 3
version = 4
name = High
definition = cartesio

2
resources/quality/cartesio/nylon/cartesio_0.8_nylon_normal.inst.cfg
View file

@ -1,5 +1,5 @@
[general]
version = 3
version = 4
name = Normal
definition = cartesio

2
resources/quality/cartesio/pc/cartesio_0.25_pc_high.inst.cfg
View file

@ -1,5 +1,5 @@
[general]
version = 3
version = 4
name = High
definition = cartesio

2
resources/quality/cartesio/pc/cartesio_0.25_pc_normal.inst.cfg
View file

@ -1,5 +1,5 @@
[general]
version = 3
version = 4
name = Normal
definition = cartesio

2
resources/quality/cartesio/pc/cartesio_0.4_pc_high.inst.cfg
View file

@ -1,5 +1,5 @@
[general]
version = 3
version = 4
name = High
definition = cartesio

2
resources/quality/cartesio/pc/cartesio_0.4_pc_normal.inst.cfg
View file

@ -1,5 +1,5 @@
[general]
version = 3
version = 4
name = Normal
definition = cartesio

2
resources/quality/cartesio/pc/cartesio_0.8_pc_coarse.inst.cfg
View file

@ -1,5 +1,5 @@
[general]
version = 3
version = 4
name = Coarse
definition = cartesio

2
resources/quality/cartesio/pc/cartesio_0.8_pc_extra_coarse.inst.cfg
View file

@ -1,5 +1,5 @@
[general]
version = 3
version = 4
name = Extra Coarse
definition = cartesio

2
resources/quality/cartesio/pc/cartesio_0.8_pc_high.inst.cfg
View file

@ -1,5 +1,5 @@
[general]
version = 3
version = 4
name = High
definition = cartesio

2
resources/quality/cartesio/pc/cartesio_0.8_pc_normal.inst.cfg
View file

@ -1,5 +1,5 @@
[general]
version = 3
version = 4
name = Normal
definition = cartesio

2
resources/quality/cartesio/petg/cartesio_0.25_petg_high.inst.cfg
View file

@ -1,5 +1,5 @@
[general]
version = 3
version = 4
name = High
definition = cartesio

2
resources/quality/cartesio/petg/cartesio_0.25_petg_normal.inst.cfg
View file

@ -1,5 +1,5 @@
[general]
version = 3
version = 4
name = Normal
definition = cartesio

2
resources/quality/cartesio/petg/cartesio_0.4_petg_high.inst.cfg
View file

@ -1,5 +1,5 @@
[general]
version = 3
version = 4
name = High
definition = cartesio

2
resources/quality/cartesio/petg/cartesio_0.4_petg_normal.inst.cfg
View file

@ -1,5 +1,5 @@
[general]
version = 3
version = 4
name = Normal
definition = cartesio

2
resources/quality/cartesio/petg/cartesio_0.8_petg_coarse.inst.cfg
View file

@ -1,5 +1,5 @@
[general]
version = 3
version = 4
name = Coarse
definition = cartesio

2
resources/quality/cartesio/petg/cartesio_0.8_petg_extra_coarse.inst.cfg
View file

@ -1,5 +1,5 @@
[general]
version = 3
version = 4
name = Extra Coarse
definition = cartesio

2
resources/quality/cartesio/petg/cartesio_0.8_petg_high.inst.cfg
View file

@ -1,5 +1,5 @@
[general]
version = 3
version = 4
name = High
definition = cartesio

2
resources/quality/cartesio/petg/cartesio_0.8_petg_normal.inst.cfg
View file

@ -1,5 +1,5 @@
[general]
version = 3
version = 4
name = Normal
definition = cartesio

2
resources/quality/cartesio/pla/cartesio_0.25_pla_high.inst.cfg
View file

@ -1,5 +1,5 @@
[general]
version = 3
version = 4
name = High
definition = cartesio

2
resources/quality/cartesio/pla/cartesio_0.25_pla_normal.inst.cfg
View file

@ -1,5 +1,5 @@
[general]
version = 3
version = 4
name = Normal
definition = cartesio

2
resources/quality/cartesio/pla/cartesio_0.4_pla_high.inst.cfg
View file

@ -1,5 +1,5 @@
[general]
version = 3
version = 4
name = High
definition = cartesio

2
resources/quality/cartesio/pla/cartesio_0.4_pla_normal.inst.cfg
View file

@ -1,5 +1,5 @@
[general]
version = 3
version = 4
name = Normal
definition = cartesio

2
resources/quality/cartesio/pla/cartesio_0.8_pla_coarse.inst.cfg
View file

@ -1,5 +1,5 @@
[general]
version = 3
version = 4
name = Coarse
definition = cartesio

2
resources/quality/cartesio/pla/cartesio_0.8_pla_extra_coarse.inst.cfg
View file

@ -1,5 +1,5 @@
[general]
version = 3
version = 4
name = Extra Coarse
definition = cartesio

2
resources/quality/cartesio/pla/cartesio_0.8_pla_high.inst.cfg
View file

@ -1,5 +1,5 @@
[general]
version = 3
version = 4
name = High
definition = cartesio

2
resources/quality/cartesio/pla/cartesio_0.8_pla_normal.inst.cfg
View file

@ -1,5 +1,5 @@
[general]
version = 3
version = 4
name = Normal
definition = cartesio

2
resources/quality/cartesio/pva/cartesio_0.25_pva_high.inst.cfg
View file

@ -1,5 +1,5 @@
[general]
version = 3
version = 4
name = High
definition = cartesio

2
resources/quality/cartesio/pva/cartesio_0.25_pva_normal.inst.cfg
View file

@ -1,5 +1,5 @@
[general]
version = 3
version = 4
name = Normal
definition = cartesio

2
resources/quality/cartesio/pva/cartesio_0.4_pva_high.inst.cfg
View file

@ -1,5 +1,5 @@
[general]
version = 3
version = 4
name = High
definition = cartesio

2
resources/quality/cartesio/pva/cartesio_0.4_pva_normal.inst.cfg
View file

@ -1,5 +1,5 @@
[general]
version = 3
version = 4
name = Normal
definition = cartesio

2
resources/quality/cartesio/pva/cartesio_0.8_pva_coarse.inst.cfg
View file

@ -1,5 +1,5 @@
[general]
version = 3
version = 4
name = Coarse
definition = cartesio

2
resources/quality/cartesio/pva/cartesio_0.8_pva_extra_coarse.inst.cfg
View file

@ -1,5 +1,5 @@
[general]
version = 3
version = 4
name = Extra Coarse
definition = cartesio

2
resources/quality/cartesio/pva/cartesio_0.8_pva_high.inst.cfg
View file

@ -1,5 +1,5 @@
[general]
version = 3
version = 4
name = High
definition = cartesio

2
resources/quality/cartesio/pva/cartesio_0.8_pva_normal.inst.cfg
View file

@ -1,5 +1,5 @@
[general]
version = 3
version = 4
name = Normal
definition = cartesio

2
resources/quality/coarse.inst.cfg
View file

@ -1,5 +1,5 @@
[general]
version = 3
version = 4
name = Coarse Quality
definition = fdmprinter

2
resources/quality/deltacomb/deltacomb_abs_fast.inst.cfg
View file

@ -1,5 +1,5 @@
[general]
version = 3
version = 4
definition = deltacomb
name = Fast Quality (beta)

2
resources/quality/deltacomb/deltacomb_abs_high.inst.cfg
View file

@ -1,5 +1,5 @@
[general]
version = 3
version = 4
definition = deltacomb
name = High Quality (beta)

2
resources/quality/deltacomb/deltacomb_abs_normal.inst.cfg
View file

@ -1,5 +1,5 @@
[general]
version = 3
version = 4
definition = deltacomb
name = Normal Quality (beta)

2
resources/quality/deltacomb/deltacomb_nylon_fast.inst.cfg
View file

@ -1,5 +1,5 @@
[general]
version = 3
version = 4
name = Fast Quality (beta)
definition = deltacomb

2
resources/quality/deltacomb/deltacomb_nylon_high.inst.cfg
View file

@ -1,5 +1,5 @@
[general]
version = 3
version = 4
name = High Quality (beta)
definition = deltacomb

Some files were not shown because too many files have changed in this diff Show more