Fix bugs

Author: KangLin

.github/workflows/msvc.yml

@@ -402,6 +402,10 @@ jobs:
             -DCMARK_STATIC=ON ^
             -DWITH_CMARK=OFF ^
             -DWITH_CMARK_GFM=ON ^
+            -DWITH_WebEngineWidgets=ON ^
+            -DRABBIT_ENABLE_INSTALL_DEPENDENT=ON ^
+            -DRABBIT_ENABLE_INSTALL_QT=ON ^
+            -DRABBIT_ENABLE_INSTALL_TO_BUILD_PATH=ON ^
             -DCMAKE_BUILD_TYPE=${{matrix.BUILD_TYPE}} ^
             -DCMAKE_INSTALL_PREFIX=${{env.BUILD_DIR}}/install ^
             -DCMAKE_PREFIX_PATH=${{env.INSTALL_DIR}} ^
@@ -413,10 +417,6 @@ jobs:
             -DVCPKG_TRACE_FIND_PACKAGE=ON ^
             -DBUILD_QUIWidget=OFF ^
             -DBUILD_APP=ON ^
-            -DRABBIT_ENABLE_INSTALL_DEPENDENT=ON ^
-            -DRABBIT_ENABLE_INSTALL_QT=ON ^
-            -DRABBIT_ENABLE_INSTALL_TO_BUILD_PATH=ON ^
-            -DWITH_WebEngineWidgets=ON ^
             -DBUILD_FREERDP=ON ^
             -DPCAP_ROOT=${{env.INSTALL_DIR}}/npcap ^
             -DPacket_ROOT=${{env.INSTALL_DIR}}/npcap ^
@@ -427,16 +427,16 @@ jobs:
             cmake --install . --config ${{matrix.BUILD_TYPE}} --component DependLibraries --strip
             echo "cmake install config: ${{matrix.BUILD_TYPE}} component: Runtime"
             cmake --install . --config ${{matrix.BUILD_TYPE}} --component Runtime --strip
-            echo "cmake install config: ${{matrix.BUILD_TYPE}} component: Application"
-            cmake --install . --config ${{matrix.BUILD_TYPE}} --component Application --strip
             echo "cmake install config: ${{matrix.BUILD_TYPE}} component: Plugin"
             cmake --install . --config ${{matrix.BUILD_TYPE}} --component Plugin --strip
+            echo "cmake install config: ${{matrix.BUILD_TYPE}} component: Application"
+            cmake --install . --config ${{matrix.BUILD_TYPE}} --component Application --strip
           ) else (
             echo "cmake install config: ${{matrix.BUILD_TYPE}} component: Runtime Application Plugin"
             cmake --install . --config ${{matrix.BUILD_TYPE}} --component Runtime
-            cmake --install . --config ${{matrix.BUILD_TYPE}} --component Application
             cmake --install . --config ${{matrix.BUILD_TYPE}} --component Plugin
             cmake --install . --config ${{matrix.BUILD_TYPE}} --component DependLibraries
+            cmake --install . --config ${{matrix.BUILD_TYPE}} --component Application
           )
 
       - name: Package

Package/debian/rules

@@ -53,12 +53,12 @@ override_dh_auto_install:
 	cmake --install $(BUILD_DIR) --config Release \
 		--component Runtime --strip \
 		--prefix $(PACKAGE_DIR)/opt/RabbitRemoteControl
-	cmake --install $(BUILD_DIR) --config Release \
-		--component Application --strip \
-		--prefix $(PACKAGE_DIR)/opt/RabbitRemoteControl	
 	cmake --install $(BUILD_DIR) --config Release \
 		--component Plugin --strip \
 		--prefix $(PACKAGE_DIR)/opt/RabbitRemoteControl
+	cmake --install $(BUILD_DIR) --config Release \
+		--component Application --strip \
+		--prefix $(PACKAGE_DIR)/opt/RabbitRemoteControl
 
 override_dh_shlibdeps:
 	dh_shlibdeps --dpkg-shlibdeps-params=--ignore-missing-info -l`pwd`/$(PACKAGE_DIR)/opt/RabbitRemoteControl/lib:`pwd`/$(PACKAGE_DIR)/opt/RabbitRemoteControl/lib/`uname -m`-linux-gnu:$(LIB_PARAS)

