mirrors/nextcloud-desktop
1
0
Fork 0
mirror of https://github.com/nextcloud/desktop.git synced 2024-12-21 05:13:04 +03:00
Code Issues Projects Releases Packages Wiki Activity
16651 commits 486 branches 258 tags 463 MiB
Commit graph

128 commits

Author SHA1 Message Date
Camila
fdc160460b Fix #2085 new tray menu. 
Update systray behavior and context menu:
- left click brings up the new QtQuick based dialogs on all latforms
- right click brings up the new QtQuick based dialog on Mac OS only
- right click brings up a context menu on all other platforms than Mac OS
- "Quit Nextcloud" => "Exit Nextcloud"
- Add "Open main dialog" option.

Signed-off-by: Camila <hello@camila.codes>
 2020-07-02 19:21:10 +02:00
Stephan Beyer
080505ef46 Simplify tray window positioning 
The Qml position setting code is moved to C++, which allowed to get rid
of the currentScreenIndex() method (which seemed to be just a detour to
pass the screen from C++ to Qml).

Signed-off-by: Stephan Beyer <s-beyer@gmx.net>
 2020-06-26 12:03:26 +00:00
Stephan Beyer
3f4ed0883a Make sure the menu separator uses Style.menuBorder color 
In case the default color value will ever change, this
commit makes sure that the colors of the menu border and
the menu separator coincide.

Signed-off-by: Stephan Beyer <s-beyer@gmx.net>
 2020-06-22 06:54:57 +00:00
Kevin Ottens
4f7a6cfb1d Make activity items with a link clickable 
We then get more items clickable, in particular the bottom one proposing
to open the activity application. Now we can click it and it opens the
activity application straight away.

Signed-off-by: Kevin Ottens <kevin.ottens@nextcloud.com>
 2020-06-16 18:52:20 +02:00
Kevin Ottens
f147e5a66f Don't use a bright blue color for menus 
As advised, use a light gray instead, this electric blue was a bit too
much.

Signed-off-by: Kevin Ottens <kevin.ottens@nextcloud.com>
 2020-06-16 18:52:20 +02:00
Kevin Ottens
bc863584db Don't duplicate file name in the info line 
For the "Activity" type activities, displayPath contains the file name
which is also in the subject. This was redundant, so now we don't
display an info line at all for that type of activities.

Signed-off-by: Kevin Ottens <kevin.ottens@nextcloud.com>
 2020-06-16 18:52:20 +02:00
Kevin Ottens
f8e2e3403a Close all menus on window show 
We previously missed the app menu which wasn't closed.

Signed-off-by: Kevin Ottens <kevin.ottens@nextcloud.com>
 2020-06-16 18:52:20 +02:00
Nicolas Fella
07bede8a56 Use properties to get user details 
Convert imperative QML code to declarative code using property bindings

Signed-off-by: Nicolas Fella <nicolas.fella@gmx.de>
 2020-06-16 15:01:37 +02:00
Nicolas Fella
a12205f322 Port from context properties to singletons 
Context properties are deprecated and will be removed in Qt 6.
QML singletons are the better option here, especially given that
UserModel and UserAppsModel already are singletons.

Signed-off-by: Nicolas Fella <nicolas.fella@gmx.de>
 2020-06-16 14:34:59 +02:00
Nicolas Fella
be2e5266aa Create HeaderButton QML component 
Deduplicate the Button code by moving it into a separate file.

Also use the same background code for the apps button since as far as I can tell it didn't behave any different

Signed-off-by: Nicolas Fella <nicolas.fella@gmx.de>
 2020-06-15 20:52:41 +02:00
Michael Schuster
44a9200c5d Fix crash caused by setting Tray window screen pointer on the QML side 
Seems like Qt sometimes doesn't like the QML window's screen property to be set
to a C++ (QVariant) pointer value, so we use the index: Qt.application.screens[]

See Qt docs: https://doc.qt.io/qt-5/qml-qtquick-window-window.html#screen-prop

This fix returns the matching window's index from the QGuiApplication::screens()
list to the QML side, instead of the window pointer.

Steps to reproduce the crash with the previous code:
- Open the Tray menu and close it a few times,
  or scroll randomly up and down in its activity list.

Tested with Qt 5.12.5

Signed-off-by: Michael Schuster <michael@schuster.ms>
 2020-06-15 12:32:25 +00:00
