Merge branch 'develop' into 'master'

V0.8.4

See merge request !14

AUTHORS

@@ -19,11 +19,12 @@ Nick Sohre (University of Minnesota)
 Yao Xiao
 
 JPSeditor contributors:
-(Date: 16.08.2017)
+(Date: 03.09.2017)
 
 Erik Andresen
 Mohcine Chraibi 
 Nick Sohre (University of Minnesota)
 Maximilian Osterkamp (BUW)
 Aaron Schumacher (BUW)
+Tao Zhong
 

CHANGELOG.md

 # Change Log
 All notable changes to this project will be documented in this file.
 
+## v0.8.4 [05.10.2018]
+## Added
+- In menu bar, under "Edit" you will find "Clear Rooms and Doors button" to clear all defined rooms and doors.
+
+- Define points of a line using keyboard on status bar.
+
+## Changed
+- A new tidily icons are added.
+
+## Bugs fixed
+- Fixed a crash when deleting rooms.
+
+- Fixed a problem when width of lines change after highlighting.
+
+- Fixed a problem when room is deleted bug caption is still there.
+
+- Fixed a problem when captions are overlapped.
+
 ## v0.8.3 [16.05.2018]
 ### Added
 - Now user can type x and y to define endpoint for line and Hline.  !7

CMakeLists.txt

@@ -34,7 +34,7 @@ set(README_FILE "${CMAKE_SOURCE_DIR}/README.md")
 set(CMAKE_COLOR_MAKEFILE ON)
 set(JPSEDITOR_MAJOR_VERSION 0)
 set(JPSEDITOR_MINOR_VERSION 8)
-set(JPSEDITOR_PATCH_VERSION 2)
+set(JPSEDITOR_PATCH_VERSION 4)
 set(JPSEDITOR_VERSION
   ${JPSEDITOR_MAJOR_VERSION}.${JPSEDITOR_MINOR_VERSION}.${JPSEDITOR_PATCH_VERSION})
 
@@ -171,7 +171,7 @@ set( UIS
 
 # and finally a resource file
 set( RCS
-    forms/Ressource.qrc
+        Resources/resources.qrc
   )
 
 
@@ -505,4 +505,3 @@ endif()
 #     install_qt5_executable("${EXECUTABLE}" "qsqlite")
 #   endif()
 # endif()
-