From: Stefano Rivera <stefano@rivera.za.net>
Date: Sat, 17 May 2014 16:08:23 +0000 (+0200)
Subject: Rebuild the XPM icon too
X-Git-Tag: 0.1~85
X-Git-Url: https://git.ctpug.org.za/?a=commitdiff_plain;h=aabdc8dbeee28109bc0f28b49b9d84a91bfa48d9;p=naja.git

Rebuild the XPM icon too
---

diff --git a/data/icons/Makefile b/data/icons/Makefile
index 33a133c..d2795b2 100644
--- a/data/icons/Makefile
+++ b/data/icons/Makefile
@@ -1,4 +1,4 @@
-TARGETS=robolock.icns robolock.ico
+TARGETS=robolock.icns robolock.ico robolock.xpm
 
 PNGS=$(wildcard *.png)
 RGBA_PNGS=$(patsubst %,rgba/%,$(PNGS))
@@ -14,7 +14,7 @@ clean:
 
 .PHONY: install-tools
 install-tools:
-	echo apt-get install icnsutils icoutils
+	echo apt-get install icnsutils icoutils imagemagick
 
 rgba/%.png: %.png
 	mkdir -p rgba
@@ -25,3 +25,6 @@ robolock.icns: $(filter-out %_24.png %_64.png,$(RGBA_PNGS))
 
 robolock.ico: $(RGBA_PNGS)
 	icotool --create --output $@ $^
+
+robolock.xpm: robot_32.png
+	convert $^ $@
diff --git a/data/icons/robolock.xpm b/data/icons/robolock.xpm
index f2a5327..d31f113 100644
--- a/data/icons/robolock.xpm
+++ b/data/icons/robolock.xpm
@@ -1,51 +1,47 @@
 /* XPM */
 static char *robolock[] = {
 /* columns rows colors chars-per-pixel */
-"32 32 13 1 ",
-"  c #404B07",
-". c #6C2940",
-"X c #403578",
-"o c #135740",
+"32 32 9 1 ",
+"  c black",
+". c #404B07",
+"X c #6C2940",
+"o c #403578",
 "O c #D9680F",
-"+ c #26C30F",
-"@ c #2697F0",
-"# c #ECA8BF",
-"$ c #BFCA87",
-"% c #93D6BF",
-"& c #BFB4F8",
-"* c gray100",
-"= c None",
+"+ c #2697F0",
+"@ c #BFCA87",
+"# c #BFB4F8",
+"$ c None",
 /* pixels */
-"================================",
-"===========$        $====o======",
-"===========          ====oo=====",
-"===========$%%%*%*%*$==%%XX%%===",
-"===========$%%%%%%%%$==%&.X%&===",
-"=========== $$    $$ ==&#=.&#===",
-"=========== $      $ ==##==##===",
-"==============$$$$==============",
-"===========$        $===========",
-"========= $ $      $ $ =========",
-"========                ========",
-"=======$ ==$$  +   $$== $=======",
-"======$$$== $  +%  $ ==$$$======",
-"===== $====$   @&   $====$ =====",
-"=====  ====$$      $$====  =====",
-"=====$$======  @&  ======$$=====",
-"=====  ======  @   ======  =====",
-"==== == ====$      $==== == ====",
-"==== == === $  O#  $ === == ====",
-"===========$        $===========",
-"===========$$  O#  $$===========",
-"===========  $ O# $  ===========",
-"===========$ $$  $$ $===========",
-"============$======$============",
-"============ ====== ============",
-"============$======$============",
-"============$======$============",
-"============ ====== ============",
-"===========$$$====$$$===========",
-"==========  $$ == $$  ==========",
-"=========      ==      =========",
-"================================"
+"$$$$...........@@@..@@@@@@@@$$$$",
+"$$$.............@@@..@@@@@@@@$$$",
+"$$...............@@@..@@@@@@@@$$",
+"$$................@@@..@@@@@@@$$",
+"$$.....$$$$$$$$$$$$$$$$$$@@@@@$$",
+"$$....$$$$$$$$$$$$$$$$$$$$@@@@$$",
+"$$....$$$$$$$$$$$$$$$$$$$$@@@@$$",
+"$$....$$$$$$$$$$$$$$$$$$$$@@@@$$",
+"$$....$$$$$$$$$$$$$$$$$$$$@@@@$$",
+"$$....$$$$$$$$$$$$$$$$$$$$@@@@$$",
+"XXOOOOOOOOOOOOOOOO++++++++++##++",
+"XXOOOOOOOOOOOOOOOO++++++++++##++",
+"XXOOOOOOOOOOOO++++++++++++++##++",
+"XXOOOOOOOOOOOO++++++++++++++##++",
+"XXOOOOOOOOOOOOOOOO++++++++++##++",
+"XXOOOOOOOOOOOOOOOO++++++++++##++",
+"XXOOOOO  OOOOO+++++++++  +++##++",
+"XXOOOO    OOOO++++++++    ++##++",
+"XXOOOO    OOOOOOOO++++    ++##++",
+"XXOOOOO  OOOOOOOOO+++++  +++##++",
+"XXOOOOOXXOOOOO+++++++++oo+++##++",
+"XXOOOOOXXOOOOO+++++++++oo+++##++",
+"XXOOOOX  XOOOOOOOO++++o  o++##++",
+"XXOOOO    OOOOOOOO++++    ++##++",
+"XXOOOOOOOOOOOO++++++++++++++##++",
+"XXOOOOOOOOOOOO++++++++++++++##++",
+"XXOOOOOOOOOOOOOOOO++++++++++##++",
+"XXOOOOOOOOOOOOOOOO++++++++++##++",
+"XXOOOOOOOOOOOO++++++++++++++##++",
+"XXOOOOOOOOOOOO++++++++++++++##++",
+"XXOOOOOOOOOOOOOOOO++++++++++##++",
+"XXOOOOOOOOOOOOOOOO++++++++++##++"
 };