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

Rename KIcon to enhance compatibility with KDE4

Browse Source
pull/1/head
Timothy Pearson 12 years ago
parent 13ea8e1fd7
commit 8141d8e2e3
26 changed files with 64 additions and 64 deletions
Show Stats Download Patch File Download Diff File

2
amarok/src/actionclasses.cpp
Unescape View File

@ -398,7 +398,7 @@ void SelectAction::setIcons( TQStringList icons )
{ {
m_icons = icons; m_icons = icons;
for( int i = 0, n = items().count(); i < n; ++i ) for( int i = 0, n = items().count(); i < n; ++i )
popupMenu()->changeItem( i, kapp->iconLoader()->loadIconSet( *icons.at( i ), KIcon::Small ), popupMenu()->text( i ) ); popupMenu()->changeItem( i, kapp->iconLoader()->loadIconSet( *icons.at( i ), TDEIcon::Small ), popupMenu()->text( i ) );
} }
TQStringList SelectAction::icons() const { return m_icons; } TQStringList SelectAction::icons() const { return m_icons; }

2
amarok/src/app.cpp
Unescape View File

@ -1077,7 +1077,7 @@ void App::engineStateChanged( Engine::State state, Engine::State oldState )
m_pPlaylistWindow->setCaption( kapp->makeStdCaption( i18n("Playlist") ) ); m_pPlaylistWindow->setCaption( kapp->makeStdCaption( i18n("Playlist") ) );
else m_pPlaylistWindow->setCaption( "Amarok" ); else m_pPlaylistWindow->setCaption( "Amarok" );
TrackToolTip::instance()->clear(); TrackToolTip::instance()->clear();
Amarok::OSD::instance()->setImage( KIconLoader().iconPath( "amarok", -KIcon::SizeHuge ) ); Amarok::OSD::instance()->setImage( TDEIconLoader().iconPath( "amarok", -TDEIcon::SizeHuge ) );
break; break;
case Engine::Playing: case Engine::Playing:

2
amarok/src/collectionbrowser.cpp
Unescape View File

@ -2736,7 +2736,7 @@ CollectionView::iconForCategory( const int cat ) const
break; break;
} }
return TDEGlobal::iconLoader()->loadIcon( icon, KIcon::Toolbar, KIcon::SizeSmall ); return TDEGlobal::iconLoader()->loadIcon( icon, TDEIcon::Toolbar, TDEIcon::SizeSmall );
} }
TQString TQString

2
amarok/src/configdialog.cpp
Unescape View File

