sync: from linuxdeepin/dde-session-shell

.reuse/dep5

@@ -0,0 +1,73 @@
+Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+Upstream-Name: dde-session-shell
+Upstream-Contact: UnionTech Software Technology Co., Ltd.
+Source: https://github.com/linuxdeepin/dde-session-shell
+
+# README
+Files: README.md README.zh_CN.md
+Copyright: None
+License: CC-BY-4.0
+
+# cmake
+Files: cmake/*.in cmake/*.cmake
+Copyright: None
+License: CC0-1.0
+
+# xml2cpp
+Files: src/global_util/dbus/*
+Copyright: The Qt Company Ltd.
+License: CC0-1.0
+
+# Project file
+Files: *.pro *.qrc *CMakeLists.txt *.cmake qt-theme.ini files/* scripts/* src/lightdm-deepin-greeter/deepin-greeter .project .syncexclude
+Copyright: None
+License: CC0-1.0
+
+# docs
+Files: docs/*
+Copyright: UnionTech Software Technology Co., Ltd.
+License: GPL-3.0-or-later
+
+# png svg
+Files: src/widgets/img/* misc/images/* src/session-widgets/img/* plugins/examples/login-plugins/login-udcp/images/*
+Copyright: UnionTech Software Technology Co., Ltd.
+License: GPL-3.0-or-later
+
+# translation
+Files: translations/* .tx/*
+Copyright: UnionTech Software Technology Co., Ltd.
+License: GPL-3.0-or-later
+
+# sh
+Files: lupdate.sh tests/test-recoverage.sh translate_generation.sh
+Copyright: None
+License: CC0-1.0
+
+# gitignore
+Files: .gitignore
+Copyright: None
+License: CC0-1.0
+
+# ci
+Files: .github/* .gitlab-ci.yml .obs/*
+Copyright: None
+License: CC0-1.0
+
+# xml toml json conf yaml
+Files: xml/*.xml *.json *.conf
+Copyright: UnionTech Software Technology Co., Ltd.
+License: GPL-3.0-or-later
+
+# qss
+Files: src/widgets/skin/*.qss
+Copyright: UnionTech Software Technology Co., Ltd.
+License: GPL-3.0-or-later
+
+# debian rpm archlinux
+Files: debian/* rpm/* archlinux/*
+Copyright: None
+License: CC0-1.0
+
+Files: toolGenerate/**/*
+Copyright: None
+License: CC0-1.0

plugins/CMakeLists.txt

@@ -4,4 +4,3 @@ if (DISABLE_DSS_SNIPE)
 endif()
 # add_subdirectory(examples)
 # add_subdirectory(assist_login)
-# add_subdirectory("login-gesture")

src/dde-lock/lockframe.cpp

@@ -171,7 +171,12 @@ bool LockFrame::event(QEvent *event)
         }
 
         if (keyValue != "") {
+#ifdef ENABLE_DSS_SNIPE
+            // v25 dde-daemon接受小驼峰命名的name
+            emit sendKeyValue(qtifyName(keyValue));
+#else
             emit sendKeyValue(keyValue);
+#endif
         }
     }
     return FullScreenBackground::event(event);

src/global_util/public_func.cpp

@@ -356,3 +356,21 @@
     return value.toBool();
 }
 #endif
+
+QString qtifyName(const QString &name) {
+    bool next_cap = false;
+    QString result;
+
+    for (auto it = name.cbegin(); it != name.cend(); ++it) {
+        if (*it == '-') {
+            next_cap = true;
+        } else if (next_cap) {
+            result.append(it->toUpper());
+            next_cap = false;
+        } else {
+            result.append(*it);
+        }
+    }
+
+    return result;
+}

src/global_util/public_func.h

@@ -82,4 +82,10 @@ void configWebEngine();
 bool isSleepLock();
 #endif
 
+/**
+ * @brief convert 'some-key' to 'someKey'.
+ */
+
+QString qtifyName(const QString &name);
+
 #endif // PUBLIC_FUNC_H