Changeset 123:3b181cd0ab99 for src

Timestamp:

04/29/12 06:48:38 (13 years ago)

Author:

István Váradi <ivaradi@…>

Branch:

default

Phase:

public

Message:

The Preferences dialog works

Location:

src/mlx

Files:

• config.py (modified) (3 diffs)
• const.py (modified) (1 diff)
• gui/common.py (modified) (2 diffs)
• gui/gui.py (modified) (6 diffs)
• gui/info.py (modified) (1 diff)
• gui/prefs.py (added)
• i18n.py (modified) (4 diffs)
• mlx.py (modified) (2 diffs)

src/mlx/config.py

@@ -29 +29 @@
         self._updateURL = Config.DEFAULT_UPDATE_URL
 
+        self._language = ""
+
         self._modified = False
-
-        self._language = ""
 
     @property
@@ -67 +67 @@
         if rememberPassword!=self._rememberPassword:
             self._rememberPassword = rememberPassword
+            self._modified = True
+
+    @property
+    def language(self):
+        """Get the language to use."""
+        return self._language
+
+    @language.setter
+    def language(self, language):
+        """Set the language to use."""
+        if language!=self._language:
+            self._language = language
             self._modified = True
 
@@ -160 +172 @@
         import locale
         if self._language:
+            os.environ["LANGUAGE"] = self._language
+            os.environ["LANG"] = self._language + ".UTF-8"
+            os.environ["LC_MESSAGES"] = self._language + ".UTF-8"
+            os.environ["LC_COLLATE"] = self._language + ".UTF-8"
+            os.environ["LC_CTYPE"] = self._language + ".UTF-8"
+
             locale.setlocale(locale.LC_ALL, (self._language,
                                              locale.getpreferredencoding()))

src/mlx/const.py

@@ -219 +219 @@
     return _stageStrings[stage] if stage in _stageStrings else None
         
-    
+#-------------------------------------------------------------------------------
+
+languages = ["$system", "en_GB", "hu_HU"]

src/mlx/gui/common.py

@@ -27 +27 @@
     BUTTONSTYPE_YES_NO = gtk.BUTTONS_YES_NO
     RESPONSETYPE_YES = gtk.RESPONSE_YES
+    RESPONSETYPE_ACCEPT = gtk.RESPONSE_ACCEPT
+    RESPONSETYPE_REJECT = gtk.RESPONSE_REJECT
     ACCEL_VISIBLE = gtk.ACCEL_VISIBLE
     CONTROL_MASK = gdk.CONTROL_MASK
+    DIALOG_MODAL = gtk.DIALOG_MODAL
 
     def text2unicode(text):
@@ -49 +52 @@
     BUTTONSTYPE_YES_NO = gtk.ButtonsType.YES_NO
     RESPONSETYPE_YES = gtk.ResponseType.YES
+    RESPONSETYPE_ACCEPT = gtk.ResponseType.ACCEPT
+    RESPONSETYPE_REJECT = gtk.ResponseType.REJECT
     ACCEL_VISIBLE = gtk.AccelFlags.VISIBLE
     CONTROL_MASK = gdk.ModifierType.CONTROL_MASK
+    DIALOG_MODAL = gtk.DialogFlags.MODAL
 
     import codecs

src/mlx/gui/gui.py

@@ -10 +10 @@
 from mlx.gui.weighthelp import WeightHelp
 from mlx.gui.gates import FleetGateStatus
+from mlx.gui.prefs import Preferences
 
 import mlx.const as const
@@ -61 +62 @@
         """Build the GUI."""
         
-        window = gtk.Window()
+        self._mainWindow = window = gtk.Window()
         window.set_title(WINDOW_TITLE_BASE)
         window.set_icon_from_file(os.path.join(iconDirectory, "logo.ico"))
@@ -73 +74 @@
         window.add(mainVBox)
 
+        self._preferences = Preferences(self)
+
         menuBar = self._buildMenuBar(accelGroup)
         mainVBox.pack_start(menuBar, False, False, 0)
@@ -130 +133 @@
         self._weightHelp.reset()
         self._weightHelp.disable()
-
-        self._mainWindow = window
 
         self._statusIcon = StatusIcon(iconDirectory, self)
@@ -663 +664 @@
         fileMenu.append(quitMenuItem)
 
+        toolsMenuItem = gtk.MenuItem(xstr("menu_tools"))
+        toolsMenu = gtk.Menu()
+        toolsMenuItem.set_submenu(toolsMenu)
+        menuBar.append(toolsMenuItem)
+
+        prefsMenuItem = gtk.ImageMenuItem(gtk.STOCK_PREFERENCES)
+        prefsMenuItem.set_use_stock(True)
+        prefsMenuItem.set_label(xstr("menu_tools_prefs"))
+        prefsMenuItem.add_accelerator("activate", accelGroup,
+                                      ord(xstr("menu_tools_prefs_key")),
+                                      CONTROL_MASK, ACCEL_VISIBLE)
+        prefsMenuItem.connect("activate", self._editPreferences)
+        toolsMenu.append(prefsMenuItem)
 
         viewMenuItem = gtk.MenuItem(xstr("menu_view"))
@@ -759 +773 @@
         else:
             self._mainWindow.set_default(None)
