Changeset 220:96ad81e11b85

Timestamp:

06/04/12 09:53:04 (12 years ago)

Author:

István Váradi <ivaradi@…>

Branch:

default

Phase:

public

Message:

The Data tab of the PIREP viewer works

Location:

src/mlx

Files:

• const.py (modified) (1 diff)
• gui/common.py (modified) (2 diffs)
• gui/gui.py (modified) (4 diffs)
• gui/pirep.py (added)
• i18n.py (modified) (1 diff)
• pirep.py (modified) (2 diffs)

src/mlx/const.py

@@ -203 +203 @@
 #-------------------------------------------------------------------------------
 
+flightTypes = [ FLIGHTTYPE_SCHEDULED,
+                FLIGHTTYPE_OLDTIMER,
+                FLIGHTTYPE_VIP,
+                FLIGHTTYPE_CHARTER ]
+
+#-------------------------------------------------------------------------------
+
+_flightTypeStrings = { FLIGHTTYPE_SCHEDULED : "scheduled",
+                       FLIGHTTYPE_OLDTIMER : "ot",
+                       FLIGHTTYPE_VIP : "vip",
+                       FLIGHTTYPE_CHARTER : "charter" }
+
+def flightType2string(flightType):
+    """Get the string equivalent of the given flight type."""
+    print _flightTypeStrings
+    return _flightTypeStrings[flightType] \
+           if flightType in _flightTypeStrings else None    
+
+#-------------------------------------------------------------------------------
+
 # Delay code: loading problems
 DELAYCODE_LOADING = 0

src/mlx/gui/common.py

@@ -53 +53 @@
 
     SELECTION_MULTIPLE = gtk.SELECTION_MULTIPLE
+
+    SHADOW_IN = gtk.SHADOW_IN
+
+    POLICY_AUTOMATIC = gtk.POLICY_AUTOMATIC
 
     def text2unicode(text):
@@ -97 +101 @@
     SELECTION_MULTIPLE = gtk.SelectionMode.MULTIPLE
 
+    SHADOW_IN = gtk.ShadowType.IN
+
+    POLICY_AUTOMATIC = gtk.PolicyType.AUTOMATIC
+
     import codecs
     _utf8Decoder = codecs.getdecoder("utf-8")

src/mlx/gui/gui.py

@@ -12 +12 @@
 from mlx.gui.prefs import Preferences
 from mlx.gui.checklist import ChecklistEditor
+from mlx.gui.pirep import PIREPViewer
 
 import mlx.const as const
@@ -144 +145 @@
         self._monitorWindowY = None
         self._selfToggling = False
+
+        self._pirepViewer = PIREPViewer(self)
 
         window.show_all()
@@ -1006 +1009 @@
                 if result==RESPONSETYPE_OK:
                     self.sendPIREP(pirep)
+                elif result==1:
+                    self._pirepViewer.setPIREP(pirep)
+                    self._pirepViewer.show_all()
+                    self._pirepViewer.run()
+                    self._pirepViewer.hide()
 
     def _getLoadPirepDialog(self):
@@ -1138 +1146 @@
 
         dialog.add_button(xstr("button_cancel"), RESPONSETYPE_REJECT)
+        dialog.add_button(xstr("viewPIREP"), 1)
         dialog.add_button(xstr("sendPIREP"), RESPONSETYPE_OK)
         

src/mlx/i18n.py

@@ -873 +873 @@
                  "you may try again later. Or it can be a bug;\n" \
                  "see the debug log for more information.")
