openkylin
/
ukui-screensaver
mirror of https://gitee.com/openkylin/ukui-screensaver.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

!44 增加登录配置同步V11修改 

Merge pull request !44 from 杨敏/openkylin/nile-dev
This commit is contained in:
杨敏 2023-11-16 07:03:12 +00:00 committed by Gitee
parent 8628f076fc fdd348c96d
commit 06ccdbcfa1
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F
9 changed files with 159 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
data/desktop/kwin.desktop Executable file
View File

@ -0,0 +1,14 @@
[Desktop Entry]
Type=Application
Name=KWin
Exec=kwin_x11 --replace
NoDisplay=true
# name of loadable control center module
X-UKUI-WMSettingsModule=kwin
# name we put on the WM spec check window
X-UKUI-WMName=KWin
# back compat only
X-UKUI-Autostart-Phase=WindowManager
X-UKUI-Provides=windowmanager
X-UKUI-Autostart-Notify=true
X-Ubuntu-Gettext-Domain=kwin

20
data/desktop/ukui-kglobal.desktop Executable file
View File

@ -0,0 +1,20 @@
[Desktop Entry]
Type=Application
Name=Screensaver
Name[tr]=Ekran Koruyucu
Name[zh_CN]=屏幕保护程序
Name[zh_HK]=螢幕保護程式
Name[zh_TW]=螢幕保護程式
Comment[tr]=Ekran koruyucuyu çalıştır ve programı kilitler
Comment[zh_CN]=运行屏幕保护及锁定程序
Comment[zh_TW]=啟動螢幕保護程式以及鎖定程式
Exec=kglobalaccel5
NoDisplay=true
X-UKUI-Autostart-Phase=Application
X-UKUI-Autostart-Notify=true
X-UKUI-Bugzilla-Bugzilla=UKUI
X-UKUI-Bugzilla-Product=ukui-screensaver
X-UKUI-Bugzilla-Component=general
X-UKUI-Bugzilla-Version=1.0.0
OnlyShowIn=UKUI
X-UKUI-AutoRestart=true

21
data/desktop/ukui-screensaver.desktop Executable file
View File

@ -0,0 +1,21 @@
[Desktop Entry]
Type=Application
Name=Screensaver
Name[tr]=Ekran Koruyucu
Name[zh_CN]=屏幕保护程序
Name[zh_HK]=螢幕保護程式
Name[zh_TW]=螢幕保護程式
Comment[tr]=Ekran koruyucuyu çalıştır ve programı kilitler
Comment[zh_CN]=运行屏幕保护及锁定程序
Comment[zh_TW]=啟動螢幕保護程式以及鎖定程式
Exec=ukui-screensaver-backend --lock-startup
#Exec=mate-terminal
NoDisplay=true
X-UKUI-Autostart-Phase=Application
X-UKUI-Autostart-Notify=true
X-UKUI-Bugzilla-Bugzilla=UKUI
X-UKUI-Bugzilla-Product=ukui-screensaver
X-UKUI-Bugzilla-Component=general
X-UKUI-Bugzilla-Version=1.0.0
OnlyShowIn=UKUI
X-UKUI-AutoRestart=true

74
data/desktop/ukui-settings-daemon.desktop Executable file
View File

