New graphics including knots.

diff --git a/ChangeLog b/ChangeLog
index eb4005a..2e159fb 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2010-06-27 speedometer 0.99 (Midsummer)
+       * Final release for Diablo
+       * All new high contrast graphics
+       * Added knots as new unit
+       * No more cardware
+

 2009-02-20 speedometer 0.32 (Toups)
 
        * Fixed a bug that caused a crash when the speed was more than
 2009-02-20 speedometer 0.32 (Toups)
 
        * Fixed a bug that caused a crash when the speed was more than

diff --git a/Makefile b/Makefile
index 160348a..49e9b38 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -26,7 +26,7 @@ install: all
        install -D data/speedometer.desktop $(DESTDIR)/usr/share/applications/hildon/speedometer.desktop
        install -D data/speedometer.service $(DESTDIR)/usr/share/dbus-1/services/speedometer.service
        install -d $(DESTDIR)/usr/share/speedometer/
        install -D data/speedometer.desktop $(DESTDIR)/usr/share/applications/hildon/speedometer.desktop
        install -D data/speedometer.service $(DESTDIR)/usr/share/dbus-1/services/speedometer.service
        install -d $(DESTDIR)/usr/share/speedometer/

-       install data/*.png $(DESTDIR)/usr/share/speedometer/
+       install gfx/*.png $(DESTDIR)/usr/share/speedometer/

        install -D icons/speedometer-64.png $(DESTDIR)/usr/share/icons/hicolor/scalable/hildon/speedometer.png
 
 uninstall:
        install -D icons/speedometer-64.png $(DESTDIR)/usr/share/icons/hicolor/scalable/hildon/speedometer.png
 
 uninstall:

diff --git a/README b/README
index cd125d7..4a8cf1e 100644 (file)
--- a/README
+++ b/README
@@ -2,21 +2,6 @@
 This application and all its files are released under
 GPL license. See COPYING for the whole license text.
 
 This application and all its files are released under
 GPL license. See COPYING for the whole license text.
 

-There is one catch though.. If you really like this
-program I would like to get a postcard from you.
-
-This is *not* to say you have to but it would be very nice.
-
-See http://en.wikipedia.org/wiki/Cardware if you don't know
-what this means.
-
-Anyway, here goes the address:
-
-Wellu Mäkinen
-Poste restante
-33580 Tampere
-FINLAND
-

 This application has been tested and developed solely
 on Nokia N810 which has internal GPS receiver. It
 *might* work on Nokia N800 with a Bluetooth GPS dongle
 This application has been tested and developed solely
 on Nokia N810 which has internal GPS receiver. It
 *might* work on Nokia N800 with a Bluetooth GPS dongle

diff --git a/data/0.png b/data/0.png
deleted file mode 100644 (file)
index 7b1a97f..0000000
Binary files a/data/0.png and /dev/null differ

diff --git a/data/1.png b/data/1.png
deleted file mode 100644 (file)
index 094a59c..0000000
Binary files a/data/1.png and /dev/null differ

diff --git a/data/2.png b/data/2.png
deleted file mode 100644 (file)
index 4cff46a..0000000
Binary files a/data/2.png and /dev/null differ

diff --git a/data/3.png b/data/3.png
deleted file mode 100644 (file)
index d19f3b7..0000000
Binary files a/data/3.png and /dev/null differ

diff --git a/data/4.png b/data/4.png
deleted file mode 100644 (file)
index e357bed..0000000
Binary files a/data/4.png and /dev/null differ

diff --git a/data/5.png b/data/5.png
deleted file mode 100644 (file)
index f93428a..0000000
Binary files a/data/5.png and /dev/null differ

diff --git a/data/6.png b/data/6.png
deleted file mode 100644 (file)
index 2e578a0..0000000
Binary files a/data/6.png and /dev/null differ

diff --git a/data/7.png b/data/7.png
deleted file mode 100644 (file)
index 9aacef3..0000000
Binary files a/data/7.png and /dev/null differ

diff --git a/data/8.png b/data/8.png
deleted file mode 100644 (file)
index 673fa4e..0000000
Binary files a/data/8.png and /dev/null differ

diff --git a/data/9.png b/data/9.png
deleted file mode 100644 (file)
index 85b3059..0000000
Binary files a/data/9.png and /dev/null differ

diff --git a/data/big.xcf b/data/big.xcf
deleted file mode 100644 (file)
index 36ebe67..0000000
Binary files a/data/big.xcf and /dev/null differ

diff --git a/data/fs.png b/data/fs.png
deleted file mode 100644 (file)
index 1385cf5..0000000
Binary files a/data/fs.png and /dev/null differ

diff --git a/data/kmh.png b/data/kmh.png
deleted file mode 100644 (file)
index f4812f0..0000000
Binary files a/data/kmh.png and /dev/null differ

diff --git a/data/mph.png b/data/mph.png
deleted file mode 100644 (file)
index 686cd56..0000000
Binary files a/data/mph.png and /dev/null differ

diff --git a/data/ms.png b/data/ms.png
deleted file mode 100644 (file)
index 8292458..0000000
Binary files a/data/ms.png and /dev/null differ

diff --git a/debian/changelog b/debian/changelog
index bba36c2..78a578c 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+speedometer (0.99) unstable; urgency=low
+
+  * Final release for Diablo.
+  * All new high contrast graphics including knots.
+
+ -- Wellu Mäkinen <wellu@wellu.org>  Sun, 27 Jun 2010 10:59:54 +0300
+

 speedometer (0.32) unstable; urgency=low
 
   * Fixed a crash when speed is more than 1000 km/h.
 speedometer (0.32) unstable; urgency=low
 
   * Fixed a crash when speed is more than 1000 km/h.

diff --git a/debian/speedometer.links b/debian/speedometer.links
index fffe1f4..bad507e 100644 (file)
--- a/debian/speedometer.links
+++ b/debian/speedometer.links
@@ -1,4 +1,6 @@
 usr/share/speedometer/ms.png usr/share/speedometer/10.png
 usr/share/speedometer/kmh.png usr/share/speedometer/11.png
 usr/share/speedometer/mph.png usr/share/speedometer/12.png
 usr/share/speedometer/ms.png usr/share/speedometer/10.png
 usr/share/speedometer/kmh.png usr/share/speedometer/11.png
 usr/share/speedometer/mph.png usr/share/speedometer/12.png

-usr/share/speedometer/fs.png usr/share/speedometer/13.png
+usr/share/speedometer/fts.png usr/share/speedometer/13.png
+usr/share/speedometer/knot.png usr/share/speedometer/14.png
+

diff --git a/ui.c b/ui.c
index 6c225ab..8e7d610 100644 (file)
--- a/ui.c
+++ b/ui.c
@@ -37,12 +37,11 @@
  */
 gdouble conversion[] = { 1, 3.6, 2.237, 3.281, 1.944 };
 guint unit = 1;
  */
 gdouble conversion[] = { 1, 3.6, 2.237, 3.281, 1.944 };
 guint unit = 1;

