Revision: 608
http://pytrainer.svn.sourceforge.net/pytrainer/?rev=608&view=rev
Author: jblance
Date: 2010-07-11 04:49:45 +0000 (Sun, 11 Jul 2010)
Log Message:
-----------
Add cancel button to openstreetmaps extension as per Druzee's patch
Modified Paths:
--------------
pytrainer/trunk/extensions/openstreetmap/openstreetmap.py
Modified: pytrainer/trunk/extensions/openstreetmap/openstreetmap.py
===================================================================
--- pytrainer/trunk/extensions/openstreetmap/openstreetmap.py 2010-07-09 19:49:50 UTC (rev 607)
+++ pytrainer/trunk/extensions/openstreetmap/openstreetmap.py 2010-07-11 04:49:45 UTC (rev 608)
@@ -47,7 +47,11 @@
f.close() #Close
f = open(gpx_file, 'r') #Reopen in readonly mode
#Get extra info from user
- self.display_options_window()
+ response=self.display_options_window()
+ if not response==gtk.RESPONSE_ACCEPT:
+ f.close()
+ logging.debug("User abort")
+ return
fields = (("description",self.description), ("tags",self.tags), ("visibility",self.visibility))
logging.debug("Added fields: %s" % str(fields))
#Multipart encode the request
@@ -93,7 +97,7 @@
logging.debug("<<")
def display_options_window(self):
- self.prefwindow = gtk.Dialog(title=_("Please add any additional information for this upload"), parent=None, flags=gtk.DIALOG_MODAL | gtk.DIALOG_DESTROY_WITH_PARENT, buttons=(gtk.STOCK_OK, gtk.RESPONSE_ACCEPT))
+ self.prefwindow = gtk.Dialog(title=_("Please add any additional information for this upload"), parent=None, flags=gtk.DIALOG_MODAL | gtk.DIALOG_DESTROY_WITH_PARENT, buttons=(gtk.STOCK_OK, gtk.RESPONSE_ACCEPT, gtk.STOCK_CANCEL, gtk.RESPONSE_REJECT))
self.prefwindow.set_modal(False)
table = gtk.Table(1,2)
self.entryList = []
@@ -127,10 +131,13 @@
self.prefwindow.vbox.pack_start(table)
self.prefwindow.show_all()
self.prefwindow.connect("response", self.on_options_ok_clicked)
- self.prefwindow.run()
+ response=self.prefwindow.run()
+ self.prefwindow.destroy()
+ return response
def on_options_ok_clicked(self, widget, response_id):
- widget.destroy()
+ if not response_id == gtk.RESPONSE_ACCEPT:
+ return response_id
self.description = self.entryList[0].get_text()
if self.description == "":
logging.debug("A description is required - setting to default")
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
