Skip to content

Commit 30509f9

Browse files
committed
fix form hide timeout
1 parent 7bb93a6 commit 30509f9

File tree

3 files changed

+39
-11
lines changed

3 files changed

+39
-11
lines changed

src/loginform.cpp

Lines changed: 34 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -250,7 +250,7 @@ void LoginForm::onPrompt(QString prompt, QLightDM::Greeter::PromptType promptTyp
250250
//"password: "
251251
//"Enter new password: "
252252
//"Enter it again: "
253-
253+
emit resetHideTimer();
254254
qInfo() << "Received Prompt: " << prompt << " type: " << QString::number(promptType);
255255

256256
if((prompt.compare("Enter new password: ") == 0 || prompt.compare("New password: ") == 0 ||
@@ -297,7 +297,7 @@ void LoginForm::onPrompt(QString prompt, QLightDM::Greeter::PromptType promptTyp
297297

298298
void LoginForm::onMessage(QString prompt, QLightDM::Greeter::MessageType messageType){
299299
QString type = NULL;
300-
300+
emit resetHideTimer();
301301
qInfo() << "Received Message: " << prompt << " type: " << QString::number(messageType);
302302

303303
if(messageType == QLightDM::Greeter::MessageTypeError){
@@ -359,7 +359,7 @@ void LoginForm::authenticationComplete()
359359
{
360360

361361
QString lastuser;
362-
362+
emit resetHideTimer();
363363

364364
lastuser = ui->userInput->text().trimmed();
365365

@@ -480,7 +480,7 @@ void LoginForm::on_pushButton_resetpwd_clicked()
480480
QString userid;
481481

482482

483-
483+
emit resetHideTimer();
484484
if(toolButtons[(lastuserindex + 1) % 3]->text().isEmpty())
485485
return;
486486

@@ -735,9 +735,12 @@ void LoginForm::addUsertoCache(QString user_name){
735735

736736
void LoginForm::userButtonClicked(){
737737

738+
738739
QObject *senderObj = sender(); // This will give Sender object
739740
QString senderObjName = senderObj->objectName();
740741

742+
emit resetHideTimer();
743+
741744
for(int i = 0; i< total_user_count + 1; i++){
742745

743746
if(senderObjName.compare(toolButtons[(lastuserindex + 0) % 3]->objectName()) == 0){//left
@@ -1025,6 +1028,7 @@ void LoginForm::userSelectStateMachine(int key, int button){
10251028
void LoginForm::keyPressEvent(QKeyEvent *event)
10261029
{
10271030

1031+
emit resetHideTimer();
10281032
if (event->key() == Qt::Key_Return || event->key() == Qt::Key_Enter) {
10291033

10301034

@@ -1138,7 +1142,7 @@ void LoginForm::on_resetpasswordButton_clicked()
11381142
{
11391143

11401144
QString userid;
1141-
1145+
emit resetHideTimer();
11421146
if(!userResetRequest){
11431147

11441148

@@ -1254,7 +1258,7 @@ void LoginForm::LoginTimerFinished(){
12541258
QString userid;
12551259
static int opcheckcounter;
12561260

1257-
1261+
emit resetHideTimer();
12581262
switch(loginTimerState){
12591263

12601264
case 0:
@@ -1396,7 +1400,7 @@ void LoginForm::userPasswordResetRequest(){
13961400
static int inpipefd[2];
13971401
static int outpipefd[2];
13981402
int status;
1399-
1403+
emit resetHideTimer();
14001404

14011405
switch(userRequestTimerState){
14021406

@@ -1587,7 +1591,7 @@ void LoginForm::passwordResetTimerFinished(){
15871591
static int opcheckcounter;
15881592
bool errorflag = false;
15891593
static QString userx;
1590-
1594+
emit resetHideTimer();
15911595
switch(resetTimerState){
15921596

15931597
case 0:
@@ -1763,6 +1767,9 @@ QString LoginForm::translateResetPwdMessage(QString message){
17631767

17641768
void LoginForm::on_acceptbutton_clicked()
17651769
{
1770+
1771+
emit resetHideTimer();
1772+
17661773
if(userResetRequest){
17671774

17681775
if(passwordChangeError){
@@ -1967,7 +1974,7 @@ void LoginForm::pageTransition(QWidget *Page){
19671974

19681975
ui->stackedWidget->setCurrentIndex(ui->stackedWidget->indexOf(Page));
19691976

1970-
1977+
emit resetHideTimer();
19711978
if(Page == ui->waitpage){
19721979
ui->waitlabel->setFocus();
19731980
mv->start();
@@ -2025,6 +2032,8 @@ void LoginForm::pageTransition(QWidget *Page){
20252032

20262033
void LoginForm::on_backButton_clicked()
20272034
{
2035+
2036+
emit resetHideTimer();
20282037
needPasswordChange = 0;
20292038
cancelLogin();
20302039
ui->passwordInput->clear();
@@ -2040,6 +2049,7 @@ void LoginForm::on_backButton_clicked()
20402049
void LoginForm::usersbuttonReposition(){
20412050
QFont font;
20422051

2052+
emit resetHideTimer();
20432053
ui->userInput->clear();
20442054
ui->userInput->hide();
20452055
ui->toolButtonleft->setGeometry(left);
@@ -2096,7 +2106,7 @@ void LoginForm::usersbuttonReposition(){
20962106

20972107
void LoginForm::on_cancelResetButton_clicked()
20982108
{
2099-
2109+
emit resetHideTimer();
21002110
userResetRequest = false;
21012111
systemResetRequest = false;
21022112

@@ -2181,7 +2191,7 @@ void LoginForm::keyboardEvent(QString key){
21812191
QString txt;
21822192

21832193

2184-
2194+
emit resetHideTimer();
21852195

21862196
if(key.compare(QString("enter")) == 0){
21872197
QKeyEvent *event = new QKeyEvent(QEvent::KeyPress, Qt::Key_Enter, Qt::NoModifier);
@@ -2405,6 +2415,7 @@ bool LoginForm::ifLocalUser(QString username){
24052415

24062416
void LoginForm::on_pwShowbutton_pressed()
24072417
{
2418+
emit resetHideTimer();
24082419
ui->passwordInput->setEchoMode(QLineEdit::EchoMode::Normal);
24092420
ui->passwordInput->setDisabled(true);
24102421
}
@@ -2420,6 +2431,7 @@ void LoginForm::on_pwShowbutton_released()
24202431

24212432
void LoginForm::on_showoldPwdButton_pressed()
24222433
{
2434+
emit resetHideTimer();
24232435
ui->oldpasswordinput->setEchoMode(QLineEdit::EchoMode::Normal);
24242436
ui->oldpasswordinput->setDisabled(true);
24252437
}
@@ -2433,6 +2445,7 @@ void LoginForm::on_showoldPwdButton_released()
24332445

24342446
void LoginForm::on_shownewPwdButton_pressed()
24352447
{
2448+
emit resetHideTimer();
24362449
ui->newpasswordinput->setEchoMode(QLineEdit::EchoMode::Normal);
24372450
ui->newpasswordinput->setDisabled(true);
24382451
}
@@ -2445,6 +2458,7 @@ void LoginForm::on_shownewPwdButton_released()
24452458

24462459
void LoginForm::on_showconfirmPwdButton_pressed()
24472460
{
2461+
emit resetHideTimer();
24482462
ui->newpasswordconfirminput->setEchoMode(QLineEdit::EchoMode::Normal);
24492463
ui->newpasswordconfirminput->setDisabled(true);
24502464
}
@@ -2472,11 +2486,13 @@ void LoginForm::debugBox(QString mes){
24722486

24732487
void LoginForm::on_pushButton_right_clicked()
24742488
{
2489+
emit resetHideTimer();
24752490
userSelectStateMachine(Qt::Key_Right, -1);
24762491
}
24772492

24782493
void LoginForm::on_pushButton_left_clicked()
24792494
{
2495+
emit resetHideTimer();
24802496
userSelectStateMachine(Qt::Key_Left, -1);
24812497
}
24822498

@@ -2534,5 +2550,12 @@ void LoginForm::showAll(void){
25342550

25352551
void LoginForm::on_passwordInput_textEdited(const QString &arg1)
25362552
{
2553+
emit resetHideTimer();
2554+
justshowed = false;
2555+
}
2556+
2557+
void LoginForm::on_userInput_textEdited(const QString &arg1)
2558+
{
2559+
emit resetHideTimer();
25372560
justshowed = false;
25382561
}

src/loginform.h

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -87,6 +87,7 @@ public slots:
8787
void sendKeyboardCloseRequest();
8888
void selectKeyboard(void);
8989
void sendCurrentUser(QString user);
90+
void resetHideTimer(void);
9091

9192

9293

@@ -146,6 +147,8 @@ private slots:
146147

147148
void on_passwordInput_textEdited(const QString &arg1);
148149

150+
void on_userInput_textEdited(const QString &arg1);
151+
149152
private:
150153
void initialize();
151154

src/mainwindow.cpp

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -160,8 +160,10 @@ MainWindow::MainWindow(int screen, QWidget *parent) :
160160
QObject::connect(m_LoginForm, &LoginForm::selectKeyboard, m_SettingsForm, &SettingsForm::keyboardSelectSlot);
161161
QObject::connect(m_SettingsForm, &SettingsForm::sendSessionInfo, m_LoginForm, &LoginForm::setCurrentSession);
162162
QObject::connect(m_LoginForm, &LoginForm::sendCurrentUser, m_SettingsForm, &SettingsForm::receiveCurrentUser);
163+
QObject::connect(m_LoginForm, &LoginForm::resetHideTimer, this, &MainWindow::resetHideFormsTimer);
163164
keyboardInit();
164165

166+
165167
int slide_timeout = Settings().slideShow_timeout();
166168

167169
if(slide_timeout < 1)

0 commit comments

Comments
 (0)