Use material icons in mpc toolbar

diff --git a/etc/images/mpc/README b/etc/images/mpc/README
deleted file mode 100644 (file)
index bf84c76..0000000
--- a/etc/images/mpc/README
+++ /dev/null
@@ -1,6 +0,0 @@
-COPYRIGHT AND LICENSE INFORMATION FOR IMAGE FILES
-
-Files: add.xpm ffwd.xpm next.xpm pause.xpm play.xpm prev.xpm rewind.xpm stop.xpm
-Author: Stefan Monnier <monnier@iro.umontreal.ca>
-Copyright (C) 2009-2022 Free Software Foundation, Inc.
-License: GNU General Public License version 3 or later (see COPYING)

diff --git a/etc/images/mpc/add.pbm b/etc/images/mpc/add.pbm
deleted file mode 100644 (file)
index 3745891..0000000
Binary files a/etc/images/mpc/add.pbm and /dev/null differ

diff --git a/etc/images/mpc/add.xpm b/etc/images/mpc/add.xpm
deleted file mode 100644 (file)
index 02893c9..0000000
--- a/etc/images/mpc/add.xpm
+++ /dev/null
@@ -1,31 +0,0 @@
-/* XPM */
-static char * stop_xpm[] = {
-"24 24 4 1",
-"      c None",
-".     s light1        c grey90",
-"X     s main  c grey70",
-"o     s shadow        c grey50",
-"                        ",
-" ...................... ",
-" .XXXXXXXXXXXXXXXXXXXXo ",
-" .XXXXXXXXXXXXXXXXXXXXo ",
-" .XXXXXXXXXXXXXXXXXXXXo ",
-" .XXXXXXXX....XXXXXXXXo ",
-" .XXXXXXXX.XXoXXXXXXXXo ",
-" .XXXXXXXX.XXoXXXXXXXXo ",
-" .XXXXXXXX.XXoXXXXXXXXo ",
-" .XXXXXXXX.XXoXXXXXXXXo ",
-" .XXX......XXo.....XXXo ",
-" .XXX.XXXXXXXXXXXXoXXXo ",
-" .XXX.XXXXXXXXXXXXoXXXo ",
-" .XXX.oooooXXooooooXXXo ",
-" .XXXXXXXX.XXoXXXXXXXXo ",
-" .XXXXXXXX.XXoXXXXXXXXo ",
-" .XXXXXXXX.XXoXXXXXXXXo ",
-" .XXXXXXXX.XXoXXXXXXXXo ",
-" .XXXXXXXX.oooXXXXXXXXo ",
-" .XXXXXXXXXXXXXXXXXXXXo ",
-" .XXXXXXXXXXXXXXXXXXXXo ",
-" .XXXXXXXXXXXXXXXXXXXXo ",
-" .ooooooooooooooooooooo ",
-"                        "};

diff --git a/etc/images/mpc/ffwd.pbm b/etc/images/mpc/ffwd.pbm
deleted file mode 100644 (file)
index ca8fabd..0000000
Binary files a/etc/images/mpc/ffwd.pbm and /dev/null differ

