Merge branch 'version087' into 'master'

CHANGELOG.md

@@ -1,46 +1,62 @@
 # Change Log
 All notable changes to this project will be documented in this file.
 
+## v0.8.7 [08.03.2019]
+### Added
+- Add line snapping options #102
+- Add backuping with lines #101
+- Add layers controlling #90
+
+### Changed
+- Change warning for Hline #117
+- Show operations message on statusBar #113
+- Redesign Inifile widget Layout #112
+
+### Bugs fixed
+- Fix keyshorts conflict #120
+- Fix segmentation fault #121
+- Fix error by inputing coordinates #116
+
 ## v0.8.6 [08.01.2019]
-## Added
+### Added
 - Add zoom extents option #64
 - Add zoom Windows option #64
 - Add wirte ini-files feature #27
 
-## Changed
+### Changed
 - Improve statbility #105
 - Use panning mode by middle button 
 
-## Bugs fixed
+### Bugs fixed
 - Fix shortcut for "Del"
 
 ## v0.8.5 [02.11.2018]
-## Added
+### Added
 - Add Auto Saving function #67
 
 - Better Panning Mode #100
 
-## Changed
+### Changed
 - Update Shortcuts #92
 
 - Design new origin and axis #99
 
-## Bugs fixed
+### Bugs fixed
 - Esc doesn't work while drawing #98
 
 - SegFault: Delete all Rooms #91
 
 
 ## v0.8.4 [05.10.2018]
-## Added
+### Added
 - In menu bar, under "Edit" you will find "Clear Rooms and Doors button" to clear all defined rooms and doors. #54
 
 - Define points of a line using keyboard on status bar. #61 #63
 
-## Changed
+### Changed
 - A new tidily icons are added. #88
 
-## Bugs fixed
+### Bugs fixed
 - Fixed a crash when deleting rooms. #42
 
 - Fixed a problem when width of lines change after highlighting. #50

CMakeLists.txt

@@ -36,17 +36,18 @@ 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 4)
+set(JPSEDITOR_PATCH_VERSION 7)
 set(JPSEDITOR_VERSION
-  ${JPSEDITOR_MAJOR_VERSION}.${JPSEDITOR_MINOR_VERSION}.${JPSEDITOR_PATCH_VERSION})
+        ${JPSEDITOR_MAJOR_VERSION}.${JPSEDITOR_MINOR_VERSION}.${JPSEDITOR_PATCH_VERSION})
 
 if("${CMAKE_BUILD_TYPE}" STREQUAL "")
     set(CMAKE_BUILD_TYPE Release)
 endif()
 
 message( STATUS "Generating  ................................... ${PROJECT_NAME} (${JPSEDITOR_VERSION}) -- ${CMAKE_BUILD_TYPE}")
 if(APPLE )
-  set(CMAKE_INSTALL_PREFIX "/tmp")
+    set(CMAKE_INSTALL_PREFIX "/Applications")
+  set (CMAKE_PREFIX_PATH "/Applications/Qt/5.12.0/clang_64")
 endif()
 message(STATUS "${PROJECT_NAME} will be installed to ${CMAKE_INSTALL_PREFIX}")
 
@@ -112,15 +113,22 @@ set( SRCS
     src/widgetlandmark.cpp
     src/widgetsettings.cpp
     src/jpsconnection.cpp
-        src/jpsregion.cpp
+    src/jpsregion.cpp
+    src/settingdialog.cpp
+    src/inifilewidget.cpp
+    src/snappingoptions.cpp
+
     dxflib/src/dl_writer_ascii.cpp
     dxflib/src/dl_dxf.cpp
     src/UndoFramework/action.cpp
     src/UndoFramework/actionstack.cpp
     src/UndoFramework/lineaction.cpp
-        src/AutomaticRoomIdentification/roomdefinition.cpp
+    src/AutomaticRoomIdentification/roomdefinition.cpp
     src/AutomaticRoomIdentification/roomidentification.cpp
-    src/settingdialog.cpp
+    src/tinyxml/tinystr.cpp
+    src/tinyxml/tinyxml.cpp
+    src/tinyxml/tinyxmlerror.cpp
+    src/tinyxml/tinyxmlparser.cpp
   )
 # all header files that should be treated with moc
 set( HDR
@@ -139,7 +147,12 @@ set( HDR
     src/widgetlandmark.h
     src/widgetsettings.h
     src/jpsconnection.h
-        src/jpsregion.h
+    src/jpsregion.h
+    src/dtrace.h
+    src/settingdialog.h
+    src/inifilewidget.h
+    src/snappingoptions.h
+
     dxflib/src/dl_writer_ascii.h
     dxflib/src/dl_writer.h
     dxflib/src/dl_global.h
@@ -151,15 +164,15 @@ set( HDR
     dxflib/src/dl_creationadapter.h
     dxflib/src/dl_codes.h
     dxflib/src/dl_attributes.h
+
     src/UndoFramework/action.h
     src/UndoFramework/actionstack.h
     src/UndoFramework/lineaction.h
-        src/AutomaticRoomIdentification/roomID.h
+    src/AutomaticRoomIdentification/roomID.h
     src/AutomaticRoomIdentification/roomdefinition.h
     src/AutomaticRoomIdentification/roomidentification.h
-    src/dtrace.h
-    src/settingdialog.h
-
+    src/tinyxml/tinystr.h
+    src/tinyxml/tinyxml.h
   )
 
 # *.ui files
@@ -169,6 +182,8 @@ set( UIS
     forms/widgetlandmark.ui
     forms/widgetsettings.ui
     forms/settingdialog.ui
+    forms/inifilewidget.ui
+    forms/snappingoptions.ui
   )
 
 # and finally a resource file

CONTRIBUTING.md

@@ -195,9 +195,6 @@ Here are some hints to configure your editor in order to use the *stroustrup* st
     Read also
     [How to change indentation width in eclipse?](https://superuser.com/questions/462221/how-do-i-reliably-change-the-indentation-width-in-eclipse)
 
-- **Clion**
-<!-- TODO -->
-
 
 ## Writing Documentation
 

Resources/resources.qrc

@@ -58,5 +58,7 @@
         <file>Icons/plus.svg</file>
         <file>Icons/landmark.svg</file>
         <file>Icons/moved_hand.svg</file>
+        <file>Icons/attribute.svg</file>
+        <file>Icons/breaking.png</file>
     </qresource>
 </RCC>