@ -185,7 +185,7 @@ AmarokConfigDialog::AmarokConfigDialog( TQWidget *parent, const char* name, TDEC
// Show information labels (must be done after insertions) // Show information labels (must be done after insertions)
TQObjectList *list = queryList( TQLABEL_OBJECT_NAME_STRING, "infoPixmap" ); TQObjectList *list = queryList( TQLABEL_OBJECT_NAME_STRING, "infoPixmap" );
TQPixmap const info = TDEGlobal::iconLoader()->iconPath( "messagebox_info", -KIcon::SizeHuge ); TQPixmap const info = TDEGlobal::iconLoader()->iconPath( "messagebox_info", -TDEIcon::SizeHuge );
for( TQObject *label = list->first(); label; label = list->next() ) for( TQObject *label = list->first(); label; label = list->next() )
static_cast<TQLabel*>(TQT_TQWIDGET(label))->setPixmap( info ); static_cast<TQLabel*>(TQT_TQWIDGET(label))->setPixmap( info );
delete list; delete list;

8
amarok/src/contextbrowser.cpp
Unescape View File

@ -1117,7 +1117,7 @@ public:
m_amarokIconPath = TQDeepCopy<TQString>(TDEGlobal::iconLoader()->iconPath( "amarok", m_amarokIconPath = TQDeepCopy<TQString>(TDEGlobal::iconLoader()->iconPath( "amarok",
-KIcon::SizeEnormous ) ); -TDEIcon::SizeEnormous ) );
m_musicBrainIconPath = TQDeepCopy<TQString>(locate( "data", "amarok/images/musicbrainz.png" ) m_musicBrainIconPath = TQDeepCopy<TQString>(locate( "data", "amarok/images/musicbrainz.png" )
); );
m_lastfmIcon = "file://" + locate( "data","amarok/images/lastfm.png" ); m_lastfmIcon = "file://" + locate( "data","amarok/images/lastfm.png" );
@ -1774,9 +1774,9 @@ void CurrentTrackJob::showLastFm( const MetaBundle &currentTrack )
for ( TQString* url = newUrls.first(); url; url = newUrls.next() ) for ( TQString* url = newUrls.first(); url; url = newUrls.next() )
url->replace( TQRegExp( "^http:" ), "externalurl:" ); url->replace( TQRegExp( "^http:" ), "externalurl:" );
const TQString skipIcon = TDEGlobal::iconLoader()->iconPath( Amarok::icon("next"), -KIcon::SizeSmallMedium ); const TQString skipIcon = TDEGlobal::iconLoader()->iconPath( Amarok::icon("next"), -TDEIcon::SizeSmallMedium );
const TQString loveIcon = TDEGlobal::iconLoader()->iconPath( Amarok::icon("love"), -KIcon::SizeSmallMedium ); const TQString loveIcon = TDEGlobal::iconLoader()->iconPath( Amarok::icon("love"), -TDEIcon::SizeSmallMedium );
const TQString banIcon = TDEGlobal::iconLoader()->iconPath( Amarok::icon("remove"), -KIcon::SizeSmallMedium ); const TQString banIcon = TDEGlobal::iconLoader()->iconPath( Amarok::icon("remove"), -TDEIcon::SizeSmallMedium );
m_HTMLSource.append( QStringx( m_HTMLSource.append( QStringx(

4
amarok/src/covermanager.cpp
Unescape View File

@ -885,7 +885,7 @@ void CoverManager::setStatusText( TQString text )
///////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////
CoverView::CoverView( TQWidget *parent, const char *name, WFlags f ) CoverView::CoverView( TQWidget *parent, const char *name, WFlags f )
: KIconView( parent, name, f ) : TDEIconView( parent, name, f )
{ {
Debug::Block block( __PRETTY_FUNCTION__ ); Debug::Block block( __PRETTY_FUNCTION__ );
@ -952,7 +952,7 @@ void CoverView::setStatusText( TQIconViewItem *item )
///////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////
CoverViewItem::CoverViewItem( TQIconView *parent, TQIconViewItem *after, const TQString &artist, const TQString &album ) CoverViewItem::CoverViewItem( TQIconView *parent, TQIconViewItem *after, const TQString &artist, const TQString &album )
: KIconViewItem( parent, after, album ) : TDEIconViewItem( parent, after, album )
, m_artist( artist ) , m_artist( artist )
, m_album( album ) , m_album( album )
, m_coverImagePath( CollectionDB::instance()->albumImage( m_artist, m_album, false, 0, &m_embedded ) ) , m_coverImagePath( CollectionDB::instance()->albumImage( m_artist, m_album, false, 0, &m_embedded ) )

4
amarok/src/covermanager.h
Unescape View File

@ -108,7 +108,7 @@ class CoverManager : public TQSplitter
int m_coverErrors; int m_coverErrors;
}; };
class CoverView : public KIconView class CoverView : public TDEIconView
{ {
Q_OBJECT Q_OBJECT
@ -123,7 +123,7 @@ class CoverView : public KIconView
void setStatusText( TQIconViewItem *item ); void setStatusText( TQIconViewItem *item );
}; };
class CoverViewItem : public KIconViewItem class CoverViewItem : public TDEIconViewItem
{ {
public: public:
CoverViewItem( TQIconView *parent, TQIconViewItem *after, const TQString &artist, const TQString &album ); CoverViewItem( TQIconView *parent, TQIconViewItem *after, const TQString &artist, const TQString &album );

4
amarok/src/deletedialog.cpp
Unescape View File

@ -71,12 +71,12 @@ void DeleteWidget::slotShouldDelete(bool shouldDelete)
ddDeleteText->setText(i18n("<qt>These items will be <b>permanently " ddDeleteText->setText(i18n("<qt>These items will be <b>permanently "
"deleted</b> from your hard disk.</qt>")); "deleted</b> from your hard disk.</qt>"));
ddWarningIcon->setPixmap(TDEGlobal::iconLoader()->loadIcon("messagebox_warning", ddWarningIcon->setPixmap(TDEGlobal::iconLoader()->loadIcon("messagebox_warning",
KIcon::Desktop, KIcon::SizeLarge)); TDEIcon::Desktop, TDEIcon::SizeLarge));
} }
else { else {
ddDeleteText->setText(i18n("<qt>These items will be moved to the Trash Bin.</qt>")); ddDeleteText->setText(i18n("<qt>These items will be moved to the Trash Bin.</qt>"));
ddWarningIcon->setPixmap(TDEGlobal::iconLoader()->loadIcon("trashcan_full", ddWarningIcon->setPixmap(TDEGlobal::iconLoader()->loadIcon("trashcan_full",
KIcon::Desktop, KIcon::SizeLarge)); TDEIcon::Desktop, TDEIcon::SizeLarge));
} }
} }

2
amarok/src/directorylist.cpp
Unescape View File

@ -280,7 +280,7 @@ Item::newItems( const KFileItemList &list ) //SLOT
} }
} }
item->setPixmap( 0, (*it)->pixmap( KIcon::SizeSmall ) ); item->setPixmap( 0, (*it)->pixmap( TDEIcon::SizeSmall ) );
} }
} }

6
amarok/src/magnatunebrowser/magnatunelistviewitems.cpp
Unescape View File

