Changeset 226:473bbc9d355f for src/mlx

Timestamp:

06/05/12 15:42:34 (12 years ago)

Author:

István Váradi <ivaradi@…>

Branch:

default

Phase:

public

Message:

Faults are logged highlighted

Location:

src/mlx/gui

Files:

• common.py (modified) (3 diffs)
• gui.py (modified) (3 diffs)
• pirep.py (modified) (2 diffs)

src/mlx/gui/common.py

@@ -57 +57 @@
 
     POLICY_AUTOMATIC = gtk.POLICY_AUTOMATIC
+
+    WEIGHT_BOLD = pango.WEIGHT_BOLD
 
     def text2unicode(text):
@@ -105 +107 @@
     POLICY_AUTOMATIC = gtk.PolicyType.AUTOMATIC
 
+    WEIGHT_BOLD = pango.Weight.BOLD
+
     import codecs
     _utf8Decoder = codecs.getdecoder("utf-8")
@@ -228 +232 @@
 #------------------------------------------------------------------------------
 
-def formatFlightLogLine(timeStr, line, isFault = False):
+def formatFlightLogLine(timeStr, line):
     """Format the given flight log line."""
     """Format the given line for flight logging."""
     if timeStr is not None:
         line = timeStr + ": " + line
-    #if isFault:
-    #    line = "<b>" + line + "</b>"
     return line + "\n"
 
 #------------------------------------------------------------------------------
+
+def addFaultTag(buffer):
+    """Add a tag named 'fault' to the given buffer."""
+    faultTag = gtk.TextTag(name = "fault")
+    faultTag.set_property("foreground", "red")
+    faultTag.set_property("weight", WEIGHT_BOLD)
+    buffer.get_tag_table().add(faultTag)    
+
+#------------------------------------------------------------------------------
+
+def appendTextBuffer(buffer, text, isFault = False):
+    """Append the given line at the end of the given text buffer.
+
+    If isFault is set, use the tag named 'fault'."""
+    if isFault:
+        buffer.insert_with_tags_by_name(buffer.get_end_iter(), text,
+                                        "fault")
+    else:
+        buffer.insert(buffer.get_end_iter(), text)
+
+#------------------------------------------------------------------------------

src/mlx/gui/gui.py

@@ -112 +112 @@
         
         (logWidget, self._logView)  = self._buildLogWidget()
+        addFaultTag(self._logView.get_buffer())        
         label = gtk.Label(xstr("tab_log"))
         label.set_use_underline(True)
@@ -466 +467 @@
         """Write the given message line to the log."""
         gobject.idle_add(self._writeLog,
-                         formatFlightLogLine(timeStr, line, isFault = isFault),
-                         self._logView)
-
-    def updateFlightLogLine(self, index, timeStr, line, isFault = False):
+                         formatFlightLogLine(timeStr, line),
+                         self._logView, isFault)
+
+    def updateFlightLogLine(self, index, timeStr, line):
         """Update the line with the given index."""
         gobject.idle_add(self._updateFlightLogLine, index,
-                         formatFlightLogLine(timeStr, line,
-                                             isFault = isFault))
+                         formatFlightLogLine(timeStr, line))
 
     def _updateFlightLogLine(self, index, line):
@@ -914 +914 @@
         return (alignment, logView)
 
-    def _writeLog(self, msg, logView):
+    def _writeLog(self, msg, logView, isFault = False):
         """Write the given message to the log."""
         buffer = logView.get_buffer()
-        buffer.insert(buffer.get_end_iter(), msg)
+        appendTextBuffer(buffer, msg, isFault = isFault)
         logView.scroll_mark_onscreen(buffer.get_insert())
 

src/mlx/gui/pirep.py

@@ -239 +239 @@
         for (timeStr, line) in pirep.logLines:
             isFault = lineIndex in pirep.faultLineIndexes
-            logBuffer.insert(logBuffer.get_end_iter(), 
-                             formatFlightLogLine(timeStr, line, 
-                                                 isFault = isFault))
+            appendTextBuffer(logBuffer,
+                             formatFlightLogLine(timeStr, line),
+                             isFault = isFault)
             lineIndex += 1
 
@@ -573 +573 @@
 
         (logWindow, self._log) = PIREPViewer.getTextWindow(heightRequest = -1)
+        addFaultTag(self._log.get_buffer())
         mainBox.pack_start(logWindow, True, True, 0)