From 9c311999b52ef01846d5ad249899b6de4d593fb7 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Wed, 22 Oct 2014 01:27:28 -0500 Subject: [PATCH] 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 --- kipi-plugins/acquireimages/acquireimagedialog.cpp | 2 +- kipi-plugins/calendar/monthwidget.cpp | 2 +- kipi-plugins/ipodexport/ipodexportdialog.cpp | 2 +- kipi-plugins/kameraklient/cameraiconview.cpp | 10 +++++----- kipi-plugins/kameraklient/gpfileiteminfodlg.cpp | 6 +++--- kipi-plugins/mpegencoder/plugin_mpegencoder.cpp | 2 +- kipi-plugins/sendimages/sendimagesdialog.cpp | 2 +- 7 files changed, 13 insertions(+), 13 deletions(-) diff --git a/kipi-plugins/acquireimages/acquireimagedialog.cpp b/kipi-plugins/acquireimages/acquireimagedialog.cpp index a780827..40e8e31 100644 --- a/kipi-plugins/acquireimages/acquireimagedialog.cpp +++ b/kipi-plugins/acquireimages/acquireimagedialog.cpp @@ -179,7 +179,7 @@ void AcquireImageDialog::setupImageOptions(void) page_setupImageOptions = addPage( i18n("Target Image"), i18n("Target Image Options"), - BarIcon("image", TDEIcon::SizeMedium ) ); + BarIcon("image-x-generic", TDEIcon::SizeMedium ) ); TQVBoxLayout *vlay = new TQVBoxLayout( page_setupImageOptions, 0, spacingHint() ); diff --git a/kipi-plugins/calendar/monthwidget.cpp b/kipi-plugins/calendar/monthwidget.cpp index 31929bb..7d6dcd6 100644 --- a/kipi-plugins/calendar/monthwidget.cpp +++ b/kipi-plugins/calendar/monthwidget.cpp @@ -126,7 +126,7 @@ void MonthWidget::setImage( const KURL &url ) CalSettings::instance()->setImage(month_, imagePath_); TDEIconLoader* iconLoader = TDEApplication::kApplication()->iconLoader(); - TQPixmap pix = iconLoader->loadIcon("image", TDEIcon::NoGroup, 64 ); + TQPixmap pix = iconLoader->loadIcon(""image-x-generic", TDEIcon::NoGroup, 64 ); if ( pixmap_ ) delete pixmap_; pixmap_ = new TQPixmap( pix ); diff --git a/kipi-plugins/ipodexport/ipodexportdialog.cpp b/kipi-plugins/ipodexport/ipodexportdialog.cpp index c3d5ddd..a97096d 100644 --- a/kipi-plugins/ipodexport/ipodexportdialog.cpp +++ b/kipi-plugins/ipodexport/ipodexportdialog.cpp @@ -225,7 +225,7 @@ UploadDialog::getIpodAlbumPhotos( IpodAlbumItem *item, Itdb_PhotoAlbum *album ) gint photo_id = photo->id; last = new IpodPhotoItem( item, last, photo ); last->setText( 0, TQString::number( photo_id ) ); - last->setPixmap( 0, TDEGlobal::iconLoader()->loadIcon( "image", TDEIcon::Toolbar, TDEIcon::SizeSmall ) ); + last->setPixmap( 0, TDEGlobal::iconLoader()->loadIcon( ""image-x-generic", TDEIcon::Toolbar, TDEIcon::SizeSmall ) ); } } diff --git a/kipi-plugins/kameraklient/cameraiconview.cpp b/kipi-plugins/kameraklient/cameraiconview.cpp index 795a029..6a6b0cc 100644 --- a/kipi-plugins/kameraklient/cameraiconview.cpp +++ b/kipi-plugins/kameraklient/cameraiconview.cpp @@ -62,7 +62,7 @@ CameraIconView::CameraIconView(TQWidget *parent) : ThumbView(parent) { } CameraIconView::~CameraIconView() { - delete d; + delete d; } void CameraIconView::setThumbnailSize() { @@ -81,13 +81,13 @@ void CameraIconView::setThumbnailSize() { } p.end(); d->imagePix = pix; - createPixmap(d->imagePix, "image", scale); + createPixmap(d->imagePix, "image-x-generic", scale); d->audioPix = pix; - createPixmap(d->audioPix, "sound", scale); + createPixmap(d->audioPix, "audio-x-generic", scale); d->videoPix = pix; - createPixmap(d->videoPix, "video", scale); + createPixmap(d->videoPix, "video-x-generic", scale); d->unknownPix = pix; - createPixmap(d->unknownPix, "document", scale); + createPixmap(d->unknownPix, "text-x-generic", scale); } void CameraIconView::createPixmap(TQPixmap& pix, const TQString& icon, double scale) { diff --git a/kipi-plugins/kameraklient/gpfileiteminfodlg.cpp b/kipi-plugins/kameraklient/gpfileiteminfodlg.cpp index f0fc7ed..fa62b29 100644 --- a/kipi-plugins/kameraklient/gpfileiteminfodlg.cpp +++ b/kipi-plugins/kameraklient/gpfileiteminfodlg.cpp @@ -56,13 +56,13 @@ GPFileItemInfoDlg::GPFileItemInfoDlg(const GPFileItemInfo& info, thumbLabel->setPaletteBackgroundColor(colorGroup().base()); if (!pixmap) { if (info.mime.contains("image")) - thumbLabel->setPixmap(DesktopIcon("image")); + thumbLabel->setPixmap(DesktopIcon("image-x-generic")); else if (info.mime.contains("audio")) thumbLabel->setPixmap(DesktopIcon("audio")); else if (info.mime.contains("video")) - thumbLabel->setPixmap(DesktopIcon("video")); + thumbLabel->setPixmap(DesktopIcon("video-x-generic")); else - thumbLabel->setPixmap(DesktopIcon("document")); + thumbLabel->setPixmap(DesktopIcon("text-x-generic")); } else thumbLabel->setPixmap(*pixmap); diff --git a/kipi-plugins/mpegencoder/plugin_mpegencoder.cpp b/kipi-plugins/mpegencoder/plugin_mpegencoder.cpp index e4ec880..88498a2 100644 --- a/kipi-plugins/mpegencoder/plugin_mpegencoder.cpp +++ b/kipi-plugins/mpegencoder/plugin_mpegencoder.cpp @@ -60,7 +60,7 @@ void Plugin_Mpegencoder::setup( TQWidget* widget ) KIPI::Plugin::setup( widget ); m_actionMPEGEncoder = new TDEAction (i18n("Create MPEG Slide Show..."), - "video", + "video-x-generic", 0, this, TQT_SLOT(slotActivate()), diff --git a/kipi-plugins/sendimages/sendimagesdialog.cpp b/kipi-plugins/sendimages/sendimagesdialog.cpp index f4c6242..aa8aeb8 100644 --- a/kipi-plugins/sendimages/sendimagesdialog.cpp +++ b/kipi-plugins/sendimages/sendimagesdialog.cpp @@ -250,7 +250,7 @@ void SendImagesDialog::setupImagesList(void) page_setupImagesList = addPage(i18n("Images"), i18n("Images to EMail"), - BarIcon("image", TDEIcon::SizeMedium)); + BarIcon("image-x-generic", TDEIcon::SizeMedium)); TQVBoxLayout *vlay = new TQVBoxLayout( page_setupImagesList, 0, spacingHint() );