Skip to content

Commit 7250762

Browse files
SBrieredoumdi
SBriere
and
doumdi
authored
Main merge for 1.1.0 release (#67)
* Fix layout for mac * Updated login error messages with new behavior for User Login on OpenTera. * Removed references to qt5_use_modules. * Refs #25. Work in progress to plan future sessions. * Refs #25. Future sessions can now be planned. * Refs #25. Updated new session time. * Added minimal support for Dance Service. * Fixed bug when starting a new session and wrongly offering to continue a session, but not of the currently selected type. * Refs #58. Initial dashboard widget * Refs #58. Working upcoming sessions in Dashboard view. * Refs #58. Added recent participants (based on last update date) in Dashboard * Refs #38. Added elements that require attention in the dashboard and added tools to properly manage them. * Closes #40. Implemented Drag & Drop behavior in ProjectNavigator. * Refs #40. Fixed path for ProjectNavigatorTree * Refs #59. Added DanceConfigWidget and basic integration. * Added user token management (storage, querying, management) for calls to APIs that require such a token. * Refactored Com Managers to add a base class (BaseComManager) to prevent duplicate codes when creating managers for different services. * Refs #59. Work in progress to build the Dance Service config widget... * Updated FileUploaderDialog to allow to select multiple files at once. * Refactored file structure and created a general TransferringFile class as a basis for both uploads and downloads. * Refs #59. Fixed bug introduced in ParticipantWidget that prevented creation of new participant. * Refs #59. Added video upload for Dance Service Widget and reworked UI to improve file transfers in general (uploads and downloads) * Refs #1 Improved ParticipantWidget responsiveness when loading large number of sessions. Fixed issue when the "Add participant" button was not enabled when not directly clicking on the item in the tree view. Fixed linking error on Linux with QtWebEngine. * Refs #59 Work in progress on DanceConfigWidget. * Refs #59. Added session type in DanceConfigWidget. Working playlist saving. * Refs #1. Fixed bug where UI was hanging while loading sessions in ParticipantWidget * Refs #59 Allowed to add multiple times a video in a playlist, working "cancel" button. * Refs #59 Fixed issue when received session types when no participant uuid * Refs #1 Revised SessionWidget in preparation for assets integration. * Refs #33. Added icons for various asset types. * Refs #33. Work started on AssetsWidget to improve assets view and management * Refs #1. Moved operation result messages to standalone widget * Refs #1. Added ResultMessageWidget to DanceConfigWidget * Refs #33. Querying more informations about assets from related services. * Refs #33. Work in progress for asset display: now properly managing the "New" button. * Fixed crash when deleting a session with the bottom button (!) * Refs #33. Work in progress to upload a file in the AssetsWidget * Refs #33. New file upload to FileTransferService working * Refs #33. Added newly created asset in AssetsWidget * Refs #33. Asset deletion now working. * Refs #33. Work in progress to limit the number of uploads / downloads occurring simultaneously * Refs #33. Managed transferring files states in TransferProgressDialog * Refs #33. Updated assets access token with new structure. Added access token automatic refresh. * Refs #33. Added assets download feature * Refs #33. Added asset browser for participant * Refs #33. Working "Download All" for all participant assets in Assets Browser view. * Improved software version detection * Refs #33. Manage assets access token change while downloads are pending. * Refs #1. Various bug fixes and user permissions adjustments (such as allowing users to see system services but not assign them to projects). * Building plugins only for Windows * Refs #33. Managed downloading file in batch when the file was already existing (appended a number to the filename). * Refs #33. Improved behavior when handling large amount of assets. * Refs #33. Adjusted assets managements with a token per asset, improved file transfer behavior. * Fixed unknown escape sequence warning in regexp expression used to filter file names * Refs #61. Work in progress to manage site-service association. * Refs #61. Working site-service association. * Refs #59. Moved Dance Service config tab in ProjectWidget * Refs #62. Added implementation of Device-Site management * Refs #64. Work in progress on SessionTypeWidget. * Refs #64. SessionTypeWidget working. Work in progress on SiteWidget and ProjectWidget * Refs #64. Working site-session type association and widgets. * Refs #60. Added session type selection when creating a new project. Correctly selected item in the project navigator when a deletion occurred. * Refs #1. Various UI revision and bug fixes. * Refs #62. Added missing UI to select devices for a project Refs #1. General UI improvement. * Refs #1. General UI improvements (including more options to create participants) * Refs #1. Updated QMenu stylesheet * Refs #33. Fixed issue where adding new file in session was not showing. * Refs #66. General fixes and improvements. * Refs #66. Various bug fixes and UI improvements, including access level issues * Refs #66. Adjusted ConfigWidget grid size. * Refs #66. Fixed Drag & Drop when changing participant project. * Refs #12. Updated translations & added some screenshots. * Update README.md * Refs #66. Fixed compilation issue in release. * Refs #66. Fixed delete button being disabled when not supposed to in ProjectNavigator * Refs #66. Removed "New participant" options when creating new project * Refs #66. Fixed issue when deleting a project / participant, and then creating new ones. * Refs #66. Fixed Mac OS minimum version * Update README.md Co-authored-by: Dominic Létourneau <doumdi@gmail.com>
1 parent ee9f68d commit 7250762

File tree

249 files changed

+21048
-8147
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

249 files changed

+21048
-8147
lines changed

‎CMakeLists.txt‎

Lines changed: 12 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
1+
if (APPLE)
2+
set(CMAKE_OSX_DEPLOYMENT_TARGET "10.13" CACHE STRING "Minimum OS X deployment version")
3+
endif(APPLE)
4+
15
project(OpenTeraPlus)
26

37
include(CTest)
@@ -12,8 +16,8 @@ cmake_policy(SET CMP0043 NEW)
1216

1317
# Software version
1418
SET(CPACK_PACKAGE_VERSION_MAJOR "1")
15-
SET(CPACK_PACKAGE_VERSION_MINOR "0")
16-
SET(CPACK_PACKAGE_VERSION_PATCH "4")
19+
SET(CPACK_PACKAGE_VERSION_MINOR "1")
20+
SET(CPACK_PACKAGE_VERSION_PATCH "0")
1721
SET(CPACK_PACKAGE_VERSION ${CPACK_PACKAGE_VERSION_MAJOR}.${CPACK_PACKAGE_VERSION_MINOR}.${CPACK_PACKAGE_VERSION_PATCH})
1822
add_definitions(-DOPENTERAPLUS_VERSION="${CPACK_PACKAGE_VERSION}" )
1923
add_definitions(-DOPENTERAPLUS_VERSION_MAJOR="${CPACK_PACKAGE_VERSION_MAJOR}" )
@@ -36,6 +40,12 @@ if (APPLE)
3640
set(CMAKE_INSTALL_INCLUDEDIR OpenTeraPlus.app/Contents/Helpers)
3741
endif(APPLE)
3842

43+
if (UNIX AND NOT APPLE)
44+
# Fix QWebEngine linking issues on Linux (https://bugreports.qt.io/browse/QTBUG-80964)
45+
set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -fuse-ld=gold")
46+
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fuse-ld=gold")
47+
endif(UNIX)
48+
3949

4050
set(CMAKE_VERBOSE_MAKEFILE ON)
4151
set(CMAKE_CXX_STANDARD 11)

‎README.md‎

Lines changed: 14 additions & 1 deletion

‎client/CMakeLists.txt‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
find_package(Qt5Core REQUIRED)
22

3-
43
add_subdirectory(resources)
54
add_subdirectory(src)
65

‎client/resources/TeraClient.qrc‎

Lines changed: 97 additions & 87 deletions
Original file line numberDiff line numberDiff line change
@@ -1,126 +1,136 @@
11
<RCC>
22
<qresource prefix="/">
3-
<file>logos/Estrad.png</file>
4-
<file>logos/IntRoLab.png</file>
5-
<file>logos/logo_CDRV.png</file>
6-
<file>status/calling.gif</file>
7-
<file>status/connecting.gif</file>
8-
<file>status/loading.gif</file>
9-
<file>status/status_incomplete.png</file>
10-
<file>status/status_notok.png</file>
11-
<file>status/status_ok.png</file>
12-
<file>status/warning.png</file>
3+
<file>TeRA_Background.png</file>
4+
<file>controls/blue_button.png</file>
5+
<file>controls/blue_button_pressed.png</file>
136
<file>controls/branch_closed.png</file>
147
<file>controls/branch_left.png</file>
158
<file>controls/branch_opened.png</file>
169
<file>controls/branch_up.png</file>
10+
<file>controls/check2_off.png</file>
11+
<file>controls/check2_off_disabled.png</file>
12+
<file>controls/check2_on.png</file>
13+
<file>controls/check2_on_disabled.png</file>
14+
<file>controls/check_off.png</file>
15+
<file>controls/check_off_disabled.png</file>
16+
<file>controls/check_on.png</file>
17+
<file>controls/check_on_disabled.png</file>
18+
<file>controls/green_button.png</file>
19+
<file>controls/grey_button.png</file>
20+
<file>controls/radio-off.png</file>
21+
<file>controls/radio-on.png</file>
22+
<file>controls/red_button.png</file>
23+
<file>controls/yellow_button.png</file>
24+
<file>defaults/OpenTeraPlus.json</file>
25+
<file>icons/OpenTeraPlus.ico</file>
26+
<file>icons/assets/audio.png</file>
27+
<file>icons/assets/binary.png</file>
28+
<file>icons/assets/database.png</file>
29+
<file>icons/assets/document.png</file>
30+
<file>icons/assets/encrypted.png</file>
31+
<file>icons/assets/generic.png</file>
32+
<file>icons/assets/graph.png</file>
33+
<file>icons/assets/icon_source.txt</file>
34+
<file>icons/assets/image.png</file>
35+
<file>icons/assets/json.png</file>
36+
<file>icons/assets/list.png</file>
37+
<file>icons/assets/pdf.png</file>
38+
<file>icons/assets/sensor.png</file>
39+
<file>icons/assets/unknown.png</file>
40+
<file>icons/assets/video.png</file>
41+
<file>icons/assets/web.png</file>
42+
<file>icons/assets/zip.png</file>
43+
<file>icons/config.png</file>
1744
<file>icons/copy.png</file>
45+
<file>icons/dashboard.png</file>
1846
<file>icons/data.png</file>
19-
<file>icons/data_sensor.png</file>
20-
<file>icons/delete.png</file>
2147
<file>icons/delete_old.png</file>
48+
<file>icons/details.png</file>
49+
<file>icons/device.png</file>
50+
<file>icons/device_installed.png</file>
51+
<file>icons/device_installed_busy.png</file>
52+
<file>icons/device_online.png</file>
53+
<file>icons/device_online_busy.png</file>
54+
<file>icons/download.png</file>
2255
<file>icons/edit.png</file>
56+
<file>icons/email.png</file>
57+
<file>icons/error.png</file>
58+
<file>icons/error2.png</file>
2359
<file>icons/filter.png</file>
2460
<file>icons/group.png</file>
25-
<file>icons/group_add.png</file>
26-
<file>icons/group_delete.png</file>
61+
<file>icons/history.png</file>
62+
<file>icons/info.png</file>
63+
<file>icons/join.png</file>
2764
<file>icons/kit.png</file>
65+
<file>icons/leave.png</file>
2866
<file>icons/lock.png</file>
2967
<file>icons/log.png</file>
68+
<file>icons/navtree.png</file>
3069
<file>icons/new.png</file>
70+
<file>icons/ok.png</file>
71+
<file>icons/ok2.png</file>
3172
<file>icons/options.png</file>
73+
<file>icons/password.png</file>
3274
<file>icons/patient.png</file>
3375
<file>icons/patient_installed.png</file>
76+
<file>icons/patient_installed_busy.png</file>
3477
<file>icons/patient_online.png</file>
3578
<file>icons/patient_online_busy.png</file>
79+
<file>icons/play.png</file>
80+
<file>icons/project-icon.png</file>
81+
<file>icons/project.png</file>
82+
<file>icons/random.png</file>
83+
<file>icons/record.png</file>
84+
<file>icons/record_stop.png</file>
3685
<file>icons/refresh.png</file>
3786
<file>icons/save.png</file>
3887
<file>icons/search.png</file>
3988
<file>icons/sensors.png</file>
89+
<file>icons/server.png</file>
90+
<file>icons/service.png</file>
4091
<file>icons/session.png</file>
41-
<file>icons/session_offline.png</file>
42-
<file>icons/session_offline_warning.png</file>
43-
<file>icons/session_online.png</file>
44-
<file>icons/session_online_warning.png</file>
45-
<file>icons/session_pause.png</file>
46-
<file>icons/session_warning.png</file>
92+
<file>icons/session_type.png</file>
93+
<file>icons/site-icon.png</file>
94+
<file>icons/site.png</file>
95+
<file>icons/smile.png</file>
4796
<file>icons/software_user.png</file>
97+
<file>icons/software_user_offline_busy.png</file>
98+
<file>icons/software_user_online.png</file>
99+
<file>icons/software_user_online_busy.png</file>
100+
<file>icons/stop.png</file>
48101
<file>icons/test.png</file>
49-
<file>icons/test_add.png</file>
50-
<file>icons/test_lock.png</file>
51-
<file>icons/test_unlock.png</file>
52102
<file>icons/undo.png</file>
53103
<file>icons/unlock.png</file>
104+
<file>icons/upload.png</file>
54105
<file>icons/user_info.png</file>
55106
<file>icons/usergroup.png</file>
56-
<file>icons/warning.png</file>
57-
<file>TeRA_Background.png</file>
58-
<file>icons/error.png</file>
59-
<file>icons/ok.png</file>
60-
<file>icons/site.png</file>
61-
<file>icons/device.png</file>
62-
<file>icons/project.png</file>
63-
<file>icons/device_installed.png</file>
64-
<file>icons/device_online.png</file>
65-
<file>stylesheet.qss</file>
66-
<file>icons/info.png</file>
67-
<file>icons/navtree.png</file>
68-
<file>icons/history.png</file>
69-
<file>icons/config.png</file>
70-
<file>icons/dashboard.png</file>
71-
<file>icons/details.png</file>
72-
<file>icons/password.png</file>
73-
<file>icons/server.png</file>
74-
<file>icons/email.png</file>
75-
<file>controls/check_off.png</file>
76-
<file>controls/check_on.png</file>
77-
<file>controls/check2_off_disabled.png</file>
78-
<file>controls/check2_off.png</file>
79-
<file>controls/check2_on_disabled.png</file>
80-
<file>controls/check2_on.png</file>
81-
<file>controls/check_on_disabled.png</file>
82-
<file>controls/check_off_disabled.png</file>
83-
<file>icons/download.png</file>
84-
<file>icons/session_type.png</file>
85-
<file>icons/service.png</file>
86-
<file>icons/stop.png</file>
87-
<file>status/session_loading.gif</file>
88-
<file>icons/software_user_online.png</file>
89-
<file>controls/radio-off.png</file>
90-
<file>controls/radio-on.png</file>
91-
<file>translations/openteraplus_en.qm</file>
92-
<file>translations/openteraplus_fr.qm</file>
93-
<file>icons/play.png</file>
94107
<file>icons/view_off.png</file>
95108
<file>icons/view_on.png</file>
96-
<file>status/status_unknown.png</file>
97-
<file>status/status_online.png</file>
98-
<file>status/status_offline.png</file>
109+
<file>icons/warning.png</file>
110+
<file>logos/Estrad.png</file>
111+
<file>logos/IntRoLab.png</file>
112+
<file>logos/LogoOpenTeraPlus.png</file>
113+
<file>logos/logo_CDRV.png</file>
114+
<file>sounds/notify_invite.wav</file>
99115
<file>sounds/notify_offline.wav</file>
100116
<file>sounds/notify_online.wav</file>
117+
<file>status/calling.gif</file>
118+
<file>status/connecting.gif</file>
119+
<file>status/loading.gif</file>
120+
<file>status/session_loading.gif</file>
101121
<file>status/status_busy.png</file>
102-
<file>icons/software_user_offline_busy.png</file>
103-
<file>icons/software_user_online_busy.png</file>
104-
<file>icons/device_installed_busy.png</file>
105-
<file>icons/device_online_busy.png</file>
106-
<file>icons/patient_installed_busy.png</file>
107-
<file>icons/ok2.png</file>
108-
<file>icons/join.png</file>
109-
<file>icons/leave.png</file>
110-
<file>icons/error2.png</file>
111-
<file>icons/smile.png</file>
112-
<file>defaults/OpenTeraPlus.json</file>
113-
<file>sounds/notify_invite.wav</file>
114-
<file>icons/random.png</file>
115-
<file>logos/LogoOpenTeraPlus.png</file>
116-
<file>icons/OpenTeraPlus.ico</file>
117-
<file>icons/record.png</file>
118-
<file>icons/record_stop.png</file>
119-
<file>controls/green_button.png</file>
120-
<file>controls/grey_button.png</file>
121-
<file>controls/red_button.png</file>
122-
<file>controls/yellow_button.png</file>
123-
<file>controls/blue_button.png</file>
124-
<file>controls/blue_button_pressed.png</file>
122+
<file>status/status_incomplete.png</file>
123+
<file>status/status_notok.png</file>
124+
<file>status/status_offline.png</file>
125+
<file>status/status_ok.png</file>
126+
<file>status/status_online.png</file>
127+
<file>status/status_unknown.png</file>
128+
<file>status/warning.png</file>
129+
<file>stylesheet.qss</file>
130+
<file>icons/group_new.png</file>
131+
<file>icons/patient_new.png</file>
132+
<file>icons/project_new.png</file>
133+
<file>translations/openteraplus_en.qm</file>
134+
<file>translations/openteraplus_fr.qm</file>
125135
</qresource>
126136
</RCC>

‎client/resources/icons/assets/audio.png‎

6.81 KB

‎client/resources/icons/assets/binary.png‎

6.39 KB

‎client/resources/icons/assets/database.png‎

13 KB

‎client/resources/icons/assets/document.png‎

3.88 KB

‎client/resources/icons/assets/encrypted.png‎

1.3 KB

‎client/resources/icons/assets/generic.png‎

3.63 KB

0 commit comments

Comments
 (0)