Browse Source

dont use QtWebKit

its not available anymore in recent distributions:
https://lists.debian.org/debian-devel-announce/2015/05/msg00001.html

breaks the help feature, but ¯\_(ツ)_/¯
master_qgis2
Norwin Roosen 9 months ago
parent
commit
812e559af4
3 changed files with 10 additions and 9 deletions
  1. 1
    1
      core/actions.py
  2. 4
    4
      ui/main_window.py
  3. 5
    4
      ui/main_window_dialog.py

+ 1
- 1
core/actions.py View File

@@ -21,7 +21,7 @@
21 21
  ***************************************************************************/
22 22
 """
23 23
 
24
-from PyQt4.QtWebKit import QWebView
24
+#from PyQt4.QtWebKit import QWebView
25 25
 from PyQt4.QtGui import QDesktopServices
26 26
 from PyQt4.QtCore import QUrl
27 27
 from qgis.utils import iface

+ 4
- 4
ui/main_window.py View File

@@ -191,9 +191,9 @@ class Ui_ui_main_window(object):
191 191
         spacerItem2 = QtGui.QSpacerItem(40, 20, QtGui.QSizePolicy.Expanding, QtGui.QSizePolicy.Minimum)
192 192
         self.horizontalLayout_3.addItem(spacerItem2)
193 193
         self.verticalLayout_5.addLayout(self.horizontalLayout_3)
194
-        self.webBrowser = QtWebKit.QWebView(self.scrollAreaWidgetContents)
195
-        self.webBrowser.setObjectName(_fromUtf8("webBrowser"))
196
-        self.verticalLayout_5.addWidget(self.webBrowser)
194
+        #self.webBrowser = QtWebKit.QWebView(self.scrollAreaWidgetContents)
195
+        #self.webBrowser.setObjectName(_fromUtf8("webBrowser"))
196
+        #self.verticalLayout_5.addWidget(self.webBrowser)
197 197
         spacerItem3 = QtGui.QSpacerItem(20, 40, QtGui.QSizePolicy.Minimum, QtGui.QSizePolicy.Expanding)
198 198
         self.verticalLayout_5.addItem(spacerItem3)
199 199
         self.scrollArea.setWidget(self.scrollAreaWidgetContents)
@@ -428,7 +428,7 @@ class Ui_ui_main_window(object):
428 428
         self.groupBox_4.setTitle(_translate("ui_main_window", "Licence", None))
429 429
 
430 430
 from qgis import gui
431
-from PyQt4 import QtWebKit
431
+#from PyQt4 import QtWebKit
432 432
 from query_dialog import QueryWidget
433 433
 from osm_file_dialog import OsmFileWidget
434 434
 from quick_query_dialog import QuickQueryWidget

+ 5
- 4
ui/main_window_dialog.py View File

@@ -104,16 +104,17 @@ class MainWindowDialog(QDialog, Ui_ui_main_window):
104 104
             file_help_path = join(doc_path, helpFileName)
105 105
             if isfile(file_help_path):
106 106
                 self.help_file = file_help_path
107
-                self.webBrowser.load(QUrl(self.help_file))
107
+                #self.webBrowser.load(QUrl(self.help_file))
108 108
                 break
109
-        else:
110
-            self.webBrowser.setHtml("<h3>Help not available</h3>")
109
+        #else:
110
+        #    self.webBrowser.setHtml("<h3>Help not available</h3>")
111 111
 
112 112
     def get_root_help(self):
113 113
         """
114 114
         home button set the default help page
115 115
         """
116
-        self.webBrowser.load(QUrl(self.help_file))
116
+        #self.webBrowser.load(QUrl(self.help_file))
117
+        pass
117 118
 
118 119
     def refresh_my_queries_tree(self):
119 120
         """

Loading…
Cancel
Save