mirrors/nextcloud-desktop
1
0
Fork 0
mirror of https://github.com/nextcloud/desktop.git synced 2024-12-22 21:50:30 +03:00
Code Issues Projects Releases Packages Wiki Activity
16749 commits 486 branches 258 tags 464 MiB
Commit graph

3193 commits

Author SHA1 Message Date
Felix Weilbach
03610cb706 Set button on QMessageBox before changing the text 
Signed-off-by: Felix Weilbach <felix.weilbach@nextcloud.com>
 2021-05-27 07:39:50 +00: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
2caa9ccfc6 Add Q_UNREACHABLE() after switch statements in UserStatus. 
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
dc01b76066 Fix code style. 
Signed-off-by: Camila <hello@camila.codes>
 2021-05-25 06:55:52 +00:00
Camila
93227ab08b Check if new value is different from the current one. 
In AccountState::setDesktopNotificationsAllowed.

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
Camila
e3b96ddc85 Move stringToEnum and enumToString to an anonymous namespace. 
Signed-off-by: Camila <hello@camila.codes>
 2021-05-25 06:55:52 +00:00
Camila
1f61d258bb Fix user status message alignment. 
Signed-off-by: Camila <hello@camila.codes>
 2021-05-25 06:55:52 +00:00
rakekniven
793c211232
Merge branch 'master' into Valdnet-patch-3 2021-05-20 07:47:17 +02:00
Felix Weilbach
32b7e62359 Warn user if using e2ee and vfs together 
Signed-off-by: Felix Weilbach <felix.weilbach@nextcloud.com>
 2021-05-18 11:50:18 +00:00
Valdnet
a3b2dc669c
One more apostrophe change 
Signed-off-by: Valdnet <47037905+Valdnet@users.noreply.github.com>
 2021-05-12 12:45:33 +02:00
Valdnet
dadddd7ea2 l10n: Replace apostrophe with double quotation 
Signed-off-by: Valdnet <47037905+Valdnet@users.noreply.github.com>
 2021-05-12 12:34:22 +02:00
allexzander
bbf11d7e7a Temporary! Windows. VFS. Block Virtual Files for partition root sync folders. 
Signed-off-by: allexzander <blackslayer4@gmail.com>
 2021-05-11 18:53:35 +03:00
Matthieu Gallien
54d91cdd7b also update ownCloud years interval in copyright notice 
Signed-off-by: Matthieu Gallien <matthieu_gallien@yahoo.fr>
 2021-05-10 10:29:22 +00:00
Matthieu Gallien
86dda5675f send OS name and version to auto updater to allow selective upgrades 
in order to be able to suuport legacy OS, also sends the OS name and
version

will be used to detect Windows 8.1 and similar legacy versions

Signed-off-by: Matthieu Gallien <matthieu_gallien@yahoo.fr>
 2021-05-06 09:32:09 +00:00
Hannah von Reth
adb56178b9 GetLastError() needs to be called when the error happens 
qDebug might clear it already

Signed-off-by: Matthieu Gallien <matthieu_gallien@yahoo.fr>
 2021-05-06 07:35:59 +00:00
rakekniven
6d23e93d31
Changed copyright year to 2021 
Fix for #3258 

Signed-off-by: rakekniven <2069590+rakekniven@users.noreply.github.com>
 2021-05-05 13:37:31 +02:00
Felix Weilbach
aadee15008 Fallback to primary screen if screen under pointer not found 
Fixes #3252

Signed-off-by: Felix Weilbach <felix.weilbach@nextcloud.com>
 2021-05-05 11:56:46 +02:00
rakekniven
33ef3a1d1e
Merge branch 'master' into rakekniven-patch-2 2021-04-30 14:38:23 +02:00
Valdnet
dc6518a4ee
l10n: Translation of ellipse 
Signed-off-by: Valdnet <47037905+Valdnet@users.noreply.github.com>
 2021-04-30 13:57:02 +02:00
rakekniven
0e12b0323e
No need to translate ellipsis 
Here another PR for the same code line as #3238 

