From 135b6d4019f584c050b3d70c11fb5bcf2c7396c4 Mon Sep 17 00:00:00 2001 From: Bdale Garbee Date: Sun, 16 Feb 2014 15:53:22 -0700 Subject: use svg in the .desktop file --- debian/altos.desktop | 2 +- debian/altos.install | 1 + debian/altusmetrum.svg | 215 +++++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 217 insertions(+), 1 deletion(-) create mode 100644 debian/altusmetrum.svg (limited to 'debian') diff --git a/debian/altos.desktop b/debian/altos.desktop index 88b99f97..2d93f29d 100644 --- a/debian/altos.desktop +++ b/debian/altos.desktop @@ -3,7 +3,7 @@ Type=Application Name=AltOS UI GenericName=Altus Metrum Ground Station Comment=View and log downlink data from Altus Metrum products -Icon=/usr/share/pixmaps/altusmetrum.xpm +Icon=/usr/share/pixmaps/altusmetrum.svg Exec=/usr/bin/altosui %f Terminal=false MimeType=text/plain; diff --git a/debian/altos.install b/debian/altos.install index 05f0eec5..8bfdd837 100644 --- a/debian/altos.install +++ b/debian/altos.install @@ -1,4 +1,5 @@ debian/altos.desktop usr/share/applications +debian/altusmetrum.svg usr/share/pixmaps debian/altusmetrum.xpm usr/share/pixmaps src/*/*.ihx usr/share/altos src/*/*.map usr/share/altos diff --git a/debian/altusmetrum.svg b/debian/altusmetrum.svg new file mode 100644 index 00000000..256b8c5a --- /dev/null +++ b/debian/altusmetrum.svg @@ -0,0 +1,215 @@ + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + -- cgit v1.2.3 From 066a01ad0b4e73fdb47b43a42c1d0b7fae81a180 Mon Sep 17 00:00:00 2001 From: Keith Packard Date: Sun, 16 Feb 2014 14:57:38 -0800 Subject: Put altusmetrum.svg and micropeak.svg in icon directory Signed-off-by: Keith Packard --- debian/altusmetrum.svg | 215 ------------------------------------------------- icon/altusmetrum.svg | 215 +++++++++++++++++++++++++++++++++++++++++++++++++ icon/micropeak.svg | 184 ++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 399 insertions(+), 215 deletions(-) delete mode 100644 debian/altusmetrum.svg create mode 100644 icon/altusmetrum.svg create mode 100644 icon/micropeak.svg (limited to 'debian') diff --git a/debian/altusmetrum.svg b/debian/altusmetrum.svg deleted file mode 100644 index 256b8c5a..00000000 --- a/debian/altusmetrum.svg +++ /dev/null @@ -1,215 +0,0 @@ - - - - - - - - image/svg+xml - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/icon/altusmetrum.svg b/icon/altusmetrum.svg new file mode 100644 index 00000000..256b8c5a --- /dev/null +++ b/icon/altusmetrum.svg @@ -0,0 +1,215 @@ + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/icon/micropeak.svg b/icon/micropeak.svg new file mode 100644 index 00000000..e6fbe120 --- /dev/null +++ b/icon/micropeak.svg @@ -0,0 +1,184 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + -- cgit v1.2.3 From 948a614a62754fd4fffd9b84ad83fd444e4f0437 Mon Sep 17 00:00:00 2001 From: Keith Packard Date: Sun, 16 Feb 2014 15:17:40 -0800 Subject: Move .desktop and icon management out of debian dir This constructs a .desktop file from a template and installs it, along with suitable .svg icons, during the normal build process Signed-off-by: Keith Packard --- Makefile.am | 2 +- altosui/.gitignore | 2 ++ altosui/Makefile.am | 15 +++++++++++---- altosui/altos.desktop.in | 10 ++++++++++ altosui/linux-install.sh | 8 +++++++- configure.ac | 1 + debian/altos.desktop | 10 ---------- debian/altos.install | 2 -- icon/Makefile.am | 26 ++++++++++++++++++++++++++ 9 files changed, 58 insertions(+), 18 deletions(-) create mode 100644 altosui/altos.desktop.in delete mode 100644 debian/altos.desktop create mode 100644 icon/Makefile.am (limited to 'debian') diff --git a/Makefile.am b/Makefile.am index fa4da1fe..f035bb39 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,4 +1,4 @@ -SUBDIRS=ao-tools src doc altoslib libaltos altosuilib altosui micropeak ao-utils altosdroid +SUBDIRS=ao-tools src doc icon altoslib libaltos altosuilib altosui micropeak ao-utils altosdroid EXTRA_DIST = ChangeLog diff --git a/altosui/.gitignore b/altosui/.gitignore index 4ee3f4ad..10b600e4 100644 --- a/altosui/.gitignore +++ b/altosui/.gitignore @@ -14,8 +14,10 @@ altosui-jdb classaltosui.stamp altos-windows.nsi Altos-Linux-*.tar.bz2 +Altos-Linux-*.sh Altos-Mac-*.zip Altos-Windows-*.exe +altos.desktop *.dll *.dylib *.so diff --git a/altosui/Makefile.am b/altosui/Makefile.am index 20b234ab..03c1cfc9 100644 --- a/altosui/Makefile.am +++ b/altosui/Makefile.am @@ -103,6 +103,10 @@ LIBALTOS= \ libaltos.dylib \ altos.dll +desktopdir = $(datadir)/applications +desktop_file = altos.desktop +desktop_DATA = $(desktop_file) + JAR=altosui.jar FATJAR=altosui-fat.jar @@ -179,8 +183,8 @@ FAT_FILES=$(FATJAR) $(ALTOSLIB_CLASS) $(ALTOSUILIB_CLASS) $(FREETTS_CLASS) $(JFR LINUX_LIBS=libaltos32.so libaltos64.so -LINUX_FILES=$(FAT_FILES) $(LINUX_LIBS) $(FIRMWARE) $(DOC) -LINUX_EXTRA=altosui-fat ../debian/altos.desktop ../debian/altusmetrum.xpm +LINUX_FILES=$(FAT_FILES) $(LINUX_LIBS) $(FIRMWARE) $(DOC) altos.desktop.in ../icon/altusmetrum.svg +LINUX_EXTRA=altosui-fat MACOSX_INFO_PLIST=Info.plist MACOSX_FILES=$(FAT_FILES) libaltos.dylib $(MACOSX_INFO_PLIST) $(DOC) ReadMe-Mac.rtf @@ -196,6 +200,11 @@ clean-local: $(JFREECHART_CLASS) $(JCOMMON_CLASS) $(LIBALTOS) Manifest.txt Manifest-fat.txt altos-windows.log altos-windows.nsi \ altosui altosui-test altosui-jdb macosx linux +EXTRA_DIST = $(desktop_file).in + +$(desktop_file): $(desktop_file).in + sed -e 's#%bindir%#@bindir@#' -e 's#%icondir%#$(datadir)/icons/hicolor/scalable/apps#' ${srcdir}/altos.desktop.in > $@ + if FATINSTALL FATTARGET=$(FATDIR)/$(VERSION) @@ -335,8 +344,6 @@ $(LINUX_DIST): $(LINUX_FILES) $(LINUX_EXTRA) -rm -rf linux mkdir -p linux/AltOS cp -p $(LINUX_FILES) linux/AltOS - sed -e 's;/usr/bin;%BIN%;' -e 's;/usr/share/pixmaps;%BIN%;' $(srcdir)/../debian/altos.desktop > linux/AltOS/altos.desktop.in - cp -p $(srcdir)/../debian/altusmetrum.xpm linux/AltOS/altusmetrum.xpm cp -p altosui-fat linux/AltOS/altosui chmod +x linux/AltOS/altosui tar cjf $@ -C linux AltOS diff --git a/altosui/altos.desktop.in b/altosui/altos.desktop.in new file mode 100644 index 00000000..66114348 --- /dev/null +++ b/altosui/altos.desktop.in @@ -0,0 +1,10 @@ +[Desktop Entry] +Type=Application +Name=AltOS UI +GenericName=Altus Metrum Ground Station +Comment=View and log downlink data from Altus Metrum products +Icon=%icondir%/altusmetrum.svg +Exec=%bindir%/altosui %f +Terminal=false +MimeType=text/plain; +Categories=Education;Electronics;Science; diff --git a/altosui/linux-install.sh b/altosui/linux-install.sh index c5101eb4..d7ec9517 100644 --- a/altosui/linux-install.sh +++ b/altosui/linux-install.sh @@ -144,7 +144,7 @@ BIN="$target_abs"/AltOS desktop="$target"/AltOS/altos.desktop rm -f "$desktop" -sed "s;%BIN%;$BIN;" "$target"/AltOS/altos.desktop.in > "$desktop" +sed -e "s;%bindir%;$BIN;" -e "s;%icondir%;$BIN;" "$target"/AltOS/altos.desktop.in > "$desktop" # # Figure out where to install the .desktop file. If we can, write it @@ -185,6 +185,12 @@ case "$?" in ;; esac +# +# Install icon to desktop if desired +# + + + finish 0 __ARCHIVE_BELOW__ diff --git a/configure.ac b/configure.ac index 6be99d1f..12cfdaa0 100644 --- a/configure.ac +++ b/configure.ac @@ -487,6 +487,7 @@ AC_OUTPUT([ Makefile src/Makedefs altoslib/Makefile +icon/Makefile altosuilib/Makefile altosuilib/AltosUIVersion.java altosui/Makefile diff --git a/debian/altos.desktop b/debian/altos.desktop deleted file mode 100644 index 2d93f29d..00000000 --- a/debian/altos.desktop +++ /dev/null @@ -1,10 +0,0 @@ -[Desktop Entry] -Type=Application -Name=AltOS UI -GenericName=Altus Metrum Ground Station -Comment=View and log downlink data from Altus Metrum products -Icon=/usr/share/pixmaps/altusmetrum.svg -Exec=/usr/bin/altosui %f -Terminal=false -MimeType=text/plain; -Categories=Education;Electronics;Science; diff --git a/debian/altos.install b/debian/altos.install index 8bfdd837..50f21eb1 100644 --- a/debian/altos.install +++ b/debian/altos.install @@ -1,5 +1,3 @@ -debian/altos.desktop usr/share/applications -debian/altusmetrum.svg usr/share/pixmaps debian/altusmetrum.xpm usr/share/pixmaps src/*/*.ihx usr/share/altos src/*/*.map usr/share/altos diff --git a/icon/Makefile.am b/icon/Makefile.am new file mode 100644 index 00000000..eedb7760 --- /dev/null +++ b/icon/Makefile.am @@ -0,0 +1,26 @@ +RES=16 32 48 256 + +AM_FILES=$(shell for i in $(RES); do echo altus-metrum-$$i.png; done) +MP_FILES=$(shell for i in $(RES); do echo micropeak-$$i.png; done) + +ICO_FILES=altus-metrum.ico micro-peak.ico + +icondir = $(datadir)/icons/hicolor/scalable/apps + +AM_ICON = altusmetrum.svg +MP_ICON = micropeak.svg + +icon_DATA = $(AM_ICON) $(MP_ICON) + +EXTRA_DIST = $(icon_DATA) $(AM_FILES) $(MP_FILES) + +all-local: $(ICO_FILES) + +#clean-local: +# $(RM) -f $(ICO_FILES) + +altus-metrum.ico: $(AM_FILES) + icotool -c -o $@ $(AM_FILES) + +micro-peak.ico: $(MP_FILES) + icotool -c -o $@ $(MP_FILES) \ No newline at end of file -- cgit v1.2.3 From 8e7b8b0533e03e89425296d464b7a1a26fb63686 Mon Sep 17 00:00:00 2001 From: Keith Packard Date: Thu, 5 Jun 2014 16:52:36 -0700 Subject: telegps: Update icon and icon building Switch to satellite icon, build the osx and windows icons. Signed-off-by: Keith Packard --- debian/control | 2 +- icon/Makefile.am | 18 ++- icon/telegps-128.png | Bin 8736 -> 10163 bytes icon/telegps-16.png | Bin 507 -> 693 bytes icon/telegps-256.png | Bin 21589 -> 23474 bytes icon/telegps-32.png | Bin 1475 -> 1751 bytes icon/telegps-48.png | Bin 2507 -> 2962 bytes icon/telegps-512.png | Bin 56581 -> 0 bytes icon/telegps-64.png | Bin 3678 -> 4364 bytes icon/telegps.ico | Bin 285478 -> 354422 bytes icon/telegps.svg | 292 ++++++++++++++++++++++++++++----------------- telegps/telegps.desktop.in | 10 +- 12 files changed, 204 insertions(+), 118 deletions(-) delete mode 100644 icon/telegps-512.png (limited to 'debian') diff --git a/debian/control b/debian/control index f23a841a..6c28ca71 100644 --- a/debian/control +++ b/debian/control @@ -3,7 +3,7 @@ Section: electronics Priority: optional Maintainer: Bdale Garbee Uploaders: Keith Packard -Build-Depends: debhelper (>= 7), autoconf, automake, gawk, libreadline-dev, libusb-1.0-0-dev, nickle, cc1111, xsltproc, fop, xmlto, docbook-xml, docbook-xsl, swig, default-jdk, freetts, libtool, libjfreechart-java, libbluetooth-dev, pkg-config, libelf-dev, libbluetooth-dev, libssl-dev, gcc-arm-none-eabi +Build-Depends: debhelper (>= 7), autoconf, automake, gawk, libreadline-dev, libusb-1.0-0-dev, nickle, cc1111, xsltproc, fop, xmlto, docbook-xml, docbook-xsl, swig, default-jdk, freetts, libtool, libjfreechart-java, libbluetooth-dev, pkg-config, libelf-dev, libbluetooth-dev, libssl-dev, gcc-arm-none-eabi, icotool, librsvg2-bin Standards-Version: 3.9.5 Homepage: http://altusmetrum.org/AltOS Vcs-Git: git://git.gag.com/fw/altos diff --git a/icon/Makefile.am b/icon/Makefile.am index eedb7760..60afdb1c 100644 --- a/icon/Makefile.am +++ b/icon/Makefile.am @@ -1,21 +1,26 @@ -RES=16 32 48 256 +RES=16 32 48 64 128 256 AM_FILES=$(shell for i in $(RES); do echo altus-metrum-$$i.png; done) MP_FILES=$(shell for i in $(RES); do echo micropeak-$$i.png; done) +TG_FILES=$(shell for i in $(RES); do echo telegps-$$i.png; done) -ICO_FILES=altus-metrum.ico micro-peak.ico +ICO_FILES=altus-metrum.ico micro-peak.ico telegps.ico icondir = $(datadir)/icons/hicolor/scalable/apps AM_ICON = altusmetrum.svg MP_ICON = micropeak.svg +TG_ICON = telegps.svg -icon_DATA = $(AM_ICON) $(MP_ICON) +icon_DATA = $(AM_ICON) $(MP_ICON) $(TG_ICON) -EXTRA_DIST = $(icon_DATA) $(AM_FILES) $(MP_FILES) +EXTRA_DIST = $(icon_DATA) $(AM_FILES) $(MP_FILES) $(TG_FILES) all-local: $(ICO_FILES) +$(TG_FILES): telegps.svg + for i in $(RES); do rsvg-convert -w $$i -o telegps-$$i.png telegps.svg; done + #clean-local: # $(RM) -f $(ICO_FILES) @@ -23,4 +28,7 @@ altus-metrum.ico: $(AM_FILES) icotool -c -o $@ $(AM_FILES) micro-peak.ico: $(MP_FILES) - icotool -c -o $@ $(MP_FILES) \ No newline at end of file + icotool -c -o $@ $(MP_FILES) + +telegps.ico: $(TG_FILES) + icotool -c -o $@ $(TG_FILES) diff --git a/icon/telegps-128.png b/icon/telegps-128.png index f1343d9e..6b72cc46 100644 Binary files a/icon/telegps-128.png and b/icon/telegps-128.png differ diff --git a/icon/telegps-16.png b/icon/telegps-16.png index 5bd45999..3010a4e1 100644 Binary files a/icon/telegps-16.png and b/icon/telegps-16.png differ diff --git a/icon/telegps-256.png b/icon/telegps-256.png index 46e1670a..7565b525 100644 Binary files a/icon/telegps-256.png and b/icon/telegps-256.png differ diff --git a/icon/telegps-32.png b/icon/telegps-32.png index c8588899..a01d41d1 100644 Binary files a/icon/telegps-32.png and b/icon/telegps-32.png differ diff --git a/icon/telegps-48.png b/icon/telegps-48.png index 3bee98e6..e9bbda08 100644 Binary files a/icon/telegps-48.png and b/icon/telegps-48.png differ diff --git a/icon/telegps-512.png b/icon/telegps-512.png deleted file mode 100644 index 47c47003..00000000 Binary files a/icon/telegps-512.png and /dev/null differ diff --git a/icon/telegps-64.png b/icon/telegps-64.png index 0ee086a6..b39c8f65 100644 Binary files a/icon/telegps-64.png and b/icon/telegps-64.png differ diff --git a/icon/telegps.ico b/icon/telegps.ico index bedf04ef..bbe2283e 100644 Binary files a/icon/telegps.ico and b/icon/telegps.ico differ diff --git a/icon/telegps.svg b/icon/telegps.svg index 256b8c5a..a14267bc 100644 --- a/icon/telegps.svg +++ b/icon/telegps.svg @@ -10,57 +10,25 @@ xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" + width="141.19534" + height="135.41844" id="svg2" - width="191.28" - height="245.28" - version="1.0" - sodipodi:version="0.32" + version="1.1" inkscape:version="0.48.4 r9939" - sodipodi:docname="altusmetrum-only.svg" - inkscape:output_extension="org.inkscape.output.svg.inkscape" - inkscape:export-filename="/home/keithp/src/cc1111/altus-logo/bottom.png" - inkscape:export-xdpi="119.89881" - inkscape:export-ydpi="119.89881"> - - - - image/svg+xml - - - - - + sodipodi:docname="telegps.svg"> - - - - - - - - - + id="defs4"> + - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + fit-margin-top="0" + fit-margin-left="0" + fit-margin-right="0" + fit-margin-bottom="0" + inkscape:window-width="2560" + inkscape:window-height="1582" + inkscape:window-x="0" + inkscape:window-y="0" + inkscape:window-maximized="1" /> + + + + image/svg+xml + + + + + - - - - + inkscape:label="Layer 1" + inkscape:groupmode="layer" + id="layer1" + transform="translate(-261.09094,-353.45446)"> + diff --git a/telegps/telegps.desktop.in b/telegps/telegps.desktop.in index abdf286f..3d249d8a 100644 --- a/telegps/telegps.desktop.in +++ b/telegps/telegps.desktop.in @@ -1,10 +1,10 @@ [Desktop Entry] Type=Application -Name=MicroPeak -GenericName=MicroPeak download and analysis -Comment=View and log data from MicroPeak altimeters -Icon=%icondir%/micropeak.svg -Exec=%bindir%/micropeak %f +Name=TeleGPS +GenericName=TeleGPS monitor, download and analysis +Comment=View and log data from TeleGPS tracking devices +Icon=%icondir%/telegps.svg +Exec=%bindir%/telegps %f Terminal=false MimeType=text/plain; Categories=Education;Electronics;Science; -- cgit v1.2.3 From bfdaa95cb72c833896076d4e1a4bfe61d9549fed Mon Sep 17 00:00:00 2001 From: Keith Packard Date: Thu, 12 Jun 2014 15:59:20 -0700 Subject: debian: Fix build depends icotool -> icoutils Signed-off-by: Keith Packard --- debian/control | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'debian') diff --git a/debian/control b/debian/control index 6c28ca71..13f8e1a3 100644 --- a/debian/control +++ b/debian/control @@ -3,7 +3,7 @@ Section: electronics Priority: optional Maintainer: Bdale Garbee Uploaders: Keith Packard -Build-Depends: debhelper (>= 7), autoconf, automake, gawk, libreadline-dev, libusb-1.0-0-dev, nickle, cc1111, xsltproc, fop, xmlto, docbook-xml, docbook-xsl, swig, default-jdk, freetts, libtool, libjfreechart-java, libbluetooth-dev, pkg-config, libelf-dev, libbluetooth-dev, libssl-dev, gcc-arm-none-eabi, icotool, librsvg2-bin +Build-Depends: debhelper (>= 7), autoconf, automake, gawk, libreadline-dev, libusb-1.0-0-dev, nickle, cc1111, xsltproc, fop, xmlto, docbook-xml, docbook-xsl, swig, default-jdk, freetts, libtool, libjfreechart-java, libbluetooth-dev, pkg-config, libelf-dev, libbluetooth-dev, libssl-dev, gcc-arm-none-eabi, icoutils, librsvg2-bin Standards-Version: 3.9.5 Homepage: http://altusmetrum.org/AltOS Vcs-Git: git://git.gag.com/fw/altos -- cgit v1.2.3 From 4ec960b705b87b15d015abb2a9a3e23eee414f1d Mon Sep 17 00:00:00 2001 From: Keith Packard Date: Sat, 14 Jun 2014 17:51:46 -0700 Subject: icon: Create all icons from .svg files Remove images from repository, leaving only the svg files and build instructions Signed-off-by: Keith Packard --- debian/control | 2 +- icon/.gitignore | 6 ++++++ icon/Makefile.am | 42 ++++++++++++++++++++++++++++++++++++++---- icon/altus-metrum-128.png | Bin 8736 -> 0 bytes icon/altus-metrum-16.png | Bin 507 -> 0 bytes icon/altus-metrum-256.png | Bin 21589 -> 0 bytes icon/altus-metrum-32.png | Bin 1475 -> 0 bytes icon/altus-metrum-48.png | Bin 2507 -> 0 bytes icon/altus-metrum-512.png | Bin 56581 -> 0 bytes icon/altus-metrum-64.png | Bin 3678 -> 0 bytes icon/altus-metrum.ico | Bin 285478 -> 0 bytes icon/make-png | 34 ++++++++++++++++++++++++++++++++++ icon/micro-peak.ico | Bin 285478 -> 0 bytes icon/micropeak-128.png | Bin 4394 -> 0 bytes icon/micropeak-16.png | Bin 534 -> 0 bytes icon/micropeak-256.png | Bin 8055 -> 0 bytes icon/micropeak-32.png | Bin 1072 -> 0 bytes icon/micropeak-48.png | Bin 1662 -> 0 bytes icon/micropeak-64.png | Bin 2240 -> 0 bytes icon/telegps-128.png | Bin 10163 -> 0 bytes icon/telegps-16.png | Bin 693 -> 0 bytes icon/telegps-256.png | Bin 23474 -> 0 bytes icon/telegps-32.png | Bin 1751 -> 0 bytes icon/telegps-48.png | Bin 2962 -> 0 bytes icon/telegps-64.png | Bin 4364 -> 0 bytes icon/telegps.ico | Bin 354422 -> 0 bytes 26 files changed, 79 insertions(+), 5 deletions(-) create mode 100644 icon/.gitignore delete mode 100644 icon/altus-metrum-128.png delete mode 100644 icon/altus-metrum-16.png delete mode 100644 icon/altus-metrum-256.png delete mode 100644 icon/altus-metrum-32.png delete mode 100644 icon/altus-metrum-48.png delete mode 100644 icon/altus-metrum-512.png delete mode 100644 icon/altus-metrum-64.png delete mode 100644 icon/altus-metrum.ico create mode 100755 icon/make-png delete mode 100644 icon/micro-peak.ico delete mode 100644 icon/micropeak-128.png delete mode 100644 icon/micropeak-16.png delete mode 100644 icon/micropeak-256.png delete mode 100644 icon/micropeak-32.png delete mode 100644 icon/micropeak-48.png delete mode 100644 icon/micropeak-64.png delete mode 100644 icon/telegps-128.png delete mode 100644 icon/telegps-16.png delete mode 100644 icon/telegps-256.png delete mode 100644 icon/telegps-32.png delete mode 100644 icon/telegps-48.png delete mode 100644 icon/telegps-64.png delete mode 100644 icon/telegps.ico (limited to 'debian') diff --git a/debian/control b/debian/control index 13f8e1a3..1d4ee52f 100644 --- a/debian/control +++ b/debian/control @@ -3,7 +3,7 @@ Section: electronics Priority: optional Maintainer: Bdale Garbee Uploaders: Keith Packard -Build-Depends: debhelper (>= 7), autoconf, automake, gawk, libreadline-dev, libusb-1.0-0-dev, nickle, cc1111, xsltproc, fop, xmlto, docbook-xml, docbook-xsl, swig, default-jdk, freetts, libtool, libjfreechart-java, libbluetooth-dev, pkg-config, libelf-dev, libbluetooth-dev, libssl-dev, gcc-arm-none-eabi, icoutils, librsvg2-bin +Build-Depends: debhelper (>= 7), autoconf, automake, gawk, libreadline-dev, libusb-1.0-0-dev, nickle, cc1111, xsltproc, fop, xmlto, docbook-xml, docbook-xsl, swig, default-jdk, freetts, libtool, libjfreechart-java, libbluetooth-dev, pkg-config, libelf-dev, libbluetooth-dev, libssl-dev, gcc-arm-none-eabi, icoutils, librsvg2-bin, icnsutils Standards-Version: 3.9.5 Homepage: http://altusmetrum.org/AltOS Vcs-Git: git://git.gag.com/fw/altos diff --git a/icon/.gitignore b/icon/.gitignore new file mode 100644 index 00000000..e89555de --- /dev/null +++ b/icon/.gitignore @@ -0,0 +1,6 @@ +altus-metrum-*.png +micropeak-*.png +telegps-*.png +*.ico +*.icns +*.build diff --git a/icon/Makefile.am b/icon/Makefile.am index 60afdb1c..db5577d6 100644 --- a/icon/Makefile.am +++ b/icon/Makefile.am @@ -1,10 +1,17 @@ -RES=16 32 48 64 128 256 +LINUX_RES=16 32 48 64 128 256 512 +MAC_RES=16 32 128 256 512 +WIN_RES=16 24 32 48 64 72 96 128 180 256 +RES=$(shell echo $(LINUX_RES) $(MAC_RES) $(WIN_RES) | awk '{ for (i = 1; i <= NF; i++) printf("%s\n", $$i); }' | sort -n -u) AM_FILES=$(shell for i in $(RES); do echo altus-metrum-$$i.png; done) MP_FILES=$(shell for i in $(RES); do echo micropeak-$$i.png; done) TG_FILES=$(shell for i in $(RES); do echo telegps-$$i.png; done) +MAC_TG_FILES=$(shell for i in $(MAC_RES); do echo telegps-$$i.png; done) +MAC_MP_FILES=$(shell for i in $(MAC_RES); do echo micropeak-$$i.png; done) +MAC_AM_FILES=$(shell for i in $(MAC_RES); do echo altus-metrum-$$i.png; done) ICO_FILES=altus-metrum.ico micro-peak.ico telegps.ico +ICNS_FILES=AltosUIIcon.icns TeleGPS.icns MicroPeak.icns icondir = $(datadir)/icons/hicolor/scalable/apps @@ -16,10 +23,28 @@ icon_DATA = $(AM_ICON) $(MP_ICON) $(TG_ICON) EXTRA_DIST = $(icon_DATA) $(AM_FILES) $(MP_FILES) $(TG_FILES) -all-local: $(ICO_FILES) +res: + echo $(RES) -$(TG_FILES): telegps.svg - for i in $(RES); do rsvg-convert -w $$i -o telegps-$$i.png telegps.svg; done +all-local: $(ICO_FILES) $(ICNS_FILES) + +clean-local: + $(RM) $(TG_FILES) $(MP_FILES) $(ICO_FILES) $(ICNS_FILES) *.build + +$(AM_FILES): altusmetrum.build + +altusmetrum.build: altusmetrum.svg + for i in $(RES); do ./make-png altusmetrum.svg $$i altus-metrum-$$i.png; done && touch $@ + +$(TG_FILES): telegps.build + +telegps.build: telegps.svg + for i in $(RES); do ./make-png telegps.svg $$i telegps-$$i.png; done && touch $@ + +$(MP_FILES): micropeak.build + +micropeak.build: micropeak.svg + for i in $(RES); do ./make-png micropeak.svg $$i micropeak-$$i.png; done && touch $@ #clean-local: # $(RM) -f $(ICO_FILES) @@ -32,3 +57,12 @@ micro-peak.ico: $(MP_FILES) telegps.ico: $(TG_FILES) icotool -c -o $@ $(TG_FILES) + +AltosUIIcon.icns: $(MAC_AM_FILES) + png2icns $@ $(MAC_AM_FILES) + +TeleGPS.icns: $(MAC_TG_FILES) + png2icns $@ $(MAC_TG_FILES) + +MicroPeak.icns: $(MAC_MP_FILES) + png2icns $@ $(MAC_MP_FILES) diff --git a/icon/altus-metrum-128.png b/icon/altus-metrum-128.png deleted file mode 100644 index f1343d9e..00000000 Binary files a/icon/altus-metrum-128.png and /dev/null differ diff --git a/icon/altus-metrum-16.png b/icon/altus-metrum-16.png deleted file mode 100644 index 5bd45999..00000000 Binary files a/icon/altus-metrum-16.png and /dev/null differ diff --git a/icon/altus-metrum-256.png b/icon/altus-metrum-256.png deleted file mode 100644 index 46e1670a..00000000 Binary files a/icon/altus-metrum-256.png and /dev/null differ diff --git a/icon/altus-metrum-32.png b/icon/altus-metrum-32.png deleted file mode 100644 index c8588899..00000000 Binary files a/icon/altus-metrum-32.png and /dev/null differ diff --git a/icon/altus-metrum-48.png b/icon/altus-metrum-48.png deleted file mode 100644 index 3bee98e6..00000000 Binary files a/icon/altus-metrum-48.png and /dev/null differ diff --git a/icon/altus-metrum-512.png b/icon/altus-metrum-512.png deleted file mode 100644 index 47c47003..00000000 Binary files a/icon/altus-metrum-512.png and /dev/null differ diff --git a/icon/altus-metrum-64.png b/icon/altus-metrum-64.png deleted file mode 100644 index 0ee086a6..00000000 Binary files a/icon/altus-metrum-64.png and /dev/null differ diff --git a/icon/altus-metrum.ico b/icon/altus-metrum.ico deleted file mode 100644 index bedf04ef..00000000 Binary files a/icon/altus-metrum.ico and /dev/null differ diff --git a/icon/make-png b/icon/make-png new file mode 100755 index 00000000..748cf32e --- /dev/null +++ b/icon/make-png @@ -0,0 +1,34 @@ +#!/bin/sh + +case $# in +3) + ;; +*) + echo "Usage: $0 " 1>&2 + exit 1 + ;; +esac + +SVG=$1 +SIZE=$2 +PNG=$3 + +SHADOW=$(($SIZE / 16)) +IMAGE=$(($SIZE - $SHADOW)) + +OPACITY=80 +BLUR=$(($SHADOW / 4)) +SHIFT=$(($SHADOW - $BLUR)) + +echo SHADOW $SHADOW IMAGE $IMAGE OPACITY $OPACITY SHIFT $SHIFT BLUR $BLUR + +TMP=image-$$.png + +trap "rm $TMP" 0 1 15 + +rsvg-convert -w $IMAGE -h $IMAGE -o $TMP $SVG + +convert $TMP \ + \( +clone -background black -shadow ${OPACITY}x${BLUR}+${SHIFT}+${SHIFT} \) \ + +swap -background none -layers merge -crop ${SIZE}x${SIZE}+0+0 +repage $PNG + diff --git a/icon/micro-peak.ico b/icon/micro-peak.ico deleted file mode 100644 index b672aa04..00000000 Binary files a/icon/micro-peak.ico and /dev/null differ diff --git a/icon/micropeak-128.png b/icon/micropeak-128.png deleted file mode 100644 index f045dc6a..00000000 Binary files a/icon/micropeak-128.png and /dev/null differ diff --git a/icon/micropeak-16.png b/icon/micropeak-16.png deleted file mode 100644 index d8140802..00000000 Binary files a/icon/micropeak-16.png and /dev/null differ diff --git a/icon/micropeak-256.png b/icon/micropeak-256.png deleted file mode 100644 index b96d4706..00000000 Binary files a/icon/micropeak-256.png and /dev/null differ diff --git a/icon/micropeak-32.png b/icon/micropeak-32.png deleted file mode 100644 index d34c5c12..00000000 Binary files a/icon/micropeak-32.png and /dev/null differ diff --git a/icon/micropeak-48.png b/icon/micropeak-48.png deleted file mode 100644 index 86dc4f7f..00000000 Binary files a/icon/micropeak-48.png and /dev/null differ diff --git a/icon/micropeak-64.png b/icon/micropeak-64.png deleted file mode 100644 index 6ca7c2eb..00000000 Binary files a/icon/micropeak-64.png and /dev/null differ diff --git a/icon/telegps-128.png b/icon/telegps-128.png deleted file mode 100644 index 6b72cc46..00000000 Binary files a/icon/telegps-128.png and /dev/null differ diff --git a/icon/telegps-16.png b/icon/telegps-16.png deleted file mode 100644 index 3010a4e1..00000000 Binary files a/icon/telegps-16.png and /dev/null differ diff --git a/icon/telegps-256.png b/icon/telegps-256.png deleted file mode 100644 index 7565b525..00000000 Binary files a/icon/telegps-256.png and /dev/null differ diff --git a/icon/telegps-32.png b/icon/telegps-32.png deleted file mode 100644 index a01d41d1..00000000 Binary files a/icon/telegps-32.png and /dev/null differ diff --git a/icon/telegps-48.png b/icon/telegps-48.png deleted file mode 100644 index e9bbda08..00000000 Binary files a/icon/telegps-48.png and /dev/null differ diff --git a/icon/telegps-64.png b/icon/telegps-64.png deleted file mode 100644 index b39c8f65..00000000 Binary files a/icon/telegps-64.png and /dev/null differ diff --git a/icon/telegps.ico b/icon/telegps.ico deleted file mode 100644 index bbe2283e..00000000 Binary files a/icon/telegps.ico and /dev/null differ -- cgit v1.2.3 From 4e3318645d08dda483aced97450b344629902c4d Mon Sep 17 00:00:00 2001 From: Keith Packard Date: Sat, 14 Jun 2014 18:11:28 -0700 Subject: debian: Build requires /usr/bin/convert now This is provided by either graphicsmagick or imagemagick Signed-off-by: Keith Packard --- debian/control | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'debian') diff --git a/debian/control b/debian/control index 1d4ee52f..3c9e8999 100644 --- a/debian/control +++ b/debian/control @@ -3,7 +3,7 @@ Section: electronics Priority: optional Maintainer: Bdale Garbee Uploaders: Keith Packard -Build-Depends: debhelper (>= 7), autoconf, automake, gawk, libreadline-dev, libusb-1.0-0-dev, nickle, cc1111, xsltproc, fop, xmlto, docbook-xml, docbook-xsl, swig, default-jdk, freetts, libtool, libjfreechart-java, libbluetooth-dev, pkg-config, libelf-dev, libbluetooth-dev, libssl-dev, gcc-arm-none-eabi, icoutils, librsvg2-bin, icnsutils +Build-Depends: debhelper (>= 7), autoconf, automake, gawk, libreadline-dev, libusb-1.0-0-dev, nickle, cc1111, xsltproc, fop, xmlto, docbook-xml, docbook-xsl, swig, default-jdk, freetts, libtool, libjfreechart-java, libbluetooth-dev, pkg-config, libelf-dev, libbluetooth-dev, libssl-dev, gcc-arm-none-eabi, icoutils, librsvg2-bin, icnsutils, graphicsmagick | imagemagick Standards-Version: 3.9.5 Homepage: http://altusmetrum.org/AltOS Vcs-Git: git://git.gag.com/fw/altos -- cgit v1.2.3