CI: modify qtermwidget url

Author: KangLin

.github/workflows/msvc.yml

@@ -438,7 +438,7 @@ jobs:
           copy /Y ${{env.INSTALL_DIR}}\lib\*.dll install\bin
           copy /Y vcpkg_installed\${{matrix.VCPKG_TARGET_TRIPLET}}\bin\*.dll install\bin
           IF EXIST "${{env.INSTALL_DIR}}\share\qtermwidget6" (
-              copy /Y ${{env.INSTALL_DIR}}\share\qtermwidget6 install\share
+              xcopy "${{env.INSTALL_DIR}}\share\qtermwidget6" install\share /Y /S
           )
           C:\msys64\usr\bin\wget https://npcap.com/dist/npcap-1.80.exe
           copy npcap-1.80.exe install\bin

Script/build_depend.sh

@@ -513,8 +513,9 @@ if [ $QTERMWIDGET -eq 1 ]; then
         cmake --build . --config Release --target install
     fi
     if [ ! -d ${INSTALL_DIR}/lib/cmake/qtermwidget6 ]; then
-        git clone -b 2.2.0 --depth=1 https://github.com/lxqt/qtermwidget.git
+        git clone https://github.com/KangLin/qtermwidget.git
         cd qtermwidget
+        git checkout keyboardlayout
         cmake -E make_directory build
         cd build
         cmake .. -DCMAKE_BUILD_TYPE=Release \

Src/Terminal/OperateTerminal.cpp

@@ -28,26 +28,19 @@ COperateTerminal::COperateTerminal(CPlugin *parent)
                                          + QDir::separator() + "share"
                                          + QDir::separator() + "qtermwidget6"
                                          + QDir::separator() + "color-schemes");
-    QTermWidget::addCustomKeyboardLayoutDir(QApplication::applicationDirPath()
+    /*QTermWidget::addCustomKeyboardLayoutDir(QApplication::applicationDirPath()
                                             + QDir::separator() + "kb-layouts");
     QTermWidget::addCustomKeyboardLayoutDir(QApplication::applicationDirPath()
                                             + QDir::separator() + ".."
                                             + QDir::separator() + "share"
                                             + QDir::separator() + "qtermwidget6"
-                                            + QDir::separator() + "kb-layouts");
+                                            + QDir::separator() + "kb-layouts");//*/
     m_pTerminal = new QTermWidget(0);
     if(!m_pTerminal) {
         qCritical(log) << "new QTermWidget() fail";
         return;
     }
     m_pTerminal->setAutoClose(true);
-    m_pTerminal->addCustomColorSchemeDir(QApplication::applicationDirPath()
-                                         + QDir::separator() + "color-schemes");
-    m_pTerminal->addCustomColorSchemeDir(QApplication::applicationDirPath()
-                                         + QDir::separator() + ".."
-                                         + QDir::separator() + "share"
-                                         + QDir::separator() + "qtermwidget6"
-                                         + QDir::separator() + "color-schemes");
 
     bool check = false;
     m_pTerminal->setContextMenuPolicy(Qt::CustomContextMenu);

snap/snapcraft.yaml

@@ -240,9 +240,10 @@ parts:
     # See 'snapcraft plugins'
     # see: https://snapcraft.io/docs/supported-plugins
     plugin: cmake # See: https://snapcraft.io/docs/cmake-plugin
-    source: https://github.com/lxqt/qtermwidget.git
+    source: https://github.com/KangLin/qtermwidget.git
     source-type: git
-    source-tag: 2.2.0
+    #source-tag: 2.2.0
+    source-branch: keyboardlayout
     source-depth: 1
     after:
       - lxqt-build-tools