diff --git a/etc/images/mpc/ffwd.xpm b/etc/images/mpc/ffwd.xpm
deleted file mode 100644 (file)
index 0d1ca01..0000000
--- a/etc/images/mpc/ffwd.xpm
+++ /dev/null
@@ -1,33 +0,0 @@
-/* XPM */
-static char * ffwd_xpm[] = {
-"24 24 5 1",
-"      c None",
-".     s light1        c grey90",
-"X     s main  c grey70",
-"o     s shadow        c grey50",
-"O     s light2        c grey80",
-"                        ",
-" ...................... ",
-" .XXXXXXXXXXXXXXXXXXXXo ",
-" .XXXXXXXXXXXXXXXXXXXXo ",
-" .XXXXXXXXXXXXXXXXXXXXo ",
-" .XXX.OXXX.OXXXXXXXXXXo ",
-" .XXX.XOXX.XOXXXXXXXXXo ",
-" .XXX.XXOO.XXOOXXXXXXXo ",
-" .XXX.XXXX.XXXXOXXXXXXo ",
-" .XXX.XXXX.XXXXXOXXXXXo ",
-" .XXX.XXXX.XXXXXXOOXXXo ",
-" .XXX.XXXX.XXXXXXXXOXXo ",
-" .XXX.XXXX.XXXXXXXXoXXo ",
-" .XXX.XXXX.XXXXXXooXXXo ",
-" .XXX.XXXX.XXXXXoXXXXXo ",
-" .XXX.XXXX.XXXXoXXXXXXo ",
-" .XXX.XXoo.XXooXXXXXXXo ",
-" .XXX.XoXX.XoXXXXXXXXXo ",
-" .XXX.oXXX.oXXXXXXXXXXo ",
-" .XXXXXXXXXXXXXXXXXXXXo ",
-" .XXXXXXXXXXXXXXXXXXXXo ",
-" .XXXXXXXXXXXXXXXXXXXXo ",
-" .ooooooooooooooooooooo ",
-"                        "};
-

diff --git a/etc/images/mpc/next.pbm b/etc/images/mpc/next.pbm
deleted file mode 100644 (file)
index 41bcf4b..0000000
Binary files a/etc/images/mpc/next.pbm and /dev/null differ

diff --git a/etc/images/mpc/next.xpm b/etc/images/mpc/next.xpm
deleted file mode 100644 (file)
index af712de..0000000
--- a/etc/images/mpc/next.xpm
+++ /dev/null
@@ -1,33 +0,0 @@
-/* XPM */
-static char * next_xpm[] = {
-"24 24 5 1",
-"      c None",
-".     s light1        c grey90",
-"X     s main  c grey70",
-"o     s shadow        c grey50",
-"O     s light2        c grey80",
-"                        ",
-" ...................... ",
-" .XXXXXXXXXXXXXXXXXXXXo ",
-" .XXXXXXXXXXXXXXXXXXXXo ",
-" .XXXXXXXXXXXXXXXXXXXXo ",
-" .XXX.OXXXXXXXXX...XXXo ",
-" .XXX.XOXXXXXXXX.XoXXXo ",
-" .XXX.XXOOXXXXXX.XoXXXo ",
-" .XXX.XXXXOXXXXX.XoXXXo ",
-" .XXX.XXXXXOXXXX.XoXXXo ",
-" .XXX.XXXXXXOOXX.XoXXXo ",
-" .XXX.XXXXXXXXOX.XoXXXo ",
-" .XXX.XXXXXXXXoX.XoXXXo ",
-" .XXX.XXXXXXooXX.XoXXXo ",
-" .XXX.XXXXXoXXXX.XoXXXo ",
-" .XXX.XXXXoXXXXX.XoXXXo ",
-" .XXX.XXooXXXXXX.XoXXXo ",
-" .XXX.XoXXXXXXXX.XoXXXo ",
-" .XXX.oXXXXXXXXX.ooXXXo ",
-" .XXXXXXXXXXXXXXXXXXXXo ",
-" .XXXXXXXXXXXXXXXXXXXXo ",
-" .XXXXXXXXXXXXXXXXXXXXo ",
-" .ooooooooooooooooooooo ",
-"                        "};
-

diff --git a/etc/images/mpc/pause.pbm b/etc/images/mpc/pause.pbm
deleted file mode 100644 (file)
index 7d09d16..0000000
Binary files a/etc/images/mpc/pause.pbm and /dev/null differ

