Merge pull request #53 from introlab/dev

Main merge for 1.0.3 release

.gitmodules

@@ -3,8 +3,4 @@
 	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
+	url = https://github.com/introlab/opentera_messages.git

CMakeLists.txt

@@ -13,7 +13,7 @@ cmake_policy(SET CMP0043 NEW)
 # Software version
 SET(CPACK_PACKAGE_VERSION_MAJOR "1")
 SET(CPACK_PACKAGE_VERSION_MINOR "0")
-SET(CPACK_PACKAGE_VERSION_PATCH "2")
+SET(CPACK_PACKAGE_VERSION_PATCH "3")
 SET(CPACK_PACKAGE_VERSION ${CPACK_PACKAGE_VERSION_MAJOR}.${CPACK_PACKAGE_VERSION_MINOR}.${CPACK_PACKAGE_VERSION_PATCH})
 add_definitions(-DOPENTERAPLUS_VERSION="${CPACK_PACKAGE_VERSION}" )
 add_definitions(-DOPENTERAPLUS_VERSION_MAJOR="${CPACK_PACKAGE_VERSION_MAJOR}" )
@@ -30,6 +30,13 @@ endif(NOT CMAKE_BUILD_TYPE)
 set(CMAKE_INSTALL_DEFAULT_COMPONENT_NAME openteraplus)
 set(CMAKE_INSTALL_PREFIX ${CMAKE_CURRENT_SOURCE_DIR}/deploy)
 
+if (APPLE)
+    set(CMAKE_INSTALL_BINDIR OpenTeraPlus.app/Contents/bin)
+    set(CMAKE_INSTALL_LIBDIR OpenTeraPlus.app/Contents/lib)
+    set (CMAKE_INSTALL_INCLUDEDIR OpenTeraPlus.app/Contents/include)
+endif(APPLE)
+
+
 set(CMAKE_VERBOSE_MAKEFILE ON)
 set(CMAKE_CXX_STANDARD 11)
 set(CMAKE_WINDOWS_EXPORT_ALL_SYMBOLS ON)
@@ -52,8 +59,11 @@ add_subdirectory(client)
 # Tests
 add_subdirectory(tests)
 
+# Readme and other files
+add_custom_target(readme SOURCES README.md LICENSE.TXT)
+
+# Install LICENSE / README
+install(FILES README.md LICENSE.TXT DESTINATION .)
+
 # Package
 add_subdirectory(package)
-
-# Readme and other files
-add_custom_target(readme SOURCES README.md)

client/resources/TeraClient.qrc

@@ -133,5 +133,13 @@
         <file>icons/random.png</file>
         <file>logos/LogoOpenTeraPlus.png</file>
         <file>icons/OpenTeraPlus.ico</file>
+        <file>icons/record.png</file>
+        <file>icons/record_stop.png</file>
+        <file>controls/green_button.png</file>
+        <file>controls/grey_button.png</file>
+        <file>controls/red_button.png</file>
+        <file>controls/yellow_button.png</file>
+        <file>controls/blue_button.png</file>
+        <file>controls/blue_button_pressed.png</file>
     </qresource>
 </RCC>

client/resources/defaults/OpenTeraPlus.json

@@ -1,7 +1,8 @@
 {
     "Settings": {
         "showServers": true,
-        "logToFile": true
+        "logToFile": true,
+        "kitMode": false
     },
     "Servers": {
         "Local - Port 40075": {

client/resources/stylesheet.qss

@@ -60,6 +60,18 @@ QTableWidget::tab,QHeaderView::section {
     min-height:25px;
 }
 
+QHeaderView::down-arrow {
+    image: url(://controls/branch_opened.png);
+    height: 12px;
+    width: 12px;
+}
+
+QHeaderView::up-arrow {
+    image: url(://controls/branch_up.png);
+    height: 12px;
+    width: 12px;
+}
+
 QTabBar::tab{
     background: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: 0  rgba(128,128,140,50%),  stop: 1.0  rgba(100,100,140,25%));
     border: 2px solid  rgba(128,128,140,50%);
@@ -549,7 +561,7 @@ QPushButton#btnEditUser::hover, QPushButton#btnConfig::hover{
     color:black;
 }
 
-QToolButton#btnVideo:!checked, QToolButton#btnLog:!checked{
+QToolButton#btnVideo:!checked, QToolButton#btnLog:!checked, QToolButton#btnFilterActive:!checked, QToolButton#btnSearch:!checked{
     color:white;
     background-color: transparent;
     border: 1px solid rgb(120,120,120);
@@ -562,14 +574,14 @@ QToolButton#btnLog:!checked, QToolButton#btnInSessionInfos:!checked{
     border: 0px;
 }
 
-QToolButton#btnVideo:checked, QToolButton#btnLog:checked, QToolButton#btnInSessionInfos:checked{
+QToolButton#btnVideo:checked, QToolButton#btnLog:checked, QToolButton#btnInSessionInfos:checked, QToolButton#btnSearch:checked, QToolButton#btnFilterActive:checked{
     color:black;
     background-color: gray;
     /*border: 2px solid white;*/
     border: 0px;
 }
 
-QLineEdit#txtPartSearch{
+QLineEdit#txtPartSearch, QLineEdit#txtNavSearch{
     color: white;
     background-color: rgba(0,0,0,15%);
 }