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

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_fi.ts

@@ -7,11 +7,11 @@
     </message>
     <message>
         <source>For first time use, please set the gesture password first</source>
-        <translation>Kun käytät ensimmäistä kertaa, aseta ensin ele salasanaksi</translation>
+        <translation>Kun käytät ensimmäistä kertaa, aseta ensin ele</translation>
     </message>
     <message>
         <source>Set gesture password</source>
-        <translation>Aseta ele salasanaksi</translation>
+        <translation>Aseta ele</translation>
     </message>
     <message>
         <source>Please draw a gesture password</source>
@@ -47,7 +47,7 @@
     </message>
     <message>
         <source>Device is locked, unlocked after %1 minutes</source>
-        <translation type="unfinished"/>
+        <translation>Tietokone on lukittu, avataan %1 minuutin kuluttua</translation>
     </message>
     <message>
         <source>Modify gesture password</source>
@@ -63,27 +63,27 @@
     </message>
     <message>
         <source>Drawing error, Contact the administrator to reset</source>
-        <translation type="unfinished"/>
+        <translation>Piirtovirhe, ota yhteyttä järjestelmänvalvojaan nollaamista varten.</translation>
     </message>
     <message>
         <source>Cancel</source>
-        <translation type="unfinished"/>
+        <translation>Peruuta</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"/>
+        <translation>Piirtovirhe, %1 yritystä jäljellä. Ota yhteyttä järjestelmänvalvojaan nollaamista varten.</translation>
     </message>
     <message>
         <source>Setup completed Start unlock</source>
-        <translation type="unfinished"/>
+        <translation>Asennus valmis, aloita lukituksen avaaminen</translation>
     </message>
     <message>
         <source>Unlock with gesture password</source>
-        <translation type="unfinished"/>
+        <translation>Avaa lukitus eleellä</translation>
     </message>
     <message>
         <source>Minimum 4 points, please redraw</source>

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

@@ -47,7 +47,7 @@
     </message>
     <message>
         <source>Device is locked, unlocked after %1 minutes</source>
-        <translation type="unfinished"/>
+        <translation>Urządzenie zablokowane, odblokowanie za %1 minut</translation>
     </message>
     <message>
         <source>Modify gesture password</source>
@@ -63,35 +63,35 @@
     </message>
     <message>
         <source>Drawing error, Contact the administrator to reset</source>
-        <translation type="unfinished"/>
+        <translation>Błąd rysowania, skontaktuj się z administratorem, aby zresetować hasło</translation>
     </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"/>
+        <translation>Błąd rysowania, pozostały %1 próby. Skontaktuj się z administratorem, aby zresetować hasło</translation>
     </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>
-        <translation type="unfinished"/>
+        <translation>Odblokuj za pomocą wzoru hasła</translation>
     </message>
     <message>
         <source>Minimum 4 points, please redraw</source>
-        <translation type="unfinished"/>
+        <translation>Co najmniej 4 punkty, narysuj ponownie.</translation>
     </message>
     <message>
         <source>Contact the administrator to reset</source>
-        <translation type="unfinished"/>
+        <translation>Skontaktuj się z administratorem, aby zresetować hasło</translation>
     </message>
 </context>
 </TS>

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