From 91749eba9eedb1e89c074c952e659adfc6be61af Mon Sep 17 00:00:00 2001 From: liudun Date: Fri, 19 Jan 2024 14:12:25 +0800 Subject: [PATCH] =?UTF-8?q?lintian=E6=A3=80=E6=9F=A5=E4=BB=A5=E5=8F=8A?= =?UTF-8?q?=E7=89=88=E6=9D=83=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- BiometricAuth/biometricauthwidget.cpp | 2 +- BiometricAuth/biometricauthwidget.h | 2 +- BiometricAuth/biometricdeviceinfo.cpp | 2 +- BiometricAuth/biometricdeviceinfo.h | 3 +- BiometricAuth/biometricdeviceswidget.cpp | 2 +- BiometricAuth/biometricdeviceswidget.h | 2 +- BiometricAuth/biometricproxy.cpp | 2 +- BiometricAuth/biometricproxy.h | 2 +- BiometricAuth/giodbus.cpp | 2 +- BiometricAuth/giodbus.h | 2 +- BiometricAuth/main.cpp | 2 +- BiometricAuth/uniauthservice.cpp | 2 +- BiometricAuth/uniauthservice.h | 2 +- Common/CMakeLists.txt | 3 +- Common/autoresize.cpp | 2 +- Common/autoresize.h | 2 +- Common/checkbutton.cpp | 2 +- Common/checkbutton.h | 2 +- Common/commonfunc.cpp | 2 +- Common/commonfunc.h | 2 +- Common/glibinterface.cpp | 2 +- Common/glibinterface.h | 2 +- Common/plasma-shell-manager.cpp | 2 +- Common/plasma-shell-manager.h | 2 +- KylinNM/hot-spot/dlghotspotcreate.cpp | 2 +- KylinNM/hot-spot/dlghotspotcreate.h | 2 +- KylinNM/src/backthread.cpp | 54 ++-- KylinNM/src/backthread.h | 12 +- KylinNM/src/confform.cpp | 2 +- KylinNM/src/confform.h | 2 +- KylinNM/src/ksimplenm.cpp | 2 +- KylinNM/src/ksimplenm.h | 2 +- KylinNM/src/kylin-dbus-interface.cpp | 2 +- KylinNM/src/kylin-dbus-interface.h | 2 +- KylinNM/src/kylin-network-interface.c | 39 +-- KylinNM/src/kylin-network-interface.h | 12 +- KylinNM/src/kylinnm.cpp | 179 ++++++------ KylinNM/src/kylinnm.h | 2 +- KylinNM/src/loadingdiv.cpp | 2 +- KylinNM/src/loadingdiv.h | 2 +- KylinNM/src/main.cpp | 2 +- KylinNM/src/oneconnform.cpp | 2 +- KylinNM/src/oneconnform.h | 2 +- KylinNM/src/onelancform.cpp | 2 +- KylinNM/src/onelancform.h | 2 +- KylinNM/src/swipegesturerecognizer.cpp | 2 +- KylinNM/src/swipegesturerecognizer.h | 2 +- KylinNM/src/switchbutton.cpp | 2 +- KylinNM/src/switchbutton.h | 2 +- KylinNM/src/utils.cpp | 2 +- KylinNM/src/utils.h | 2 +- KylinNM/wireless-security/dlgconnhidwifi.cpp | 2 +- KylinNM/wireless-security/dlgconnhidwifi.h | 2 +- .../wireless-security/dlgconnhidwifileap.cpp | 2 +- .../wireless-security/dlgconnhidwifileap.h | 2 +- .../dlgconnhidwifisecfast.cpp | 2 +- .../wireless-security/dlgconnhidwifisecfast.h | 2 +- .../dlgconnhidwifisecleap.cpp | 2 +- .../wireless-security/dlgconnhidwifisecleap.h | 2 +- .../dlgconnhidwifisecpeap.cpp | 2 +- .../wireless-security/dlgconnhidwifisecpeap.h | 2 +- .../dlgconnhidwifisecpwd.cpp | 2 +- .../wireless-security/dlgconnhidwifisecpwd.h | 2 +- .../dlgconnhidwifisectls.cpp | 2 +- .../wireless-security/dlgconnhidwifisectls.h | 2 +- .../dlgconnhidwifisectunneltls.cpp | 2 +- .../dlgconnhidwifisectunneltls.h | 2 +- .../wireless-security/dlgconnhidwifiwep.cpp | 2 +- KylinNM/wireless-security/dlgconnhidwifiwep.h | 2 +- .../wireless-security/dlgconnhidwifiwpa.cpp | 2 +- KylinNM/wireless-security/dlgconnhidwifiwpa.h | 2 +- KylinNM/wireless-security/kylinheadfile.cpp | 2 +- KylinNM/wireless-security/kylinheadfile.h | 2 +- VirtualKeyboard/src/charsmorewidget.cpp | 2 +- VirtualKeyboard/src/charsmorewidget.h | 2 +- VirtualKeyboard/src/charswidget.cpp | 2 +- VirtualKeyboard/src/charswidget.h | 2 +- VirtualKeyboard/src/commondef.h | 2 +- VirtualKeyboard/src/dragwidget.cpp | 2 +- VirtualKeyboard/src/dragwidget.h | 2 +- VirtualKeyboard/src/fakekeyboard.h | 2 +- VirtualKeyboard/src/kbbutton.cpp | 2 +- VirtualKeyboard/src/kbbutton.h | 2 +- VirtualKeyboard/src/kbtitle.cpp | 2 +- VirtualKeyboard/src/kbtitle.h | 2 +- VirtualKeyboard/src/letterswidget.cpp | 2 +- VirtualKeyboard/src/letterswidget.h | 2 +- VirtualKeyboard/src/main.cpp | 2 +- VirtualKeyboard/src/numberswidget.cpp | 2 +- VirtualKeyboard/src/numberswidget.h | 2 +- VirtualKeyboard/src/qtkeyboard.cpp | 2 +- VirtualKeyboard/src/qtkeyboard.h | 2 +- VirtualKeyboard/src/virtualkeyboardwidget.cpp | 2 +- VirtualKeyboard/src/virtualkeyboardwidget.h | 2 +- VirtualKeyboard/src/x11keyboard.cpp | 2 +- VirtualKeyboard/src/x11keyboard.h | 2 +- data/CMakeLists.txt | 2 +- ...ensaver-startup.sh => screensaver-startup} | 0 debian/changelog | 260 +++++++++--------- debian/control | 67 ++--- debian/copyright | 73 +---- debian/rules | 4 +- debian/source/format | 2 +- debian/ukui-screensaver.manpages | 4 +- debian/ukui-screensaver.postinst | 4 +- examples/LoadCustomPlugin/main.cpp | 2 +- examples/LoadCustomPlugin/widget.cpp | 2 +- examples/LoadCustomPlugin/widget.h | 2 +- i18n_ts/CMakeLists.txt | 2 +- man/screensaver-startup.1 | 40 +++ man/ukui-screensaver-checkpass.1 | 39 +++ screensaver-focus-helper/blackwindow.cpp | 2 +- screensaver-focus-helper/blackwindow.h | 2 +- screensaver-focus-helper/main.cpp | 2 +- screensaver/chinesedate.cpp | 2 +- screensaver/chinesedate.h | 2 +- screensaver/customplugin.cpp | 2 +- screensaver/customplugin.h | 2 +- screensaver/cyclelabel.cpp | 2 +- screensaver/cyclelabel.h | 2 +- screensaver/main.cpp | 2 +- screensaver/mbackground.cpp | 2 +- screensaver/mbackground.h | 2 +- screensaver/scconfiguration.cpp | 2 +- screensaver/scconfiguration.h | 2 +- screensaver/screensaver.cpp | 2 +- screensaver/screensaver.h | 2 +- screensaver/screensaverplugin.h | 2 +- screensaver/sleeptime.cpp | 2 +- screensaver/sleeptime.h | 2 +- screensaver/weathermanager.cpp | 2 +- set4kScale/main.cpp | 2 +- src/CMakeLists.txt | 10 +- src/PhysicalDeviceSet/brightnessdeviceset.cpp | 2 +- src/PhysicalDeviceSet/brightnessdeviceset.h | 2 +- src/PhysicalDeviceSet/flightmodeset.cpp | 2 +- src/PhysicalDeviceSet/flightmodeset.h | 2 +- src/PhysicalDeviceSet/sounddeviceset.cpp | 2 +- src/PhysicalDeviceSet/sounddeviceset.h | 2 +- src/PhysicalDeviceSet/touchscreenset.cpp | 2 +- src/PhysicalDeviceSet/touchscreenset.h | 2 +- src/accountsinterface.cpp | 2 +- src/accountsinterface.h | 2 +- src/auth-pam.cpp | 2 +- src/auth-pam.h | 2 +- src/auth.h | 2 +- src/authdialog.cpp | 2 +- src/authdialog.h | 2 +- src/batterywidget.cpp | 2 +- src/batterywidget.h | 2 +- src/common.h | 2 +- src/configuration.cpp | 2 +- src/configuration.h | 2 +- src/device.cpp | 2 +- src/device.h | 2 +- src/digitalauthdialog.cpp | 2 +- src/digitalauthdialog.h | 2 +- src/digitalkeyboard.cpp | 2 +- src/digitalkeyboard.h | 2 +- src/displaymanager.cpp | 2 +- src/displaymanager.h | 2 +- src/eduplatforminterface.cpp | 2 +- src/eduplatforminterface.h | 2 +- src/enginedevice.cpp | 2 +- src/enginedevice.h | 2 +- src/fullbackgroundwidget.cpp | 2 +- src/fullbackgroundwidget.h | 2 +- src/generalauthwidget.cpp | 2 +- src/generalauthwidget.h | 4 +- src/gestureauthdialog.cpp | 2 +- src/gestureauthdialog.h | 2 +- src/grab-x11.cpp | 2 +- src/grab-x11.h | 2 +- src/hoverwidget.cpp | 2 +- src/hoverwidget.h | 2 +- src/iconedit.cpp | 2 +- src/iconedit.h | 2 +- src/imageutil.cpp | 2 +- src/imageutil.h | 2 +- src/interface.cpp | 2 +- src/interface.h | 2 +- src/klabel.cpp | 2 +- src/klabel.h | 2 +- src/libinputswitchevent.cpp | 2 +- src/libinputswitchevent.h | 2 +- src/lockchecker.cpp | 2 +- src/lockchecker.h | 2 +- src/lockwidget.cpp | 44 +-- src/lockwidget.h | 6 +- src/logind.cpp | 2 +- src/logind.h | 2 +- src/loginedusers.cpp | 2 +- src/loginedusers.h | 2 +- src/loginoptionswidget.cpp | 2 +- src/loginoptionswidget.h | 2 +- src/machinemodel.cpp | 2 +- src/machinemodel.h | 2 +- src/modebutton.cpp | 2 +- src/modebutton.h | 2 +- src/monitorwatcher.cpp | 2 +- src/monitorwatcher.h | 2 +- src/mytabwidget.cpp | 2 +- src/mytabwidget.h | 2 +- src/networkwatcher.cpp | 2 +- src/networkwatcher.h | 2 +- src/pam-tally.c | 2 +- src/pam-tally.cpp | 9 +- src/pam-tally.h | 2 +- src/pam.cpp | 2 +- src/pam.h | 2 +- src/permissioncheck.h | 2 +- src/powermanager.cpp | 2 +- src/powermanager.h | 2 +- src/rootWindowBackground.cpp | 2 +- src/rootWindowBackground.h | 2 +- src/screensavermode.cpp | 2 +- src/screensavermode.h | 2 +- src/screensaverwidget.cpp | 2 +- src/screensaverwidget.h | 2 +- src/screensaverwndadaptor.cpp | 2 +- src/screensaverwndadaptor.h | 2 +- src/servicemanager.cpp | 2 +- src/servicemanager.h | 2 +- src/sessionwatcher.cpp | 2 +- src/sessionwatcher.h | 2 +- src/surewindow.cpp | 2 +- src/surewindow.h | 2 +- src/switchbuttongroup.cpp | 2 +- src/switchbuttongroup.h | 2 +- src/tabletlockwidget.cpp | 2 +- src/tabletlockwidget.h | 2 +- src/test-accounts.cpp | 2 +- src/types.h | 2 +- src/ukui-screensaver-backend.cpp | 2 +- src/ukui-screensaver-checkpass.cpp | 2 +- src/ukui-screensaver-command.cpp | 2 +- src/ukui-screensaver-dialog.cpp | 2 +- src/unixsignallistener.cpp | 2 +- src/unixsignallistener.h | 2 +- src/users.cpp | 2 +- src/users.h | 2 +- src/utils.cpp | 2 +- src/utils.h | 2 +- src/verificationwidget.cpp | 2 +- src/verificationwidget.h | 2 +- src/verticalVerificationwidget.cpp | 2 +- src/verticalVerificationwidget.h | 2 +- src/weathermanager.cpp | 2 +- src/weathermanager.h | 2 +- src/wechatauthdialog.cpp | 2 +- src/wechatauthdialog.h | 2 +- src/xeventmonitor.cpp | 2 +- src/xeventmonitor.h | 2 +- 253 files changed, 683 insertions(+), 647 deletions(-) rename data/{screensaver-startup.sh => screensaver-startup} (100%) create mode 100644 man/screensaver-startup.1 create mode 100644 man/ukui-screensaver-checkpass.1 diff --git a/BiometricAuth/biometricauthwidget.cpp b/BiometricAuth/biometricauthwidget.cpp index 4a03938..3e944a3 100644 --- a/BiometricAuth/biometricauthwidget.cpp +++ b/BiometricAuth/biometricauthwidget.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2018 Tianjin KYLIN Information Technology Co., Ltd. + * Copyright (C) 2023, KylinSoft Co., Ltd. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/BiometricAuth/biometricauthwidget.h b/BiometricAuth/biometricauthwidget.h index 8390a02..9bc221b 100644 --- a/BiometricAuth/biometricauthwidget.h +++ b/BiometricAuth/biometricauthwidget.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2018 Tianjin KYLIN Information Technology Co., Ltd. + * Copyright (C) 2023, KylinSoft Co., Ltd. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/BiometricAuth/biometricdeviceinfo.cpp b/BiometricAuth/biometricdeviceinfo.cpp index 83f97f0..3f3fa03 100644 --- a/BiometricAuth/biometricdeviceinfo.cpp +++ b/BiometricAuth/biometricdeviceinfo.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2018 Tianjin KYLIN Information Technology Co., Ltd. + * Copyright (C) 2023, KylinSoft Co., Ltd. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/BiometricAuth/biometricdeviceinfo.h b/BiometricAuth/biometricdeviceinfo.h index e5a4e64..96f80e1 100644 --- a/BiometricAuth/biometricdeviceinfo.h +++ b/BiometricAuth/biometricdeviceinfo.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2018 Tianjin KYLIN Information Technology Co., Ltd. + * Copyright (C) 2023, KylinSoft Co., Ltd. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -281,6 +281,7 @@ enum LOGINOPT_TYPE { LOGINOPT_TYPE_VOICEPRINT, // 声纹 LOGINOPT_TYPE_FINGERVEIN, // 指静脉 LOGINOPT_TYPE_GENERAL_UKEY, // 普通的ukey + LOGINOPT_TYPE_CUSTOM, // 第三方 LOGINOPT_TYPE_ADVANCED_UKEY, // 高阶的ukey LOGINOPT_TYPE_QRCODE, // 二维码 LOGINOPT_TYPE_OTHERS, // 其他 diff --git a/BiometricAuth/biometricdeviceswidget.cpp b/BiometricAuth/biometricdeviceswidget.cpp index 0766ae3..ecbbb8b 100644 --- a/BiometricAuth/biometricdeviceswidget.cpp +++ b/BiometricAuth/biometricdeviceswidget.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2018 Tianjin KYLIN Information Technology Co., Ltd. + * Copyright (C) 2023, KylinSoft Co., Ltd. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/BiometricAuth/biometricdeviceswidget.h b/BiometricAuth/biometricdeviceswidget.h index bdef3da..b693bb8 100644 --- a/BiometricAuth/biometricdeviceswidget.h +++ b/BiometricAuth/biometricdeviceswidget.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2018 Tianjin KYLIN Information Technology Co., Ltd. + * Copyright (C) 2023, KylinSoft Co., Ltd. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/BiometricAuth/biometricproxy.cpp b/BiometricAuth/biometricproxy.cpp index 9f2513e..f4c158a 100644 --- a/BiometricAuth/biometricproxy.cpp +++ b/BiometricAuth/biometricproxy.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2018 Tianjin KYLIN Information Technology Co., Ltd. + * Copyright (C) 2023, KylinSoft Co., Ltd. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/BiometricAuth/biometricproxy.h b/BiometricAuth/biometricproxy.h index 5395ed7..894b6ce 100644 --- a/BiometricAuth/biometricproxy.h +++ b/BiometricAuth/biometricproxy.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2018 Tianjin KYLIN Information Technology Co., Ltd. + * Copyright (C) 2023, KylinSoft Co., Ltd. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/BiometricAuth/giodbus.cpp b/BiometricAuth/giodbus.cpp index 02a362b..f9089ae 100644 --- a/BiometricAuth/giodbus.cpp +++ b/BiometricAuth/giodbus.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2021 Tianjin KYLIN Information Technology Co., Ltd. + * Copyright (C) 2023, KylinSoft Co., Ltd. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/BiometricAuth/giodbus.h b/BiometricAuth/giodbus.h index a75f989..46a84f1 100644 --- a/BiometricAuth/giodbus.h +++ b/BiometricAuth/giodbus.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2021 Tianjin KYLIN Information Technology Co., Ltd. + * Copyright (C) 2023, KylinSoft Co., Ltd. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/BiometricAuth/main.cpp b/BiometricAuth/main.cpp index cd780b5..e162b9d 100644 --- a/BiometricAuth/main.cpp +++ b/BiometricAuth/main.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2018 Tianjin KYLIN Information Technology Co., Ltd. + * Copyright (C) 2023, KylinSoft Co., Ltd. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/BiometricAuth/uniauthservice.cpp b/BiometricAuth/uniauthservice.cpp index 4f327af..33f3f96 100644 --- a/BiometricAuth/uniauthservice.cpp +++ b/BiometricAuth/uniauthservice.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2022 Tianjin KYLIN Information Technology Co., Ltd. + * Copyright (C) 2023, KylinSoft Co., Ltd. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/BiometricAuth/uniauthservice.h b/BiometricAuth/uniauthservice.h index 9bbe5b4..15a09a8 100644 --- a/BiometricAuth/uniauthservice.h +++ b/BiometricAuth/uniauthservice.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2022 Tianjin KYLIN Information Technology Co., Ltd. + * Copyright (C) 2023, KylinSoft Co., Ltd. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/Common/CMakeLists.txt b/Common/CMakeLists.txt index 1f4d3b7..e73d30b 100644 --- a/Common/CMakeLists.txt +++ b/Common/CMakeLists.txt @@ -1,6 +1,7 @@ pkg_check_modules(GLIB REQUIRED glib-2.0) find_package(X11 REQUIRED) find_package(KF5WindowSystem) +find_package(KF5Wayland) include_directories( ${Qt5Core_INCLUDE_DIRS} @@ -28,4 +29,4 @@ set(Common_SRC ) add_library(Common STATIC ${Common_SRC}) -target_link_libraries(Common Qt5::Core Qt5::DBus Qt5::Widgets Qt5::X11Extras ${GIOUNIX2_LIBRARIES} ${KF5Wayland_LIBRARIES} -lKF5WaylandClient -lKF5WaylandServer KF5::WindowSystem) +target_link_libraries(Common Qt5::Core Qt5::DBus Qt5::Widgets Qt5::X11Extras ${GIOUNIX2_LIBRARIES} ${KF5Wayland_LIBRARIES} -lKF5WaylandClient -lKF5WaylandServer KF5::WindowSystem KF5::WaylandClient KF5::WaylandServer) diff --git a/Common/autoresize.cpp b/Common/autoresize.cpp index c5301e9..df7374e 100644 --- a/Common/autoresize.cpp +++ b/Common/autoresize.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2018 Tianjin KYLIN Information Technology Co., Ltd. + * Copyright (C) 2023, KylinSoft Co., Ltd. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/Common/autoresize.h b/Common/autoresize.h index 610a2f9..519a3f8 100644 --- a/Common/autoresize.h +++ b/Common/autoresize.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2018 Tianjin KYLIN Information Technology Co., Ltd. + * Copyright (C) 2023, KylinSoft Co., Ltd. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/Common/checkbutton.cpp b/Common/checkbutton.cpp index 9962a15..8745e1c 100644 --- a/Common/checkbutton.cpp +++ b/Common/checkbutton.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2019 Tianjin KYLIN Information Technology Co., Ltd. + * Copyright (C) 2023, KylinSoft Co., Ltd. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/Common/checkbutton.h b/Common/checkbutton.h index 59f3463..9f3edca 100644 --- a/Common/checkbutton.h +++ b/Common/checkbutton.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2019 Tianjin KYLIN Information Technology Co., Ltd. + * Copyright (C) 2023, KylinSoft Co., Ltd. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/Common/commonfunc.cpp b/Common/commonfunc.cpp index e9aacce..894b237 100644 --- a/Common/commonfunc.cpp +++ b/Common/commonfunc.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2019 Tianjin KYLIN Information Technology Co., Ltd. + * Copyright (C) 2023, KylinSoft Co., Ltd. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/Common/commonfunc.h b/Common/commonfunc.h index d028bdd..1c44ec6 100644 --- a/Common/commonfunc.h +++ b/Common/commonfunc.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2019 Tianjin KYLIN Information Technology Co., Ltd. + * Copyright (C) 2023, KylinSoft Co., Ltd. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/Common/glibinterface.cpp b/Common/glibinterface.cpp index 66c26bc..744536b 100644 --- a/Common/glibinterface.cpp +++ b/Common/glibinterface.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2023 Tianjin KYLIN Information Technology Co., Ltd. + * Copyright (C) 2023, KylinSoft Co., Ltd. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/Common/glibinterface.h b/Common/glibinterface.h index 3b3c018..c09f90b 100644 --- a/Common/glibinterface.h +++ b/Common/glibinterface.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2023 Tianjin KYLIN Information Technology Co., Ltd. + * Copyright (C) 2023, KylinSoft Co., Ltd. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/Common/plasma-shell-manager.cpp b/Common/plasma-shell-manager.cpp index e8336b4..f556012 100644 --- a/Common/plasma-shell-manager.cpp +++ b/Common/plasma-shell-manager.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2022 Tianjin KYLIN Information Technology Co., Ltd. + * Copyright (C) 2023, KylinSoft Co., Ltd. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/Common/plasma-shell-manager.h b/Common/plasma-shell-manager.h index e5e0230..759a8f1 100644 --- a/Common/plasma-shell-manager.h +++ b/Common/plasma-shell-manager.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2022 Tianjin KYLIN Information Technology Co., Ltd. + * Copyright (C) 2023, KylinSoft Co., Ltd. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/KylinNM/hot-spot/dlghotspotcreate.cpp b/KylinNM/hot-spot/dlghotspotcreate.cpp index a64e249..c3b92e2 100644 --- a/KylinNM/hot-spot/dlghotspotcreate.cpp +++ b/KylinNM/hot-spot/dlghotspotcreate.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2020 Tianjin KYLIN Information Technology Co., Ltd. + * Copyright (C) 2023, KylinSoft Co., Ltd. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/KylinNM/hot-spot/dlghotspotcreate.h b/KylinNM/hot-spot/dlghotspotcreate.h index 11a884d..bc968ab 100644 --- a/KylinNM/hot-spot/dlghotspotcreate.h +++ b/KylinNM/hot-spot/dlghotspotcreate.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2020 Tianjin KYLIN Information Technology Co., Ltd. + * Copyright (C) 2023, KylinSoft Co., Ltd. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/KylinNM/src/backthread.cpp b/KylinNM/src/backthread.cpp index d115d26..03e3934 100644 --- a/KylinNM/src/backthread.cpp +++ b/KylinNM/src/backthread.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2020 Tianjin KYLIN Information Technology Co., Ltd. + * Copyright (C) 2023, KylinSoft Co., Ltd. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -43,9 +43,9 @@ BackThread::~BackThread() } //get the connection state of wired and wireles network -IFace* BackThread::execGetIface() +IFace BackThread::execGetIface() { - IFace *iface = new IFace(); + IFace iface; QString tmpPath = "/tmp/kylin-nm-iface-" + QDir::home().dirName(); QString cmd = "export LANG='en_US.UTF-8';export LANGUAGE='en_US';nmcli -f TYPE,DEVICE,STATE device > " + tmpPath; @@ -64,8 +64,8 @@ IFace* BackThread::execGetIface() QStringList txtList = txt.split("\n"); file.close(); - iface->lstate = 2; - iface->wstate = 2; + iface.lstate = 2; + iface.wstate = 2; for (int i = 1; i < txtList.size(); i ++) { QString line = txtList.at(i); @@ -77,32 +77,32 @@ IFace* BackThread::execGetIface() QString iname = lastStr.left(index2); QString istateStr = lastStr.mid(index2).trimmed(); - if (type == "ethernet" && iface->lstate != 0) { + if (type == "ethernet" && iface.lstate != 0) { // if type is wired network - iface->lname = iname; + iface.lname = iname; if (istateStr == "unmanaged") { - iface->lstate = 2; //switch of wired device is off + iface.lstate = 2; //switch of wired device is off } if (istateStr == "disconnected" || istateStr == "unavailable") { - iface->lstate = 1; //wired network is disconnected + iface.lstate = 1; //wired network is disconnected } if (istateStr == "connected") { - iface->lstate = 0; //wired network is connected + iface.lstate = 0; //wired network is connected } } - if (type == "wifi" && iface->wstate != 0) { + if (type == "wifi" && iface.wstate != 0) { // if type is wireless network - iface->wname = iname; + iface.wname = iname; if (istateStr == "unmanaged" || istateStr == "unavailable") { - iface->wstate = 2; //switch of wireless device is off + iface.wstate = 2; //switch of wireless device is off } if (istateStr == "disconnected") { - iface->wstate = 1; //wireless network is disconnected + iface.wstate = 1; //wireless network is disconnected } if (istateStr == "connected") { - iface->wstate = 0; //wireless network is connected + iface.wstate = 0; //wireless network is connected } } } @@ -120,7 +120,7 @@ void BackThread::execEnNet() // int status = system("nmcli networking on"); // if (status != 0){ syslog(LOG_ERR, "execute 'nmcli networking on' in function 'execEnNet' failed");} while (1) { - if (execGetIface()->lstate != 2) { + if (execGetIface().lstate != 2) { sleep(3); emit enNetDone(); emit btFinish(); @@ -133,14 +133,14 @@ void BackThread::execEnNet() //turn off the switch of wireless network first, then turn off the switch of network void BackThread::execDisNet() { - if (execGetIface()->wstate != 2) { + if (execGetIface().wstate != 2) { char *chr = "nmcli radio wifi off"; Utils::m_system(chr); // int status = system("nmcli radio wifi off"); // if (status != 0){ syslog(LOG_ERR, "execute 'nmcli radio wifi off' in function 'execDisNet' failed");} while (1) { - if (execGetIface()->wstate == 2) { + if (execGetIface().wstate == 2) { emit disWifiDone(); emit btFinish(); break; @@ -154,7 +154,7 @@ void BackThread::execDisNet() // int status1 = system("nmcli networking off"); // if (status1 != 0){ syslog(LOG_ERR, "execute 'nmcli networking off' in function 'execDisNet' failed");} while (1) { - if (execGetIface()->lstate == 2) { + if (execGetIface().lstate == 2) { emit disNetDone(); emit btFinish(); break; @@ -185,7 +185,7 @@ void BackThread::execEnWifi() //int status1 = system("nmcli radio wifi on"); //if (status1 != 0){ syslog(LOG_ERR, "execute 'nmcli radio wifi on' in function 'execEnWifi' failed");} while (1) { - if (execGetIface()->wstate != 2) { + if (execGetIface().wstate != 2) { KylinDBus objKyDbus; while (1) { if (objKyDbus.getAccessPointsNumber() > 0) { @@ -211,7 +211,7 @@ void BackThread::execDisWifi() // int status = system("nmcli radio wifi off"); // if (status != 0){ syslog(LOG_ERR, "execute 'nmcli radio wifi off' in function 'execDisWifi' failed");} while (1) { - if (execGetIface()->wstate == 2) { + if (execGetIface().wstate == 2) { KylinNM::reflashWifiUi(); emit disWifiDone(); emit btFinish(); @@ -233,8 +233,8 @@ void BackThread::execConnLan(QString connName) Utils::m_system(cmd.toUtf8().data()); // int status = system(cmd.toUtf8().data()); // if (status != 0){ syslog(LOG_ERR, "execute 'nmcli connection up' in function 'execConnLan' failed");} - qDebug()<<"debug: in function execConnLan, wired net state is: "<lstate); - syslog(LOG_DEBUG, "In function execConnLan, wired net state is: %d", execGetIface()->lstate); + qDebug()<<"debug: in function execConnLan, wired net state is: "<wstate); - syslog(LOG_DEBUG, "In function execConnWifiPWD, wireless net state is: %d", execGetIface()->wstate); + qDebug()<<"debug: in function execConnWifiPWD, wireless net state is: "<wstate); - syslog(LOG_DEBUG, "In function on_readoutput, wireless net state is: %d", execGetIface()->wstate); + qDebug()<<"debug: in function on_readoutput, wireless net state is: "<pw_name; @@ -213,6 +216,7 @@ activecon *kylin_network_get_activecon_info() if((activefp=fopen(filename,"r"))==NULL) { printf("error!"); + return -1; } fgets(activeStrLine,1024,activefp); while(!feof(activefp)) @@ -222,22 +226,22 @@ activecon *kylin_network_get_activecon_info() } // printf("%d\n",activenum); fclose(activefp); - activecon *activelist=(activecon *)malloc(sizeof(activecon)*activenum); + *activelist=(activecon *)malloc(sizeof(activecon)*activenum); - int count=0; + *count=0; FILE *fp; char StrLine[1024]; if((fp=fopen(filename,"r"))==NULL) { printf("error!"); - + return -1; } free(path); fgets(StrLine,1024,fp); while(!feof(fp)) { - if(count==activenum-1)break; + if(*count==activenum-1)break; fgets(StrLine,1024,fp); @@ -257,10 +261,9 @@ activecon *kylin_network_get_activecon_info() } // printf("连接名称长度：%d\n",num); - activelist[count].con_name=(char *)malloc(sizeof(char)*(num+1)); strncpy(conname,StrLine,num+1); conname[num]='\0'; - strncpy(activelist[count].con_name,conname,num+1); + strncpy((*activelist)[*count].con_name,conname,num+1); // printf("%s\n",activelist[count].con_name); //截取连接类型 @@ -291,10 +294,9 @@ activecon *kylin_network_get_activecon_info() if(*index2==' ')break; num1++; } - activelist[count].type=(char *)malloc(sizeof(char)*(num1+1)); strncpy(type,index1+2,num1+1); type[num1]='\0'; - strncpy(activelist[count].type,type,num1+1); + strncpy((*activelist)[*count].type,type,num1+1); // printf("%s\n",activelist[count].type); //截取连接所属设备 @@ -315,20 +317,14 @@ activecon *kylin_network_get_activecon_info() if(*index4==' ')break; num2++; } - activelist[count].dev=(char *)malloc(sizeof(char)*(num2+1)); strncpy(dev,index3+1,num2+1); dev[num2]='\0'; - strncpy(activelist[count].dev,dev,num2+1); + strncpy((*activelist)[*count].dev,dev,num2+1); // printf("%s\n",activelist[count].dev); - count++; + (*count)++; } fclose(fp); - - activelist[count].con_name=NULL; - activelist[count].type=NULL; - activelist[count].dev=NULL; - - return activelist; + return 0; } //创建新的以太网连接 @@ -829,6 +825,7 @@ long *kylin_network_get_bytes(char *if_name) if(i == 10) { rtbyt[1] = atol(value); + free(value); break; } free(value); @@ -869,6 +866,7 @@ long *kylin_network_get_packets(char *if_name) if(i == 11) { rtpkt[1] = atol(value); + free(value); break; } free(value); @@ -909,6 +907,7 @@ long *kylin_network_get_errs(char *if_name) if(i == 12) { rterrs[1] = atol(value); + free(value); break; } free(value); @@ -949,6 +948,7 @@ long *kylin_network_get_drop(char *if_name) if(i == 13) { rtdrop[1] = atol(value); + free(value); break; } free(value); @@ -989,6 +989,7 @@ long *kylin_network_get_fifo(char *if_name) if(i == 14) { rtfifo[1] = atol(value); + free(value); break; } free(value); diff --git a/KylinNM/src/kylin-network-interface.h b/KylinNM/src/kylin-network-interface.h index 1b44dab..61448de 100644 --- a/KylinNM/src/kylin-network-interface.h +++ b/KylinNM/src/kylin-network-interface.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2020 Tianjin KYLIN Information Technology Co., Ltd. + * Copyright (C) 2023, KylinSoft Co., Ltd. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -52,9 +52,9 @@ typedef struct typedef struct { - char *con_name;//活动网络连接名称 - char *type;//活动网络连接类型 - char *dev;//活动网络所属设备 + char con_name[128];//活动网络连接名称 + char type[128];//活动网络连接类型 + char dev[128];//活动网络所属设备 }activecon;//存放当前活动网络连接 /* @@ -71,9 +71,9 @@ conlist *kylin_network_get_conlist_info(); /* * Get the active network connection. - * return the struct pointer. + * return the struct pointer and list count. */ -activecon *kylin_network_get_activecon_info(); +int kylin_network_get_activecon_info(activecon** activelist, int* count); /* * Create a new Ethernet connection. diff --git a/KylinNM/src/kylinnm.cpp b/KylinNM/src/kylinnm.cpp index d17fd83..f4e1423 100644 --- a/KylinNM/src/kylinnm.cpp +++ b/KylinNM/src/kylinnm.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2020 Tianjin KYLIN Information Technology Co., Ltd. + * Copyright (C) 2023, KylinSoft Co., Ltd. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -489,26 +489,26 @@ void KylinNM::getInitLanSlist() // 初始化网络 void KylinNM::initNetwork() { - BackThread *bt = new BackThread(); - IFace *iface = bt->execGetIface(); + BackThread bt; + IFace iface = bt.execGetIface(); - wname = iface->wname; - lwname = iface->wname; - lname = iface->lname; - llname = iface->lname; + wname = iface.wname; + lwname = iface.wname; + lname = iface.lname; + llname = iface.lname; - mwBandWidth = bt->execChkLanWidth(lname); + mwBandWidth = bt.execChkLanWidth(lname); // 开关状态 qDebug()<<"==="; qDebug()<<"state of network: '0' is connected, '1' is disconnected, '2' is net device switch off"; syslog(LOG_DEBUG, "state of network: '0' is connected, '1' is disconnected, '2' is net device switch off"); - qDebug()<<"current network state: lan state ="<lstate<<", wifi state ="<wstate ; - syslog(LOG_DEBUG, "current network state: wired state =%d, wifi state =%d", iface->lstate, iface->wstate); + qDebug()<<"current network state: lan state ="<lbBtnNetBG->setStyleSheet(btnOnQss); - if (iface->wstate == 0 || iface->wstate == 1 || iface->wstate == 3) { + if (iface.wstate == 0 || iface.wstate == 1 || iface.wstate == 3) { // ui->lbBtnWifiBG->setStyleSheet(btnBgOnQss); //ui->lbBtnWifiBall->move(X_RIGHT_WIFI_BALL, Y_WIFI_BALL); btnWireless->setSwitchStatus(true); @@ -519,11 +519,11 @@ void KylinNM::initNetwork() } // 初始化网络列表 - if (iface->wstate != 2) { - if (iface->wstate == 0) { + if (iface.wstate != 2) { + if (iface.wstate == 0) { connWifiDone(3); } else { - if (iface->lstate == 0) { + if (iface.lstate == 0) { connLanDone(3); } } @@ -533,8 +533,8 @@ void KylinNM::initNetwork() ui->btnWifiList->setStyleSheet("QPushButton{border:none;}"); } else { objKyDBus->setWifiSwitchState(false); //通知控制面板wifi未开启 - if (iface->lstate != 2) { - if (iface->lstate == 0) { + if (iface.lstate != 2) { + if (iface.lstate == 0) { connLanDone(3); } onBtnNetListClicked(); @@ -544,7 +544,7 @@ void KylinNM::initNetwork() } else { /*没看懂这段断开连接是什么意思，暂时关闭这段操作，会导致页面卡顿、某些情景还会自动断开网络 // BackThread *m_bt = new BackThread(); -// IFace *m_iface = m_bt->execGetIface(); +// m_bt->execGetIface(); // m_bt->disConnLanOrWifi("ethernet"); // sleep(1); @@ -552,7 +552,6 @@ void KylinNM::initNetwork() // sleep(1); // m_bt->disConnLanOrWifi("ethernet"); -// delete m_iface; // m_bt->deleteLater(); */ @@ -683,16 +682,13 @@ void KylinNM::updateNetList() } is_stop_check_net_state = 1; if (is_btnWifiList_clicked == 1) { - BackThread *loop_bt = new BackThread(); - IFace *loop_iface = loop_bt->execGetIface(); + BackThread loop_bt; + IFace loop_iface = loop_bt.execGetIface(); - if (loop_iface->wstate != 2) { + if (loop_iface.wstate != 2) { is_update_wifi_list = 1; this->ksnm->execGetWifiList(); //更新wifi列表 } - - delete loop_iface; - loop_bt->deleteLater(); } is_stop_check_net_state = 0; } @@ -724,16 +720,13 @@ void KylinNM::iconActivated(QSystemTrayIcon::ActivationReason reason) } is_stop_check_net_state = 1; if (is_btnWifiList_clicked == 1) { - BackThread *loop_bt = new BackThread(); - IFace *loop_iface = loop_bt->execGetIface(); + BackThread loop_bt; + IFace loop_iface = loop_bt.execGetIface(); - if (loop_iface->wstate != 2) { + if (loop_iface.wstate != 2) { is_update_wifi_list = 1; this->ksnm->execGetWifiList(); //更新wifi列表 } - - delete loop_iface; - loop_bt->deleteLater(); } is_stop_check_net_state = 0; } else { @@ -912,9 +905,13 @@ void KylinNM::getActiveInfo() QString actLanName = "--"; QString actWifiName = "--"; - activecon *act = kylin_network_get_activecon_info(); + activecon *act = NULL; + int count = 0; + kylin_network_get_activecon_info(&act, &count); + if(!act) + return ; int index = 0; - while (act[index].con_name != NULL) { + while (act && index < count) { if (QString(act[index].type) == "ethernet" || QString(act[index].type) == "802-3-ethernet") { actLanName = QString(act[index].con_name); } @@ -923,7 +920,9 @@ void KylinNM::getActiveInfo() } index ++; } - + if (act) { + free(act); + } //ukui3.0中获取currentActWifiSignalLv的值 if (activeWifiSignalLv > 75) { @@ -979,14 +978,12 @@ void KylinNM::onPhysicalCarrierChanged(bool flag) qDebug()<<"拔出了有线网的网线"; syslog(LOG_DEBUG,"wired physical cable is already plug out"); - BackThread *bt = new BackThread(); - IFace *iface = bt->execGetIface(); - if (iface->lstate != 0) { + BackThread bt; + IFace iface = bt.execGetIface(); + if (iface.lstate != 0) { is_stop_check_net_state = 1; wiredCableDownTimer->start(2000); } - delete iface; - bt->deleteLater(); } } @@ -1017,13 +1014,12 @@ void KylinNM::onCarrierDownHandle() void KylinNM::onDeleteLan() { deleteLanTimer->stop(); - BackThread *btn_bt = new BackThread(); - btn_bt->disConnLanOrWifi("ethernet"); + BackThread btn_bt; + btn_bt.disConnLanOrWifi("ethernet"); sleep(1); - btn_bt->disConnLanOrWifi("ethernet"); + btn_bt.disConnLanOrWifi("ethernet"); sleep(1); - btn_bt->disConnLanOrWifi("ethernet"); - btn_bt->deleteLater(); + btn_bt.disConnLanOrWifi("ethernet"); this->stopLoading(); onBtnNetListClicked(0); @@ -1079,42 +1075,36 @@ void KylinNM::checkIsWirelessDeviceOn() void KylinNM::getLanBandWidth() { - BackThread *bt = new BackThread(); - IFace *iface = bt->execGetIface(); + BackThread bt; + IFace iface = bt.execGetIface(); - lname = iface->lname; + lname = iface.lname; - mwBandWidth = bt->execChkLanWidth(lname); + mwBandWidth = bt.execChkLanWidth(lname); } //检测网络设备状态 bool KylinNM::checkLanOn() { - BackThread *bt = new BackThread(); - IFace *iface = bt->execGetIface(); + BackThread bt; + IFace iface = bt.execGetIface(); - if (iface->lstate == 2) { + if (iface.lstate == 2) { return false; } else { return true; } - - delete iface; - bt->deleteLater(); } bool KylinNM::checkWlOn() { - BackThread *bt = new BackThread(); - IFace *iface = bt->execGetIface(); + BackThread bt; + IFace iface = bt.execGetIface(); bool ret = true; - if (iface->wstate == 2) { + if (iface.wstate == 2) { ret = false; } - - delete iface; - bt->deleteLater(); return ret; } @@ -1307,14 +1297,14 @@ void KylinNM::onBtnNetListClicked(int flag) ui->lbNetListBG->setStyleSheet(btnOnQss); ui->lbWifiListBG->setStyleSheet(btnOffQss); - BackThread *bt = new BackThread(); - IFace *iface = bt->execGetIface(); + BackThread bt; + IFace iface = bt.execGetIface(); lbLoadDown->show(); lbLoadUp->show(); lbLoadDownImg->show(); lbLoadUpImg->show(); - if (iface->lstate != 0) { + if (iface.lstate != 0) { lbLoadDown->hide(); lbLoadUp->hide(); lbLoadDownImg->hide(); @@ -1340,7 +1330,7 @@ void KylinNM::onBtnNetListClicked(int flag) return; } - if (iface->lstate != 2) { + if (iface.lstate != 2) { this->startLoading(); this->ksnm->execGetLanList(); } else { @@ -1360,10 +1350,6 @@ void KylinNM::onBtnNetListClicked(int flag) ui->lbWifiListImg->setStyleSheet("QLabel{border-image:url(:/res/x/pb-wifi-n.png);background-position:center;background-repeat:no-repeat;}"); lbNetListText->setStyleSheet("QLabel{color:rgba(47, 179, 232, 1);background-color:transparent;}"); lbWifiListText->setStyleSheet("QLabel{color:rgba(38, 38, 38, 0.75);background-color:transparent;}"); - - - delete iface; - bt->deleteLater(); } // 当点击wifi标题的时候执行 @@ -1372,14 +1358,14 @@ void KylinNM::on_btnWifiList_clicked() this->is_btnWifiList_clicked = 1; this->is_btnNetList_clicked = 0; - BackThread *bt = new BackThread(); - IFace *iface = bt->execGetIface(); + BackThread bt; + IFace iface = bt.execGetIface(); lbLoadDown->show(); lbLoadUp->show(); lbLoadDownImg->show(); lbLoadUpImg->show(); - if (iface->wstate != 0) { + if (iface.wstate != 0) { lbLoadDown->hide(); lbLoadUp->hide(); lbLoadDownImg->hide(); @@ -1394,7 +1380,7 @@ void KylinNM::on_btnWifiList_clicked() btnWireless->show(); //ui->lbBtnWifiBG->show(); //ui->lbBtnWifiBall->show(); - if (iface->wstate == 0 || iface->wstate == 1 || iface->wstate == 3) { + if (iface.wstate == 0 || iface.wstate == 1 || iface.wstate == 3) { //ui->lbBtnWifiBG->setStyleSheet(btnBgOnQss); //ui->lbBtnWifiBall->move(X_RIGHT_WIFI_BALL, Y_WIFI_BALL); btnWireless->setSwitchStatus(true); @@ -1404,7 +1390,7 @@ void KylinNM::on_btnWifiList_clicked() btnWireless->setSwitchStatus(false); } - if (iface->wstate != 2) { + if (iface.wstate != 2) { //ui->lbBtnWifiBG->setStyleSheet(btnBgOnQss); //ui->lbBtnWifiBall->move(X_RIGHT_WIFI_BALL, Y_WIFI_BALL); btnWireless->setSwitchStatus(true); @@ -1462,9 +1448,6 @@ void KylinNM::on_btnWifiList_clicked() this->scrollAreaw->show(); this->topWifiListWidget->show(); on_btnWifiList_pressed(); - - delete iface; - bt->deleteLater(); } void KylinNM::on_btnNetList_pressed() @@ -1516,16 +1499,20 @@ void KylinNM::getLanListDone(QStringList slist) // 获取当前连接的lan name QString actLanName = "--"; - activecon *act = kylin_network_get_activecon_info(); - + activecon *act = NULL; + int count = 0; + kylin_network_get_activecon_info(&act, &count); int index = 0; - while (act[index].con_name != NULL) { + while (act && index < count) { if (QString(act[index].type) == "ethernet" || QString(act[index].type) == "802-3-ethernet") { actLanName = QString(act[index].con_name); break; } index ++; } + if (act) { + free(act); + } // 若当前lan name为"--"，设置OneConnForm OneLancForm *ccf = new OneLancForm(topLanListWidget, this, confForm, ksnm); @@ -1686,15 +1673,21 @@ void KylinNM::loadWifiListDone(QStringList slist) actWifiBssidList.append("--"); } - activecon *act = kylin_network_get_activecon_info(); + activecon *act = NULL; + int wifiCount = 0; + kylin_network_get_activecon_info(&act, &wifiCount); int index = 0; - while (act[index].con_name != NULL) { + while (act && index < wifiCount) { if (QString(act[index].type) == "wifi" || QString(act[index].type) == "802-11-wireless") { actWifiName = QString(act[index].con_name); break; } index ++; } + if (act) { + free(act); + } + // 根据当前连接的wifi 设置OneConnForm OneConnForm *ccf = new OneConnForm(topWifiListWidget, this, confForm, ksnm); if (actWifiName == "--" && actWifiBssidList.at(0) == "--") { @@ -2381,8 +2374,8 @@ void KylinNM::activeGetWifiList() //网络开关处理，打开与关闭网络 void KylinNM::enNetDone() { - BackThread *bt = new BackThread(); - mwBandWidth = bt->execChkLanWidth(lname); + BackThread bt; + mwBandWidth = bt.execChkLanWidth(lname); ui->lbBtnNetBG->setStyleSheet(btnOnQss); @@ -2470,7 +2463,6 @@ void KylinNM::enWifiDone() qDebug()<<"debug: already turn on the switch of wifi network"; syslog(LOG_DEBUG, "Already turn on the switch of wifi network"); - QTimer::singleShot(200, this, &KylinNM::onConnectChanged); } void KylinNM::disWifiDone() { @@ -2606,16 +2598,13 @@ void KylinNM::onExternalWifiSwitchChange(bool wifiEnabled) void KylinNM::on_checkWifiListChanged() { if (is_stop_check_net_state==0 && this->is_btnWifiList_clicked==1 && this->isVisible()) { - BackThread *loop_bt = new BackThread(); - IFace *loop_iface = loop_bt->execGetIface(); + BackThread loop_bt; + IFace loop_iface = loop_bt.execGetIface(); - if (loop_iface->wstate != 2) { + if (loop_iface.wstate != 2) { is_update_wifi_list = 1; this->ksnm->execGetWifiList(); //更新wifi列表 } - - delete loop_iface; - loop_bt->deleteLater(); } } @@ -2766,9 +2755,14 @@ int KylinNM::getConnectStatus() QString actLanName = "--"; QString actWifiName = "--"; - activecon *act = kylin_network_get_activecon_info(); + activecon *act = NULL; + int count = 0; + kylin_network_get_activecon_info(&act, &count); int index = 0; - while (act[index].con_name != NULL) { + if(!act){ + return -1; + } + while (act && index < count) { if (QString(act[index].type) == "ethernet" || QString(act[index].type) == "802-3-ethernet") { actLanName = QString(act[index].con_name); } @@ -2777,6 +2771,9 @@ int KylinNM::getConnectStatus() } index ++; } + if (act) { + free(act); + } //ukui3.0中获取currentActWifiSignalLv的值 if (activeWifiSignalLv > 75) { diff --git a/KylinNM/src/kylinnm.h b/KylinNM/src/kylinnm.h index 3ed9ce6..7ff41f6 100644 --- a/KylinNM/src/kylinnm.h +++ b/KylinNM/src/kylinnm.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2020 Tianjin KYLIN Information Technology Co., Ltd. + * Copyright (C) 2023, KylinSoft Co., Ltd. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/KylinNM/src/loadingdiv.cpp b/KylinNM/src/loadingdiv.cpp index bf1b0c4..7c90740 100644 --- a/KylinNM/src/loadingdiv.cpp +++ b/KylinNM/src/loadingdiv.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2020 Tianjin KYLIN Information Technology Co., Ltd. + * Copyright (C) 2023, KylinSoft Co., Ltd. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/KylinNM/src/loadingdiv.h b/KylinNM/src/loadingdiv.h index f8ee9e3..aebc34b 100644 --- a/KylinNM/src/loadingdiv.h +++ b/KylinNM/src/loadingdiv.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2020 Tianjin KYLIN Information Technology Co., Ltd. + * Copyright (C) 2023, KylinSoft Co., Ltd. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/KylinNM/src/main.cpp b/KylinNM/src/main.cpp index 0929685..f55ec14 100644 --- a/KylinNM/src/main.cpp +++ b/KylinNM/src/main.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2020 Tianjin KYLIN Information Technology Co., Ltd. + * Copyright (C) 2023, KylinSoft Co., Ltd. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/KylinNM/src/oneconnform.cpp b/KylinNM/src/oneconnform.cpp index 9a82926..790c1a6 100644 --- a/KylinNM/src/oneconnform.cpp +++ b/KylinNM/src/oneconnform.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2020 Tianjin KYLIN Information Technology Co., Ltd. + * Copyright (C) 2023, KylinSoft Co., Ltd. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/KylinNM/src/oneconnform.h b/KylinNM/src/oneconnform.h index 70bbbd8..0c0cb9e 100644 --- a/KylinNM/src/oneconnform.h +++ b/KylinNM/src/oneconnform.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2020 Tianjin KYLIN Information Technology Co., Ltd. + * Copyright (C) 2023, KylinSoft Co., Ltd. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/KylinNM/src/onelancform.cpp b/KylinNM/src/onelancform.cpp index b297910..38b6c0d 100644 --- a/KylinNM/src/onelancform.cpp +++ b/KylinNM/src/onelancform.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2020 Tianjin KYLIN Information Technology Co., Ltd. + * Copyright (C) 2023, KylinSoft Co., Ltd. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/KylinNM/src/onelancform.h b/KylinNM/src/onelancform.h index 3d1f196..ac5f4b0 100644 --- a/KylinNM/src/onelancform.h +++ b/KylinNM/src/onelancform.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2020 Tianjin KYLIN Information Technology Co., Ltd. + * Copyright (C) 2023, KylinSoft Co., Ltd. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/KylinNM/src/swipegesturerecognizer.cpp b/KylinNM/src/swipegesturerecognizer.cpp index dd888c3..a628efc 100644 --- a/KylinNM/src/swipegesturerecognizer.cpp +++ b/KylinNM/src/swipegesturerecognizer.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2020 Tianjin KYLIN Information Technology Co., Ltd. + * Copyright (C) 2023, KylinSoft Co., Ltd. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/KylinNM/src/swipegesturerecognizer.h b/KylinNM/src/swipegesturerecognizer.h index 4b6c7b8..14e1131 100644 --- a/KylinNM/src/swipegesturerecognizer.h +++ b/KylinNM/src/swipegesturerecognizer.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2020 Tianjin KYLIN Information Technology Co., Ltd. + * Copyright (C) 2023, KylinSoft Co., Ltd. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/KylinNM/src/switchbutton.cpp b/KylinNM/src/switchbutton.cpp index 43ad098..698c49f 100644 --- a/KylinNM/src/switchbutton.cpp +++ b/KylinNM/src/switchbutton.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2020 Tianjin KYLIN Information Technology Co., Ltd. + * Copyright (C) 2023, KylinSoft Co., Ltd. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/KylinNM/src/switchbutton.h b/KylinNM/src/switchbutton.h index 8c86bc2..2e18d16 100644 --- a/KylinNM/src/switchbutton.h +++ b/KylinNM/src/switchbutton.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2020 Tianjin KYLIN Information Technology Co., Ltd. + * Copyright (C) 2023, KylinSoft Co., Ltd. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/KylinNM/src/utils.cpp b/KylinNM/src/utils.cpp index 7821508..3d98604 100644 --- a/KylinNM/src/utils.cpp +++ b/KylinNM/src/utils.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2020 Tianjin KYLIN Information Technology Co., Ltd. + * Copyright (C) 2023, KylinSoft Co., Ltd. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/KylinNM/src/utils.h b/KylinNM/src/utils.h index 74f9e1a..01b02c6 100644 --- a/KylinNM/src/utils.h +++ b/KylinNM/src/utils.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2020 Tianjin KYLIN Information Technology Co., Ltd. + * Copyright (C) 2023, KylinSoft Co., Ltd. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/KylinNM/wireless-security/dlgconnhidwifi.cpp b/KylinNM/wireless-security/dlgconnhidwifi.cpp index 3901449..1845611 100644 --- a/KylinNM/wireless-security/dlgconnhidwifi.cpp +++ b/KylinNM/wireless-security/dlgconnhidwifi.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2020 Tianjin KYLIN Information Technology Co., Ltd. + * Copyright (C) 2023, KylinSoft Co., Ltd. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/KylinNM/wireless-security/dlgconnhidwifi.h b/KylinNM/wireless-security/dlgconnhidwifi.h index 33d4c42..cc2e6dc 100644 --- a/KylinNM/wireless-security/dlgconnhidwifi.h +++ b/KylinNM/wireless-security/dlgconnhidwifi.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2020 Tianjin KYLIN Information Technology Co., Ltd. + * Copyright (C) 2023, KylinSoft Co., Ltd. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/KylinNM/wireless-security/dlgconnhidwifileap.cpp b/KylinNM/wireless-security/dlgconnhidwifileap.cpp index 5926b12..e28cde0 100644 --- a/KylinNM/wireless-security/dlgconnhidwifileap.cpp +++ b/KylinNM/wireless-security/dlgconnhidwifileap.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2020 Tianjin KYLIN Information Technology Co., Ltd. + * Copyright (C) 2023, KylinSoft Co., Ltd. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/KylinNM/wireless-security/dlgconnhidwifileap.h b/KylinNM/wireless-security/dlgconnhidwifileap.h index de96ce2..3b3cd57 100644 --- a/KylinNM/wireless-security/dlgconnhidwifileap.h +++ b/KylinNM/wireless-security/dlgconnhidwifileap.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2020 Tianjin KYLIN Information Technology Co., Ltd. + * Copyright (C) 2023, KylinSoft Co., Ltd. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/KylinNM/wireless-security/dlgconnhidwifisecfast.cpp b/KylinNM/wireless-security/dlgconnhidwifisecfast.cpp index b4d07f5..dd5dbc5 100644 --- a/KylinNM/wireless-security/dlgconnhidwifisecfast.cpp +++ b/KylinNM/wireless-security/dlgconnhidwifisecfast.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2020 Tianjin KYLIN Information Technology Co., Ltd. + * Copyright (C) 2023, KylinSoft Co., Ltd. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/KylinNM/wireless-security/dlgconnhidwifisecfast.h b/KylinNM/wireless-security/dlgconnhidwifisecfast.h index 7a1491a..5f3acda 100644 --- a/KylinNM/wireless-security/dlgconnhidwifisecfast.h +++ b/KylinNM/wireless-security/dlgconnhidwifisecfast.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2020 Tianjin KYLIN Information Technology Co., Ltd. + * Copyright (C) 2023, KylinSoft Co., Ltd. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/KylinNM/wireless-security/dlgconnhidwifisecleap.cpp b/KylinNM/wireless-security/dlgconnhidwifisecleap.cpp index a9d9e41..afbb71f 100644 --- a/KylinNM/wireless-security/dlgconnhidwifisecleap.cpp +++ b/KylinNM/wireless-security/dlgconnhidwifisecleap.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2020 Tianjin KYLIN Information Technology Co., Ltd. + * Copyright (C) 2023, KylinSoft Co., Ltd. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/KylinNM/wireless-security/dlgconnhidwifisecleap.h b/KylinNM/wireless-security/dlgconnhidwifisecleap.h index 4336b65..fc3c8e5 100644 --- a/KylinNM/wireless-security/dlgconnhidwifisecleap.h +++ b/KylinNM/wireless-security/dlgconnhidwifisecleap.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2020 Tianjin KYLIN Information Technology Co., Ltd. + * Copyright (C) 2023, KylinSoft Co., Ltd. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/KylinNM/wireless-security/dlgconnhidwifisecpeap.cpp b/KylinNM/wireless-security/dlgconnhidwifisecpeap.cpp index 50a0c9f..e47f244 100644 --- a/KylinNM/wireless-security/dlgconnhidwifisecpeap.cpp +++ b/KylinNM/wireless-security/dlgconnhidwifisecpeap.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2020 Tianjin KYLIN Information Technology Co., Ltd. + * Copyright (C) 2023, KylinSoft Co., Ltd. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/KylinNM/wireless-security/dlgconnhidwifisecpeap.h b/KylinNM/wireless-security/dlgconnhidwifisecpeap.h index d0361df..24bc740 100644 --- a/KylinNM/wireless-security/dlgconnhidwifisecpeap.h +++ b/KylinNM/wireless-security/dlgconnhidwifisecpeap.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2020 Tianjin KYLIN Information Technology Co., Ltd. + * Copyright (C) 2023, KylinSoft Co., Ltd. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/KylinNM/wireless-security/dlgconnhidwifisecpwd.cpp b/KylinNM/wireless-security/dlgconnhidwifisecpwd.cpp index 94b90d7..540cb3c 100644 --- a/KylinNM/wireless-security/dlgconnhidwifisecpwd.cpp +++ b/KylinNM/wireless-security/dlgconnhidwifisecpwd.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2020 Tianjin KYLIN Information Technology Co., Ltd. + * Copyright (C) 2023, KylinSoft Co., Ltd. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/KylinNM/wireless-security/dlgconnhidwifisecpwd.h b/KylinNM/wireless-security/dlgconnhidwifisecpwd.h index d44250d..c5c9965 100644 --- a/KylinNM/wireless-security/dlgconnhidwifisecpwd.h +++ b/KylinNM/wireless-security/dlgconnhidwifisecpwd.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2020 Tianjin KYLIN Information Technology Co., Ltd. + * Copyright (C) 2023, KylinSoft Co., Ltd. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/KylinNM/wireless-security/dlgconnhidwifisectls.cpp b/KylinNM/wireless-security/dlgconnhidwifisectls.cpp index 5a61d76..99a8465 100644 --- a/KylinNM/wireless-security/dlgconnhidwifisectls.cpp +++ b/KylinNM/wireless-security/dlgconnhidwifisectls.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2020 Tianjin KYLIN Information Technology Co., Ltd. + * Copyright (C) 2023, KylinSoft Co., Ltd. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/KylinNM/wireless-security/dlgconnhidwifisectls.h b/KylinNM/wireless-security/dlgconnhidwifisectls.h index c133807..f431412 100644 --- a/KylinNM/wireless-security/dlgconnhidwifisectls.h +++ b/KylinNM/wireless-security/dlgconnhidwifisectls.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2020 Tianjin KYLIN Information Technology Co., Ltd. + * Copyright (C) 2023, KylinSoft Co., Ltd. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/KylinNM/wireless-security/dlgconnhidwifisectunneltls.cpp b/KylinNM/wireless-security/dlgconnhidwifisectunneltls.cpp index fb02a60..be659d4 100644 --- a/KylinNM/wireless-security/dlgconnhidwifisectunneltls.cpp +++ b/KylinNM/wireless-security/dlgconnhidwifisectunneltls.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2020 Tianjin KYLIN Information Technology Co., Ltd. + * Copyright (C) 2023, KylinSoft Co., Ltd. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/KylinNM/wireless-security/dlgconnhidwifisectunneltls.h b/KylinNM/wireless-security/dlgconnhidwifisectunneltls.h index bbd881a..4cf933d 100644 --- a/KylinNM/wireless-security/dlgconnhidwifisectunneltls.h +++ b/KylinNM/wireless-security/dlgconnhidwifisectunneltls.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2020 Tianjin KYLIN Information Technology Co., Ltd. + * Copyright (C) 2023, KylinSoft Co., Ltd. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/KylinNM/wireless-security/dlgconnhidwifiwep.cpp b/KylinNM/wireless-security/dlgconnhidwifiwep.cpp index 72fa078..5d56dbb 100644 --- a/KylinNM/wireless-security/dlgconnhidwifiwep.cpp +++ b/KylinNM/wireless-security/dlgconnhidwifiwep.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2020 Tianjin KYLIN Information Technology Co., Ltd. + * Copyright (C) 2023, KylinSoft Co., Ltd. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/KylinNM/wireless-security/dlgconnhidwifiwep.h b/KylinNM/wireless-security/dlgconnhidwifiwep.h index bd071ac..5659e1a 100644 --- a/KylinNM/wireless-security/dlgconnhidwifiwep.h +++ b/KylinNM/wireless-security/dlgconnhidwifiwep.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2020 Tianjin KYLIN Information Technology Co., Ltd. + * Copyright (C) 2023, KylinSoft Co., Ltd. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/KylinNM/wireless-security/dlgconnhidwifiwpa.cpp b/KylinNM/wireless-security/dlgconnhidwifiwpa.cpp index c1a9fdc..7957ef5 100644 --- a/KylinNM/wireless-security/dlgconnhidwifiwpa.cpp +++ b/KylinNM/wireless-security/dlgconnhidwifiwpa.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2020 Tianjin KYLIN Information Technology Co., Ltd. + * Copyright (C) 2023, KylinSoft Co., Ltd. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/KylinNM/wireless-security/dlgconnhidwifiwpa.h b/KylinNM/wireless-security/dlgconnhidwifiwpa.h index 3b73126..402fabe 100644 --- a/KylinNM/wireless-security/dlgconnhidwifiwpa.h +++ b/KylinNM/wireless-security/dlgconnhidwifiwpa.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2020 Tianjin KYLIN Information Technology Co., Ltd. + * Copyright (C) 2023, KylinSoft Co., Ltd. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/KylinNM/wireless-security/kylinheadfile.cpp b/KylinNM/wireless-security/kylinheadfile.cpp index e8b92dc..2410e79 100644 --- a/KylinNM/wireless-security/kylinheadfile.cpp +++ b/KylinNM/wireless-security/kylinheadfile.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2020 Tianjin KYLIN Information Technology Co., Ltd. + * Copyright (C) 2023, KylinSoft Co., Ltd. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/KylinNM/wireless-security/kylinheadfile.h b/KylinNM/wireless-security/kylinheadfile.h index 449d547..3617e51 100644 --- a/KylinNM/wireless-security/kylinheadfile.h +++ b/KylinNM/wireless-security/kylinheadfile.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2020 Tianjin KYLIN Information Technology Co., Ltd. + * Copyright (C) 2023, KylinSoft Co., Ltd. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/VirtualKeyboard/src/charsmorewidget.cpp b/VirtualKeyboard/src/charsmorewidget.cpp index 01cc10f..52090f1 100644 --- a/VirtualKeyboard/src/charsmorewidget.cpp +++ b/VirtualKeyboard/src/charsmorewidget.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2023 Tianjin KYLIN Information Technology Co., Ltd. + * Copyright (C) 2023, KylinSoft Co., Ltd. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/VirtualKeyboard/src/charsmorewidget.h b/VirtualKeyboard/src/charsmorewidget.h index 9971ed3..b505d3d 100644 --- a/VirtualKeyboard/src/charsmorewidget.h +++ b/VirtualKeyboard/src/charsmorewidget.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2023 Tianjin KYLIN Information Technology Co., Ltd. + * Copyright (C) 2023, KylinSoft Co., Ltd. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/VirtualKeyboard/src/charswidget.cpp b/VirtualKeyboard/src/charswidget.cpp index c66597f..e3ce74d 100644 --- a/VirtualKeyboard/src/charswidget.cpp +++ b/VirtualKeyboard/src/charswidget.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2023 Tianjin KYLIN Information Technology Co., Ltd. + * Copyright (C) 2023, KylinSoft Co., Ltd. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/VirtualKeyboard/src/charswidget.h b/VirtualKeyboard/src/charswidget.h index 1076201..4f0a0ad 100644 --- a/VirtualKeyboard/src/charswidget.h +++ b/VirtualKeyboard/src/charswidget.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2023 Tianjin KYLIN Information Technology Co., Ltd. + * Copyright (C) 2023, KylinSoft Co., Ltd. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/VirtualKeyboard/src/commondef.h b/VirtualKeyboard/src/commondef.h index 629bd2d..ff1d6c1 100644 --- a/VirtualKeyboard/src/commondef.h +++ b/VirtualKeyboard/src/commondef.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2023 Tianjin KYLIN Information Technology Co., Ltd. + * Copyright (C) 2023, KylinSoft Co., Ltd. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/VirtualKeyboard/src/dragwidget.cpp b/VirtualKeyboard/src/dragwidget.cpp index db8a332..f41fb98 100644 --- a/VirtualKeyboard/src/dragwidget.cpp +++ b/VirtualKeyboard/src/dragwidget.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2023 Tianjin KYLIN Information Technology Co., Ltd. + * Copyright (C) 2023, KylinSoft Co., Ltd. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/VirtualKeyboard/src/dragwidget.h b/VirtualKeyboard/src/dragwidget.h index e8b1527..c08f850 100644 --- a/VirtualKeyboard/src/dragwidget.h +++ b/VirtualKeyboard/src/dragwidget.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2023 Tianjin KYLIN Information Technology Co., Ltd. + * Copyright (C) 2023, KylinSoft Co., Ltd. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/VirtualKeyboard/src/fakekeyboard.h b/VirtualKeyboard/src/fakekeyboard.h index 65a22ce..2d918c5 100644 --- a/VirtualKeyboard/src/fakekeyboard.h +++ b/VirtualKeyboard/src/fakekeyboard.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2023 Tianjin KYLIN Information Technology Co., Ltd. + * Copyright (C) 2023, KylinSoft Co., Ltd. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/VirtualKeyboard/src/kbbutton.cpp b/VirtualKeyboard/src/kbbutton.cpp index d593793..5658089 100644 --- a/VirtualKeyboard/src/kbbutton.cpp +++ b/VirtualKeyboard/src/kbbutton.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2023 Tianjin KYLIN Information Technology Co., Ltd. + * Copyright (C) 2023, KylinSoft Co., Ltd. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/VirtualKeyboard/src/kbbutton.h b/VirtualKeyboard/src/kbbutton.h index 923fa2e..543b47b 100644 --- a/VirtualKeyboard/src/kbbutton.h +++ b/VirtualKeyboard/src/kbbutton.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2023 Tianjin KYLIN Information Technology Co., Ltd. + * Copyright (C) 2023, KylinSoft Co., Ltd. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/VirtualKeyboard/src/kbtitle.cpp b/VirtualKeyboard/src/kbtitle.cpp index f5aa6b7..5dffdec 100644 --- a/VirtualKeyboard/src/kbtitle.cpp +++ b/VirtualKeyboard/src/kbtitle.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2023 Tianjin KYLIN Information Technology Co., Ltd. + * Copyright (C) 2023, KylinSoft Co., Ltd. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/VirtualKeyboard/src/kbtitle.h b/VirtualKeyboard/src/kbtitle.h index cda3263..fee198d 100644 --- a/VirtualKeyboard/src/kbtitle.h +++ b/VirtualKeyboard/src/kbtitle.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2023 Tianjin KYLIN Information Technology Co., Ltd. + * Copyright (C) 2023, KylinSoft Co., Ltd. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/VirtualKeyboard/src/letterswidget.cpp b/VirtualKeyboard/src/letterswidget.cpp index f93b522..6d30943 100644 --- a/VirtualKeyboard/src/letterswidget.cpp +++ b/VirtualKeyboard/src/letterswidget.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2023 Tianjin KYLIN Information Technology Co., Ltd. + * Copyright (C) 2023, KylinSoft Co., Ltd. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/VirtualKeyboard/src/letterswidget.h b/VirtualKeyboard/src/letterswidget.h index 31ee168..c7639b3 100644 --- a/VirtualKeyboard/src/letterswidget.h +++ b/VirtualKeyboard/src/letterswidget.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2023 Tianjin KYLIN Information Technology Co., Ltd. + * Copyright (C) 2023, KylinSoft Co., Ltd. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/VirtualKeyboard/src/main.cpp b/VirtualKeyboard/src/main.cpp index dbb84a0..6906c96 100644 --- a/VirtualKeyboard/src/main.cpp +++ b/VirtualKeyboard/src/main.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2018 Tianjin KYLIN Information Technology Co., Ltd. + * Copyright (C) 2023, KylinSoft Co., Ltd. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/VirtualKeyboard/src/numberswidget.cpp b/VirtualKeyboard/src/numberswidget.cpp index a09de13..9aeab9c 100644 --- a/VirtualKeyboard/src/numberswidget.cpp +++ b/VirtualKeyboard/src/numberswidget.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2023 Tianjin KYLIN Information Technology Co., Ltd. + * Copyright (C) 2023, KylinSoft Co., Ltd. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/VirtualKeyboard/src/numberswidget.h b/VirtualKeyboard/src/numberswidget.h index bea0f28..0b08660 100644 --- a/VirtualKeyboard/src/numberswidget.h +++ b/VirtualKeyboard/src/numberswidget.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2023 Tianjin KYLIN Information Technology Co., Ltd. + * Copyright (C) 2023, KylinSoft Co., Ltd. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/VirtualKeyboard/src/qtkeyboard.cpp b/VirtualKeyboard/src/qtkeyboard.cpp index a87495b..9b3a7c0 100644 --- a/VirtualKeyboard/src/qtkeyboard.cpp +++ b/VirtualKeyboard/src/qtkeyboard.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2023 Tianjin KYLIN Information Technology Co., Ltd. + * Copyright (C) 2023, KylinSoft Co., Ltd. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/VirtualKeyboard/src/qtkeyboard.h b/VirtualKeyboard/src/qtkeyboard.h index a9c9690..6d35bc4 100644 --- a/VirtualKeyboard/src/qtkeyboard.h +++ b/VirtualKeyboard/src/qtkeyboard.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2023 Tianjin KYLIN Information Technology Co., Ltd. + * Copyright (C) 2023, KylinSoft Co., Ltd. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/VirtualKeyboard/src/virtualkeyboardwidget.cpp b/VirtualKeyboard/src/virtualkeyboardwidget.cpp index 4318702..4a8422e 100644 --- a/VirtualKeyboard/src/virtualkeyboardwidget.cpp +++ b/VirtualKeyboard/src/virtualkeyboardwidget.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2018 Tianjin KYLIN Information Technology Co., Ltd. + * Copyright (C) 2023, KylinSoft Co., Ltd. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/VirtualKeyboard/src/virtualkeyboardwidget.h b/VirtualKeyboard/src/virtualkeyboardwidget.h index b7abe87..51eec62 100644 --- a/VirtualKeyboard/src/virtualkeyboardwidget.h +++ b/VirtualKeyboard/src/virtualkeyboardwidget.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2018 Tianjin KYLIN Information Technology Co., Ltd. + * Copyright (C) 2023, KylinSoft Co., Ltd. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/VirtualKeyboard/src/x11keyboard.cpp b/VirtualKeyboard/src/x11keyboard.cpp index c7cd2c8..d6377d0 100644 --- a/VirtualKeyboard/src/x11keyboard.cpp +++ b/VirtualKeyboard/src/x11keyboard.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2018 Tianjin KYLIN Information Technology Co., Ltd. + * Copyright (C) 2023, KylinSoft Co., Ltd. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/VirtualKeyboard/src/x11keyboard.h b/VirtualKeyboard/src/x11keyboard.h index 9914019..b3a5f1b 100644 --- a/VirtualKeyboard/src/x11keyboard.h +++ b/VirtualKeyboard/src/x11keyboard.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2018 Tianjin KYLIN Information Technology Co., Ltd. + * Copyright (C) 2023, KylinSoft Co., Ltd. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/data/CMakeLists.txt b/data/CMakeLists.txt index 6900182..bc5a8b3 100644 --- a/data/CMakeLists.txt +++ b/data/CMakeLists.txt @@ -3,5 +3,5 @@ install(FILES ukui-screensaver.desktop DESTINATION /etc/xdg/autostart) install(FILES ukui-screensaver.directory DESTINATION /usr/share/desktop-directories) install(FILES ukui-screensavers.menu DESTINATION /etc/xdg/menus) install(FILES ukui-screensaver-qt DESTINATION /etc/pam.d) -install(FILES screensaver-startup.sh DESTINATION /usr/bin) +install(FILES screensaver-startup DESTINATION /usr/bin) install(FILES ukui-screensaver-dialog.desktop DESTINATION /usr/share/applications) diff --git a/data/screensaver-startup.sh b/data/screensaver-startup similarity index 100% rename from data/screensaver-startup.sh rename to data/screensaver-startup diff --git a/debian/changelog b/debian/changelog index cbff8f5..812951d 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,202 +1,202 @@ -ukui-screensaver (4.0.0.0-ok7~0825) yangtze; urgency=medium +ukui-screensaver (4.0.0.0-1) noble; urgency=medium - * BUG号：I72HS3【次要】【电源管理】设置合盖时锁屏或休眠，开盖时出现键盘界面 - * 需求号：无 - * 其他修改说明：无 + * New upstream release. - -- Yang Min Fri, 25 Aug 2023 08:58:00 +0800 + -- liudun Fri, 8 Sep 2023 13:51:43 +0800 -ukui-screensaver (4.0.0.0-ok6~0808) yangtze; urgency=medium +ukui-screensaver (3.0.3.2-1) unstable; urgency=medium - * BUG号：I7JFT2 屏保时空格键无法唤醒登录密码输入框 - I729TV 【用户切换】用户切换进入已登录用用户时，存在闪过屏保锁屏界面 - I774FQ 【锁屏】进入锁屏切换用户到其他用户，再切换回来后登录进入桌面过程中右下角弹出切换用户窗口 - * 需求号：无 - * 其他修改说明：无 - * commit id:004330d + * Use qt5_add_translation instead of qt5_create_translation. + (Closes: #1042303) - -- Yang Min Tue, 08 Aug 2023 09:45:26 +0800 + -- handsome_feng Mon, 21 Aug 2023 15:32:43 +0800 -ukui-screensaver (4.0.0.0-ok5~0705) yangtze; urgency=medium +ukui-screensaver (3.0.3.1-1) unstable; urgency=medium - * BUG号：无 - * 需求号：无 - * 其他修改说明:修改changlog + [ Adrian Bunk ] + * Fix FTBFS with new glib. (Closes: #1020068) - -- liudun Wed, 05 Jul 2023 19:54:42 +0800 + -- handsome_feng Mon, 17 Oct 2022 19:27:09 +0800 -ukui-screensaver (4.0.0.0-ok4~0705) yangtze; urgency=medium +ukui-screensaver (3.0.3-1) unstable; urgency=medium - * BUG号：无 - * 需求号：无 - * 其他修改说明：添加layer-shell-qt的运行依赖 + * New upstream release. - -- liudun Wed, 05 Jul 2023 19:20:57 +0800 + -- handsome_feng Tue, 22 Feb 2022 14:20:17 +0800 -ukui-screensaver (4.0.0.0-ok4~0704) yangtze; urgency=medium +ukui-screensaver (3.0.2-1) unstable; urgency=medium - * BUG号：bug##I72EYT【次要】【锁屏】锁屏界面平板模式切换横竖屏后软键盘下方显示不全（wayland中文） - * 需求号：无 - * 其他修改说明：更新changelog + * New upstream release. - -- liuyuanpeng Tue, 04 Jul 2023 15:41:42 +0800 + -- handsome_feng Tue, 17 Aug 2021 20:41:03 +0800 -ukui-screensaver (4.0.0.0-ok3~0704) yangtze; urgency=medium +ukui-screensaver (3.0.1-1) unstable; urgency=medium - * BUG号：bug##I72EYT【次要】【锁屏】锁屏界面平板模式切换横竖屏后软键盘下方显示不全（wayland中文） - * 需求号：无 - * 其他修改说明：处理编译依赖问题 + * New upstream bugfix release. - -- liudun Tue, 04 Jul 2023 10:34:46 +0800 + -- handsome_feng Sun, 27 Sep 2020 14:47:09 +0800 -ukui-screensaver (4.0.0.0-ok3~0628) yangtze; urgency=medium +ukui-screensaver (3.0.0-1) unstable; urgency=medium - * BUG号：bug#I69CSS【锁屏】合盖后重新打开进入锁屏，此时锁屏界面下方图标会被遮住 - * 需求号：无 - * 其他修改说明：无 + * New upstream release. + * debian/control: bump standards-version to 4.5.0. - -- liudun Wed, 28 Jun 2023 15:05:12 +0800 + -- handsome_feng Wed, 12 Aug 2020 12:01:14 +0000 -ukui-screensaver (4.0.0.0-ok3~0608) yangtze; urgency=medium +ukui-screensaver (2.1.1-1) unstable; urgency=medium - * BUG号：无 - * 需求号：无 - * 其他修改说明：处理编译依赖问题 + * New upstream bugfix release: + - Fix that long press the enter key will cause the crash. + - Set default face to avoid empty frame. - -- Yang Min Thu, 08 Jun 2023 17:03:13 +0800 + -- handsome_feng Mon, 13 Apr 2020 16:33:05 +0800 -ukui-screensaver (4.0.0.0-ok3~0602) yangtze; urgency=medium +ukui-screensaver (2.1.0-1) unstable; urgency=medium - * BUG号：I73TLX 修复网络图标显示异常的问题 - * 需求号：无 - * 其他修改说明：无 + * New upstream bugfix release. + - Fix the problem that the on-screen keyboard + is displayed incorrectly when dual screen. + - Fix the issue that the second-user cannot + use biometrics when switching users to lock the screen. + - Fix the lock screen issue when root user switched tty + back and forth. + - Keep lock screen stays on top. + - Fix that in extended mode, login interface cannot be switched + between two monitors with the mouse. + * Fix the problem that the first user could not lock + the screen when logging in two users at the same time + by user switching. + * debian: + - Bump standards-vertion to 4.5.0. + - Remove the missing file from copyright. - -- Yang Min Fri, 02 Jun 2023 16:23:59 +0800 + -- handsome_feng Thu, 26 Mar 2020 21:19:04 +0800 -ukui-screensaver (4.0.0.0-ok2~0518) yangtze; urgency=medium +ukui-screensaver (2.0.10-1) unstable; urgency=medium - * BUG号：I72EWI锁屏界面点击切换用户回来后，输入框不输入文字时显示密码多了个冒号 - I728TE【控制面板】中文模式下，在个性化屏保界面悬浮屏保预览界面，提示语为英文，且进入屏保提示语也为英文 - * 需求号：无 - * 其他修改说明：无 + * New upstream release. + * debian/{compat,control} + - use debhelper-compat, bump to compat level version 12. + * debian/control: + - Bump standards-version to 4.4.1. No changes needed. - -- Yang Min Thu, 18 May 2023 10:24:00 +0800 + -- handsome_feng Wed, 11 Dec 2019 09:06:24 +0800 -ukui-screensaver (4.0.0.0-ok1~0426) yangtze; urgency=medium +ukui-screensaver (2.0.9-0ubuntu1) eoan; urgency=medium - * BUG号： 137546 【RISC-V】【控制面板】无法更改屏幕缩放 - * 需求号：无 - * 其他修改说明：无 + * Bugfix only: + - Don't lock when in live session. (LP: #1842855) + - Fix the wrong background. (LP: #1836292) + - Fix the wrong path of ukui-screensaver.menu. + - Fix the errors when running Kydroid. + - Fix the focus issues. - -- Yang Min Wed, 26 Apr 2023 19:49:20 +0800 + -- handsome_feng Mon, 07 Oct 2019 20:10:00 +0800 -ukui-screensaver (3.22.1.3-ok11~0412) yangtze; urgency=medium +ukui-screensaver (2.0.7-1) unstable; urgency=medium - * BUG号：I5XFFQ 锁屏登入界面无键盘图标，无实体键盘时无法输入 - * 需求号：无 - * 其他修改说明：无 + [ Liu Yuanpeng ] + * Set background widget on top. (LP: #1828955) + * Set default background color. (LP: #1828982) + * Fix that sometimes can't enter password. - -- Yang Min Wed, 12 Apr 2023 14:48:36 +0800 + [ handsome_feng ] + * Bump standards-vertion to 4.4.0. + * Drop mate-session-manager. -ukui-screensaver (3.22.1.3-ok10~0412) yangtze; urgency=medium + -- handsome_feng Wed, 14 Aug 2019 09:04:48 +0800 - * BUG号：136797 【虚拟机】【virtualbox】【锁屏】锁屏后锁屏页面时间与头像显示未对齐，登录页面正常 - I5M3SK 内存泄露 - * 需求号：无 - * 其他修改说明：无 +ukui-screensaver (2.0.6-0ubuntu1) disco; urgency=medium - -- Yang Min Wed, 12 Apr 2023 13:40:10 +0800 + * Bugfix only: + - Fix the bug that the screensaver is still activated when + sessionIdleOption is unchecked. -ukui-screensaver (3.22.1.3-ok9~0323) yangtze; urgency=medium + -- handsome_feng Fri, 12 Apr 2019 14:32:26 +0800 - * BUG号：I65B7Q 【次要】【系统登录】登录界面tab后，esc键位无法回复登录界面默认显示 - * 需求号：无 - * 其他修改说明：无 +ukui-screensaver (2.0.5-0ubuntu1) disco; urgency=medium - -- Yang Min Thu, 23 Mar 2023 09:35:33 +0800 + * Bugfix only: + - Fix the wrong activated condition. (LP: #1822037) -ukui-screensaver (3.22.1.3-ok8~0314) yangtze; urgency=medium + -- handsome_feng Thu, 28 Mar 2019 16:38:31 +0800 - * BUG号：无 - * 需求号：无 - * 其他修改说明：更新屏保语录 +ukui-screensaver (2.0.4-1) experimental; urgency=medium - -- Yang Min Tue, 14 Mar 2023 15:25:34 +0800 + * Add /etc/pam.d/ukui-screensaver-qt. + * Generate dbus adaptor in CMake file. + * Bugfix: failed to switch to biometric authentication if no default device. + * Bugfix: stop authentication before suspend and start it after wake up. + * Bugfix: not activated when idel-activation-enabled is false. -ukui-screensaver (3.22.1.3-ok7~0109) yangtze; urgency=medium + -- handsome_feng Fri, 22 Mar 2019 11:38:03 +0800 - * BUG号： 161081 【设计】ukui屏保格言替换文本 - * 需求号：无 - * 其他修改说明：无 +ukui-screensaver (2.0.3-1) unstable; urgency=medium - -- Yang Min Mon, 09 Jan 2023 20:58:42 +0800 + * Change UI. + * Add virtual keyboard. + * Add button for switching user. + * Remove Xext dependency. + * Auto retry if identify failed. + * Set the button's cursor to PointingHand. + * Add waiting movie after respond. + * Show black if the saver's path doesn't exist. -ukui-screensaver (3.22.1.3-ok6~1230) yangtze; urgency=medium + -- handsome_feng Sat, 05 Jan 2019 16:10:25 +0800 - * BUG号：131228 【wayland】【控制面板】【显示器】【锁屏】扩展模式下锁屏，仅一个屏幕有锁屏壁纸 - * 需求号：无 - * 其他修改说明：修复锁屏界面插拔电源均直接进入系统桌面问题 +ukui-screensaver (2.0.2-1) unstable; urgency=medium - -- Yang Min Fri, 30 Dec 2022 15:27:42 +0800 + * Add fr.po, pt.po, ru.po. -ukui-screensaver (3.22.1.3-ok5~1208) yangtze; urgency=medium + -- handsome_feng Tue, 23 Oct 2018 14:14:18 +0800 - * BUG号：无 - * 需求号：Task#123734 子 openkylin网络插件化适配 / openkylin网络插件化适配-登录锁屏 +ukui-screensaver (2.0.1-1) UNRELEASED; urgency=medium - -- Yang Min Thu, 08 Dec 2022 14:39:04 +0800 + * Update translation. + * Change Architecture to any. + * New design implemneted with Qt5. -ukui-screensaver (3.22.1.3-ok3~1101) yangtze; urgency=medium + -- handsome_feng Sat, 29 Sep 2018 17:01:12 +0800 - * BUG号：无 - * 需求号：Task#114869 【登录锁屏】增加登录、锁屏状态显示 +ukui-screensaver (1.1.2-1) UNRELEASED; urgency=medium - -- Yang Min Mon, 24 Oct 2022 11:13:26 +0800 + * Set object name of auth_prompt_entry. -ukui-screensaver (3.1.1.34update1-ok8) yangtze; urgency=medium + -- handsome_feng Tue, 26 Jun 2018 16:10:33 +0800 - * BUG号：132979 【用户反馈】【锁屏】系统不操作等待5分钟必进入锁屏（锁屏同步新的逻辑，跟随屏保设置） - * 需求号：无 - * 其他修改说明：无 +ukui-screensaver (1.1.1-1) UNRELEASED; urgency=medium - -- Yang Min Thu, 11 Aug 2022 10:08:54 +0800 + * Fix a translation file typo + * Add "Modified by:" to three files -ukui-screensaver (3.1.1.34update1-ok7.1) yangtze; urgency=medium + -- handsome_feng Sat, 17 Mar 2018 14:01:48 +0800 - * BUG号： 129308 【网络】输入密码界面点击网络连接，网络图标显示错误，显示的是未连接状态 - * 需求号：无 - * 其他修改说明：无 +ukui-screensaver (1.1.0-1) UNRELEASED; urgency=medium - -- Yang Min Wed, 20 Jul 2022 19:03:44 +0800 + * Optimize the lock-dialog rendering process. + * Remove frame shadow from the lock-dialog. + * Add CSS stylesheets to the unlock button. + * Migrate gtk-2.0 to gtk-3.0. + * Update translation files. -ukui-screensaver (3.1.1.34update1-ok6) yangte; urgency=medium + -- handsome_feng Tue, 27 Feb 2018 15:41:35 +0800 - * fix bug#128103 锁屏后无法通过正确密码进入系统 +ukui-screensaver (1.0.3-1) UNRELEASED; urgency=medium - -- liuyuanpeng Wed, 20 Jul 2022 17:14:17 +0800 + * [Fixed] screensaver-preferences can't preview "Blank Screen" correctly. + * [Improved] Change the unlock arrow to button. + * [Improved] Set the font style of username label. -ukui-screensaver (3.1.1.34update1-ok5) yangte; urgency=medium + -- handsome_feng Wed, 13 Sep 2017 09:14:54 +0800 - * fix bug#125395 【wayland】【锁屏】在锁屏界面可以使用快捷键调出窗口或者进行窗口切换等操作 +ukui-screensaver (1.0.2-2) unstable; urgency=medium - -- liuyuanpeng Tue, 19 Jul 2022 11:26:30 +0800 + * Use tracker.d.o team address (Closes: #899718) -ukui-screensaver (3.1.1.34update1-ok4) yangte; urgency=medium + -- Aron Xu Mon, 09 Jul 2018 17:09:48 +0800 - * 新增屏保插件，wayland下使用加载插件的方式加载屏保 +ukui-screensaver (1.0.2-1) unstable; urgency=medium - -- liuyuanpeng Mon, 18 Jul 2022 16:25:25 +0800 + * Initial release (Closes: #872968) -ukui-screensaver (3.1.1.34update1-ok3~0716) yangtze; urgency=medium - - * bug#128739 【wayland】【控制面板】【个性化】控制面板锁屏壁纸没有默认设置，导致登录界面也不显示背景 - * bug#128557 【wayland】【锁屏】点击锁屏恢复默认，更换背景，锁屏也一同更换 - - -- liuyuanpeng Sat, 16 Jul 2022 15:20:36 +0800 - -ukui-screensaver (3.1.1.34update1-ok2~0623) yangtze; urgency=medium - - * Initial for openKylin. - * 修复锁屏窗口适配wayland置顶协议不生效问题 - - -- Xie Wei Thu, 19 May 2022 11:21:46 +0800 + -- Aron Xu Sat, 26 Aug 2017 15:26:45 +0800 diff --git a/debian/control b/debian/control index 231a94b..ac77cae 100644 --- a/debian/control +++ b/debian/control @@ -4,48 +4,51 @@ Priority: optional Maintainer: Kylin Team Uploaders: Aron Xu , handsome_feng -Build-Depends: debhelper-compat (= 12), - cmake (>=2.6), - qtbase5-dev, - libqt5x11extras5-dev, - libpam0g-dev, - qttools5-dev, - qttools5-dev-tools, +Build-Depends: cmake (>=2.6), + debhelper-compat (= 13), + kylin-nm-plugin, + libavcodec-dev, + libavformat-dev, libglib2.0-dev, + libgsettings-qt-dev, + libimlib2-dev, +# libinput-dev, + libkf5networkmanagerqt-dev, + libkf5screen-dev, + libkf5wayland-dev, + libkf5windowsystem-dev, + libkylin-nm-base (>=3.20.0.9-0k1), + libkysdk-system-dev, + liblayershellqtinterface-dev, + libmatemixer-dev, + libnm-dev, libopencv-dev, + libpam0g-dev, + libqt5svg5-dev, + libqt5x11extras5-dev, + libukui-log4qt-dev, +# libukuiinputgatherclient-dev, libx11-dev, libxtst-dev, - libqt5svg5-dev, - libkylin-nm-base (>=3.20.0.9-0k1), - libnm-dev, - libkf5networkmanagerqt-dev, - kylin-nm-plugin, - libkf5wayland-dev, - libkf5screen-dev, - libgsettings-qt-dev, - libkf5windowsystem-dev, - libmatemixer-dev, - libimlib2-dev, - libukui-log4qt-dev, - libkysdk-sysinfo-dev (>> 1.1.0kylin1), - ukui-input-gather (>=1.0.0.2), - libinput-dev, - libukuiinputgatherclient-dev, - liblayershellqtinterface-dev -Standards-Version: 4.5.0 + qtbase5-dev, + qtmultimedia5-dev, + qttools5-dev, + qttools5-dev-tools, +# ukui-input-gather (>=1.0.0.2) +Standards-Version: 4.6.1.0 Rules-Requires-Root: no -Homepage: https://www.github.com/ukui/ukui-screensaver -Vcs-Git: https://github.com/ukui/ukui-screensaver.git -Vcs-Browser: https://github.com/ukui/ukui-screensaver +Homepage: https://gitee.com/openkylin/ukui-screensaver +Vcs-Git: https://gitee.com/openkylin/ukui-screensaver.git +Vcs-Browser: https://gitee.com/openkylin/ukui-screensaver Package: ukui-screensaver Architecture: any Depends: ethtool, - mate-desktop-common, - ukui-session-manager, + layer-shell-qt, libpam-biometric(>=3.20.0.10), - ukui-input-gather(>=1.0.0.2), - layer-shell-qt, + mate-desktop-common, +# ukui-input-gather(>=1.0.0.2), + ukui-session-manager, ${misc:Depends}, ${shlibs:Depends} Replaces: ukui-screensaver-common (<< 2.0.0) diff --git a/debian/copyright b/debian/copyright index 34d2316..e049131 100644 --- a/debian/copyright +++ b/debian/copyright @@ -1,71 +1,22 @@ Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ -Upstream-Contact: yanghao@kylinos.cn -Source: https://github.com/ukui/ukui-screensaver +Upstream-Contact: liudun@kylinos.cn +Source: https://gitee.com/openkylin/ukui-screensaver -Files: CMakeLists.txt - src/* - i18n_ts/* - data/* - man/* - debian/* - screensaver/* - Common/* - .gitattributes - KylinNM/* - .config.h.in - screensaver-focus-helper/* - set4kScale/* -Copyright: 2018, Tianjin KYLIN Information Technology Co., Ltd. - 2019, Tianjin KYLIN Information Technology Co., Ltd. - 2020, Tianjin KYLIN Information Technology Co., Ltd. - 2021, Tianjin KYLIN Information Technology Co., Ltd. - 2022, Tianjin KYLIN Information Technology Co., Ltd. +Files: * +Copyright: 2023, KylinSoft Co., Ltd. License: GPL-3+ -Files: src/xeventmonitor.h - src/xeventmonitor.cpp +Files: src/xeventmonitor.cpp + src/xeventmonitor.h Copyright: 2011 ~ 2017 Deepin, Inc. 2011 ~ 2017 Wang Yong - 2018, Tianjin KYLIN Information Technology Co., Ltd. -License: GPL-3+ - -Files: BiometricAuth/* - VirtualKeyboard/* -Copyright: 2018, Tianjin KYLIN Information Technology Co., Ltd. - 2021, Tianjin KYLIN Information Technology Co., Ltd. - 2022, Tianjin KYLIN Information Technology Co., Ltd. + 2023, KylinSoft Co., Ltd. License: GPL-3+ License: GPL-3+ - This package is free software; you can redistribute it and/or modify + This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 3 of the License, or - (at your option) any later version. - . - This package is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU Genaral Public License for more details. - . - You should have received a copy og the GNU General Public License - along with this program. If not, see - . - On Debian systems, the complete text of the GNU General - Public License version 3 can be found in "/usr/share/common-licenses/GPL-3". - -License: GPL-2+ - This package is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 2 of the License, or - (at your option) any later version. - . - This package is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU Genaral Public License for more details. - . - You should have received a copy og the GNU General Public License - along with this program. If not, see - . - On Debian systems, the complete text of the GNU General - Public License version 2 can be found in "/usr/share/common-licenses/GPL-2". + the Free Software Foundation; version 3 dated June, 2007, or (at + your option) any later version. + On Debian systems, the complete text of version 3 of the GNU General + Public License can be found in '/usr/share/common-licenses/GPL-3'. diff --git a/debian/rules b/debian/rules index e776f1f..2965926 100755 --- a/debian/rules +++ b/debian/rules @@ -13,5 +13,5 @@ override_dh_usrlocal: override_dh_builddeb-arch: # ukui-screensaver-checkpass - chmod u+s debian/ukui-screensaver/usr/bin/ukui-screensaver-checkpass - dh_builddeb -a \ No newline at end of file + # chmod u+s debian/ukui-screensaver/usr/bin/ukui-screensaver-checkpass + dh_builddeb -a diff --git a/debian/source/format b/debian/source/format index 89ae9db..163aaf8 100644 --- a/debian/source/format +++ b/debian/source/format @@ -1 +1 @@ -3.0 (native) +3.0 (quilt) diff --git a/debian/ukui-screensaver.manpages b/debian/ukui-screensaver.manpages index ff36470..5d7190c 100644 --- a/debian/ukui-screensaver.manpages +++ b/debian/ukui-screensaver.manpages @@ -1,3 +1,5 @@ +man/screensaver-startup.1 man/ukui-screensaver-backend.1 -man/ukui-screensaver-dialog.1 +man/ukui-screensaver-checkpass.1 man/ukui-screensaver-command.1 +man/ukui-screensaver-dialog.1 diff --git a/debian/ukui-screensaver.postinst b/debian/ukui-screensaver.postinst index 41fedbe..1d4e3da 100644 --- a/debian/ukui-screensaver.postinst +++ b/debian/ukui-screensaver.postinst @@ -1,6 +1,6 @@ #!/bin/sh -chmod u+s /usr/bin/ukui-screensaver-checkpass +#chmod u+s /usr/bin/ukui-screensaver-checkpass set -e glib-compile-schemas /usr/share/glib-2.0/schemas/ @@ -9,3 +9,5 @@ if [ -x /usr/share/kylin-system-updater/kylin-reboot-required ]; then #执行请求重启提示 /usr/share/kylin-system-updater/kylin-reboot-required fi + +#DEBHELPER# diff --git a/examples/LoadCustomPlugin/main.cpp b/examples/LoadCustomPlugin/main.cpp index 1ba44a8..66ff2d1 100644 --- a/examples/LoadCustomPlugin/main.cpp +++ b/examples/LoadCustomPlugin/main.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2022 Tianjin KYLIN Information Technology Co., Ltd. + * Copyright (C) 2023, KylinSoft Co., Ltd. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/examples/LoadCustomPlugin/widget.cpp b/examples/LoadCustomPlugin/widget.cpp index fe30bca..9ee20dc 100644 --- a/examples/LoadCustomPlugin/widget.cpp +++ b/examples/LoadCustomPlugin/widget.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2022 Tianjin KYLIN Information Technology Co., Ltd. + * Copyright (C) 2023, KylinSoft Co., Ltd. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/examples/LoadCustomPlugin/widget.h b/examples/LoadCustomPlugin/widget.h index 02e7658..de9533e 100644 --- a/examples/LoadCustomPlugin/widget.h +++ b/examples/LoadCustomPlugin/widget.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2022 Tianjin KYLIN Information Technology Co., Ltd. + * Copyright (C) 2023, KylinSoft Co., Ltd. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/i18n_ts/CMakeLists.txt b/i18n_ts/CMakeLists.txt index f4b0cef..96e8518 100644 --- a/i18n_ts/CMakeLists.txt +++ b/i18n_ts/CMakeLists.txt @@ -1,7 +1,7 @@ find_package(Qt5LinguistTools) file(GLOB ts_files *.ts) -qt5_create_translation(qm_files ${ts_files}) +qt5_add_translation(qm_files ${ts_files}) add_custom_target(i18n DEPENDS ${qm_files} SOURCES ${ts_files} diff --git a/man/screensaver-startup.1 b/man/screensaver-startup.1 new file mode 100644 index 0000000..554a950 --- /dev/null +++ b/man/screensaver-startup.1 @@ -0,0 +1,40 @@ +.\" ukui-screensaver manual page +.\" +.\" This is free software; you may redistribute it and/or modify +.\" it under the terms of the GNU General Public License as +.\" published by the Free Software Foundation; either version 2, +.\" or (at your option) any later version. +.\" +.\" This is distributed in the hope that it will be useful, but +.\" WITHOUT ANY WARRANTY; without even the implied warranty of +.\" MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +.\" GNU General Public License for more details. +.\" +.\"You should have received a copy of the GNU General Public License along +.\"with this program; if not, write to the Free Software Foundation, Inc., +.\"51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. +.\" +.TH UKUI-SCREENSAVER 1 "03 May 2018" "UKUI Desktop Environment" +.\" Please adjust this date whenever revising the manpage. +.\" +.SH "NAME" +ukui-screensaver \- The UKUI Desktop Screensaver and Locker +.SH "DESCRIPTION" +UKUI Screensaver is the default screen saver and locker for the UKUI Desktop. It is designed with simplicity and security in mind. \fBukui-screensaver\fP integrates well with the UKUI desktop, and it supports User Switching and the ability to lock down configuration settings. +.P +This program also accepts the standard GTK options. +.SH "BUGS" +.SS Should you encounter any bugs, they may be reported at: +http://github.com/ukui-desktop/ukui-screensaver/issues +.SH "AUTHORS" +.SS ukui-screensaver is maintained by: +.nf +Hao Lee +.fi +.SS This Man Page has been updated/re-written for the UKUI Desktop Environment by: +Hao Lee (2018) +.SH "SEE ALSO" +.SS Further information may also be available at: http://wiki.ukui-desktop.org/docs +.P +.BR ukui-screensaver-command (1), + diff --git a/man/ukui-screensaver-checkpass.1 b/man/ukui-screensaver-checkpass.1 new file mode 100644 index 0000000..bbdc7fb --- /dev/null +++ b/man/ukui-screensaver-checkpass.1 @@ -0,0 +1,39 @@ +.\" ukui-screensaver manual page +.\" +.\" This is free software; you may redistribute it and/or modify +.\" it under the terms of the GNU General Public License as +.\" published by the Free Software Foundation; either version 2, +.\" or (at your option) any later version. +.\" +.\" This is distributed in the hope that it will be useful, but +.\" WITHOUT ANY WARRANTY; without even the implied warranty of +.\" MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +.\" GNU General Public License for more details. +.\" +.\"You should have received a copy of the GNU General Public License along +.\"with this program; if not, write to the Free Software Foundation, Inc., +.\"51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. +.\" +.TH UKUI-SCREENSAVER 1 "03 May 2018" "UKUI Desktop Environment" +.\" Please adjust this date whenever revising the manpage. +.\" +.SH "NAME" +ukui-screensaver \- The UKUI Desktop Screensaver and Locker +.SH "DESCRIPTION" +UKUI Screensaver is the default screen saver and locker for the UKUI Desktop. It is designed with simplicity and security in mind. \fBukui-screensaver\fP integrates well with the UKUI desktop, and it supports User Switching and the ability to lock down configuration settings. +.P +This program also accepts the standard GTK options. +.SH "BUGS" +.SS Should you encounter any bugs, they may be reported at: +http://github.com/ukui-desktop/ukui-screensaver/issues +.SH "AUTHORS" +.SS ukui-screensaver is maintained by: +.nf +Hao Lee +.fi +.SS This Man Page has been updated/re-written for the UKUI Desktop Environment by: +Hao Lee (2018) +.SH "SEE ALSO" +.SS Further information may also be available at: http://wiki.ukui-desktop.org/docs +.P +.BR ukui-screensaver-command (1), diff --git a/screensaver-focus-helper/blackwindow.cpp b/screensaver-focus-helper/blackwindow.cpp index 0830595..9532381 100644 --- a/screensaver-focus-helper/blackwindow.cpp +++ b/screensaver-focus-helper/blackwindow.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2021 Tianjin KYLIN Information Technology Co., Ltd. + * Copyright (C) 2023, KylinSoft Co., Ltd. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/screensaver-focus-helper/blackwindow.h b/screensaver-focus-helper/blackwindow.h index 6d1f071..e171dae 100644 --- a/screensaver-focus-helper/blackwindow.h +++ b/screensaver-focus-helper/blackwindow.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2021 Tianjin KYLIN Information Technology Co., Ltd. + * Copyright (C) 2023, KylinSoft Co., Ltd. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/screensaver-focus-helper/main.cpp b/screensaver-focus-helper/main.cpp index 70b9982..bfa4547 100644 --- a/screensaver-focus-helper/main.cpp +++ b/screensaver-focus-helper/main.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2021 Tianjin KYLIN Information Technology Co., Ltd. + * Copyright (C) 2023, KylinSoft Co., Ltd. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/screensaver/chinesedate.cpp b/screensaver/chinesedate.cpp index 811e504..9c4bfab 100644 --- a/screensaver/chinesedate.cpp +++ b/screensaver/chinesedate.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2018 Tianjin KYLIN Information Technology Co., Ltd. + * Copyright (C) 2023, KylinSoft Co., Ltd. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/screensaver/chinesedate.h b/screensaver/chinesedate.h index 8f580fc..b669c3b 100644 --- a/screensaver/chinesedate.h +++ b/screensaver/chinesedate.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2018 Tianjin KYLIN Information Technology Co., Ltd. + * Copyright (C) 2023, KylinSoft Co., Ltd. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/screensaver/customplugin.cpp b/screensaver/customplugin.cpp index 7f31d23..0a62454 100644 --- a/screensaver/customplugin.cpp +++ b/screensaver/customplugin.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2018 Tianjin KYLIN Information Technology Co., Ltd. + * Copyright (C) 2023, KylinSoft Co., Ltd. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/screensaver/customplugin.h b/screensaver/customplugin.h index 49f3b07..a7a4aca 100644 --- a/screensaver/customplugin.h +++ b/screensaver/customplugin.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2022 Tianjin KYLIN Information Technology Co., Ltd. + * Copyright (C) 2023, KylinSoft Co., Ltd. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/screensaver/cyclelabel.cpp b/screensaver/cyclelabel.cpp index f6c847a..622d1b5 100644 --- a/screensaver/cyclelabel.cpp +++ b/screensaver/cyclelabel.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2019 Tianjin KYLIN Information Technology Co., Ltd. + * Copyright (C) 2023, KylinSoft Co., Ltd. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/screensaver/cyclelabel.h b/screensaver/cyclelabel.h index b8b2af6..aa8bc7b 100644 --- a/screensaver/cyclelabel.h +++ b/screensaver/cyclelabel.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2019 Tianjin KYLIN Information Technology Co., Ltd. + * Copyright (C) 2023, KylinSoft Co., Ltd. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/screensaver/main.cpp b/screensaver/main.cpp index 28f3dd3..5cd07ab 100644 --- a/screensaver/main.cpp +++ b/screensaver/main.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2018 Tianjin KYLIN Information Technology Co., Ltd. + * Copyright (C) 2023, KylinSoft Co., Ltd. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/screensaver/mbackground.cpp b/screensaver/mbackground.cpp index a1e6553..b803cc0 100644 --- a/screensaver/mbackground.cpp +++ b/screensaver/mbackground.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2018 Tianjin KYLIN Information Technology Co., Ltd. + * Copyright (C) 2023, KylinSoft Co., Ltd. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/screensaver/mbackground.h b/screensaver/mbackground.h index 747cf1d..24e2040 100644 --- a/screensaver/mbackground.h +++ b/screensaver/mbackground.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2018 Tianjin KYLIN Information Technology Co., Ltd. + * Copyright (C) 2023, KylinSoft Co., Ltd. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/screensaver/scconfiguration.cpp b/screensaver/scconfiguration.cpp index 7342b76..31bba70 100644 --- a/screensaver/scconfiguration.cpp +++ b/screensaver/scconfiguration.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2018 Tianjin KYLIN Information Technology Co., Ltd. + * Copyright (C) 2023, KylinSoft Co., Ltd. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/screensaver/scconfiguration.h b/screensaver/scconfiguration.h index 83322fe..cf6db45 100644 --- a/screensaver/scconfiguration.h +++ b/screensaver/scconfiguration.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2018 Tianjin KYLIN Information Technology Co., Ltd. + * Copyright (C) 2023, KylinSoft Co., Ltd. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/screensaver/screensaver.cpp b/screensaver/screensaver.cpp index c556d56..3b80db5 100644 --- a/screensaver/screensaver.cpp +++ b/screensaver/screensaver.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2018 Tianjin KYLIN Information Technology Co., Ltd. + * Copyright (C) 2023, KylinSoft Co., Ltd. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/screensaver/screensaver.h b/screensaver/screensaver.h index bbdb2b6..8e3af51 100644 --- a/screensaver/screensaver.h +++ b/screensaver/screensaver.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2018 Tianjin KYLIN Information Technology Co., Ltd. + * Copyright (C) 2023, KylinSoft Co., Ltd. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/screensaver/screensaverplugin.h b/screensaver/screensaverplugin.h index 4fcd9ff..997b38e 100644 --- a/screensaver/screensaverplugin.h +++ b/screensaver/screensaverplugin.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2022 Tianjin KYLIN Information Technology Co., Ltd. + * Copyright (C) 2023, KylinSoft Co., Ltd. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/screensaver/sleeptime.cpp b/screensaver/sleeptime.cpp index bd06b4d..95a792e 100644 --- a/screensaver/sleeptime.cpp +++ b/screensaver/sleeptime.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2018 Tianjin KYLIN Information Technology Co., Ltd. + * Copyright (C) 2023, KylinSoft Co., Ltd. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/screensaver/sleeptime.h b/screensaver/sleeptime.h index 2174ac5..a9e98bc 100644 --- a/screensaver/sleeptime.h +++ b/screensaver/sleeptime.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2018 Tianjin KYLIN Information Technology Co., Ltd. + * Copyright (C) 2023, KylinSoft Co., Ltd. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/screensaver/weathermanager.cpp b/screensaver/weathermanager.cpp index 506b34c..132ad4d 100644 --- a/screensaver/weathermanager.cpp +++ b/screensaver/weathermanager.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2020 Tianjin KYLIN Information Technology Co., Ltd. + * Copyright (C) 2023, KylinSoft Co., Ltd. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/set4kScale/main.cpp b/set4kScale/main.cpp index 80b6c1e..dda6306 100644 --- a/set4kScale/main.cpp +++ b/set4kScale/main.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2022 Tianjin KYLIN Information Technology Co., Ltd. + * Copyright (C) 2023, KylinSoft Co., Ltd. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index c30a4e9..25d5d07 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -57,7 +57,7 @@ set(EXTRA_LIBS -lKF5WaylandServer -lKF5WaylandClient -llibnm-icon-kylin - -lukuiinputgatherclient +# -lukuiinputgatherclient ) qt5_wrap_ui(dialog_SRC @@ -121,8 +121,8 @@ qt5_wrap_cpp(dialog_SRC device.h enginedevice.h batterywidget.h - libinputswitchevent.h - machinemodel.h +# libinputswitchevent.h +# machinemodel.h ) set(dialog_SRC @@ -176,8 +176,8 @@ set(dialog_SRC device.cpp enginedevice.cpp batterywidget.cpp - libinputswitchevent.cpp - machinemodel.cpp +# libinputswitchevent.cpp +# machinemodel.cpp ) add_executable(ukui-screensaver-dialog ${dialog_SRC}) add_definitions(-DAPP_API_MAJOR=0 -DAPP_API_MINOR=11 -DAPP_API_FUNC=0) diff --git a/src/PhysicalDeviceSet/brightnessdeviceset.cpp b/src/PhysicalDeviceSet/brightnessdeviceset.cpp index 5e25b9f..9171562 100644 --- a/src/PhysicalDeviceSet/brightnessdeviceset.cpp +++ b/src/PhysicalDeviceSet/brightnessdeviceset.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2022 Tianjin KYLIN Information Technology Co., Ltd. + * Copyright (C) 2023, KylinSoft Co., Ltd. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/PhysicalDeviceSet/brightnessdeviceset.h b/src/PhysicalDeviceSet/brightnessdeviceset.h index c361c9d..8385a02 100644 --- a/src/PhysicalDeviceSet/brightnessdeviceset.h +++ b/src/PhysicalDeviceSet/brightnessdeviceset.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2020 Tianjin KYLIN Information Technology Co., Ltd. + * Copyright (C) 2023, KylinSoft Co., Ltd. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/PhysicalDeviceSet/flightmodeset.cpp b/src/PhysicalDeviceSet/flightmodeset.cpp index 33e4616..89e35cd 100644 --- a/src/PhysicalDeviceSet/flightmodeset.cpp +++ b/src/PhysicalDeviceSet/flightmodeset.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2020 Tianjin KYLIN Information Technology Co., Ltd. + * Copyright (C) 2023, KylinSoft Co., Ltd. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/PhysicalDeviceSet/flightmodeset.h b/src/PhysicalDeviceSet/flightmodeset.h index 3efcd0a..829004d 100644 --- a/src/PhysicalDeviceSet/flightmodeset.h +++ b/src/PhysicalDeviceSet/flightmodeset.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2020 Tianjin KYLIN Information Technology Co., Ltd. + * Copyright (C) 2023, KylinSoft Co., Ltd. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/PhysicalDeviceSet/sounddeviceset.cpp b/src/PhysicalDeviceSet/sounddeviceset.cpp index 876708f..405438f 100644 --- a/src/PhysicalDeviceSet/sounddeviceset.cpp +++ b/src/PhysicalDeviceSet/sounddeviceset.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2021 Tianjin KYLIN Information Technology Co., Ltd. + * Copyright (C) 2023, KylinSoft Co., Ltd. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/PhysicalDeviceSet/sounddeviceset.h b/src/PhysicalDeviceSet/sounddeviceset.h index 12701bd..ecaf02e 100644 --- a/src/PhysicalDeviceSet/sounddeviceset.h +++ b/src/PhysicalDeviceSet/sounddeviceset.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2020 Tianjin KYLIN Information Technology Co., Ltd. + * Copyright (C) 2023, KylinSoft Co., Ltd. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/PhysicalDeviceSet/touchscreenset.cpp b/src/PhysicalDeviceSet/touchscreenset.cpp index 9884078..020b05e 100644 --- a/src/PhysicalDeviceSet/touchscreenset.cpp +++ b/src/PhysicalDeviceSet/touchscreenset.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2020 Tianjin KYLIN Information Technology Co., Ltd. + * Copyright (C) 2023, KylinSoft Co., Ltd. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/PhysicalDeviceSet/touchscreenset.h b/src/PhysicalDeviceSet/touchscreenset.h index 096ce9e..dd8b7bc 100644 --- a/src/PhysicalDeviceSet/touchscreenset.h +++ b/src/PhysicalDeviceSet/touchscreenset.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2020 Tianjin KYLIN Information Technology Co., Ltd. + * Copyright (C) 2023, KylinSoft Co., Ltd. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/accountsinterface.cpp b/src/accountsinterface.cpp index 7bc8cbb..7a38f62 100644 --- a/src/accountsinterface.cpp +++ b/src/accountsinterface.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2019 Tianjin KYLIN Information Technology Co., Ltd. + * Copyright (C) 2023, KylinSoft Co., Ltd. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/accountsinterface.h b/src/accountsinterface.h index 2e1a0d5..1e02497 100644 --- a/src/accountsinterface.h +++ b/src/accountsinterface.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2020 Tianjin KYLIN Information Technology Co., Ltd. + * Copyright (C) 2023, KylinSoft Co., Ltd. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/auth-pam.cpp b/src/auth-pam.cpp index aa01e1c..2cc3090 100644 --- a/src/auth-pam.cpp +++ b/src/auth-pam.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2018 Tianjin KYLIN Information Technology Co., Ltd. + * Copyright (C) 2023, KylinSoft Co., Ltd. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/auth-pam.h b/src/auth-pam.h index 3fba36c..15998a4 100644 --- a/src/auth-pam.h +++ b/src/auth-pam.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2018 Tianjin KYLIN Information Technology Co., Ltd. + * Copyright (C) 2023, KylinSoft Co., Ltd. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/auth.h b/src/auth.h index b2f8193..65561cc 100644 --- a/src/auth.h +++ b/src/auth.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2018 Tianjin KYLIN Information Technology Co., Ltd. + * Copyright (C) 2023, KylinSoft Co., Ltd. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/authdialog.cpp b/src/authdialog.cpp index e68e6ed..df036d9 100644 --- a/src/authdialog.cpp +++ b/src/authdialog.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2018 Tianjin KYLIN Information Technology Co., Ltd. + * Copyright (C) 2023, KylinSoft Co., Ltd. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/authdialog.h b/src/authdialog.h index 9288545..4db7bdf 100644 --- a/src/authdialog.h +++ b/src/authdialog.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2018 Tianjin KYLIN Information Technology Co., Ltd. + * Copyright (C) 2023, KylinSoft Co., Ltd. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/batterywidget.cpp b/src/batterywidget.cpp index d0a1c72..efd1f69 100644 --- a/src/batterywidget.cpp +++ b/src/batterywidget.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2022 Tianjin KYLIN Information Technology Co., Ltd. + * Copyright (C) 2023, KylinSoft Co., Ltd. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/batterywidget.h b/src/batterywidget.h index acf9ac5..fc0847b 100644 --- a/src/batterywidget.h +++ b/src/batterywidget.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2022 Tianjin KYLIN Information Technology Co., Ltd. + * Copyright (C) 2023, KylinSoft Co., Ltd. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/common.h b/src/common.h index 95489cb..6abd844 100644 --- a/src/common.h +++ b/src/common.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2021 Tianjin KYLIN Information Technology Co., Ltd. + * Copyright (C) 2023, KylinSoft Co., Ltd. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/configuration.cpp b/src/configuration.cpp index 0e9198c..5eda310 100644 --- a/src/configuration.cpp +++ b/src/configuration.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2018 Tianjin KYLIN Information Technology Co., Ltd. + * Copyright (C) 2023, KylinSoft Co., Ltd. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/configuration.h b/src/configuration.h index 8bd81e8..097d59a 100644 --- a/src/configuration.h +++ b/src/configuration.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2018 Tianjin KYLIN Information Technology Co., Ltd. + * Copyright (C) 2023, KylinSoft Co., Ltd. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/device.cpp b/src/device.cpp index 007d30a..6a195b8 100644 --- a/src/device.cpp +++ b/src/device.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2021 Tianjin KYLIN Information Technology Co., Ltd. + * Copyright (C) 2023, KylinSoft Co., Ltd. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/device.h b/src/device.h index 73c8615..e1967f3 100644 --- a/src/device.h +++ b/src/device.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2021 Tianjin KYLIN Information Technology Co., Ltd. + * Copyright (C) 2023, KylinSoft Co., Ltd. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/digitalauthdialog.cpp b/src/digitalauthdialog.cpp index 6646352..b7e2ce6 100644 --- a/src/digitalauthdialog.cpp +++ b/src/digitalauthdialog.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2018 Tianjin KYLIN Information Technology Co., Ltd. + * Copyright (C) 2023, KylinSoft Co., Ltd. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/digitalauthdialog.h b/src/digitalauthdialog.h index 630f9be..e4ee7d3 100644 --- a/src/digitalauthdialog.h +++ b/src/digitalauthdialog.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2018 Tianjin KYLIN Information Technology Co., Ltd. + * Copyright (C) 2023, KylinSoft Co., Ltd. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/digitalkeyboard.cpp b/src/digitalkeyboard.cpp index 4597ad4..7aa5884 100644 --- a/src/digitalkeyboard.cpp +++ b/src/digitalkeyboard.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2021 Tianjin KYLIN Information Technology Co., Ltd. + * Copyright (C) 2023, KylinSoft Co., Ltd. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/digitalkeyboard.h b/src/digitalkeyboard.h index 4a386fe..0e8f98e 100644 --- a/src/digitalkeyboard.h +++ b/src/digitalkeyboard.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2018 Tianjin KYLIN Information Technology Co., Ltd. + * Copyright (C) 2023, KylinSoft Co., Ltd. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/displaymanager.cpp b/src/displaymanager.cpp index 65e9346..0c705e2 100644 --- a/src/displaymanager.cpp +++ b/src/displaymanager.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2018 Tianjin KYLIN Information Technology Co., Ltd. + * Copyright (C) 2023, KylinSoft Co., Ltd. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/displaymanager.h b/src/displaymanager.h index 741be7d..4467a5a 100644 --- a/src/displaymanager.h +++ b/src/displaymanager.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2018 Tianjin KYLIN Information Technology Co., Ltd. + * Copyright (C) 2023, KylinSoft Co., Ltd. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/eduplatforminterface.cpp b/src/eduplatforminterface.cpp index 6f3384c..fbe9b26 100644 --- a/src/eduplatforminterface.cpp +++ b/src/eduplatforminterface.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2021 Tianjin KYLIN Information Technology Co., Ltd. + * Copyright (C) 2023, KylinSoft Co., Ltd. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/eduplatforminterface.h b/src/eduplatforminterface.h index 0a93506..42326c0 100644 --- a/src/eduplatforminterface.h +++ b/src/eduplatforminterface.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2020 Tianjin KYLIN Information Technology Co., Ltd. + * Copyright (C) 2023, KylinSoft Co., Ltd. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/enginedevice.cpp b/src/enginedevice.cpp index f69c95e..9ceb480 100644 --- a/src/enginedevice.cpp +++ b/src/enginedevice.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2021 Tianjin KYLIN Information Technology Co., Ltd. + * Copyright (C) 2023, KylinSoft Co., Ltd. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/enginedevice.h b/src/enginedevice.h index c87bacc..fa9fd4d 100644 --- a/src/enginedevice.h +++ b/src/enginedevice.h @@ -1,5 +1,5 @@ /* - * Copyright 2021 KylinSoft Co., Ltd. + * 2023, KylinSoft Co., Ltd. * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/fullbackgroundwidget.cpp b/src/fullbackgroundwidget.cpp index f4124b0..0b164af 100644 --- a/src/fullbackgroundwidget.cpp +++ b/src/fullbackgroundwidget.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2018 Tianjin KYLIN Information Technology Co., Ltd. + * Copyright (C) 2023, KylinSoft Co., Ltd. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/fullbackgroundwidget.h b/src/fullbackgroundwidget.h index e960415..70c7b8f 100644 --- a/src/fullbackgroundwidget.h +++ b/src/fullbackgroundwidget.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2018 Tianjin KYLIN Information Technology Co., Ltd. + * Copyright (C) 2023, KylinSoft Co., Ltd. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/generalauthwidget.cpp b/src/generalauthwidget.cpp index eaa2efa..2a955fb 100644 --- a/src/generalauthwidget.cpp +++ b/src/generalauthwidget.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2018 Tianjin KYLIN Information Technology Co., Ltd. + * Copyright (C) 2023, KylinSoft Co., Ltd. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/generalauthwidget.h b/src/generalauthwidget.h index 47f2c57..10b6fad 100644 --- a/src/generalauthwidget.h +++ b/src/generalauthwidget.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2018 Tianjin KYLIN Information Technology Co., Ltd. + * Copyright (C) 2023, KylinSoft Co., Ltd. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -31,4 +31,4 @@ signals: public slots: }; -#endif // GENERALAUTHWIDGET_H \ No newline at end of file +#endif // GENERALAUTHWIDGET_H diff --git a/src/gestureauthdialog.cpp b/src/gestureauthdialog.cpp index ca657dc..34e81e3 100644 --- a/src/gestureauthdialog.cpp +++ b/src/gestureauthdialog.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2018 Tianjin KYLIN Information Technology Co., Ltd. + * Copyright (C) 2023, KylinSoft Co., Ltd. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/gestureauthdialog.h b/src/gestureauthdialog.h index ad32bc7..56fa3cc 100644 --- a/src/gestureauthdialog.h +++ b/src/gestureauthdialog.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2018 Tianjin KYLIN Information Technology Co., Ltd. + * Copyright (C) 2023, KylinSoft Co., Ltd. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/grab-x11.cpp b/src/grab-x11.cpp index 9182cab..ba74bd1 100644 --- a/src/grab-x11.cpp +++ b/src/grab-x11.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2018 Tianjin KYLIN Information Technology Co., Ltd. + * Copyright (C) 2023, KylinSoft Co., Ltd. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/grab-x11.h b/src/grab-x11.h index ea0457a..59f034f 100644 --- a/src/grab-x11.h +++ b/src/grab-x11.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2018 Tianjin KYLIN Information Technology Co., Ltd. + * Copyright (C) 2023, KylinSoft Co., Ltd. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/hoverwidget.cpp b/src/hoverwidget.cpp index 3c3b55e..75ad97d 100644 --- a/src/hoverwidget.cpp +++ b/src/hoverwidget.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2019 Tianjin KYLIN Information Technology Co., Ltd. + * Copyright (C) 2023, KylinSoft Co., Ltd. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/hoverwidget.h b/src/hoverwidget.h index 1fcf667..ae1cc7d 100644 --- a/src/hoverwidget.h +++ b/src/hoverwidget.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2019 Tianjin KYLIN Information Technology Co., Ltd. + * Copyright (C) 2023, KylinSoft Co., Ltd. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/iconedit.cpp b/src/iconedit.cpp index 3e573fd..e5667ac 100644 --- a/src/iconedit.cpp +++ b/src/iconedit.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2018 Tianjin KYLIN Information Technology Co., Ltd. + * Copyright (C) 2023, KylinSoft Co., Ltd. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/iconedit.h b/src/iconedit.h index f067a3e..2f30418 100644 --- a/src/iconedit.h +++ b/src/iconedit.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2018 Tianjin KYLIN Information Technology Co., Ltd. + * Copyright (C) 2023, KylinSoft Co., Ltd. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/imageutil.cpp b/src/imageutil.cpp index 11fe92f..90531d4 100644 --- a/src/imageutil.cpp +++ b/src/imageutil.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2019 Tianjin KYLIN Information Technology Co., Ltd. + * Copyright (C) 2023, KylinSoft Co., Ltd. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/imageutil.h b/src/imageutil.h index ae40c46..526d311 100644 --- a/src/imageutil.h +++ b/src/imageutil.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2019 Tianjin KYLIN Information Technology Co., Ltd. + * Copyright (C) 2023, KylinSoft Co., Ltd. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/interface.cpp b/src/interface.cpp index d188ebf..cc9a1de 100644 --- a/src/interface.cpp +++ b/src/interface.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2018 Tianjin KYLIN Information Technology Co., Ltd. + * Copyright (C) 2023, KylinSoft Co., Ltd. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/interface.h b/src/interface.h index 8b228ae..9dfb3ec 100644 --- a/src/interface.h +++ b/src/interface.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2018 Tianjin KYLIN Information Technology Co., Ltd. + * Copyright (C) 2023, KylinSoft Co., Ltd. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/klabel.cpp b/src/klabel.cpp index ad19dd3..7789e9c 100644 --- a/src/klabel.cpp +++ b/src/klabel.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2023 Tianjin KYLIN Information Technology Co., Ltd. + * Copyright (C) 2023, KylinSoft Co., Ltd. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/klabel.h b/src/klabel.h index c96b00b..29cd8fd 100644 --- a/src/klabel.h +++ b/src/klabel.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2023 Tianjin KYLIN Information Technology Co., Ltd. + * Copyright (C) 2023, KylinSoft Co., Ltd. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/libinputswitchevent.cpp b/src/libinputswitchevent.cpp index de3886f..ad8eb5d 100644 --- a/src/libinputswitchevent.cpp +++ b/src/libinputswitchevent.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2022 Tianjin KYLIN Information Technology Co., Ltd. + * Copyright (C) 2023, KylinSoft Co., Ltd. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/libinputswitchevent.h b/src/libinputswitchevent.h index 95ecbe3..7d04bb8 100644 --- a/src/libinputswitchevent.h +++ b/src/libinputswitchevent.h @@ -1,5 +1,5 @@ /* - * Copyright 2022 KylinSoft Co., Ltd. + * 2023, KylinSoft Co., Ltd. * * This program is free software: you can redistribute it and/or modify it under * the terms of the GNU General Public License as published by the Free Software diff --git a/src/lockchecker.cpp b/src/lockchecker.cpp index c0533cf..2492220 100644 --- a/src/lockchecker.cpp +++ b/src/lockchecker.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2021 Tianjin KYLIN Information Technology Co., Ltd. + * Copyright (C) 2023, KylinSoft Co., Ltd. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/lockchecker.h b/src/lockchecker.h index 6653850..a072ad1 100644 --- a/src/lockchecker.h +++ b/src/lockchecker.h @@ -1,5 +1,5 @@ /* - * Copyright (C) Copyright 2021 KylinSoft Co., Ltd. + * Copyright (C) 2023, KylinSoft Co., Ltd. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/lockwidget.cpp b/src/lockwidget.cpp index 9949706..acfa319 100644 --- a/src/lockwidget.cpp +++ b/src/lockwidget.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2018 Tianjin KYLIN Information Technology Co., Ltd. + * Copyright (C) 2023, KylinSoft Co., Ltd. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -801,15 +801,15 @@ void LockWidget::initUI() this, &LockWidget::showUserMenu); } //监听物理键盘插拔 - libswitch = new LibinputSwitchEvent; - isTableMode = libswitch->geInitDevicesStatus(); +// libswitch = new LibinputSwitchEvent; +// isTableMode = libswitch->geInitDevicesStatus(); // if(isTableMode && !(vKeyboard && vKeyboard->isVisible())) { // showVirtualKeyboard(); // } - connect(libswitch , &LibinputSwitchEvent::tabletModeStatusChanged, this, [ = ](int tablet_mode) { - isTableMode = tablet_mode; - qInfo()<<"TableMode:"<isVisible())) { +// connect(libswitch , &LibinputSwitchEvent::tabletModeStatusChanged, this, [ = ](int tablet_mode) { +// isTableMode = tablet_mode; +// qInfo()<<"TableMode:"<isVisible())) { // QTimer::singleShot(1000, this, [=]{ // if (this->isTableMode) { // showVirtualKeyboard(); @@ -818,20 +818,20 @@ void LockWidget::initUI() // }); // } // }); - } else if (!isTableMode && (tabAt == BOTTMBTN && horAT == KEYBOARDBTN) && (vKeyboard && vKeyboard->isVisible())) { - QTimer::singleShot(100, this, [=]{ - if (!this->isTableMode) { - hideBottomPlugins(); - } - }); - } - }); +// } else if (!isTableMode && (tabAt == BOTTMBTN && horAT == KEYBOARDBTN) && (vKeyboard && vKeyboard->isVisible())) { +// QTimer::singleShot(100, this, [=]{ +// if (!this->isTableMode) { +// hideBottomPlugins(); +// } +// }); +// } +// }); } void LockWidget::netInPutStatus() { - if(isTableMode && !(vKeyboard && vKeyboard->isVisible())) - showVirtualKeyboard(); +// if(isTableMode && !(vKeyboard && vKeyboard->isVisible())) +// showVirtualKeyboard(); } void LockWidget::showVirtualKeyboard() @@ -1180,10 +1180,10 @@ void LockWidget::onClickPassword() setCheckedSheet(SWITCHBTN, false); at_plugins = false; } - if(isTableMode) { +// if(isTableMode) { if(!(vKeyboard && vKeyboard->isVisible())) showVirtualKeyboard(); - } +// } // if(vKeyboard && vKeyboard->isVisible()) { // vKeyboard->hide(); // at_plugins = false; @@ -1878,9 +1878,9 @@ bool LockWidget::exitSubWidget() if(!authDialog->getLineeditStatus()) { tabAt = LINEEDIT; authDialog->setFocusin(IN_LINEEDIT); - if(isTableMode && !(vKeyboard && vKeyboard->isVisible())) { - showVirtualKeyboard(); - } +// if(isTableMode && !(vKeyboard && vKeyboard->isVisible())) { +// showVirtualKeyboard(); +// } } else { tabAt = MESSAGEBTN; authDialog->setFocusin(ON_MESSAGEBTN); diff --git a/src/lockwidget.h b/src/lockwidget.h index 47f8b28..49d3ba7 100644 --- a/src/lockwidget.h +++ b/src/lockwidget.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2018 Tianjin KYLIN Information Technology Co., Ltd. + * Copyright (C) 2023, KylinSoft Co., Ltd. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -34,7 +34,7 @@ #include "lockchecker.h" #include "xeventmonitor.h" #include "batterywidget.h" -#include "libinputswitchevent.h" +//#include "libinputswitchevent.h" namespace Ui { class LockWidget; @@ -205,7 +205,7 @@ private: // 监听键盘插拔 - LibinputSwitchEvent *libswitch = nullptr; +// LibinputSwitchEvent *libswitch = nullptr; bool isTableMode = false; bool m_isShowKeyboard = false; // 打开电源管理界面前虚拟键盘是否已打开 diff --git a/src/logind.cpp b/src/logind.cpp index e8817ac..7ecd7a3 100644 --- a/src/logind.cpp +++ b/src/logind.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2020 Tianjin KYLIN Information Technology Co., Ltd. + * Copyright (C) 2023, KylinSoft Co., Ltd. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/logind.h b/src/logind.h index 155c1ef..b06a11f 100644 --- a/src/logind.h +++ b/src/logind.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2020 Tianjin KYLIN Information Technology Co., Ltd. + * Copyright (C) 2023, KylinSoft Co., Ltd. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/loginedusers.cpp b/src/loginedusers.cpp index bd4d247..e9e40be 100644 --- a/src/loginedusers.cpp +++ b/src/loginedusers.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2019 Tianjin KYLIN Information Technology Co., Ltd. + * Copyright (C) 2023, KylinSoft Co., Ltd. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/loginedusers.h b/src/loginedusers.h index de1b175..f0a82d4 100644 --- a/src/loginedusers.h +++ b/src/loginedusers.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2019 Tianjin KYLIN Information Technology Co., Ltd. + * Copyright (C) 2023, KylinSoft Co., Ltd. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/loginoptionswidget.cpp b/src/loginoptionswidget.cpp index f2f1b95..fa0f0f2 100644 --- a/src/loginoptionswidget.cpp +++ b/src/loginoptionswidget.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2022 Tianjin KYLIN Information Technology Co., Ltd. + * Copyright (C) 2023, KylinSoft Co., Ltd. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/loginoptionswidget.h b/src/loginoptionswidget.h index 8c197fa..ccae5bd 100644 --- a/src/loginoptionswidget.h +++ b/src/loginoptionswidget.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2022 Tianjin KYLIN Information Technology Co., Ltd. + * Copyright (C) 2023, KylinSoft Co., Ltd. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/machinemodel.cpp b/src/machinemodel.cpp index 957da65..5e25927 100644 --- a/src/machinemodel.cpp +++ b/src/machinemodel.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2023 Tianjin KYLIN Information Technology Co., Ltd. + * Copyright (C) 2023, KylinSoft Co., Ltd. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/machinemodel.h b/src/machinemodel.h index 7b49b64..a6dc584 100644 --- a/src/machinemodel.h +++ b/src/machinemodel.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2023 Tianjin KYLIN Information Technology Co., Ltd. + * Copyright (C) 2023, KylinSoft Co., Ltd. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/modebutton.cpp b/src/modebutton.cpp index 3b8bb26..651f59e 100644 --- a/src/modebutton.cpp +++ b/src/modebutton.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2023 Tianjin KYLIN Information Technology Co., Ltd. + * Copyright (C) 2023, KylinSoft Co., Ltd. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/modebutton.h b/src/modebutton.h index dc7944c..c5b5e69 100644 --- a/src/modebutton.h +++ b/src/modebutton.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2023 Tianjin KYLIN Information Technology Co., Ltd. + * Copyright (C) 2023, KylinSoft Co., Ltd. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/monitorwatcher.cpp b/src/monitorwatcher.cpp index 60009ec..efec7cc 100644 --- a/src/monitorwatcher.cpp +++ b/src/monitorwatcher.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2018 Tianjin KYLIN Information Technology Co., Ltd. + * Copyright (C) 2023, KylinSoft Co., Ltd. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/monitorwatcher.h b/src/monitorwatcher.h index 0f10599..c13f696 100644 --- a/src/monitorwatcher.h +++ b/src/monitorwatcher.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2018 Tianjin KYLIN Information Technology Co., Ltd. + * Copyright (C) 2023, KylinSoft Co., Ltd. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/mytabwidget.cpp b/src/mytabwidget.cpp index dcc2e20..4f5ab47 100644 --- a/src/mytabwidget.cpp +++ b/src/mytabwidget.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2021 Tianjin KYLIN Information Technology Co., Ltd. + * Copyright (C) 2023, KylinSoft Co., Ltd. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/mytabwidget.h b/src/mytabwidget.h index 732d44d..5921dc9 100644 --- a/src/mytabwidget.h +++ b/src/mytabwidget.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2021 Tianjin KYLIN Information Technology Co., Ltd. + * Copyright (C) 2023, KylinSoft Co., Ltd. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/networkwatcher.cpp b/src/networkwatcher.cpp index 3c57a49..c8372a8 100644 --- a/src/networkwatcher.cpp +++ b/src/networkwatcher.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2021 Tianjin KYLIN Information Technology Co., Ltd. + * Copyright (C) 2023, KylinSoft Co., Ltd. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/networkwatcher.h b/src/networkwatcher.h index a388266..840fc50 100644 --- a/src/networkwatcher.h +++ b/src/networkwatcher.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2021 Tianjin KYLIN Information Technology Co., Ltd. + * Copyright (C) 2023, KylinSoft Co., Ltd. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/pam-tally.c b/src/pam-tally.c index ff0642c..fe5a15a 100644 --- a/src/pam-tally.c +++ b/src/pam-tally.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2018 Tianjin KYLIN Information Technology Co., Ltd. + * Copyright (C) 2023, KylinSoft Co., Ltd. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/pam-tally.cpp b/src/pam-tally.cpp index ba82fec..8ae03ef 100644 --- a/src/pam-tally.cpp +++ b/src/pam-tally.cpp @@ -1,9 +1,9 @@ /* - * Copyright (C) 2018 Tianjin KYLIN Information Technology Co., Ltd. + * Copyright (C) 2023, KylinSoft Co., Ltd. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2, or (at your option) + * the Free Software Foundation; either version 3, or (at your option) * any later version. * * This program is distributed in the hope that it will be useful, @@ -12,9 +12,8 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA - * 02110-1301, USA. + * along with this program; if not, see . + * **/ #include "pam-tally.h" #include diff --git a/src/pam-tally.h b/src/pam-tally.h index bc93826..6d69616 100644 --- a/src/pam-tally.h +++ b/src/pam-tally.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2018 Tianjin KYLIN Information Technology Co., Ltd. + * Copyright (C) 2023, KylinSoft Co., Ltd. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/pam.cpp b/src/pam.cpp index ca1c126..071e4f1 100644 --- a/src/pam.cpp +++ b/src/pam.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2018 Tianjin KYLIN Information Technology Co., Ltd. + * Copyright (C) 2023, KylinSoft Co., Ltd. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/pam.h b/src/pam.h index 317098d..6ae8bb3 100644 --- a/src/pam.h +++ b/src/pam.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2018 Tianjin KYLIN Information Technology Co., Ltd. + * Copyright (C) 2023, KylinSoft Co., Ltd. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/permissioncheck.h b/src/permissioncheck.h index 3af7e9c..1b52a29 100644 --- a/src/permissioncheck.h +++ b/src/permissioncheck.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2021 Tianjin KYLIN Information Technology Co., Ltd. + * Copyright (C) 2023, KylinSoft Co., Ltd. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/powermanager.cpp b/src/powermanager.cpp index 5b9ba34..f3a75fc 100644 --- a/src/powermanager.cpp +++ b/src/powermanager.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2018 Tianjin KYLIN Information Technology Co., Ltd. + * Copyright (C) 2023, KylinSoft Co., Ltd. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/powermanager.h b/src/powermanager.h index 7199568..f0f437f 100644 --- a/src/powermanager.h +++ b/src/powermanager.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2018 Tianjin KYLIN Information Technology Co., Ltd. + * Copyright (C) 2023, KylinSoft Co., Ltd. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/rootWindowBackground.cpp b/src/rootWindowBackground.cpp index eb3d534..71ed259 100644 --- a/src/rootWindowBackground.cpp +++ b/src/rootWindowBackground.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2018 Tianjin KYLIN Information Technology Co., Ltd. + * Copyright (C) 2023, KylinSoft Co., Ltd. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/rootWindowBackground.h b/src/rootWindowBackground.h index 5cd0860..40d4940 100644 --- a/src/rootWindowBackground.h +++ b/src/rootWindowBackground.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2018 Tianjin KYLIN Information Technology Co., Ltd. + * Copyright (C) 2023, KylinSoft Co., Ltd. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/screensavermode.cpp b/src/screensavermode.cpp index 37eab3c..cc8c16d 100644 --- a/src/screensavermode.cpp +++ b/src/screensavermode.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2018 Tianjin KYLIN Information Technology Co., Ltd. + * Copyright (C) 2023, KylinSoft Co., Ltd. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/screensavermode.h b/src/screensavermode.h index 51c738e..4927c56 100644 --- a/src/screensavermode.h +++ b/src/screensavermode.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2018 Tianjin KYLIN Information Technology Co., Ltd. + * Copyright (C) 2023, KylinSoft Co., Ltd. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/screensaverwidget.cpp b/src/screensaverwidget.cpp index 36bd944..18a952d 100644 --- a/src/screensaverwidget.cpp +++ b/src/screensaverwidget.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2018 Tianjin KYLIN Information Technology Co., Ltd. + * Copyright (C) 2023, KylinSoft Co., Ltd. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/screensaverwidget.h b/src/screensaverwidget.h index 7099cba..c9d8318 100644 --- a/src/screensaverwidget.h +++ b/src/screensaverwidget.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2018 Tianjin KYLIN Information Technology Co., Ltd. + * Copyright (C) 2023, KylinSoft Co., Ltd. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/screensaverwndadaptor.cpp b/src/screensaverwndadaptor.cpp index 8d4b9a5..0d3cc94 100644 --- a/src/screensaverwndadaptor.cpp +++ b/src/screensaverwndadaptor.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2022 Tianjin KYLIN Information Technology Co., Ltd. + * Copyright (C) 2023, KylinSoft Co., Ltd. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/screensaverwndadaptor.h b/src/screensaverwndadaptor.h index 77c3dde..9c83702 100644 --- a/src/screensaverwndadaptor.h +++ b/src/screensaverwndadaptor.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2022 Tianjin KYLIN Information Technology Co., Ltd. + * Copyright (C) 2023, KylinSoft Co., Ltd. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/servicemanager.cpp b/src/servicemanager.cpp index 427678e..017f52a 100644 --- a/src/servicemanager.cpp +++ b/src/servicemanager.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2018 Tianjin KYLIN Information Technology Co., Ltd. + * Copyright (C) 2023, KylinSoft Co., Ltd. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/servicemanager.h b/src/servicemanager.h index 548cf1d..ff9b2be 100644 --- a/src/servicemanager.h +++ b/src/servicemanager.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2018 Tianjin KYLIN Information Technology Co., Ltd. + * Copyright (C) 2023, KylinSoft Co., Ltd. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/sessionwatcher.cpp b/src/sessionwatcher.cpp index be05ab5..6fb3acc 100644 --- a/src/sessionwatcher.cpp +++ b/src/sessionwatcher.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2018 Tianjin KYLIN Information Technology Co., Ltd. + * Copyright (C) 2023, KylinSoft Co., Ltd. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/sessionwatcher.h b/src/sessionwatcher.h index 2c4a56d..728b181 100644 --- a/src/sessionwatcher.h +++ b/src/sessionwatcher.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2018 Tianjin KYLIN Information Technology Co., Ltd. + * Copyright (C) 2023, KylinSoft Co., Ltd. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/surewindow.cpp b/src/surewindow.cpp index ee7e4eb..3d16432 100644 --- a/src/surewindow.cpp +++ b/src/surewindow.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2022 Tianjin KYLIN Information Technology Co., Ltd. + * Copyright (C) 2023, KylinSoft Co., Ltd. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/surewindow.h b/src/surewindow.h index 7d49b31..f8ecec8 100644 --- a/src/surewindow.h +++ b/src/surewindow.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2022 Tianjin KYLIN Information Technology Co., Ltd. + * Copyright (C) 2023, KylinSoft Co., Ltd. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/switchbuttongroup.cpp b/src/switchbuttongroup.cpp index dcb085d..8c4204e 100644 --- a/src/switchbuttongroup.cpp +++ b/src/switchbuttongroup.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2018 Tianjin KYLIN Information Technology Co., Ltd. + * Copyright (C) 2023, KylinSoft Co., Ltd. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/switchbuttongroup.h b/src/switchbuttongroup.h index 1a2ace7..5218568 100644 --- a/src/switchbuttongroup.h +++ b/src/switchbuttongroup.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2018 Tianjin KYLIN Information Technology Co., Ltd. + * Copyright (C) 2023, KylinSoft Co., Ltd. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/tabletlockwidget.cpp b/src/tabletlockwidget.cpp index 9a18136..c585c53 100644 --- a/src/tabletlockwidget.cpp +++ b/src/tabletlockwidget.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2018 Tianjin KYLIN Information Technology Co., Ltd. + * Copyright (C) 2023, KylinSoft Co., Ltd. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/tabletlockwidget.h b/src/tabletlockwidget.h index 8acf3b7..1a53a93 100644 --- a/src/tabletlockwidget.h +++ b/src/tabletlockwidget.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2018 Tianjin KYLIN Information Technology Co., Ltd. + * Copyright (C) 2023, KylinSoft Co., Ltd. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/test-accounts.cpp b/src/test-accounts.cpp index 4da700b..dbe4b7c 100644 --- a/src/test-accounts.cpp +++ b/src/test-accounts.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2018 Tianjin KYLIN Information Technology Co., Ltd. + * Copyright (C) 2023, KylinSoft Co., Ltd. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/types.h b/src/types.h index 7153a28..a86db5d 100644 --- a/src/types.h +++ b/src/types.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2018 Tianjin KYLIN Information Technology Co., Ltd. + * Copyright (C) 2023, KylinSoft Co., Ltd. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/ukui-screensaver-backend.cpp b/src/ukui-screensaver-backend.cpp index 87ca85d..867f4b2 100644 --- a/src/ukui-screensaver-backend.cpp +++ b/src/ukui-screensaver-backend.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2018 Tianjin KYLIN Information Technology Co., Ltd. + * Copyright (C) 2023, KylinSoft Co., Ltd. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/ukui-screensaver-checkpass.cpp b/src/ukui-screensaver-checkpass.cpp index 165259d..eaca64a 100644 --- a/src/ukui-screensaver-checkpass.cpp +++ b/src/ukui-screensaver-checkpass.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2018 Tianjin KYLIN Information Technology Co., Ltd. + * Copyright (C) 2023, KylinSoft Co., Ltd. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/ukui-screensaver-command.cpp b/src/ukui-screensaver-command.cpp index c18808c..590d2da 100644 --- a/src/ukui-screensaver-command.cpp +++ b/src/ukui-screensaver-command.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2018 Tianjin KYLIN Information Technology Co., Ltd. + * Copyright (C) 2023, KylinSoft Co., Ltd. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/ukui-screensaver-dialog.cpp b/src/ukui-screensaver-dialog.cpp index 009fd8b..686b925 100644 --- a/src/ukui-screensaver-dialog.cpp +++ b/src/ukui-screensaver-dialog.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2018 Tianjin KYLIN Information Technology Co., Ltd. + * Copyright (C) 2023, KylinSoft Co., Ltd. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/unixsignallistener.cpp b/src/unixsignallistener.cpp index 6cb1583..44473b7 100644 --- a/src/unixsignallistener.cpp +++ b/src/unixsignallistener.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2018 Tianjin KYLIN Information Technology Co., Ltd. + * Copyright (C) 2023, KylinSoft Co., Ltd. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/unixsignallistener.h b/src/unixsignallistener.h index 2a1da96..d56bbbb 100644 --- a/src/unixsignallistener.h +++ b/src/unixsignallistener.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2018 Tianjin KYLIN Information Technology Co., Ltd. + * Copyright (C) 2023, KylinSoft Co., Ltd. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/users.cpp b/src/users.cpp index 1e4a305..07ad745 100644 --- a/src/users.cpp +++ b/src/users.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2018 Tianjin KYLIN Information Technology Co., Ltd. + * Copyright (C) 2023, KylinSoft Co., Ltd. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/users.h b/src/users.h index d43a01d..2c2effa 100644 --- a/src/users.h +++ b/src/users.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2018 Tianjin KYLIN Information Technology Co., Ltd. + * Copyright (C) 2023, KylinSoft Co., Ltd. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/utils.cpp b/src/utils.cpp index dc5e9bc..a379b98 100644 --- a/src/utils.cpp +++ b/src/utils.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2018 Tianjin KYLIN Information Technology Co., Ltd. + * Copyright (C) 2023, KylinSoft Co., Ltd. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/utils.h b/src/utils.h index b00b483..8f84329 100644 --- a/src/utils.h +++ b/src/utils.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2022 Tianjin KYLIN Information Technology Co., Ltd. + * Copyright (C) 2023, KylinSoft Co., Ltd. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/verificationwidget.cpp b/src/verificationwidget.cpp index 9acb3e4..bea431b 100644 --- a/src/verificationwidget.cpp +++ b/src/verificationwidget.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2020 Tianjin KYLIN Information Technology Co., Ltd. + * Copyright (C) 2023, KylinSoft Co., Ltd. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/verificationwidget.h b/src/verificationwidget.h index 973017e..1b71cf7 100644 --- a/src/verificationwidget.h +++ b/src/verificationwidget.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2020 Tianjin KYLIN Information Technology Co., Ltd. + * Copyright (C) 2023, KylinSoft Co., Ltd. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/verticalVerificationwidget.cpp b/src/verticalVerificationwidget.cpp index e848a45..7309701 100644 --- a/src/verticalVerificationwidget.cpp +++ b/src/verticalVerificationwidget.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2020 Tianjin KYLIN Information Technology Co., Ltd. + * Copyright (C) 2023, KylinSoft Co., Ltd. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/verticalVerificationwidget.h b/src/verticalVerificationwidget.h index 26a94d4..ba45ac1 100644 --- a/src/verticalVerificationwidget.h +++ b/src/verticalVerificationwidget.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2020 Tianjin KYLIN Information Technology Co., Ltd. + * Copyright (C) 2023, KylinSoft Co., Ltd. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/weathermanager.cpp b/src/weathermanager.cpp index 506b34c..132ad4d 100644 --- a/src/weathermanager.cpp +++ b/src/weathermanager.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2020 Tianjin KYLIN Information Technology Co., Ltd. + * Copyright (C) 2023, KylinSoft Co., Ltd. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/weathermanager.h b/src/weathermanager.h index 3f29c40..f609234 100644 --- a/src/weathermanager.h +++ b/src/weathermanager.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2020 Tianjin KYLIN Information Technology Co., Ltd. + * Copyright (C) 2023, KylinSoft Co., Ltd. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/wechatauthdialog.cpp b/src/wechatauthdialog.cpp index 8deb3ed..34122ab 100644 --- a/src/wechatauthdialog.cpp +++ b/src/wechatauthdialog.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2018 Tianjin KYLIN Information Technology Co., Ltd. + * Copyright (C) 2023, KylinSoft Co., Ltd. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/wechatauthdialog.h b/src/wechatauthdialog.h index 57b183a..a68526b 100644 --- a/src/wechatauthdialog.h +++ b/src/wechatauthdialog.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2018 Tianjin KYLIN Information Technology Co., Ltd. + * Copyright (C) 2023, KylinSoft Co., Ltd. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/xeventmonitor.cpp b/src/xeventmonitor.cpp index 9eca744..e527b19 100644 --- a/src/xeventmonitor.cpp +++ b/src/xeventmonitor.cpp @@ -3,7 +3,7 @@ * * Copyright (C) 2011 ~ 2017 Deepin, Inc. * 2011 ~ 2017 Wang Yong - * Copyright (C) 2018 Tianjin KYLIN Information Technology Co., Ltd. + 2023, KylinSoft Co., Ltd. * * Author: Wang Yong * Maintainer: Wang Yong diff --git a/src/xeventmonitor.h b/src/xeventmonitor.h index b30099d..4449fc7 100644 --- a/src/xeventmonitor.h +++ b/src/xeventmonitor.h @@ -3,7 +3,7 @@ * * Copyright (C) 2011 ~ 2017 Deepin, Inc. * 2011 ~ 2017 Wang Yong - * Copyright (C) 2018 Tianjin KYLIN Information Technology Co., Ltd. + 2023, KylinSoft Co., Ltd. * * Author: Wang Yong * Maintainer: Wang Yong