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

fix(同步主线最新代码): 同步主线最新代码 

Description: 无

Log: 无
This commit is contained in:
liudun 2023-04-27 11:36:44 +08:00
parent 6f21587497
commit 0f1227ab2d
9 changed files with 2328 additions and 2343 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
biometric-manager/i18n_ts/zh_CN.ts
View File

@ -825,7 +825,7 @@ p, li { white-space: pre-wrap; }
<message>
<location filename="../src/inputdialog.cpp" line="54"/>
<source>Duplicate feature name</source>
<translation>特征名称重复</translation>
<translation>特征名重复</translation>
</message>
<message>
<location filename="../src/inputdialog.cpp" line="56"/>
@ -835,7 +835,7 @@ p, li { white-space: pre-wrap; }
<message>
<location filename="../src/inputdialog.cpp" line="58"/>
<source>Empty feature name</source>
<translation>空的特征名称</translation>
<translation>名称不能为空</translation>
</message>
</context>
<context>
@ -1269,7 +1269,12 @@ p, li { white-space: pre-wrap; }
<translation>选择设备类型</translation>
</message>
<message>
<location filename="../src/mainwindow.cpp" line="568"/>
<location filename="../src/mainwindow.cpp" line="358"/>
<source>Close</source>
<translation>关闭</translation>
</message>
<message>
<location filename="../src/mainwindow.cpp" line="483"/>
<source>Restart Service</source>
<translation>重启服务</translation>
</message>

33
biometric-manager/src/mainwindow.cpp
View File