Kevin Ottens
40824dc427 Get rid of screenIndex 
This was leading to the same logic being duplicated several times. It's
fine to return the QScreen* on the QML side directly but wrapped into a
QVariant.

Signed-off-by: Kevin Ottens <kevin.ottens@nextcloud.com>
 2020-06-15 12:32:25 +00:00
Kevin Ottens
6c6dfb15a7 Move all the position computation on the C++ side 
The API is just more convenient there, the rect and point types on the
QML side are just pale shadow of their C++ counterparts.

Also improved a bit the constness of the Systray class.

Signed-off-by: Kevin Ottens <kevin.ottens@nextcloud.com>
 2020-06-15 12:32:25 +00:00
Kevin Ottens
83b36b4ab0 Rename tbOrientation into taskbarOrientation 
Signed-off-by: Kevin Ottens <kevin.ottens@nextcloud.com>
 2020-06-15 12:32:25 +00:00
Kevin Ottens
aa90237e94 Introduce a screenRect as coordinate space 
The top left corner of that screenRect is (0,0) or based on
(virtualX,virtualY) depending on the platform. This leads to easier
reduction in code duplication.

Signed-off-by: Kevin Ottens <kevin.ottens@nextcloud.com>
 2020-06-15 12:32:25 +00:00
Kevin Ottens
65e8f33ccf Use TaskBarPosition enum on the QML side 
Signed-off-by: Kevin Ottens <kevin.ottens@nextcloud.com>
 2020-06-15 12:32:25 +00:00
Dominique Fuchs
a6f918f3c2 More simplifications, also transfer of more tray positioning logic to C++ backend. 
Signed-off-by: Dominique Fuchs <32204802+DominiqueFuchs@users.noreply.github.com>
 2020-06-15 12:32:25 +00:00
Dominique Fuchs
f44df7f61a Major multi monitor improvements and rewrite of tray window positioning 
Signed-off-by: Dominique Fuchs <32204802+DominiqueFuchs@users.noreply.github.com>
 2020-06-15 12:32:25 +00:00
Stephan Beyer
749070a29c Hide openLocalFolderButton if no local folder is configured 
Signed-off-by: Stephan Beyer <s-beyer@gmx.net>
 2020-06-09 16:45:46 +02:00
Stephan Beyer
2946c335ba Change width of app menu 
The app menu had a width based on the header button size which was
way too narrow to display its content.

This commit changes the width based on the contents (menu items) of
the menu, however, limiting the maximum width to half the window width.

Signed-off-by: Stephan Beyer <s-beyer@gmx.net>
 2020-06-09 14:53:51 +02:00
Kevin Ottens
b579b49a5c Get rid of redundant parentheses 
Signed-off-by: Kevin Ottens <kevin.ottens@nextcloud.com>
 2020-05-25 20:03:01 +02:00
Dominique Fuchs
e9a82dff77 Merge remote-tracking branch 'origin/master' into traywindow-listview-actions 
Signed-off-by: Dominique Fuchs <32204802+DominiqueFuchs@users.noreply.github.com>
 2020-05-20 10:48:46 +02:00
Dominique Fuchs
9bfcdbae3a More code cleanupand style-preference adjustments. 
Signed-off-by: Dominique Fuchs <32204802+DominiqueFuchs@users.noreply.github.com>
 2020-05-20 00:09:41 +02:00
Dominique Fuchs
fa9dddf567 Code cleanup and this-> removals. 
Signed-off-by: Dominique Fuchs <32204802+DominiqueFuchs@users.noreply.github.com>
 2020-05-19 23:25:21 +02:00
