Mercurial Repositories > eric / file diff

--- a/UI/CodeDocumentationViewer.py	Mon Nov 06 20:00:42 2017 +0100
+++ b/UI/CodeDocumentationViewer.py	Tue Nov 07 19:37:17 2017 +0100
@@ -263,12 +263,9 @@
         self.verticalLayout.addWidget(self.__plainTextViewer)
         
         # Rich Text (Web) Viewer
-        try:
-            self.__richTextViewer = WebViewDocumentationViewer(self)
-            self.__richTextViewer.setObjectName("__richTextViewer")
-            self.verticalLayout.addWidget(self.__richTextViewer)
-        except ImportError:
-            self.__richTextViewer = None
+        self.__richTextViewer = WebViewDocumentationViewer(self)
+        self.__richTextViewer.setObjectName("__richTextViewer")
+        self.verticalLayout.addWidget(self.__richTextViewer)
         
         self.__toolButton = E5ToolButton(self)
         self.__toolButton.setObjectName(
@@ -284,12 +281,11 @@
         self.__optionsActionGroup = QActionGroup(self)
         self.__optionsActionGroup.setExclusive(True)
         self.__optionsMenu = QMenu(self)
-        if self.__richTextViewer:
-            self.__richTextAct = self.__optionsMenu.addAction(
-                self.tr("Rich Text"),
-                lambda: self.__showTextViewer(True))
-            self.__richTextAct.setCheckable(True)
-            self.__optionsActionGroup.addAction(self.__richTextAct)
+        self.__richTextAct = self.__optionsMenu.addAction(
+            self.tr("Rich Text"),
+            lambda: self.__showTextViewer(True))
+        self.__richTextAct.setCheckable(True)
+        self.__optionsActionGroup.addAction(self.__richTextAct)
         self.__plainTextAct = self.__optionsMenu.addAction(
             self.tr("Plain Text"),
             lambda: self.__showTextViewer(False))
@@ -306,11 +302,8 @@
         """
         Public method to finalize the setup of the documentation viewer.
         """
-        if self.__richTextViewer:
-            self.__showTextViewer(
-                Preferences.getDocuViewer("ShowInfoAsRichText"))
-        else:
-            self.__showTextViewer(False)
+        self.__showTextViewer(
+            Preferences.getDocuViewer("ShowInfoAsRichText"))
         
         self.__startingUp = False
         provider = Preferences.getDocuViewer("Provider")
@@ -417,7 +410,7 @@
         
         if self.__selectedProvider != self.__disabledProvider:
             self.__plainTextViewer.clear()
-            self.__richTextViewer and self.__richTextViewer.clear()
+            self.__richTextViewer.clear()
             self.__providers[self.__selectedProvider][0](editor)
     
     # TODO: document this hook in the plug-in document
@@ -541,8 +534,7 @@
         @param html prepared HTML text
         @type str
         """
-        if self.__richTextViewer:
-            self.__richTextViewer.setHtml(html)
+        self.__richTextViewer.setHtml(html)
     
     def __setHtmlWarning(self, warningText):
         """
@@ -551,9 +543,8 @@
         @param warningText text to be shown as a warning
         @type str
         """
-        if self.__richTextViewer:
-            html = prepareDocumentationViewerHtmlWarningDocument(warningText)
-            self.__richTextViewer.setHtml(html)
+        html = prepareDocumentationViewerHtmlWarningDocument(warningText)
+        self.__richTextViewer.setHtml(html)
     
     @pyqtSlot(int)
     def on_providerComboBox_currentIndexChanged(self, index):
@@ -565,7 +556,7 @@
         """
         if not self.__shuttingDown and not self.__startingUp:
             self.__plainTextViewer.clear()
-            self.__richTextViewer and self.__richTextViewer.clear()
+            self.__richTextViewer.clear()
             self.objectLineEdit.clear()
             
             provider = self.providerComboBox.itemData(index)
@@ -588,12 +579,9 @@
         """
         Public slot to handle a change of preferences.
         """
-        if self.__richTextViewer:
-            showMarkdown = Preferences.getDocuViewer("ShowInfoAsRichText")
-            if showMarkdown != self.__showMarkdown:
-                self.__showTextViewer(showMarkdown)
-        else:
-            self.__showTextViewer(False)
+        showMarkdown = Preferences.getDocuViewer("ShowInfoAsRichText")
+        if showMarkdown != self.__showMarkdown:
+            self.__showTextViewer(showMarkdown)
         
         provider = Preferences.getDocuViewer("Provider")
         if provider != self.__selectedProvider:
@@ -612,13 +600,13 @@
         self.__showMarkdown = richText
         
         self.__plainTextViewer.clear()
-        self.__richTextViewer and self.__richTextViewer.clear()
+        self.__richTextViewer.clear()
         
         self.__plainTextViewer.setVisible(not richText)
-        self.__richTextViewer and self.__richTextViewer.setVisible(richText)
+        self.__richTextViewer.setVisible(richText)
         
         self.__plainTextAct.setChecked(not richText)
-        self.__richTextViewer and self.__richTextAct.setChecked(richText)
+        self.__richTextAct.setChecked(richText)
         
         self.documentationReady(self.__lastDocumentation)