Signed-off-by: rakekniven <2069590+rakekniven@users.noreply.github.com>
 2021-04-30 13:27:18 +02:00
Valdnet
f431649bad l10n: Change to an ellipsis 
Signed-off-by: Valdnet <47037905+Valdnet@users.noreply.github.com>
 2021-04-30 08:19:25 +00:00
allexzander
e72013fed1 Fix Felix's comments. 
Signed-off-by: allexzander <blackslayer4@gmail.com>
 2021-04-29 07:43:21 +00:00
allexzander
19e2d70c53 Final corrections and refactoring. 
Signed-off-by: allexzander <blackslayer4@gmail.com>
 2021-04-29 07:43:21 +00:00
allexzander
deb9ba89f0 Only show password option for email shares. 
Signed-off-by: allexzander <blackslayer4@gmail.com>
 2021-04-29 07:43:21 +00:00
allexzander
526fa399dc Fix review comments. 
Signed-off-by: allexzander <blackslayer4@gmail.com>
 2021-04-29 07:43:20 +00:00
allexzander
c908183044 Use separate progress indicator for password and replace a button with it while running. 
Signed-off-by: allexzander <blackslayer4@gmail.com>
 2021-04-29 07:43:20 +00:00
allexzander
0072d39ca0 Fix review comments. 
Signed-off-by: allexzander <blackslayer4@gmail.com>
 2021-04-29 07:43:20 +00:00
allexzander
2d88fc6c99 Obey enforced password for share by email. 
Signed-off-by: allexzander <blackslayer4@gmail.com>
 2021-04-29 07:43:20 +00:00
Valdnet
8aedc74838 l10n: Delete space and change capital letter 
Signed-off-by: Valdnet <47037905+Valdnet@users.noreply.github.com>
 2021-04-28 11:41:06 +00:00
allexzander
e7e5542d3e Improve public link sharing UI. Fix UX issues. 
Signed-off-by: allexzander <blackslayer4@gmail.com>
 2021-04-27 13:51:52 +03:00
Felix Weilbach
9a88e38121 Call finish() if going to remove all files 
While investigating #3172, I discoverd that the sync will hang forever
if the user has deleted all files on the server. Calling the callback
resolves the problem.

Signed-off-by: Felix Weilbach <felix.weilbach@nextcloud.com>
 2021-04-26 12:50:14 +00:00
Valdnet
796b4e4e72 l10n: Change to an ellipsis 
Reported on Transifex.

Signed-off-by: Valdnet <47037905+Valdnet@users.noreply.github.com>
 2021-04-22 07:40:15 +00:00
Felix Weilbach
275e46f0db Show progess indicator 
Signed-off-by: Felix Weilbach <felix.weilbach@nextcloud.com>
 2021-04-20 07:13:23 +00:00
Felix Weilbach
c3fac23903 Don't delete note and expiration date on toggle 
Signed-off-by: Felix Weilbach <felix.weilbach@nextcloud.com>
 2021-04-20 07:13:23 +00:00
Felix Weilbach
8711d5bf49 Don't use unnecessary layout element 
Signed-off-by: Felix Weilbach <felix.weilbach@nextcloud.com>
 2021-04-20 07:13:23 +00:00
Felix Weilbach
2851528595 Show user/group note on share if already set 
Signed-off-by: Felix Weilbach <felix.weilbach@nextcloud.com>
 2021-04-20 07:13:23 +00:00
Felix Weilbach
22a3b19e08 Add expire date to user and group share 
Fixes #3100

Signed-off-by: Felix Weilbach <felix.weilbach@nextcloud.com>
 2021-04-20 07:13:23 +00:00
Felix Weilbach
946a51e4c1 Add note to user and group share 
Fixes #3104

Signed-off-by: Felix Weilbach <felix.weilbach@nextcloud.com>
 2021-04-20 07:13:23 +00:00
Matthieu Gallien
20357ca7fa Revert "Add CMake option to enable address sanitizers" 
This reverts commit 3000e26640.

This was not intended for a direct push