@ -34,7 +34,7 @@ MagnatuneListViewArtistItem::MagnatuneListViewArtistItem( MagnatuneArtist artist
{ {
TDEListViewItem::setText( 0, artist.getName() ); TDEListViewItem::setText( 0, artist.getName() );
setPixmap(0, TDEGlobal::iconLoader()->loadIcon( "personal", KIcon::Toolbar, KIcon::SizeSmall ) ); setPixmap(0, TDEGlobal::iconLoader()->loadIcon( "personal", TDEIcon::Toolbar, TDEIcon::SizeSmall ) );
setDragEnabled ( true ); setDragEnabled ( true );
} }
@ -90,7 +90,7 @@ MagnatuneListViewAlbumItem::MagnatuneListViewAlbumItem( MagnatuneAlbum album, TD
TDEListViewItem::setText( 0, album.getName() ); TDEListViewItem::setText( 0, album.getName() );
setDragEnabled( true ); setDragEnabled( true );
//setPixmap(0, TDEGlobal::iconLoader()->loadIcon( "cdrom_unmount", KIcon::Toolbar, KIcon::SizeSmall ) ); //setPixmap(0, TDEGlobal::iconLoader()->loadIcon( "cdrom_unmount", TDEIcon::Toolbar, TDEIcon::SizeSmall ) );
} }
@ -166,7 +166,7 @@ MagnatuneListViewTrackItem::MagnatuneListViewTrackItem( MagnatuneTrack track, TD
setDragEnabled( true ); setDragEnabled( true );
//setPixmap(0, TDEGlobal::iconLoader()->loadIcon( "track", KIcon::Toolbar, KIcon::SizeSmall ) ); //setPixmap(0, TDEGlobal::iconLoader()->loadIcon( "track", TDEIcon::Toolbar, TDEIcon::SizeSmall ) );
} }
MagnatuneListViewTrackItem::~ MagnatuneListViewTrackItem( ) MagnatuneListViewTrackItem::~ MagnatuneListViewTrackItem( )

32
amarok/src/mediabrowser.cpp
Unescape View File

