Changeset 823:7a9ce7d89ece for src

Timestamp:

09/25/16 07:08:29 (8 years ago)

Author:

István Váradi <ivaradi@…>

Branch:

default

Phase:

public

Message:

Multiple flights can be selected in a flight list (re #307).

Location:

src/mlx/gui

Files:

• common.py (modified) (2 diffs)
• flight.py (modified) (3 diffs)
• flightlist.py (modified) (11 diffs)

src/mlx/gui/common.py

@@ -101 +101 @@
 
     UPDATE_IF_VALID = gtk.UPDATE_IF_VALID
+
+    SELECTION_MULTIPLE = gtk.SELECTION_MULTIPLE
 
     pixbuf_new_from_file = gdk.pixbuf_new_from_file
@@ -177 +179 @@
 
     UPDATE_IF_VALID = gtk.SpinButtonUpdatePolicy.IF_VALID
+
+    SELECTION_MULTIPLE = gtk.SelectionMode.MULTIPLE
 
     pixbuf_new_from_file = gdkPixbuf.Pixbuf.new_from_file

src/mlx/gui/flight.py

@@ -608 +608 @@
                 self._buildFlights()
 
-    def _selectionChanged(self, flightList, index):
+    def _selectionChanged(self, flightList, indexes):
         """Called when the selection is changed."""
-        selected = index is not None
-        self._saveButton.set_sensitive(selected)
+        self._saveButton.set_sensitive(len(indexes)==1)
         self._updateNextButton()
 
@@ -620 +619 @@
     def _updateNextButton(self):
         """Update the sensitivity of the Next button."""
-        sensitive = self._flightList.selectedIndex is not None and \
+        sensitive = len(self._flightList.selectedIndexes)==1 and \
           not self._pendingFlightsWindowShown
         self._button.set_sensitive(sensitive)
@@ -674 +673 @@
     def _getSelectedFlight(self):
         """Get the currently selected flight."""
-        index = self._flightList.selectedIndex
-        return self._flights[index]
+        indexes = self._flightList.selectedIndexes
+        assert(len(indexes)==1)
+        return self._flights[indexes[0]]
 
     def _updateDepartureGate(self):

src/mlx/gui/flightlist.py

@@ -79 +79 @@
 
     def __init__(self, columnDescriptors = defaultColumnDescriptors,
-                 popupMenuProducer = None, widthRequest = None):
+                 popupMenuProducer = None, widthRequest = None,
+                 multiSelection = False):
         """Construct the flight list with the given column descriptors."""
 
@@ -114 +115 @@
         selection = self._view.get_selection()
         selection.connect("changed", self._selectionChanged)
+        if multiSelection:
+            selection.set_mode(SELECTION_MULTIPLE)
 
         scrolledWindow = gtk.ScrolledWindow()
@@ -132 +135 @@
 
     @property
-    def selectedIndex(self):
-        """Get the index of the selected entry, if any."""
+    def selectedIndexes(self):
+        """Get the indexes of the selected entries, if any.
+
+        The indexes are sorted."""
         selection = self._view.get_selection()
-        (model, iter) = selection.get_selected()
-        if iter is None:
-            return None
-        else:
-            index = model.get_value(iter, 0)
-            return index
+        (model, rows) = selection.get_selected_rows()
+
+        indexes = [self._getIndexForPath(path) for path in rows]
+        indexes.sort()
+        return indexes
 
     @property
@@ -158 +162 @@
         self._model.append(values)
 
-    def removeFlight(self, index):
-        """Remove the flight with the given index."""
+    def removeFlights(self, indexes):
+        """Remove the flights with the given indexes."""
         model = self._model
         idx = 0
@@ -165 +169 @@
         while iter is not None:
             nextIter = model.iter_next(iter)
-            if model.get_value(iter, 0)==index:
+            if model.get_value(iter, 0) in indexes:
                 model.remove(iter)
             else:
@@ -172 +176 @@
             iter = nextIter
 
+    def _getIndexForPath(self, path):
+        """Get the index for the given path."""
+        iter = self._model.get_iter(path)
+        return self._model.get_value(iter, 0)
+
     def _rowActivated(self, flightList, path, column):
         """Called when a row is selected."""
-        self.emit("row-activated", self.selectedIndex)
+        self.emit("row-activated", self._getIndexForPath(path))
 
     def _buttonPressEvent(self, widget, event):
@@ -198 +207 @@
     def _selectionChanged(self, selection):
         """Called when the selection has changed."""
-        self.emit("selection-changed", self.selectedIndex)
+        self.emit("selection-changed", self.selectedIndexes)
 
 #-------------------------------------------------------------------------------
@@ -250 +259 @@
         self._flightList = FlightList(columnDescriptors =
                                       PendingFlightsFrame.columnDescriptors,
-                                      widthRequest = 500)
+                                      widthRequest = 500, multiSelection = True)
         self._flightList.connect("selection-changed", self._selectionChanged)
 
@@ -290 +299 @@
         self._flightList.addFlight(flight)
 
-    def _selectionChanged(self, flightList, selectedIndex):
+    def _selectionChanged(self, flightList, selectedIndexes):
         """Called when the selection in the list has changed."""
-        sensitive = selectedIndex is not None
-        self._editButton.set_sensitive(sensitive)
-        self._reflyButton.set_sensitive(sensitive)
-        self._deleteButton.set_sensitive(sensitive)
+        self._editButton.set_sensitive(len(selectedIndexes)==1)
+        self._reflyButton.set_sensitive(len(selectedIndexes)>0)
+        self._deleteButton.set_sensitive(len(selectedIndexes)>0)
 
     def _reflyClicked(self, button):
@@ -303 +311 @@
         self.set_sensitive(False)
 
-        flight = self._flights[self._flightList.selectedIndex]
-        gui.webHandler.reflyFlights(self._reflyResultCallback, [flight.id])
+        flightIDs = [self._flights[i].id
+                     for i in self._flightList.selectedIndexes]
+        gui.webHandler.reflyFlights(self._reflyResultCallback, flightIDs)
 
     def _reflyResultCallback(self, returned, result):
@@ -320 +329 @@
 
         if returned:
-            index = self._flightList.selectedIndex
-
-            flight = self._flights[index]
-
-            self._flightList.removeFlight(index)
-            del self._flights[index]
-
-            self._wizard.reflyFlight(flight)
+            indexes = self._flightList.selectedIndexes
+
+            flights = [self._flights[index] for index in indexes]
+
+            self._flightList.removeFlights(indexes)
+            for index in indexes[::-1]:
+                del self._flights[index]
+
+            for flight in flights:
+                self._wizard.reflyFlight(flight)