Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/nextcloud/desktop.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Schuster <michael@schuster.ms>2020-01-19 21:12:34 +0300
committerMichael Schuster <michael@schuster.ms>2020-01-19 21:12:34 +0300
commit03cddabfd026af3af0006bd73bb7733c8b7b73f3 (patch)
treefe97723505744b0cd7b4d351cb3e1b9544a62fa1
parent8c2d77c68f77b06be4f7e439e86a238b1534bf68 (diff)
Tray menu: Only show time ago (view too noisy)v2.7.0-beta1
Don't show date and time for now, rather as a tool tip later. Signed-off-by: Michael Schuster <michael@schuster.ms>
-rw-r--r--src/gui/tray/ActivityListModel.cpp3
-rw-r--r--src/gui/tray/UserModel.cpp2
2 files changed, 3 insertions, 2 deletions
diff --git a/src/gui/tray/ActivityListModel.cpp b/src/gui/tray/ActivityListModel.cpp
index a9b2efc64..f97af5eac 100644
--- a/src/gui/tray/ActivityListModel.cpp
+++ b/src/gui/tray/ActivityListModel.cpp
@@ -188,7 +188,8 @@ QVariant ActivityListModel::data(const QModelIndex &index, int role) const
case AccountRole:
return a._accName;
case PointInTimeRole:
- return a._id == -1 ? "" : QString("%1 - %2").arg(Utility::timeAgoInWords(a._dateTime.toLocalTime()), a._dateTime.toLocalTime().toString(Qt::DefaultLocaleShortDate));
+ //return a._id == -1 ? "" : QString("%1 - %2").arg(Utility::timeAgoInWords(a._dateTime.toLocalTime()), a._dateTime.toLocalTime().toString(Qt::DefaultLocaleShortDate));
+ return a._id == -1 ? "" : Utility::timeAgoInWords(a._dateTime.toLocalTime());
case AccountConnectedRole:
return (ast && ast->isConnected());
default:
diff --git a/src/gui/tray/UserModel.cpp b/src/gui/tray/UserModel.cpp
index b7dbc8fed..4c0ebdd1e 100644
--- a/src/gui/tray/UserModel.cpp
+++ b/src/gui/tray/UserModel.cpp
@@ -770,7 +770,7 @@ void UserModel::fetchCurrentActivityModel()
AccountAppList UserModel::appList() const
{
- if (_users.count() >= 1) {
+ if (_users.count() > 0) {
return _users[_currentUserId]->appList();
} else {
return AccountAppList();