version 8 - no journal, 8.2.0 update

4 files changed, 26 insertions, 14 deletions

diff --git a/MANIFEST b/MANIFEST
index 6f54436..85185ae 100644
--- a/MANIFEST
+++ b/MANIFEST
@@ -3,7 +3,6 @@ TODO
 setup.py
 COPYING
 README
-locale/en/LC_MESSAGES
 locale/en/LC_MESSAGES/org.laptop.APRSXO.mo
 locale/en/activity.linfo
 activity/activity-aprs-xo.svg
diff --git a/NEWS b/NEWS
index 35fb91d..503d20b 100644
--- a/NEWS
+++ b/NEWS
@@ -6,3 +6,4 @@ September 28 2008 - version 4 - no journal, no message queue, gui update
 October 5 2008 - version 5 - no journal, can not cancel messages
 October 7 2008 - version 6 - no journal, can cancel message queue, show acks
 October 18 2008 - version 7 - no journal, ack bugfix
+October 18 2008 - version 8 - no journal, 8.2.0 update
diff --git a/activity/activity.info b/activity/activity.info
index a92c463..e334971 100644
--- a/activity/activity.info
+++ b/activity/activity.info
@@ -1,6 +1,6 @@
 [Activity]
 name = APRS-XO
-activity_version= 7
+activity_version= 8
 service_name = org.laptop.APRSXO
 icon = activity-aprs-xo
 exec = sugar-activity aprs.APRSActivity
diff --git a/aprs.py b/aprs.py
index 96ffc48..830fd02 100755
--- a/aprs.py
+++ b/aprs.py
@@ -217,7 +217,7 @@ class APRSActivity(activity.Activity):
         stationbox.pack_start(stationlabel, False, False, 0)
         stationlabel.show()
 
-        # so the text box does not fill all Horizontal space
+        # so the text box does not fill all horizontal space
         stationtextbox = gtk.HBox()
 
         self.stationtext = gtk.Entry()
@@ -406,17 +406,15 @@ class APRSActivity(activity.Activity):
         rightwintopbox = gtk.HBox(False, 4)
 
         clearbutton = gtk.Button()
-#        clearbutton.set_label("  Clear  ")
-#        clearbutton.connect("clicked", self.clear_message)
         clearbutton.set_label(" Cancel Messages ")
         clearbutton.connect("clicked", self.clear_msg_queue)
-        rightwintopbox.pack_start(clearbutton, False, False, 20)
+        rightwintopbox.pack_start(clearbutton, False, False, 18)
         clearbutton.show()
 
         self.beaconbutton = gtk.CheckButton("Beacon every 10 minutes")
         self.beaconbutton.set_active(True)
         self.beaconbutton.connect("toggled", self.enable_beacon, "beacon")
-        rightwintopbox.pack_start(self.beaconbutton, False, False, 20)
+        rightwintopbox.pack_start(self.beaconbutton, False, False, 18)
         self.beaconbutton.show()
 
         rightwin.pack_start(rightwintopbox, False, False, 0)
@@ -428,7 +426,7 @@ class APRSActivity(activity.Activity):
         self.messageview.set_justification(gtk.JUSTIFY_LEFT)
         self.messageview.modify_font(smallfont)
 
-        self.messagebuffer.set_text("Welcome to APRS-XO.\n\nThis program sends your position information to a server that will\ndisplay your location on a webpage.  This program requires an\nactive Internet connection to work.\n\nSelect an APRS Site\nSelecting a button will copy the URI to the clipboard.\n\nIndentifiers\nEnter your callsign and optionally an aprsd password.\n\nStation Comment\nData in the Station Comment field will appear after your location\ninformation on the website.")
+        self.messagebuffer.set_text("Welcome to APRS-XO.\n\nThis program sends your position information to a server that\nwill display your location on a webpage.  This program requires an active Internet connection to work.\n\nSelect an APRS Site\nSelecting a button will copy the URI to the clipboard.\n\nIndentifiers\nEnter your callsign and optionally an aprsd password.\n\nStation Comment\nData in the Station Comment field will appear after your\nlocation information on the website.")
 
         self.messagewindow = gtk.ScrolledWindow()
         self.messagewindow.set_policy(gtk.POLICY_AUTOMATIC, gtk.POLICY_ALWAYS)