+
+    def _editPreferences(self, menuItem):
+        """Callback for editing the preferences."""
+        self._preferences.run(self.config)

src/mlx/gui/info.py

@@ -5 +5 @@
 from mlx.i18n import xstr
 import mlx.const as const
+
+#------------------------------------------------------------------------------
 
 class FlightInfo(gtk.VBox):

src/mlx/i18n.py

@@ -128 +128 @@
         self.add("menu_file_quit_key", "q")
         self.add("quit_question", "Are you sure to quit the logger?")
+
+        self.add("menu_tools", "Tools")
+        self.add("menu_tools_prefs", "_Preferences")
+        self.add("menu_tools_prefs_key", "p")
 
         self.add("menu_view", "View")
@@ -528 +532 @@
         self.add("gates_plane_parking", "PARKING")
         self.add("gates_plane_unknown", "UNKNOWN")
-                 
+
+        self.add("prefs_title", "Preferences")
+        self.add("prefs_tab_general", "_General")
+        self.add("prefs_tab_general_tooltip", "General preferences")
+        self.add("prefs_tab_advanced", "_Advanced")
+        self.add("prefs_tab_advanced_tooltip",
+                 "Advanced preferences, edit with care!")
+        self.add("prefs_language", "_Language:")
+        self.add("prefs_language_tooltip",
+                 "The language of the program")
+        self.add("prefs_restart",
+                 "Restart needed")
+        self.add("prefs_language_restart_sec",
+                 "If you change the language, the program should be restarted "
+                 "so that the change has an effect.")
+        self.add("prefs_lang_$system", "system default")
+        self.add("prefs_lang_en_GB", "English")
+        self.add("prefs_lang_hu_HU", "Hungarian")
+        self.add("prefs_update_auto", "Update the program auto_matically")
+        self.add("prefs_update_auto_tooltip",
+                 "If checked the program will look for updates when "
+                 "it is starting, and if new updates are found, they "
+                 "will be downloaded and installed. This ensures that "
+                 "the PIREP you send will always conform to the latest "
+                 "expectations of the airline.")
+        self.add("prefs_update_auto_warning",
+                 "Disabling automatic updates may result in "
+                 "your version of the program becoming out of date "
+                 "and your PIREPs not being accepted.")
+        self.add("prefs_update_url", "Update _URL:")
+        self.add("prefs_update_url_tooltip",
+                 "The URL from which to download the updates. Change this "
+                 "only if you know what you are doing!")
+
 #------------------------------------------------------------------------------
 
@@ -543 +580 @@
         self.add("menu_file_quit_key", "k")
         self.add("quit_question", "Biztosan ki akarsz lépni?")
+
+        self.add("menu_tools", "Eszközök")
+        self.add("menu_tools_prefs", "_Beállítások")
+        self.add("menu_tools_prefs_key", "b")
 
         self.add("menu_view", "Nézet")
@@ -951 +992 @@
         self.add("gates_plane_unknown", "ISMERETLEN")
                  
+        self.add("prefs_title", "Beállítások")
+        self.add("prefs_tab_general", "_Általános")
+        self.add("prefs_tab_general_tooltip", "Általános beállítások")
+        self.add("prefs_tab_advanced", "_Haladó")
+        self.add("prefs_tab_advanced_tooltip",
+                 "Haladó beállítások: óvatosan módosítsd őket!")
+        self.add("prefs_language", "_Nyelv:")
+        self.add("prefs_language_tooltip",
+                 "A program által használt nyelv")
+        self.add("prefs_restart",
+                 "Újraindítás szükséges")
+        self.add("prefs_language_restart_sec",
+                 "A program nyelvének megváltoztatása csak egy újraindítást "
+                 "követően jut érvényre.")
+        self.add("prefs_lang_$system", "alapértelmezett")
+        self.add("prefs_lang_en_GB", "angol")
+        self.add("prefs_lang_hu_HU", "magyar")
+        self.add("prefs_update_auto",
+                 "Frissítsd a programot _automatikusan")
+        self.add("prefs_update_auto_tooltip",
+                 "Ha ez be van jelölve, a program induláskor frissítést "
+                 "keres, és ha talál, azokat letölti és telepíti. Ez "
+                 "biztosítja, hogy az elküldött PIREP minden megfelel "
+                 "a legújabb elvárásoknak.")
+        self.add("prefs_update_auto_warning",
+                 "Az automatikus frissítés kikapcsolása azt okozhatja, "
+                 "hogy a program Nálad lévő verziója elavulttá válik, "
+                 "és a PIREP-jeidet így nem fogadják el.")
+        self.add("prefs_update_url", "Frissítés _URL-je:")
+        self.add("prefs_update_url_tooltip",
+                 "Az URL, ahol a frissítéseket keresi a program. Csak akkor "
+                 "változtasd meg, ha biztos vagy a dolgodban!")
+
 #------------------------------------------------------------------------------
 

src/mlx/mlx.py

@@ -1 +1 @@
 # The main program
-
-from .gui.gui import GUI
 
 from config import Config
@@ -35 +33 @@
     setLanguage(config.getLanguage())
     
+    from .gui.gui import GUI
     gui = GUI(programDirectory, config)