| 871c8786 | 2014-10-22 01:27:23 | Timothy Pearson |
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 |
||
|
M digikam/digikam/albumiconview.cpp M digikam/digikam/pixmapmanager.cpp M digikam/imageplugins/coreplugin/iccprooftool.cpp M digikam/imageplugins/coreplugin/imageeffect_iccproof.cpp M digikam/libs/dialogs/imagedialog.cpp M digikam/libs/imageproperties/imagepropertiessidebar.cpp M digikam/libs/imageproperties/imagepropertiessidebarcamgui.cpp M digikam/libs/thumbbar/thumbbar.cpp M digikam/libs/widgets/metadata/metadatawidget.cpp M digikam/utilities/cameragui/cameraiconview.cpp M digikam/utilities/lighttable/lighttablebar.cpp M digikam/utilities/setup/setup.cpp M digikam/utilities/setup/setupmime.cpp |
||
diff --git a/digikam/digikam/albumiconview.cpp b/digikam/digikam/albumiconview.cpp
index c8ccf53..2d3a7a4 100644
--- a/digikam/digikam/albumiconview.cpp
+++ b/digikam/digikam/albumiconview.cpp
@@ -1286,7 +1286,7 @@
if (urls.isEmpty())
return;
- TQPixmap icon(DesktopIcon("image", 48));
+ TQPixmap icon(DesktopIcon("image-x-generic", 48));
int w = icon.width();
int h = icon.height();
diff --git a/digikam/digikam/pixmapmanager.cpp b/digikam/digikam/pixmapmanager.cpp
index b63ab7d..5ae5072 100644
--- a/digikam/digikam/pixmapmanager.cpp
+++ b/digikam/digikam/pixmapmanager.cpp
@@ -196,16 +196,16 @@
{
if (settings->getImageFileFilter().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()))
{
- img = DesktopIcon("video", TDEIcon::SizeEnormous).convertToImage();
+ img = DesktopIcon("video-x-generic", TDEIcon::SizeEnormous).convertToImage();
}
else if (settings->getAudioFileFilter().upper().contains(ext.upper()))
{
- img = DesktopIcon("sound", TDEIcon::SizeEnormous).convertToImage();
+ img = DesktopIcon("audio-x-generic", TDEIcon::SizeEnormous).convertToImage();
}
}
diff --git a/digikam/imageplugins/coreplugin/iccprooftool.cpp b/digikam/imageplugins/coreplugin/iccprooftool.cpp
index 9c7c3fe..19e0fbc 100644
--- a/digikam/imageplugins/coreplugin/iccprooftool.cpp
+++ b/digikam/imageplugins/coreplugin/iccprooftool.cpp
@@ -201,7 +201,7 @@
//---------- "General" Page Setup ----------------------------------
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>"));
TQGridLayout *zeroPageLayout = new TQGridLayout(generalOptions, 5, 1);
diff --git a/digikam/imageplugins/coreplugin/imageeffect_iccproof.cpp b/digikam/imageplugins/coreplugin/imageeffect_iccproof.cpp
index fb0f8d7..058a4ae 100644
--- a/digikam/imageplugins/coreplugin/imageeffect_iccproof.cpp
+++ b/digikam/imageplugins/coreplugin/imageeffect_iccproof.cpp
@@ -188,7 +188,7 @@
//---------- "General" Page Setup ----------------------------------
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>"));
TQGridLayout *zeroPageLayout = new TQGridLayout(generalOptions, 5, 1, spacingHint());
diff --git a/digikam/libs/dialogs/imagedialog.cpp b/digikam/libs/dialogs/imagedialog.cpp
index ade4b98..879d7b0 100644
--- a/digikam/libs/dialogs/imagedialog.cpp
+++ b/digikam/libs/dialogs/imagedialog.cpp
@@ -230,7 +230,7 @@
void ImageDialogPreview::slotFailedThumbnail(const KURL& /*url*/)
{
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));
}
diff --git a/digikam/libs/imageproperties/imagepropertiessidebar.cpp b/digikam/libs/imageproperties/imagepropertiessidebar.cpp
index 9f1dccc..c54721c 100644
--- a/digikam/libs/imageproperties/imagepropertiessidebar.cpp
+++ b/digikam/libs/imageproperties/imagepropertiessidebar.cpp
@@ -66,7 +66,7 @@
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_colorTab, SmallIcon("blend"), i18n("Colors"));
diff --git a/digikam/libs/imageproperties/imagepropertiessidebarcamgui.cpp b/digikam/libs/imageproperties/imagepropertiessidebarcamgui.cpp
index 6a13df1..f69b7f4 100644
--- a/digikam/libs/imageproperties/imagepropertiessidebarcamgui.cpp
+++ b/digikam/libs/imageproperties/imagepropertiessidebarcamgui.cpp
@@ -98,7 +98,7 @@
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"));
// ----------------------------------------------------------
diff --git a/digikam/libs/thumbbar/thumbbar.cpp b/digikam/libs/thumbbar/thumbbar.cpp
index fecfbf1..63cdb64 100644
--- a/digikam/libs/thumbbar/thumbbar.cpp
+++ b/digikam/libs/thumbbar/thumbbar.cpp
@@ -802,7 +802,7 @@
return;
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)
{
diff --git a/digikam/libs/widgets/metadata/metadatawidget.cpp b/digikam/libs/widgets/metadata/metadatawidget.cpp
index 4ccfbbf..040c6c6 100644
--- a/digikam/libs/widgets/metadata/metadatawidget.cpp
+++ b/digikam/libs/widgets/metadata/metadatawidget.cpp
@@ -108,14 +108,14 @@
d->levelButtons->setFrameShape(TQFrame::NoFrame);
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);
TQWhatsThis::add( simpleLevel, i18n( "Switch the tags view to a simple human-readable list" ) );
TQToolTip::add( simpleLevel, i18n( "Simple list" ));
d->levelButtons->insert(simpleLevel, SIMPLE);
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);
TQWhatsThis::add( fullLevel, i18n( "Switch the tags view to a full list" ) );
TQToolTip::add( fullLevel, i18n( "Full list" ));
diff --git a/digikam/utilities/cameragui/cameraiconview.cpp b/digikam/utilities/cameragui/cameraiconview.cpp
index 86b39e2..a482839 100644
--- a/digikam/utilities/cameragui/cameraiconview.cpp
+++ b/digikam/utilities/cameragui/cameraiconview.cpp
@@ -310,7 +310,7 @@
else
{
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)
.convertToImage();
}
@@ -687,7 +687,7 @@
TQDragObject * drag = new CameraItemListDrag(lst, d->cameraUI);
if (drag)
{
- TQPixmap icon(DesktopIcon("image", 48));
+ TQPixmap icon(DesktopIcon("image-x-generic", 48));
int w = icon.width();
int h = icon.height();
diff --git a/digikam/utilities/lighttable/lighttablebar.cpp b/digikam/utilities/lighttable/lighttablebar.cpp
index e20f7be..d5e2166 100644
--- a/digikam/utilities/lighttable/lighttablebar.cpp
+++ b/digikam/utilities/lighttable/lighttablebar.cpp
@@ -638,7 +638,7 @@
imageIDs.append(item->info()->id());
albumIDs.append(item->info()->albumID());
- TQPixmap icon(DesktopIcon("image", 48));
+ TQPixmap icon(DesktopIcon("image-x-generic", 48));
int w = icon.width();
int h = icon.height();
diff --git a/digikam/utilities/setup/setup.cpp b/digikam/utilities/setup/setup.cpp
index fa8e4f3..7450d60 100644
--- a/digikam/utilities/setup/setup.cpp
+++ b/digikam/utilities/setup/setup.cpp
@@ -168,7 +168,7 @@
d->lighttablePage = new SetupLightTable(d->page_lighttable);
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->page_iofiles = addPage(i18n("Save Images"), i18n("Image Editor: Settings for Saving Images Files"),
diff --git a/digikam/utilities/setup/setupmime.cpp b/digikam/utilities/setup/setupmime.cpp
index e1fc680..594dece 100644
--- a/digikam/utilities/setup/setupmime.cpp
+++ b/digikam/utilities/setup/setupmime.cpp
@@ -88,7 +88,7 @@
TQGridLayout* grid1 = new TQGridLayout(imageFileFilterBox->layout(), 1, 1, KDialog::spacingHint());
TQLabel *logoLabel1 = new TQLabel(imageFileFilterBox);
- logoLabel1->setPixmap(DesktopIcon("image"));
+ logoLabel1->setPixmap(DesktopIcon("image-x-generic"));
TQLabel *imageFileFilterLabel = new TQLabel(imageFileFilterBox);
imageFileFilterLabel->setText(i18n("Show only &image files with extensions:"));
@@ -119,7 +119,7 @@
TQGridLayout* grid2 = new TQGridLayout(movieFileFilterBox->layout(), 1, 1, KDialog::spacingHint());
TQLabel *logoLabel2 = new TQLabel(movieFileFilterBox);
- logoLabel2->setPixmap(DesktopIcon("video"));
+ logoLabel2->setPixmap(DesktopIcon("video-x-generic"));
TQLabel *movieFileFilterLabel = new TQLabel(movieFileFilterBox);
movieFileFilterLabel->setText(i18n("Show only &movie files with extensions:"));
@@ -150,7 +150,7 @@
TQGridLayout* grid3 = new TQGridLayout(audioFileFilterBox->layout(), 1, 1, KDialog::spacingHint());
TQLabel *logoLabel3 = new TQLabel(audioFileFilterBox);
- logoLabel3->setPixmap(DesktopIcon("sound"));
+ logoLabel3->setPixmap(DesktopIcon("audio-x-generic"));
TQLabel *audioFileFilterLabel = new TQLabel(audioFileFilterBox);
audioFileFilterLabel->setText(i18n("Show only &audio files with extensions:"));
|
||