Merge pull request #31 from introlab/dev

Merge from Dev in Master for Release 1.0.0

.gitignore

@@ -0,0 +1 @@
+/client/resources/translations/*.qm

.gitmodules

@@ -0,0 +1,10 @@
+[submodule "external/protobuf"]
+	path = external/protobuf
+	url = https://github.com/protocolbuffers/protobuf.git
+[submodule "external/messages"]
+	path = external/messages
+	url = https://github.com/introlab/opentera_messages.git
+[submodule "external/opentera-webcamoid"]
+	path = external/opentera-webcamoid
+	url = https://github.com/introlab/opentera-webcamoid.git
+	branch = devel

CMakeLists.txt

@@ -11,34 +11,44 @@ cmake_minimum_required(VERSION 3.0.2)
 cmake_policy(SET CMP0043 NEW)
 
 # Software version
-SET(CPACK_PACKAGE_VERSION_MAJOR "0")
-SET(CPACK_PACKAGE_VERSION_MINOR "1")
+SET(CPACK_PACKAGE_VERSION_MAJOR "1")
+SET(CPACK_PACKAGE_VERSION_MINOR "0")
 SET(CPACK_PACKAGE_VERSION_PATCH "0")
 SET(CPACK_PACKAGE_VERSION ${CPACK_PACKAGE_VERSION_MAJOR}.${CPACK_PACKAGE_VERSION_MINOR}.${CPACK_PACKAGE_VERSION_PATCH})
-add_definitions(-DTERAPLUS_VERSION="${CPACK_PACKAGE_VERSION}" )
+add_definitions(-DOPENTERAPLUS_VERSION="${CPACK_PACKAGE_VERSION}" )
+add_definitions(-DOPENTERAPLUS_CLIENT_NAME="${CMAKE_PROJECT_NAME}")
 
 # Compile in debug or release mode
 if(NOT CMAKE_BUILD_TYPE)
-  #SET(CMAKE_BUILD_TYPE Release)
-  set(CMAKE_BUILD_TYPE Debug)
+  SET(CMAKE_BUILD_TYPE Release)
+  #set(CMAKE_BUILD_TYPE Debug)
 endif(NOT CMAKE_BUILD_TYPE)
 
+set(CMAKE_INSTALL_DEFAULT_COMPONENT_NAME openteraplus)
+set(CMAKE_INSTALL_PREFIX ${CMAKE_CURRENT_SOURCE_DIR}/deploy)
+
 set(CMAKE_VERBOSE_MAKEFILE ON)
 set(CMAKE_CXX_STANDARD 11)
 set(CMAKE_WINDOWS_EXPORT_ALL_SYMBOLS ON)
 
 message(STATUS "Using QMAKE: ${QT_QMAKE_EXECUTABLE}")
 
 # This will enable to output everything in the bin directory for testing and debugging...
-SET (EXECUTABLE_OUTPUT_PATH ${PROJECT_SOURCE_DIR}/bin)
-SET (LIBRARY_OUTPUT_PATH ${PROJECT_SOURCE_DIR}/bin)
+# SET (EXECUTABLE_OUTPUT_PATH ${PROJECT_SOURCE_DIR}/bin)
+# SET (LIBRARY_OUTPUT_PATH ${PROJECT_SOURCE_DIR}/bin)
+
+# External dependencies first
+add_subdirectory(external)
 
 # Shared data
 add_subdirectory(shared)
 
 # Client
 add_subdirectory(client)
 
+# Tests
+add_subdirectory(tests)
+
 # Package
 add_subdirectory(package)
 

client/CMakeLists.txt

@@ -1,4 +1,6 @@
 find_package(Qt5Core REQUIRED)
 
+
 add_subdirectory(resources)
 add_subdirectory(src)
+

client/resources/TeraClient.qrc

@@ -1,6 +1,5 @@
 <RCC>
     <qresource prefix="/">
-        <file>defaults/TeraClientConfig.txt</file>
         <file>logos/Estrad.png</file>
         <file>logos/IntRoLab.png</file>
         <file>logos/LOGO Transparent.png</file>
@@ -84,5 +83,54 @@
         <file>icons/device_online.png</file>
         <file>stylesheet.qss</file>
         <file>icons/info.png</file>
+        <file>icons/camera.png</file>
+        <file>icons/navtree.png</file>
+        <file>icons/history.png</file>
+        <file>icons/config.png</file>
+        <file>icons/dashboard.png</file>
+        <file>icons/details.png</file>
+        <file>icons/password.png</file>
+        <file>icons/server.png</file>
+        <file>icons/email.png</file>
+        <file>controls/check_off.png</file>
+        <file>controls/check_on.png</file>
+        <file>controls/check2_off_disabled.png</file>
+        <file>controls/check2_off.png</file>
+        <file>controls/check2_on_disabled.png</file>
+        <file>controls/check2_on.png</file>
+        <file>controls/check_on_disabled.png</file>
+        <file>controls/check_off_disabled.png</file>
+        <file>icons/download.png</file>
+        <file>icons/session_type.png</file>
+        <file>icons/service.png</file>
+        <file>icons/stop.png</file>
+        <file>status/session_loading.gif</file>
+        <file>icons/software_user_offline.png</file>
+        <file>icons/software_user_online.png</file>
+        <file>controls/radio-off.png</file>
+        <file>controls/radio-on.png</file>
+        <file>translations/openteraplus_en.qm</file>
+        <file>translations/openteraplus_fr.qm</file>
+        <file>icons/play.png</file>
+        <file>icons/view_off.png</file>
+        <file>icons/view_on.png</file>
+        <file>status/status_unknown.png</file>
+        <file>status/status_online.png</file>
+        <file>status/status_offline.png</file>
+        <file>sounds/notify_offline.wav</file>
+        <file>sounds/notify_online.wav</file>
+        <file>status/status_busy.png</file>
+        <file>icons/software_user_offline_busy.png</file>
+        <file>icons/software_user_online_busy.png</file>
+        <file>icons/device_installed_busy.png</file>
+        <file>icons/device_online_busy.png</file>
+        <file>icons/patient_installed_busy.png</file>
+        <file>icons/ok2.png</file>
+        <file>icons/join.png</file>
+        <file>icons/leave.png</file>
+        <file>icons/error2.png</file>
+        <file>icons/smile.png</file>
+        <file>defaults/OpenTeraPlus.json</file>
+        <file>sounds/notify_invite.wav</file>
     </qresource>
 </RCC>

client/resources/defaults/OpenTeraPlus.json

@@ -0,0 +1,16 @@
+{
+    "Settings": {
+        "showServers": true,
+        "logToFile": true
+    },
+    "Servers": {
+        "Local-40075": {
+                "url": "localhost",
+                "port": 40075
+        },
+        "3IT-Telesante": {
+                "url": "telesante.3it.usherbrooke.ca",
+                "port": 40075
+	}
+    }
+}