sync: from linuxdeepin/dde-session-shell

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

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

Author: deepin-ci-robot

.gitignore

@@ -29,6 +29,6 @@ build*/
 tests/report/*
 .transifexrc
 .cache/
-
+.cursor/
 # for snipe
 src/global_util/dbus/*

.tx/config

@@ -8,3 +8,9 @@ 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]
+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

.tx/transifex.yaml

@@ -0,0 +1,13 @@
+filters:
+- filter_type: file
+  source_file: translations/dde-session-shell_en.ts
+  file_format: QT
+  source_language: en
+  translation_files_expression: translations/dde-session-shell_<lang>.ts
+- filter_type: file
+  source_file: plugins/login-gesture/translations/login-gesture_en.ts
+  file_format: QT
+  source_language: en
+  translation_files_expression: plugins/login-gesture/translations/login-gesture_<lang>.ts
+settings:
+  pr_branch_name: transifex_update_<br_unique_id>

CMakeLists.txt

@@ -260,6 +260,7 @@ set(LOCK_SRCS
     src/widgets/passworderrortipswidget.cpp
     src/widgets/passworderrortipswidget.h
     src/global_util/dbusconstant.h
+    src/global_util/signal_bridge.h
 )
 
 link_libraries(
@@ -324,8 +325,15 @@ set(GREETER_SRCS
     src/lightdm-deepin-greeter/logincontent.cpp
     src/lightdm-deepin-greeter/logintipswindow.cpp
     src/lightdm-deepin-greeter/sessionwidget.cpp
+    src/global_util/signal_bridge.h
 )
 
+if (USE_DEEPIN_WAYLAND)
+  set(GREETER_SRCS
+    ${GREETER_SRCS}
+  )
+endif(USE_DEEPIN_WAYLAND)
+
 add_executable(lightdm-deepin-greeter
     ${GREETER_SRCS}
     ${QRCS}

configs/org.deepin.dde.lightdm-deepin-greeter.json

@@ -301,6 +301,16 @@
             "description": "是否长按小眼睛显示密码，true-鼠按长按小眼睛才显示密码，false-鼠标点击一下就一直显示密码",
             "permissions": "readwrite",
             "visibility": "private"
+        },
+        "mfaSequence":{
+            "value": {"userType":"","authSequence":[]},
+            "serial": 0,
+            "flags": ["global"],
+            "name": "mfaSequence",
+            "name[zh_CN]": "多因认证时控制前端按认证顺序展示UI",
+            "description": "userType可用值，all:代表所有用户，adDomain:代表域用户,其它可选还有default、native，authSequence中的数组即代表认证类型的顺序",
+            "permissions": "readwrite",
+            "visibility": "private"
         }
     }
 }

configs/org.deepin.dde.lock.json

@@ -281,6 +281,26 @@
             "description": "是否长按小眼睛显示密码，true-鼠按长按小眼睛才显示密码，false-鼠标点击一下就一直显示密码",
             "permissions": "readwrite",
             "visibility": "private"
+        },
+        "mfaSequence":{
+            "value": {"userType":"","authSequence":[]},
+            "serial": 0,
+            "flags": ["global"],
+            "name": "mfaSequence",
+            "name[zh_CN]": "多因认证时控制前端按认证顺序展示UI",
+            "description": "userType可用值，all:代表所有用户，adDomain:代表域用户,其它可选还有default、native，authSequence中的数组即代表认证类型的顺序",
+            "permissions": "readwrite",
+            "visibility": "private"
+        },
+        "enableShutdownBlackWidget":{
+            "value": true,
+            "serial": 0,
+            "flags": ["global"],
+            "name": "enableShutdownBlackWidget",
+            "name[zh_CN]": "是否打开关机、重启黑屏界面",
+            "description": "是否打开关机、重启黑屏界面；false：不开，true：开启。默认值为true；",
+            "permissions": "readwrite",
+            "visibility": "private"
         }
     }
 }