Changeset 80:d3ca14051108 for src/mlx

Timestamp:

04/14/12 09:03:10 (13 years ago)

Author:

István Váradi <ivaradi@…>

Branch:

default

Phase:

public

Message:

The simulator time is displayed in the status bar

Location:

src/mlx/gui

Files:

• flight.py (modified) (2 diffs)
• gui.py (modified) (1 diff)
• statusbar.py (modified) (4 diffs)

src/mlx/gui/flight.py

@@ -549 +549 @@
         labelAlignment = gtk.Alignment(xalign=0.0, xscale=0.0)
         self._tailNumber = gtk.Label()
-        self._tailNumber.set_width_chars(6)
+        self._tailNumber.set_width_chars(10)
         self._tailNumber.set_alignment(0.0, 0.5)
         labelAlignment.add(self._tailNumber)
@@ -561 +561 @@
         labelAlignment = gtk.Alignment(xalign=0.0, xscale=0.0)
         self._departureICAO = gtk.Label()
-        self._departureICAO.set_width_chars(5)
+        self._departureICAO.set_width_chars(6)
         self._departureICAO.set_alignment(0.0, 0.5)
         labelAlignment.add(self._departureICAO)

src/mlx/gui/gui.py

@@ -218 +218 @@
         """Update the data."""
         gobject.idle_add(self._monitorWindow.setData, state)
+        gobject.idle_add(self._statusbar.updateTime, state.timestamp)
 
     def resetFlightStatus(self):
         """Reset the status of the flight."""
         self._statusbar.resetFlightStatus()
+        self._statusbar.updateTime()
         self._statusIcon.resetFlightStatus()
 

src/mlx/gui/statusbar.py

@@ -8 +8 @@
 
 import math
+import time
 
 #-------------------------------------------------------------------------------
@@ -61 +62 @@
         statusBox.pack_start(gtk.VSeparator(), False, False, 8)
 
+        self._timeLabel = gtk.Label("--:--:--")
+        self._timeLabel.set_width_chars(8)
+        self._timeLabel.set_tooltip_text("The simulator time in UTC")
+        self._timeLabel.set_alignment(1.0, 0.5)
+        
+        statusBox.pack_start(self._timeLabel, False, False, 8)
+
+        statusBox.pack_start(gtk.VSeparator(), False, False, 8)
+
         self._ratingLabel = gtk.Label()
         self._ratingLabel.set_width_chars(12)
@@ -75 +85 @@
         
         self._updateFlightStatus()
+        self.updateTime()
 
     def updateConnection(self, connecting, connected):
@@ -85 +96 @@
         """Update the busy state."""
         self._busyLabel.set_text("" if message is None else message)
+
+    def updateTime(self, t = None):
+        """Update the time"""
+        timeStr = "--:--:--" if t is None \
+                  else time.strftime("%H:%M:%S", time.gmtime(t))
+        
+        self._timeLabel.set_text(timeStr)
 
     def _drawConnState(self, connStateArea, eventOrContext):