Changeset 264:6fbadb22b2c3 for src/mlx/gui

Timestamp:

07/01/12 07:58:44 (12 years ago)

Author:

István Váradi <ivaradi@…>

Branch:

default

Phase:

public

Message:

Started implementing the approach callout editor

Location:

src/mlx/gui

Files:

• callouts.py (added)
• checklist.py (modified) (1 diff)
• common.py (modified) (2 diffs)
• gui.py (modified) (4 diffs)

src/mlx/gui/checklist.py

@@ -203 +203 @@
         selection = self._fileList.get_selection()
         (model, paths) = selection.get_selected_rows()
-        while paths:
-            model.remove(model.get_iter(paths[0]))
-            (model, paths) = selection.get_selected_rows()
+
+        iters = [model.get_iter(path) for path in paths]
+
+        for i in iters:
+            if i is not None:
+                model.remove(i)
         
     def _moveUpButtonClicked(self, button):

src/mlx/gui/common.py

@@ -62 +62 @@
     WINDOW_STATE_ICONIFIED = gdk.WINDOW_STATE_ICONIFIED
     WINDOW_STATE_WITHDRAWN = gdk.WINDOW_STATE_WITHDRAWN
+
+    SORT_ASCENDING = gtk.SORT_ASCENDING
+    SORT_DESCENDING = gtk.SORT_DESCENDING
 
     pixbuf_new_from_file = gdk.pixbuf_new_from_file
@@ -118 +121 @@
     WINDOW_STATE_WITHDRAWN = gdk.WindowState.WITHDRAWN
 
+    SORT_ASCENDING = gtk.SortType.ASCENDING
+    SORT_DESCENDING = gtk.SortType.DESCENDING
+
     pixbuf_new_from_file = gdkPixbuf.Pixbuf.new_from_file
 

src/mlx/gui/gui.py

@@ -13 +13 @@
 from mlx.gui.prefs import Preferences
 from mlx.gui.checklist import ChecklistEditor
+from mlx.gui.callouts import ApproachCalloutsEditor
 from mlx.gui.pirep import PIREPViewer
 
@@ -95 +96 @@
         self._preferences = Preferences(self)
         self._checklistEditor = ChecklistEditor(self)
+        self._approachCalloutsEditor = ApproachCalloutsEditor(self)
 
         menuBar = self._buildMenuBar(accelGroup)
@@ -870 +872 @@
         checklistMenuItem.connect("activate", self._editChecklist)
         toolsMenu.append(checklistMenuItem)
+
+        approachCalloutsMenuItem = gtk.ImageMenuItem(gtk.STOCK_EDIT)
+        approachCalloutsMenuItem.set_use_stock(True)
+        approachCalloutsMenuItem.set_label(xstr("menu_tools_callouts"))
+        approachCalloutsMenuItem.add_accelerator("activate", accelGroup,
+                                                 ord(xstr("menu_tools_callouts_key")),
+                                                 CONTROL_MASK, ACCEL_VISIBLE)
+        approachCalloutsMenuItem.connect("activate", self._editApproachCallouts)
+        toolsMenu.append(approachCalloutsMenuItem)
 
         prefsMenuItem = gtk.ImageMenuItem(gtk.STOCK_PREFERENCES)
@@ -1007 +1018 @@
         """Callback for editing the checklists."""
         self._checklistEditor.run()
+        
+    def _editApproachCallouts(self, menuItem):
+        """Callback for editing the approach callouts."""
+        self._approachCalloutsEditor.run()
         
     def _editPreferences(self, menuItem):