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

pull/1/head
Timothy Pearson 8 years ago
parent 19ae0d4108
commit 8e55e5b7a4
  1. 2
      amarok/src/amarokcore/crashhandler.cpp
  2. 10
      amarok/src/iconloader.cpp
  3. 10
      amarok/src/konquisidebar/universalamarok.cpp

@ -289,7 +289,7 @@ Amarok::CrashHandlerWidget::CrashHandlerWidget()
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 );

@ -39,7 +39,7 @@ Amarok::icon( const TQString& name ) //declared in amarok.h
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 @@ Amarok::icon( const TQString& name ) //declared in amarok.h
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 @@ Amarok::icon( const TQString& name ) //declared in amarok.h
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";

@ -105,11 +105,11 @@ UniversalAmarok::UniversalAmarok(TDEInstance *inst,TQObject *parent,TQWidget *wi
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() ) );

Loading…
Cancel
Save