Commit graph

12548 commits

Author SHA1 Message Date
Camila San
31892f5337
Changes background color to white for the Activity list widget.
Signed-off-by: Camila San <hello@camila.codes>
2018-07-30 22:06:02 +02:00
Camila San
e9dbee0df5
Removes alternate color on the rows of Activity Widget.
- Also fixes the click on each activity: the user had to click twice -
one to select the row and then one click to open file manager or
browser.

Signed-off-by: Camila San <hello@camila.codes>
2018-07-30 22:06:02 +02:00
Camila San
9cbf5aa783
Changes icons for actions in Activity List.
- For folder (open file manager) and close (dismiss
notification).

Signed-off-by: Camila San <hello@camila.codes>
2018-07-30 22:06:02 +02:00
Camila San
36a73432bc
Implements ActivityWidget::slotProgressInfo.
- Attempts to implement slot as it was in the old IssuesWidget.
- It should clean up the activity list when needed -  e.g. when file
conflict was solved.

Signed-off-by: Camila San <hello@camila.codes>
2018-07-30 22:06:01 +02:00
Camila San
b2834e047d
Refactores ActivityListModel::removeFromActivityList.
- Fixes crash when dismissing notification - notification was being
removed from the wrong list.
- Minor changes: removes AccountStatePtr where it was needed anymore now
that ActivityListModel has an _accountState, it doesn't need to be
checked for each activity/notification.

Signed-off-by: Camila San <hello@camila.codes>
2018-07-30 22:06:01 +02:00
Camila San
f63434b856
Stores folder in ActivityData.
- The information is needed on ActivityWidget::slotProgressInfo.

Signed-off-by: Camila San <hello@camila.codes>
2018-07-30 22:06:01 +02:00
Camila San
7bc9275a8c
Separates types of errors: SyncErrorType and SyncFileItemType.
- This follows what the enums already being used SynResult::Status and
SyncFileItem::Status.
- Do not display buttons for FileErrorTypes - since they are errors on
local syncing, there is nothing to do in the server.

Signed-off-by: Camila San <hello@camila.codes>
2018-07-30 22:06:01 +02:00
Camila San
7b1569df81
Removes static const from activity widget.
- It didn't need to be static.
- It crashed on Windows (Visual Studio 15 2017 Win64).

Signed-off-by: Camila San <hello@camila.codes>
2018-07-30 22:06:01 +02:00
Camila San
f85825dee4
Adds header and forward declaration of 'QMouseEvent' to ActivityItemDelegate.
To fix compiling for Qt5.7 (drone error).

Signed-off-by: Camila San <hello@camila.codes>
2018-07-30 22:06:01 +02:00
Camila San
3673603e5a
Fixes buttons clickable area in the activities list.
- Their size was not correctly calculated so it was hard to filter the
clicks on the list. User had to click multiple times before clicking on
the right acceptable area.

Signed-off-by: Camila San <hello@camila.codes>
2018-07-30 22:06:01 +02:00
Camila San
9f9be7814c
Adjust space between action/buttons in the toolbar.
- Minor: cleans up code used for debug.

Signed-off-by: Camila San <hello@camila.codes>
2018-07-30 22:06:01 +02:00
Camila San
938c99ec42
Fixes and improves 'copy to clipboard' output.
- With the merging of activities and notifications the copy to clipboard
function got broken. Had to put it back as it was before.
- The output text from the clipboard was almost unreadeable. Ajusted the
space between texts and used separator '-' instead of ','.
- Minor: cleans up comments.

Signed-off-by: Camila San <hello@camila.codes>
2018-07-30 22:06:01 +02:00
Camila San
4a6b7854f5
Adds 'Join' string for call notifications.
- Stores object_type from the api response to check if notification is a
call so the primary button text and action is 'Join'.
- Puts strings into consts.
- Minor change: Improves comments on ActivityListModel.

Signed-off-by: Camila San <hello@camila.codes>
2018-07-30 22:06:01 +02:00
Camila San
00effb0e2f
Adds 'accept' button for remote share notifications.
- Stores object_type form the api response to check if notification is
remote_share, so the primary button text is 'accept' instead of 'more
information'.

