eric: comparison eric7/UI/UserInterface.py

-:cfd0e44ef084
+:e91b276e0771
 from Sessions.SessionFile import SessionFile
 from Tasks.TasksFile import TasksFile
+from EricNetwork.EricNetworkIcon import EricNetworkIcon
 from EricNetwork.EricNetworkProxyFactory import (
 EricNetworkProxyFactory, proxyAuthenticationRequired
 )
 try:
 from EricNetwork.EricSslErrorHandler import (
 @signal reloadAPIs() emitted to reload the api information
 @signal showMenu(str, QMenu) emitted when a menu is about to be shown. The
 name of the menu and a reference to the menu are given.
 @signal masterPasswordChanged(str, str) emitted after the master
 password has been changed with the old and the new password
+@signal onlineStateChanged(online) emitted to indicate a change of the
+network state
 """
 appendStderr = pyqtSignal(str)
 appendStdout = pyqtSignal(str)
 preferencesChanged = pyqtSignal()
 reloadAPIs = pyqtSignal()
 showMenu = pyqtSignal(str, QMenu)
 masterPasswordChanged = pyqtSignal(str, str)
+onlineStateChanged = pyqtSignal(bool)
 maxFilePathLen = 100
 maxMenuFilePathLen = 75
 LeftSide = 1
 self.toolGroups, self.currentToolGroup = Preferences.readToolGroups()
 self.toolProcs = []
 self.__initExternalToolsActions()
 # redirect handling of http and https URLs to ourselves
-# TODO: enable this once PyQt 6.2.0/Qt 6.2.0 is released
+QDesktopServices.setUrlHandler("http", self.handleUrl)
-if False:
+QDesktopServices.setUrlHandler("https", self.handleUrl)
-QDesktopServices.setUrlHandler("http", self.handleUrl)
-QDesktopServices.setUrlHandler("https", self.handleUrl)
 # register all relevant objects
 splash.showMessage(self.tr("Registering Objects..."))
 ericApp().registerObject("UserInterface", self)
 ericApp().registerObject("DebugUI", self.debuggerUI)
 from VCS.StatusMonitorLed import StatusMonitorLedWidget
 self.sbVcsMonitorLed = StatusMonitorLedWidget(
 self.project, self.__statusBar)
 self.__statusBar.addPermanentWidget(self.sbVcsMonitorLed)
+self.networkIcon = EricNetworkIcon(self.__statusBar)
+self.__statusBar.addPermanentWidget(self.networkIcon)
+self.networkIcon.onlineStateChanged.connect(self.onlineStateChanged)
+self.networkIcon.onlineStateChanged.connect(self.__onlineStateChanged)
 def __initExternalToolsActions(self):
 """
 Private slot to create actions for the configured external tools.
 """
 def checkPluginUpdatesAvailable(self):
 """
 Public method to check the availability of updates of plug-ins.
 """
-self.pluginManager.checkPluginUpdatesAvailable()
+if self.isOnline():
+self.pluginManager.checkPluginUpdatesAvailable()
 #################################################################
 ## Drag and Drop Support
 #################################################################
 self.__saveCurrentViewProfile(True)
 Preferences.saveToolGroups(self.toolGroups, self.currentToolGroup)
 Preferences.syncPreferences()
 self.shutdownCalled = True
 return True
+def isOnline(self):
+"""
+Public method to get the online state.
+@return online state
+@rtype bool
+"""
+return self.networkIcon.isOnline()
+def __onlineStateChanged(self, online):
+"""
+Private slot handling changes in online state.
+@param online flag indicating the online state
+@type bool
+"""
+if online:
+self.performVersionCheck(False)
 ##############################################
 ## Below are methods to check for new versions
 ##############################################
 @param manual flag indicating an invocation via the menu (boolean)
 @param alternative index of server to download from (integer)
 @param showVersions flag indicating the show versions mode (boolean)
 """
-if not manual:
+if self.isOnline():
-if VersionOnly.startswith("@@"):
+if not manual:
-return
+if VersionOnly.startswith("@@"):
-else:
-period = Preferences.getUI("PerformVersionCheck")
-if period == 0:
 return
-elif period in [2, 3, 4]:
+else:
-lastCheck = Preferences.Prefs.settings.value(
+period = Preferences.getUI("PerformVersionCheck")
-"Updates/LastCheckDate", QDate(1970, 1, 1))
+if period == 0:
-if lastCheck.isValid():
+return
-now = QDate.currentDate()
+elif period in [2, 3, 4]:
-if (
+lastCheck = Preferences.Prefs.settings.value(
-(period == 2 and lastCheck.day() == now.day()) or
+"Updates/LastCheckDate", QDate(1970, 1, 1))
-(period == 3 and lastCheck.daysTo(now) < 7) or
+if lastCheck.isValid():
-(period == 4 and (lastCheck.daysTo(now) <
+now = QDate.currentDate()
-lastCheck.daysInMonth()))
+if (
-):
+(period == 2 and
-# daily, weekly, monthly
+lastCheck.day() == now.day()) or
-return
+(period == 3 and lastCheck.daysTo(now) < 7) or
+(period == 4 and (lastCheck.daysTo(now) <
-self.__inVersionCheck = True
+lastCheck.daysInMonth()))
-self.manualUpdatesCheck = manual
+):
-self.showAvailableVersions = showVersions
+# daily, weekly, monthly
-self.httpAlternative = alternative
+return
-url = QUrl(self.__httpAlternatives[alternative])
-self.__versionCheckCanceled = False
+self.__inVersionCheck = True
-if manual:
+self.manualUpdatesCheck = manual
-if self.__versionCheckProgress is None:
+self.showAvailableVersions = showVersions
-self.__versionCheckProgress = EricProgressDialog(
+self.httpAlternative = alternative
-"", self.tr("&Cancel"),
+url = QUrl(self.__httpAlternatives[alternative])
-0, len(self.__httpAlternatives),
+self.__versionCheckCanceled = False
-self.tr("%v/%m"), self)
+if manual:
-self.__versionCheckProgress.setWindowTitle(
+if self.__versionCheckProgress is None:
-self.tr("Version Check"))
+self.__versionCheckProgress = EricProgressDialog(
-self.__versionCheckProgress.setMinimumDuration(0)
+"", self.tr("&Cancel"),
-self.__versionCheckProgress.canceled.connect(
+0, len(self.__httpAlternatives),
-self.__versionsDownloadCanceled)
+self.tr("%v/%m"), self)
-self.__versionCheckProgress.setLabelText(
+self.__versionCheckProgress.setWindowTitle(
-self.tr("Trying host {0}").format(url.host()))
+self.tr("Version Check"))
-self.__versionCheckProgress.setValue(alternative)
+self.__versionCheckProgress.setMinimumDuration(0)
-request = QNetworkRequest(url)
+self.__versionCheckProgress.canceled.connect(
-request.setAttribute(
+self.__versionsDownloadCanceled)
-QNetworkRequest.Attribute.CacheLoadControlAttribute,
+self.__versionCheckProgress.setLabelText(
-QNetworkRequest.CacheLoadControl.AlwaysNetwork)
+self.tr("Trying host {0}").format(url.host()))
-reply = self.__networkManager.get(request)
+self.__versionCheckProgress.setValue(alternative)
-reply.finished.connect(lambda: self.__versionsDownloadDone(reply))
+request = QNetworkRequest(url)
-self.__replies.append(reply)
+request.setAttribute(
+QNetworkRequest.Attribute.CacheLoadControlAttribute,
+QNetworkRequest.CacheLoadControl.AlwaysNetwork)
+reply = self.__networkManager.get(request)
+reply.finished.connect(lambda: self.__versionsDownloadDone(reply))
+self.__replies.append(reply)
+else:
+if manual:
+EricMessageBox.warning(
+self,
+self.tr("Error getting versions information"),
+self.tr("The versions information cannot not be"
+" downloaded because the Internet is"
+" <b>not reachable</b>. Please try again later.")
+)
 @pyqtSlot()
 def __versionsDownloadDone(self, reply):
 """
 Private slot called, after the versions file has been downloaded

Mercurial Repositories > eric / file comparison

comparison: eric7/UI/UserInterface.py

eric7/UI/UserInterface.py