diff -r d14ddbfbbd36 -r c6dda2cbe081 Preferences/ConfigurationPages/EmailPage.py
--- a/Preferences/ConfigurationPages/EmailPage.py Sat Feb 16 10:27:50 2019 +0100
+++ b/Preferences/ConfigurationPages/EmailPage.py Sat Mar 02 11:15:24 2019 +0100
@@ -38,14 +38,21 @@
self.__helpDialog = None
+ pipPackages = [
+ "google-api-python-client",
+ "google-auth-oauthlib",
+ ]
+ self.__pipCommand = "pip install --upgrade {0}".format(
+ " ".join(pipPackages))
+
# set initial values
try:
import googleapiclient # __IGNORE_WARNING__
self.googleMailCheckBox.setChecked(
Preferences.getUser("UseGoogleMailOAuth2"))
- from E5Network.E5GoogleMail import isCredentialsFileAvailable
- if not isCredentialsFileAvailable():
+ from E5Network.E5GoogleMail import isClientSecretFileAvailable
+ if not isClientSecretFileAvailable():
# credentials file is not installed
self.googleMailCheckBox.setChecked(False)
self.googleMailCheckBox.setEnabled(False)
@@ -59,8 +66,8 @@
self.googleMailCheckBox.setEnabled(False)
self.googleMailInfoLabel.setText(self.tr(
"<p>The Google Mail Client API is not installed."
- " Use <code>pip install --upgrade google-api-python-client"
- "</code> to install it.</p>"))
+ " Use <code>{0}</code> to install it.</p>")
+ .format(self.__pipCommand))
self.googleHelpButton.setEnabled(False)
Preferences.setUser("UseGoogleMailOAuth2", False)
@@ -283,10 +290,10 @@
from E5Network.E5GoogleMail import GoogleMailHelp
helpStr = GoogleMailHelp()
except ImportError:
- helpStr = self.tr(
- "<p>The Google Mail Client API is not installed."
- " Use <code>pip install --upgrade google-api-python-client"
- "</code> to install it.</p>")
+ helpStr = self.tr(
+ "<p>The Google Mail Client API is not installed."
+ " Use <code>{0}</code> to install it.</p>"
+ ).format(self.__pipCommand)
from E5Gui.E5SimpleHelpDialog import E5SimpleHelpDialog
self.__helpDialog = E5SimpleHelpDialog(
