Merge pull request #5 from srilakshmikanthanp/auth

Attempt to auto connect the device

.installer/configuration/config.xml

@@ -11,7 +11,7 @@
   <TargetDir>@HomeDir@/.clipbird</TargetDir>
   <Title>Clipbird Installer</Title>
   <Name>Clipbird</Name>
-  <Version>1.0.0</Version>
+  <Version>1.1.0</Version>
   <Publisher>Sri Lakshmi Kanthan P</Publisher>
   <StartMenuDir>Clipbird</StartMenuDir>
 </Installer>

.installer/packages/clipbird/meta/install.qs

@@ -61,7 +61,7 @@ Component.prototype.createOperations = function () {
       "@TargetDir@/clipbird.exe",
       "@StartMenuDir@/ClipBird.lnk",
       "workingDirectory=@TargetDir@",
-      "iconPath=@TargetDir@/logo.png",
+      "iconPath=@TargetDir@/logo.ico",
       "IconId=0",
       "description=ClipBird"
     );

.installer/packages/clipbird/meta/package.xml

@@ -15,7 +15,7 @@
     on your network.
   </Description>
   <ReleaseDate>2023-07-29</ReleaseDate>
-  <Version>1.0.0</Version>
+  <Version>1.1.0</Version>
   <Script>install.qs</Script>
   <Licenses>
     <License name="MIT LICENSE" file="LICENSE" />

.scripts/package.ps1

