Changeset 864:b154a5d879cb

Timestamp:

06/18/17 17:59:30 (8 years ago)

Author:

István Váradi <ivaradi@…>

Branch:

default

Phase:

public

Message:

A flight can be deleted from the flight list (re #308)

Files:

• locale/en/mlx.po (modified) (2 diffs)
• locale/hu/mlx.po (modified) (2 diffs)
• src/mlx/gui/flight.py (modified) (6 diffs)

locale/en/mlx.po

@@ -482 +482 @@
 msgstr "Printing failed"
 
+msgid "flightsel_delete"
+msgstr "_Delete flight..."
+
+msgid "flightsel_delete_tooltip"
+msgstr "Click here to delete the currently selected flight."
+
+msgid "flightsel_delete_confirm"
+msgstr "Are you sure to delete the selected flight?"
+
+msgid "flightsel_delete_busy"
+msgstr "Deleting flight..."
+
 msgid "flightsel_save_title"
 msgstr "Save a flight into a file"
@@ -520 +532 @@
 msgid "flightsel_popup_save"
 msgstr "S_ave..."
+
+msgid "flightsel_popup_delete"
+msgstr "_Delete..."
 
 msgid "fleet_busy"

locale/hu/mlx.po

@@ -482 +482 @@
 msgstr "A nyomtatás nem sikerült"
 
+msgid "flightsel_delete"
+msgstr "Járat _törlése..."
+
+msgid "flightsel_delete_tooltip"
+msgstr ""
+"Ezzel a gombbal letörölheted a kiválasztott járatot."
+
+msgid "flightsel_delete_confirm"
+msgstr "Biztosan törölni szeretnéd a kiválasztott járatot?"
+
+msgid "flightsel_delete_busy"
+msgstr "Járat törlése..."
+
 msgid "flightsel_save_title"
 msgstr "Járat mentése fájlba"
@@ -522 +535 @@
 msgid "flightsel_popup_save"
 msgstr "_Mentés..."
+
+msgid "flightsel_popup_delete"
+msgstr "_Törlés..."
 
 msgid "fleet_busy"

src/mlx/gui/flight.py

@@ -492 +492 @@
         flightButtonWidthBox.pack_start(self._printButton, True, True, 4)
 
+        self._deleteButton = gtk.Button(xstr("flightsel_delete"))
+        self._deleteButton.set_use_underline(True)
+        self._deleteButton.set_sensitive(False)
+        self._deleteButton.set_tooltip_text(xstr("flightsel_delete_tooltip"))
+        self._deleteButton.connect("clicked", self._deleteClicked)
+
+        flightButtonWidthBox.pack_start(self._deleteButton, True, True, 4)
 
         flightButtonWidthAlignment.add(flightButtonWidthBox)
@@ -648 +655 @@
     def _printClicked(self, button):
         """Called when the Print briefing button is clicked."""
+        self._printSelected()
+
+    def _printSelected(self):
+        """Print the briefing for the selected flight."""
         wizard = self._wizard
         flight = self._getSelectedFlight()
@@ -843 +854 @@
         cr.stroke()
 
+    def _deleteClicked(self, button):
+        """Called when the Delete flight button is clicked."""
+        self._deleteSelected()
+
+    def _deleteSelected(self):
+        """Delete the selected flight."""
+        if askYesNo(xstr("flightsel_delete_confirm"),
+                    parent = self._wizard.gui.mainWindow):
+            flight = self._getSelectedFlight()
+            gui = self._wizard.gui
+            gui.beginBusy(xstr("flightsel_delete_busy"))
+
+            gui.webHandler.deleteFlights(self._deleteResultCallback,
+                                         [flight.id])
+
+    def _deleteResultCallback(self, returned, result):
+        """Called when the deletion result is available."""
+        gobject.idle_add(self._handleDeleteResult, returned, result)
+
+    def _handleDeleteResult(self, returned, result):
+        """Handle the delete result."""
+        gui = self._wizard.gui
+        gui.endBusy()
+
+        if returned:
+            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]
+        else:
+            communicationErrorDialog()
+
+
     def _refreshClicked(self, button):
         """Called when the refresh button is clicked."""
@@ -858 +905 @@
         self._saveButton.set_sensitive(len(indexes)==1)
         self._printButton.set_sensitive(len(indexes)==1)
+        self._deleteButton.set_sensitive(len(indexes)==1)
         self._updateNextButton()
 
@@ -1042 +1090 @@
         menu.append(menuItem)
 
+        menuItem = gtk.MenuItem()
+        menuItem.set_label(xstr("flightsel_popup_delete"))
+        menuItem.set_use_underline(True)
+        menuItem.connect("activate", self._popupDelete)
+        menuItem.show()
+
+        menu.append(menuItem)
+
         return menu
 
@@ -1053 +1109 @@
         if not self._completed:
             self._saveSelected()
+
+    def _popupDelete(self, menuItem):
+        """Called when the Delete menu item is activated in the popup menu."""
+        if not self._completed:
+            self._deleteSelected()
 
 #-----------------------------------------------------------------------------