diff options
| -rw-r--r-- | kdesktop/kdesktop.kcfg | 6 | ||||
| -rw-r--r-- | kdesktop/kdiconview.cc | 5 | ||||
| -rw-r--r-- | kdesktop/krootwm.cc | 2 | ||||
| -rw-r--r-- | kdesktop/lock/lockprocess.cc | 29 | ||||
| -rw-r--r-- | kdesktop/lock/main.cc | 12 |
5 files changed, 34 insertions, 20 deletions
diff --git a/kdesktop/kdesktop.kcfg b/kdesktop/kdesktop.kcfg index a1a37b11c..4b5c0a2b7 100644 --- a/kdesktop/kdesktop.kcfg +++ b/kdesktop/kdesktop.kcfg @@ -207,7 +207,7 @@ <label>Device Types to exclude</label> <whatsthis>The device types which you do not want to see on the desktop.</whatsthis> <!-- kdiconview.cc:261 --> - <!-- QString tmpList=config->readEntry("exclude","media/hdd_mounted,media/hdd_unmounted,media/floppy_unmounted,media/cdrom_unmounted,media/floppy5_unmounted"); --> + <!-- TQString tmpList=config->readEntry("exclude","media/hdd_mounted,media/hdd_unmounted,media/floppy_unmounted,media/cdrom_unmounted,media/floppy5_unmounted"); --> </entry> </group> <group name="KDE"> @@ -353,7 +353,7 @@ <label></label> <whatsthis></whatsthis> <!-- minicli.cpp:191 --> - <!-- QStringList histList = config->readPathListEntry("History"); --> + <!-- TQStringList histList = config->readPathListEntry("History"); --> <!-- minicli.cpp:242 --> <!-- config->writePathEntry( "History", m_dlg->cbCommand->historyItems() ); --> </entry> @@ -406,7 +406,7 @@ <label></label> <whatsthis></whatsthis> <!-- minicli.cpp:204 --> - <!-- QStringList compList = config->readPathListEntry("CompletionItems"); --> + <!-- TQStringList compList = config->readPathListEntry("CompletionItems"); --> <!-- minicli.cpp:244 --> <!-- config->writePathEntry( "CompletionItems", m_dlg->cbCommand->completionObject()->items() ); --> </entry> diff --git a/kdesktop/kdiconview.cc b/kdesktop/kdiconview.cc index 3404e4ae9..8a9a896df 100644 --- a/kdesktop/kdiconview.cc +++ b/kdesktop/kdiconview.cc @@ -1560,8 +1560,9 @@ void KDIconView::updateWorkArea( const TQRect &wr ) kdDebug(1204) << " oldArea: " << oldArea.x() << "," << oldArea.y() << " " << oldArea.width() << "x" << oldArea.height() << endl; - if ( m_autoAlign ) - int dummy = 0; //lineupIcons(); + if ( m_autoAlign ) { + //lineupIcons(); + } else { bool needRepaint = false; TQIconViewItem* item; diff --git a/kdesktop/krootwm.cc b/kdesktop/krootwm.cc index f7f8de0ef..809327ca2 100644 --- a/kdesktop/krootwm.cc +++ b/kdesktop/krootwm.cc @@ -245,7 +245,7 @@ void KRootWm::initConfig() // Read configuration for icons alignment if ( m_bDesktopEnabled ) { - bool startup = true; m_pDesktop->iconView()->setAutoAlign( KDesktopSettings::autoLineUpIcons() ); + m_pDesktop->iconView()->setAutoAlign( KDesktopSettings::autoLineUpIcons() ); if ( kapp->authorize( "editable_desktop_icons" ) ) { m_pDesktop->iconView()->setItemsMovable( !KDesktopSettings::lockIcons() ); KToggleAction *aLockIcons = static_cast<KToggleAction*>(m_actionCollection->action("lock_icons")); diff --git a/kdesktop/lock/lockprocess.cc b/kdesktop/lock/lockprocess.cc index acb4889a9..c0050d308 100644 --- a/kdesktop/lock/lockprocess.cc +++ b/kdesktop/lock/lockprocess.cc @@ -658,6 +658,10 @@ void LockProcess::startSecureDialog() mBusy = true; execDialog( &inDlg ); mBusy = false; + bool forcecontdisp = mForceContinualLockDisplayTimer->isActive(); + if (forcecontdisp) { + DISABLE_CONTINUOUS_LOCKDLG_DISPLAY + } trinity_desktop_lock_in_sec_dlg = false; if (ret == 0) { kapp->quit(); @@ -690,6 +694,9 @@ void LockProcess::startSecureDialog() } // FIXME // Handle remaining two cases (logoff menu and switch user) + if (forcecontdisp) { + ENABLE_CONTINUOUS_LOCKDLG_DISPLAY + } stopSaver(); } @@ -1495,17 +1502,21 @@ void LockProcess::hackExited(KProcess *) void LockProcess::displayLockDialogIfNeeded() { - if (m_startupStatusDialog) { m_startupStatusDialog->closeSMDialog(); m_startupStatusDialog=NULL; } - if (trinity_desktop_lock_use_system_modal_dialogs) { - if (!mBusy) { - mBusy = true; - if (mLocked) { - if (checkPass()) { - stopSaver(); - kapp->quit(); + if (m_startupStatusDialog) { + m_startupStatusDialog->closeSMDialog(); m_startupStatusDialog=NULL; + } + if (!trinity_desktop_lock_in_sec_dlg) { + if (trinity_desktop_lock_use_system_modal_dialogs) { + if (!mBusy) { + mBusy = true; + if (mLocked) { + if (checkPass()) { + stopSaver(); + kapp->quit(); + } } + mBusy = false; } - mBusy = false; } } } diff --git a/kdesktop/lock/main.cc b/kdesktop/lock/main.cc index 93206951d..5853da17a 100644 --- a/kdesktop/lock/main.cc +++ b/kdesktop/lock/main.cc @@ -252,19 +252,21 @@ int main( int argc, char **argv ) } } - if (args->isSet( "forcelock" ) || (signalled_forcelock == TRUE)) + if (args->isSet( "forcelock" ) || (signalled_forcelock == TRUE)) { trinity_desktop_lock_forced = TRUE; + } LockProcess process(child, (args->isSet( "blank" ) || (signalled_blank == TRUE))); - if (!child) + if (!child) { process.setChildren(child_sockets); - else + } + else { process.setParent(parent_connection); + } bool rt; bool sig = false; - if( !child && (args->isSet( "forcelock" ) || (signalled_forcelock == TRUE))) - { + if( (!child && (args->isSet( "forcelock" )) || (signalled_forcelock == TRUE))) { rt = process.lock(); sig = true; } |