sync: from linuxdeepin/dde-session-shell

deepin-ci-robot · deepin-ci-robot · commit 070e44314558 · 2025-09-16T09:48:14.000Z
Synchronize source files from linuxdeepin/dde-session-shell. Source-pull-request: linuxdeepin/dde-session-shell#44
diff --git a/.tx/config b/.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
+
diff --git a/plugins/CMakeLists.txt b/plugins/CMakeLists.txt
@@ -4,4 +4,3 @@ if (DISABLE_DSS_SNIPE)
 endif()
 # add_subdirectory(examples)
 # add_subdirectory(assist_login)
-# add_subdirectory("login-gesture")
diff --git a/plugins/login-gesture/translations/login-gesture_fi.ts b/plugins/login-gesture/translations/login-gesture_fi.ts
@@ -7,83 +7,83 @@
     </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>
-        <translation>Piirrä ele salasanaksi</translation>
+        <translation>Piirrä ele</translation>
     </message>
     <message>
         <source>Please draw the gesture password again</source>
-        <translation>Piirrä ele salasanaksi uudelleen</translation>
+        <translation>Piirrä ele uudelleen</translation>
     </message>
     <message>
         <source>Setup completed Start login</source>
         <translation>Asetus valmis, aloita kirjautuminen</translation>
     </message>
     <message>
         <source>Forgot gesture password</source>
-        <translation>Unohda ele salasana</translation>
+        <translation>Unohda ele</translation>
     </message>
     <message>
         <source>Sign in with gesture password</source>
-        <translation>Kirjaudu sisään ele salasanalla</translation>
+        <translation>Kirjaudu sisään eleellä</translation>
     </message>
     <message>
         <source>Gesture password has been reset</source>
-        <translation>Ele salasana on nollattu</translation>
+        <translation>Ele on nollattu</translation>
     </message>
     <message>
         <source>Please reset the gesture password</source>
-        <translation>Nollaa eleen salasana</translation>
+        <translation>Nollaa ele</translation>
     </message>
     <message>
         <source>Inconsistent with the last drawing, please redraw</source>
         <translation>Ei ole sama edellisen kanssa, piirrä uudelleen</translation>
     </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>
-        <translation>Muokkaa eleen salasanaa</translation>
+        <translation>Muokkaa elettä</translation>
     </message>
     <message>
         <source>Please draw the current gesture password</source>
-        <translation>Piirrä nykyinen ele salasana</translation>
+        <translation>Piirrä nykyinen ele</translation>
     </message>
     <message>
         <source>Modified successfully</source>
         <translation>Muutettu onnistuneesti</translation>
     </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>
diff --git a/plugins/login-gesture/translations/login-gesture_pl.ts b/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>
diff --git a/src/dde-lock/lockframe.cpp b/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);
diff --git a/src/global_util/public_func.cpp b/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;
+}
diff --git a/src/global_util/public_func.h b/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

Original file line number	Diff line number	Diff line change
`@@ -171,7 +171,12 @@ bool LockFrame::event(QEvent *event)`
`171`	`171`	`}`
`172`	`172`
`173`	`173`	`if (keyValue != "") {`
	`174`	`+#ifdef ENABLE_DSS_SNIPE`
	`175`	`+ // v25 dde-daemon接受小驼峰命名的name`
	`176`	`+ emit sendKeyValue(qtifyName(keyValue));`
	`177`	`+#else`
`174`	`178`	`emit sendKeyValue(keyValue);`
	`179`	`+#endif`
`175`	`180`	`}`
`176`	`181`	`}`
`177`	`182`	`return FullScreenBackground::event(event);`