Merge branch 'master' of github.com:mauroc/squiddio_pi

mauroc · Oct 11, 2019 · 35b0a5d · 35b0a5d
2 parents 623b833 + 168458d
commit 35b0a5d
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 8 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -33,8 +33,8 @@ SET(CPACK_PACKAGE_CONTACT "Mauro Calvi")
 
 SET(VERSION_MAJOR "1")
 SET(VERSION_MINOR "0")
-SET(VERSION_PATCH "11")
-SET(PLUGIN_VERSION_DATE "2019/09/26")
+SET(VERSION_PATCH "12")
+SET(PLUGIN_VERSION_DATE "2019/10/10")
 SET(OCPN_MIN_VERSION "ov50")
 
 #SET(CMAKE_BUILD_TYPE Debug)

diff --git a/ci/travis-build-osx.sh b/ci/travis-build-osx.sh
@@ -42,7 +42,7 @@ chmod 644 /usr/local/lib/lib*.dylib
 make install
 #make install # Dunno why the second is needed but it is, otherwise
              # plugin data is not included in the bundle
-# make create-dmg
+make create-dmg
 
 wget http://opencpn.navnux.org/build_deps/Packages.dmg;
 hdiutil attach Packages.dmg;

diff --git a/cmake/PluginPackage.cmake b/cmake/PluginPackage.cmake
@@ -171,24 +171,24 @@ IF(APPLE)
 
   # INSTALL(DIRECTORY DESTINATION "bin/OpenCPN.app/Contents/PlugIns")
   install(
-    FILES ${PREFIX_PARENTLIB}/libsquiddio_pi.dylib
+    FILES ${PREFIX_PARENTLIB}/lib${PACKAGE_NAME}.dylib
     DESTINATION "bin/OpenCPN.app/Contents/PlugIns"
   )
   set(
     LIBS
-    "\${CMAKE_INSTALL_PREFIX}/bin/OpenCPN.app/Contents/PlugIns/libsquiddio_pi.dylib"
+    "\${CMAKE_INSTALL_PREFIX}/bin/OpenCPN.app/Contents/PlugIns/lib${PACKAGE_NAME}.dylib"
   )
   MESSAGE(STATUS "osX package: ${CPACK_PACKAGE_FILE_NAME}, package_version: ${PACKAGE_VERSION}, package_release: ${OCPN_MIN_VERSION}")
   add_custom_command(
     OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/${CPACK_PACKAGE_FILE_NAME}.dmg
     COMMAND chmod +x ${CMAKE_SOURCE_DIR}/buildosx/create-dmg
     COMMAND
       ${CMAKE_SOURCE_DIR}/buildosx/create-dmg 
-      --volname "squiddio_pi Installer" 
+      --volname "${PACKAGE_NAME} Installer" 
       --background ${CMAKE_SOURCE_DIR}/buildosx/background.png
         ${CMAKE_CURRENT_BINARY_DIR}/${CPACK_PACKAGE_FILE_NAME}.dmg
         ${CMAKE_INSTALL_PREFIX}/bin/
-    DEPENDS ${CMAKE_INSTALL_PREFIX}/bin/OpenCPN.app/Contents/PlugIns/libsquiddio_pi.dylib
+    DEPENDS ${CMAKE_INSTALL_PREFIX}/bin/OpenCPN.app/Contents/PlugIns/lib${PACKAGE_NAME}.dylib
     WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
     COMMENT "create-dmg [${CPACK_PACKAGE_FILE_NAME}]: Generated dmg file."
   )

diff --git a/src/squiddio_pi.cpp b/src/squiddio_pi.cpp
@@ -250,7 +250,7 @@ int squiddio_pi::Init(void) {
 
     //    This PlugIn needs a toolbar icon, so request its insertion
     m_leftclick_tool_id = InsertPlugInTool(_T(""), _img_plugin_logo,
-            _img_plugin_logo, wxITEM_NORMAL, _("sQuiddio"), _T(""), NULL,
+            _img_plugin_logo, wxITEM_CHECK, _("sQuiddio"), _T(""), NULL,
             SQUIDDIO_TOOL_POSITION, 0, this);
 
     m_pThread = new SquiddioThread(this);
@@ -1204,7 +1204,9 @@ void squiddio_pi::SetLogsWindow() {
 }
 
 void squiddio_pi::OnToolbarToolCallback(int id) {
+    SetToolbarItemState( m_leftclick_tool_id, true );
     PreferencesDialog(m_parent_window);
+    SetToolbarItemState( m_leftclick_tool_id, false );
 }
 void squiddio_pi::SetPluginMessage(wxString &message_id, wxString &message_body) {
     g_psJSON->ProcessMessage(message_id, message_body);