Changeset 272:b80168ef552a

Timestamp:

07/03/12 14:52:59 (12 years ago)

Author:

István Váradi <ivaradi@…>

Branch:

default

Phase:

public

Message:

Changed the way the altitude clashes are handled

Location:

src/mlx

Files:

• gui/callouts.py (modified) (4 diffs)
• i18n.py (modified) (2 diffs)

src/mlx/gui/callouts.py

@@ -255 +255 @@
         editedIter = model.get_iter_from_string(path)
         editedPath = model.get_path(editedIter)
-        if self._hasAltitude(newAltitude, ignorePath = editedPath):
+        otherPath = self._hasAltitude(newAltitude, ignorePath = editedPath)
+        if otherPath is not None:
             dialog = gtk.MessageDialog(parent = self,
                                        type = MESSAGETYPE_QUESTION,
@@ -273 +274 @@
         if newAltitude is not None:
             model[editedPath][0] = newAltitude
+            if otherPath is not None:
+                model.remove(model.get_iter(otherPath))
 
     def _saveApproachCallouts(self):
@@ -409 +412 @@
         or not.
         
-        ignorePath is a path in the model to ignore."""        
+        ignorePath is a path in the model to ignore.
+
+        Returns the path of the element found, if any, or None, if the
+        altitude is not found."""        
         model = self._fileListModel
         iter = model.get_iter_first()
@@ -415 +421 @@
             path = model.get_path(iter)
             if path!=ignorePath and altitude==model[path][0]:
-                return True
+                return path
             iter = model.iter_next(iter)
 
-        return False
+        return None
 
     def _getNextValidUsualAltitude(self, startValue, descending):

src/mlx/i18n.py

@@ -995 +995 @@
         self.add("callouts_altitude_clash_sec",
                  "Shall I set the altitude nevertheless? If so, "
-                 "both callouts will be played when reaching the altitude "
-                 "simultaneously.")
+                 "the other callout with the same altitude will be "
+                 "removed.")
 
 #------------------------------------------------------------------------------
@@ -1875 +1875 @@
         self.add("callouts_altitude_clash_sec",
                  "Ennek ellenére beállítsam a megadott magasságoz? Ha "
-                 "így teszek, mindkét bemondást egyidejűleg le fogja "
-                 "játszani a program a magasság elérésekor.")
+                 "így teszek, a másik bemondást egyúttal törlöm.")
 
 #------------------------------------------------------------------------------