chylex/Nextcloud-Desktop
1
0
Fork 0
mirror of https://github.com/chylex/Nextcloud-Desktop.git synced 2024-09-29 00:42:45 +02:00
Code
16,714 Commits 4 Branches 173 Tags 91 MiB
v3.3.0
Commit Graph

234 Commits

Author SHA1 Message Date
Felix Weilbach
7bb0c588c1 Don't constrain size of hover background 
Signed-off-by: Felix Weilbach <felix.weilbach@nextcloud.com>
 2021-07-28 10:29:04 +00:00
Felix Weilbach
a421ebf01c Make main dialog normal window when displayed as regular window 
This will enable users to minimize the dialog.

Signed-off-by: Felix Weilbach <felix.weilbach@nextcloud.com>
 2021-07-22 10:34:13 +02:00
Camila
6886d6213a
Add custom component ActivityItem. 
That also addresses QML warnings.

Signed-off-by: Camila <hello@camila.codes>
 2021-07-21 17:03:26 +02:00
Camila
79dd4f73fe Fix QML warning: Unable to assign [undefined] to QFont. 
Signed-off-by: Camila <hello@camila.codes>
 2021-07-21 14:46:04 +00:00
Felix Weilbach
4e95e32791 Call setClosed() on correct Object 
Signed-off-by: Felix Weilbach <felix.weilbach@nextcloud.com>
 2021-07-20 12:56:00 +02:00
Matthieu Gallien
064f64f06d fix width of user status message to not overlap other elements 
Signed-off-by: Matthieu Gallien <matthieu.gallien@nextcloud.com>
 2021-07-16 15:19:20 +00:00
Matthieu Gallien
260e1d77f5 clean indentation in UserLine.qml 
Signed-off-by: Matthieu Gallien <matthieu.gallien@nextcloud.com>
 2021-07-16 15:19:20 +00:00
Matthieu Gallien
c2602135ab fix size of the Label with user status 
ensure the label width is not higher than the parent to ensure log
string get elided as expected

Signed-off-by: Matthieu Gallien <matthieu.gallien@nextcloud.com>
 2021-07-16 13:04:33 +00:00
Felix Weilbach
036db9d22d Position main dialog on at tray icon if not a regular window 
Signed-off-by: Felix Weilbach <felix.weilbach@nextcloud.com>
 2021-07-14 18:27:50 +02:00
Felix Weilbach
efaccbd6fd Show main dialog as normal window if tray icons not available 
Fixes #3307

Signed-off-by: Felix Weilbach <felix.weilbach@nextcloud.com>
 2021-07-12 14:10:26 +00:00
Matthieu Gallien
c27fc1be4a use fallback icons for activities without icons 
Signed-off-by: Matthieu Gallien <matthieu.gallien@nextcloud.com>
 2021-06-30 11:28:13 +00:00
Matthieu Gallien
269d225511 directly send the icon url for activities to teh qml component 
should allow usage of default cache from Image qml standard component

Signed-off-by: Matthieu Gallien <matthieu.gallien@nextcloud.com>
 2021-06-30 11:28:12 +00:00
Camila
7ddc4ca170 Remove extra RowLayout. 
Signed-off-by: Camila <hello@camila.codes>
 2021-06-16 07:55:33 +00:00
Camila
449fda16e1 Fix QML Warning: ReferenceError: PopupMenu is not defined. 
Signed-off-by: Camila <hello@camila.codes>
 2021-06-16 07:55:33 +00:00
Camila
19e581657d Fix QML warning: Cannot specify left, right... anchors for items inside Row. 
Signed-off-by: Camila <hello@camila.codes>
 2021-06-16 07:55:33 +00:00
Camila
5585f61cc0 Fix QML warning: Detected anchors on an item that is managed by a layout. 
Signed-off-by: Camila <hello@camila.codes>
 2021-06-16 07:55:33 +00:00