+
+        self.add("viewPIREP", "_View PIREP...")
+
+        self.add("pirepView_title", "PIREP viewer")
+
+        self.add("pirepView_frame_flight", "Flight")
+        self.add("pirepView_callsign", "Callsign:")
+        self.add("pirepView_tailNumber", "Tail no.:")
+        self.add("pirepView_aircraftType", "Aircraft:")
+        self.add("pirepView_departure", "Departure airport:")
+        self.add("pirepView_departure_time", "time:")
+        self.add("pirepView_arrival", "Arrival airport:")
+        self.add("pirepView_arrival_time", "time:")
+        self.add("pirepView_numPassengers", "PAX:")
+        self.add("pirepView_numCrew", "Crew:")
+        self.add("pirepView_bagWeight", "Baggage:")
+        self.add("pirepView_cargoWeight", "Cargo:")
+        self.add("pirepView_mailWeight", "Mail:")
+        self.add("pirepView_route", "MAVA route:")
+
+        self.add("pirepView_frame_route", "Route filed")
+        self.add("pirepView_filedCruiseLevel", "Cruise level:")
+        self.add("pirepView_modifiedCruiseLevel", "modified to:")
+
+        self.add("pirepView_frame_departure", "Departure")
+        self.add("pirepView_runway", "Runway:")
+        self.add("pirepView_sid", "SID:")
+
+        self.add("pirepView_frame_arrival", "Arrival")
+        self.add("pirepView_star", "STAR:")
+        self.add("pirepView_transition", "Transition:")
+        self.add("pirepView_approachType", "Approach:")
+
+        self.add("pirepView_frame_statistics", "Statistics")
+        self.add("pirepView_blockTimeStart", "Block time start:")
+        self.add("pirepView_blockTimeEnd", "end:")
+        self.add("pirepView_flightTimeStart", "Flight time start:")
+        self.add("pirepView_flightTimeEnd", "end:")
+        self.add("pirepView_flownDistance", "Flown distance:")
+        self.add("pirepView_fuelUsed", "Fuel used:")
+        self.add("pirepView_rating", "Rating:")
+
+        self.add("pirepView_frame_miscellaneous", "Miscellaneous")
+        self.add("pirepView_flightType", "Type:")
+        self.add("pirepView_online", "Online:")
+        self.add("pirepView_yes", "yes")
+        self.add("pirepView_no", "no")
+        self.add("pirepView_delayCodes", "Delay codes:")
 
 #------------------------------------------------------------------------------

src/mlx/pirep.py

@@ -10 +10 @@
 class PIREP(object):
     """A pilot's report of a flight."""
-    _delayCodeNames = { const.DELAYCODE_LOADING : "Loading Problems",
-                        const.DELAYCODE_NETWORK : "Net Problems",
-                        const.DELAYCODE_SYSTEM : "System Crash/Freezing",
-                        const.DELAYCODE_TRAFFIC : "Traffic Problems",
-                        const.DELAYCODE_WEATHER : "Weather Problems",
-                        const.DELAYCODE_VATSIM : "VATSIM Problem",
-                        const.DELAYCODE_CONTROLLER : "Controller's Fault",
-                        const.DELAYCODE_NAVIGATION : "Navigation Problem",
-                        const.DELAYCODE_APRON : "Apron Navigation Problems",
-                        const.DELAYCODE_PERSONAL : "Personal Reasons" }
+    delayCodeNames = { const.DELAYCODE_LOADING : "Loading Problems",
+                       const.DELAYCODE_NETWORK : "Net Problems",
+                       const.DELAYCODE_SYSTEM : "System Crash/Freezing",
+                       const.DELAYCODE_TRAFFIC : "Traffic Problems",
+                       const.DELAYCODE_WEATHER : "Weather Problems",
+                       const.DELAYCODE_VATSIM : "VATSIM Problem",
+                       const.DELAYCODE_CONTROLLER : "Controller's Fault",
+                       const.DELAYCODE_NAVIGATION : "Navigation Problem",
+                       const.DELAYCODE_APRON : "Apron Navigation Problems",
+                       const.DELAYCODE_PERSONAL : "Personal Reasons" }
 
     @staticmethod
@@ -117 +117 @@
             for code in self.delayCodes:
                 if s: s += ", "
-                s += PIREP._delayCodeNames[code]
+                s += PIREP.delayCodeNames[code]
             return s