Changeset 32:46c1a12f72d1 for src/mlx/gui/gui.py

Timestamp:

02/25/12 15:49:27 (12 years ago)

Author:

István Váradi <ivaradi@…>

Branch:

default

Phase:

public

Message:

Implemented the status bar.

File:

• src/mlx/gui/gui.py (modified) (11 diffs)

src/mlx/gui/gui.py

@@ -2 +2 @@
 
 from statusicon import StatusIcon
+from statusbar import Statusbar
 from mlx.gui.common import *
 
@@ -10 +11 @@
 import mlx.acft as acft
 
-import math
 import time
 
@@ -64 +64 @@
         logFrame.set_border_width(8)
         mainVBox.pack_start(logFrame, True, True, 0)
-        
+
+        mainVBox.pack_start(gtk.HSeparator(), False, False, 0)
+
+        self._statusbar = Statusbar()
+        mainVBox.pack_start(self._statusbar, False, False, 0)
+
         win.show_all()        
 
@@ -82 +87 @@
         """Called when we have connected to the simulator."""
         self._connected = True
-        self._updateConnState()
         self._logger.untimedMessage("Connected to the simulator %s" % (descriptor,))
+        gobject.idle_add(self._statusbar.updateConnection,
+                         self._connecting, self._connected)
         
     def disconnected(self):
         """Called when we have disconnected from the simulator."""
         self._connected = False
-        self._updateConnState()
         self._logger.untimedMessage("Disconnected from the simulator")
+        gobject.idle_add(self._statusbar.updateConnection,
+                         self._connecting, self._connected)
 
     def write(self, msg):
@@ -101 +108 @@
     def resetFlightStatus(self):
         """Reset the status of the flight."""
+        self._statusbar.resetFlightStatus()
         self._statusIcon.resetFlightStatus()
 
@@ -109 +117 @@
     def _setStage(self, stage):
         """Set the stage of the flight."""
+        self._statusbar.setStage(stage)
         self._statusIcon.setStage(stage)
 
@@ -117 +126 @@
     def _setRating(self, rating):
         """Set the rating of the flight."""
+        self._statusbar.setRating(rating)
         self._statusIcon.setRating(rating)
 
@@ -125 +135 @@
     def _setNoGo(self, reason):
         """Set the rating of the flight."""
+        self._statusbar.setNoGo(reason)
         self._statusIcon.setNoGo(reason)
 
@@ -156 +167 @@
             self.showMainWindow()
             
-    def _drawConnState(self, connStateArea, eventOrContext):
-        """Draw the connection state."""
-        context = eventOrContext if pygobject else connStateArea.window.cairo_create()
-
-        if self._connecting:
-            if self._connected:
-                context.set_source_rgb(0.0, 1.0, 0.0)
-            else:
-                context.set_source_rgb(1.0, 0.0, 0.0)
-        else:
-            context.set_source_rgb(0.75, 0.75, 0.75)
-
-        width = connStateArea.get_allocated_width() if pygobject \
-                else connStateArea.allocation.width
-        height = connStateArea.get_allocated_height() if pygobject \
-                 else connStateArea.allocation.height
-        context.arc(width/2, height/2, 8, 0, 2*math.pi)
-
-        context.fill()
-
-    def _updateConnState(self):
-        """Initiate the updating of the connection state icon."""
-        self._connStateArea.queue_draw()
-
     def _connectToggled(self, button):
         """Callback for the connection button."""
@@ -211 +198 @@
             self._flight = None
 
-        self._updateConnState()
+        self._statusbar.updateConnection(self._connecting, self._connected)
 
     def _buildSetupFrame(self):
@@ -299 +286 @@
 
         setupBox.pack_start(self._connectButton, False, False, 0)
-
-        setupBox.pack_start(gtk.VSeparator(), False, False, 8)    
-
-        self._connStateArea = gtk.DrawingArea()
-        self._connStateArea.set_size_request(16, 16)
-        self._connStateArea.set_tooltip_markup('The state of the connection.\n'
-                                               '<span foreground="grey">Grey</span> means idle.\n'
-                                               '<span foreground="red">Red</span> means trying to connect.\n'
-                                               '<span foreground="green">Green</span> means connected.')
-
-        if pygobject:
-            self._connStateArea.connect("draw", self._drawConnState)
-        else:
-            self._connStateArea.connect("expose_event", self._drawConnState)
-
-        alignment = gtk.Alignment(xalign = 0.5, yalign = 0.5)
-        alignment.add(self._connStateArea)
-
-        setupBox.pack_start(alignment, False, False, 8)
 
         setupBox.pack_start(gtk.VSeparator(), False, False, 8)