Signed-off-by: Matthieu Gallien <matthieu_gallien@yahoo.fr>
 2021-04-19 17:54:09 +02:00
Felix Weilbach
3000e26640 Add CMake option to enable address sanitizers 
Signed-off-by: Felix Weilbach <felix.weilbach@nextcloud.com>
 2021-04-19 15:38:59 +02:00
allexzander
d65c91ea36 Display VFS sync folder within the navigation panel on Windows. 
Signed-off-by: allexzander <blackslayer4@gmail.com>
 2021-04-16 07:18:44 +00:00
Nicolas Fella
2548455f45 Copy FindSharedMimeInfo from ECM 
Instead of relying on ECM being installed.

We copy other stuff from ECM so be consistent.

Signed-off-by: Nicolas Fella <nicolas.fella@gmx.de>
 2021-04-15 14:32:46 +00:00
rakekniven
03e7d8da28
Merge branch 'master' into patch-1 2021-04-14 17:11:27 +02:00
Nicolas Fella
70033cda1f Use imported target for Threads 
Signed-off-by: Nicolas Fella <nicolas.fella@gmx.de>
 2021-04-14 11:07:04 +00:00
castillo92
98a4bb8cce
Update sharedialog.cpp 
The original sentence uses the word "share" three times and is too redundant when translated into other languages
 2021-04-14 09:24:35 +02: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
Felix Weilbach
b256c6e694 Ping websocket server 
This helps the client to recognize if the websocket server is still alive.

Fixes #2983

Signed-off-by: Felix Weilbach <felix.weilbach@nextcloud.com>
 2021-04-13 12:19:40 +00:00
Valdnet
e628a51735 l10n: Unify spelling 
Spelling unification in Nextcloud applications.

Signed-off-by: Felix Weilbach <felix.weilbach@nextcloud.com>
 2021-04-13 12:24:57 +02:00
Nicolas Fella
b34a901838 Use FindPkgConfig to find libcloudproviders and related libs 
Instead of using custom find modules.

This allows using imported targets which make the code much nicer.

Signed-off-by: Nicolas Fella <nicolas.fella@gmx.de>
 2021-04-12 10:00:08 +00:00
Felix Weilbach
c49dc440bb Embed version and icon into windows executable 
These changes are necessary because of changing the compilation
process for the gui from a single executable to static lib +
executable in commit 0521dce174.
Otherwise the version and icon information will be lost.

Signed-off-by: Felix Weilbach <felix.weilbach@nextcloud.com>
 2021-04-09 13:53:12 +02:00
Camila
1ca0ea49dd Remove unnecessary local variable. 
Signed-off-by: Camila <hello@camila.codes>
 2021-04-08 07:10:59 +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
050bd49373 Rename enumToUserString => enumToString. 
Signed-off-by: Camila <hello@camila.codes>
 2021-04-08 07:10:59 +00:00
Camila
8986975a17 Use enum class instead of enum. 
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
c8ac99c8cf Align status text with server url. 
Cleans the space in the beginning of the string when there is no emoji
set.

Signed-off-by: Camila <hello@camila.codes>
 2021-04-08 07:10:59 +00:00
Camila
e51dad79a2 Refactor UserStatus. 
- Make preDefinedStatus a local var.
- Add function to get the status user string.

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
Matthieu Gallien
d6752c96b1 use QFileInfo to check if path is absolute to avoid assert on windows 
on windos absolute path does not have to start with / . Remove failing assert
when editing ignored files list.

Signed-off-by: Matthieu Gallien <matthieu_gallien@yahoo.fr>
 2021-04-07 07:40:07 +00:00
allexzander
e15045977e Reduce Socket API logging. 
Signed-off-by: allexzander <blackslayer4@gmail.com>
 2021-04-06 09:34:20 +03:00