diff --git a/etc/images/mpc/pause.xpm b/etc/images/mpc/pause.xpm
deleted file mode 100644 (file)
index e02c3b8..0000000
--- a/etc/images/mpc/pause.xpm
+++ /dev/null
@@ -1,32 +0,0 @@
-/* XPM */
-static char * pause_xpm[] = {
-"24 24 4 1",
-"      c None",
-".     s light1        c grey90",
-"X     s main  c grey70",
-"o     s shadow        c grey50",
-"                        ",
-" ...................... ",
-" .XXXXXXXXXXXXXXXXXXXXo ",
-" .XXXXXXXXXXXXXXXXXXXXo ",
-" .XXXXXXXXXXXXXXXXXXXXo ",
-" .XXXX.....XX.....XXXXo ",
-" .XXXX.XXXoXX.XXXoXXXXo ",
-" .XXXX.XXXoXX.XXXoXXXXo ",
-" .XXXX.XXXoXX.XXXoXXXXo ",
-" .XXXX.XXXoXX.XXXoXXXXo ",
-" .XXXX.XXXoXX.XXXoXXXXo ",
-" .XXXX.XXXoXX.XXXoXXXXo ",
-" .XXXX.XXXoXX.XXXoXXXXo ",
-" .XXXX.XXXoXX.XXXoXXXXo ",
-" .XXXX.XXXoXX.XXXoXXXXo ",
-" .XXXX.XXXoXX.XXXoXXXXo ",
-" .XXXX.XXXoXX.XXXoXXXXo ",
-" .XXXX.XXXoXX.XXXoXXXXo ",
-" .XXXX.ooooXX.ooooXXXXo ",
-" .XXXXXXXXXXXXXXXXXXXXo ",
-" .XXXXXXXXXXXXXXXXXXXXo ",
-" .XXXXXXXXXXXXXXXXXXXXo ",
-" .ooooooooooooooooooooo ",
-"                        "};
-

diff --git a/etc/images/mpc/play.pbm b/etc/images/mpc/play.pbm
deleted file mode 100644 (file)
index a961bb5..0000000
Binary files a/etc/images/mpc/play.pbm and /dev/null differ

diff --git a/etc/images/mpc/play.xpm b/etc/images/mpc/play.xpm
deleted file mode 100644 (file)
index 9a6e289..0000000
--- a/etc/images/mpc/play.xpm
+++ /dev/null
@@ -1,33 +0,0 @@
-/* XPM */
-static char * play_xpm[] = {
-"24 24 5 1",
-"      c None",
-".     s light1        c grey90",
-"X     s main  c grey70",
-"o     s shadow        c grey50",
-"O     s light2        c grey80",
-"                        ",
-" ...................... ",
-" .XXXXXXXXXXXXXXXXXXXXo ",
-" .XXXXXXXXXXXXXXXXXXXXo ",
-" .XXXXXXXXXXXXXXXXXXXXo ",
-" .XXX.OOXXXXXXXXXXXXXXo ",
-" .XXX.XXOOXXXXXXXXXXXXo ",
-" .XXX.XXXXOOXXXXXXXXXXo ",
-" .XXX.XXXXXXOOXXXXXXXXo ",
-" .XXX.XXXXXXXXOOXXXXXXo ",
-" .XXX.XXXXXXXXXXOOXXXXo ",
-" .XXX.XXXXXXXXXXXXOXXXo ",
-" .XXX.XXXXXXXXXXXXoXXXo ",
-" .XXX.XXXXXXXXXXooXXXXo ",
-" .XXX.XXXXXXXXooXXXXXXo ",
-" .XXX.XXXXXXooXXXXXXXXo ",
-" .XXX.XXXXooXXXXXXXXXXo ",
-" .XXX.XXooXXXXXXXXXXXXo ",
-" .XXX.ooXXXXXXXXXXXXXXo ",
-" .XXXXXXXXXXXXXXXXXXXXo ",
-" .XXXXXXXXXXXXXXXXXXXXo ",
-" .XXXXXXXXXXXXXXXXXXXXo ",
-" .ooooooooooooooooooooo ",
-"                        "};
-

