commit 3e0c7ad07bdd1d82ce22918e85669b1029de3beb Author: Jonathan Riddell Date: Tue May 23 12:24:52 2017 +0100 Update version number for 5.8.7 GIT_SILENT diff --git a/CMakeLists.txt b/CMakeLists.txt index a870634..a1d7df9 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,5 +1,5 @@ project(libksysguard) -set(PROJECT_VERSION "5.8.6") +set(PROJECT_VERSION "5.8.7") set(PROJECT_VERSION_MAJOR 5) cmake_minimum_required(VERSION 2.8.12 FATAL_ERROR) commit acb088749af1678814fe7718886ca36209b02e79 Author: Marco Martin Date: Thu Mar 30 19:33:50 2017 +0200 don't reset the view to the top on gaining focus when the listview gained focus, it used to reset the view position to the first element, but this both lost the previously selected item and was a really weird behavior especially when the focus was gained by click rather than keyboard navigation, and was often seen as a bug. reviewed-by:David Edmundson BUG:363420 diff --git a/processui/ksysguardprocesslist.cpp b/processui/ksysguardprocesslist.cpp index 44603de..dac6f9a 100644 --- a/processui/ksysguardprocesslist.cpp +++ b/processui/ksysguardprocesslist.cpp @@ -1437,15 +1437,6 @@ bool KSysGuardProcessList::eventFilter(QObject *obj, QEvent *event) { return true; } } - } else if (event->type() == QEvent::FocusIn) { - if (obj == d->mUi->treeView && !d->mUi->treeView->selectionModel()->hasSelection()) { - // treeview is focused, but there is no current selection. select the first row - d->mUi->treeView->setCurrentIndex(d->mUi->treeView->model()->index(0, 0)); - } else if (obj == d->mUi->txtFilter) { - // text field is focused, so clear treeview selection to communicate that you will not - // interact with any elements in the view until the view is focused explicitly - d->mUi->treeView->setCurrentIndex(QModelIndex()); - } } return false; } commit f09aa9ce4fb54a7f25692dfa40c54b745506cb0c Author: l10n daemon script Date: Mon Mar 27 05:11:43 2017 +0200 SVN_SILENT made messages (.desktop file) - always resolve ours In case of conflict in i18n, keep the version of the branch "ours" To resolve a particular conflict, "git checkout --ours path/to/file.desktop" diff --git a/processcore/actions.actions b/processcore/actions.actions index ebf0d15..0f5e5e3 100644 --- a/processcore/actions.actions +++ b/processcore/actions.actions @@ -296,7 +296,7 @@ Description[fy]=Feroaret de leaflikheid fan in oantsjutte proses Description[ga]=Athraigh tosaíocht próisis áirithe Description[gl]=Troca o valor nice dun proceso dado Description[he]=שינוי את ה־niceness של תהליך נתון -Description[hr]=Promijeni procesorski udio (nice) za dani proces +Description[hr]=Promijeni procesorski udio (nice) za dani proces Description[hu]=Egy processzus prioritásának (nice) módosítása Description[ia]=Cambia le sympathia (prioritate) de un date processo Description[id]=Ubah kebaikan proses yang diberikan commit 656a6a9e2894d923feb479c4594d0c2c681f6989 Author: Jonathan Riddell Date: Tue Feb 21 11:44:25 2017 +0000 Update version number for 5.8.6 GIT_SILENT diff --git a/CMakeLists.txt b/CMakeLists.txt index 6a410e7..a870634 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,5 +1,5 @@ project(libksysguard) -set(PROJECT_VERSION "5.8.5") +set(PROJECT_VERSION "5.8.6") set(PROJECT_VERSION_MAJOR 5) cmake_minimum_required(VERSION 2.8.12 FATAL_ERROR) commit 30c0bb3332f9896c258b346389fe29caec35680d Author: Jonathan Riddell Date: Tue Dec 27 09:27:44 2016 +0000 Update version number for 5.8.5 GIT_SILENT diff --git a/CMakeLists.txt b/CMakeLists.txt index 4248b72..6a410e7 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,5 +1,5 @@ project(libksysguard) -set(PROJECT_VERSION "5.8.4") +set(PROJECT_VERSION "5.8.5") set(PROJECT_VERSION_MAJOR 5) cmake_minimum_required(VERSION 2.8.12 FATAL_ERROR)