Camila
c8edb11228 Fix QML warning: Accessible must be attached to an Item. 
Signed-off-by: Camila <hello@camila.codes>
 2021-06-16 07:55:33 +00:00
allexzander
a3d12a616b Add error message to GUI. 
Signed-off-by: allexzander <blackslayer4@gmail.com>
 2021-06-15 14:33:45 +03:00
Camila
f758157973 Fix aligment emoji + message on Windows. 
Signed-off-by: Camila <hello@camila.codes>
 2021-05-25 06:55:53 +00:00
Camila
8d2264e027 Display the user status emoji separated from the message. 
It allows to align the emoji with the message.

Signed-off-by: Camila <hello@camila.codes>
 2021-05-25 06:55:53 +00:00
Camila
1cb7f63575 Remove signal refreshCurrentUserGui. 
Use only QML property bindings to refresh the UI.

Signed-off-by: Camila <hello@camila.codes>
 2021-05-25 06:55:53 +00:00
Camila
46f7cd3884 User property isConnected instead of a invokable. 
Remove unnecessary connection to refreshCurrentUserGui signal.

Signed-off-by: Camila <hello@camila.codes>
 2021-05-25 06:55:53 +00:00
Camila
1adde8d547 serverUserStatus => serverHasUserStatus. 
Signed-off-by: Camila <hello@camila.codes>
 2021-05-25 06:55:53 +00:00
Camila
73da14040b Rename ServerUserStatusRole to ServerHasUserStatusRole. 
- serverHasUserStatus Q_PROPERTY is CONSTANT.
- Fix code style.

Signed-off-by: Camila <hello@camila.codes>
 2021-05-25 06:55:53 +00:00
Camila
828881d82a Do not display the folder status if there are no folders being synced. 
Signed-off-by: Camila <hello@camila.codes>
 2021-05-25 06:55:53 +00:00
Camila
4326eb53ba Fix margins and sizes to align both avatar + user status displays. 
Signed-off-by: Camila <hello@camila.codes>
 2021-05-25 06:55:52 +00:00
Camila
f7e9e31bc9 Rename isDesktopNotificationsAllowed property to desktopNotificationsAllowed. 
- User !== instead of !=.
- Fix code style.

Signed-off-by: Camila <hello@camila.codes>
 2021-05-25 06:55:52 +00:00
Camila
820e97cd9b Do not display the user status if there is no pre defined message. 
Display the server url instead.

Signed-off-by: Camila <hello@camila.codes>
 2021-05-25 06:55:52 +00:00
Camila
c793cbe593 Always display the server url in the drop down account menu. 
Signed-off-by: Camila <hello@camila.codes>
 2021-05-25 06:55:52 +00:00
Camila
419595ce5e Use DesktopNotificationsAllowedRole to check if user is online. 
Rename ServerUserStatus to ServerUserStatusRole.

Signed-off-by: Camila <hello@camila.codes>
 2021-05-25 06:55:52 +00:00
Camila
bd65eee278 Remove unused methods in UserModel. 
Signed-off-by: Camila <hello@camila.codes>
 2021-05-25 06:55:52 +00:00
Camila
671b099c98 Check if the user is connected and if the server supports user status. 
Signed-off-by: Camila <hello@camila.codes>
 2021-05-25 06:55:52 +00:00
Felix Weilbach
696979cb0e Display invalid filenames as warning 
Signed-off-by: Felix Weilbach <felix.weilbach@nextcloud.com>
 2021-04-13 14:58:51 +00:00
Felix Weilbach
b736355985 Add notification cache 
The notification cache helps to not display duplicate desktop
notifications to the user.

Signed-off-by: Felix Weilbach <felix.weilbach@nextcloud.com>
 2021-04-13 14:58:50 +00:00
Camila
29f4a3857b Reposition qml elements for the folder status icon. 
Signed-off-by: Camila <hello@camila.codes>
 2021-04-08 07:10:59 +00:00
Camila
50de12b3c3 Undo unnecessary removal of lines. 
Signed-off-by: Camila <hello@camila.codes>
 2021-04-08 07:10:59 +00:00