diff --git a/etc/images/mpc/prev.pbm b/etc/images/mpc/prev.pbm
deleted file mode 100644 (file)
index 392cb31..0000000
Binary files a/etc/images/mpc/prev.pbm and /dev/null differ

diff --git a/etc/images/mpc/prev.xpm b/etc/images/mpc/prev.xpm
deleted file mode 100644 (file)
index 6fe140d..0000000
--- a/etc/images/mpc/prev.xpm
+++ /dev/null
@@ -1,32 +0,0 @@
-/* XPM */
-static char * prev_xpm[] = {
-"24 24 4 1",
-"      c None",
-".     s light1        c grey90",
-"X     s main  c grey70",
-"o     s shadow        c grey50",
-"                        ",
-" ...................... ",
-" .XXXXXXXXXXXXXXXXXXXXo ",
-" .XXXXXXXXXXXXXXXXXXXXo ",
-" .XXXXXXXXXXXXXXXXXXXXo ",
-" .XXX...XXXXXXXXX..XXXo ",
-" .XXX.XoXXXXXXXX.XoXXXo ",
-" .XXX.XoXXXXXX..XXoXXXo ",
-" .XXX.XoXXXXX.XXXXoXXXo ",
-" .XXX.XoXXXX.XXXXXoXXXo ",
-" .XXX.XoXX..XXXXXXoXXXo ",
-" .XXX.XoX.XXXXXXXXoXXXo ",
-" .XXX.XoXoXXXXXXXXoXXXo ",
-" .XXX.XoXXooXXXXXXoXXXo ",
-" .XXX.XoXXXXoXXXXXoXXXo ",
-" .XXX.XoXXXXXoXXXXoXXXo ",
-" .XXX.XoXXXXXXooXXoXXXo ",
-" .XXX.XoXXXXXXXXoXoXXXo ",
-" .XXX.ooXXXXXXXXXooXXXo ",
-" .XXXXXXXXXXXXXXXXXXXXo ",
-" .XXXXXXXXXXXXXXXXXXXXo ",
-" .XXXXXXXXXXXXXXXXXXXXo ",
-" .ooooooooooooooooooooo ",
-"                        "};
-

diff --git a/etc/images/mpc/rewind.pbm b/etc/images/mpc/rewind.pbm
deleted file mode 100644 (file)
index b078f5c..0000000
Binary files a/etc/images/mpc/rewind.pbm and /dev/null differ

diff --git a/etc/images/mpc/rewind.xpm b/etc/images/mpc/rewind.xpm
deleted file mode 100644 (file)
index af94c0f..0000000
--- a/etc/images/mpc/rewind.xpm
+++ /dev/null
@@ -1,32 +0,0 @@
-/* XPM */
-static char * rewind_xpm[] = {
-"24 24 4 1",
-"      c None",
-".     s light1        c grey90",
-"X     s main  c grey70",
-"o     s shadow        c grey50",
-"                        ",
-" ...................... ",
-" .XXXXXXXXXXXXXXXXXXXXo ",
-" .XXXXXXXXXXXXXXXXXXXXo ",
-" .XXXXXXXXXXXXXXXXXXXXo ",
-" .XXXXXXXXXX..XXX..XXXo ",
-" .XXXXXXXXX.XoXX.XoXXXo ",
-" .XXXXXXX..XXo..XXoXXXo ",
-" .XXXXXX.XXXXoXXXXoXXXo ",
-" .XXXXX.XXXXXoXXXXoXXXo ",
-" .XXX..XXXXXXoXXXXoXXXo ",
-" .XX.XXXXXXXXoXXXXoXXXo ",
-" .XXoXXXXXXXXoXXXXoXXXo ",
-" .XXXooXXXXXXoXXXXoXXXo ",
-" .XXXXXoXXXXXoXXXXoXXXo ",
-" .XXXXXXoXXXXoXXXXoXXXo ",
-" .XXXXXXXooXXoooXXoXXXo ",
-" .XXXXXXXXXoXoXXoXoXXXo ",
-" .XXXXXXXXXXooXXXooXXXo ",
-" .XXXXXXXXXXXXXXXXXXXXo ",
-" .XXXXXXXXXXXXXXXXXXXXo ",
-" .XXXXXXXXXXXXXXXXXXXXo ",
-" .ooooooooooooooooooooo ",
-"                        "};
-