Felix Weilbach
b2377ff64f Remove html tags from strings that may appear in notifications 
The content of notifications on MacOS are not allowed to contain HTML
tags in it. Linux (Free Desktop) notifications may contain HTML tags
in their content. However, it is optional that the notification daemon
interprets the tags. The GNOME notification daemon does not interpret
HTML tags and even does not strip them off. KDE's daemon interprets
the tags. For now I think it's the best solution to remove the HTML
tags. In the future we should fire a action if the user clicks on the
notification and react on it and open the link then. This should work
on all platforms. But as this change involves working with the native
MacOS api and I don't have hardware for that at the moment for that I
will postpone it.

Fixes #2200

Signed-off-by: Felix Weilbach <felix.weilbach@nextcloud.com>
 2021-03-31 16:23:42 +02:00
Felix Weilbach
354f4c02ee Don't deploy bearer plugin on MacOS 
Fixes #2944, #2237

Signed-off-by: Felix Weilbach <felix.weilbach@nextcloud.com>
 2021-03-29 13:46:07 +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
Valdnet
519dee9104 l10n: Change sync message #3027 2021-03-24 13:13:40 +00:00
allexzander
193e50311b Refresh Windows download dialog progress when hydrating a placeholder 
Signed-off-by: allexzander <blackslayer4@gmail.com>
 2021-03-24 14:09:06 +02:00
Felix Weilbach
c296a93cee Enable high dpi scaling on all platforms 
Fixes #2295, #1079, #914

Signed-off-by: Felix Weilbach <felix.weilbach@nextcloud.com>
 2021-03-23 08:36:11 +00:00
Felix Weilbach
f4853da2ab Fix crash when trying to open the folder creation dialog 
The bug does seem to just appear in special compiler
constellations. We're unsure why this fix works. To better see if this
fix works or if crashes still occur, we added some logging.

Signed-off-by: Felix Weilbach <felix.weilbach@nextcloud.com>
 2021-03-17 08:43:32 +01:00
Felix Weilbach
ff7932bb54 Display the content of the login dialog correct 
This adjustment is necessary because of the changes of the new account
wizard that were introduced with:
e0b7ef15b2

Signed-off-by: Felix Weilbach <felix.weilbach@nextcloud.com>
 2021-03-16 13:34:34 +00:00
Kevin Ottens
7ad0208800 Finish cleaning up shibboleth 
There were a couple of shibboleth related enums left, since that auth
method isn't supported anymore remove the code tied to those enums. It
was dead code anyway.

Signed-off-by: Kevin Ottens <kevin.ottens@enioka.com>
 2021-03-15 09:38:15 +00:00
Felix Weilbach
cdc2e4c56e Don't customize settings dialog palette 
Customizing of the palette will prevent the settings dialog from
display a dark theme correct.

Fixes #2993

Signed-off-by: Felix Weilbach <felix.weilbach@nextcloud.com>
 2021-03-12 11:47:16 +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
e0b7ef15b2 Restyle wizard pages 
Signed-off-by: Felix Weilbach <felix.weilbach@nextcloud.com>
 2021-03-10 09:55:40 +01:00
Felix Weilbach
f55e5b1885 Restyle wizard 
Signed-off-by: Felix Weilbach <felix.weilbach@nextcloud.com>
 2021-03-10 09:55:40 +01:00
Felix Weilbach
9185956069 Split out wizard welcome page 
Signed-off-by: Felix Weilbach <felix.weilbach@nextcloud.com>
 2021-03-10 09:55:40 +01:00
István Váradi
2e7cc96228 Do not include glib.h with extern C (2) 
Signed-off-by: István Váradi <ivaradi@varadiistvan.hu>
 2021-03-10 07:48:23 +01:00
István Váradi
db321d25ef Do no include glib.h with extern C 
Signed-off-by: István Váradi <ivaradi@varadiistvan.hu>
 2021-03-09 10:29:14 +01: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
88a21c0665 Do not add debug build to startup programs. 
Signed-off-by: allexzander <blackslayer4@gmail.com>
 2021-02-18 13:19:06 +00:00
Felix Weilbach
29e1a82f56 Add missing override specifer to WebFlowCredentials 
Signed-off-by: Felix Weilbach <felix.weilbach@nextcloud.com>
 2021-02-13 10:22:01 +00:00