yukijoou/kwin
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Saying

Browse source 
"If this was only a temporary problem, you can resume using the 'Empty' shortcut.\n"
if no shortcut is found makes no sense, reworked to avoid it

Tried my best to do correct indentation but make failed

svn path=/trunk/KDE/kdebase/workspace/; revision=878365
This commit is contained in:
Albert Astals Cid 2008-10-31 23:54:52 +00:00
parent 102be68572
commit 5f7174a27e
1 changed files with 8 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
composite.cpp
View file

@ -484,12 +484,16 @@ void Workspace::checkCompositePaintTime( int msec )
if( tooslow ) if( tooslow )
{ {
QTimer::singleShot( 0, this, SLOT( suspendCompositing())); QTimer::singleShot( 0, this, SLOT( suspendCompositing()));
QString shortcut = i18n( "Empty" ); QString shortcut, message;
if( KAction* action = qobject_cast<KAction*>( keys->action("Suspend Compositing"))) if( KAction* action = qobject_cast<KAction*>( keys->action("Suspend Compositing")))
shortcut = action->globalShortcut().primary().toString(QKeySequence::NativeText); shortcut = action->globalShortcut().primary().toString(QKeySequence::NativeText);
QString message = i18n( "Compositing was too slow and has been suspended.\n" if (shortcut.isEmpty())
"If this was only a temporary problem, you can resume using the '%1' shortcut.\n" message = i18n( "Compositing was too slow and has been suspended.\n"
"You can also disable functionality checks in advanced compositing settings.", shortcut ); "You can disable functionality checks in advanced compositing settings." );
else
message = i18n( "Compositing was too slow and has been suspended.\n"
"If this was only a temporary problem, you can resume using the '%1' shortcut.\n"
"You can also disable functionality checks in advanced compositing settings.", shortcut );
Notify::raise( Notify::CompositingSlow, message ); Notify::raise( Notify::CompositingSlow, message );
compositeTimer.start( 1000 ); // so that it doesn't trigger sooner than suspendCompositing() compositeTimer.start( 1000 ); // so that it doesn't trigger sooner than suspendCompositing()
} }