| 130a7f36 | 2014-10-12 17:47:33 | Timothy Pearson |
Bring stop, lock, exit, and run icons into XDG compliance |
||
|
M amarok/src/covermanager.cpp M amarok/src/playlistbrowseritem.cpp |
||
diff --git a/amarok/src/covermanager.cpp b/amarok/src/covermanager.cpp
index dbf3892..33b2ff9 100644
--- a/amarok/src/covermanager.cpp
+++ b/amarok/src/covermanager.cpp
@@ -199,7 +199,7 @@
m_statusBar->addWidget( m_statusLabel = new KSqueezedTextLabel( m_statusBar ), 4 );
m_statusLabel->setIndent( 3 );
m_statusBar->addWidget( m_progressBox = new TQHBox( m_statusBar ), 1, true );
- KPushButton *stopButton = new KPushButton( KGuiItem(i18n("Abort"), "stop"), m_progressBox );
+ KPushButton *stopButton = new KPushButton( KGuiItem(i18n("Abort"), "process-stop"), m_progressBox );
connect( stopButton, TQT_SIGNAL(clicked()), TQT_SLOT(stopFetching()) );
m_progress = new KProgress( m_progressBox );
m_progress->setCenterIndicator( true );
diff --git a/amarok/src/playlistbrowseritem.cpp b/amarok/src/playlistbrowseritem.cpp
index b66a89c..676c8fc 100644
--- a/amarok/src/playlistbrowseritem.cpp
+++ b/amarok/src/playlistbrowseritem.cpp
@@ -2845,7 +2845,7 @@
TDETrader::OfferList offers = TDETrader::self()->query( mimetype->name(), "Type == 'Application'" );
if( offers.empty() || (offers.size()==1 && offers.first()->name()=="Amarok") )
{
- menu.insertItem( SmallIconSet( Amarok::icon( "run" ) ), i18n( "&Open With..."), OPEN_WITH );
+ menu.insertItem( SmallIconSet( Amarok::icon( "system-run" ) ), i18n( "&Open With..."), OPEN_WITH );
}
else
{
@@ -2860,8 +2860,8 @@
++i;
}
openMenu->insertSeparator();
- openMenu->insertItem( SmallIconSet( Amarok::icon( "run" ) ), i18n( "&Other..."), OPEN_WITH );
- menu.insertItem( SmallIconSet( Amarok::icon( "run" ) ), i18n("&Open With"), openMenu, OPEN_WITH );
+ openMenu->insertItem( SmallIconSet( Amarok::icon( "system-run" ) ), i18n( "&Other..."), OPEN_WITH );
+ menu.insertItem( SmallIconSet( Amarok::icon( "system-run" ) ), i18n("&Open With"), openMenu, OPEN_WITH );
}
if( MediaBrowser::isAvailable() )
|
||
| 57b59fe2 | 2014-10-12 17:52:30 | Timothy Pearson |
Merge branch 'master' of http://scm.trinitydesktop.org/scm/git/amarok |
||
|
M cmake |
||
diff --git a/cmake b/cmake index 0d5ca8b..08c6f54 160000 --- a/cmake +++ b/cmake -Subproject commit 0d5ca8bebbb638b05f1d11537ce41fcf73d10ac9 +Subproject commit 08c6f54d6f80554caa671847417cf04326adb63c |
||