Changeset 76:f5b2b0022cdf

Timestamp:

04/14/12 05:24:38 (13 years ago)

Author:

István Váradi <ivaradi@…>

Branch:

default

Phase:

public

Message:

Added a Quit option to the status icon's menu and a confirmation dialog.

Location:

src/mlx/gui

Files:

• common.py (modified) (2 diffs)
• flight.py (modified) (4 diffs)
• gui.py (modified) (1 diff)
• monitor.py (added)
• statusicon.py (modified) (1 diff)

src/mlx/gui/common.py

@@ -20 +20 @@
 
     MESSAGETYPE_ERROR = gtk.MESSAGE_ERROR
+    MESSAGETYPE_QUESTION = gtk.MESSAGE_QUESTION
     BUTTONSTYPE_OK = gtk.BUTTONS_OK
+    BUTTONSTYPE_YES_NO = gtk.BUTTONS_YES_NO
+    RESPONSETYPE_YES = gtk.RESPONSE_YES
 else:
     print "Using PyGObject"
@@ -30 +33 @@
     from gi.repository import Pango as pango
     appIndicator = True
-
+    
     MESSAGETYPE_ERROR = gtk.MessageType.ERROR
+    MESSAGETYPE_QUESTION = gtk.MessageType.QUESTION
     BUTTONSTYPE_OK = gtk.ButtonsType.OK
+    BUTTONSTYPE_YES_NO = gtk.ButtonsType.YES_NO
+    RESPONSETYPE_YES = gtk.ResponseType.YES
 
 import cairo

src/mlx/gui/flight.py

@@ -1346 +1346 @@
         self._starButton = gtk.CheckButton()
         self._starButton.connect("clicked", self._starButtonClicked)
-        self._starButton.set_active(True)
         table.attach(self._starButton, 0, 1, 0, 1)
 
@@ -1364 +1363 @@
         self._transitionButton = gtk.CheckButton()
         self._transitionButton.connect("clicked", self._transitionButtonClicked)
-        self._transitionButton.set_active(True)
         table.attach(self._transitionButton, 0, 1, 1, 2)
 
@@ -1400 +1398 @@
         self._approachType.set_width_chars(10)
         self._approachType.set_tooltip_text("The type of the approach, e.g. ILS or VISUAL.")
-        self._runway.connect("changed", self._updateForwardButton)
+        self._approachType.connect("changed", self._updateForwardButton)
         table.attach(self._approachType, 2, 3, 3, 4)
         label.set_mnemonic_widget(self._approachType)
@@ -1428 +1426 @@
         self._button.set_use_stock(True)
         self._button.connect("clicked", self._forwardClicked)
+
+        # These are needed for correct size calculations
+        self._starButton.set_active(True)
+        self._transitionButton.set_active(True)
 
     def activate(self):

src/mlx/gui/gui.py

@@ -843 +843 @@
     def _quit(self, what = None):
         """Quit from the application."""
-        self._statusIcon.destroy()
-        return gtk.main_quit()
+        dialog = gtk.MessageDialog(type = MESSAGETYPE_QUESTION,
+                                   buttons = BUTTONSTYPE_YES_NO,
+                                   message_format =
+                                   "Are you sure to quit the logger?")
+        result = dialog.run()
+        dialog.hide()
+        
+        if result==RESPONSETYPE_YES:
+            self._statusIcon.destroy()
+            return gtk.main_quit()
 
     def _notebookPageSwitch(self, notebook, page, page_num):

src/mlx/gui/statusicon.py

@@ -39 +39 @@
         self._showHideMenuItem.show()  
         menu.append(self._showHideMenuItem)  
+
+        self._quitMenuItem = gtk.MenuItem()  
+        self._quitMenuItem.set_label("Quit")  
+        self._quitMenuItem.show()  
+        self._quitMenuItem.connect("activate", self._gui._quit)
+        menu.append(self._quitMenuItem)  
 
         menu.show()