@ -217,13 +217,13 @@ MediaBrowser::MediaBrowser( const char *name )
s_instance = this; s_instance = this;
// preload pixmaps used in browser // preload pixmaps used in browser
KIconLoader iconLoader; TDEIconLoader iconLoader;
MediaItem::s_pixUnknown = new TQPixmap(iconLoader.loadIcon( Amarok::icon( "unknown" ), KIcon::Toolbar, KIcon::SizeSmall )); MediaItem::s_pixUnknown = new TQPixmap(iconLoader.loadIcon( Amarok::icon( "unknown" ), TDEIcon::Toolbar, TDEIcon::SizeSmall ));
MediaItem::s_pixTrack = new TQPixmap(iconLoader.loadIcon( Amarok::icon( "playlist" ), KIcon::Toolbar, KIcon::SizeSmall )); MediaItem::s_pixTrack = new TQPixmap(iconLoader.loadIcon( Amarok::icon( "playlist" ), TDEIcon::Toolbar, TDEIcon::SizeSmall ));
MediaItem::s_pixFile = new TQPixmap(iconLoader.loadIcon( Amarok::icon( "sound" ), KIcon::Toolbar, KIcon::SizeSmall ) ); MediaItem::s_pixFile = new TQPixmap(iconLoader.loadIcon( Amarok::icon( "sound" ), TDEIcon::Toolbar, TDEIcon::SizeSmall ) );
MediaItem::s_pixPodcast = new TQPixmap(iconLoader.loadIcon( Amarok::icon( "podcast" ), KIcon::Toolbar, KIcon::SizeSmall ) ); MediaItem::s_pixPodcast = new TQPixmap(iconLoader.loadIcon( Amarok::icon( "podcast" ), TDEIcon::Toolbar, TDEIcon::SizeSmall ) );
MediaItem::s_pixPlaylist = new TQPixmap(iconLoader.loadIcon( Amarok::icon( "playlist" ), KIcon::Toolbar, KIcon::SizeSmall ) ); MediaItem::s_pixPlaylist = new TQPixmap(iconLoader.loadIcon( Amarok::icon( "playlist" ), TDEIcon::Toolbar, TDEIcon::SizeSmall ) );
MediaItem::s_pixRootItem = new TQPixmap(iconLoader.loadIcon( Amarok::icon( "files2" ), KIcon::Toolbar, KIcon::SizeSmall ) ); MediaItem::s_pixRootItem = new TQPixmap(iconLoader.loadIcon( Amarok::icon( "files2" ), TDEIcon::Toolbar, TDEIcon::SizeSmall ) );
// history // history
// favorites // favorites
// collection // collection
@ -232,15 +232,15 @@ MediaBrowser::MediaBrowser( const char *name )
// player_playlist_2 // player_playlist_2
// cancel // cancel
// sound // sound
MediaItem::s_pixArtist = new TQPixmap(iconLoader.loadIcon( Amarok::icon( "personal" ), KIcon::Toolbar, KIcon::SizeSmall ) ); MediaItem::s_pixArtist = new TQPixmap(iconLoader.loadIcon( Amarok::icon( "personal" ), TDEIcon::Toolbar, TDEIcon::SizeSmall ) );
MediaItem::s_pixAlbum = new TQPixmap(iconLoader.loadIcon( Amarok::icon( "cdrom_unmount" ), KIcon::Toolbar, KIcon::SizeSmall ) ); MediaItem::s_pixAlbum = new TQPixmap(iconLoader.loadIcon( Amarok::icon( "cdrom_unmount" ), TDEIcon::Toolbar, TDEIcon::SizeSmall ) );
MediaItem::s_pixInvisible = new TQPixmap(iconLoader.loadIcon( Amarok::icon( "cancel" ), KIcon::Toolbar, KIcon::SizeSmall ) ); MediaItem::s_pixInvisible = new TQPixmap(iconLoader.loadIcon( Amarok::icon( "cancel" ), TDEIcon::Toolbar, TDEIcon::SizeSmall ) );
MediaItem::s_pixStale = new TQPixmap(iconLoader.loadIcon( Amarok::icon( "cancel" ), KIcon::Toolbar, KIcon::SizeSmall ) ); MediaItem::s_pixStale = new TQPixmap(iconLoader.loadIcon( Amarok::icon( "cancel" ), TDEIcon::Toolbar, TDEIcon::SizeSmall ) );
MediaItem::s_pixOrphaned = new TQPixmap(iconLoader.loadIcon( Amarok::icon( "cancel" ), KIcon::Toolbar, KIcon::SizeSmall ) ); MediaItem::s_pixOrphaned = new TQPixmap(iconLoader.loadIcon( Amarok::icon( "cancel" ), TDEIcon::Toolbar, TDEIcon::SizeSmall ) );
MediaItem::s_pixDirectory = new TQPixmap(iconLoader.loadIcon( Amarok::icon( "folder" ), KIcon::Toolbar, KIcon::SizeSmall ) ); MediaItem::s_pixDirectory = new TQPixmap(iconLoader.loadIcon( Amarok::icon( "folder" ), TDEIcon::Toolbar, TDEIcon::SizeSmall ) );
MediaItem::s_pixTransferBegin = new TQPixmap(iconLoader.loadIcon( Amarok::icon( "play" ), KIcon::Toolbar, KIcon::SizeSmall ) ); MediaItem::s_pixTransferBegin = new TQPixmap(iconLoader.loadIcon( Amarok::icon( "play" ), TDEIcon::Toolbar, TDEIcon::SizeSmall ) );
MediaItem::s_pixTransferEnd = new TQPixmap(iconLoader.loadIcon( Amarok::icon( "stop" ), KIcon::Toolbar, KIcon::SizeSmall ) ); MediaItem::s_pixTransferEnd = new TQPixmap(iconLoader.loadIcon( Amarok::icon( "stop" ), TDEIcon::Toolbar, TDEIcon::SizeSmall ) );
MediaItem::s_pixTransferFailed = new TQPixmap(iconLoader.loadIcon( Amarok::icon( "cancel" ), KIcon::Toolbar, KIcon::SizeSmall ) ); MediaItem::s_pixTransferFailed = new TQPixmap(iconLoader.loadIcon( Amarok::icon( "cancel" ), TDEIcon::Toolbar, TDEIcon::SizeSmall ) );
setSpacing( 4 ); setSpacing( 4 );

4
amarok/src/mediadevice/daap/daapclient.cpp
Unescape View File

@ -472,7 +472,7 @@ DaapClient::customClicked()
: KDialogBase( parent, "DaapAddHostDialog", true, i18n( "Add Computer" ) , Ok|Cancel) : KDialogBase( parent, "DaapAddHostDialog", true, i18n( "Add Computer" ) , Ok|Cancel)
{ {
m_base = new AddHostBase( this, "DaapAddHostBase" ); m_base = new AddHostBase( this, "DaapAddHostBase" );
m_base->m_downloadPixmap->setPixmap( TQPixmap( TDEGlobal::iconLoader()->iconPath( Amarok::icon( "download" ), -KIcon::SizeEnormous ) ) ); m_base->m_downloadPixmap->setPixmap( TQPixmap( TDEGlobal::iconLoader()->iconPath( Amarok::icon( "download" ), -TDEIcon::SizeEnormous ) ) );
m_base->m_hostName->setFocus(); m_base->m_hostName->setFocus();
setMainWidget( m_base ); setMainWidget( m_base );
} }
@ -523,7 +523,7 @@ DaapClient::passwordPrompt()
setButtonOK( ok ); setButtonOK( ok );
TQLabel* passIcon = new TQLabel( mainWidget(), "passicon" ); TQLabel* passIcon = new TQLabel( mainWidget(), "passicon" );
passIcon->setPixmap( TQPixmap( TDEGlobal::iconLoader()->iconPath( "password", -KIcon::SizeHuge ) ) ); passIcon->setPixmap( TQPixmap( TDEGlobal::iconLoader()->iconPath( "password", -TDEIcon::SizeHuge ) ) );
TQHBox* loginArea = new TQHBox( mainWidget(), "passhbox" ); TQHBox* loginArea = new TQHBox( mainWidget(), "passhbox" );
new TQLabel( i18n( "Password:"), loginArea, "passlabel" ); new TQLabel( i18n( "Password:"), loginArea, "passlabel" );
m_input = new KPasswordEdit( loginArea, "passedit" ); m_input = new KPasswordEdit( loginArea, "passedit" );