Package/rpm/rabbitremotecontrol.spec

@@ -113,10 +113,10 @@ cmake --install $RPM_BUILD_DIR --config Release --strip \
     --component Runtime \
     --prefix ${RPM_BUILD_ROOT}%{INSTALL_PREFIX}
 cmake --install $RPM_BUILD_DIR --config Release --strip \
-    --component Application \
+    --component Plugin \
     --prefix ${RPM_BUILD_ROOT}%{INSTALL_PREFIX}
 cmake --install $RPM_BUILD_DIR --config Release --strip \
-    --component Plugin \
+    --component Application \
     --prefix ${RPM_BUILD_ROOT}%{INSTALL_PREFIX}
 
 #if [ -n "${INSTALL_DIR}" ]; then

Script/build_appimage.sh

@@ -189,8 +189,8 @@ cmake "$REPO_ROOT" \
 cmake --build . --config Release --parallel $(nproc)
 cmake --install . --config Release --strip --component DependLibraries --prefix ${INSTALL_APP_DIR}
 cmake --install . --config Release --strip --component Runtime --prefix ${INSTALL_APP_DIR}
-cmake --install . --config Release --strip --component Application --prefix ${INSTALL_APP_DIR}
 cmake --install . --config Release --strip --component Plugin --prefix ${INSTALL_APP_DIR}
+cmake --install . --config Release --strip --component Application --prefix ${INSTALL_APP_DIR}
 if [ -d "${INSTALL_DIR}/share/qtermwidget6" ]; then
     cp -r ${INSTALL_DIR}/share/qtermwidget6 ${INSTALL_APP_DIR}/share/
 else

Src/Terminal/ParameterTerminal.cpp

@@ -27,7 +27,7 @@ CParameterTerminal::CParameterTerminal(QObject *parent, const QString& szPrefix)
     m_bMotionAfterPasting = false;
     m_bDisableBracketedPasteMode = false;
     m_bDirectional = true;
-
+    m_szKeyBindings = "default";
     m_szTextCodec = "UTF-8";
     m_nHistorySize = 1000;
 }

Src/Windows/HookWindows.cpp

@@ -137,13 +137,14 @@ int CHookWindows::RegisterKeyboard()
         msg.checkBox()->setChecked(
             m_pParameterPlugin->GetPromptAdministratorPrivilege());
         nRet = msg.exec();
-        if(QMessageBox::Yes == nRet) {
-            RabbitCommon::CTools::Instance()->StartWithAdministratorPrivilege(true);
-        }
         if(m_pParameterPlugin->GetPromptAdministratorPrivilege()
             != msg.checkBox()->isChecked()) {
             m_pParameterPlugin->SetPromptAdministratorPrivilege(
                 msg.checkBox()->isChecked());
+            emit m_pParameterPlugin->sigChanged();
+        }
+        if(QMessageBox::Yes == nRet) {
+            RabbitCommon::CTools::Instance()->StartWithAdministratorPrivilege(true);
         }
     }
 

snap/snapcraft.yaml.core22

@@ -300,6 +300,7 @@ parts:
       - -DWinPR_DIR=$CRAFT_STAGE/usr/local/lib/cmake/WinPR3
       - -DFreeRDP-Shadow_DIR=$CRAFT_STAGE/usr/local/lib/cmake/FreeRDP-Shadow3
       - -DFreeRDP-Server_DIR=$CRAFT_STAGE/usr/local/lib/cmake/FreeRDP-Server3
+      - -DWITH_WebEngineWidgets=ON
     # build-environment:
     #   - LD_LIBRARY_PATH: "$CRAFT_STAGE/qt/lib:$LD_LIBRARY_PATH"
     #   - CMAKE_FIND_ROOT_PATH: "$CRAFT_STAGE/qt;$CRAFT_STAGE/usr/local/lib;$CMAKE_FIND_ROOT_PATH"