Klaas Freitag
efb0faa14e
Folder: After sync, fire up tray notification if conflicts happened.
...
If there were conflicts, users want to have a tray notification that warn
about.
This will help for #3222
2016-04-05 16:37:54 +02:00
Klaas Freitag
73e2a503d7
NotificationWidget: Some ui refinements.
2016-04-04 12:46:00 +02:00
Klaas Freitag
bc6eebddf4
NotificationWidget: Handle empty message and subject properly.
2016-04-04 12:45:39 +02:00
Klaas Freitag
6b0d535120
Merge branch 'notifications'
2016-04-04 10:40:33 +02:00
Christian Kamm
e05819370b
Fix invalid read on account removal
2016-03-31 09:00:32 +02:00
Daniel Molkentin
9ea191f63d
Scale correctly with HiDPI displays on Linux with Qt 5.6
2016-03-30 18:25:30 +02:00
Olivier Goffart
cdbc25ede8
Merge pull request #4615 from owncloud/socketApiRefactor
...
Socket API refactor
2016-03-30 13:24:10 +02:00
Jocelyn Turcotte
a0260c29c0
Fix the build on Windows
2016-03-30 12:19:09 +02:00
ckamm
98995f45e6
Merge pull request #4618 from ckamm/progressui
...
Progress layout adjustments
2016-03-30 09:22:27 +02:00
Christian Kamm
5636dc1386
Tooltip updater: Fix compile with Qt4
2016-03-30 09:21:28 +02:00
Klaas Freitag
885f8b382f
ActivityWidget: Handle plural properly in translations.
...
Even for the case where the number is fixed.
Also fix the translators comments.
2016-03-29 18:01:54 +02:00
Klaas Freitag
8166c52f4a
NotificationHandling: Use QByteArray for the verb.
2016-03-29 18:01:49 +02:00
Jocelyn Turcotte
fbf23b6abb
Cleanup after the SyncFileStatusTracker change
...
- Add missing explicit keywords
- Add doc
- Comment out verbose and partly redundant qDebug statements
2016-03-29 17:39:30 +02:00
Klaas Freitag
cd3f612857
ActivityWidget: Rename blacklistActivities to blacklistNotifications.
2016-03-29 16:50:58 +02:00
Klaas Freitag
2e30a0e5bc
Remove superflous iterator increment
2016-03-29 16:50:15 +02:00
Klaas Freitag
cacb751ab8
Cleaups based on review feedback.
2016-03-29 14:38:11 +02:00
Klaas Freitag
4d59f5ec66
ActivityData: Declare operators outside the class
2016-03-29 14:09:19 +02:00
Klaas Freitag
69e8e15884
Remove explicit time spec specification as it is not needed.
2016-03-29 13:59:08 +02:00
Daniel Molkentin
1730569f77
No Q_NULLPTR in Qt 4.8
2016-03-29 13:28:11 +02:00
Christian Kamm
c5fbde412c
Folder info layout adjustments #3403
...
* Remove duplicate remote path
* Use thin progress bar
* Move bandwidth and file info to tooltip
* Shorten overall progress message
This also fixes #4562 by making the layout not dependent on the
width of the displayed text.
2016-03-29 12:45:01 +02:00
Christian Kamm
10a7128d1a
Update QTreeView tooltips as they change #3403
2016-03-29 12:26:09 +02:00
Christian Kamm
41f43feecf
Add utility function for shorter time duration strings #3403
2016-03-29 12:26:09 +02:00
Christian Kamm
ffbd5df25f
Account UI: Fix log out button text #4578
2016-03-29 12:14:53 +02:00
Jocelyn Turcotte
69aa39f1f6
Don's use SyncFileStatus for Folder::createGuiLog
...
SyncFileStatus' purpose is to track overlay icon status.
Instead of putting comments and default: clauses in switch
on both sides about unused enums, use different enums.
This also remove STATUS_NEW which is the equivalent of
STATUS_SYNC in all shell extension implementations, and
remove STATUS_UPDATED and STATUS_STAT_ERROR which have
the same semantic as STATUS_UPTODATE and STATUS__ERROR.
2016-03-28 14:29:47 +02:00
Jocelyn Turcotte
ea5e6d367b
Connect the SocketApi directly to the SyncFileStatusTracker
...
Don't go through the Folder->ProgressDispatcher->SocketApi route and
keep the path logic in SyncFileStatusTracker.
2016-03-28 14:29:47 +02:00
Jocelyn Turcotte
da7b9916e5
Move the SocketApi business logic to a libsync SyncFileStatusTracker class
...
This will allow testing this code and avoid going through too many
layers to get notified and a file status changed.
2016-03-28 14:29:47 +02:00
Jocelyn Turcotte
dac4bd8370
Remove null-checks for FolderMan::_socketApi
...
It's now created in the constructor and won't be null.
2016-03-28 14:29:47 +02:00
Jocelyn Turcotte
6e16e34799
Remove SocketApi::dbFileRecord_capi in favor of JournalDB::getFileRecord
2016-03-28 14:29:47 +02:00
Jocelyn Turcotte
6d3fe9d865
Remove the tainted folder logic
...
This currently is no-op code since the socket API isn't notified
that the tainted folder list changed, and the result is the same
since a sync will be triggered within the next 5 seconds and the
modified folder will be shown as SYNC at that point anyway.
Removing the dependency to the file watcher allows moving the
status estimation logic to libsync.
2016-03-28 14:29:47 +02:00
Jocelyn Turcotte
c090a511fd
Remove OwnCloud6 specific sharing code
...
If users encounter this situation, the share icon will simply not show.
This simplifies the transition to move this code in libsync.
2016-03-28 14:29:47 +02:00
Jocelyn Turcotte
2d2c7bc9b8
Move the SyncEngine construction to the Folder constructor
...
The SyncEngine is now created only once, at construction of the
Folder, instead of being reconstructed on each sync.
2016-03-28 13:26:38 +02:00
Jocelyn Turcotte
df386b64ba
Make the AccountState a construction argument of the Folder
...
This will help moving the SyncEngine construction in the constructor
and allow moving functionalities from Folder to SyncEngine or its
delegated objects.
2016-03-28 13:07:28 +02:00
Daniel Molkentin
7730e826b0
Merge pull request #4580 from owncloud/implement_ep_1136
...
Implement EP 1136
2016-03-24 14:58:09 +01:00
Daniel Molkentin
2d24585a8f
Implement enforcing a static URL postfix.
...
Second part of EP 1136
2016-03-24 14:18:52 +01:00
Klaas Freitag
1fe5d6bb0c
Notifications: Handle Notifications without an action.
...
The policy that was said is that if a notification has no action, the
client can and should display a close-button. This patch does it.
In additon to that, the client needs a blacklist of closed notifcations
otherwise they would re-appear next time the server notifications are
fetched again.
Also, changed the cleanup of not-longer-used widgets to be more robust.
2016-03-23 17:02:13 +01:00
Klaas Freitag
0c944a06f9
NotificationWidgetUI: Fix sizing and sizePolicy
2016-03-23 16:49:25 +01:00
Klaas Freitag
1bb3a4a45d
NotificationWidget: Remove accountName() and add activity() method.
2016-03-23 16:48:38 +01:00
Klaas Freitag
161d21904a
ActivityData: Add source file for implementation details
...
Add the ident() method and operators.
2016-03-23 16:47:13 +01:00
Klaas Freitag
f70c6282ca
Notifications: Remove unused variable.
2016-03-22 11:38:10 +01:00
Klaas Freitag
ad60e8ac89
Notifications: Fix handling of notifications to remove from the list.
...
If a notification is not longer in the list of notifications coming from
the server, it needs to be removed from the widget list.
2016-03-22 10:35:24 +01:00
Klaas Freitag
d03fcc95e4
Notifications: Maintain a timeSinceLastCheck for every Account.
...
In multi-account environment every account needs the own counter.
2016-03-22 09:58:30 +01:00
Daniel Molkentin
fb75adcd57
Wizard: Implement alternative forms of inquiring about the userID
...
Settable in the theme.
2016-03-21 23:50:48 +01:00
Klaas Freitag
d407aacc4a
Notifications: remove notification widgets if the notification is gone.
...
If a notification is not longer in the list that comes from the
server, the notification is removed.
That is mainly for the notifications that are created by the
announcement application
2016-03-21 16:32:37 +01:00
Klaas Freitag
b9663456d8
Notifications: Refresh the notifications based on a config value.
...
Pulls a timer that polls for new notifications regularly. Add
Config file method for the interval value.
2016-03-18 16:28:20 +01:00
Christian Kamm
03db1894d8
Fix wizardSelectiveSyncDefaultNothing #4581
2016-03-18 13:52:45 +01:00
Christian Kamm
ff4cdc3161
Quota: Change quota path if single folder #4460
...
Since the quota is a per-folder value, this will make the displayed data
more useful when a single sync folder is configured.
Of course each subfolder could have a different quota again.
2016-03-18 13:34:49 +01:00
Klaas Freitag
7f22a07312
Notifications: Check if the account is connected before querying.
...
Also avoid memory leaks if it is not connected.
2016-03-18 12:29:09 +01:00
Klaas Freitag
328d254f7f
Notifications: Remove "done" notification widgets after fife seconds.
2016-03-18 11:25:14 +01:00
Klaas Freitag
0a590b7cbe
Notifications: Give feedback if notifcation request succeeded.
...
Also display a time stamp.
2016-03-18 10:02:11 +01:00
Klaas Freitag
05de710b67
Notifications: Display timestamp of the notification in the widget
2016-03-18 08:21:54 +01:00