diff --git a/etc/images/mpc/stop.pbm b/etc/images/mpc/stop.pbm
deleted file mode 100644 (file)
index 470963a..0000000
Binary files a/etc/images/mpc/stop.pbm and /dev/null differ

diff --git a/etc/images/mpc/stop.xpm b/etc/images/mpc/stop.xpm
deleted file mode 100644 (file)
index 446c462..0000000
--- a/etc/images/mpc/stop.xpm
+++ /dev/null
@@ -1,32 +0,0 @@
-/* XPM */
-static char * stop_xpm[] = {
-"24 24 4 1",
-"      c None",
-".     s light1        c grey90",
-"X     s main  c grey70",
-"o     s shadow        c grey50",
-"                        ",
-" ...................... ",
-" .XXXXXXXXXXXXXXXXXXXXo ",
-" .XXXXXXXXXXXXXXXXXXXXo ",
-" .XXXXXXXXXXXXXXXXXXXXo ",
-" .XXX..............XXXo ",
-" .XXX.XXXXXXXXXXXXoXXXo ",
-" .XXX.XXXXXXXXXXXXoXXXo ",
-" .XXX.XXXXXXXXXXXXoXXXo ",
-" .XXX.XXXXXXXXXXXXoXXXo ",
-" .XXX.XXXXXXXXXXXXoXXXo ",
-" .XXX.XXXXXXXXXXXXoXXXo ",
-" .XXX.XXXXXXXXXXXXoXXXo ",
-" .XXX.XXXXXXXXXXXXoXXXo ",
-" .XXX.XXXXXXXXXXXXoXXXo ",
-" .XXX.XXXXXXXXXXXXoXXXo ",
-" .XXX.XXXXXXXXXXXXoXXXo ",
-" .XXX.XXXXXXXXXXXXoXXXo ",
-" .XXX.oooooooooooooXXXo ",
-" .XXXXXXXXXXXXXXXXXXXXo ",
-" .XXXXXXXXXXXXXXXXXXXXo ",
-" .XXXXXXXXXXXXXXXXXXXXo ",
-" .ooooooooooooooooooooo ",
-"                        "};
-

diff --git a/lisp/mpc.el b/lisp/mpc.el
index ba95308bf67464fb6f77c361f3a6c8bef8fb6621..c317ef70786be06df1ee7397cd47e911e1bf541c 100644 (file)
--- a/lisp/mpc.el
+++ b/lisp/mpc.el
@@ -1174,11 +1174,11 @@ If PLAYLIST is t or nil or missing, use the main playlist."
 
 (defvar mpc-tool-bar-map
   (let ((map (make-sparse-keymap)))
-    (tool-bar-local-item "mpc/prev" 'mpc-prev 'prev map
+    (tool-bar-local-item (icons-get-filename "av/skip_previous") 'mpc-prev 'prev map
      :enable '(not (equal (cdr (assq 'state mpc-status)) "stop"))
      :label "Prev" :vert-only t)
     ;; FIXME: how can we bind it to the down-event?
-    (tool-bar-local-item "mpc/rewind" 'mpc-rewind 'rewind map
+    (tool-bar-local-item (icons-get-filename "av/fast_rewind") 'mpc-rewind 'rewind map
      :enable '(not (equal (cdr (assq 'state mpc-status)) "stop"))
      :label "Rew" :vert-only t
      :button '(:toggle . (and mpc--faster-toggle-timer
