Merge branch 'master' into feature-backup-manager

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

View File

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

View File

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

View File

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