From: Richard Kettlewell Date: Sat, 2 Aug 2008 16:45:46 +0000 (+0100) Subject: New icons for Disobedience. They are bigger and more colorful than X-Git-Tag: 4.3~79 X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~mdw/git/disorder/commitdiff_plain/5c739b23f0192923e4485b9eb503a6d0b9aeb5c3?hp=cc6241b2b4401228b916e8fcd804f6b9cd27a34d New icons for Disobedience. They are bigger and more colorful than previously. The SVG originals are included for the benefit of future cosmetic enhancement, but they aren't automatically converted to PNG at any point. --- diff --git a/disobedience/control.c b/disobedience/control.c index 6ed9fb3..8e1391e 100644 --- a/disobedience/control.c +++ b/disobedience/control.c @@ -169,9 +169,9 @@ static int rtp_sensitive(void) { /** @brief Table of all icons */ static struct icon icons[] = { { - icon_on: "pause.png", + icon_on: "pause32.png", tip_on: "Pause playing track", - icon_off: "play.png", + icon_off: "play32.png", tip_off: "Resume playing track", menuitem: "/Control/Playing", on: pause_resume_on, @@ -181,7 +181,7 @@ static struct icon icons[] = { events: "pause-changed playing-changed rights-changed", }, { - icon_on: "cross.png", + icon_on: "cross32.png", tip_on: "Cancel playing track", menuitem: "/Control/Scratch", sensitive: scratch_sensitive, @@ -189,9 +189,9 @@ static struct icon icons[] = { events: "playing-track-changed rights-changed", }, { - icon_on: "randomcross.png", + icon_on: "randomenabled32.png", tip_on: "Disable random play", - icon_off: "random.png", + icon_off: "randomdisabled32.png", tip_off: "Enable random play", menuitem: "/Control/Random play", on: random_enabled, @@ -201,9 +201,9 @@ static struct icon icons[] = { events: "random-changed rights-changed", }, { - icon_on: "notescross.png", + icon_on: "playenabled32.png", tip_on: "Disable play", - icon_off: "notes.png", + icon_off: "playdisabled32.png", tip_off: "Enable play", on: playing_enabled, sensitive: playing_sensitive, @@ -212,9 +212,9 @@ static struct icon icons[] = { events: "enabled-changed rights-changed", }, { - icon_on: "speakercross.png", + icon_on: "rtpenabled32.png", tip_on: "Stop playing network stream", - icon_off: "speaker.png", + icon_off: "rtpdisabled32.png", tip_off: "Play network stream", menuitem: "/Control/Network player", on: rtp_enabled, diff --git a/doc/disobedience.1.in b/doc/disobedience.1.in index 2d9beb9..ef1f482 100644 --- a/doc/disobedience.1.in +++ b/doc/disobedience.1.in @@ -73,6 +73,8 @@ name, author and version number of the software. .TP .B "Pause button" The pause button can be used to pause and resume tracks. +This button shows either a pause symbol (two vertical bars) or a resume symbol +(a right-pointing arrow). .TP .B "Scratch button" The scratch button, a red cross, can be used to interrupt the currently playing @@ -81,16 +83,22 @@ track. .B "Random play button" The random play button can be used to enable and disable random play. It does not take effect until the currently playing track finishes. +When the button is green, random play is enabled. +When it is grey, random play is disabled. .TP .B "Play button" The play button controls whether tracks will be played at all. As above it does not take effect until the currently playing track finishes. +When the button is green, play is enabled. +When it is grey, play is disabled. .TP .B "Network play button" The network play buttons enables or disables network play. See .B "NETWORK PLAY" below. +When the button is green, network play is enabled. +When it is grey, network play is disabled. .TP .B "Volume slider" The volume slider indicates the current volume level and can be used to adjust diff --git a/images/Makefile.am b/images/Makefile.am index 607d025..25d33c0 100644 --- a/images/Makefile.am +++ b/images/Makefile.am @@ -24,6 +24,11 @@ notes.png play.png pause.png random.png randomcross.png notescross.png \ propagate.png speaker.png speakercross.png directory.png logo.png \ logosmall.png logo256.png -EXTRA_DIST=$(pkghttp_DATA) duck.png disobedience16x16.xpm disobedience32x32.xpm +EXTRA_DIST=$(pkghttp_DATA) duck.png disobedience16x16.xpm \ +disobedience32x32.xpm cross.svg go.svg notes.svg noteson.svg pause.svg \ +query.svg queryon.svg speaker.svg speakeron.svg cross32.png \ +pause32.png play32.png playdisabled32.png playenabled32.png \ +randomdisabled32.png randomenabled32.png rtpdisabled32.png \ +rtpenabled32.png CLEANFILES=$(SEDFILES) diff --git a/images/cross.svg b/images/cross.svg new file mode 100644 index 0000000..c76e7d7 --- /dev/null +++ b/images/cross.svg @@ -0,0 +1,99 @@ + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + diff --git a/images/cross32.png b/images/cross32.png new file mode 100644 index 0000000..df52c34 Binary files /dev/null and b/images/cross32.png differ diff --git a/images/go.svg b/images/go.svg new file mode 100644 index 0000000..53a61b4 --- /dev/null +++ b/images/go.svg @@ -0,0 +1,62 @@ + + + + + + + + + image/svg+xml + + + + + + + + diff --git a/images/notes.svg b/images/notes.svg new file mode 100644 index 0000000..464b2ea --- /dev/null +++ b/images/notes.svg @@ -0,0 +1,96 @@ + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + diff --git a/images/noteson.svg b/images/noteson.svg new file mode 100644 index 0000000..e42a43d --- /dev/null +++ b/images/noteson.svg @@ -0,0 +1,96 @@ + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + diff --git a/images/pause.svg b/images/pause.svg new file mode 100644 index 0000000..08f659c --- /dev/null +++ b/images/pause.svg @@ -0,0 +1,75 @@ + + + + + + + + + image/svg+xml + + + + + + + + + diff --git a/images/pause32.png b/images/pause32.png new file mode 100644 index 0000000..1dc9c9f Binary files /dev/null and b/images/pause32.png differ diff --git a/images/play32.png b/images/play32.png new file mode 100644 index 0000000..77942bb Binary files /dev/null and b/images/play32.png differ diff --git a/images/playdisabled32.png b/images/playdisabled32.png new file mode 100644 index 0000000..c09ba76 Binary files /dev/null and b/images/playdisabled32.png differ diff --git a/images/playenabled32.png b/images/playenabled32.png new file mode 100644 index 0000000..d6406dd Binary files /dev/null and b/images/playenabled32.png differ diff --git a/images/query.svg b/images/query.svg new file mode 100644 index 0000000..797cf17 --- /dev/null +++ b/images/query.svg @@ -0,0 +1,94 @@ + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + diff --git a/images/queryon.svg b/images/queryon.svg new file mode 100644 index 0000000..a6e441e --- /dev/null +++ b/images/queryon.svg @@ -0,0 +1,94 @@ + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + diff --git a/images/randomdisabled32.png b/images/randomdisabled32.png new file mode 100644 index 0000000..853175e Binary files /dev/null and b/images/randomdisabled32.png differ diff --git a/images/randomenabled32.png b/images/randomenabled32.png new file mode 100644 index 0000000..752502c Binary files /dev/null and b/images/randomenabled32.png differ diff --git a/images/rtpdisabled32.png b/images/rtpdisabled32.png new file mode 100644 index 0000000..7533925 Binary files /dev/null and b/images/rtpdisabled32.png differ diff --git a/images/rtpenabled32.png b/images/rtpenabled32.png new file mode 100644 index 0000000..5caca17 Binary files /dev/null and b/images/rtpenabled32.png differ diff --git a/images/speaker.svg b/images/speaker.svg new file mode 100644 index 0000000..24a2d11 --- /dev/null +++ b/images/speaker.svg @@ -0,0 +1,115 @@ + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + diff --git a/images/speakeron.svg b/images/speakeron.svg new file mode 100644 index 0000000..0ae5c02 --- /dev/null +++ b/images/speakeron.svg @@ -0,0 +1,115 @@ + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + +