diff -r 464a6b049f89 -r a258569d44db Preferences/ConfigurationPages/HelpDocumentationPage.py
--- a/Preferences/ConfigurationPages/HelpDocumentationPage.py Wed Nov 25 19:01:45 2015 +0100
+++ b/Preferences/ConfigurationPages/HelpDocumentationPage.py Thu Nov 26 19:47:09 2015 +0100
@@ -9,17 +9,13 @@
from __future__ import unicode_literals
-from PyQt5.QtCore import pyqtSlot, QUrl
-
-from E5Gui.E5Completers import E5FileCompleter
-from E5Gui import E5FileDialog
+from E5Gui.E5PathPicker import E5PathPickerModes
from .ConfigurationPageBase import ConfigurationPageBase
from .Ui_HelpDocumentationPage import Ui_HelpDocumentationPage
import Preferences
import Utilities
-import UI.PixmapCache
class HelpDocumentationPage(ConfigurationPageBase, Ui_HelpDocumentationPage):
@@ -34,21 +30,31 @@
self.setupUi(self)
self.setObjectName("HelpDocumentationPage")
- self.python2DocDirButton.setIcon(UI.PixmapCache.getIcon("open.png"))
- self.pythonDocDirButton.setIcon(UI.PixmapCache.getIcon("open.png"))
- self.qt4DocDirButton.setIcon(UI.PixmapCache.getIcon("open.png"))
- self.qt5DocDirButton.setIcon(UI.PixmapCache.getIcon("open.png"))
- self.pyqt4DocDirButton.setIcon(UI.PixmapCache.getIcon("open.png"))
- self.pyqt5DocDirButton.setIcon(UI.PixmapCache.getIcon("open.png"))
- self.pysideDocDirButton.setIcon(UI.PixmapCache.getIcon("open.png"))
-
- self.python2DocDirCompleter = E5FileCompleter(self.python2DocDirEdit)
- self.pythonDocDirCompleter = E5FileCompleter(self.pythonDocDirEdit)
- self.qt4DocDirCompleter = E5FileCompleter(self.qt4DocDirEdit)
- self.qt5DocDirCompleter = E5FileCompleter(self.qt5DocDirEdit)
- self.pyqt4DocDirCompleter = E5FileCompleter(self.pyqt4DocDirEdit)
- self.pyqt5DocDirCompleter = E5FileCompleter(self.pyqt5DocDirEdit)
- self.pysideDocDirCompleter = E5FileCompleter(self.pysideDocDirEdit)
+ self.python2DocDirPicker.setMode(E5PathPickerModes.OpenFileMode)
+ self.python2DocDirPicker.setFilters(self.tr(
+ "HTML Files (*.html *.htm);;"
+ "Compressed Help Files (*.chm);;"
+ "All Files (*)"))
+ self.pythonDocDirPicker.setMode(E5PathPickerModes.OpenFileMode)
+ self.pythonDocDirPicker.setFilters(self.tr(
+ "HTML Files (*.html *.htm);;"
+ "Compressed Help Files (*.chm);;"
+ "All Files (*)"))
+ self.qt4DocDirPicker.setMode(E5PathPickerModes.OpenFileMode)
+ self.qt4DocDirPicker.setFilters(self.tr(
+ "HTML Files (*.html *.htm);;All Files (*)"))
+ self.qt5DocDirPicker.setMode(E5PathPickerModes.OpenFileMode)
+ self.qt5DocDirPicker.setFilters(self.tr(
+ "HTML Files (*.html *.htm);;All Files (*)"))
+ self.pyqt4DocDirPicker.setMode(E5PathPickerModes.OpenFileMode)
+ self.pyqt4DocDirPicker.setFilters(self.tr(
+ "HTML Files (*.html *.htm);;All Files (*)"))
+ self.pyqt5DocDirPicker.setMode(E5PathPickerModes.OpenFileMode)
+ self.pyqt5DocDirPicker.setFilters(self.tr(
+ "HTML Files (*.html *.htm);;All Files (*)"))
+ self.pysideDocDirPicker.setMode(E5PathPickerModes.OpenFileMode)
+ self.pysideDocDirPicker.setFilters(self.tr(
+ "HTML Files (*.html *.htm);;All Files (*)"))
try:
import PyQt5 # __IGNORE_WARNING__
@@ -62,19 +68,19 @@
self.pysideGroup.setEnabled(False)
# set initial values
- self.python2DocDirEdit.setText(
+ self.python2DocDirPicker.setText(
Preferences.getHelp("Python2DocDir"))
- self.pythonDocDirEdit.setText(
+ self.pythonDocDirPicker.setText(
Preferences.getHelp("PythonDocDir"))
- self.qt4DocDirEdit.setText(
+ self.qt4DocDirPicker.setText(
Preferences.getHelp("Qt4DocDir"))
- self.qt5DocDirEdit.setText(
+ self.qt5DocDirPicker.setText(
Preferences.getHelp("Qt5DocDir"))
- self.pyqt4DocDirEdit.setText(
+ self.pyqt4DocDirPicker.setText(
Preferences.getHelp("PyQt4DocDir"))
- self.pyqt5DocDirEdit.setText(
+ self.pyqt5DocDirPicker.setText(
Preferences.getHelp("PyQt5DocDir"))
- self.pysideDocDirEdit.setText(
+ self.pysideDocDirPicker.setText(
Preferences.getHelp("PySideDocDir"))
def save(self):
@@ -83,129 +89,25 @@
"""
Preferences.setHelp(
"Python2DocDir",
- self.python2DocDirEdit.text())
+ self.python2DocDirPicker.text())
Preferences.setHelp(
"PythonDocDir",
- self.pythonDocDirEdit.text())
+ self.pythonDocDirPicker.text())
Preferences.setHelp(
"Qt4DocDir",
- self.qt4DocDirEdit.text())
+ self.qt4DocDirPicker.text())
Preferences.setHelp(
"Qt5DocDir",
- self.qt5DocDirEdit.text())
+ self.qt5DocDirPicker.text())
Preferences.setHelp(
"PyQt4DocDir",
- self.pyqt4DocDirEdit.text())
+ self.pyqt4DocDirPicker.text())
Preferences.setHelp(
"PyQt5DocDir",
- self.pyqt5DocDirEdit.text())
+ self.pyqt5DocDirPicker.text())
Preferences.setHelp(
"PySideDocDir",
- self.pysideDocDirEdit.text())
-
- @pyqtSlot()
- def on_python2DocDirButton_clicked(self):
- """
- Private slot to select the Python 2 documentation directory.
- """
- entry = E5FileDialog.getOpenFileName(
- self,
- self.tr("Select Python 2 documentation entry"),
- QUrl(self.python2DocDirEdit.text()).path(),
- self.tr(
- "HTML Files (*.html *.htm);;"
- "Compressed Help Files (*.chm);;"
- "All Files (*)"))
-
- if entry:
- self.python2DocDirEdit.setText(Utilities.toNativeSeparators(entry))
-
- @pyqtSlot()
- def on_pythonDocDirButton_clicked(self):
- """
- Private slot to select the Python 3 documentation directory.
- """
- entry = E5FileDialog.getOpenFileName(
- self,
- self.tr("Select Python 3 documentation entry"),
- QUrl(self.pythonDocDirEdit.text()).path(),
- self.tr(
- "HTML Files (*.html *.htm);;"
- "Compressed Help Files (*.chm);;"
- "All Files (*)"))
-
- if entry:
- self.pythonDocDirEdit.setText(Utilities.toNativeSeparators(entry))
-
- @pyqtSlot()
- def on_qt4DocDirButton_clicked(self):
- """
- Private slot to select the Qt4 documentation directory.
- """
- entry = E5FileDialog.getOpenFileName(
- self,
- self.tr("Select Qt4 documentation entry"),
- QUrl(self.qt4DocDirEdit.text()).path(),
- self.tr("HTML Files (*.html *.htm);;All Files (*)"))
-
- if entry:
- self.qt4DocDirEdit.setText(Utilities.toNativeSeparators(entry))
-
- @pyqtSlot()
- def on_qt5DocDirButton_clicked(self):
- """
- Private slot to select the Qt5 documentation directory.
- """
- entry = E5FileDialog.getOpenFileName(
- self,
- self.tr("Select Qt5 documentation entry"),
- QUrl(self.qt5DocDirEdit.text()).path(),
- self.tr("HTML Files (*.html *.htm);;All Files (*)"))
-
- if entry:
- self.qt5DocDirEdit.setText(Utilities.toNativeSeparators(entry))
-
- @pyqtSlot()
- def on_pyqt4DocDirButton_clicked(self):
- """
- Private slot to select the PyQt5 documentation directory.
- """
- entry = E5FileDialog.getOpenFileName(
- self,
- self.tr("Select PyQt5 documentation entry"),
- QUrl(self.pyqt4DocDirEdit.text()).path(),
- self.tr("HTML Files (*.html *.htm);;All Files (*)"))
-
- if entry:
- self.pyqt4DocDirEdit.setText(Utilities.toNativeSeparators(entry))
-
- @pyqtSlot()
- def on_pyqt5DocDirButton_clicked(self):
- """
- Private slot to select the PyQt5 documentation directory.
- """
- entry = E5FileDialog.getOpenFileName(
- self,
- self.tr("Select PyQt5 documentation entry"),
- QUrl(self.pyqt4DocDirEdit.text()).path(),
- self.tr("HTML Files (*.html *.htm);;All Files (*)"))
-
- if entry:
- self.pyqt5DocDirEdit.setText(Utilities.toNativeSeparators(entry))
-
- @pyqtSlot()
- def on_pysideDocDirButton_clicked(self):
- """
- Private slot to select the PySide documentation directory.
- """
- entry = E5FileDialog.getOpenFileName(
- self,
- self.tr("Select PySide documentation entry"),
- QUrl(self.pysideDocDirEdit.text()).path(),
- self.tr("HTML Files (*.html *.htm);;All Files (*)"))
-
- if entry:
- self.pysideDocDirEdit.setText(Utilities.toNativeSeparators(entry))
+ self.pysideDocDirPicker.text())
def create(dlg):
