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

Rename KIcon to enhance compatibility with KDE4

Browse Source
pull/1/head
Timothy Pearson 11 years ago
parent bba095a5aa
commit f8b1b30a59
19 changed files with 31 additions and 31 deletions
Show Stats Download Patch File Download Diff File

2
libk3b/tools/k3bmultichoicedialog.cpp
Unescape View File

@ -67,7 +67,7 @@ static TQPixmap themedMessageBoxIcon(TQMessageBox::Icon icon)
break;
}
TQPixmap ret = TDEApplication::kApplication()->iconLoader()->loadIcon(icon_name, KIcon::NoGroup, KIcon::SizeMedium, KIcon::DefaultState, 0, true);
TQPixmap ret = TDEApplication::kApplication()->iconLoader()->loadIcon(icon_name, TDEIcon::NoGroup, TDEIcon::SizeMedium, TDEIcon::DefaultState, 0, true);
if (ret.isNull())
return TQMessageBox::standardIcon(icon);

4
src/k3bemptydiscwaiter.cpp
Unescape View File

@ -209,10 +209,10 @@ int K3bEmptyDiscWaiter::waitForDisc( int mediaState, int mediaType, const TQStri
if( d->wantedMediaType & K3bDevice::MEDIA_WRITABLE_DVD )
d->pixLabel->setPixmap( TDEGlobal::instance()->iconLoader()->loadIcon( "dvd_unmount",
KIcon::NoGroup, KIcon::SizeMedium ) );
TDEIcon::NoGroup, TDEIcon::SizeMedium ) );
else
d->pixLabel->setPixmap( TDEGlobal::instance()->iconLoader()->loadIcon( "cdwriter_unmount",
KIcon::NoGroup, KIcon::SizeMedium ) );
TDEIcon::NoGroup, TDEIcon::SizeMedium ) );
adjustSize();

2
src/k3bflatbutton.cpp
Unescape View File

@ -52,7 +52,7 @@ K3bFlatButton::K3bFlatButton( TDEAction* a, TQWidget *parent, const char *name )
setText( a->text() );
TQToolTip::add( this, a->toolTip() );
setPixmap( TDEGlobal::iconLoader()->loadIcon( a->icon(), KIcon::NoGroup, 32 ) );
setPixmap( TDEGlobal::iconLoader()->loadIcon( a->icon(), TDEIcon::NoGroup, 32 ) );
connect( this, TQT_SIGNAL(clicked()), a, TQT_SLOT(activate()) );
}

2
src/k3bjobprogressosd.cpp
Unescape View File

@ -118,7 +118,7 @@ void K3bJobProgressOSD::renderOSD()
// calculate needed size
if( K3bTheme* theme = k3bappcore->themeManager()->currentTheme() ) {
TQPixmap icon = TDEGlobal::iconLoader()->loadIcon( "k3b", KIcon::NoGroup, 32 );
TQPixmap icon = TDEGlobal::iconLoader()->loadIcon( "k3b", TDEIcon::NoGroup, 32 );
int margin = 10;
int textWidth = fontMetrics().width( m_text );

2
src/k3bpassivepopup.cpp
Unescape View File

@ -72,7 +72,7 @@ static TQPixmap themedMessageBoxIcon( K3bPassivePopup::MessageType mt )
break;
}
TQPixmap ret = TDEApplication::kApplication()->iconLoader()->loadIcon(icon_name, KIcon::NoGroup, KIcon::SizeMedium, KIcon::DefaultState, 0, true);
TQPixmap ret = TDEApplication::kApplication()->iconLoader()->loadIcon(icon_name, TDEIcon::NoGroup, TDEIcon::SizeMedium, TDEIcon::DefaultState, 0, true);
if( ret.isNull() )
return TQMessageBox::standardIcon( qIcon );

2
src/k3bsidepanel.cpp
Unescape View File

@ -91,7 +91,7 @@ void K3bSidePanel::addButton( TQFrame* frame, TDEAction* a )
TQToolButton* b = new TQToolButton( frame );
b->setTextLabel( a->toolTip(), true );
b->setTextLabel( a->text(), false );
b->setIconSet( a->iconSet(KIcon::Small) );
b->setIconSet( a->iconSet(TDEIcon::Small) );
b->setUsesTextLabel( true );
b->setAutoRaise( true );
b->setTextPosition( TQToolButton::BesideIcon );

2
src/misc/k3bcdcopydialog.cpp
Unescape View File

