diff options
Diffstat (limited to 'amarok/src/statusbar/queueLabel.cpp')
-rw-r--r-- | amarok/src/statusbar/queueLabel.cpp | 32 |
1 files changed, 16 insertions, 16 deletions
diff --git a/amarok/src/statusbar/queueLabel.cpp b/amarok/src/statusbar/queueLabel.cpp index d78869a0..c25431f2 100644 --- a/amarok/src/statusbar/queueLabel.cpp +++ b/amarok/src/statusbar/queueLabel.cpp @@ -99,27 +99,27 @@ void QueueLabel::setNum( int num ) TQPixmap pix( w, h ); TQPainter p( &pix ); - p.setBrush( tqcolorGroup().background() ); - p.setPen( tqcolorGroup().background() ); + p.setBrush( colorGroup().background() ); + p.setPen( colorGroup().background() ); p.drawRect( pix.rect() ); - p.setBrush( tqcolorGroup().highlight() ); - p.setPen( tqcolorGroup().highlight().dark() ); + p.setBrush( colorGroup().highlight() ); + p.setPen( colorGroup().highlight().dark() ); if( w > h ) { p.drawPie( 0, 0, h, h, 90*16, 180*16 ); p.drawPie( w-1 -h, 0, h, h, -90*16, 180*16 ); p.drawLine( h/2-1, 0, w-1 - h/2, 0 ); p.drawLine( h/2-1, h-1, w-1 - h/2, h-1 ); - p.setPen( tqcolorGroup().highlight() ); + p.setPen( colorGroup().highlight() ); p.drawRect( h/2-1, 1, w - h + 1, h-2 ); } else p.drawEllipse( pix.rect() ); p.setFont( f ); - p.setPen( tqcolorGroup().highlightedText() ); - p.setBrush( tqcolorGroup().highlight().dark() ); + p.setPen( colorGroup().highlightedText() ); + p.setBrush( colorGroup().highlight().dark() ); p.drawText( pix.rect(), TQt::AlignCenter | TQt::SingleLine, text ); p.end(); @@ -175,7 +175,7 @@ void QueueLabel::mousePressEvent( TQMouseEvent* mouseEvent ) const uint count = queue.count(); if( length ) menu->insertTitle( i18n( "1 Queued Track (%1)", "%n Queued Tracks (%1)", count ) - .tqarg( MetaBundle::prettyLength( length, true ) ) ); + .arg( MetaBundle::prettyLength( length, true ) ) ); else menu->insertTitle( i18n( "1 Queued Track", "%n Queued Tracks", count ) ); Amarok::actionCollection()->action( "queue_manager" )->plug( menu ); @@ -191,7 +191,7 @@ void QueueLabel::mousePressEvent( TQMouseEvent* mouseEvent ) { for( uint n = kMin( i + MAX_TO_SHOW - 1, count ); i <= n; ++i, ++it ) menu->insertItem( - KStringHandler::rsqueeze( i18n( "%1. %2" ).tqarg( i ).tqarg( veryNiceTitle( *it ) ), 50 ), i ); + KStringHandler::rsqueeze( i18n( "%1. %2" ).arg( i ).arg( veryNiceTitle( *it ) ), 50 ), i ); if( i < count ) { @@ -205,8 +205,8 @@ void QueueLabel::mousePressEvent( TQMouseEvent* mouseEvent ) menu = menus.getFirst(); int mx, my; - const int mw = menu->tqsizeHint().width(), - mh = menu->tqsizeHint().height(), + const int mw = menu->sizeHint().width(), + mh = menu->sizeHint().height(), sy = mapFrom( Amarok::StatusBar::instance(), TQPoint( 0, 0 ) ).y(), sheight = Amarok::StatusBar::instance()->height(); const TQRect dr = TQApplication::desktop()->availableGeometry( this ); @@ -264,11 +264,11 @@ void QueueLabel::showToolTip() } if( length ) text += TQString("<center>%1</center>") - .tqarg( i18n( "1 track (%1)", "%n tracks (%1)", count ) - .tqarg( MetaBundle::prettyLength( length, true ) ) ); + .arg( i18n( "1 track (%1)", "%n tracks (%1)", count ) + .arg( MetaBundle::prettyLength( length, true ) ) ); } - text += i18n( "Next: %1" ).tqarg( veryNiceTitle( item, true /*bold*/ ) ); + text += i18n( "Next: %1" ).arg( veryNiceTitle( item, true /*bold*/ ) ); m_tooltip = new KDE::PopupMessage( parentWidget()->parentWidget(), this, 0 ); m_tooltip->setShowCloseButton( false ); @@ -296,9 +296,9 @@ TQString QueueLabel::veryNiceTitle( PlaylistItem* item, bool bold ) const const TQString artist = item->artist()->stripWhiteSpace(), title = item->title().stripWhiteSpace(); if( !artist.isEmpty() && !title.isEmpty() ) - return ( bold ? i18n( "<b>%1</b> by <b>%2</b>" ) : i18n( "%1 by %2" ) ).tqarg( title ).tqarg( artist ); + return ( bold ? i18n( "<b>%1</b> by <b>%2</b>" ) : i18n( "%1 by %2" ) ).arg( title ).arg( artist ); else - return TQString( "<b>%1</b>" ).tqarg( MetaBundle::prettyTitle( item->filename() ) ); + return TQString( "<b>%1</b>" ).arg( MetaBundle::prettyTitle( item->filename() ) ); } |