@@ -24,11 +24,11 @@ Remove-Item -Recurse -Force $ClipbirDir/* -Exclude .gitignore
 
 # Copy All openssl dlls to the package directory
 Write-Host "Copying $env:OPENSSL_ROOT_DIR /bin/*.dll to $ClipbirDir" -ForegroundColor Green
-Copy-Item "$env:OPENSSL_ROOT_DIR /bin/*.dll" $ClipbirDir
+Copy-Item "$env:OPENSSL_ROOT_DIR/bin/*.dll" $ClipbirDir
 
 # copy the Logo to the package directory
-Write-Host "Copying ./assets/images/logo.png to $ClipbirDir" -ForegroundColor Green
-Copy-Item ./assets/images/logo.png $ClipbirDir
+Write-Host "Copying ./assets/images/* to $ClipbirDir" -ForegroundColor Green
+Copy-Item ./assets/images/* $ClipbirDir
 
 # Create the package as BuildType (to lower) version
 Write-Host "Creating the package as Release version" -ForegroundColor Green

.vscode/c_cpp_properties.json

@@ -1,28 +1,5 @@
 {
   "configurations": [
-    {
-      "compilerPath": "/usr/bin/gcc",
-      "name": "linux",
-      "includePath": [
-        "${workspaceFolder}/build/_deps/singleapplication-src",
-        "${workspaceFolder}/build",
-        "${workspaceFolder}/",
-        "${workspaceFolder}/build/_deps/**",
-        "/opt/Qt/6.5.2/gcc_64/include/QtGui",
-        "/opt/Qt/6.5.2/gcc_64/include/QtCore",
-        "/opt/Qt/6.5.2/gcc_64/include/**",
-        "${HOME}/.kderoot/include/KF6/KDNSSD"
-      ],
-      "defines": [
-        "_UNICODE",
-        "_DEBUG",
-        "UNICODE"
-      ],
-      "cStandard": "c17",
-      "cppStandard": "c++17",
-      "intelliSenseMode": "linux-gcc-x64",
-      "configurationProvider": "ms-vscode.cpptools"
-    },
     {
       "compilerPath": "C:/Program Files/Microsoft Visual Studio/2022/Community/VC/Tools/MSVC/14.33.31629/bin/Hostx64/x64/cl.exe",
       "name": "Win32",
@@ -38,11 +15,7 @@
         "C:\\Program Files\\Bonjour SDK\\Include",
         "C:\\kderoot\\include\\KF6\\KGuiAddons\\**"
       ],
-      "defines": [
-        "_UNICODE",
-        "_DEBUG",
-        "UNICODE"
-      ],
+      "defines": [ "_UNICODE", "_DEBUG", "UNICODE" ],
       "cStandard": "c17",
       "cppStandard": "c++17",
       "intelliSenseMode": "msvc-x64",

.vscode/settings.json

@@ -14,7 +14,8 @@
     "pubkey",
     "qobject",
     "qvariant",
-    "SSLCONFIG"
+    "SSLCONFIG",
+    "unauthed"
   ],
   "files.associations": {
     ".env*": "dotenv",
@@ -148,6 +149,11 @@
     "*.qs": "javascript",
     ".qs": "javascript",
     "qsystemtrayicon": "cpp",
-    "qsettings": "cpp"
+    "qsettings": "cpp",
+    "queue": "cpp",
+    "stack": "cpp",
+    "qsslcertificate": "cpp",
+    "qapplication": "cpp",
+    "singleapplication": "cpp"
   },
 }

CMakeLists.txt

@@ -2,7 +2,7 @@
 cmake_minimum_required(VERSION 3.0.0 FATAL_ERROR)
 
 # set project name and version
-project(clipbird VERSION 0.0.1 LANGUAGES CXX)
+project(clipbird VERSION 1.1.0 LANGUAGES CXX)
 
 # set c++ standard 17
 set(CMAKE_CXX_STANDARD 17)
@@ -105,6 +105,11 @@ qt_standard_project_setup()
 qt_add_resources(RESOURCES
   ${PROJECT_SOURCE_DIR}/assets/resources.qrc)
 
+# Add windows.rc to project
+if (WIN32)
+  set (RESOURCES ${RESOURCES} ${PROJECT_SOURCE_DIR}/assets/windows.rc)
+endif()
+
 # Add executable
 qt_add_executable(clipbird
   ${main_cpp} ${RESOURCES})
@@ -114,7 +119,6 @@ target_link_libraries(clipbird
   PRIVATE SingleApplication::SingleApplication
   PRIVATE Qt6::Widgets
   PRIVATE Qt6::Network
-  PRIVATE Qt6::Sql
   PRIVATE OpenSSL::SSL
   PRIVATE OpenSSL::Crypto)
 
@@ -146,10 +150,8 @@ if(CMAKE_CXX_COMPILER_ID MATCHES "GNU")
   target_compile_options(clipbird PRIVATE -std=c++17)
 endif()
 
-# add target linker options MSVC /NODEFAULTLIB:library
 # add target compiler options MSVC /std:c++17
 if(MSVC)
-  target_link_options(clipbird PRIVATE /NODEFAULTLIB:library)
   target_compile_options(clipbird PRIVATE /std:c++17)
 endif()
 

README.md

@@ -110,14 +110,6 @@ In the following steps, we will see how to build the project in the Windows plat
 * Qt6
 * OpenSSL
 
-#### Installing Qt6
-
-Go to [Qt](https://www.qt.io/download-qt-installer) and download the Qt installer for windows, then install it in your system. After installing Qt, you need to set the environment variable `QT_CMAKE_DIR` to the Qt cmake directory.
-
-#### Installing Bonjour
-
-Just go to [bonjour](https://developer.apple.com/bonjour/) and downlod the bonjour SDK for windows, then install it in your system. It should set the environment variable `BONJOUR_SDK_HOME` to the Bonjour SDK directory.
-
 #### Installing OpenSSL
 
 Install OpenSSL using the following command and set the environment variable `OPENSSL_ROOT_DIR` to the OpenSSL installation directory.
@@ -126,6 +118,14 @@ Install OpenSSL using the following command and set the environment variable `OP
 choco install openssl
 ~~~
 
+#### Installing Qt6
+
+Go to [Qt](https://www.qt.io/download-qt-installer) and download the Qt installer for windows, then install it in your system. After installing Qt, you need to set the environment variable `QT_CMAKE_DIR` to the Qt cmake directory.
+
+#### Installing Bonjour
+
+Just go to [bonjour](https://developer.apple.com/bonjour/) and downlod the bonjour SDK for windows, then install it in your system. It should set the environment variable `BONJOUR_SDK_HOME` to the Bonjour SDK directory.
+
 #### Environment Variables
 
 | Variable            | Value                              |

assets/windows.rc

@@ -0,0 +1,6 @@
+// Copyright (c) 2023 Sri Lakshmi Kanthan P
+//
+// This software is released under the MIT License.
+// https://opensource.org/licenses/MIT
+
+appIcon ICON "./assets/images/logo.ico"

constants/constants.cpp

@@ -111,7 +111,6 @@ std::string getAppIssuePage() {
  * @return std::string
  */
 std::string getMDnsServiceName() {
-  std::cout << QSysInfo::machineHostName().toStdString() << std::endl;
   return QSysInfo::machineHostName().toStdString();
 }