Signed-off-by: Camila San <hello@camila.codes>
2018-07-30 22:06:01 +02:00
Camila San
f0ca5dbded
Fix settings dialog for mac.
- Fixes adding/removing accounts with separator in the toolbar -
accounts were not added in the right order and removing was not
including the separator.
- Fixes button sizes in the activities list - the buttons were too small
for the text.

Signed-off-by: Camila San <hello@camila.codes>
2018-07-30 22:06:01 +02:00
Camila San
11484d5588
Removes Protocol and Issues widget files and references.
- Minor changes:
 - Improves comments and qCWarning  messages
 - Removes commented out code.
 - adds TODO's.

Signed-off-by: Camila San <hello@camila.codes>
2018-07-30 22:06:01 +02:00
Camila San
ab3c6da5d7
Gives full path to file to open in file manager.
- The path to the file wa being stored in the wrong activity property.
It was in the action link when it should be in the file.
- Minor: comments out the display of issues and protocol widget.

Signed-off-by: Camila San <hello@camila.codes>
2018-07-30 22:06:01 +02:00
Camila San
f402b1d9e4
Changes icons for opening in file manager and to dismiss notification.
- The icons used before were not really clear on what their function
was.

Signed-off-by: Camila San <hello@camila.codes>
2018-07-30 22:06:01 +02:00
Camila San
ec51428e4d
Fixes the url for the button 'more information'.
- The url for the browser was not full path to the file.

Signed-off-by: Camila San <hello@camila.codes>
2018-07-30 22:06:00 +02:00
Camila San
64d635a046
Fixes the color of the font.
- It was too light when the row was selected.

Signed-off-by: Camila San <hello@camila.codes>
2018-07-30 22:06:00 +02:00
Camila San
9de3985021
Small fixes.
- Align progress indicator to the center.
- Moves unused code.
- Removes unused labels.

Signed-off-by: Camila San <hello@camila.codes>
2018-07-30 22:06:00 +02:00
Camila San
a9cd3b3a6d
Merges errors and protocols into notifications/activities.
- Errors will always be on top, then Notifications comes next and then Activities for last.
- Adds 2 new types of Activity: NotificationType and ErrorType.
- ActivityListModel and ActivityWidget stores AccountState to connect user and widget.

Signed-off-by: Camila San <hello@camila.codes>
2018-07-30 22:06:00 +02:00
Camila San
d0c72dd642
Makes space smaller bewteen user/activities and network/settings menu.
Signed-off-by: Camila San <hello@camila.codes>
2018-07-30 22:06:00 +02:00
Camila San
9ad2a980ce
Moves the separator to between accounts.
Signed-off-by: Camila San <hello@camila.codes>
2018-07-30 22:06:00 +02:00
Camila San
7e8b5f34d7
Fixes the text length for activities.
- Activities from the server don't have buttons to interact with so
their content can use the full lenght of the row.

Signed-off-by: Camila San <hello@camila.codes>
2018-07-30 22:06:00 +02:00
Camila San
918ccb1ed3
Removes row when notification is dismissed.
Signed-off-by: Camila San <hello@camila.codes>
2018-07-30 22:06:00 +02:00
Camila San
e3c7a5a2ff
Changes Activity list view icons, buttons and drawing.
- Displays the notification icon when available.
- Adds dismiss button with an icon.
- Handles buttons actions in the list view.
- Changes what is painted first (activityitemdelegate) for each row in
the activity list.

Signed-off-by: Camila San <hello@camila.codes>
2018-07-30 22:06:00 +02:00
Camila San
00a73b5ded
Adds class to retrieve icons.
- This is an attempt to cache the icons.

Signed-off-by: Camila San <hello@camila.codes>
2018-07-30 22:06:00 +02:00
Camila San
49377976db
Removes notification row from the view when clicking on Dismiss.
Signed-off-by: Camila San <hello@camila.codes>
2018-07-30 22:06:00 +02:00
Camila San
ef4a30fcb9
Displays a menu once the user clicks on the button in the notifications.
- In activityitemdelegate the mouse events are filtered (ActivityItemDelegate::editorEvent) to check if the user clicked
on a button in the list of activities/notifications. Then a signal is emitted to ActivityWidget that does the rest:
show submenu when there are more options, open browser, open file manager, send request to server.