@ -114,7 +114,7 @@ K3bCdCopyDialog::K3bCdCopyDialog( TQWidget *parent, const char *name, bool modal
groupCopies->setInsideSpacing( spacingHint() );
groupCopies->setInsideMargin( marginHint() );
TQLabel* pixLabel = new TQLabel( groupCopies );
pixLabel->setPixmap( SmallIcon( "cdcopy", KIcon::SizeMedium ) );
pixLabel->setPixmap( SmallIcon( "cdcopy", TDEIcon::SizeMedium ) );
pixLabel->setScaledContents( false );
m_spinCopies = new TQSpinBox( 1, 999, 1, groupCopies );

2
src/misc/k3bcdimagewritingdialog.cpp
Unescape View File

@ -252,7 +252,7 @@ void K3bCdImageWritingDialog::setupGui()
groupCopies->setInsideSpacing( spacingHint() );
groupCopies->setInsideMargin( marginHint() );
TQLabel* pixLabel = new TQLabel( groupCopies );
pixLabel->setPixmap( SmallIcon( "cdcopy", KIcon::SizeMedium ) );
pixLabel->setPixmap( SmallIcon( "cdcopy", TDEIcon::SizeMedium ) );
pixLabel->setScaledContents( false );
m_spinCopies = new TQSpinBox( groupCopies );
m_spinCopies->setMinValue( 1 );

2
src/misc/k3bdvdcopydialog.cpp
Unescape View File

@ -114,7 +114,7 @@ K3bDvdCopyDialog::K3bDvdCopyDialog( TQWidget* parent, const char* name, bool mod
groupCopies->setInsideSpacing( spacingHint() );
groupCopies->setInsideMargin( marginHint() );
TQLabel* pixLabel = new TQLabel( groupCopies );
pixLabel->setPixmap( SmallIcon( "cdcopy", KIcon::SizeMedium ) );
pixLabel->setPixmap( SmallIcon( "cdcopy", TDEIcon::SizeMedium ) );
pixLabel->setScaledContents( false );
m_spinCopies = new TQSpinBox( groupCopies );
m_spinCopies->setMinValue( 1 );

2
src/misc/k3bisoimagewritingdialog.cpp
Unescape View File

@ -195,7 +195,7 @@ void K3bIsoImageWritingDialog::setupGui()
groupCopies->setInsideSpacing( spacingHint() );
groupCopies->setInsideMargin( marginHint() );
TQLabel* pixLabel = new TQLabel( groupCopies );
pixLabel->setPixmap( SmallIcon( "cdcopy", KIcon::SizeMedium ) );
pixLabel->setPixmap( SmallIcon( "cdcopy", TDEIcon::SizeMedium ) );
pixLabel->setScaledContents( false );
m_spinCopies = new TQSpinBox( groupCopies );
m_spinCopies->setMinValue( 1 );

4
src/option/k3bexternalbinwidget.cpp
Unescape View File

@ -70,10 +70,10 @@ K3bExternalBinWidget::K3bExternalBinViewItem::K3bExternalBinViewItem( K3bExterna
void K3bExternalBinWidget::K3bExternalBinViewItem::setDefault( bool b )
{
static TQPixmap s_emptyPix( (int)KIcon::SizeSmall, (int)KIcon::SizeSmall );
static TQPixmap s_emptyPix( (int)TDEIcon::SizeSmall, (int)TDEIcon::SizeSmall );
static bool s_emptyPixInitialized = false;
if( !s_emptyPixInitialized ) {
s_emptyPix.setMask( TQBitmap( (int)KIcon::SizeSmall, (int)KIcon::SizeSmall, true ) );
s_emptyPix.setMask( TQBitmap( (int)TDEIcon::SizeSmall, (int)TDEIcon::SizeSmall, true ) );
s_emptyPixInitialized = true;
}

16
src/option/k3boptiondialog.cpp
Unescape View File

@ -127,7 +127,7 @@ void K3bOptionDialog::slotDefault()
void K3bOptionDialog::setupBurningPage()
{
TQFrame* frame = addPage( i18n("Advanced"), i18n("Advanced Settings"),
TDEGlobal::instance()->iconLoader()->loadIcon( "cdwriter_unmount", KIcon::NoGroup, KIcon::SizeMedium ) );
TDEGlobal::instance()->iconLoader()->loadIcon( "cdwriter_unmount", TDEIcon::NoGroup, TDEIcon::SizeMedium ) );
TQGridLayout* _frameLayout = new TQGridLayout( frame );
_frameLayout->setSpacing( 0 );
@ -141,7 +141,7 @@ void K3bOptionDialog::setupBurningPage()
void K3bOptionDialog::setupProgramsPage()
{
TQFrame* frame = addPage( i18n("Programs"), i18n("Setup External Programs"),
TDEGlobal::instance()->iconLoader()->loadIcon( "exec", KIcon::NoGroup, KIcon::SizeMedium ) );
TDEGlobal::instance()->iconLoader()->loadIcon( "exec", TDEIcon::NoGroup, TDEIcon::SizeMedium ) );
TQGridLayout* _frameLayout = new TQGridLayout( frame );
_frameLayout->setSpacing( 0 );
@ -155,7 +155,7 @@ void K3bOptionDialog::setupProgramsPage()
void K3bOptionDialog::setupCddbPage()
{
TQFrame* frame = addPage( i18n("CDDB"), i18n("Setup the CDDB Server"),
TDEGlobal::instance()->iconLoader()->loadIcon( "connect_established", KIcon::NoGroup, KIcon::SizeMedium ) );
TDEGlobal::instance()->iconLoader()->loadIcon( "connect_established", TDEIcon::NoGroup, TDEIcon::SizeMedium ) );
TQGridLayout* mainGrid = new TQGridLayout( frame );
mainGrid->setSpacing(0);
@ -173,7 +173,7 @@ void K3bOptionDialog::setupCddbPage()
void K3bOptionDialog::setupDevicePage()
{
TQFrame* frame = addPage( i18n("Devices"), i18n("Setup Devices"),
TDEGlobal::instance()->iconLoader()->loadIcon( "blockdevice", KIcon::NoGroup, KIcon::SizeMedium ) );
TDEGlobal::instance()->iconLoader()->loadIcon( "blockdevice", TDEIcon::NoGroup, TDEIcon::SizeMedium ) );
TQHBoxLayout* box = new TQHBoxLayout( frame );
box->setSpacing(0);
@ -186,7 +186,7 @@ void K3bOptionDialog::setupDevicePage()
void K3bOptionDialog::setupMiscPage()
{
TQFrame* frame = addPage( i18n("Misc"), i18n("Miscellaneous Settings"),
TDEGlobal::instance()->iconLoader()->loadIcon( "misc", KIcon::NoGroup, KIcon::SizeMedium ) );
TDEGlobal::instance()->iconLoader()->loadIcon( "misc", TDEIcon::NoGroup, TDEIcon::SizeMedium ) );
TQVBoxLayout* box = new TQVBoxLayout( frame );
box->setSpacing( 0 );
@ -201,7 +201,7 @@ void K3bOptionDialog::setupNotifyPage()
{
TQFrame* frame = addPage( i18n("Notifications"), i18n("System Notifications"),
TDEGlobal::instance()->iconLoader()->loadIcon( "knotify",
KIcon::NoGroup, KIcon::SizeMedium ) );
TDEIcon::NoGroup, TDEIcon::SizeMedium ) );
TQVBoxLayout* box = new TQVBoxLayout( frame );
box->setSpacing( 0 );
box->setMargin( 0 );
@ -215,7 +215,7 @@ void K3bOptionDialog::setupPluginPage()
{
TQFrame* frame = addPage( i18n("Plugins"), i18n("K3b Plugin Configuration"),
TDEGlobal::instance()->iconLoader()->loadIcon( "gear",
KIcon::NoGroup, KIcon::SizeMedium ) );
TDEIcon::NoGroup, TDEIcon::SizeMedium ) );
TQVBoxLayout* box = new TQVBoxLayout( frame );
box->setSpacing( 0 );
box->setMargin( 0 );
@ -229,7 +229,7 @@ void K3bOptionDialog::setupThemePage()
{
TQFrame* frame = addPage( i18n("Themes"), i18n("K3b GUI Themes"),
TDEGlobal::instance()->iconLoader()->loadIcon( "style",
KIcon::NoGroup, KIcon::SizeMedium ) );
TDEIcon::NoGroup, TDEIcon::SizeMedium ) );
TQVBoxLayout* box = new TQVBoxLayout( frame );
box->setSpacing( 0 );
box->setMargin( 0 );

2
src/projects/k3baudiotracktrmlookupdialog.cpp
Unescape View File

@ -57,7 +57,7 @@ K3bAudioTrackTRMLookupDialog::K3bAudioTrackTRMLookupDialog( TQWidget* parent, co
m_infoLabel = new TQLabel( plainPage() );
TQLabel* pixLabel = new TQLabel( plainPage() );
pixLabel->setPixmap( TDEGlobal::iconLoader()->loadIcon( "musicbrainz", KIcon::NoGroup, 64 ) );
pixLabel->setPixmap( TDEGlobal::iconLoader()->loadIcon( "musicbrainz", TDEIcon::NoGroup, 64 ) );
pixLabel->setScaledContents( false );
m_busyWidget = new K3bBusyWidget( plainPage() );

4
src/projects/k3bdatapropertiesdialog.cpp
Unescape View File

@ -92,7 +92,7 @@ K3bDataPropertiesDialog::K3bDataPropertiesDialog( K3bDataItem* dataItem, TQWidge
if( K3bFileItem* fileItem = dynamic_cast<K3bFileItem*>(dataItem) ) {
KFileItem kFileItem( KFileItem::Unknown, KFileItem::Unknown, KURL::fromPathOrURL(fileItem->localPath()) );
labelMimeType->setPixmap( kFileItem.pixmap(KIcon::SizeLarge) );
labelMimeType->setPixmap( kFileItem.pixmap(TDEIcon::SizeLarge) );
if( fileItem->isSymLink() )
m_labelType->setText( i18n("Link to %1").arg(kFileItem.mimeComment()) );
else
@ -116,7 +116,7 @@ K3bDataPropertiesDialog::K3bDataPropertiesDialog( K3bDataItem* dataItem, TQWidge
i18n("and 1 directory", "and %n directories", dirItem->numDirs()) + ")" );
}
else {
labelMimeType->setPixmap( DesktopIcon("unknown", KIcon::SizeLarge) );
labelMimeType->setPixmap( DesktopIcon("unknown", TDEIcon::SizeLarge) );
m_labelType->setText( i18n("Special file") );
m_labelLocalName->hide();
m_labelLocalLocation->hide();

4
src/projects/k3bdataviewitem.cpp
Unescape View File

@ -210,9 +210,9 @@ void K3bDataFileViewItem::init( K3bFileItem* file )
// determine the mimetype
m_pMimeType = KMimeType::findByURL( KURL::fromPathOrURL(file->localPath()) );
if( !m_pMimeType )
setPixmap( 0, DesktopIcon( "unknown", 16, KIcon::DefaultState ) );
setPixmap( 0, DesktopIcon( "unknown", 16, TDEIcon::DefaultState ) );
else
setPixmap( 0, m_pMimeType->pixmap( KURL::fromPathOrURL(file->localPath()), KIcon::Desktop, 16, KIcon::DefaultState ) );
setPixmap( 0, m_pMimeType->pixmap( KURL::fromPathOrURL(file->localPath()), TDEIcon::Desktop, 16, TDEIcon::DefaultState ) );
}

2
src/projects/k3bmovixlistview.cpp
Unescape View File

@ -63,7 +63,7 @@ K3bMovixFileViewItem::K3bMovixFileViewItem( K3bMovixDoc* doc,
: K3bMovixListViewItem( doc, item, parent, after ),
KFileItem( 0, 0, KURL::fromPathOrURL(item->localPath()) )
{
setPixmap( 1, KFileItem::pixmap( 16, KIcon::DefaultState ) );
setPixmap( 1, KFileItem::pixmap( 16, TDEIcon::DefaultState ) );
setEditor( 1, LINE );
}

2
src/projects/k3bprojectburndialog.cpp
Unescape View File

@ -290,7 +290,7 @@ void K3bProjectBurnDialog::prepareGui()
groupCopies->setInsideSpacing( spacingHint() );
groupCopies->setInsideMargin( marginHint() );
TQLabel* pixLabel = new TQLabel( groupCopies );
pixLabel->setPixmap( SmallIcon( "cdcopy", KIcon::SizeMedium ) );
pixLabel->setPixmap( SmallIcon( "cdcopy", TDEIcon::SizeMedium ) );
pixLabel->setScaledContents( false );
m_spinCopies = new TQSpinBox( 1, 999, 1, groupCopies );

4
src/projects/k3bvcdtrackdialog.cpp
Unescape View File

@ -73,9 +73,9 @@ K3bVcdTrackDialog::K3bVcdTrackDialog( K3bVcdDoc* _doc, TQPtrList<K3bVcdTrack>& t
m_muxrate->setText( i18n( "%1 bit/s" ).arg( selectedTrack->muxrate() ) );
if ( selectedTrack->isSegment() )
m_labelMimeType->setPixmap( SmallIcon( "image", KIcon::SizeMedium ) );
m_labelMimeType->setPixmap( SmallIcon( "image", TDEIcon::SizeMedium ) );
else
m_labelMimeType->setPixmap( SmallIcon( "video", KIcon::SizeMedium ) );
m_labelMimeType->setPixmap( SmallIcon( "video", TDEIcon::SizeMedium ) );
fillGui();
}

2
src/rip/videodvd/k3bvideodvdrippingtitlelistview.cpp
Unescape View File

@ -193,7 +193,7 @@ protected:
preW = h*16/9;
p->drawRect( ( w - preW ) / 2, ( height() - h ) / 2, preW, h );
TQPixmap noIcon = TDEApplication::kApplication()->iconLoader()->loadIcon( "no", KIcon::NoGroup, KIcon::SizeSmall, KIcon::DefaultState, 0, true );
TQPixmap noIcon = TDEApplication::kApplication()->iconLoader()->loadIcon( "no", TDEIcon::NoGroup, TDEIcon::SizeSmall, TDEIcon::DefaultState, 0, true );
p->drawPixmap( ( w - noIcon.width() ) / 2, ( height() - noIcon.height() ) / 2, noIcon );
}
else {

Write Preview
Loading…
Cancel
Save