summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--debian/control2
-rw-r--r--icon/Makefile.am18
-rw-r--r--icon/telegps-128.pngbin8736 -> 10163 bytes
-rw-r--r--icon/telegps-16.pngbin507 -> 693 bytes
-rw-r--r--icon/telegps-256.pngbin21589 -> 23474 bytes
-rw-r--r--icon/telegps-32.pngbin1475 -> 1751 bytes
-rw-r--r--icon/telegps-48.pngbin2507 -> 2962 bytes
-rw-r--r--icon/telegps-512.pngbin56581 -> 0 bytes
-rw-r--r--icon/telegps-64.pngbin3678 -> 4364 bytes
-rw-r--r--icon/telegps.icobin285478 -> 354422 bytes
-rw-r--r--icon/telegps.svg292
-rw-r--r--telegps/telegps.desktop.in10
12 files changed, 204 insertions, 118 deletions
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 <bdale@gag.com>
Uploaders: Keith Packard <keithp@keithp.com>
-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
--- a/icon/telegps-128.png
+++ b/icon/telegps-128.png
Binary files differ
diff --git a/icon/telegps-16.png b/icon/telegps-16.png
index 5bd45999..3010a4e1 100644
--- a/icon/telegps-16.png
+++ b/icon/telegps-16.png
Binary files differ
diff --git a/icon/telegps-256.png b/icon/telegps-256.png
index 46e1670a..7565b525 100644
--- a/icon/telegps-256.png
+++ b/icon/telegps-256.png
Binary files differ
diff --git a/icon/telegps-32.png b/icon/telegps-32.png
index c8588899..a01d41d1 100644
--- a/icon/telegps-32.png
+++ b/icon/telegps-32.png
Binary files differ
diff --git a/icon/telegps-48.png b/icon/telegps-48.png
index 3bee98e6..e9bbda08 100644
--- a/icon/telegps-48.png
+++ b/icon/telegps-48.png
Binary files differ
diff --git a/icon/telegps-512.png b/icon/telegps-512.png
deleted file mode 100644
index 47c47003..00000000
--- a/icon/telegps-512.png
+++ /dev/null
Binary files differ
diff --git a/icon/telegps-64.png b/icon/telegps-64.png
index 0ee086a6..b39c8f65 100644
--- a/icon/telegps-64.png
+++ b/icon/telegps-64.png
Binary files differ
diff --git a/icon/telegps.ico b/icon/telegps.ico
index bedf04ef..bbe2283e 100644
--- a/icon/telegps.ico
+++ b/icon/telegps.ico
Binary files 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">
- <metadata
- id="metadata14">
- <rdf:RDF>
- <cc:Work
- rdf:about="">
- <dc:format>image/svg+xml</dc:format>
- <dc:type
- rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
- <dc:title></dc:title>
- </cc:Work>
- </rdf:RDF>
- </metadata>
+ sodipodi:docname="telegps.svg">
<defs
- id="defs12">
- <linearGradient
- id="linearGradient3165">
- <stop
- style="stop-color:#000000;stop-opacity:1;"
- offset="0"
- id="stop3167" />
- <stop
- style="stop-color:#000000;stop-opacity:0;"
- offset="1"
- id="stop3169" />
- </linearGradient>
- <linearGradient
- id="linearGradient3177">
- <stop
- style="stop-color:#da7000;stop-opacity:1;"
- offset="0"
- id="stop3179" />
- <stop
- id="stop3447"
- offset="0.24528302"
- style="stop-color:#a63852;stop-opacity:1;" />
- <stop
- style="stop-color:#7200a4;stop-opacity:1;"
- offset="1"
- id="stop3181" />
- </linearGradient>
+ id="defs4">
+ <radialGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient3169"
+ id="radialGradient3175"
+ cx="951.68713"
+ cy="2305.2668"
+ fx="951.68713"
+ fy="2305.2668"
+ r="951.68701"
+ gradientTransform="matrix(1,0,0,1.2664529,0,-321.14689)"
+ gradientUnits="userSpaceOnUse" />
<linearGradient
id="linearGradient3169">
<stop
@@ -76,24 +44,6 @@
offset="1"
id="stop3173" />
</linearGradient>
- <inkscape:perspective
- sodipodi:type="inkscape:persp3d"
- inkscape:vp_x="0 : 121 : 1"
- inkscape:vp_y="0 : 1000 : 0"
- inkscape:vp_z="191 : 121 : 1"
- inkscape:persp3d-origin="95.5 : 80.666667 : 1"
- id="perspective16" />
- <radialGradient
- inkscape:collect="always"
- xlink:href="#linearGradient3169"
- id="radialGradient3175"
- cx="951.68713"
- cy="2305.2668"
- fx="951.68713"
- fy="2305.2668"
- r="951.68701"
- gradientTransform="matrix(1,0,0,1.2664529,0,-321.14689)"
- gradientUnits="userSpaceOnUse" />
<radialGradient
inkscape:collect="always"
xlink:href="#linearGradient3165"
@@ -105,10 +55,21 @@
r="951.68701"
gradientTransform="matrix(1,0,0,1.2664529,0,-321.14689)"
gradientUnits="userSpaceOnUse" />
+ <linearGradient
+ id="linearGradient3165">
+ <stop
+ style="stop-color:#000000;stop-opacity:1;"
+ offset="0"
+ id="stop3167" />
+ <stop
+ style="stop-color:#000000;stop-opacity:0;"
+ offset="1"
+ id="stop3169" />
+ </linearGradient>
<radialGradient
inkscape:collect="always"
xlink:href="#linearGradient3169"
- id="radialGradient3020"
+ id="radialGradient2838"
gradientUnits="userSpaceOnUse"
gradientTransform="matrix(1,0,0,1.2664529,0,-321.14689)"
cx="951.68713"
@@ -116,10 +77,25 @@
fx="951.68713"
fy="2305.2668"
r="951.68701" />
+ <linearGradient
+ id="linearGradient3181">
+ <stop
+ style="stop-color:#ff8a00;stop-opacity:1;"
+ offset="0"
+ id="stop3183" />
+ <stop
+ id="stop3185"
+ offset="0.71698111"
+ style="stop-color:#c24573;stop-opacity:0.98039216;" />
+ <stop
+ style="stop-color:#8500e7;stop-opacity:0.96078432;"
+ offset="1"
+ id="stop3187" />
+ </linearGradient>
<radialGradient
inkscape:collect="always"
xlink:href="#linearGradient3165"
- id="radialGradient3022"
+ id="radialGradient2840"
gradientUnits="userSpaceOnUse"
gradientTransform="matrix(1,0,0,1.2664529,0,-321.14689)"
cx="951.68713"
@@ -127,10 +103,21 @@
fx="951.68713"
fy="1205.2668"
r="951.68701" />
+ <linearGradient
+ id="linearGradient3190">
+ <stop
+ style="stop-color:#000000;stop-opacity:1;"
+ offset="0"
+ id="stop3192" />
+ <stop
+ style="stop-color:#000000;stop-opacity:0;"
+ offset="1"
+ id="stop3194" />
+ </linearGradient>
<radialGradient
inkscape:collect="always"
xlink:href="#linearGradient3169"
- id="radialGradient3024"
+ id="radialGradient2830"
gradientUnits="userSpaceOnUse"
gradientTransform="matrix(1,0,0,1.2664529,0,-321.14689)"
cx="951.68713"
@@ -138,10 +125,25 @@
fx="951.68713"
fy="2305.2668"
r="951.68701" />
+ <linearGradient
+ id="linearGradient3197">
+ <stop
+ style="stop-color:#ff8a00;stop-opacity:1;"
+ offset="0"
+ id="stop3199" />
+ <stop
+ id="stop3201"
+ offset="0.71698111"
+ style="stop-color:#c24573;stop-opacity:0.98039216;" />
+ <stop
+ style="stop-color:#8500e7;stop-opacity:0.96078432;"
+ offset="1"
+ id="stop3203" />
+ </linearGradient>
<radialGradient
inkscape:collect="always"
xlink:href="#linearGradient3165"
- id="radialGradient3026"
+ id="radialGradient2832"
gradientUnits="userSpaceOnUse"
gradientTransform="matrix(1,0,0,1.2664529,0,-321.14689)"
cx="951.68713"
@@ -149,10 +151,21 @@
fx="951.68713"
fy="1205.2668"
r="951.68701" />
+ <linearGradient
+ id="linearGradient3206">
+ <stop
+ style="stop-color:#000000;stop-opacity:1;"
+ offset="0"
+ id="stop3208" />
+ <stop
+ style="stop-color:#000000;stop-opacity:0;"
+ offset="1"
+ id="stop3210" />
+ </linearGradient>
<radialGradient
inkscape:collect="always"
xlink:href="#linearGradient3169"
- id="radialGradient3028"
+ id="radialGradient2834"
gradientUnits="userSpaceOnUse"
gradientTransform="matrix(1,0,0,1.2664529,0,-321.14689)"
cx="951.68713"
@@ -160,10 +173,25 @@
fx="951.68713"
fy="2305.2668"
r="951.68701" />
+ <linearGradient
+ id="linearGradient3213">
+ <stop
+ style="stop-color:#ff8a00;stop-opacity:1;"
+ offset="0"
+ id="stop3215" />
+ <stop
+ id="stop3217"
+ offset="0.71698111"
+ style="stop-color:#c24573;stop-opacity:0.98039216;" />
+ <stop
+ style="stop-color:#8500e7;stop-opacity:0.96078432;"
+ offset="1"
+ id="stop3219" />
+ </linearGradient>
<radialGradient
inkscape:collect="always"
xlink:href="#linearGradient3165"
- id="radialGradient3030"
+ id="radialGradient2836"
gradientUnits="userSpaceOnUse"
gradientTransform="matrix(1,0,0,1.2664529,0,-321.14689)"
cx="951.68713"
@@ -171,45 +199,95 @@
fx="951.68713"
fy="1205.2668"
r="951.68701" />
+ <linearGradient
+ id="linearGradient3222">
+ <stop
+ style="stop-color:#000000;stop-opacity:1;"
+ offset="0"
+ id="stop3224" />
+ <stop
+ style="stop-color:#000000;stop-opacity:0;"
+ offset="1"
+ id="stop3226" />
+ </linearGradient>
+ <radialGradient
+ r="951.68701"
+ fy="2305.2668"
+ fx="951.68713"
+ cy="2305.2668"
+ cx="951.68713"
+ gradientTransform="matrix(1,0,0,1.2664529,0,-321.14689)"
+ gradientUnits="userSpaceOnUse"
+ id="radialGradient3232"
+ xlink:href="#linearGradient3169"
+ inkscape:collect="always" />
+ <radialGradient
+ r="951.68701"
+ fy="1205.2668"
+ fx="951.68713"
+ cy="1205.2668"
+ cx="951.68713"
+ gradientTransform="matrix(1,0,0,1.2664529,0,-321.14689)"
+ gradientUnits="userSpaceOnUse"
+ id="radialGradient3234"
+ xlink:href="#linearGradient3165"
+ inkscape:collect="always" />
+ <radialGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient3169"
+ id="radialGradient4101"
+ cx="194.54575"
+ cy="361.16367"
+ fx="194.54575"
+ fy="361.16367"
+ r="70.597672"
+ gradientTransform="matrix(1,0,0,0.95908583,137.14286,74.776711)"
+ gradientUnits="userSpaceOnUse" />
</defs>
<sodipodi:namedview
- inkscape:cy="107.44765"
- inkscape:cx="270.26251"
- inkscape:zoom="0.86831672"
- inkscape:window-height="709"
- inkscape:window-width="1006"
- inkscape:pageshadow="2"
- inkscape:pageopacity="0.0"
- guidetolerance="10.0"
- gridtolerance="10.0"
- objecttolerance="10.0"
- borderopacity="1.0"
- bordercolor="#666666"
- pagecolor="#ffffff"
id="base"
+ pagecolor="#ffffff"
+ bordercolor="#666666"
+ borderopacity="1.0"
+ inkscape:pageopacity="0.0"
+ inkscape:pageshadow="2"
+ inkscape:zoom="3.959798"
+ inkscape:cx="89.129775"
+ inkscape:cy="34.623372"
+ inkscape:document-units="px"
+ inkscape:current-layer="layer1"
showgrid="false"
- inkscape:window-x="266"
- inkscape:window-y="43"
- inkscape:current-layer="svg2"
- inkscape:window-maximized="0" />
+ 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" />
+ <metadata
+ id="metadata7">
+ <rdf:RDF>
+ <cc:Work
+ rdf:about="">
+ <dc:format>image/svg+xml</dc:format>
+ <dc:type
+ rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+ <dc:title />
+ </cc:Work>
+ </rdf:RDF>
+ </metadata>
<g
- transform="matrix(0.1,0,0,0.1,1.1516425,2.6405446)"
- id="g3"
- style="fill:url(#radialGradient3175);fill-opacity:1;stroke:url(#radialGradient3171);stroke-width:1;stroke-miterlimit:4;stroke-dasharray:none">
- <g
- transform="translate(20.61545,-27.69425)"
- style="fill:url(#radialGradient3028);fill-opacity:1;fill-rule:evenodd;stroke:url(#radialGradient3030);stroke-width:1;stroke-miterlimit:4;stroke-dasharray:none"
- id="g5">
- <path
- d="m 931.07168,1164.597 248.86992,-331.80265 416.1687,1338.32935 286.6484,267.1042 -520.4224,0 -270.2797,-262.2181 0,-1033.0627 -160.98492,106.6818 -160.98492,-106.6818 0,1033.0627 -270.2797,262.2181 -520.4224,0 286.6484,-267.1042 416.1687,-1338.32935 248.86992,331.80265 z"
- id="path7"
- style="fill:url(#radialGradient3020);fill-opacity:1;stroke:url(#radialGradient3022);stroke-width:1;stroke-miterlimit:4;stroke-dasharray:none"
- inkscape:connector-curvature="0" />
- <path
- d="m 931.07168,27.69425 224.03682,720.46517 -63.341,76.00913 L 931.07168,486.3269 770.37586,824.16855 707.03486,748.15942 931.07168,27.69425 z"
- id="path9"
- style="fill:url(#radialGradient3024);fill-opacity:1;stroke:url(#radialGradient3026);stroke-width:1;stroke-miterlimit:4;stroke-dasharray:none"
- inkscape:connector-curvature="0" />
- </g>
+ inkscape:label="Layer 1"
+ inkscape:groupmode="layer"
+ id="layer1"
+ transform="translate(-261.09094,-353.45446)">
+ <path
+ style="fill:url(#radialGradient4101);fill-opacity:1"
+ d="m 261.09094,466.61035 1.9122,-1.69399 39.0721,-36.4688 20.74158,22.05252 -40.71991,38.37279 z m 36.24983,1.34654 -14.08636,-15.38433 -15.33887,14.40857 14.50759,15.23741 z m 18.98704,-17.58715 -14.47613,-15.53942 -14.95191,14.42099 14.19976,15.37575 z m 43.2565,3.24033 -5.69326,-6.00917 -2.76929,1.85727 c -5.01515,3.36349 -10.61773,4.75193 -13.55344,3.35884 -0.90785,-0.4308 -11.20677,-10.85557 -16.46128,-16.61505 -6.3177,-6.92484 -17.77225,-18.68338 -18.08204,-21.53696 l -0.25491,-2.34789 -6.68224,-3.00173 -6.68224,-3.00173 -0.12416,-2.54849 c -0.24316,-4.99109 2.61694,-11.66135 7.10652,-16.57368 6.51922,-7.13306 14.23173,-10.81215 21.4071,-10.21178 l 2.49577,0.20881 2.34108,7.3087 2.34109,7.3087 2.0542,0.21626 c 1.12981,0.11895 2.29245,0.36702 2.58364,0.55127 0.29119,0.18424 11.17756,11.55849 16.63562,17.46044 5.67391,6.13537 16.35301,17.71615 16.74619,18.65715 1.36492,3.26672 -0.56522,9.34479 -4.44838,14.00803 -0.92939,1.1161 -1.6875,2.14976 -1.6847,2.29703 0.003,0.14726 2.44601,2.88431 5.42933,6.08233 2.98332,3.19801 5.42421,6.02814 5.42421,6.28919 0,0.66794 -0.91528,1.72591 -1.73982,2.01104 -0.50334,0.17406 -2.27007,-1.42112 -6.38899,-5.76858 z m -13.8944,-6.52384 c 0.96195,-0.49074 2.46683,-1.3673 3.34417,-1.94791 l 1.59519,-1.05564 -1.69025,-1.72225 c -1.71532,-1.74777 -2.09589,-2.99732 -1.1891,-3.90412 0.98407,-0.98406 2.33559,-0.53387 3.9423,1.31314 l 1.57825,1.81431 1.43638,-1.7099 c 1.7115,-2.03742 3.3933,-5.47555 3.39008,-6.9304 -0.0104,-4.68327 -7.01613,-2.68794 -13.36898,3.80766 -4.26282,4.35861 -6.32786,9.57528 -4.26584,10.77629 1.19252,0.69458 3.36009,0.51166 5.2278,-0.44118 z m -37.53066,-44.39022 c 2.23934,-2.70633 7.29399,-6.99375 10.13666,-8.59806 1.69887,-0.95877 2.21231,-1.46174 2.04152,-1.99985 -0.1255,-0.3954 -1.05734,-3.0661 -2.07077,-5.93487 l -1.84259,-5.21596 -1.60649,0.12825 c -4.1301,0.32972 -9.06228,2.86043 -13.29918,6.82384 -4.03277,3.77245 -7.7843,10.20829 -7.89014,13.53572 l -0.0463,1.4539 5.4085,2.47197 5.4085,2.47197 1.02919,-1.54008 c 0.56606,-0.84704 1.79503,-2.46562 2.73105,-3.59683 z m 32.91039,-10.47213 40.55794,-38.76942 c 7.09795,7.71166 14.5366,15.63755 20.65837,22.2503 l -40.53088,38.2414 z m 35.73645,1.02093 -14.2595,-15.3791 -15.29495,14.35785 14.65467,15.14661 z m 18.6801,-17.55816 -14.10162,-15.40128 -15.32812,14.3973 14.52992,15.24342 z"
+ id="path3063"
+ inkscape:connector-curvature="0"
+ sodipodi:nodetypes="ccccccccccccccccscssascccssscccscasscsssssccssscssssscssscssccccsccccccccccccccccc" />
</g>
</svg>
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;