Changeset 738:d51ccfc6e8a9

Timestamp:

01/02/16 12:09:24 (9 years ago)

Author:

István Váradi <ivaradi@…>

Branch:

default

Phase:

public

Message:

The usage of RPC can be configured (re #283).

Files:

• locale/en/mlx.po (modified) (1 diff)
• locale/hu/mlx.po (modified) (1 diff)
• src/mlx/config.py (modified) (5 diffs)
• src/mlx/gui/prefs.py (modified) (3 diffs)

locale/en/mlx.po

@@ -1737 +1737 @@
 "know what you are doing!"
 
+msgid "prefs_use_rpc"
+msgstr "Use _RPC calls"
+
+msgid "prefs_use_rpc_tooltip"
+msgstr ""
+"If checked the program will use RPC calls towards the MAVA server. "
+"This should be the normal operation, but if some server operation "
+"fails, you may want to try to uncheck here. Note, that some new "
+"functionality will still be called over RPC."
+
 msgid "prefs_msgs_fs"
 msgstr "Displayed in FS"

locale/hu/mlx.po

@@ -1748 +1748 @@
 "ha biztos vagy a dolgodban!"
 
+msgid "prefs_use_rpc"
+msgstr "_RPC hívások"
+
+msgid "prefs_use_rpc_tooltip"
+msgstr ""
+"Ha ez be van jelölve, a program RPC hívásokkal kommunikál a MAVA "
+"szerverrel. Ez a normális, azonban ha valamilyen szerverművelet "
+"nem sikerül, megpróbálhatjuk itt megszüntetni a kijelölést. "
+"Azonban bizonyos új funkciókat továbbra is RPC-n fog hívni a program."
+
 msgid "prefs_msgs_fs"
 msgstr ""

src/mlx/config.py

@@ -258 +258 @@
         if secondaryInstallation:
             self._updateURL += "/exp"
+        self._useRPC = True
 
         self._messageTypeLevels = {}
@@ -666 +667 @@
         if updateURL!=self._updateURL:
             self._updateURL = updateURL
+            self._modified = True
+
+    @property
+    def useRPC(self):
+        """Determine if RPC calls should be used."""
+        return self._useRPC
+
+    @useRPC.setter
+    def useRPC(self, useRPC):
+        """Set whether RPC calls should be used."""
+        if useRPC!=self._useRPC:
+            self._useRPC = useRPC
             self._modified = True
 
@@ -775 +788 @@
                                     Config.DEFAULT_UPDATE_URL +
                                     ("/exp" if secondaryInstallation else ""))
+        self._useRPC = self._getBoolean(config, "general", "useRPC", True)
 
         for aircraftType in const.aircraftTypes:
@@ -867 +881 @@
         config.set("update", "url", self._updateURL)
 
+        config.set("general", "useRPC",
+                   "yes" if self._useRPC else "no")
+
         config.add_section(Checklist.SECTION)
         config.add_section(ApproachCallouts.SECTION)
@@ -1001 +1018 @@
         print "  autoUpdate:", self._autoUpdate
         print "  updateURL:", self._updateURL
+        print "  useRPC:", self._useRPC
 
         print "  messageTypeLevels:"

src/mlx/gui/prefs.py

@@ -276 +276 @@
 
         self._updateURL.set_text(config.updateURL)
+
+        self._useRPC.set_active(config.useRPC)
 
         self._settingFromConfig = False
@@ -320 +322 @@
         config.autoUpdate = self._autoUpdate.get_active()
         config.updateURL = self._updateURL.get_text()
+        config.useRPC = self._useRPC.get_active()
 
     def _buildGeneral(self):
@@ -814 +817 @@
         updateURLBox.pack_start(self._updateURL, True, True, 4)
 
+        self._useRPC = gtk.CheckButton(xstr("prefs_use_rpc"))
+        mainBox.pack_start(self._useRPC, False, False, 16)
+
+        self._useRPC.set_use_underline(True)
+        self._useRPC.set_tooltip_text(xstr("prefs_use_rpc_tooltip"))
+
         return mainAlignment