@ -79,8 +79,6 @@ MainWindow::MainWindow(QString usernameFromCmd, QWidget *parent) :
ui->setupUi(this);
this->setCentralWidget(ui->centralWidget);// 设置centralWidget，不然设置主窗口布局会有问题
prettify();
initialize();
@ -117,6 +115,7 @@ MainWindow::MainWindow(QString usernameFromCmd, QWidget *parent) :
m_curStyle = m_styleSettings->get("styleName").toString();
connect(m_styleSettings, &QGSettings::changed,
this, &MainWindow::onConfigurationChanged);
setCurStyleSheet();
}
MainWindow::~MainWindow()
@ -136,6 +135,7 @@ void MainWindow::onConfigurationChanged(QString key)
if(key == "styleName"){
m_curStyle = m_styleSettings->get("styleName").toString();
initPermissionWidget();
setCurStyleSheet();
}
}
@ -170,6 +170,35 @@ void MainWindow::initPerwgtSize()
});
}
void MainWindow::setCurStyleSheet()
{
if (m_curStyle == "ukui-dark" || m_curStyle == "ukui-black") {
permissionLabel->setStyleSheet("background-color: black; border-radius: 8px;border: 1px solid #404040;");
systemLabel->setStyleSheet("background-color: black;border-bottom-left-radius: 8px;border-bottom-right-radius: 8px;border: 1px solid #404040;");
saverLabel->setStyleSheet("background-color: black;border-style:solid;border-left-width: 1px; border-color:#404040;border-right-width: 1px;");
greetLabel->setStyleSheet("background-color: black;border-top-left-radius: 8px;border-top-right-radius: 8px;border: 1px solid #404040;");
QPixmap noDeviceIcon;
noDeviceIcon.load(":/images/assets/dark-no-device.svg");
ui->lblNoDeviceIFace->setPixmap(noDeviceIcon);
ui->lblNoDeviceIFingerPrint->setPixmap(noDeviceIcon);
ui->lblNoDeviceIFingerVein->setPixmap(noDeviceIcon);
ui->lblNoDeviceIIris->setPixmap(noDeviceIcon);
ui->lblNoDeviceIVoicePrint->setPixmap(noDeviceIcon);
} else {
permissionLabel->setStyleSheet("background-color: white; border-radius: 8px;border: 1px solid #E7E7E7;");
systemLabel->setStyleSheet("background-color: white;border-bottom-left-radius: 8px;border-bottom-right-radius: 8px;border: 1px solid #E7E7E7;");
saverLabel->setStyleSheet("background-color: white;border-style:solid;border-left-width: 1px; border-color:#E7E7E7;border-right-width: 1px;");
greetLabel->setStyleSheet("background-color: white;border-top-left-radius: 8px;border-top-right-radius: 8px;border: 1px solid #E7E7E7;");
QPixmap noDeviceIcon;
noDeviceIcon.load(":/images/assets/no-device.svg");
ui->lblNoDeviceIFace->setPixmap(noDeviceIcon);
ui->lblNoDeviceIFingerPrint->setPixmap(noDeviceIcon);
ui->lblNoDeviceIFingerVein->setPixmap(noDeviceIcon);
ui->lblNoDeviceIIris->setPixmap(noDeviceIcon);
ui->lblNoDeviceIVoicePrint->setPixmap(noDeviceIcon);
}
}
void MainWindow::resizeEvent(QResizeEvent *event)
{
if (isPermissionWidget) {

1
biometric-manager/src/mainwindow.h
View File

@ -92,6 +92,7 @@ private slots:
void onDefaultDeviceChanged(bool checked);
bool changeDeviceStatus(DeviceInfo *deviceInfo, KSwitchButton* switchBtn);
void onUSBDeviceHotPlug(int, int, int);
void setCurStyleSheet();
void onConfigurationChanged(QString key);
void onUpdateDevice(int,int,int);
void onDeleteFeatureState(int nState);

4582
biometric-manager/src/mainwindow.ui
View File

File diff suppressed because it is too large Load Diff

2
biometric-manager/src/promptdialog.cpp
View File

@ -812,6 +812,8 @@ void PromptDialog::showClosePrompt(QString tips)
w_timer->stop();
}
ui->msgLabel->setText(tips);
ui->msgLabel->setWordWrap(true);
ui->msgLabel->adjustSize();
ui->msgLabel->show();
ui->Fsbtn->setText(tr("Finish"));
ui->Fsbtn->show();

3
biometric-manager/src/promptdialog.ui
View File

@ -244,6 +244,9 @@
<property name="alignment">
<set>Qt::AlignCenter</set>
</property>
<property name="wordWrap">
<bool>true</bool>
</property>
</widget>
</item>
</layout>

3
biometric-plugin/biometricswidget.cpp
View File

@ -93,6 +93,9 @@ void BiometricsWidget::initBioComonent()
connect(ui->biometricDeviceBox_2, SIGNAL(currentIndexChanged(int)),
this, SLOT(onbiometricDeviceBoxCurrentIndexChanged(int)));
ui->toolButton->setProperty("isWindowButton", 0x1);
ui->toolButton->setProperty("useIconHighlightEffect", 0x2);
ui->toolButton->setIcon(QIcon::fromTheme("view-more-horizontal-symbolic"));
menu = new QMenu();
QAction *installAction = new QAction(tr("Advanced Settings"), this);

30
biometric-plugin/i18n_ts/bo_CN.ts
View File

@ -573,27 +573,27 @@ Please authenticate yourself to continue</source>
<message>
<location filename="../changepwddialog.ui" line="130"/>
<source>Change Pwd</source>
<translation>Pwdལ་འགྱུར་ལྡོག་གཏོང་དགོས།</translation>
<translation>གསང་གྲངས་བཟོ་བཅོས་རྒྱག་དགོས།</translation>
</message>
<message>
<location filename="../changepwddialog.ui" line="317"/>
<source>Pwd type</source>
<translation>Pwdརིགས་དབྱིབས།</translation>
<translation>གསང་བའི་རིགས།</translation>
</message>
<message>
<location filename="../changepwddialog.ui" line="395"/>
<source>Cur pwd</source>
<translation>ཀྱག་ཀྱོག་གི་pwd</translation>
<translation>མིག་སྔར་གསང་བའི་ཨང་གྲངས།</translation>
</message>
<message>
<location filename="../changepwddialog.ui" line="440"/>
<source>New pwd</source>
<translation>pwdགསར་པ།</translation>
<translation>གསང་གྲངས་གསར་པ།</translation>
</message>
<message>
<location filename="../changepwddialog.ui" line="485"/>
<source>New pwd sure</source>
<translation>pwdགཏན་འཁེལ་གསར་པ།</translation>
<translation>གསང་གྲངས་གསར་པ་གཏན་ཁེལ་བྱ།</translation>
</message>
<message>
<location filename="../changepwddialog.ui" line="605"/>
@ -608,7 +608,7 @@ Please authenticate yourself to continue</source>
<message>
<location filename="../changepwddialog.cpp" line="64"/>
<source>Change pwd</source>
<translation>pwd བརྗེ་བ།</translation>
<translation>གསང་གྲངས་བཟོ་བཅོས་རྒྱག་དགོས།</translation>
</message>
<message>
<source>Cur pwd checking!</source>
@ -655,7 +655,7 @@ Please authenticate yourself to continue</source>
<message>
<location filename="../changepwddialog.cpp" line="329"/>
<source>Same with old pwd</source>
<translation>གནའ་བོའི་pwdདང་གཅིག་མཚུངས་ཡིན།</translation>
<translation>གསང་གྲངས་རྙིང་པ་དང་གཅིག་མཚུངས་ཡིན།</translation>
</message>
<message>
<source>Password length needs to more than %1 character!</source>
@ -673,7 +673,7 @@ Please authenticate yourself to continue</source>
<location filename="../changepwddialog.cpp" line="245"/>
<location filename="../changepwddialog.cpp" line="365"/>
<source>Inconsistency with pwd</source>
<translation>pwdདང་གཅིག་མཐུན་མིན་པ།</translation>
<translation>གསང་གྲངས་གསར་རྙིང་གཅིག་མཐུན་མ་བྱུང་།</translation>
</message>
</context>
<context>
@ -696,7 +696,7 @@ Please authenticate yourself to continue</source>
<location filename="../changeuserpwd.cpp" line="124"/>
<location filename="../changeuserpwd.cpp" line="628"/>
<source>Current Pwd</source>
<translation>མིག་སྔའི་Pwd</translation>
<translation>མིག་སྔར་གསང་བའི་ཨང་གྲངས།</translation>
</message>
<message>
<location filename="../changeuserpwd.cpp" line="156"/>
@ -704,7 +704,7 @@ Please authenticate yourself to continue</source>
<location filename="../changeuserpwd.cpp" line="629"/>
<location filename="../changeuserpwd.cpp" line="637"/>
<source>New Pwd</source>
<translation>Pwdགསར་པ།</translation>
<translation>གསང་གྲངས་གསར་པ།</translation>
</message>
<message>
<location filename="../changeuserpwd.cpp" line="197"/>
@ -712,7 +712,7 @@ Please authenticate yourself to continue</source>
<location filename="../changeuserpwd.cpp" line="630"/>
<location filename="../changeuserpwd.cpp" line="638"/>
<source>Sure Pwd</source>
<translation>གཏན་འཁེལ་བྱས་པའི་Pwd</translation>
<translation>གསང་གྲངས་གཏན་ཁེལ་བྱ།</translation>
</message>
<message>
<location filename="../changeuserpwd.cpp" line="260"/>
@ -729,7 +729,7 @@ Please authenticate yourself to continue</source>
<message>
<location filename="../changeuserpwd.cpp" line="444"/>
<source>Same with old pwd</source>
<translation type="unfinished">གནའ་བོའི་pwdདང་གཅིག་མཚུངས་ཡིན།</translation>
<translation>གསང་གྲངས་རྙིང་པ་དང་གཅིག་མཚུངས་ཡིན།</translation>
</message>
<message>
<location filename="../changeuserpwd.cpp" line="500"/>
@ -744,7 +744,7 @@ Please authenticate yourself to continue</source>
<message>
<location filename="../changeuserpwd.cpp" line="825"/>
<source>current pwd cannot be empty!</source>
<translation>ད་ལྟའི་pwdནི་སྟོང་པ་ཡིན་མི་སྲིད།</translation>
<translation>མིག་སྔར་གསང་བའི་གསང་བ་སྟོང་པར་འགྱུར་མི་རུང་།</translation>
</message>
<message>
<location filename="../changeuserpwd.cpp" line="830"/>
@ -754,13 +754,13 @@ Please authenticate yourself to continue</source>
<message>
<location filename="../changeuserpwd.cpp" line="835"/>
<source>sure pwd cannot be empty!</source>
<translation>pwdནི་སྟོང་བ་ཡིན་མི་སྲིད་པ་ཐག་གིས་ཆོད།</translation>
<translation>གསང་བའི་ཨང་གྲངས་དེ་སྟོང་པར་གཏན་ཁེལ་བྱེད་མི་རུང་།</translation>
</message>
<message>
<location filename="../changeuserpwd.cpp" line="373"/>
<location filename="../changeuserpwd.cpp" line="714"/>
<source>Inconsistency with pwd</source>
<translation>pwdདང་གཅིག་མཐུན་མིན་པ།</translation>
<translation>གསང་གྲངས་གསར་རྙིང་གཅིག་མཐུན་མ་བྱུང་།</translation>
</message>
<message>
<location filename="../changeuserpwd.cpp" line="663"/>

6
biometric-plugin/i18n_ts/zh_CN.ts
View File

@ -34,7 +34,7 @@
<message>
<location filename="../biometricenroll.cpp" line="156"/>
<source>Close</source>
<translation type="unfinished">关闭</translation>
<translation>关闭</translation>
</message>
<message>
<location filename="../biometricenroll.cpp" line="209"/>
@ -532,12 +532,12 @@ Please authenticate yourself to continue</source>
<message>
<location filename="../changefeaturename.cpp" line="34"/>
<source>Please do not use spaces as the beginning or end of the feature name</source>
<translation>请不要在名称首或者未输入空格</translation>
<translation>请不要以空格作为特征名称的开头或者结尾</translation>
</message>
<message>
<location filename="../changefeaturename.cpp" line="36"/>
<source>Empty feature name</source>
<translation>空的特征名</translation>
<translation>名称不能为空</translation>
</message>
<message>
<location filename="../changefeaturename.cpp" line="38"/>