Merge pull request #33 from waterlovemelon/sync-gerrit

chore: 批量同步gerrit代码到GitHub上

Author: waterlovemelon

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

debian/control

@@ -44,13 +44,14 @@ Depends: ${shlibs:Depends}, ${misc:Depends}, ${dist:Depends},
  libssl1.1,
  libxcb-util0 | libxcb-util1,
  dde-dconfig-daemon,
- dde-wayland-config(>>1.0.10-1)
+ dde-wayland-config(>>1.0.10-1),
+ dss-wechat-auth-plugin
 Provides: lightdm-greeter,
  deepin-greeter-wayland
 Recommends: onboard,
+ dss-captcha-plugin,
  dss-network-plugin,
- dde-wallpaper-cache,
- dss-wechat-auth-plugin
+ dde-wallpaper-cache
 Conflicts: dde-workspace,
  deepin-notifications,
  dde-session-ui (<< 5.0.0),
@@ -70,3 +71,18 @@ Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}
 Description: deepin desktop-environment - dde-session-shell module development files
  DDE Session Shell module development files of deepin desktop-environment
+
+Package: dde-gesture-login
+Architecture: any
+Depends: ${shlibs:Depends}, ${misc:Depends}, ${dist:Depends},
+ deepin-desktop-schemas (>=5.9.14),
+ dde-daemon (>=5.13.12),
+ startdde (>=5.10.24),
+ deepin-authenticate(>=1.2.27),
+ libssl-dev,
+ dde-dconfig-daemon,
+ dde-wayland-config(>>1.0.10-1)
+Conflicts: dss-gesture-login-plugin
+Description: deepin desktop-environment - dde-session-shell login plugin files
+ reset-pattern-dialog - modify gesture password enrolled, or create new gesture password
+ liblogin-gesture.so - support gesture password login on greeter and lock

debian/dde-gesture-login.install

@@ -0,0 +1,6 @@
+usr/share/dde-gesture-login/translations
+usr/lib/dde-session-shell/modules/liblogin-gesture.so
+usr/lib/dde-control-center/reset-pattern-dialog
+usr/share/dsg/configs/org.deepin.dde.lock/org.deepin.dde.dss-login-gesture.json
+usr/share/dsg/configs/org.deepin.dde.lightdm-deepin-greeter/org.deepin.dde.dss-login-gesture.json
+lib/dde-session-shell/modules/config.d/login-gesture.json

debian/dde-gesture-login.postinst

@@ -0,0 +1,21 @@
+#!/bin/sh
+
+set -e
+
+if getent passwd deepin-password-admin >/dev/null; then
+    if which deluser >/dev/null; then
+        deluser --system deepin-password-admin -q || echo "Could not remove deepin-password-admin user."
+    fi
+fi
+
+if getent group deepin-password-admin >/dev/null; then
+    if which delgroup >/dev/null; then
+        delgroup --system deepin-password-admin || echo "Could not remove deepin-password-admin group."
+    fi
+fi
+
+chown deepin-daemon:deepin-daemon /usr/lib/dde-control-center/reset-pattern-dialog
+chmod 500 /usr/lib/dde-control-center/reset-pattern-dialog
+
+#DEBHELPER#
+exit 0

debian/dde-gesture-login.sysusers

@@ -0,0 +1,4 @@
+# This file is part of dde-control-center
+#Type Name                      ID                  GECOS              Home directory Shell
+u     deepin-daemon       -                   ""                  -              -
+

debian/dde-session-shell.install

@@ -1,9 +1,14 @@
 etc
 usr/bin
-usr/share
+usr/share/applications
+usr/share/deepin-debug-config
+usr/share/dsg
+usr/share/glib-2.0
 usr/share/xgreeters
-usr/share/dde-session-shell/greeters.d/x
-usr/share/dde-session-shell/greeters.d/wayland
+usr/share/dbus-1
+usr/share/deepin-authentication
+usr/share/deepin-log-viewer
+usr/share/dde-session-shell
 usr/share/lightdm/lightdm.conf.d
-usr/lib/dde-session-shell/modules
-usr/lib/*/security
+usr/lib/dde-session-shell/modules/libone-key-login.so
+usr/lib/*/security