@ -0,0 +1,74 @@
[Desktop Entry]
Type=Application
Name=UKUI Settings Daemon
Name[am]=የ ሜት ማሰናጃ ረዳት
Name[ar]=محثّ إعدادات متّة
Name[as]=UKUI Settings ডেমন
Name[ast]=Degorriu d'axustes de UKUI
Name[be]=Дэман настáўленняў UKUI
Name[bg]=Сървър за настройките на UKUI
Name[bn]=UKUI Settings ডেমন
Name[bn_IN]=UKUI Settings ডেমন
Name[ca]=Dimoni dels ajusts de UKUI
Name[ca@valencia]=Dimoni de paràmetres del UKUI
Name[cmn]=UKUI 設定值守護程式
Name[crh]=UKUI Ayarları Cını
Name[cs]=Démon nastavení UKUI
Name[da]=UKUI-indstillingsdæmon
Name[de]=UKUI-Einstellungsdienst
Name[el]=Δαίμονας ρυθμίσεων UKUI
Name[en_AU]=UKUI Settings Daemon
Name[en_GB]=UKUI Settings Daemon
Name[es]=Administrador de preferencias de UKUI
Name[et]=UKUI sätetedeemon
Name[eu]=UKUIren ezarpenen daemon-a
Name[fi]=Maten asetuspalvelin
Name[fr]=Service des paramètres UKUI
Name[ga]=Deamhan Socruithe UKUI
Name[gl]=Servizo de configuracións do UKUI
Name[gu]=UKUI સુયોજનો ડેઇમન
Name[he]=מנוע ההגדרות של UKUI
Name[hi]=गनोम सेटिंग डेमॉन
Name[hu]=UKUI beállításdémon
Name[hy]=UKUI Կարգաբերման պարամետրերի օժանդակ ծրագիր
Name[id]=Daemon Penataan UKUI
Name[it]=Demone di impostazioni per UKUI
Name[ja]=UKUI 設定デーモン
Name[kn]=UKUI ಸಂಯೋಜನೆಗಳ ಡೀಮನ್(Daemon)
Name[ko]=마테 설정 데몬
Name[lt]=UKUI nustatymų tarnyba
Name[lv]=UKUI iestatījumu dēmons
Name[mk]=Демонот за поставувања на UKUI
Name[ml]=ഗ്നോമിലെ സജ്ജീകരണങ്ങളുടെ നിരന്തരപ്രവൃത്തി
Name[mr]=UKUI संयोजना डीमन
Name[ms]=Daemon Tetapan UKUI
Name[nb]=UKUI oppsettstjenestenisse
Name[nl]=Mate-instellingenvoorziening
Name[nn]=UKUI innstillingsnisse
Name[or]=UKUI ବିନ୍ୟାସ ଡେମନ
Name[pa]=ਗਨੋਮ ਸੈਟਿੰਗ ਡੈਮਨ
Name[pl]=Usługa ustawień środowiska UKUI
Name[pt]=Servidor de Definições UKUI
Name[pt_BR]=Daemon de configurações do UKUI
Name[ro]=Serviciul de configurări UKUI
Name[ru]=Демон параметров UKUI
Name[sk]=Démon nastavení UKUI
Name[sl]=Ozadnji program nastavitev UKUI
Name[sr]=Мејтов услужник подешавања
Name[sr@latin]=Uslužni program za podešavanje Gnoma
Name[sv]=UKUI-inställningsdemon
Name[ta]=UKUI அமைவுகள் கிங்கரன்
Name[te]=UKUI అమర్పుల డెమోన్
Name[th]=ดีมอนค่าตั้ง UKUI
Name[tr]=UKUI Ayarlar Servisi
Name[uk]=Служба параметрів UKUI
Name[ur]=میٹ ترتیبات ڈیمن
Name[vi]=Trình nền Thiết lập UKUI
Name[zh_CN]=UKUI 设置守护程序
Name[zh_HK]=UKUI 設定值伺服程式
Name[zh_TW]=UKUI 設定值守護程式
Exec=/usr/bin/ukui-settings-daemon
OnlyShowIn=UKUI;
X-UKUI-Autostart-Phase=Initialization
X-UKUI-Autostart-Notify=true
X-UKUI-AutoRestart=true

2
data/ukui-greeter/ukui-greeter.desktop
View File

@ -1,6 +1,6 @@
[Desktop Entry]
Name=UKUI Greeter
Comment=UKUI Greeter
Exec=ukui-greeter
Exec=ukui-session simpleDesk
Type=Application
X-Ubuntu-Gettext-Domain=ukui-greeter

7
debian/ukui-screensaver.install vendored
View File

@ -1,3 +1,8 @@
data/ukui-greeter/95-ukui-greeter.conf /usr/share/lightdm/lightdm.conf.d/
data/ukui-greeter/lightdm-session-setup.sh /usr/lib/lightdm/
data/ukui-greeter/ukui-greeter.desktop /usr/share/xgreeters/
data/ukui-greeter/ukui-greeter.desktop /usr/share/xgreeters/
data/desktop/kwin.desktop /usr/share/ukui/ukui-session-manager/simpledesk/
data/desktop/ukui-screensaver.desktop /usr/share/ukui/ukui-session-manager/simpledesk/
data/desktop/ukui-kglobal.desktop /usr/share/ukui/ukui-session-manager/simpledesk/
data/desktop/ukui-settings-daemon.desktop /usr/share/ukui/ukui-session-manager/simpledesk/

