v0.0.9 Release

.gitignore

@@ -1,7 +1,8 @@
 .idea
 .vs
 .stfolder
+builds
+.stignore
+.DS_Store
 CMakeSettings.json
-cmake-build-debug
-cmake-build-release
 CMakeLists.txt.user

CMakeLists.txt

@@ -1,28 +1,19 @@
 cmake_minimum_required(VERSION 3.14)
 project(Strategr)
 
-
 set(CMAKE_CXX_STANDARD 17)
 set(Boost_USE_STATIC_LIBS ON)
 
-message("platform ${CMAKE_GENERATOR_PLATFORM}")
-
 find_package(Boost COMPONENTS filesystem REQUIRED)
 find_package(catch2 REQUIRED)
 find_package(Qt5 COMPONENTS Widgets Network Test REQUIRED)
 
-find_library(utf8Proc_LIBRARY_PATH
-        libutf8proc.a
-        utf8proc_static.lib
-        utf8proc
-        HINTS $ENV{LIBPATH})
+find_library(utf8Proc_LIBRARY_PATH libutf8proc.a utf8proc.lib utf8proc)
 
 if (APPLE)
     find_package(Qt5 COMPONENTS MacExtras REQUIRED)
 endif ()
 
-message(${utf8Proc_LIBRARY_PATH})
-
 include_directories(.)
 include_directories(models)
 include_directories(models/apple)
