Changeset 128:e14fcd9d9215 for src/mlx

Timestamp:

04/29/12 09:52:52 (13 years ago)

Author:

István Váradi <ivaradi@…>

Branch:

default

Phase:

public

Message:

Various small fixes

Location:

src/mlx

Files:

• gui/gui.py (modified) (1 diff)
• gui/info.py (modified) (1 diff)
• gui/statusicon.py (modified) (2 diffs)
• i18n.py (modified) (2 diffs)

src/mlx/gui/gui.py

@@ -390 +390 @@
         self._reconnecting = False
         self._statusbar.updateConnection(False, False)
+        self._weightHelp.disable()
             
     def addFlightLogLine(self, timeStr, line):

src/mlx/gui/info.py

@@ -132 +132 @@
         """Get the list of delay codes checked by the user."""
         codes =  []
-        for index in range(0, len(FlightInfo._delayCodes)):
+        delayCodes = FlightInfo._delayCodes()
+        for index in range(0, len(delayCodes)):
             if self._delayCodeWidgets[index].get_active():
-                codes.append(FlightInfo._delayCodes[index][0])
+                codes.append(delayCodes[index][0])
         return codes
             

src/mlx/gui/statusicon.py

@@ -143 +143 @@
     def _updateFlightStatus(self):
         """Update the flight status."""
-        stage = "-" if self._stage is None \
+        stage = u"-" if self._stage is None \
                 else xstr("flight_stage_" + const.stage2string(self._stage))
         
@@ -152 +152 @@
 
         if appIndicator:
-            self._stageMenuItem.set_label("%s %s" % (xstr("statusicon_stage"), stage))
-            self._ratingMenuItem.set_label("%s: %s" %
-                                           (xstr("statusicon_rating"), rating))
+            self._stageMenuItem.set_label("%s: %s" % \
+                                          (xstr("statusicon_stage"),
+                                           stage))
+            self._ratingMenuItem.set_label("%s: %s" % \
+                                           (xstr("statusicon_rating"),
+                                            rating))
         else:
             if self._noGoReason is not None:
                 rating = '<span foreground="red">' + rating + '</span>'
-            markup = "MAVA Logger X %s\n\n%s: %s\n%s: %s" %\
+            markup = u"MAVA Logger X %s\n\n%s: %s\n%s: %s" %\
                      (const.VERSION, xstr("statusicon_stage"), stage,
                       xstr("statusicon_rating"), rating)

src/mlx/i18n.py

@@ -461 +461 @@
         self.add("statusicon_showmonitor", "Show monitor window")
         self.add("statusicon_quit", "Quit")
-        self.add("statusicon_stage", "Stage:")
-        self.add("statusicon_rating", "Rating:")
+        self.add("statusicon_stage", "Stage")
+        self.add("statusicon_rating", "Rating")
 
         self.add("update_title", "Update")
@@ -922 +922 @@
         self.add("statusicon_showmonitor", "Mutasd a monitor ablakot")
         self.add("statusicon_quit", "Kilépés")
-        self.add("statusicon_stage", "Fázis:")
-        self.add("statusicon_rating", "Pontszám:")
+        self.add("statusicon_stage", u"Fázis")
+        self.add("statusicon_rating", u"Pontszám")
 
         self.add("update_title", "Frissítés")