Signed-off-by: Camila San <hello@camila.codes>
2018-07-30 22:06:00 +02:00
Camila San
9ad01f0819
Fixes order of the notifications: latest on top.
Signed-off-by: Camila San <hello@camila.codes>
2018-07-30 22:06:00 +02:00
Camila San
7fa5e41e8d
Only displays buttons if it is a notification and adjust space left.
- Do not display buttons for activities.
- Adds correctly text and button in the space left depending on the widget size.

Signed-off-by: Camila San <hello@camila.codes>
2018-07-30 22:06:00 +02:00
Camila San
4e4a0da3b7
Returns the activity type to the list view.
Signed-off-by: Camila San <hello@camila.codes>
2018-07-30 22:05:59 +02:00
Camila San
2350b41dc3
List model returns the list of actions for each activity.
- The list of possible actions (server requests( was not being used in
the activityitemdelegate. This is needed to be able to draw the primary
action buttons and other options for each notification in the view.)
- Minor changes:
  - Uses different icons for activities and notifications in the list view.
  - Align elements in the list view of notifications/activities properly.

Signed-off-by: Camila San <hello@camila.codes>
2018-07-30 22:05:59 +02:00
Camila San
d1f4f8a558
Correctly removes actions - account, separator and settings widget from toolbar when account is removed.
Signed-off-by: Camila San <hello@camila.codes>
2018-07-30 22:05:59 +02:00
Camila San
a6331c7a75
Fixes widget stack visibility when switching actions.
Signed-off-by: Camila San <hello@camila.codes>
2018-07-30 22:05:59 +02:00
Camila San
22a6303c9d
Adds space bewteen different accounts and activity.
Signed-off-by: Camila San <hello@camila.codes>
2018-07-30 22:05:59 +02:00
Camila San
1b1468a9c6
Each user has its own list of activities.
Signed-off-by: Camila San <hello@camila.codes>
2018-07-30 22:05:59 +02:00
Camila San
b13f77c0fb
Adds one activity widget for each user.
- ActivityListModel and ActivityWidget stores an AccountState to connect user and widget.

Signed-off-by: Camila San <hello@camila.codes>
2018-07-30 22:05:59 +02:00
Camila San
8e0c036fc3
Aligns Network and General to the right.
Signed-off-by: Camila San <hello@camila.codes>
2018-07-30 22:05:59 +02:00
Camila San
75c2613b1b
Displays activity and notification messages in the list view.
Signed-off-by: Camila San <hello@camila.codes>
2018-07-30 22:05:59 +02:00
Camila San
908870ccde
Adds notifications to the Activities list.
Signed-off-by: Camila San <hello@camila.codes>
2018-07-30 22:05:57 +02:00
Roeland Jago Douma
30a4f1edd7
Merge pull request #510 from ivaradi/beta-ppa
Use the beta PPA for builds (re #402)
2018-07-30 20:34:05 +02:00
Roeland Jago Douma
9722fbc151
Merge pull request #507 from doits/allow_macos_gpu_switching
allow to switch to the integrated gpu on MacOS
2018-07-30 20:33:41 +02:00
Roeland Jago Douma
7fccae7875
Merge pull request #509 from ivaradi/artful-cosmic
Stop building for Artful, enable Cosmic
2018-07-30 20:32:56 +02:00
Nextcloud bot
d49aadaf76
[tx-robot] updated from transifex 2018-07-30 00:50:31 +00:00
Nextcloud bot
adb6606e6f
[tx-robot] updated from transifex 2018-07-29 00:48:28 +00:00
Nextcloud bot
e0a1b00d3e
[tx-robot] updated from transifex 2018-07-28 00:47:08 +00:00
István Váradi
c2ceb173b1
Merge branch 'master' into beta-ppa 2018-07-27 21:00:01 +02:00
István Váradi
5f74baabeb
Merge branch 'master' into artful-cosmic 2018-07-27 20:59:44 +02:00