diff --git a/data/icons.qrc b/data/icons.qrc index 4512b3110..df5f5ee2a 100644 --- a/data/icons.qrc +++ b/data/icons.qrc @@ -57,11 +57,13 @@ icons/128x128/mcintosh-player.png icons/128x128/mcintosh-text.png icons/128x128/media-eject.png - icons/128x128/media-forward.png icons/128x128/media-pause.png icons/128x128/media-play.png - icons/128x128/media-rewind.png icons/128x128/media-stop.png + icons/128x128/media-skip-forward.png + icons/128x128/media-skip-backward.png + icons/128x128/media-seek-forward.png + icons/128x128/media-seek-backward.png icons/128x128/nvidia.png icons/128x128/realtek.png icons/128x128/search.png @@ -146,11 +148,13 @@ icons/64x64/mcintosh-player.png icons/64x64/mcintosh-text.png icons/64x64/media-eject.png - icons/64x64/media-forward.png icons/64x64/media-pause.png icons/64x64/media-play.png - icons/64x64/media-rewind.png icons/64x64/media-stop.png + icons/64x64/media-skip-forward.png + icons/64x64/media-skip-backward.png + icons/64x64/media-seek-forward.png + icons/64x64/media-seek-backward.png icons/64x64/nvidia.png icons/64x64/pulseaudio.png icons/64x64/realtek.png @@ -237,13 +241,15 @@ icons/48x48/mcintosh.png icons/48x48/mcintosh-text.png icons/48x48/media-eject.png - icons/48x48/media-forward.png icons/48x48/media-pause.png icons/48x48/media-playlist-repeat.png icons/48x48/media-playlist-shuffle.png icons/48x48/media-play.png - icons/48x48/media-rewind.png icons/48x48/media-stop.png + icons/48x48/media-skip-forward.png + icons/48x48/media-skip-backward.png + icons/48x48/media-seek-forward.png + icons/48x48/media-seek-backward.png icons/48x48/nvidia.png icons/48x48/pulseaudio.png icons/48x48/realtek.png @@ -330,13 +336,15 @@ icons/32x32/mcintosh.png icons/32x32/mcintosh-text.png icons/32x32/media-eject.png - icons/32x32/media-forward.png icons/32x32/media-pause.png icons/32x32/media-playlist-repeat.png icons/32x32/media-playlist-shuffle.png icons/32x32/media-play.png - icons/32x32/media-rewind.png icons/32x32/media-stop.png + icons/32x32/media-skip-forward.png + icons/32x32/media-skip-backward.png + icons/32x32/media-seek-forward.png + icons/32x32/media-seek-backward.png icons/32x32/nvidia.png icons/32x32/pulseaudio.png icons/32x32/realtek.png @@ -423,13 +431,15 @@ icons/22x22/mcintosh.png icons/22x22/mcintosh-text.png icons/22x22/media-eject.png - icons/22x22/media-forward.png icons/22x22/media-pause.png icons/22x22/media-playlist-repeat.png icons/22x22/media-playlist-shuffle.png icons/22x22/media-play.png - icons/22x22/media-rewind.png icons/22x22/media-stop.png + icons/22x22/media-skip-forward.png + icons/22x22/media-skip-backward.png + icons/22x22/media-seek-forward.png + icons/22x22/media-seek-backward.png icons/22x22/nvidia.png icons/22x22/pulseaudio.png icons/22x22/realtek.png diff --git a/data/icons/128x128/media-forward.png b/data/icons/128x128/media-forward.png deleted file mode 100644 index 01b50df07..000000000 Binary files a/data/icons/128x128/media-forward.png and /dev/null differ diff --git a/data/icons/128x128/media-pause.png b/data/icons/128x128/media-pause.png index 8af21c05d..d5b9c83cf 100644 Binary files a/data/icons/128x128/media-pause.png and b/data/icons/128x128/media-pause.png differ diff --git a/data/icons/128x128/media-play.png b/data/icons/128x128/media-play.png index 566356265..8b8a32b81 100644 Binary files a/data/icons/128x128/media-play.png and b/data/icons/128x128/media-play.png differ diff --git a/data/icons/128x128/media-rewind.png b/data/icons/128x128/media-rewind.png deleted file mode 100644 index 2f3e93478..000000000 Binary files a/data/icons/128x128/media-rewind.png and /dev/null differ diff --git a/data/icons/128x128/media-seek-backward.png b/data/icons/128x128/media-seek-backward.png new file mode 100644 index 000000000..95cc10fd5 Binary files /dev/null and b/data/icons/128x128/media-seek-backward.png differ diff --git a/data/icons/128x128/media-seek-forward.png b/data/icons/128x128/media-seek-forward.png new file mode 100644 index 000000000..fd976956d Binary files /dev/null and b/data/icons/128x128/media-seek-forward.png differ diff --git a/data/icons/128x128/media-skip-backward.png b/data/icons/128x128/media-skip-backward.png new file mode 100644 index 000000000..64cff200f Binary files /dev/null and b/data/icons/128x128/media-skip-backward.png differ diff --git a/data/icons/128x128/media-skip-forward.png b/data/icons/128x128/media-skip-forward.png new file mode 100644 index 000000000..33a99e134 Binary files /dev/null and b/data/icons/128x128/media-skip-forward.png differ diff --git a/data/icons/128x128/media-stop.png b/data/icons/128x128/media-stop.png index 8a655398b..b5829bc06 100644 Binary files a/data/icons/128x128/media-stop.png and b/data/icons/128x128/media-stop.png differ diff --git a/data/icons/22x22/media-forward.png b/data/icons/22x22/media-forward.png deleted file mode 100644 index c11ee5d31..000000000 Binary files a/data/icons/22x22/media-forward.png and /dev/null differ diff --git a/data/icons/22x22/media-pause.png b/data/icons/22x22/media-pause.png index 0b85f80c0..c0e92bd4f 100644 Binary files a/data/icons/22x22/media-pause.png and b/data/icons/22x22/media-pause.png differ diff --git a/data/icons/22x22/media-play.png b/data/icons/22x22/media-play.png index 2ea18a217..c5bbd2209 100644 Binary files a/data/icons/22x22/media-play.png and b/data/icons/22x22/media-play.png differ diff --git a/data/icons/22x22/media-rewind.png b/data/icons/22x22/media-rewind.png deleted file mode 100644 index 6e1976b45..000000000 Binary files a/data/icons/22x22/media-rewind.png and /dev/null differ diff --git a/data/icons/22x22/media-seek-backward.png b/data/icons/22x22/media-seek-backward.png new file mode 100644 index 000000000..cbb13f0cb Binary files /dev/null and b/data/icons/22x22/media-seek-backward.png differ diff --git a/data/icons/22x22/media-seek-forward.png b/data/icons/22x22/media-seek-forward.png new file mode 100644 index 000000000..16c13a5be Binary files /dev/null and b/data/icons/22x22/media-seek-forward.png differ diff --git a/data/icons/22x22/media-skip-backward.png b/data/icons/22x22/media-skip-backward.png new file mode 100644 index 000000000..77379c8ae Binary files /dev/null and b/data/icons/22x22/media-skip-backward.png differ diff --git a/data/icons/22x22/media-skip-forward.png b/data/icons/22x22/media-skip-forward.png new file mode 100644 index 000000000..dd88135f6 Binary files /dev/null and b/data/icons/22x22/media-skip-forward.png differ diff --git a/data/icons/22x22/media-stop.png b/data/icons/22x22/media-stop.png index 65364ea52..87104f9c4 100644 Binary files a/data/icons/22x22/media-stop.png and b/data/icons/22x22/media-stop.png differ diff --git a/data/icons/32x32/media-forward.png b/data/icons/32x32/media-forward.png deleted file mode 100644 index 567d8380d..000000000 Binary files a/data/icons/32x32/media-forward.png and /dev/null differ diff --git a/data/icons/32x32/media-pause.png b/data/icons/32x32/media-pause.png index 3e4545221..7c93ba6fb 100644 Binary files a/data/icons/32x32/media-pause.png and b/data/icons/32x32/media-pause.png differ diff --git a/data/icons/32x32/media-play.png b/data/icons/32x32/media-play.png index 38a3159a9..3370fc313 100644 Binary files a/data/icons/32x32/media-play.png and b/data/icons/32x32/media-play.png differ diff --git a/data/icons/32x32/media-rewind.png b/data/icons/32x32/media-rewind.png deleted file mode 100644 index c714221b2..000000000 Binary files a/data/icons/32x32/media-rewind.png and /dev/null differ diff --git a/data/icons/32x32/media-seek-backward.png b/data/icons/32x32/media-seek-backward.png new file mode 100644 index 000000000..e8a638b37 Binary files /dev/null and b/data/icons/32x32/media-seek-backward.png differ diff --git a/data/icons/32x32/media-seek-forward.png b/data/icons/32x32/media-seek-forward.png new file mode 100644 index 000000000..cecfd84c6 Binary files /dev/null and b/data/icons/32x32/media-seek-forward.png differ diff --git a/data/icons/32x32/media-skip-backward.png b/data/icons/32x32/media-skip-backward.png new file mode 100644 index 000000000..6a43b4097 Binary files /dev/null and b/data/icons/32x32/media-skip-backward.png differ diff --git a/data/icons/32x32/media-skip-forward.png b/data/icons/32x32/media-skip-forward.png new file mode 100644 index 000000000..b5a1a33f1 Binary files /dev/null and b/data/icons/32x32/media-skip-forward.png differ diff --git a/data/icons/32x32/media-stop.png b/data/icons/32x32/media-stop.png index 74069ec32..74cb05b6a 100644 Binary files a/data/icons/32x32/media-stop.png and b/data/icons/32x32/media-stop.png differ diff --git a/data/icons/48x48/media-forward.png b/data/icons/48x48/media-forward.png deleted file mode 100644 index 82187e2b0..000000000 Binary files a/data/icons/48x48/media-forward.png and /dev/null differ diff --git a/data/icons/48x48/media-pause.png b/data/icons/48x48/media-pause.png index 5a657c516..52dbebed5 100644 Binary files a/data/icons/48x48/media-pause.png and b/data/icons/48x48/media-pause.png differ diff --git a/data/icons/48x48/media-play.png b/data/icons/48x48/media-play.png index 2fbb5e101..d05d0bded 100644 Binary files a/data/icons/48x48/media-play.png and b/data/icons/48x48/media-play.png differ diff --git a/data/icons/48x48/media-rewind.png b/data/icons/48x48/media-rewind.png deleted file mode 100644 index db81a8813..000000000 Binary files a/data/icons/48x48/media-rewind.png and /dev/null differ diff --git a/data/icons/48x48/media-seek-backward.png b/data/icons/48x48/media-seek-backward.png new file mode 100644 index 000000000..932b675d8 Binary files /dev/null and b/data/icons/48x48/media-seek-backward.png differ diff --git a/data/icons/48x48/media-seek-forward.png b/data/icons/48x48/media-seek-forward.png new file mode 100644 index 000000000..104aa6bc7 Binary files /dev/null and b/data/icons/48x48/media-seek-forward.png differ diff --git a/data/icons/48x48/media-skip-backward.png b/data/icons/48x48/media-skip-backward.png new file mode 100644 index 000000000..ebc1cabb3 Binary files /dev/null and b/data/icons/48x48/media-skip-backward.png differ diff --git a/data/icons/48x48/media-skip-forward.png b/data/icons/48x48/media-skip-forward.png new file mode 100644 index 000000000..7a213d4bb Binary files /dev/null and b/data/icons/48x48/media-skip-forward.png differ diff --git a/data/icons/48x48/media-stop.png b/data/icons/48x48/media-stop.png index 180b001b8..ecd6891b2 100644 Binary files a/data/icons/48x48/media-stop.png and b/data/icons/48x48/media-stop.png differ diff --git a/data/icons/64x64/media-forward.png b/data/icons/64x64/media-forward.png deleted file mode 100644 index 7e5a3f455..000000000 Binary files a/data/icons/64x64/media-forward.png and /dev/null differ diff --git a/data/icons/64x64/media-pause.png b/data/icons/64x64/media-pause.png index c1470bf05..cd57ec1dc 100644 Binary files a/data/icons/64x64/media-pause.png and b/data/icons/64x64/media-pause.png differ diff --git a/data/icons/64x64/media-play.png b/data/icons/64x64/media-play.png index bbc09e14b..bede81d41 100644 Binary files a/data/icons/64x64/media-play.png and b/data/icons/64x64/media-play.png differ diff --git a/data/icons/64x64/media-rewind.png b/data/icons/64x64/media-rewind.png deleted file mode 100644 index e7348957b..000000000 Binary files a/data/icons/64x64/media-rewind.png and /dev/null differ diff --git a/data/icons/64x64/media-seek-backward.png b/data/icons/64x64/media-seek-backward.png new file mode 100644 index 000000000..0224b7ac1 Binary files /dev/null and b/data/icons/64x64/media-seek-backward.png differ diff --git a/data/icons/64x64/media-seek-forward.png b/data/icons/64x64/media-seek-forward.png new file mode 100644 index 000000000..516be01bf Binary files /dev/null and b/data/icons/64x64/media-seek-forward.png differ diff --git a/data/icons/64x64/media-skip-backward.png b/data/icons/64x64/media-skip-backward.png new file mode 100644 index 000000000..61b518749 Binary files /dev/null and b/data/icons/64x64/media-skip-backward.png differ diff --git a/data/icons/64x64/media-skip-forward.png b/data/icons/64x64/media-skip-forward.png new file mode 100644 index 000000000..0d56aecdb Binary files /dev/null and b/data/icons/64x64/media-skip-forward.png differ diff --git a/data/icons/64x64/media-stop.png b/data/icons/64x64/media-stop.png index 00b199244..1576448b5 100644 Binary files a/data/icons/64x64/media-stop.png and b/data/icons/64x64/media-stop.png differ diff --git a/data/icons/full/media-forward.png b/data/icons/full/media-forward.png deleted file mode 100644 index 328e47e4b..000000000 Binary files a/data/icons/full/media-forward.png and /dev/null differ diff --git a/data/icons/full/media-pause.png b/data/icons/full/media-pause.png index 0d73fe2f4..d5b9c83cf 100644 Binary files a/data/icons/full/media-pause.png and b/data/icons/full/media-pause.png differ diff --git a/data/icons/full/media-play.png b/data/icons/full/media-play.png index 5c8c97a2f..8b8a32b81 100644 Binary files a/data/icons/full/media-play.png and b/data/icons/full/media-play.png differ diff --git a/data/icons/full/media-rewind.png b/data/icons/full/media-rewind.png deleted file mode 100644 index d92c7755b..000000000 Binary files a/data/icons/full/media-rewind.png and /dev/null differ diff --git a/data/icons/full/media-seek-backward.png b/data/icons/full/media-seek-backward.png new file mode 100644 index 000000000..95cc10fd5 Binary files /dev/null and b/data/icons/full/media-seek-backward.png differ diff --git a/data/icons/full/media-seek-forward.png b/data/icons/full/media-seek-forward.png new file mode 100644 index 000000000..fd976956d Binary files /dev/null and b/data/icons/full/media-seek-forward.png differ diff --git a/data/icons/full/media-skip-backward.png b/data/icons/full/media-skip-backward.png new file mode 100644 index 000000000..64cff200f Binary files /dev/null and b/data/icons/full/media-skip-backward.png differ diff --git a/data/icons/full/media-skip-forward.png b/data/icons/full/media-skip-forward.png new file mode 100644 index 000000000..33a99e134 Binary files /dev/null and b/data/icons/full/media-skip-forward.png differ diff --git a/data/icons/full/media-stop.png b/data/icons/full/media-stop.png index d2e9d1032..b5829bc06 100644 Binary files a/data/icons/full/media-stop.png and b/data/icons/full/media-stop.png differ diff --git a/src/core/mainwindow.cpp b/src/core/mainwindow.cpp index 8db086152..d09b08625 100644 --- a/src/core/mainwindow.cpp +++ b/src/core/mainwindow.cpp @@ -347,11 +347,11 @@ MainWindow::MainWindow(Application *app, SystemTrayIcon *tray_icon, OSD *osd, co ui_->action_open_file->setIcon(IconLoader::Load("document-open")); ui_->action_open_cd->setIcon(IconLoader::Load("cd")); - ui_->action_previous_track->setIcon(IconLoader::Load("media-rewind")); + ui_->action_previous_track->setIcon(IconLoader::Load("media-skip-backward")); ui_->action_play_pause->setIcon(IconLoader::Load("media-play")); ui_->action_stop->setIcon(IconLoader::Load("media-stop")); ui_->action_stop_after_this_track->setIcon(IconLoader::Load("media-stop")); - ui_->action_next_track->setIcon(IconLoader::Load("media-forward")); + ui_->action_next_track->setIcon(IconLoader::Load("media-skip-forward")); ui_->action_quit->setIcon(IconLoader::Load("application-exit")); // Playlist @@ -601,7 +601,7 @@ MainWindow::MainWindow(Application *app, SystemTrayIcon *tray_icon, OSD *osd, co playlist_queue_play_next_ = playlist_menu_->addAction(IconLoader::Load("go-next"), tr("Queue selected tracks to play next"), this, SLOT(PlaylistQueuePlayNext())); playlist_queue_play_next_->setShortcut(QKeySequence("Ctrl+Shift+D")); ui_->playlist->addAction(playlist_queue_play_next_); - playlist_skip_ = playlist_menu_->addAction(IconLoader::Load("media-forward"), tr("Toggle skip status"), this, SLOT(PlaylistSkip())); + playlist_skip_ = playlist_menu_->addAction(IconLoader::Load("media-skip-forward"), tr("Toggle skip status"), this, SLOT(PlaylistSkip())); ui_->playlist->addAction(playlist_skip_); playlist_menu_->addSeparator(); @@ -1641,7 +1641,7 @@ void MainWindow::PlaylistRightClick(const QPoint &global_pos, const QModelIndex if (not_in_queue == 0) playlist_queue_->setIcon(IconLoader::Load("go-previous")); else playlist_queue_->setIcon(IconLoader::Load("go-next")); - if (in_skipped < selected) playlist_skip_->setIcon(IconLoader::Load("media-forward")); + if (in_skipped < selected) playlist_skip_->setIcon(IconLoader::Load("media-skip-forward")); else playlist_skip_->setIcon(IconLoader::Load("media-play"));