From 83c4cc5dbddab07fb1677dc7e45cf47e1b13fd13 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Wed, 22 Oct 2014 01:27:23 -0500 Subject: Bring most mimetypes in line with XDG specifications. The following are not fully verified in source as of this commit due to ubiquity: html, empty, info, make, man, misc, source, unknown --- src/k3bdiskinfoview.cpp | 4 ++-- src/k3bjobprogressdialog.cpp | 2 +- src/misc/k3bcdimagewritingdialog.cpp | 8 ++++---- src/misc/k3bisoimagewritingdialog.cpp | 2 +- src/option/k3boptiondialog.cpp | 2 +- src/projects/k3bdataview.cpp | 2 +- src/projects/k3bdataviewitem.cpp | 4 ++-- src/projects/k3bmixeddirtreeview.cpp | 2 +- src/projects/k3bvcdlistviewitem.cpp | 8 ++++---- src/projects/k3bvcdtrackdialog.cpp | 8 ++++---- 10 files changed, 21 insertions(+), 21 deletions(-) diff --git a/src/k3bdiskinfoview.cpp b/src/k3bdiskinfoview.cpp index 8801c39..1f3e68f 100644 --- a/src/k3bdiskinfoview.cpp +++ b/src/k3bdiskinfoview.cpp @@ -254,10 +254,10 @@ void K3bDiskInfoView::reloadMedium() item = new TDEListViewItem( trackItem, item ); TQString text; if( track.type() == K3bTrack::AUDIO ) { - item->setPixmap( 0, SmallIcon( "sound" ) ); + item->setPixmap( 0, SmallIcon( "audio-x-generic" ) ); text = i18n("Audio"); } else { - item->setPixmap( 0, SmallIcon( "tar" ) ); + item->setPixmap( 0, SmallIcon( "application-x-tar" ) ); if( track.mode() == K3bTrack::MODE1 ) text = i18n("Data/Mode1"); else if( track.mode() == K3bTrack::MODE2 ) diff --git a/src/k3bjobprogressdialog.cpp b/src/k3bjobprogressdialog.cpp index fb5fb5c..14a710f 100644 --- a/src/k3bjobprogressdialog.cpp +++ b/src/k3bjobprogressdialog.cpp @@ -342,7 +342,7 @@ void K3bJobProgressDialog::slotInfoMessage( const TQString& infoString, int type break; case K3bJob::INFO: default: - currentInfoItem->setPixmap( 0, SmallIcon( "info" ) ); + currentInfoItem->setPixmap( 0, SmallIcon( "application-vnd.tde.info" ) ); } // This should scroll down (hopefully!) diff --git a/src/misc/k3bcdimagewritingdialog.cpp b/src/misc/k3bcdimagewritingdialog.cpp index 28da8d3..64e06f5 100644 --- a/src/misc/k3bcdimagewritingdialog.cpp +++ b/src/misc/k3bcdimagewritingdialog.cpp @@ -589,7 +589,7 @@ void K3bCdImageWritingDialog::createIso9660InfoItems( K3bIso9660* isoF ) i18n("Detected:"), i18n("Iso9660 image") ); isoRootItem->setForegroundColor( 0, palette().disabled().foreground() ); - isoRootItem->setPixmap( 0, SmallIcon( "cdimage") ); + isoRootItem->setPixmap( 0, SmallIcon( "application-x-cd-image") ); TDEIO::filesize_t size = K3b::filesize( KURL::fromPathOrURL(isoF->fileName()) ); K3bListViewItem* item = new K3bListViewItem( isoRootItem, m_infoView->lastItem(), @@ -654,7 +654,7 @@ void K3bCdImageWritingDialog::createCdrecordCloneItems( const TQString& tocFile, i18n("Detected:"), i18n("Cdrecord clone image") ); isoRootItem->setForegroundColor( 0, palette().disabled().foreground() ); - isoRootItem->setPixmap( 0, SmallIcon( "cdimage") ); + isoRootItem->setPixmap( 0, SmallIcon( "application-x-cd-image") ); K3bListViewItem* item = new K3bListViewItem( isoRootItem, m_infoView->lastItem(), i18n("Filesize:"), TDEIO::convertSize( K3b::filesize(KURL::fromPathOrURL(imageFile)) ) ); @@ -682,7 +682,7 @@ void K3bCdImageWritingDialog::createCueBinItems( const TQString& cueFile, const i18n("Detected:"), i18n("Cue/bin image") ); isoRootItem->setForegroundColor( 0, palette().disabled().foreground() ); - isoRootItem->setPixmap( 0, SmallIcon( "cdimage") ); + isoRootItem->setPixmap( 0, SmallIcon( "application-x-cd-image") ); K3bListViewItem* item = new K3bListViewItem( isoRootItem, m_infoView->lastItem(), i18n("Filesize:"), TDEIO::convertSize( K3b::filesize(KURL::fromPathOrURL(imageFile)) ) ); @@ -710,7 +710,7 @@ void K3bCdImageWritingDialog::createAudioCueItems( const K3bCueFileParser& cp ) i18n("Detected:"), i18n("Audio Cue Image") ); rootItem->setForegroundColor( 0, palette().disabled().foreground() ); - rootItem->setPixmap( 0, SmallIcon( "sound") ); + rootItem->setPixmap( 0, SmallIcon( "audio-x-generic") ); K3bListViewItem* trackParent = new K3bListViewItem( rootItem, i18n("%n track", "%n tracks", cp.toc().count() ), diff --git a/src/misc/k3bisoimagewritingdialog.cpp b/src/misc/k3bisoimagewritingdialog.cpp index 03db6cf..af072a8 100644 --- a/src/misc/k3bisoimagewritingdialog.cpp +++ b/src/misc/k3bisoimagewritingdialog.cpp @@ -320,7 +320,7 @@ void K3bIsoImageWritingDialog::updateImageSize( const TQString& path ) K3bListViewItem* isoRootItem = new K3bListViewItem( m_infoView, m_infoView->lastItem(), i18n("Iso9660 image") ); isoRootItem->setForegroundColor( 0, palette().disabled().foreground() ); - isoRootItem->setPixmap( 0, SmallIcon( "cdimage") ); + isoRootItem->setPixmap( 0, SmallIcon( "application-x-cd-image") ); K3bListViewItem* item = new K3bListViewItem( isoRootItem, m_infoView->lastItem(), i18n("Filesize:"), TDEIO::convertSize( imageSize ) ); diff --git a/src/option/k3boptiondialog.cpp b/src/option/k3boptiondialog.cpp index de0f57b..ea661c3 100644 --- a/src/option/k3boptiondialog.cpp +++ b/src/option/k3boptiondialog.cpp @@ -186,7 +186,7 @@ void K3bOptionDialog::setupDevicePage() void K3bOptionDialog::setupMiscPage() { TQFrame* frame = addPage( i18n("Misc"), i18n("Miscellaneous Settings"), - TDEGlobal::instance()->iconLoader()->loadIcon( "misc", TDEIcon::NoGroup, TDEIcon::SizeMedium ) ); + TDEGlobal::instance()->iconLoader()->loadIcon( ""application-vnd.tde.misc", TDEIcon::NoGroup, TDEIcon::SizeMedium ) ); TQVBoxLayout* box = new TQVBoxLayout( frame ); box->setSpacing( 0 ); diff --git a/src/projects/k3bdataview.cpp b/src/projects/k3bdataview.cpp index 89653be..e42a966 100644 --- a/src/projects/k3bdataview.cpp +++ b/src/projects/k3bdataview.cpp @@ -80,7 +80,7 @@ K3bDataView::K3bDataView(K3bDataDoc* doc, TQWidget *parent, const char *name ) TDEAction* actionClearSession = new TDEAction(i18n("&Clear Imported Session"), "gear", 0, TQT_TQOBJECT(this), TQT_SLOT(clearImportedSession()), actionCollection(), "project_data_clear_imported_session" ); - TDEAction* actionEditBootImages = new TDEAction(i18n("&Edit Boot Images..."), "cdtrack", 0, TQT_TQOBJECT(this), + TDEAction* actionEditBootImages = new TDEAction(i18n("&Edit Boot Images..."), "application-x-cda", 0, TQT_TQOBJECT(this), TQT_SLOT(editBootImages()), actionCollection(), "project_data_edit_boot_images" ); diff --git a/src/projects/k3bdataviewitem.cpp b/src/projects/k3bdataviewitem.cpp index fb42b67..d55588e 100644 --- a/src/projects/k3bdataviewitem.cpp +++ b/src/projects/k3bdataviewitem.cpp @@ -300,7 +300,7 @@ void K3bDataRootViewItem::setText( int col, const TQString& text ) K3bSpecialDataViewItem::K3bSpecialDataViewItem( K3bSpecialDataItem* item, TQListView* parent ) : K3bDataViewItem( item, parent ) { - setPixmap( 0, SmallIcon("unknown") ); + setPixmap( 0, SmallIcon("text-x-katefilelist") ); } TQString K3bSpecialDataViewItem::text( int col ) const @@ -322,7 +322,7 @@ TQString K3bSpecialDataViewItem::text( int col ) const K3bSessionImportViewItem::K3bSessionImportViewItem( K3bSessionImportItem* item, TQListView* parent ) : K3bDataViewItem( item, parent ) { - setPixmap( 0, SmallIcon("unknown") ); + setPixmap( 0, SmallIcon("text-x-katefilelist") ); } TQString K3bSessionImportViewItem::text( int col ) const diff --git a/src/projects/k3bmixeddirtreeview.cpp b/src/projects/k3bmixeddirtreeview.cpp index f279054..153ee89 100644 --- a/src/projects/k3bmixeddirtreeview.cpp +++ b/src/projects/k3bmixeddirtreeview.cpp @@ -37,7 +37,7 @@ public: : K3bListViewItem( parent, after ), m_doc(doc) { - setPixmap( 0, SmallIcon("sound") ); + setPixmap( 0, SmallIcon("audio-x-generic") ); } TQString text( int col ) const { diff --git a/src/projects/k3bvcdlistviewitem.cpp b/src/projects/k3bvcdlistviewitem.cpp index 128d6b0..8c30bc0 100644 --- a/src/projects/k3bvcdlistviewitem.cpp +++ b/src/projects/k3bvcdlistviewitem.cpp @@ -110,17 +110,17 @@ bool K3bVcdListViewItem::animate() switch ( m_track->mpegType() ) { case 0: // MPEG_MOTION - setPixmap( 2, ( SmallIcon( "video" ) ) ); + setPixmap( 2, ( SmallIcon( "video-x-generic" ) ) ); break; case 1: // MPEG_STILL - setPixmap( 2, ( SmallIcon( "image" ) ) ); + setPixmap( 2, ( SmallIcon( "image-x-generic" ) ) ); break; case 2: // MPEG_AUDIO - setPixmap( 2, ( SmallIcon( "sound" ) ) ); + setPixmap( 2, ( SmallIcon( "audio-x-generic" ) ) ); break; default: - setPixmap( 2, ( SmallIcon( "video" ) ) ); + setPixmap( 2, ( SmallIcon( "video-x-generic" ) ) ); break; } diff --git a/src/projects/k3bvcdtrackdialog.cpp b/src/projects/k3bvcdtrackdialog.cpp index db97767..5a04840 100644 --- a/src/projects/k3bvcdtrackdialog.cpp +++ b/src/projects/k3bvcdtrackdialog.cpp @@ -73,9 +73,9 @@ K3bVcdTrackDialog::K3bVcdTrackDialog( K3bVcdDoc* _doc, TQPtrList& t m_muxrate->setText( i18n( "%1 bit/s" ).arg( selectedTrack->muxrate() ) ); if ( selectedTrack->isSegment() ) - m_labelMimeType->setPixmap( SmallIcon( "image", TDEIcon::SizeMedium ) ); + m_labelMimeType->setPixmap( SmallIcon( "image-x-generic", TDEIcon::SizeMedium ) ); else - m_labelMimeType->setPixmap( SmallIcon( "video", TDEIcon::SizeMedium ) ); + m_labelMimeType->setPixmap( SmallIcon( "video-x-generic", TDEIcon::SizeMedium ) ); fillGui(); } @@ -265,9 +265,9 @@ void K3bVcdTrackDialog::fillPbcGui() for ( track = m_tracks.first(); track; track = m_tracks.next() ) { TQPixmap pm; if ( track->isSegment() ) - pm = SmallIcon( "image" ); + pm = SmallIcon( "image-x-generic" ); else - pm = SmallIcon( "video" ); + pm = SmallIcon( "video-x-generic" ); TQString s = displayName( track ); if ( track != selectedTrack ) // donot insert selectedTrack, it was as "ItSelf" inserted to the begin of map -- cgit v1.2.3