-#define UNIT_COUNT 4
+#define UNIT_COUNT 5

 // TODO: wrap this mess up somewhere
 // TODO: wrap this mess up somewhere

-// TODO: knot graphics are missing

 
 

-static GdkPixbuf* big_graphics[14];
-static GdkPixbuf* small_graphics[14];
+static GdkPixbuf* big_graphics[15];
+static GdkPixbuf* small_graphics[15];

 static GtkWidget* digits[5];
 static GtkWidget* unit_graphic;
 
 static GtkWidget* digits[5];
 static GtkWidget* unit_graphic;
 

@@ -71,7 +70,7 @@ void load_graphics() {
         * and store the pixbufs to the array. Pixbufs are
         * correct size to be used in the big digits.
         */
         * and store the pixbufs to the array. Pixbufs are
         * correct size to be used in the big digits.
         */

-       while(i < 14) {
+       while(i < 15) {

                char* path = g_malloc(30);
                g_sprintf(path, IMAGE_PATH, i);
                g_print(path);
                char* path = g_malloc(30);
                g_sprintf(path, IMAGE_PATH, i);
                g_print(path);

@@ -267,12 +266,6 @@ static void show_dialog() {
                        "This program is licensed under GNU General Public License, "
                        "which means (among other things) that you don't have to pay "
                        "a dime for it. "
                        "This program is licensed under GNU General Public License, "
                        "which means (among other things) that you don't have to pay "
                        "a dime for it. "

-                       "If you think, however, that this software is worth it, you "
-                       "can always drop me a postcard.\n\n"
-                       "Wellu Mäkinen\n"
-                       "Poste restante\n"
-                       "33580 Tampere\n"
-                       "FINLAND\n\n"

                        "PS. Long-tapping on the screen will quit the program.");
        gtk_dialog_run(GTK_DIALOG(dialog));
        gtk_widget_destroy(dialog);
                        "PS. Long-tapping on the screen will quit the program.");
        gtk_dialog_run(GTK_DIALOG(dialog));
        gtk_widget_destroy(dialog);