TDE
/
tdebase
mirror of https://mirror.git.trinitydesktop.org/gitea/TDE/tdebase
0
0
Fork 0
Code Issues Releases Wiki Activity

Reset kdesktop lock login dialog on GUI VT switch

Browse Source 
git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdebase@1254119 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
v3.5.13-sru
tpearson 14 years ago
parent e723b237f1
commit 291dece245
1 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File

11
kdesktop/lock/lockdlg.cc
Unescape Escape View File

@ -728,7 +728,7 @@ void PasswordDlg::slotSwitchUser()
lv = new TQListView( winFrame ); lv = new TQListView( winFrame );
connect( lv, TQT_SIGNAL(doubleClicked(TQListViewItem *, const TQPoint&, int)), TQT_SLOT(slotSessionActivated()) ); connect( lv, TQT_SIGNAL(doubleClicked(TQListViewItem *, const TQPoint&, int)), TQT_SLOT(slotSessionActivated()) );
connect( lv, TQT_SIGNAL(doubleClicked(TQListViewItem *, const TQPoint&, int)), &dialog, TQT_SLOT(reject()) ); connect( lv, TQT_SIGNAL(doubleClicked(TQListViewItem *, const TQPoint&, int)), &dialog, TQT_SLOT(accept()) );
lv->setAllColumnsShowFocus( true ); lv->setAllColumnsShowFocus( true );
lv->addColumn( i18n("Session") ); lv->addColumn( i18n("Session") );
lv->addColumn( i18n("Location") ); lv->addColumn( i18n("Location") );
@ -759,7 +759,7 @@ void PasswordDlg::slotSwitchUser()
btn = new KPushButton( KGuiItem(i18n("session", "&Activate"), "fork"), winFrame ); btn = new KPushButton( KGuiItem(i18n("session", "&Activate"), "fork"), winFrame );
connect( btn, TQT_SIGNAL(clicked()), TQT_SLOT(slotSessionActivated()) ); connect( btn, TQT_SIGNAL(clicked()), TQT_SLOT(slotSessionActivated()) );
connect( btn, TQT_SIGNAL(clicked()), &dialog, TQT_SLOT(reject()) ); connect( btn, TQT_SIGNAL(clicked()), &dialog, TQT_SLOT(accept()) );
vbox2->addWidget( btn ); vbox2->addWidget( btn );
vbox2->addStretch( 2 ); vbox2->addStretch( 2 );
} }
@ -768,7 +768,7 @@ void PasswordDlg::slotSwitchUser()
{ {
btn = new KPushButton( KGuiItem(i18n("Start &New Session"), "fork"), winFrame ); btn = new KPushButton( KGuiItem(i18n("Start &New Session"), "fork"), winFrame );
connect( btn, TQT_SIGNAL(clicked()), TQT_SLOT(slotStartNewSession()) ); connect( btn, TQT_SIGNAL(clicked()), TQT_SLOT(slotStartNewSession()) );
connect( btn, TQT_SIGNAL(clicked()), &dialog, TQT_SLOT(reject()) ); connect( btn, TQT_SIGNAL(clicked()), &dialog, TQT_SLOT(accept()) );
if (!p) if (!p)
btn->setEnabled( false ); btn->setEnabled( false );
vbox2->addWidget( btn ); vbox2->addWidget( btn );
@ -779,7 +779,10 @@ void PasswordDlg::slotSwitchUser()
connect( btn, TQT_SIGNAL(clicked()), &dialog, TQT_SLOT(reject()) ); connect( btn, TQT_SIGNAL(clicked()), &dialog, TQT_SLOT(reject()) );
vbox2->addWidget( btn ); vbox2->addWidget( btn );
static_cast< LockProcess* >(parent())->execDialog( &dialog ); int ret = static_cast< LockProcess* >(parent())->execDialog( &dialog );
if (ret != TQDialog::Rejected) {
TQDialog::reject();
}
} }
void PasswordDlg::slotSessionActivated() void PasswordDlg::slotSessionActivated()

Write Preview
Loading…
Cancel
Save