| 8e55e5b7 | 2014-10-13 20:09:55 | Timothy Pearson |
Bring mail_forward, mail_new, mail_replyall, mail_reply, mail_send, player_pause, player_play, player_stop, player_rew, player_fwd, player_start, player_end, rotate_ccw, rotate_cw, window_fullscreen, window_nofullscreen, window_new, viewmagfit, viewmag+, viewmag1, and viewmag- icons into XDG compliance |
||
|
M amarok/src/amarokcore/crashhandler.cpp M amarok/src/iconloader.cpp M amarok/src/konquisidebar/universalamarok.cpp |
||
diff --git a/amarok/src/amarokcore/crashhandler.cpp b/amarok/src/amarokcore/crashhandler.cpp
index 5fc0f27..a41d24c 100644
--- a/amarok/src/amarokcore/crashhandler.cpp
+++ b/amarok/src/amarokcore/crashhandler.cpp
@@ -289,7 +289,7 @@
layout = new TQHBoxLayout( layout, 6 );
layout->addItem( new TQSpacerItem( 6, 6, TQSizePolicy::Expanding ) );
- layout->add( new KPushButton( KGuiItem( i18n("Send Email"), "mail_send" ), this, "email" ) );
+ layout->add( new KPushButton( KGuiItem( i18n("Send Email"), "mail-send" ), this, "email" ) );
layout->add( new KPushButton( KStdGuiItem::close(), this, "close" ) );
static_cast<TQPushButton*>(child("email"))->setDefault( true );
diff --git a/amarok/src/iconloader.cpp b/amarok/src/iconloader.cpp
index 7429147..167e6a7 100644
--- a/amarok/src/iconloader.cpp
+++ b/amarok/src/iconloader.cpp
@@ -39,7 +39,7 @@
iconMap["artist"] = "personal";
iconMap["audioscrobbler"] = "audioscrobbler";
iconMap["love"] = "bookmark";
- iconMap["back"] = "player_start";
+ iconMap["back"] = "media-skip-backward";
iconMap["burn"] = "cdrom_unmount";
iconMap["change_language"] = "configure";
iconMap["clock"] = "history";
@@ -62,9 +62,9 @@
iconMap["magnatune"] = "cd";
iconMap["mostplayed"] = "favorites";
iconMap["music"] = "today";
- iconMap["next"] = "player_end";
- iconMap["pause"] = "player_pause";
- iconMap["play"] = "player_play";
+ iconMap["next"] = "media-skip-forward";
+ iconMap["pause"] = "media-playback-pause";
+ iconMap["play"] = "media-playback-start";
iconMap["playlist"] = "player_playlist_2";
iconMap["playlist_clear"] = "view_remove";
iconMap["playlist_refresh"] = "rebuild";
@@ -93,7 +93,7 @@
iconMap["settings_indicator"] = "tv";
iconMap["settings_playback"] = "kmix";
iconMap["settings_view"] = "colors";
- iconMap["stop"] = "player_stop";
+ iconMap["stop"] = "media-playback-stop";
iconMap["podcast"] = "podcast";
iconMap["podcast2"] = "podcast_new";
iconMap["track"] = "sound";
diff --git a/amarok/src/konquisidebar/universalamarok.cpp b/amarok/src/konquisidebar/universalamarok.cpp
index 8feea13..3c95f2d 100644
--- a/amarok/src/konquisidebar/universalamarok.cpp
+++ b/amarok/src/konquisidebar/universalamarok.cpp
@@ -105,11 +105,11 @@
TDEToolBar* toolBar=new TDEToolBar(widget, "PlayerControls");
toolBar->setIconSize(16);
- toolBar->insertButton( "player_start",0, TQT_SIGNAL( clicked() ), this, TQT_SLOT( sendPrev() ) );
- toolBar->insertButton( "player_play", 0, TQT_SIGNAL( clicked() ), this, TQT_SLOT( sendPlay() ) );
- toolBar->insertButton( "player_pause",0, TQT_SIGNAL( clicked() ), this, TQT_SLOT( sendPause() ) );
- toolBar->insertButton( "player_stop", 0, TQT_SIGNAL( clicked() ), this, TQT_SLOT( sendStop() ) );
- toolBar->insertButton( "player_end", 0, TQT_SIGNAL( clicked() ), this, TQT_SLOT( sendNext() ) );
+ toolBar->insertButton( "media-skip-backward",0, TQT_SIGNAL( clicked() ), this, TQT_SLOT( sendPrev() ) );
+ toolBar->insertButton( "media-playback-start", 0, TQT_SIGNAL( clicked() ), this, TQT_SLOT( sendPlay() ) );
+ toolBar->insertButton( "media-playback-pause",0, TQT_SIGNAL( clicked() ), this, TQT_SLOT( sendPause() ) );
+ toolBar->insertButton( "media-playback-stop", 0, TQT_SIGNAL( clicked() ), this, TQT_SLOT( sendStop() ) );
+ toolBar->insertButton( "media-skip-forward", 0, TQT_SIGNAL( clicked() ), this, TQT_SLOT( sendNext() ) );
toolBar->insertSeparator();
toolBar->insertButton( "arts", 0, TQT_SIGNAL( clicked() ), this, TQT_SLOT( sendMute() ) );
|
||
| c6aa5636 | 2014-10-13 20:10:17 | Timothy Pearson |
Merge branch 'master' of http://scm.trinitydesktop.org/scm/git/amarok |
||
|
M cmake |
||
diff --git a/cmake b/cmake index 08c6f54..47d7755 160000 --- a/cmake +++ b/cmake -Subproject commit 08c6f54d6f80554caa671847417cf04326adb63c +Subproject commit 47d775518c382c77f663a70bb23fad93e6810090 |
||