sync: from linuxdeepin/dde-session-shell

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

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

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

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"
         }
     }
 }

files/wayland/lightdm-deepin-greeter-wayland

@@ -33,7 +33,7 @@ device_handle(){
 	local touchpad=$(dbus_values_get_bool "$dbus_touchpad")
 
 	if [ "$touchpad" = "true" ]; then
-		dbus-send --session --dest=org.kde.KWin "$input" org.freedesktop.DBus.Properties.Set string:"org.kde.KWin.InputDevice" string:"tapToClick" variant:boolean:true
+		dbus-send --session --print-reply --dest=org.kde.KWin "$input" org.freedesktop.DBus.Properties.Set string:"org.kde.KWin.InputDevice" string:"tapToClick" variant:boolean:true
 	fi
 }
 

interface/base_module_interface.h

@@ -38,7 +38,8 @@ class BaseModuleInterface
         LoginType,   // 登陆插件
         TrayType,     // 托盘插件
         FullManagedLoginType,    // 全托管插件
-        IpcAssistLoginType       // 用于接收厂商密码插件
+        IpcAssistLoginType,       // 用于接收厂商密码插件
+        PasswordExtendLoginType,    // 密码认证扩展插件，需要两个都认证通过后
     };
 
     /**

interface/login_module_interface.h

@@ -75,6 +75,7 @@ enum AuthType {
     AT_FingerVein      = 1 << 5,    // 指静脉
     AT_Iris            = 1 << 6,    // 虹膜
     AT_Passkey         = 1 << 7,    // 安全密钥
+    AT_Pattern         = 1 << 8,    // 手势
     AT_PAM             = 1 << 29,   // PAM
     AT_Custom          = 1 << 30,   // 自定义
     AT_All             = -1         // all
@@ -98,7 +99,9 @@ enum AuthState {
     AS_Ended,       // 认证已结束，调用 End 之后，每种成功关闭的都会发送此信号，当某种认证类型被锁定时，也会触发此信号
     AS_Locked,      // 认证已锁定，当认证类型锁定时，触发此信号。该信号不会给出锁定等待时间信息
     AS_Recover,     // 设备恢复，需要调用 Start 重新开启认证，对应 AS_Exception
-    AS_Unlocked     // 认证解锁，对应 AS_Locked
+    AS_Unlocked,    // 认证解锁，对应 AS_Locked
+    AS_Unknown,     // 未知状态
+	AS_VerifyCode,  // 需要验证码
 };
 
 /**

lupdate.sh

@@ -1,4 +1,8 @@
 #!/bin/bash
-lupdate ./ -ts -no-obsolete -locations none translations/dde-session-shell_en.ts
+lupdate ./interface ./src ./tests -ts -no-obsolete -locations none translations/dde-session-shell_en.ts
+cd plugins/login-gesture
+./lupdate.sh
+cd ../../
+
 #tx push -s -b m20 # Push the files that need to be translated
 #tx pull -s -b m20 # Pull the translated files

plugins/CMakeLists.txt

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