Kevin Ottens
3b6ab2fa5a Indicate this is a dialog and not a regular window 
This is necessary with some window managers which would otherwise
consider they can reposition and resize the tray window as they wish
(yes, even though the user can't do it directly).

This is for instance the case if you use the tiling mode scripts of
KWin. It automatically ignores dialogs but might force windows to be
fullscreen (which would badly break the layout in our case).

Signed-off-by: Kevin Ottens <kevin.ottens@nextcloud.com>
 2020-05-07 09:39:08 +02:00
Dominique Fuchs
671961e641 Added share icon from nc server repo, changed corresp. btn icon 
Signed-off-by: Dominique Fuchs <32204802+DominiqueFuchs@users.noreply.github.com>
 2020-04-27 08:06:58 +02:00
Dominique Fuchs
4bd5e9d79b Implemented share functionality in tray window and changed actions / button logic. 
Signed-off-by: Dominique Fuchs <32204802+DominiqueFuchs@users.noreply.github.com>
 2020-04-25 10:17:53 +02:00
Michael Schuster
eb7ed33d98
Merge pull request #1744 from nextcloud/qt-traygeometry-workaround 
Fix wrong window position on some linux DEs - worked around invalid g…
 2020-03-01 07:07:47 +01:00
Michael Schuster
712fef0cac
Merge branch 'master' into qml-singleton-style and fix merge conflict 
Migrate changes in client.qrc to resources.qrc

Signed-off-by: Michael Schuster <michael@schuster.ms>
 2020-03-01 06:47:46 +01:00
Dominique Fuchs
0697c81ae6 Rewrite of screen selection logic, plus synamic screen selection Window.qml 
Signed-off-by: Dominique Fuchs <32204802+DominiqueFuchs@users.noreply.github.com>
 2020-01-21 13:54:04 +01:00
Dominique Fuchs
3a39e636ae Introduced Style module 
Signed-off-by: Dominique Fuchs <32204802+DominiqueFuchs@users.noreply.github.com>
 2020-01-19 20:13:12 +01:00
Dominique Fuchs
01e9343d8b Cleanup/Removal/Adaption/Update to resource files and crresponding code, esp. regarding svg usage 
Signed-off-by: Dominique Fuchs <32204802+DominiqueFuchs@users.noreply.github.com>
 2020-01-18 17:47:17 +01:00
Michael Schuster
de74057cc8
Add grey hint Activity entry if limit is reached 
Signed-off-by: Michael Schuster <michael@schuster.ms>
 2020-01-17 20:26:48 +01:00
Michael Schuster
889cb636d3
Add Activity date and time 
Signed-off-by: Michael Schuster <michael@schuster.ms>
 2020-01-17 20:16:20 +01:00
Dominique Fuchs
599dae0486 Inclusion of possible 'notification' type descriptions in activity 
Signed-off-by: Dominique Fuchs <32204802+DominiqueFuchs@users.noreply.github.com>
 2020-01-17 14:50:05 +01:00
Dominique Fuchs
0156edf320 Removed visibility workaround 
Signed-off-by: Dominique Fuchs <32204802+DominiqueFuchs@users.noreply.github.com>
 2020-01-17 11:21:43 +01:00
Dominique Fuchs
f425dfdfea Set sourceSize to prevent blurry rerendering of svg source in activityIcon 
Signed-off-by: Dominique Fuchs <32204802+DominiqueFuchs@users.noreply.github.com>
 2020-01-17 10:38:21 +01:00
Dominique Fuchs
7ea2f3fa59 Refresh visibility of ListView based on presence of items on showWindow 
Signed-off-by: Dominique Fuchs <32204802+DominiqueFuchs@users.noreply.github.com>
 2020-01-17 09:09:42 +01:00
Michael Schuster
9abc1eb921
Add initial support for Apps menu icon display (show remote SVGs) 
Caching and showing them from local data-URLs leaded to blurry rendering in Qt.

Signed-off-by: Michael Schuster <michael@schuster.ms>
 2020-01-16 18:43:48 +01:00
Dominique Fuchs
585094a719 Minor property hierarchy fix 
Signed-off-by: Dominique Fuchs <32204802+DominiqueFuchs@users.noreply.github.com>
 2020-01-16 17:40:47 +01:00
Dominique Fuchs
4b79c597dc Disabled animations until population glitches are fixed 
Signed-off-by: Dominique Fuchs <32204802+DominiqueFuchs@users.noreply.github.com>
 2020-01-16 17:11:08 +01:00
Dominique Fuchs
b9a350e201 Minor layout adjustments 
Signed-off-by: Dominique Fuchs <32204802+DominiqueFuchs@users.noreply.github.com>
 2020-01-16 15:19:17 +01:00
Dominique Fuchs
246f7e9395 1px border #0082c9 around tray window 
Signed-off-by: Dominique Fuchs <32204802+DominiqueFuchs@users.noreply.github.com>
 2020-01-16 08:01:09 +01:00
Michael Schuster
7fe138330e
Double the width of the Apps menu (x starts at the Talk button) 
Signed-off-by: Michael Schuster <michael@schuster.ms>
 2020-01-16 00:57:49 +01:00
Michael Schuster
3488fd7c7f
Fix font sizes for "Log out" and "Remove account" and the Apps menu 
Signed-off-by: Michael Schuster <michael@schuster.ms>
 2020-01-16 00:45:31 +01:00
Dominique Fuchs
00d73a9389 Add visual separation between accountStateIndicator and avatar 
Signed-off-by: Dominique Fuchs <32204802+DominiqueFuchs@users.noreply.github.com>
 2020-01-15 20:11:50 +01:00
Dominique Fuchs
ddf67ff948 Preserve a 2px distance from tray border (streamlining with acount menu) 
Signed-off-by: Dominique Fuchs <32204802+DominiqueFuchs@users.noreply.github.com>
 2020-01-15 19:28:40 +01:00
Dominique Fuchs
9b32ebdae4 Allow text to expand further if one or both buttons aren't visible 
Signed-off-by: Dominique Fuchs <32204802+DominiqueFuchs@users.noreply.github.com>
 2020-01-15 19:15:25 +01:00
Dominique Fuchs
0ec2291bd7 Layout adjustments & also show remote path in activitylist 
Signed-off-by: Dominique Fuchs <32204802+DominiqueFuchs@users.noreply.github.com>
 2020-01-15 18:44:33 +01:00
Michael Schuster
b4b6366ba8
Add App list menu to Tray UI 
- Modify Window.qml and Systray to show the App menu upon clicking the App button
  on the top-right. Fall back to opening the general URL in case no apps are found.

- Introduce a new UserAppsModel in UserModel.cpp to access the fetched server Apps
  from AccountState (propagated down from the User class).

Signed-off-by: Michael Schuster <michael@schuster.ms>
 2020-01-15 16:42:06 +01:00
Dominique Fuchs
b57b8cfb66 Resized add account icon, adapted layout for new size 
Signed-off-by: Dominique Fuchs <32204802+DominiqueFuchs@users.noreply.github.com>
 2020-01-15 08:01:54 +01:00
Dominique Fuchs
29138cc533 Font and icon size improvements, svg transfer to new folder 
Signed-off-by: Dominique Fuchs <32204802+DominiqueFuchs@users.noreply.github.com>
 2020-01-14 19:48:21 +01:00
Dominique Fuchs
65b47d4613 Make qml UI strings translatable 
Signed-off-by: Dominique Fuchs <32204802+DominiqueFuchs@users.noreply.github.com>
 2020-01-14 07:59:28 +01:00
Dominique Fuchs
e4b19d0cb5 Activity refresh in background 
Signed-off-by: Dominique Fuchs <32204802+DominiqueFuchs@users.noreply.github.com>
 2020-01-13 14:35:58 +01:00
Dominique Fuchs
9e82ba60b4 Integrated local sync activities in activitymodel 
Signed-off-by: Dominique Fuchs <32204802+DominiqueFuchs@users.noreply.github.com>
 2020-01-13 12:20:41 +01:00
Dominique Fuchs
96a74d9ef0 Minor improvements 
Signed-off-by: Dominique Fuchs <32204802+DominiqueFuchs@users.noreply.github.com>
 2020-01-13 11:46:49 +01:00
Dominique Fuchs
1ebcd3a0fb Icon selection, svg path transfers, scrollbar 
Signed-off-by: Dominique Fuchs <32204802+DominiqueFuchs@users.noreply.github.com>
 2020-01-13 09:59:34 +01:00
Dominique Fuchs
17fcfd4e41 Show ListView delegate only when model is populated (prevent dummy delegate) 
Signed-off-by: Dominique Fuchs <32204802+DominiqueFuchs@users.noreply.github.com>
 2020-01-13 09:12:44 +01:00
Dominique Fuchs
9e6df7a4dc Add populate transition 
Signed-off-by: Dominique Fuchs <32204802+DominiqueFuchs@users.noreply.github.com>
 2020-01-13 08:43:51 +01:00
Dominique Fuchs
58f1c3234d Temperarily disabling animations due to lags - FIXME 
Signed-off-by: Dominique Fuchs <32204802+DominiqueFuchs@users.noreply.github.com>
 2020-01-12 21:37:08 +01:00
Dominique Fuchs
715924cac6 Show activitylist on initial tray opening when logged in 
Signed-off-by: Dominique Fuchs <32204802+DominiqueFuchs@users.noreply.github.com>
 2020-01-12 21:19:18 +01:00
Dominique Fuchs
1c2916052d Bunch of fixes and optimizations for activityList 
Signed-off-by: Dominique Fuchs <32204802+DominiqueFuchs@users.noreply.github.com>
 2020-01-12 17:52:51 +01:00
Dominique Fuchs
b76da25ef1 Model/View improvements, also fixes crash on account removal 
Signed-off-by: Dominique Fuchs <32204802+DominiqueFuchs@users.noreply.github.com>
 2020-01-12 16:16:24 +01:00
Dominique Fuchs
7f35178c70 More fixes to login/logout logic 
Signed-off-by: Dominique Fuchs <32204802+DominiqueFuchs@users.noreply.github.com>
 2020-01-12 11:06:48 +01:00
Dominique Fuchs
8ec7cfa700 Connection status indicators as avatar overlay 
Signed-off-by: Dominique Fuchs <32204802+DominiqueFuchs@users.noreply.github.com>
 2020-01-12 09:10:06 +01:00
Dominique Fuchs
578a3b4ef4 Streamlined 'Add account' button with account entries 
Signed-off-by: Dominique Fuchs <32204802+DominiqueFuchs@users.noreply.github.com>
 2020-01-11 20:28:00 +01:00
Dominique Fuchs
a021f62e96 Tray creation timing, account menu reinstantiating on visible change 
Signed-off-by: Dominique Fuchs <32204802+DominiqueFuchs@users.noreply.github.com>
 2020-01-11 15:05:37 +01:00
Dominique Fuchs
9c0221a0fa UserLine drafting, bugfixes, restuctures 
Signed-off-by: Dominique Fuchs <32204802+DominiqueFuchs@users.noreply.github.com>
 2020-01-10 16:28:53 +01:00
Dominique Fuchs
6ac1a4a353 Preps for UserLine submenu 
Signed-off-by: Dominique Fuchs <32204802+DominiqueFuchs@users.noreply.github.com>
 2020-01-05 21:31:09 +01:00
Dominique Fuchs
330ff96ee2 Code cleanup regarding context menu. Pause/resume logic implemented. Halfway through remodeling account menu. 
Signed-off-by: Dominique Fuchs <32204802+DominiqueFuchs@users.noreply.github.com>
 2020-01-05 21:06:42 +01:00
Dominique Fuchs
a90995cf15 Focus and popup improvements for macOS 
Signed-off-by: Dominique Fuchs <32204802+DominiqueFuchs@users.noreply.github.com>
 2020-01-05 16:25:32 +01:00
Dominique Fuchs
aa9921c6f5 Quit/settings button in tray menu, disable context menu, font size fixes 
Signed-off-by: Dominique Fuchs <32204802+DominiqueFuchs@users.noreply.github.com>
 2020-01-04 17:22:56 +01:00
Dominique Fuchs
d653618b0a Fix blurry caret svg due to https://bugreports.qt.io/browse/QTBUG-44863 
Signed-off-by: Dominique Fuchs <32204802+DominiqueFuchs@users.noreply.github.com>
 2020-01-04 12:18:06 +01:00
Dominique Fuchs
ff92adf3e0 Tray account menu wording/positioning 
Signed-off-by: Dominique Fuchs <32204802+DominiqueFuchs@users.noreply.github.com>
 2020-01-04 10:09:01 +01:00
Dominique Fuchs
e0641df727 First real activity connection 
Signed-off-by: Dominique Fuchs <32204802+DominiqueFuchs@users.noreply.github.com>
 2020-01-03 16:15:15 +01:00
Dominique Fuchs
f01c47e0ec Fix server adress retreival in tray window buttons 
Signed-off-by: Dominique Fuchs <32204802+DominiqueFuchs@users.noreply.github.com>
 2020-01-03 14:00:07 +01:00
Dominique Fuchs
687a99279d Has function for ActivityModel, typos 
Signed-off-by: Dominique Fuchs <32204802+DominiqueFuchs@users.noreply.github.com>
 2020-01-03 13:39:10 +01:00
Dominique Fuchs
02cb43180c Fix git not recognizing case sensitive changes 
Signed-off-by: Dominique Fuchs <32204802+DominiqueFuchs@users.noreply.github.com>
 2020-01-03 13:12:04 +01:00
Renamed from src/gui/tray/window.qml (Browse further)