@@ -454,7 +452,7 @@ class APRSActivity(activity.Activity):
 
         self.messagetext = gtk.Entry()
         self.messagetext.set_max_length(67)
-        self.messagetext.set_width_chars(32)
+        self.messagetext.set_width_chars(31)
         self.messagetext.modify_font(smallfont)
         self.messagetext.connect("activate", self.send_message, self.messagetext)
         messagebox.pack_start(self.messagetext, False, False, 0)
@@ -475,7 +473,7 @@ class APRSActivity(activity.Activity):
         self.statusview.set_justification(gtk.JUSTIFY_LEFT)
         self.statusview.modify_font(smallfont)
 
-        self.statusbuffer.set_text("Position\nEnter your lat/long.  You may leave the decimal minutes (mm)\nblank for position ambiguity.  If you do not know your lat/long,\nenter your 5 digit zip code instead.\n\nBeacon\nWhen selected, sends location data every 10 minutes.  The\nbeacon will automatically stop when you edit personal\ninformation.  Must be manually reselected after edit completion.\n\nThis message will self destruct when you press Connect.\n\nAPRS Copyright (c) Bob Bruninga WB4APR\n\n")
+        self.statusbuffer.set_text("Position\nEnter your lat/long.  You may leave the decimal minutes (mm)\nblank for position ambiguity.  If you do not know your lat/long,\nenter your 5 digit zip code instead.\n\nBeacon\nWhen selected, sends location data every 10 minutes.  The\nbeacon will automatically stop when you edit personal\ninformation.  Must be manually reselected after edit\ncompletion.\n\nThis message will self destruct when you press Connect.\n\nAPRS Copyright (c) Bob Bruninga WB4APR\n\n")
 
         self.statuswindow = gtk.ScrolledWindow()
         self.statuswindow.set_policy(gtk.POLICY_AUTOMATIC, gtk.POLICY_ALWAYS)
@@ -488,7 +486,7 @@ class APRSActivity(activity.Activity):
 
         self.rawtext = gtk.Entry()
         self.rawtext.set_max_length(128)
-        self.rawtext.set_width_chars(43)
+        self.rawtext.set_width_chars(42)
         self.rawtext.modify_font(smallfont)
         self.rawtext.connect("activate", self.raw_send)
         self.rawbox.pack_start(self.rawtext, False, False, 0)
@@ -506,6 +504,22 @@ class APRSActivity(activity.Activity):
         win.pack_start(rightwin, False, False, 0)
         rightwin.show()
 
+        # for quick testing
+        if (TESTING):
+            self.calltext.set_text("kg4gjy")
+            self.passtext.set_text("18107")
+            self.latDDtext.set_text("35")
+            self.latMMtext.set_text("7")
+            self.latmmtext.set_text("42")
+            self.latcombo.set_active(0)
+            self.lonDDDtext.set_text("85")
+            self.lonMMtext.set_text("6")
+            self.lonmmtext.set_text("93")
+            self.loncombo.set_active(0)
+#            self.stationtext.set_text("")
+            self.ziptext.set_text("")
+            self.beaconbutton.set_active(True)
+
         win.show()
         self.calltext.grab_focus()
 
@@ -622,8 +636,6 @@ class APRSActivity(activity.Activity):
         self.input_watch = []
         self.output_watch = []
 
-        # TODO clear message queue
-
         button.set_label("Connect")
         button.modify_bg(gtk.STATE_NORMAL, gtk.gdk.color_parse("#00b20d"))
 
@@ -648,7 +660,7 @@ class APRSActivity(activity.Activity):
                 for packet in recv_data.split("\n"):
                     if (len(packet) < 2):
                         break
-                    # find uri's http or else www
+                    # find uri's http or www
                     webaddy = packet.lower().find("http")
                     if (webaddy != -1):
                         packet = ("%s\n%s" % (packet[:webaddy], packet[webaddy:]))