sync: from linuxdeepin/dde-session-shell

Synchronize source files from linuxdeepin/dde-session-shell.

Source-pull-request: linuxdeepin/dde-session-shell#44

Author: deepin-ci-robot

.tx/config

@@ -1,16 +1,15 @@
 [main]
 host = https://www.transifex.com
-minimum_perc = 80
-mode = developer
 
-[o:linuxdeepin:p:deepin-desktop-environment:r:dde-session-shell]
+[o:linuxdeepin:p:deepin-desktop-environment:r:7b6846181f3a648d8293f3e4693d31cc]
 file_filter = translations/dde-session-shell_<lang>.ts
 source_file = translations/dde-session-shell_en.ts
 source_lang = en
 type = QT
 
-[o:linuxdeepin:p:deepin-desktop-environment:r:login-gesture]
+[o:linuxdeepin:p:deepin-desktop-environment:r:ba0d8d02ba70d7f954ec191e4d0303be]
 file_filter = plugins/login-gesture/translations/login-gesture_<lang>.ts
 source_file = plugins/login-gesture/translations/login-gesture_en.ts
 source_lang = en
 type = QT
+

plugins/CMakeLists.txt

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

plugins/login-gesture/translations/login-gesture_pl.ts

@@ -67,19 +67,19 @@
     </message>
     <message>
         <source>Cancel</source>
-        <translation type="unfinished"/>
+        <translation>Anuluj</translation>
     </message>
     <message>
         <source>Ok</source>
-        <translation type="unfinished"/>
+        <translation>Ok</translation>
     </message>
     <message>
         <source>Drawing error, %1 chances left. Contact the administrator to reset</source>
         <translation type="unfinished"/>
     </message>
     <message>
         <source>Setup completed Start unlock</source>
-        <translation type="unfinished"/>
+        <translation>Konfiguracja zakończona, przejdź do logowania</translation>
     </message>
     <message>
         <source>Unlock with gesture password</source>

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 @@ bool isSleepLock()
     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