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

pull/1/head
Timothy Pearson 10 years ago
parent 86c0c6b141
commit 871c87863b

@ -1286,7 +1286,7 @@ void AlbumIconView::startDrag()
if (urls.isEmpty()) if (urls.isEmpty())
return; return;
TQPixmap icon(DesktopIcon("image", 48)); TQPixmap icon(DesktopIcon("image-x-generic", 48));
int w = icon.width(); int w = icon.width();
int h = icon.height(); int h = icon.height();

@ -197,15 +197,15 @@ void PixmapManager::slotFailedThumbnail(const KURL& url)
if (settings->getImageFileFilter().upper().contains(ext.upper()) || if (settings->getImageFileFilter().upper().contains(ext.upper()) ||
settings->getRawFileFilter().upper().contains(ext.upper())) settings->getRawFileFilter().upper().contains(ext.upper()))
{ {
img = DesktopIcon("image", TDEIcon::SizeEnormous).convertToImage(); img = DesktopIcon("image-x-generic", TDEIcon::SizeEnormous).convertToImage();
} }
else if (settings->getMovieFileFilter().upper().contains(ext.upper())) else if (settings->getMovieFileFilter().upper().contains(ext.upper()))
{ {
img = DesktopIcon("video", TDEIcon::SizeEnormous).convertToImage(); img = DesktopIcon("video-x-generic", TDEIcon::SizeEnormous).convertToImage();
} }
else if (settings->getAudioFileFilter().upper().contains(ext.upper())) else if (settings->getAudioFileFilter().upper().contains(ext.upper()))
{ {
img = DesktopIcon("sound", TDEIcon::SizeEnormous).convertToImage(); img = DesktopIcon("audio-x-generic", TDEIcon::SizeEnormous).convertToImage();
} }
} }

@ -201,7 +201,7 @@ ICCProofTool::ICCProofTool(TQObject* parent)
//---------- "General" Page Setup ---------------------------------- //---------- "General" Page Setup ----------------------------------
m_toolBoxWidgets->insertItem(GENERALPAGE, generalOptions, m_toolBoxWidgets->insertItem(GENERALPAGE, generalOptions,
SmallIconSet("misc"), i18n("General Settings")); SmallIconSet("application-vnd.tde.misc"), i18n("General Settings"));
TQWhatsThis::add(generalOptions, i18n("<p>Here you can set general parameters.</p>")); TQWhatsThis::add(generalOptions, i18n("<p>Here you can set general parameters.</p>"));
TQGridLayout *zeroPageLayout = new TQGridLayout(generalOptions, 5, 1); TQGridLayout *zeroPageLayout = new TQGridLayout(generalOptions, 5, 1);

@ -188,7 +188,7 @@ ImageEffect_ICCProof::ImageEffect_ICCProof(TQWidget* parent)
//---------- "General" Page Setup ---------------------------------- //---------- "General" Page Setup ----------------------------------
m_toolBoxWidgets->insertItem(GENERALPAGE, generalOptions, m_toolBoxWidgets->insertItem(GENERALPAGE, generalOptions,
SmallIconSet("misc"), i18n("General Settings")); SmallIconSet("application-vnd.tde.misc"), i18n("General Settings"));
TQWhatsThis::add(generalOptions, i18n("<p>Here you can set general parameters.</p>")); TQWhatsThis::add(generalOptions, i18n("<p>Here you can set general parameters.</p>"));
TQGridLayout *zeroPageLayout = new TQGridLayout(generalOptions, 5, 1, spacingHint()); TQGridLayout *zeroPageLayout = new TQGridLayout(generalOptions, 5, 1, spacingHint());

@ -230,7 +230,7 @@ void ImageDialogPreview::slotGotThumbnail(const KURL& url, const TQPixmap& pix)
void ImageDialogPreview::slotFailedThumbnail(const KURL& /*url*/) void ImageDialogPreview::slotFailedThumbnail(const KURL& /*url*/)
{ {
TDEIconLoader* iconLoader = TDEApplication::kApplication()->iconLoader(); TDEIconLoader* iconLoader = TDEApplication::kApplication()->iconLoader();
d->imageLabel->setPixmap(iconLoader->loadIcon("image", TDEIcon::NoGroup, 128, d->imageLabel->setPixmap(iconLoader->loadIcon(""image-x-generic", TDEIcon::NoGroup, 128,
TDEIcon::DefaultState, 0, true)); TDEIcon::DefaultState, 0, true));
} }

