summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2014-10-22 01:27:23 -0500
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2014-10-22 01:27:23 -0500
commit5959228db1a8f8905363bc8b8c37881db3d23cc6 (patch)
treee4e1a1d37823ff061a2a996e9d1b4c0fd4f07e2a
parent47fe9ffffa44e4811c4e70032d275d735f68e421 (diff)
downloadamarok-5959228db1a8f8905363bc8b8c37881db3d23cc6.tar.gz
amarok-5959228db1a8f8905363bc8b8c37881db3d23cc6.zip
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
-rw-r--r--amarok/src/engine/nmm/HostListItem.cpp4
-rw-r--r--amarok/src/iconloader.cpp4
-rw-r--r--amarok/src/konquisidebar/universalamarok.cpp2
3 files changed, 5 insertions, 5 deletions
diff --git a/amarok/src/engine/nmm/HostListItem.cpp b/amarok/src/engine/nmm/HostListItem.cpp
index d73b94ef..34dacdba 100644
--- a/amarok/src/engine/nmm/HostListItem.cpp
+++ b/amarok/src/engine/nmm/HostListItem.cpp
@@ -51,9 +51,9 @@ HostListItem::HostListItem( TQListView *parent, TQString hostname, bool audio, b
{
setText( HostListItem::Hostname, hostname);
- setPixmap( HostListItem::Status, SmallIcon("info") );
+ setPixmap( HostListItem::Status, SmallIcon("application-vnd.tde.info") );
setText( HostListItem::Status, i18n("Unknown") );
- setPixmap( HostListItem::Playback, SmallIcon("info") );
+ setPixmap( HostListItem::Playback, SmallIcon("application-vnd.tde.info") );
setText( HostListItem::Playback, i18n("Unknown") );
if( 24 /*m_pixmapInset.height()*/ > height() )
diff --git a/amarok/src/iconloader.cpp b/amarok/src/iconloader.cpp
index 012f29f6..cddea71e 100644
--- a/amarok/src/iconloader.cpp
+++ b/amarok/src/iconloader.cpp
@@ -58,7 +58,7 @@ Amarok::icon( const TQString& name ) //declared in amarok.h
iconMap["files"] = "folder";
iconMap["files2"] = "folder_red";
iconMap["info"] = "info";
- iconMap["lyrics"] = "document";
+ iconMap["lyrics"] = "text-x-generic";
iconMap["magnatune"] = "cd";
iconMap["mostplayed"] = "favorites";
iconMap["music"] = "today";
@@ -96,7 +96,7 @@ Amarok::icon( const TQString& name ) //declared in amarok.h
iconMap["stop"] = "media-playback-stop";
iconMap["podcast"] = "podcast";
iconMap["podcast2"] = "podcast_new";
- iconMap["track"] = "sound";
+ iconMap["track"] = "audio-x-generic";
iconMap["undo"] = "edit-undo";
iconMap["visualizations"] = "visualizations";
iconMap["zoom"] = "edit-find";
diff --git a/amarok/src/konquisidebar/universalamarok.cpp b/amarok/src/konquisidebar/universalamarok.cpp
index 2df9475f..cdc3dafa 100644
--- a/amarok/src/konquisidebar/universalamarok.cpp
+++ b/amarok/src/konquisidebar/universalamarok.cpp
@@ -85,7 +85,7 @@ UniversalAmarok::UniversalAmarok(TDEInstance *inst,TQObject *parent,TQWidget *wi
TDEToolBar *topBar = new TDEToolBar( widget, "Topbar" );
topBar->setIconSize(16);
topBar->insertButton( "today", 0, TQT_SIGNAL( clicked() ), this, TQT_SLOT( currentTrack() ) );
- topBar->insertButton( "document", 0, TQT_SIGNAL( clicked() ), this, TQT_SLOT( lyrics() ) );
+ topBar->insertButton( "text-x-generic", 0, TQT_SIGNAL( clicked() ), this, TQT_SLOT( lyrics() ) );
topBar->insertButton( "preferences-desktop-personal", 0, TQT_SIGNAL( clicked() ), this, TQT_SLOT( wiki() ) );
browser = new TDEHTMLPart(widget, "widget-browser");