2
amarok/src/multitabbar.cpp
Unescape View File

@ -1063,7 +1063,7 @@ void MultiTabBarTab::drawButtonAmarok( TQPainter *paint )
// Apply icon effect when widget disabled. Should really be cached, but *shrug*. // Apply icon effect when widget disabled. Should really be cached, but *shrug*.
if( !isEnabled() ) if( !isEnabled() )
icon = kapp->iconLoader()->iconEffect()->apply( icon, KIcon::Small, KIcon::DisabledState ); icon = kapp->iconLoader()->iconEffect()->apply( icon, TDEIcon::Small, TDEIcon::DisabledState );
if( m_position == MultiTabBar::Left || m_position == MultiTabBar::Right ) { if( m_position == MultiTabBar::Left || m_position == MultiTabBar::Right ) {
TQPixmap pixmap( height(), width() ); TQPixmap pixmap( height(), width() );

2
amarok/src/osd.cpp
Unescape View File

@ -608,7 +608,7 @@ OSDWidget::useMoodbar( void )
namespace Amarok namespace Amarok
{ {
TQImage icon() { return TQImage( KIconLoader().iconPath( "amarok", -KIcon::SizeHuge ) ); } TQImage icon() { return TQImage( TDEIconLoader().iconPath( "amarok", -TDEIcon::SizeHuge ) ); }
} }
OSDPreviewWidget::OSDPreviewWidget( TQWidget *parent ) OSDPreviewWidget::OSDPreviewWidget( TQWidget *parent )

10
amarok/src/playerwindow.cpp
Unescape View File

@ -857,12 +857,12 @@ NavButton::NavButton( TQWidget *parent, const TQString &icon, TDEAction *action
setWFlags( TQt::WNoAutoErase ); setWFlags( TQt::WNoAutoErase );
TQPixmap pixmap( getPNG( "b_" + icon ) ); TQPixmap pixmap( getPNG( "b_" + icon ) );
KIconEffect ie; TDEIconEffect ie;
// Tint icon blueish for "off" state // Tint icon blueish for "off" state
m_pixmapOff = ie.apply( pixmap, KIconEffect::Colorize, 0.5, TQColor( 0x30, 0x10, 0xff ), false ); m_pixmapOff = ie.apply( pixmap, TDEIconEffect::Colorize, 0.5, TQColor( 0x30, 0x10, 0xff ), false );
// Tint gray and make pseudo-transparent for "disabled" state // Tint gray and make pseudo-transparent for "disabled" state
m_pixmapDisabled = ie.apply( pixmap, KIconEffect::ToGray, 0.7, TQColor(), true ); m_pixmapDisabled = ie.apply( pixmap, TDEIconEffect::ToGray, 0.7, TQColor(), true );
int r = 0x20, g = 0x10, b = 0xff; int r = 0x20, g = 0x10, b = 0xff;
float percentRed = 0.0; float percentRed = 0.0;
@ -871,8 +871,8 @@ NavButton::NavButton( TQWidget *parent, const TQString &icon, TDEAction *action
for ( int i = 0; i < NUMPIXMAPS; i++ ) { for ( int i = 0; i < NUMPIXMAPS; i++ ) {
TQImage img = pixmap.convertToImage(); TQImage img = pixmap.convertToImage();
temp = KImageEffect::channelIntensity( img, percentRed, KImageEffect::Red ); temp = KImageEffect::channelIntensity( img, percentRed, KImageEffect::Red );
temp = ie.apply( temp, KIconEffect::Colorize, 1.0, TQColor( r, 0x10, 0x30 ), false ); temp = ie.apply( temp, TDEIconEffect::Colorize, 1.0, TQColor( r, 0x10, 0x30 ), false );
temp = ie.apply( temp, KIconEffect::Colorize, 1.0, TQColor( r, g, b ), false ); temp = ie.apply( temp, TDEIconEffect::Colorize, 1.0, TQColor( r, g, b ), false );
// Create new pixmap on the heap and add pointer to list // Create new pixmap on the heap and add pointer to list
m_glowPixmaps.append( temp ); m_glowPixmaps.append( temp );

2
amarok/src/playlist.cpp
Unescape View File

@ -1616,7 +1616,7 @@ Playlist::activate( TQListViewItem *item )
EngineController::instance()->stop(); EngineController::instance()->stop();
setCurrentTrack( 0 ); setCurrentTrack( 0 );
Amarok::OSD::instance()->OSDWidget::show( i18n("Playlist finished"), Amarok::OSD::instance()->OSDWidget::show( i18n("Playlist finished"),
TQImage( KIconLoader().iconPath( "amarok", -KIcon::SizeHuge ) ) ); TQImage( TDEIconLoader().iconPath( "amarok", -TDEIcon::SizeHuge ) ) );
return; return;
} }

6
amarok/src/playlistitem.cpp
Unescape View File

@ -614,7 +614,7 @@ void PlaylistItem::paintCell( TQPainter *painter, const TQColorGroup &cg, int co
// Left part // Left part
if( column == listView()->m_firstColumn ) { if( column == listView()->m_firstColumn ) {
TQImage tmpImage = currentTrackLeft.smoothScale( 1, height(), TQ_ScaleMax ); TQImage tmpImage = currentTrackLeft.smoothScale( 1, height(), TQ_ScaleMax );
KIconEffect::colorize( tmpImage, glowBase, colorize ); TDEIconEffect::colorize( tmpImage, glowBase, colorize );
imageTransparency( tmpImage, intensity ); imageTransparency( tmpImage, intensity );
p.drawImage( 0, 0, tmpImage, 0, 0, tmpImage.width() - 1 ); //HACK p.drawImage( 0, 0, tmpImage, 0, 0, tmpImage.width() - 1 ); //HACK
leftOffset = tmpImage.width() - 1; //HACK Subtracting 1, to work around the black line bug leftOffset = tmpImage.width() - 1; //HACK Subtracting 1, to work around the black line bug
@ -626,7 +626,7 @@ void PlaylistItem::paintCell( TQPainter *painter, const TQColorGroup &cg, int co
if( column == Playlist::instance()->mapToLogicalColumn( Playlist::instance()->numVisibleColumns() - 1 ) ) if( column == Playlist::instance()->mapToLogicalColumn( Playlist::instance()->numVisibleColumns() - 1 ) )
{ {
TQImage tmpImage = currentTrackRight.smoothScale( 1, height(), TQ_ScaleMax ); TQImage tmpImage = currentTrackRight.smoothScale( 1, height(), TQ_ScaleMax );
KIconEffect::colorize( tmpImage, glowBase, colorize ); TDEIconEffect::colorize( tmpImage, glowBase, colorize );
imageTransparency( tmpImage, intensity ); imageTransparency( tmpImage, intensity );
p.drawImage( width - tmpImage.width(), 0, tmpImage ); p.drawImage( width - tmpImage.width(), 0, tmpImage );
rightOffset = tmpImage.width(); rightOffset = tmpImage.width();
@ -636,7 +636,7 @@ void PlaylistItem::paintCell( TQPainter *painter, const TQColorGroup &cg, int co
// Middle part // Middle part
// Here we scale the one pixel wide middel image to stretch to the full column width. // Here we scale the one pixel wide middel image to stretch to the full column width.
TQImage tmpImage = currentTrackMid.copy(); TQImage tmpImage = currentTrackMid.copy();
KIconEffect::colorize( tmpImage, glowBase, colorize ); TDEIconEffect::colorize( tmpImage, glowBase, colorize );
imageTransparency( tmpImage, intensity ); imageTransparency( tmpImage, intensity );
tmpImage = tmpImage.smoothScale( width - leftOffset - rightOffset, height() ); tmpImage = tmpImage.smoothScale( width - leftOffset - rightOffset, height() );
p.drawImage( leftOffset, 0, tmpImage ); p.drawImage( leftOffset, 0, tmpImage );

2
amarok/src/prettypopupmenu.cpp
Unescape View File

@ -58,7 +58,7 @@ PrettyPopupMenu::generateSidePixmap()
if ( newColor != s_sidePixmapColor ) { if ( newColor != s_sidePixmapColor ) {
s_sidePixmapColor = newColor; s_sidePixmapColor = newColor;
s_sidePixmap.load( locate( "data","amarok/images/menu_sidepixmap.png" ) ); s_sidePixmap.load( locate( "data","amarok/images/menu_sidepixmap.png" ) );
KIconEffect::colorize( s_sidePixmap, newColor, 1.0 ); TDEIconEffect::colorize( s_sidePixmap, newColor, 1.0 );
} }
} }

2
amarok/src/sliderwidget.cpp
Unescape View File

@ -390,7 +390,7 @@ void
Amarok::VolumeSlider::generateGradient() Amarok::VolumeSlider::generateGradient()
{ {
//TQImage temp( locate( "data","amarok/images/volumeslider-gradient.png" ) ); //TQImage temp( locate( "data","amarok/images/volumeslider-gradient.png" ) );
//KIconEffect::colorize( temp, colorGroup().highlight(), 1.0 ); //TDEIconEffect::colorize( temp, colorGroup().highlight(), 1.0 );
const TQPixmap temp( locate( "data","amarok/images/volumeslider-gradient.png" ) ); const TQPixmap temp( locate( "data","amarok/images/volumeslider-gradient.png" ) );
const TQBitmap mask( temp.createHeuristicMask() ); const TQBitmap mask( temp.createHeuristicMask() );

8
amarok/src/starmanager.cpp
Unescape View File

@ -67,14 +67,14 @@ StarManager::reinitStars( int height, int margin )
m_starPix.convertFromImage( star ); m_starPix.convertFromImage( star );
m_fullStarPix.convertFromImage( fullStar ); m_fullStarPix.convertFromImage( fullStar );
m_greyedStar = star.copy(); m_greyedStar = star.copy();
KIconEffect::toGray( m_greyedStar, 1.0 ); TDEIconEffect::toGray( m_greyedStar, 1.0 );
m_greyedStarPix.convertFromImage( m_greyedStar ); m_greyedStarPix.convertFromImage( m_greyedStar );
TQImage half = TQImage( locate( "data", "amarok/images/smallstar.png" ) ).smoothScale( hval, hval, TQ_ScaleMin ); TQImage half = TQImage( locate( "data", "amarok/images/smallstar.png" ) ).smoothScale( hval, hval, TQ_ScaleMin );
TQImage fullHalf = TQImage( locate( "data", "amarok/images/smallstar.png" ) ); TQImage fullHalf = TQImage( locate( "data", "amarok/images/smallstar.png" ) );
m_halfStar = half.copy(); m_halfStar = half.copy();
m_fullHalfStar = fullHalf.copy(); m_fullHalfStar = fullHalf.copy();
if( AmarokConfig::customRatingsColors() ) if( AmarokConfig::customRatingsColors() )
KIconEffect::colorize( m_halfStar, m_halfStarColor, 1.0 ); TDEIconEffect::colorize( m_halfStar, m_halfStarColor, 1.0 );
m_halfStarPix.convertFromImage( m_halfStar ); m_halfStarPix.convertFromImage( m_halfStar );
m_fullHalfStarPix.convertFromImage( m_fullHalfStar ); m_fullHalfStarPix.convertFromImage( m_fullHalfStar );
@ -86,9 +86,9 @@ StarManager::reinitStars( int height, int margin )
temphalfstar = half.copy(); temphalfstar = half.copy();
if( AmarokConfig::customRatingsColors() ) if( AmarokConfig::customRatingsColors() )
{ {
KIconEffect::colorize( tempstar, m_colors[i], 1.0 ); TDEIconEffect::colorize( tempstar, m_colors[i], 1.0 );
if( !AmarokConfig::fixedHalfStarColor() ) if( !AmarokConfig::fixedHalfStarColor() )
KIconEffect::colorize( temphalfstar, m_colors[i], 1.0 ); TDEIconEffect::colorize( temphalfstar, m_colors[i], 1.0 );
} }
m_images[i] = tempstar.copy(); m_images[i] = tempstar.copy();
m_halfimages[i] = temphalfstar.copy(); m_halfimages[i] = temphalfstar.copy();

4
amarok/src/statistics.cpp
Unescape View File

@ -700,8 +700,8 @@ StatisticsItem::StatisticsItem( TQString text, StatisticsList *parent, TDEListVi
void void
StatisticsItem::setIcon( const TQString &icon ) StatisticsItem::setIcon( const TQString &icon )
{ {
TQString path = kapp->iconLoader()->iconPath( icon, -KIcon::SizeHuge ); TQString path = kapp->iconLoader()->iconPath( icon, -TDEIcon::SizeHuge );
path.replace( "32x32", "48x48" ); //HACK: KIconLoader only returns 32x32 max. Why? path.replace( "32x32", "48x48" ); //HACK: TDEIconLoader only returns 32x32 max. Why?
// debug() << "ICONPATH: " << path << endl; // debug() << "ICONPATH: " << path << endl;

2
amarok/src/statusbar/queueLabel.cpp
Unescape View File

@ -75,7 +75,7 @@ void QueueLabel::getCover( const TQString &artist, const TQString &album )
{ {
m_cover = CollectionDB::instance()->albumImage( artist, album, 50 ); m_cover = CollectionDB::instance()->albumImage( artist, album, 50 );
if( m_cover == CollectionDB::instance()->notAvailCover( 50 ) ) if( m_cover == CollectionDB::instance()->notAvailCover( 50 ) )
m_cover = TDEGlobal::iconLoader()->iconPath( "goto", -KIcon::SizeHuge ); m_cover = TDEGlobal::iconLoader()->iconPath( "goto", -TDEIcon::SizeHuge );
} }
void QueueLabel::setNum( int num ) void QueueLabel::setNum( int num )

2
amarok/src/statusbar/selectLabel.h
Unescape View File

@ -147,7 +147,7 @@ class SelectLabel : public TQLabel
m_tooltip->setMaskEffect( KDE::PopupMessage::Plain ); m_tooltip->setMaskEffect( KDE::PopupMessage::Plain );
m_tooltip->setText( tip ); m_tooltip->setText( tip );
const TQPixmap pix = TDEGlobal::iconLoader() const TQPixmap pix = TDEGlobal::iconLoader()
->loadIconSet( m_action->currentIcon(), KIcon::Toolbar, KIcon::SizeHuge ) ->loadIconSet( m_action->currentIcon(), TDEIcon::Toolbar, TDEIcon::SizeHuge )
.pixmap( TQIconSet::Large, m_action->isEnabled() .pixmap( TQIconSet::Large, m_action->isEnabled()
? TQIconSet::Normal ? TQIconSet::Normal
: TQIconSet::Disabled ); : TQIconSet::Disabled );

6
amarok/src/statusbar/statusBarBase.cpp
Unescape View File

@ -297,16 +297,16 @@ StatusBar::longMessage( const TQString &text, int type )
{ {
case Information: case Information:
case Question: case Question:
image = TDEGlobal::iconLoader()->iconPath( "messagebox_info", -KIcon::SizeHuge ); image = TDEGlobal::iconLoader()->iconPath( "messagebox_info", -TDEIcon::SizeHuge );
break; break;
case Sorry: case Sorry:
case Warning: case Warning:
image = TDEGlobal::iconLoader()->iconPath( "messagebox_warning", -KIcon::SizeHuge ); image = TDEGlobal::iconLoader()->iconPath( "messagebox_warning", -TDEIcon::SizeHuge );
break; break;
case Error: case Error:
image = TDEGlobal::iconLoader()->iconPath( "messagebox_critical", -KIcon::SizeHuge ); image = TDEGlobal::iconLoader()->iconPath( "messagebox_critical", -TDEIcon::SizeHuge );
// don't hide error messages. // don't hide error messages.
// message->setTimeout( 0 ); // message->setTimeout( 0 );
break; break;

2
amarok/src/statusbar/toggleLabel.h
Unescape View File

@ -116,7 +116,7 @@ class ToggleLabel : public TQLabel
tip += i18n("&nbsp;<br>&nbsp;<i>Disabled</i>"); tip += i18n("&nbsp;<br>&nbsp;<i>Disabled</i>");
tip += "&nbsp;"; tip += "&nbsp;";
const TQString path = TDEGlobal::iconLoader()->iconPath( m_action->icon(), -KIcon::SizeHuge ); const TQString path = TDEGlobal::iconLoader()->iconPath( m_action->icon(), -TDEIcon::SizeHuge );
m_tooltip = new KDE::PopupMessage( parentWidget()->parentWidget(), parentWidget(), 0 /*timeout*/ ); m_tooltip = new KDE::PopupMessage( parentWidget()->parentWidget(), parentWidget(), 0 /*timeout*/ );

6
amarok/src/systray.cpp
Unescape View File

@ -198,7 +198,7 @@ Amarok::TrayIcon::paintIcon( int mergePixels, bool force )
if ( grayedIcon.isNull() ) if ( grayedIcon.isNull() )
{ {
TQImage tmpTrayIcon = baseIcon.convertToImage(); TQImage tmpTrayIcon = baseIcon.convertToImage();
KIconEffect::semiTransparent( tmpTrayIcon ); TDEIconEffect::semiTransparent( tmpTrayIcon );
grayedIcon = tmpTrayIcon; grayedIcon = tmpTrayIcon;
} }
@ -213,7 +213,7 @@ Amarok::TrayIcon::paintIcon( int mergePixels, bool force )
int hue, sat, value; int hue, sat, value;
saturatedColor.getHsv( &hue, &sat, &value ); saturatedColor.getHsv( &hue, &sat, &value );
saturatedColor.setHsv( hue, sat > 200 ? 200 : sat, value < 100 ? 100 : value ); saturatedColor.setHsv( hue, sat > 200 ? 200 : sat, value < 100 ? 100 : value );
KIconEffect::colorize( tmpTrayIcon, saturatedColor/* TQt::blue */, 0.9 ); TDEIconEffect::colorize( tmpTrayIcon, saturatedColor/* TQt::blue */, 0.9 );
alternateIcon = tmpTrayIcon; alternateIcon = tmpTrayIcon;
} }
@ -255,7 +255,7 @@ Amarok::TrayIcon::blendOverlay( TQPixmap &sourcePixmap )
// blend the overlay image over the cropped rectangle // blend the overlay image over the cropped rectangle
TQImage blendedImage = sourceCropped.convertToImage(); TQImage blendedImage = sourceCropped.convertToImage();
TQImage overlayImage = overlay->convertToImage(); TQImage overlayImage = overlay->convertToImage();
KIconEffect::overlay( blendedImage, overlayImage ); TDEIconEffect::overlay( blendedImage, overlayImage );
sourceCropped.convertFromImage( blendedImage ); sourceCropped.convertFromImage( blendedImage );
// put back the blended rectangle to the original image // put back the blended rectangle to the original image

Write Preview
Loading…
Cancel
Save