2
debian/ukui-screensaver.preinst vendored
View File

@ -10,7 +10,7 @@ path_sh="/usr/lib/lightdm/lightdm-session-setup.sh "
dpkg-divert --package ukui-screensaver --rename --divert "$path_sh"".old" --add $path_sh
path_desktop="/usr/share/xgreeters/ukui-greeter.desktop"
dpkg-divert --package ukui-screensaver --rename --divert "$path_desktop"".old" --add $path_desktop
mkdir -p /usr/share/ukui/ukui-session-manager/simpledesk
#remove_greeter(){
# dpkg -P ukui-greeter
#}

2
src/dbusifs/kglobalaccelhelper.cpp
View File

@ -5,7 +5,7 @@
#include <QDBusInterface>
#include <QDBusConnectionInterface>
const static QString kglobalService = QStringLiteral("org.ukui.KWin");
const static QString kglobalService = QStringLiteral("org.kde.kglobalaccel");
const static QString kglobalPath = QStringLiteral("/kglobalaccel");
const static QString kglobalInterface = QStringLiteral("org.kde.KGlobalAccel");

25
src/widgets/authdialog.cpp
View File

@ -211,8 +211,15 @@ void AuthDialog::initHeaderWidget()
// 人脸识别重试
m_fRetryButton = new QPushButton(m_headerWidget);
m_fRetryButton->setFocusPolicy(Qt::NoFocus);
// connect(m_fRetryButton,&QPushButton::clicked,
// this,&AuthDialog::onFRetryButtonClicked);
m_fRetryButton->setStyleSheet(QString("QPushButton{border-radius: %1px; border:0px solid white;background-color: rgba(255,255,255,10%);}"
"QPushButton::hover{background-color: rgb(255,255,255,30%);}"
"QPushButton::pressed {background-color: rgba(255,255,255,40%);}").arg((int)(77*scale)));
QPixmap retryIcon = QIcon::fromTheme("view-refresh-symbolic").pixmap(48, 48);
m_fRetryButton->setIcon(drawSymbolicColoredPixmap(retryIcon, "white"));
m_fRetryButton->setIconSize(QSize(48, 48));
connect(m_fRetryButton,&QPushButton::clicked,
this,&AuthDialog::onFRetryButtonClicked);
m_fRetryButton->hide();
headerLayout->addWidget(m_fRetryButton);
@ -335,12 +342,19 @@ void AuthDialog::updateUI()
m_labelHeadImg->setPixmap(userIcon);
m_nameLabel->setText(m_curUserInfo.fullName());
m_fRetryButton->setStyleSheet(QString("QPushButton{border-radius: %1px; border:0px solid white;background-color: rgba(255,255,255,10%);}"
"QPushButton::hover{background-color: rgb(255,255,255,30%);}"
"QPushButton::pressed {background-color: rgba(255,255,255,40%);}").arg((int)(77*scale)));
m_fRetryButton->setFixedSize(154*scale, 154*scale);
m_fRetryButton->setIconSize(QSize(48*scale, 48*scale));
}
void AuthDialog::startLoadingUkey()
{
//isLoadingUkey = true;
m_ukeyLoadingWidget->show();
if (m_ukeyLoadingWidget)
m_ukeyLoadingWidget->show();
m_ukeyPasswordEdit->hide();
m_ukeyMessageLabel->hide();
if(!m_loadingTimer)
@ -1616,7 +1630,10 @@ void AuthDialog::onDeviceChanged(unsigned uCurLoginOptType, const DeviceInfoPtr
authMode = BIOMETRIC;
m_deviceInfo = deviceInfo;
switchLoginOptType(uCurLoginOptType);
if (uCurLoginOptType == LOGINOPT_TYPE_FACE)
switchLoginOptType(uCurLoginOptType, true);
else
switchLoginOptType(uCurLoginOptType);
if(!isBioSuccess && deviceInfo)
startBioAuth();
}