@@ -88,7 +79,11 @@ set(MODELS ${MODELS_PLATFORM_FILES}
         models/utility.h
         models/mousehandler.cpp
         models/mousehandler.h
-        models/mousehandleroperations.h models/selection.cpp models/selection.h models/event.cpp models/event.h)
+        models/mousehandleroperations.h
+        models/selection.cpp
+        models/selection.h
+        models/event.cpp
+        models/event.h)
 
 set(MODELS_TESTS
         models/tests/activity_tests.cpp
@@ -182,7 +177,11 @@ set(UI
         ui/searchboxwidget.cpp
         ui/searchboxwidget.h
         ui/dynamicpalette.cpp
-        ui/dynamicpalette.h ui/slotboardcircleswidget.cpp ui/slotboardcircleswidget.h)
+        ui/dynamicpalette.h
+        ui/slotboardcircleswidget.cpp
+        ui/slotboardcircleswidget.h
+        ui/iconwidget.cpp
+        ui/iconwidget.h)
 
 set(UTILITY
         ${version_file}
@@ -191,8 +190,6 @@ set(UTILITY
         utility/applicationsettings.h
         utility/utils.cpp
         utility/utils.h
-        utility/notifierimplementation.cpp
-        utility/notifierimplementation.h
         utility/notifierbackend.h
         utility/notifierbackend.cpp
         utility/fontutils.cpp
@@ -248,7 +245,18 @@ if (APPLE)
             deployment/Strategr.icns
             deployment/Strategy.icns)
 
-    SET(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/Strategr.app/Contents/Frameworks)
+    set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/Strategr.app/Contents/Frameworks)
+endif ()
+
+if (WIN32)
+    set(PLATFORM_FILES
+            deployment/Strategr.rc
+            third-party/wintoast/wintoastlib.h
+            third-party/wintoast/wintoastlib.cpp)
+
+    set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/Strategr)
+    set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/Strategr)
+    set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/Strategr)
 endif ()
 
 add_executable(models_tests
@@ -263,7 +271,6 @@ target_link_libraries(models_tests
         ${MODELS_PLATFORM_LIBRARIES})
 
 option(COVERAGE "Generate code coverage" OFF)
-message("Compiler: ${CMAKE_CXX_COMPILER_ID}")
 
 if (COVERAGE)
     if ("${CMAKE_CXX_COMPILER_ID}" MATCHES Clang)
@@ -284,8 +291,7 @@ add_library(StrategrCore SHARED ${MODELS})
 
 set(CMAKE_WINDOWS_EXPORT_ALL_SYMBOLS OFF)
 
-#add_definitions(-DUTF8PROC_STATIC -DWIN32_LEAN_AND_MEAN)
-target_compile_definitions(StrategrCore PUBLIC UTF8PROC_STATIC WIN32_LEAN_AND_MEAN)
+target_compile_definitions(StrategrCore PUBLIC UTF8PROC_STATIC)
 
 target_link_libraries(StrategrCore
         ${MODELS_LIBRARIES}
@@ -338,16 +344,38 @@ target_link_libraries(Strategr
         ${PLATFORM_LIBRARIES})
 
 if (APPLE)
-    if (CMAKE_BUILD_TYPE MATCHES Release)
+    if (CMAKE_BUILD_TYPE MATCHES Rel)
         add_custom_command(TARGET Strategr
                 POST_BUILD
                 COMMAND ${CMAKE_SOURCE_DIR}/scripts/macos_deploy.sh ${CMAKE_CURRENT_BINARY_DIR} ${VERSION})
-    endif (CMAKE_BUILD_TYPE MATCHES Release)
+    endif (CMAKE_BUILD_TYPE MATCHES Rel)
 
     set_target_properties(updater PROPERTIES
             RUNTIME_OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/Strategr.app/Contents/MacOS")
 endif ()
 
+if (WIN32)
+    if (CMAKE_BUILD_TYPE MATCHES Rel)
+        configure_file("${CMAKE_CURRENT_SOURCE_DIR}/deployment/Strategr_x86.iss.in"
+                "${CMAKE_CURRENT_SOURCE_DIR}/deployment/Strategr_x86.iss")
+
+        configure_file("${CMAKE_CURRENT_SOURCE_DIR}/deployment/Strategr_x64.iss.in"
+                "${CMAKE_CURRENT_SOURCE_DIR}/deployment/Strategr_x64.iss")
+
+        set_target_properties(Strategr PROPERTIES WIN32_EXECUTABLE ON)
+
+        add_custom_command(TARGET Strategr
+                POST_BUILD
+                COMMAND ${Qt5_DIR}/../../../bin/windeployqt.exe --no-translations ${CMAKE_RUNTIME_OUTPUT_DIRECTORY})
+
+    endif (CMAKE_BUILD_TYPE MATCHES Rel)
+
+    file(COPY "${CMAKE_CURRENT_SOURCE_DIR}/deployment/Strategr.ico"
+            DESTINATION "${CMAKE_RUNTIME_OUTPUT_DIRECTORY}")
+    file(COPY "${CMAKE_CURRENT_SOURCE_DIR}/deployment/Strategy.ico"
+            DESTINATION "${CMAKE_RUNTIME_OUTPUT_DIRECTORY}")
+endif ()
+
 # Set a custom plist file for the app bundle
 set_target_properties(Strategr PROPERTIES
         MACOSX_BUNDLE TRUE

deployment/Strategr.entitlements

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>com.apple.security.personal-information.calendars</key>
+	<true/>
+</dict>
+</plist>

deployment/Strategr.rc

@@ -0,0 +1 @@
+IDI_ICON1               ICON    "Strategr.ico"

deployment/Strategr_x64.iss

@@ -0,0 +1,47 @@
+[Setup]
+AppName=Strategr
+AppVersion=0.0.9
+DefaultDirName={pf64}/Strategr
+DefaultGroupName=Strategr
+OutputBaseFilename=Strategr-x64-v0.0.9
+OutputDir=..\builds\Windows\x64-Release\Installer
+ChangesAssociations=yes
+
+[Files]
+Source: "..\builds\Windows\x64-Release\Strategr\*"; DestDir: {app}; Flags: recursesubdirs;
+
+[Run]
+Filename: "{app}\vc_redist.x64.exe"; StatusMsg: "Installing Visual Studio C++ Runtime.."; Parameters: "/quiet"; Check: VC2019RedistNeedsInstall; Flags: waituntilterminated
+Filename: "{app}\Strategr.exe"; Description: "Launch Strategr"; Flags: postinstall nowait skipifsilent
+
+[Icons]
+Name: "{group}\Strategr"; Filename: "{app}\Strategr.exe"; WorkingDir: "{app}"
+Name: "{group}\Uninstall Strategr"; Filename: "{uninstallexe}"
+
+[Registry]
+Root: HKLM; Subkey: "Software\Classes\.stg"; ValueType: string; ValueName: ""; ValueData: "Strategy"; Flags: uninsdeletevalue
+Root: HKLM; Subkey: "Software\Classes\Strategy"; ValueType: string; ValueName: ""; ValueData: "Strategy"; Flags: uninsdeletekey
+Root: HKLM; Subkey: "Software\Classes\Strategy\DefaultIcon"; ValueType: string; ValueName: ""; ValueData: "{app}\Strategy.ico"
+Root: HKLM; Subkey: "Software\Classes\Strategy\shell\open\command"; ValueType: string; ValueName: ""; ValueData: """{app}\Strategr.exe"" ""%1"""
+
+[Code]
+function VC2019RedistNeedsInstall: Boolean;
+var
+  Version: String;
+begin
+  if (RegQueryStringValue(HKEY_LOCAL_MACHINE, 'SOFTWARE\Microsoft\VisualStudio\14.0\VC\Runtimes\x64', 'Version', Version)) then
+  begin
+    // Is the installed version at least 14.24?
+    Log('VC Redist Version check : found ' + Version);
+    Result := (CompareStr(Version, 'v14.24.28127.04')<0);
+  end
+  else
+  begin
+    // Not even an old version installed
+    Result := True;
+  end;
+  if (Result) then
+  begin
+    ExtractTemporaryFile('vc_redist.x64.exe');
+  end;
+end;

deployment/Strategr_x64.iss.in

@@ -0,0 +1,47 @@
+[Setup]
+AppName=Strategr
+AppVersion=@VERSION_SHORT@
+DefaultDirName={pf64}/Strategr
+DefaultGroupName=Strategr
+OutputBaseFilename=Strategr-x64-v@VERSION@
+OutputDir=..\builds\Windows\x64-Release\Installer
+ChangesAssociations=yes
+
+[Files]
+Source: "..\builds\Windows\x64-Release\Strategr\*"; DestDir: {app}; Flags: recursesubdirs;
+
+[Run]
+Filename: "{app}\vc_redist.x64.exe"; StatusMsg: "Installing Visual Studio C++ Runtime.."; Parameters: "/quiet"; Check: VC2019RedistNeedsInstall; Flags: waituntilterminated
+Filename: "{app}\Strategr.exe"; Description: "Launch Strategr"; Flags: postinstall nowait skipifsilent
+
+[Icons]
+Name: "{group}\Strategr"; Filename: "{app}\Strategr.exe"; WorkingDir: "{app}"
+Name: "{group}\Uninstall Strategr"; Filename: "{uninstallexe}"
+
+[Registry]
+Root: HKLM; Subkey: "Software\Classes\.stg"; ValueType: string; ValueName: ""; ValueData: "Strategy"; Flags: uninsdeletevalue
+Root: HKLM; Subkey: "Software\Classes\Strategy"; ValueType: string; ValueName: ""; ValueData: "Strategy"; Flags: uninsdeletekey
+Root: HKLM; Subkey: "Software\Classes\Strategy\DefaultIcon"; ValueType: string; ValueName: ""; ValueData: "{app}\Strategy.ico"
+Root: HKLM; Subkey: "Software\Classes\Strategy\shell\open\command"; ValueType: string; ValueName: ""; ValueData: """{app}\Strategr.exe"" ""%1"""
+
+[Code]
+function VC2019RedistNeedsInstall: Boolean;
+var
+  Version: String;
+begin
+  if (RegQueryStringValue(HKEY_LOCAL_MACHINE, 'SOFTWARE\Microsoft\VisualStudio\14.0\VC\Runtimes\x64', 'Version', Version)) then
+  begin
+    // Is the installed version at least 14.24?
+    Log('VC Redist Version check : found ' + Version);
+    Result := (CompareStr(Version, 'v14.24.28127.04')<0);
+  end
+  else
+  begin
+    // Not even an old version installed
+    Result := True;
+  end;
+  if (Result) then
+  begin
+    ExtractTemporaryFile('vc_redist.x64.exe');
+  end;
+end;

deployment/Strategr_x86.iss

@@ -0,0 +1,47 @@
+[Setup]
+AppName=Strategr
+AppVersion=0.0.9
+DefaultDirName={pf}/Strategr
+DefaultGroupName=Strategr
+OutputBaseFilename=Strategr-x86-v0.0.9
+OutputDir=..\builds\Windows\x86-Release\Installer
+ChangesAssociations=yes
+
+[Files]
+Source: "..\builds\Windows\x86-Release\Strategr\*"; DestDir: {app}; Flags: recursesubdirs;
+
+[Run]
+Filename: "{app}\vc_redist.x86.exe"; StatusMsg: "Installing Visual Studio C++ Runtime.."; Parameters: "/quiet"; Check: VC2019RedistNeedsInstall; Flags: waituntilterminated
+Filename: "{app}\Strategr.exe"; Description: "Launch Strategr"; Flags: postinstall nowait skipifsilent
+
+[Icons]
+Name: "{group}\Strategr"; Filename: "{app}\Strategr.exe"; WorkingDir: "{app}"
+Name: "{group}\Uninstall Strategr"; Filename: "{uninstallexe}"
+
+[Registry]
+Root: HKLM; Subkey: "Software\Classes\.stg"; ValueType: string; ValueName: ""; ValueData: "Strategy"; Flags: uninsdeletevalue
+Root: HKLM; Subkey: "Software\Classes\Strategy"; ValueType: string; ValueName: ""; ValueData: "Strategy"; Flags: uninsdeletekey
+Root: HKLM; Subkey: "Software\Classes\Strategy\DefaultIcon"; ValueType: string; ValueName: ""; ValueData: "{app}\Strategy.ico"
+Root: HKLM; Subkey: "Software\Classes\Strategy\shell\open\command"; ValueType: string; ValueName: ""; ValueData: """{app}\Strategr.exe"" ""%1"""
+
+[Code]
+function VC2019RedistNeedsInstall: Boolean;
+var
+  Version: String;
+begin
+  if (RegQueryStringValue(HKEY_LOCAL_MACHINE, 'SOFTWARE\Microsoft\VisualStudio\14.0\VC\Runtimes\x86', 'Version', Version)) then
+  begin
+    // Is the installed version at least 14.24?
+    Log('VC Redist Version check : found ' + Version);
+    Result := (CompareStr(Version, 'v14.24.28127.04')<0);
+  end
+  else
+  begin
+    // Not even an old version installed
+    Result := True;
+  end;
+  if (Result) then
+  begin
+    ExtractTemporaryFile('vc_redist.x86.exe');
+  end;
+end;

deployment/Strategr_x86.iss.in

@@ -0,0 +1,47 @@
+[Setup]
+AppName=Strategr
+AppVersion=@VERSION_SHORT@
+DefaultDirName={pf}/Strategr
+DefaultGroupName=Strategr
+OutputBaseFilename=Strategr-x86-v@VERSION@
+OutputDir=..\builds\Windows\x86-Release\Installer
+ChangesAssociations=yes
+
+[Files]
+Source: "..\builds\Windows\x86-Release\Strategr\*"; DestDir: {app}; Flags: recursesubdirs;
+
+[Run]
+Filename: "{app}\vc_redist.x86.exe"; StatusMsg: "Installing Visual Studio C++ Runtime.."; Parameters: "/quiet"; Check: VC2019RedistNeedsInstall; Flags: waituntilterminated
+Filename: "{app}\Strategr.exe"; Description: "Launch Strategr"; Flags: postinstall nowait skipifsilent
+
+[Icons]
+Name: "{group}\Strategr"; Filename: "{app}\Strategr.exe"; WorkingDir: "{app}"
+Name: "{group}\Uninstall Strategr"; Filename: "{uninstallexe}"
+
+[Registry]
+Root: HKLM; Subkey: "Software\Classes\.stg"; ValueType: string; ValueName: ""; ValueData: "Strategy"; Flags: uninsdeletevalue
+Root: HKLM; Subkey: "Software\Classes\Strategy"; ValueType: string; ValueName: ""; ValueData: "Strategy"; Flags: uninsdeletekey
+Root: HKLM; Subkey: "Software\Classes\Strategy\DefaultIcon"; ValueType: string; ValueName: ""; ValueData: "{app}\Strategy.ico"
+Root: HKLM; Subkey: "Software\Classes\Strategy\shell\open\command"; ValueType: string; ValueName: ""; ValueData: """{app}\Strategr.exe"" ""%1"""
+
+[Code]
+function VC2019RedistNeedsInstall: Boolean;
+var
+  Version: String;
+begin
+  if (RegQueryStringValue(HKEY_LOCAL_MACHINE, 'SOFTWARE\Microsoft\VisualStudio\14.0\VC\Runtimes\x86', 'Version', Version)) then
+  begin
+    // Is the installed version at least 14.24?
+    Log('VC Redist Version check : found ' + Version);
+    Result := (CompareStr(Version, 'v14.24.28127.04')<0);
+  end
+  else
+  begin
+    // Not even an old version installed
+    Result := True;
+  end;
+  if (Result) then
+  begin
+    ExtractTemporaryFile('vc_redist.x86.exe');
+  end;
+end;

models/mousehandler.cpp

@@ -48,6 +48,7 @@ void stg::mouse_handler::mouse_move(const stg::mouse_event &event) {
     current_slot_index = get_slot_index(event);
     current_session_index = get_session_index(current_slot_index);
     current_mouse_zone = get_mouse_zone(current_session_index, event.position);
+
     current_key_modifiers = event.modifiers;
 
     if (current_operaion->type() != none) {
@@ -210,9 +211,6 @@ stg::mouse_handler::range stg::mouse_handler::get_session_range(index_t session_
     auto top = static_cast<int>(strategy.sessions().relative_begin_time(session) * px_in_time());
     auto height = static_cast<int>(session.duration() * px_in_time());
 
-//    std::cout << "slot_index:  " << slot_index << "\n";
-//    std::cout << "session_index:  " << session_index << "\n";
-
     return range{top, top + height};
 }
 
@@ -230,7 +228,8 @@ stg::mouse_handler::mouse_zone stg::mouse_handler::get_mouse_zone(int session_in
             session_range.bottom
     };
 
-//    std::cout << "pos:  " << event.position << "\n";
+//    std::cout << "pos:  " << mouse_pos << "\n";
+//    std::cout << "slot_height:  " << get_slot_height() << "\n";
 //    std::cout << "session_range:  " << session_range << "\n";
 //    std::cout << "top_stretch_zone:  " << top_stretch_zone << "\n";
 //    std::cout << "bottom_stretch_zone:  " << bottom_stretch_zone << "\n";