@@ -1187,26 +1187,26 @@ If PLAYLIST is t or nil or missing, use the main playlist."
     ;; icons depending on whether or not it's selected, but then it'd have
     ;; to be a toggle-button, thus displayed depressed in one of the
     ;; two states :-(
-    (tool-bar-local-item "mpc/pause" 'mpc-pause 'pause map
+    (tool-bar-local-item (icons-get-filename "av/pause") 'mpc-pause 'pause map
      :label "Pause" :vert-only t
      :visible '(equal (cdr (assq 'state mpc-status)) "play")
      :help "Pause/play")
-    (tool-bar-local-item "mpc/play" 'mpc-play 'play map
+    (tool-bar-local-item (icons-get-filename "av/play_arrow") 'mpc-play 'play map
      :label "Play" :vert-only t
      :visible '(not (equal (cdr (assq 'state mpc-status)) "play"))
      :help "Play/pause")
     ;; FIXME: how can we bind it to the down-event?
-    (tool-bar-local-item "mpc/ffwd" 'mpc-ffwd 'ffwd map
+    (tool-bar-local-item (icons-get-filename "av/fast_forward") 'mpc-ffwd 'ffwd map
      :enable '(not (equal (cdr (assq 'state mpc-status)) "stop"))
      :label "Ffwd" :vert-only t
      :button '(:toggle . (and mpc--faster-toggle-timer
                              mpc--faster-toggle-forward)))
-    (tool-bar-local-item "mpc/next" 'mpc-next 'next map
+    (tool-bar-local-item (icons-get-filename "av/skip_next") 'mpc-next 'next map
      :label "Next" :vert-only t
      :enable '(not (equal (cdr (assq 'state mpc-status)) "stop")))
-    (tool-bar-local-item "mpc/stop" 'mpc-stop 'stop map
+    (tool-bar-local-item (icons-get-filename "av/stop") 'mpc-stop 'stop map
      :label "Stop" :vert-only t)
-    (tool-bar-local-item "mpc/add" 'mpc-playlist-add 'add map
+    (tool-bar-local-item (icons-get-filename "av/playlist_add") 'mpc-playlist-add 'add map
      :label "Add" :vert-only t
      :help "Append to the playlist")
     map))

diff --git a/lisp/skicons.el b/lisp/skicons.el
index ce6eca5a6cf7a7b612f8708d0a795498ec070850..a064676868feb35697eef0dfc64417a7f6dea5a0 100644 (file)
--- a/lisp/skicons.el
+++ b/lisp/skicons.el
@@ -669,22 +669,6 @@ NAME is as in `icons-get'."
     ("mail/spam" "mail/spam.xpm")
     ("mh-logo" "mh-logo.pbm")
     ("mh-logo" "mh-logo.xpm")
-    ("mpc/add" "mpc/add.pbm")
-    ("mpc/add" "mpc/add.xpm")
-    ("mpc/ffwd" "mpc/ffwd.pbm")
-    ("mpc/ffwd" "mpc/ffwd.xpm")
-    ("mpc/next" "mpc/next.pbm")
-    ("mpc/next" "mpc/next.xpm")
-    ("mpc/pause" "mpc/pause.pbm")
-    ("mpc/pause" "mpc/pause.xpm")
-    ("mpc/play" "mpc/play.pbm")
-    ("mpc/play" "mpc/play.xpm")
-    ("mpc/prev" "mpc/prev.pbm")
-    ("mpc/prev" "mpc/prev.xpm")
-    ("mpc/rewind" "mpc/rewind.pbm")
-    ("mpc/rewind" "mpc/rewind.xpm")
-    ("mpc/stop" "mpc/stop.pbm")
-    ("mpc/stop" "mpc/stop.xpm")
     ("new" "new.pbm")
     ("new" "new.xpm")
     ("newsticker/browse-url" "newsticker/browse-url.xpm")