bump version to 0.6.2.1 and fix some packaging issues

CMakeLists.txt

@@ -12,7 +12,7 @@ set(CMAKE_C_STANDARD 11)
 set(xava_VERSION_MAJOR 0)
 set(xava_VERSION_MINOR 6)
 set(xava_VERSION_PATCH 2)
-set(xava_VERSION_TWEAK 0)
+set(xava_VERSION_TWEAK 1)
 
 add_definitions(-DPACKAGE="xava" -DVERSION="${xava_VERSION_MAJOR}.${xava_VERSION_MINOR}.${xava_VERSION_PATCH}.${xava_VERSION_TWEAK}")
 add_definitions(-DPREFIX="${CMAKE_INSTALL_PREFIX}")

README.md

@@ -321,6 +321,8 @@ As of version 0.4.0 all options are done in the config file, no more command-lin
 By default a configuration file is located in `$XDG_CONFIG_HOME/xava/config`, 
 `$HOME/.config/xava/config` or on Windows `%APPDATA%\xava\config`
 
+On Windows if you used the installer, you'll find a "Configure XAVA" shortcut.
+
 The configurations are seperated into different categories such as ``[general]`` or ``[window]`` 
 which correspond with their own options.
 

assets/nsis-win/xava.nsi → assets/windows/xava.nsi

@@ -3,8 +3,8 @@
 # Set project name
 Name "X.A.V.A."
 
-!define PRODUCT_VERSION "0.6.2.0"
-!define VERSION "0.6.2.0"
+!define PRODUCT_VERSION "0.6.2.1"
+!define VERSION "0.6.2.1"
 
 VIProductVersion "${PRODUCT_VERSION}"
 VIFileVersion "${VERSION}"
@@ -28,6 +28,7 @@ Section
 
     # include these files
     File xava.exe
+    File xava.ico
     File README.md
     File LICENSE.txt
     File config.cfg
@@ -40,15 +41,16 @@ Section
 
     # create a shortcut named "new shortcut" in the start menu programs directory
     # point the new shortcut at the program uninstaller
-    CreateShortCut "$SMPROGRAMS\XAVA.lnk" "$INSTDIR\xava.exe"
-    CreateShortCut "$SMPROGRAMS\Uninstall XAVA.lnk" "$INSTDIR\uninstall.exe"
+    CreateDirectory "$SMPROGRAMS\XAVA"
+    CreateShortCut "$SMPROGRAMS\XAVA\XAVA.lnk" "$INSTDIR\xava.exe" "" "$INSTDIR\xava.ico"
+    CreateShortCut "$SMPROGRAMS\XAVA\Configure XAVA.lnk" "notepad.exe" "%APPDATA%\xava\config.cfg"
+    CreateShortCut "$SMPROGRAMS\XAVA\Uninstall XAVA.lnk" "$INSTDIR\uninstall.exe"
 SectionEnd
 
 # uninstaller section start
 Section "uninstall"
     # first, remove the link from the start menu
-    Delete "$SMPROGRAMS\XAVA.lnk"
-    Delete "$SMPROGRAMS\Uninstall XAVA.lnk"
+    RMDir /r "$SMPROGRAMS\XAVA"
 
     # second, delete the program
     RMDir /r "$INSTDIR"

src/config.c

@@ -463,7 +463,7 @@ void load_config(char configPath[255], char supportedInput[255], void* params)
 	p->monstercat = 1.5 * iniparser_getdouble(ini, "smoothing:monstercat", 1.2);
 	p->waves = iniparser_getint(ini, "smoothing:waves", 0);
 	p->integral = iniparser_getdouble(ini, "smoothing:integral", 85);
-	p->gravity = 50*iniparser_getdouble(ini, "smoothing:gravity", 100);
+	p->gravity = iniparser_getdouble(ini, "smoothing:gravity", 100);
 	p->ignore = iniparser_getdouble(ini, "smoothing:ignore", 0);
 	p->logScale = iniparser_getdouble(ini, "smoothing:log", 1.5);
 	p->oddoneout = iniparser_getdouble(ini, "smoothing:oddoneout", 1);

src/output/graphical_win.c

@@ -4,6 +4,8 @@
 #include "graphical.h"
 #include "../config.h"
 
+#define WIN_ICON_PATH "xava.ico"
+
 const char szAppName[] = "XAVA";
 const char wcWndName[] = "XAVA";
 
@@ -122,13 +124,21 @@ unsigned char register_window_win(HINSTANCE HIn) {
 	xavaWinClass.cbClsExtra=0;
 	xavaWinClass.cbWndExtra=0;
 	xavaWinClass.hInstance=HIn;
-	xavaWinClass.hIconSm = LoadIcon(NULL, IDI_APPLICATION);
-	xavaWinClass.hIcon=LoadIcon(NULL,IDI_APPLICATION);
+	xavaWinClass.hIcon=LoadImage( // returns a HANDLE so we have to cast to HICON
+  NULL,             // hInstance must be NULL when loading from a file
+  WIN_ICON_PATH,    // the icon file name
+  IMAGE_ICON,       // specifies that the file is an icon
+  0,                // width of the image (we'll specify default later on)
+  0,                // height of the image
+  LR_LOADFROMFILE|  // we want to load a file (as opposed to a resource)
+  LR_DEFAULTSIZE|   // default metrics based on the type (IMAGE_ICON, 32x32)
+  LR_SHARED         // let the system release the handle when it's no longer used
+);
+	xavaWinClass.hIconSm=xavaWinClass.hIcon;
 	xavaWinClass.hCursor=LoadCursor(NULL,IDC_ARROW);
 	xavaWinClass.hbrBackground=(HBRUSH)CreateSolidBrush(0x00000000);
 	xavaWinClass.lpszMenuName=NULL;
 	xavaWinClass.lpszClassName=szAppName;
-	xavaWinClass.hIconSm=LoadIcon(NULL,IDI_APPLICATION);
 
 	return RegisterClassEx(&xavaWinClass);
 }