Add autoinstall

Enable optional replace control image on test failure
Add Icon to app

Author: volatilflerovium

.gitignore

@@ -1,4 +1,5 @@
 *~
+deploy_app.sh
 debug_dir
 AppDir/*
 bin

CMakeLists.txt

@@ -101,6 +101,7 @@ add_executable(
 	src/light_image_panel.cpp
 	src/keyboard_configuration.cpp
 	src/configurator.cpp
+	src/utf8_text.cpp
 )
 
 target_link_libraries(

README.md

@@ -10,13 +10,14 @@ user input.
 - [Dependencies](#dependencies)
 - [Features](#features)
 - [AppImage](#appimage)
+	- [Desktop Integration](#desktop-integration) 
 - [Examples](#examples)
 - [Interface Method](#interface-method)
 	- [TinyUSB](#TinyUSB)
 	- [uinput](#uinput)
 	- [vm](#vm)
 - [Control Command](#control-command)
-- [Things to be Considered](things-to-be-considered)
+- [Things to be Considered](#things-to-be-considered)
 - [License](#license)
 
 ## Overview
@@ -87,6 +88,32 @@ openSUSE, Red Hat, Ubuntu, and other common desktop distributions running with x
 Some functionalities of kmRecorderAndPlayer relay on x11 (input on specific window,
 window screenshot), therefore it is not working under Wayland.
 
+### Desktop Integration
+
+This is totally optional.
+
+Creating desktop entries for kmRecorderPlayer ensures quick access
+from the Application menu. For this, kmRecorderAndPlayer's autoinstallation
+will create desktop file with the following content
+
+```
+[Desktop Entry]
+Name=HID Recorder and Player
+Comment=Graphical tool for recording and playing keyboard and mouse input
+Terminal=false
+Type=Application
+Exec=~/bin/kmRecPlayer/kmRecorderAndPlayer-x86_64.AppImage
+Icon=~/bin/kmRecPlayer/kmRecPlayerIcon.png
+Categories=Development;
+```
+
+and save it in ~/.local/share/applications/ It also will create the directory
+~/bin/kmRecPlayert and move the appimage there. After this you will be able
+to see kmRecorderAndPlayer listed in the Application menu under Development.
+
+To uninstall it, delete the directory ~/bin/kmRecPlayer and the file
+~/.local/share/applications/kmRecorderPlayer.desktop
+
 ## Examples
 
 The following examples are here only to illustrate the functionality of

documentation.txt

@@ -20,6 +20,7 @@
 
 #include "debug_utils.h"
 #include <cstring>
+#include <optional>
 
 #define SEPARATOR "#+{35sdfh4}|{7gkjf29}+#"
 
@@ -306,19 +307,41 @@ class SimpleUnserialization
 		template<typename T>
 		T get(const char* key)
 		{
-			size_t keySize=std::strlen(key);
-			for(size_t i=0; i<m_cstrSplit.dataSize(); i+=2){
-				if(std::memcmp(m_cstrSplit[i], key, keySize*sizeof(char))==0){
-					return FromString<T>::getFrom(m_cstrSplit[i+1], m_cstrSplit.chunkSize(i+1));
-				}
+			std::optional<T> value=getValue<T>(key);
+			if(value){
+				return *value;
 			}
-			std::string excp="Not conversion rule for type of key: ";
+			
+			std::string excp="Key: ";
 			excp+=key;
+			excp+=" not foundy.";
 			throw excp.c_str();
 		}
 
+		template<typename T>
+		T get(const char* key, T&& defaultValue)
+		{
+			std::optional<T> value=getValue<T>(key);
+			if(value){
+				return *value;
+			}
+			return std::forward<T>(defaultValue);
+		}
+
 	private:
 		CstrSplit<2*N> m_cstrSplit;
+
+		template<typename T>
+		std::optional<T> getValue(const char* key)
+		{
+			size_t keySize=std::strlen(key);
+			for(size_t i=0; i<m_cstrSplit.dataSize(); i+=2){
+				if(std::memcmp(m_cstrSplit[i], key, keySize*sizeof(char))==0){
+					return FromString<T>::getFrom(m_cstrSplit[i+1], m_cstrSplit.chunkSize(i+1));
+				}
+			}
+			return std::nullopt;
+		}
 };
 
 //====================================================================

include/cstr_split.h

@@ -209,24 +209,37 @@ class FileListPopup : public WX_Popup
 };
 
 //====================================================================
+class cmdPtr;
 
 class ResultPopup : public ExtendedPopup
 {
 	public:
-		ResultPopup(wxWindow* parent, const char* title, const std::string& baseImg);
+		ResultPopup(wxWindow* parent, const char* title, CtrlCommand* cmdPtr);
 		virtual ~ResultPopup()=default;
 
 		void loadBaseImg(const std::string& baseImg);
 
 	protected:
 		std::string m_baseImg;
 		std::string m_sampleImg;
+		CtrlCommand* m_ctrlCmdPtr;
 		wxRadioBox* m_swapScreenshotRadio;
 		ImagePanel* m_previewPanel;
 		wxBoxSizer* m_bodySizer;
 		wxBoxSizer* m_row;
+		wxBoxSizer* m_ctrlRow;
+		wxButton* m_replaceBtn;
+		ExtendedPopup* m_replaceImagePopup;
 		uint m_perc;
 
+		enum Target
+		{
+			ONE=0,
+			ALL,
+		};
+
+		void replaceImagePopupDialog();
+		void replaceImage(Target target);
 		void setLayout();
 };
 

include/dedicated_popups.h

@@ -37,6 +37,7 @@ namespace WX
 		SUBMIT_INPUT,
 		SET_CHOICE,
 		TIMER,
+		INTERFACE_TIMER,
 		CONFIG_TIMER,
 		ROI_RADIO,
 		DISPLAY_KBOARD,
@@ -159,6 +160,15 @@ enum class HID_TARGET
 	TINYUSB,
 };
 
+
+enum class InstallationStatus
+{
+	INITIAL,
+	NOT_INSTALLED,
+	INSTALLED,
+	
+};
+
 //====================================================================
 
 #endif

include/enumerations.h

@@ -83,17 +83,17 @@ class ExitCode
 	public:
 		enum 
 		{
-			OK=0,
-			FAILED=1<<1,
-			TIMEOUT=1<<2,
-			BASE_IMAGE_MISSING=1<<3,
-			TARGET_WINDOW_CLOSED=1<<4,
-			CV_EXCEPTION=1<<5,
-			OUT_OF_BOUND=1<<6,// when mouse pointer is trying to get to a position outside of the screen
-			SYSTEM_FAILED=1<<7,
-			UNKNOWN=1<<8,
-			MISSING_SYMBOL=1<<9,
-			LAST=1<<10
+			OK                  =0,
+			FAILED              =1<<0,
+			TIMEOUT             =1<<1,
+			BASE_IMAGE_MISSING  =1<<2,
+			TARGET_WINDOW_CLOSED=1<<3,
+			CV_EXCEPTION        =1<<4,
+			OUT_OF_BOUND        =1<<5,// when mouse pointer is trying to get to a position outside of the screen
+			SYSTEM_FAILED       =1<<6,
+			MISSING_SYMBOL      =1<<7,
+			UNKNOWN             =1<<8,
+			LAST                =1<<9
 		};
 
 		static const char* getExitCodeMsg(int exitCode)
@@ -625,7 +625,7 @@ class CtrlCommand : public BaseCommand, public WindowOffset
 
 		virtual int getExitCode() const override
 		{
-			return m_statusCode | 1 * static_cast<int>(m_strictRun && m_statusCode>0);
+			return m_statusCode | static_cast<int>(m_strictRun && m_statusCode!=ExitCode::OK);
 		}
 
 		virtual uint wait() const override
@@ -673,7 +673,17 @@ class CtrlCommand : public BaseCommand, public WindowOffset
 
 		virtual void setCtrlCallback();
 
-		virtual void updateBaseImg(const char* baseImg, const char* roiStr);
+		/*
+		 * Replace the current image with the newBaseImg, and a new ROI newRoiStr
+		 * 
+		 * */
+		virtual void updateBaseImg(const char* newBaseImg, const char* newRoiStr);
+
+		/*
+		 * Replace only the base image, it assumes that the new image is taken
+		 * using the same ROI as the current one.
+		 * */
+		virtual void updateBaseImg(const char* baseImg);
 
 		virtual void setSensitivity(uint sensitivity)
 		{

include/input_command.h

@@ -124,6 +124,7 @@ class RecorderPlayerKM : public wxFrame
 
 	private:
 		wxTimer m_timer;
+		wxTimer m_checkInterfacetimer;
 
 		std::string m_baseImage;
 		wxString m_roiStr;
@@ -202,7 +203,6 @@ class RecorderPlayerKM : public wxFrame
 		WxWorker* m_connectionWorkerPtr; 
 
 		CmdScrolledWindow::PlayMode m_mode;
-		Cmd m_getFocusCmd;
 
 		CommandInputMode m_commandInputMode;
 		State m_state;
@@ -217,8 +217,10 @@ class RecorderPlayerKM : public wxFrame
 		bool m_fullMenu;
 		bool m_indentation;
 
+		void autoInstall(bool install=false);
+
 		void dialogConfirm(const wxString& line1, const wxString& line2);
-		void checkConnection();
+		void checkConnection(wxTimerEvent& event);
 		void UpdateConnection(bool isConnected);
 		void initPopups();
 		bool Pause();
@@ -232,8 +234,8 @@ class RecorderPlayerKM : public wxFrame
 		bool SaveChangesData();
 		void clearCommands();
 
-		const char* session(bool regenerate=false);
-		std::string imageId();
+		//const char* session(bool regenerate=false);
+		//std::string imageId();
 
 		void windowLevelInput(const char* windowName);
 		void takeScreenshotByWindow(const char* windowName);