@ -66,7 +66,7 @@ ImagePropertiesSideBar::ImagePropertiesSideBar(TQWidget *parent, const char *nam
setSplitter(splitter); setSplitter(splitter);
appendTab(m_propertiesTab, SmallIcon("info"), i18n("Properties")); appendTab(m_propertiesTab, SmallIcon("application-vnd.tde.info"), i18n("Properties"));
appendTab(m_metadataTab, SmallIcon("exifinfo"), i18n("Metadata")); appendTab(m_metadataTab, SmallIcon("exifinfo"), i18n("Metadata"));
appendTab(m_colorTab, SmallIcon("blend"), i18n("Colors")); appendTab(m_colorTab, SmallIcon("blend"), i18n("Colors"));

@ -98,7 +98,7 @@ ImagePropertiesSideBarCamGui::ImagePropertiesSideBarCamGui(TQWidget *parent, con
setSplitter(splitter); setSplitter(splitter);
appendTab(d->cameraItemTab, SmallIcon("info"), i18n("Properties")); appendTab(d->cameraItemTab, SmallIcon("application-vnd.tde.info"), i18n("Properties"));
appendTab(d->metadataTab, SmallIcon("exifinfo"), i18n("Metadata")); appendTab(d->metadataTab, SmallIcon("exifinfo"), i18n("Metadata"));
// ---------------------------------------------------------- // ----------------------------------------------------------

@ -802,7 +802,7 @@ void ThumbBarView::slotFailedThumbnail(const KURL& url)
return; return;
TDEIconLoader* iconLoader = TDEApplication::kApplication()->iconLoader(); TDEIconLoader* iconLoader = TDEApplication::kApplication()->iconLoader();
TQPixmap pix = iconLoader->loadIcon("image", TDEIcon::NoGroup, ThumbnailSize::Huge); TQPixmap pix = iconLoader->loadIcon(""image-x-generic", TDEIcon::NoGroup, ThumbnailSize::Huge);
if (item->d->pixmap) if (item->d->pixmap)
{ {

@ -108,14 +108,14 @@ MetadataWidget::MetadataWidget(TQWidget* parent, const char* name)
d->levelButtons->setFrameShape(TQFrame::NoFrame); d->levelButtons->setFrameShape(TQFrame::NoFrame);
TQPushButton *simpleLevel = new TQPushButton( d->levelButtons ); TQPushButton *simpleLevel = new TQPushButton( d->levelButtons );
simpleLevel->setPixmap( iconLoader->loadIcon( "ascii", (TDEIcon::Group)TDEIcon::Toolbar ) ); simpleLevel->setPixmap( iconLoader->loadIcon( ""text-vnd.tde.ascii", (TDEIcon::Group)TDEIcon::Toolbar ) );
simpleLevel->setToggleButton(true); simpleLevel->setToggleButton(true);
TQWhatsThis::add( simpleLevel, i18n( "Switch the tags view to a simple human-readable list" ) ); TQWhatsThis::add( simpleLevel, i18n( "Switch the tags view to a simple human-readable list" ) );
TQToolTip::add( simpleLevel, i18n( "Simple list" )); TQToolTip::add( simpleLevel, i18n( "Simple list" ));
d->levelButtons->insert(simpleLevel, SIMPLE); d->levelButtons->insert(simpleLevel, SIMPLE);
TQPushButton *fullLevel = new TQPushButton( d->levelButtons ); TQPushButton *fullLevel = new TQPushButton( d->levelButtons );
fullLevel->setPixmap( iconLoader->loadIcon( "document", (TDEIcon::Group)TDEIcon::Toolbar ) ); fullLevel->setPixmap( iconLoader->loadIcon( ""text-x-generic", (TDEIcon::Group)TDEIcon::Toolbar ) );
fullLevel->setToggleButton(true); fullLevel->setToggleButton(true);
TQWhatsThis::add( fullLevel, i18n( "Switch the tags view to a full list" ) ); TQWhatsThis::add( fullLevel, i18n( "Switch the tags view to a full list" ) );
TQToolTip::add( fullLevel, i18n( "Full list" )); TQToolTip::add( fullLevel, i18n( "Full list" ));

@ -310,7 +310,7 @@ void CameraIconView::addItem(const GPItemInfo& info)
else else
{ {
TDEIconLoader *iconLoader = TDEApplication::kApplication()->iconLoader(); TDEIconLoader *iconLoader = TDEApplication::kApplication()->iconLoader();
thumb = iconLoader->loadIcon("empty", TDEIcon::Desktop, thumb = iconLoader->loadIcon(""application-x-zerosize", TDEIcon::Desktop,
ThumbnailSize::Huge, TDEIcon::DefaultState, 0, true) ThumbnailSize::Huge, TDEIcon::DefaultState, 0, true)
.convertToImage(); .convertToImage();
} }
@ -687,7 +687,7 @@ void CameraIconView::startDrag()
TQDragObject * drag = new CameraItemListDrag(lst, d->cameraUI); TQDragObject * drag = new CameraItemListDrag(lst, d->cameraUI);
if (drag) if (drag)
{ {
TQPixmap icon(DesktopIcon("image", 48)); TQPixmap icon(DesktopIcon("image-x-generic", 48));
int w = icon.width(); int w = icon.width();
int h = icon.height(); int h = icon.height();

@ -638,7 +638,7 @@ void LightTableBar::startDrag()
imageIDs.append(item->info()->id()); imageIDs.append(item->info()->id());
albumIDs.append(item->info()->albumID()); albumIDs.append(item->info()->albumID());
TQPixmap icon(DesktopIcon("image", 48)); TQPixmap icon(DesktopIcon("image-x-generic", 48));
int w = icon.width(); int w = icon.width();
int h = icon.height(); int h = icon.height();

@ -168,7 +168,7 @@ Setup::Setup(TQWidget* parent, const char* name, Setup::Page page)
d->lighttablePage = new SetupLightTable(d->page_lighttable); d->lighttablePage = new SetupLightTable(d->page_lighttable);
d->page_editor = addPage(i18n("Image Editor"), i18n("Image Editor General Settings"), d->page_editor = addPage(i18n("Image Editor"), i18n("Image Editor General Settings"),
BarIcon("image", TDEIcon::SizeMedium)); BarIcon("image-x-generic", TDEIcon::SizeMedium));
d->editorPage = new SetupEditor(d->page_editor); d->editorPage = new SetupEditor(d->page_editor);
d->page_iofiles = addPage(i18n("Save Images"), i18n("Image Editor: Settings for Saving Images Files"), d->page_iofiles = addPage(i18n("Save Images"), i18n("Image Editor: Settings for Saving Images Files"),

@ -88,7 +88,7 @@ SetupMime::SetupMime(TQWidget* parent )
TQGridLayout* grid1 = new TQGridLayout(imageFileFilterBox->layout(), 1, 1, KDialog::spacingHint()); TQGridLayout* grid1 = new TQGridLayout(imageFileFilterBox->layout(), 1, 1, KDialog::spacingHint());
TQLabel *logoLabel1 = new TQLabel(imageFileFilterBox); TQLabel *logoLabel1 = new TQLabel(imageFileFilterBox);
logoLabel1->setPixmap(DesktopIcon("image")); logoLabel1->setPixmap(DesktopIcon("image-x-generic"));
TQLabel *imageFileFilterLabel = new TQLabel(imageFileFilterBox); TQLabel *imageFileFilterLabel = new TQLabel(imageFileFilterBox);
imageFileFilterLabel->setText(i18n("Show only &image files with extensions:")); imageFileFilterLabel->setText(i18n("Show only &image files with extensions:"));
@ -119,7 +119,7 @@ SetupMime::SetupMime(TQWidget* parent )
TQGridLayout* grid2 = new TQGridLayout(movieFileFilterBox->layout(), 1, 1, KDialog::spacingHint()); TQGridLayout* grid2 = new TQGridLayout(movieFileFilterBox->layout(), 1, 1, KDialog::spacingHint());
TQLabel *logoLabel2 = new TQLabel(movieFileFilterBox); TQLabel *logoLabel2 = new TQLabel(movieFileFilterBox);
logoLabel2->setPixmap(DesktopIcon("video")); logoLabel2->setPixmap(DesktopIcon("video-x-generic"));
TQLabel *movieFileFilterLabel = new TQLabel(movieFileFilterBox); TQLabel *movieFileFilterLabel = new TQLabel(movieFileFilterBox);
movieFileFilterLabel->setText(i18n("Show only &movie files with extensions:")); movieFileFilterLabel->setText(i18n("Show only &movie files with extensions:"));
@ -150,7 +150,7 @@ SetupMime::SetupMime(TQWidget* parent )
TQGridLayout* grid3 = new TQGridLayout(audioFileFilterBox->layout(), 1, 1, KDialog::spacingHint()); TQGridLayout* grid3 = new TQGridLayout(audioFileFilterBox->layout(), 1, 1, KDialog::spacingHint());
TQLabel *logoLabel3 = new TQLabel(audioFileFilterBox); TQLabel *logoLabel3 = new TQLabel(audioFileFilterBox);
logoLabel3->setPixmap(DesktopIcon("sound")); logoLabel3->setPixmap(DesktopIcon("audio-x-generic"));
TQLabel *audioFileFilterLabel = new TQLabel(audioFileFilterBox); TQLabel *audioFileFilterLabel = new TQLabel(audioFileFilterBox);
audioFileFilterLabel->setText(i18n("Show only &audio files with extensions:")); audioFileFilterLabel->setText(i18n("Show only &audio files with extensions:"));

Loading…
Cancel
Save