[Pytrainer-svn] SF.net SVN: pytrainer:[442] pytrainer/trunk

[<jb...@us...>]

Revision: 442
          http://pytrainer.svn.sourceforge.net/pytrainer/?rev=442&view=rev
Author:   jblance
Date:     2009-12-26 03:14:24 +0000 (Sat, 26 Dec 2009)

Log Message:
-----------
Incorporate time into record display

Modified Paths:
--------------
    pytrainer/trunk/glade/pytrainer.glade
    pytrainer/trunk/pytrainer/gui/windowmain.py
    pytrainer/trunk/pytrainer/main.py

Modified: pytrainer/trunk/glade/pytrainer.glade
===================================================================
--- pytrainer/trunk/glade/pytrainer.glade	2009-12-26 02:19:28 UTC (rev 441)
+++ pytrainer/trunk/glade/pytrainer.glade	2009-12-26 03:14:24 UTC (rev 442)
@@ -940,6 +940,7 @@
 						  <property name="y_options"></property>
 						</packing>
 					      </child>
+					    
 
 					      <child>
 						<widget class="GtkLabel" id="record_unegative">
@@ -1110,7 +1111,7 @@
 						</packing>
 					      </child>
 
-					      <child>
+<!--					      <child>
 						<widget class="GtkLabel" id="label11145">
 						  <property name="visible">True</property>
 						  <property name="label" translatable="yes">&lt;b&gt;Date Time:&lt;/b&gt;</property>
@@ -1137,7 +1138,36 @@
 						  <property name="y_options"></property>
 						</packing>
 					      </child>
+-->
 
+					     <child>
+						<widget class="GtkLabel" id="record_time">
+						  <property name="visible">True</property>
+						  <property name="label" translatable="yes"></property>
+						  <property name="use_underline">False</property>
+						  <property name="use_markup">False</property>
+						  <property name="justify">GTK_JUSTIFY_LEFT</property>
+						  <property name="wrap">False</property>
+						  <property name="selectable">False</property>
+						  <property name="xalign">0</property>
+						  <property name="yalign">0.5</property>
+						  <property name="xpad">5</property>
+						  <property name="ypad">0</property>
+						  <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+						  <property name="width_chars">-1</property>
+						  <property name="single_line_mode">False</property>
+						  <property name="angle">0</property>
+						</widget>
+						<packing>
+						  <property name="left_attach">5</property>
+						  <property name="right_attach">6</property>
+						  <property name="top_attach">0</property>
+						  <property name="bottom_attach">1</property>
+						  <property name="x_options">fill</property>
+						  <property name="y_options"></property>
+						</packing>
+					      </child>
+<!--
 					      <child>
 						<widget class="GtkLabel" id="record_datetime">
 						  <property name="visible">True</property>
@@ -1193,7 +1223,7 @@
 						  <property name="y_options"></property>
 						</packing>
 					      </child>
-
+-->
 					      <child>
 						<widget class="GtkLabel" id="record_pace">
 						  <property name="visible">True</property>

Modified: pytrainer/trunk/pytrainer/gui/windowmain.py
===================================================================
--- pytrainer/trunk/pytrainer/gui/windowmain.py	2009-12-26 02:19:28 UTC (rev 441)
+++ pytrainer/trunk/pytrainer/gui/windowmain.py	2009-12-26 03:14:24 UTC (rev 442)
@@ -198,13 +198,13 @@
 			date_time_utc = record_list[16]
 			if date_time_local is not None: #Have a local time stored in DB
 				dateTime = dateutil.parser.parse(date_time_local)
-				recordDateTime = dateTime.strftime("%Y-%m-%d %H:%M:%S")
-				recordDateTimeOffset = dateTime.strftime("%z")
 			else: #No local time in DB
-				dateTime = dateutil.parser.parse(date_time_utc)
-				local_dateTime = dateTime.astimezone(tzlocal()) #datetime with localtime offset (using value from OS)
-				recordDateTime = local_dateTime.strftime("%Y-%m-%d %H:%M:%S")
-				recordDateTimeOffset = local_dateTime.strftime("%z")
+				tmpDateTime = dateutil.parser.parse(date_time_utc)
+				dateTime = tmpDateTime.astimezone(tzlocal()) #datetime with localtime offset (using value from OS)
+			recordDateTime = dateTime.strftime("%Y-%m-%d %H:%M:%S")
+			recordDate = dateTime.strftime("%x")
+			recordTime = dateTime.strftime("%X")
+			recordDateTimeOffset = dateTime.strftime("%z")
 			
 			if configuration.getValue("pytraining","prf_us_system") == "True":
 				self.record_distance.set_text("%0.2f" %km2miles(distance))
@@ -225,14 +225,16 @@
 				self.record_maxpace.set_text("%0.2f" %maxpace)
 			
 			self.record_sport.set_text(sport)
-			self.record_date.set_text(str(date))
+			#self.record_date.set_text(str(date))
+			self.record_date.set_text(recordDate)
+			self.record_time.set_text(recordTime)
 			hour,min,sec=self.parent.date.second2time(int(record_list[3]))
 			self.record_hour.set_text("%d" %hour)
 			self.record_minute.set_text("%02d" %min)
 			self.record_second.set_text("%02d" %sec)
 			self.record_calories.set_text("%0.0f" %calories)
-			self.record_datetime.set_text(recordDateTime)
-			self.record_datetime_offset.set_text(recordDateTimeOffset)
+			#self.record_datetime.set_text(recordDateTime)
+			#self.record_datetime_offset.set_text(recordDateTimeOffset)
 			self.record_title.set_text(title)
 			buffer = self.record_comments.get_buffer()
 			start,end = buffer.get_bounds()

Modified: pytrainer/trunk/pytrainer/main.py
===================================================================
--- pytrainer/trunk/pytrainer/main.py	2009-12-26 02:19:28 UTC (rev 441)
+++ pytrainer/trunk/pytrainer/main.py	2009-12-26 03:14:24 UTC (rev 442)
@@ -97,7 +97,7 @@
 	def __init__(self,filename = None, data_path = None): 
 		logging.debug('>>')
 		self.data_path = data_path
-		self.version ="1.7.0_svn#441"
+		self.version ="1.7.0_svn#442"
 		self.date = Date()
 		main_dir = os.path.realpath(os.path.dirname(__file__)) #why?
 		sys.path.insert(0, main_dir) #why?


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.