Camila
163015492a Fix #3067: missing apps icon. 
Signed-off-by: Camila <hello@camila.codes>
 2021-04-08 07:10:59 +00:00
Camila
d2b762aa66 Move curly brackets to the correct line. 
Signed-off-by: Camila <hello@camila.codes>
 2021-04-08 07:10:59 +00:00
Camila
98cfc362f7 Remove const and reference of base types. 
Signed-off-by: Camila <hello@camila.codes>
 2021-04-08 07:10:58 +00:00
Camila
9219926a74
Add checks in case userStatus is not available/fails on the server side. 
Signed-off-by: Camila <hello@camila.codes>
 2021-03-24 15:42:26 +01:00
Camila
d9a0778e52
Add UserStatus enum with the pre defined status. 
- User QHash to map status strings and Status enum.

Signed-off-by: Camila <hello@camila.codes>
 2021-03-24 15:41:31 +01:00
Camila
974e2fb718
Do not display notifications when user status is do not disturb. 
- This information is retrieved from the notifications endpoint.
- Add icons for the different pre defined status.
- Make functions available to QML to decide which status icon to display.
- Display the user status icon on the avatar and
move the online/offline connection status to the folder icon.

Signed-off-by: Camila <hello@camila.codes>
 2021-03-24 15:40:05 +01:00
Camila
f4d8699db8
Add UserStatus class to retrieve the user status. 
- AccountState controls UserStatus.
- Display user status in the system tray menu next to user's avatar.

Signed-off-by: Camila <hello@camila.codes>
 2021-03-24 15:39:13 +01:00
Felix Weilbach
e3ac63e9ff Rename isActivityIgnored() to isUnsolvableconflict() 
Signed-off-by: Felix Weilbach <felix.weilbach@nextcloud.com>
 2021-03-11 09:42:38 +00:00
Felix Weilbach
05d31e2e53 Split content of User::isValueableActivity() 
Refactoring of User::isValueableactivity() because of changes
introduced with merge commit f17c52d.

Signed-off-by: Felix Weilbach <felix.weilbach@nextcloud.com>
 2021-03-11 09:42:38 +00:00
Felix Weilbach
63dbb90bbd Iteration 
Signed-off-by: Felix Weilbach <felix.weilbach@nextcloud.com>
 2021-03-05 11:32:44 +00:00
Felix Weilbach
ef5abac567 Fix crashes with conflict dialog 
When the client runs and a conflict gets detected, the sync engine runs
two times.

On the first run, the sync engine detects the conflict, marks the
file as a conflict and propagates that to the GUI. This leads to an
error notification with the original filename in the main dialog.

The sync engine runs then a second time. On this second run, the file
that originally caused the conflict is not anymore a conflict
file. Instead, the sync engine detects the conflicted copy and
propagates that file as a conflict to the GUI.

When opening the conflict dialog with the original file name (not the
conflicted copy) a crash happens. Usually, the two sync runs are really
fast, so the user does not notice the first notification. However, a
problem can occur if a conflict gets created while the client is not
running. Since then, the client does not do two sync runs. It does only
run once.

Signed-off-by: Felix Weilbach <felix.weilbach@nextcloud.com>
 2021-03-05 11:32:44 +00:00
allexzander
013f3cea70 Validate sensitive URLs to onle allow http(s) schemes. 
Signed-off-by: allexzander <blackslayer4@gmail.com>
 2021-02-09 15:00:35 +02:00
allexzander
8c4d5333c1 Use push notifications for Tray activities/notifications fetch trigger. 
Signed-off-by: allexzander <blackslayer4@gmail.com>
 2021-01-27 19:53:28 +02:00
Felix Weilbach
51d8cf8102 Start file conflict resolve dialog asynchronous 
Fixes #2804

Signed-off-by: Felix Weilbach <felix.weilbach@t-online.de>
 2021-01-27 08:01:25 +00:00