GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-06-20 14:43:20 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into feature-backup-manager

Browse Source
This commit is contained in:
ChrisTerBeke 2018-05-16 13:41:57 +02:00
commit 419d521e09
3 changed files with 24 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
plugins/Toolbox/resources/qml/ToolboxDetailTile.qml
View File

@ -59,14 +59,17 @@ Item
id: installButton id: installButton
active: toolbox.isDownloading && toolbox.activePackage == model active: toolbox.isDownloading && toolbox.activePackage == model
complete: tile.installed complete: tile.installed
readyAction: function() { readyAction: function()
{
toolbox.activePackage = model toolbox.activePackage = model
toolbox.startDownload(model.download_url) toolbox.startDownload(model.download_url)
} }
activeAction: function() { activeAction: function()
{
toolbox.cancelDownload() toolbox.cancelDownload()
} }
completeAction: function() { completeAction: function()
{
toolbox.viewCategory = "installed" toolbox.viewCategory = "installed"
} }
// Don't allow installing while another download is running // Don't allow installing while another download is running

6
plugins/Toolbox/resources/qml/ToolboxInstalledTileActions.qml
View File

@ -18,11 +18,13 @@ Column
readyLabel: catalog.i18nc("@action:button", "Update") readyLabel: catalog.i18nc("@action:button", "Update")
activeLabel: catalog.i18nc("@action:button", "Updating") activeLabel: catalog.i18nc("@action:button", "Updating")
completeLabel: catalog.i18nc("@action:button", "Updated") completeLabel: catalog.i18nc("@action:button", "Updated")
readyAction: function() { readyAction: function()
{
toolbox.activePackage = model toolbox.activePackage = model
toolbox.update(model.id) toolbox.update(model.id)
} }
activeAction: function() { activeAction: function()
{
toolbox.cancelDownload() toolbox.cancelDownload()
} }
// Don't allow installing while another download is running // Don't allow installing while another download is running

14
resources/qml/Settings/SettingView.qml
View File

@ -179,6 +179,15 @@ Item
height: visible ? UM.Theme.getSize("setting_control").height : 0 height: visible ? UM.Theme.getSize("setting_control").height : 0
Behavior on height { NumberAnimation { duration: 100 } } Behavior on height { NumberAnimation { duration: 100 } }
Timer
{
id: settingsSearchTimer
onTriggered: filter.editingFinished()
interval: 500
running: false
repeat: false
}
TextField TextField
{ {
id: filter; id: filter;
@ -201,6 +210,11 @@ Item
property bool lastFindingSettings: false property bool lastFindingSettings: false
onTextChanged: onTextChanged:
{
settingsSearchTimer.restart()
}
onEditingFinished:
{ {
definitionsModel.filter = {"i18n_label": "*" + text}; definitionsModel.filter = {"i18n_label": "*" + text};
findingSettings = (text.length > 0); findingSettings = (text.length > 0);