Mercurial Repositories > eric / changeset
changeset
Changed the search widget used in the documentation viewer (and other places) to allow to save width but make it higher.
Sun, 05 Nov 2017 11:35:32 +0100
- author
- Detlev Offenbach <detlev@die-offenbachs.de>
- date
- Sun, 05 Nov 2017 11:35:32 +0100
- changeset 5959
- 4c716b02e10d
- parent 5958
- e9226b27bf9f
- child 5960
- be837f440186
Changed the search widget used in the documentation viewer (and other places) to allow to save width but make it higher.
--- a/APIs/Python3/eric6.api Fri Nov 03 17:24:01 2017 +0100 +++ b/APIs/Python3/eric6.api Sun Nov 05 11:35:32 2017 +0100 @@ -1256,7 +1256,7 @@ eric6.E5Gui.E5TextEditSearchWidget.E5TextEditSearchWidget.on_findNextButton_clicked?4() eric6.E5Gui.E5TextEditSearchWidget.E5TextEditSearchWidget.on_findPrevButton_clicked?4() eric6.E5Gui.E5TextEditSearchWidget.E5TextEditSearchWidget.on_findtextCombo_editTextChanged?4(txt) -eric6.E5Gui.E5TextEditSearchWidget.E5TextEditSearchWidget?1(parent=None) +eric6.E5Gui.E5TextEditSearchWidget.E5TextEditSearchWidget?1(parent=None, widthForHeight=True) eric6.E5Gui.E5TextSpinBox.E5TextSpinBox.addItem?4(txt, data=None) eric6.E5Gui.E5TextSpinBox.E5TextSpinBox.currentIndex?4() eric6.E5Gui.E5TextSpinBox.E5TextSpinBox.itemData?4(index) @@ -2123,7 +2123,9 @@ eric6.Helpviewer.Bookmarks.DefaultBookmarks_rc.qInitResources?4() eric6.Helpviewer.Bookmarks.DefaultBookmarks_rc.qt_resource_data?7 eric6.Helpviewer.Bookmarks.DefaultBookmarks_rc.qt_resource_name?7 -eric6.Helpviewer.Bookmarks.DefaultBookmarks_rc.qt_resource_struct?7 +eric6.Helpviewer.Bookmarks.DefaultBookmarks_rc.qt_resource_struct_v1?7 +eric6.Helpviewer.Bookmarks.DefaultBookmarks_rc.qt_resource_struct_v2?7 +eric6.Helpviewer.Bookmarks.DefaultBookmarks_rc.qt_version?7 eric6.Helpviewer.Bookmarks.NsHtmlReader.NsHtmlReader.indentSize?7 eric6.Helpviewer.Bookmarks.NsHtmlReader.NsHtmlReader.read?4(fileNameOrDevice) eric6.Helpviewer.Bookmarks.NsHtmlReader.NsHtmlReader?1() @@ -2858,7 +2860,9 @@ eric6.Helpviewer.OpenSearch.DefaultSearchEngines.DefaultSearchEngines_rc.qInitResources?4() eric6.Helpviewer.OpenSearch.DefaultSearchEngines.DefaultSearchEngines_rc.qt_resource_data?7 eric6.Helpviewer.OpenSearch.DefaultSearchEngines.DefaultSearchEngines_rc.qt_resource_name?7 -eric6.Helpviewer.OpenSearch.DefaultSearchEngines.DefaultSearchEngines_rc.qt_resource_struct?7 +eric6.Helpviewer.OpenSearch.DefaultSearchEngines.DefaultSearchEngines_rc.qt_resource_struct_v1?7 +eric6.Helpviewer.OpenSearch.DefaultSearchEngines.DefaultSearchEngines_rc.qt_resource_struct_v2?7 +eric6.Helpviewer.OpenSearch.DefaultSearchEngines.DefaultSearchEngines_rc.qt_version?7 eric6.Helpviewer.OpenSearch.OpenSearchDialog.OpenSearchDialog.on_addButton_clicked?4() eric6.Helpviewer.OpenSearch.OpenSearchDialog.OpenSearchDialog.on_deleteButton_clicked?4() eric6.Helpviewer.OpenSearch.OpenSearchDialog.OpenSearchDialog.on_editButton_clicked?4() @@ -3201,7 +3205,9 @@ eric6.Helpviewer.UserAgent.UserAgentDefaults_rc.qInitResources?4() eric6.Helpviewer.UserAgent.UserAgentDefaults_rc.qt_resource_data?7 eric6.Helpviewer.UserAgent.UserAgentDefaults_rc.qt_resource_name?7 -eric6.Helpviewer.UserAgent.UserAgentDefaults_rc.qt_resource_struct?7 +eric6.Helpviewer.UserAgent.UserAgentDefaults_rc.qt_resource_struct_v1?7 +eric6.Helpviewer.UserAgent.UserAgentDefaults_rc.qt_resource_struct_v2?7 +eric6.Helpviewer.UserAgent.UserAgentDefaults_rc.qt_version?7 eric6.Helpviewer.UserAgent.UserAgentManager.UserAgentManager.allHostNames?4() eric6.Helpviewer.UserAgent.UserAgentManager.UserAgentManager.changed?7 eric6.Helpviewer.UserAgent.UserAgentManager.UserAgentManager.close?4() @@ -3553,7 +3559,9 @@ eric6.IconEditor.cursors.cursors_rc.qInitResources?4() eric6.IconEditor.cursors.cursors_rc.qt_resource_data?7 eric6.IconEditor.cursors.cursors_rc.qt_resource_name?7 -eric6.IconEditor.cursors.cursors_rc.qt_resource_struct?7 +eric6.IconEditor.cursors.cursors_rc.qt_resource_struct_v1?7 +eric6.IconEditor.cursors.cursors_rc.qt_resource_struct_v2?7 +eric6.IconEditor.cursors.cursors_rc.qt_version?7 eric6.MultiProject.AddProjectDialog.AddProjectDialog.getData?4() eric6.MultiProject.AddProjectDialog.AddProjectDialog.on_filenamePicker_textChanged?4(txt) eric6.MultiProject.AddProjectDialog.AddProjectDialog.on_nameEdit_textChanged?4(txt) @@ -9912,7 +9920,9 @@ eric6.WebBrowser.Bookmarks.DefaultBookmarks_rc.qInitResources?4() eric6.WebBrowser.Bookmarks.DefaultBookmarks_rc.qt_resource_data?7 eric6.WebBrowser.Bookmarks.DefaultBookmarks_rc.qt_resource_name?7 -eric6.WebBrowser.Bookmarks.DefaultBookmarks_rc.qt_resource_struct?7 +eric6.WebBrowser.Bookmarks.DefaultBookmarks_rc.qt_resource_struct_v1?7 +eric6.WebBrowser.Bookmarks.DefaultBookmarks_rc.qt_resource_struct_v2?7 +eric6.WebBrowser.Bookmarks.DefaultBookmarks_rc.qt_version?7 eric6.WebBrowser.Bookmarks.NsHtmlReader.NsHtmlReader.indentSize?7 eric6.WebBrowser.Bookmarks.NsHtmlReader.NsHtmlReader.read?4(fileNameOrDevice) eric6.WebBrowser.Bookmarks.NsHtmlReader.NsHtmlReader?1() @@ -10403,7 +10413,9 @@ eric6.WebBrowser.OpenSearch.DefaultSearchEngines.DefaultSearchEngines_rc.qInitResources?4() eric6.WebBrowser.OpenSearch.DefaultSearchEngines.DefaultSearchEngines_rc.qt_resource_data?7 eric6.WebBrowser.OpenSearch.DefaultSearchEngines.DefaultSearchEngines_rc.qt_resource_name?7 -eric6.WebBrowser.OpenSearch.DefaultSearchEngines.DefaultSearchEngines_rc.qt_resource_struct?7 +eric6.WebBrowser.OpenSearch.DefaultSearchEngines.DefaultSearchEngines_rc.qt_resource_struct_v1?7 +eric6.WebBrowser.OpenSearch.DefaultSearchEngines.DefaultSearchEngines_rc.qt_resource_struct_v2?7 +eric6.WebBrowser.OpenSearch.DefaultSearchEngines.DefaultSearchEngines_rc.qt_version?7 eric6.WebBrowser.OpenSearch.OpenSearchDialog.OpenSearchDialog.on_addButton_clicked?4() eric6.WebBrowser.OpenSearch.OpenSearchDialog.OpenSearchDialog.on_deleteButton_clicked?4() eric6.WebBrowser.OpenSearch.OpenSearchDialog.OpenSearchDialog.on_editButton_clicked?4() @@ -11030,7 +11042,9 @@ eric6.WebBrowser.UserAgent.UserAgentDefaults_rc.qInitResources?4() eric6.WebBrowser.UserAgent.UserAgentDefaults_rc.qt_resource_data?7 eric6.WebBrowser.UserAgent.UserAgentDefaults_rc.qt_resource_name?7 -eric6.WebBrowser.UserAgent.UserAgentDefaults_rc.qt_resource_struct?7 +eric6.WebBrowser.UserAgent.UserAgentDefaults_rc.qt_resource_struct_v1?7 +eric6.WebBrowser.UserAgent.UserAgentDefaults_rc.qt_resource_struct_v2?7 +eric6.WebBrowser.UserAgent.UserAgentDefaults_rc.qt_version?7 eric6.WebBrowser.UserAgent.UserAgentManager.UserAgentManager.allHostNames?4() eric6.WebBrowser.UserAgent.UserAgentManager.UserAgentManager.changed?7 eric6.WebBrowser.UserAgent.UserAgentManager.UserAgentManager.close?4()
--- a/APIs/Python3/eric6.bas Fri Nov 03 17:24:01 2017 +0100 +++ b/APIs/Python3/eric6.bas Sun Nov 05 11:35:32 2017 +0100 @@ -203,7 +203,7 @@ E5StringListEditWidget QWidget Ui_E5StringListEditWidget E5TabWidget QTabWidget E5TableView QTableView -E5TextEditSearchWidget QWidget Ui_E5TextEditSearchWidget +E5TextEditSearchWidget QWidget E5TextSpinBox QSpinBox E5TldExtractor QObject E5ToolBarDialog QDialog Ui_E5ToolBarDialog
--- a/Documentation/Help/source.qhp Fri Nov 03 17:24:01 2017 +0100 +++ b/Documentation/Help/source.qhp Sun Nov 05 11:35:32 2017 +0100 @@ -4702,6 +4702,7 @@ <keyword name="E5TextEditSearchWidget.__findPrevNextQWebView" id="E5TextEditSearchWidget.__findPrevNextQWebView" ref="eric6.E5Gui.E5TextEditSearchWidget.html#E5TextEditSearchWidget.__findPrevNextQWebView" /> <keyword name="E5TextEditSearchWidget.__setFindtextComboBackground" id="E5TextEditSearchWidget.__setFindtextComboBackground" ref="eric6.E5Gui.E5TextEditSearchWidget.html#E5TextEditSearchWidget.__setFindtextComboBackground" /> <keyword name="E5TextEditSearchWidget.__setSearchButtons" id="E5TextEditSearchWidget.__setSearchButtons" ref="eric6.E5Gui.E5TextEditSearchWidget.html#E5TextEditSearchWidget.__setSearchButtons" /> + <keyword name="E5TextEditSearchWidget.__setupUi" id="E5TextEditSearchWidget.__setupUi" ref="eric6.E5Gui.E5TextEditSearchWidget.html#E5TextEditSearchWidget.__setupUi" /> <keyword name="E5TextEditSearchWidget.attachTextEdit" id="E5TextEditSearchWidget.attachTextEdit" ref="eric6.E5Gui.E5TextEditSearchWidget.html#E5TextEditSearchWidget.attachTextEdit" /> <keyword name="E5TextEditSearchWidget.keyPressEvent" id="E5TextEditSearchWidget.keyPressEvent" ref="eric6.E5Gui.E5TextEditSearchWidget.html#E5TextEditSearchWidget.keyPressEvent" /> <keyword name="E5TextEditSearchWidget.on_findNextButton_clicked" id="E5TextEditSearchWidget.on_findNextButton_clicked" ref="eric6.E5Gui.E5TextEditSearchWidget.html#E5TextEditSearchWidget.on_findNextButton_clicked" />
--- a/Documentation/Source/eric6.E5Gui.E5TextEditSearchWidget.html Fri Nov 03 17:24:01 2017 +0100 +++ b/Documentation/Source/eric6.E5Gui.E5TextEditSearchWidget.html Sun Nov 05 11:35:32 2017 +0100 @@ -45,7 +45,7 @@ Class implementing a horizontal search widget for QTextEdit. </p> <h3>Derived from</h3> -QWidget, Ui_E5TextEditSearchWidget +QWidget <h3>Class Attributes</h3> <table> <tr><td>None</td></tr> @@ -84,6 +84,9 @@ <td><a href="#E5TextEditSearchWidget.__setSearchButtons">__setSearchButtons</a></td> <td>Private slot to set the state of the search buttons.</td> </tr><tr> +<td><a href="#E5TextEditSearchWidget.__setupUi">__setupUi</a></td> +<td>Private method to generate the UI.</td> +</tr><tr> <td><a href="#E5TextEditSearchWidget.attachTextEdit">attachTextEdit</a></td> <td>Public method to attach a QTextEdit widget.</td> </tr><tr> @@ -106,13 +109,18 @@ </table> <a NAME="E5TextEditSearchWidget.__init__" ID="E5TextEditSearchWidget.__init__"></a> <h4>E5TextEditSearchWidget (Constructor)</h4> -<b>E5TextEditSearchWidget</b>(<i>parent=None</i>) +<b>E5TextEditSearchWidget</b>(<i>parent=None, widthForHeight=True</i>) <p> Constructor </p><dl> -<dt><i>parent</i></dt> +<dt><i>parent</i> (QWidget)</dt> <dd> -reference to the parent widget (QWidget) +reference to the parent widget +</dd><dt><i>widthForHeight</i> (bool)</dt> +<dd> +flag indicating to prefer width for height. + If this parameter is False, some widgets are shown in a third + line. </dd> </dl><a NAME="E5TextEditSearchWidget.__find" ID="E5TextEditSearchWidget.__find"></a> <h4>E5TextEditSearchWidget.__find</h4> @@ -214,6 +222,16 @@ <dd> flag indicating the state (boolean) </dd> +</dl><a NAME="E5TextEditSearchWidget.__setupUi" ID="E5TextEditSearchWidget.__setupUi"></a> +<h4>E5TextEditSearchWidget.__setupUi</h4> +<b>__setupUi</b>(<i>widthForHeight</i>) +<p> + Private method to generate the UI. +</p><dl> +<dt><i>widthForHeight</i> (bool)</dt> +<dd> +flag indicating to prefer width for height +</dd> </dl><a NAME="E5TextEditSearchWidget.attachTextEdit" ID="E5TextEditSearchWidget.attachTextEdit"></a> <h4>E5TextEditSearchWidget.attachTextEdit</h4> <b>attachTextEdit</b>(<i>textedit, editType="QTextEdit"</i>)
--- a/E5Gui/E5TextEditSearchWidget.py Fri Nov 03 17:24:01 2017 +0100 +++ b/E5Gui/E5TextEditSearchWidget.py Sun Nov 05 11:35:32 2017 +0100 @@ -9,35 +9,38 @@ from __future__ import unicode_literals -from PyQt5.QtCore import pyqtSlot, Qt +from PyQt5.QtCore import pyqtSlot, Qt, QMetaObject, QSize from PyQt5.QtGui import QPalette, QBrush, QColor, QTextDocument, QTextCursor -from PyQt5.QtWidgets import QWidget +from PyQt5.QtWidgets import QWidget, QVBoxLayout, QHBoxLayout, QLabel, \ + QComboBox, QCheckBox, QToolButton, QSizePolicy -from .Ui_E5TextEditSearchWidget import Ui_E5TextEditSearchWidget +from E5Gui.E5ComboBox import E5ClearableComboBox import UI.PixmapCache -class E5TextEditSearchWidget(QWidget, Ui_E5TextEditSearchWidget): +class E5TextEditSearchWidget(QWidget): """ Class implementing a horizontal search widget for QTextEdit. """ - def __init__(self, parent=None): + def __init__(self, parent=None, widthForHeight=True): """ Constructor - @param parent reference to the parent widget (QWidget) + @param parent reference to the parent widget + @type QWidget + @param widthForHeight flag indicating to prefer width for height. + If this parameter is False, some widgets are shown in a third + line. + @type bool """ super(E5TextEditSearchWidget, self).__init__(parent) - self.setupUi(self) + self.__setupUi(widthForHeight) self.__textedit = None self.__texteditType = "" self.__findBackwards = True - self.findPrevButton.setIcon(UI.PixmapCache.getIcon("1leftarrow.png")) - self.findNextButton.setIcon(UI.PixmapCache.getIcon("1rightarrow.png")) - self.__defaultBaseColor = \ self.findtextCombo.lineEdit().palette().color(QPalette.Base) self.__defaultTextColor = \ @@ -54,6 +57,97 @@ self.setFocusProxy(self.findtextCombo) + def __setupUi(self, widthForHeight): + """ + Private method to generate the UI. + + @param widthForHeight flag indicating to prefer width for height + @type bool + """ + self.setObjectName("E5TextEditSearchWidget") + + self.verticalLayout = QVBoxLayout(self) + self.verticalLayout.setObjectName("verticalLayout") + self.verticalLayout.setContentsMargins(0, 0, 0, 0) + + # row 1 of widgets + self.horizontalLayout1 = QHBoxLayout() + self.horizontalLayout1.setObjectName("horizontalLayout1") + + self.label = QLabel(self) + self.label.setObjectName("label") + self.label.setText(self.tr("Find:")) + self.horizontalLayout1.addWidget(self.label) + + self.findtextCombo = E5ClearableComboBox(self) + sizePolicy = QSizePolicy(QSizePolicy.Expanding, QSizePolicy.Fixed) + sizePolicy.setHorizontalStretch(0) + sizePolicy.setVerticalStretch(0) + sizePolicy.setHeightForWidth( + self.findtextCombo.sizePolicy().hasHeightForWidth()) + self.findtextCombo.setSizePolicy(sizePolicy) + self.findtextCombo.setMinimumSize(QSize(200, 0)) + self.findtextCombo.setEditable(True) + self.findtextCombo.setInsertPolicy(QComboBox.InsertAtTop) + self.findtextCombo.setDuplicatesEnabled(False) + self.findtextCombo.setObjectName("findtextCombo") + self.horizontalLayout1.addWidget(self.findtextCombo) + + # row 2 (maybe) of widgets + self.horizontalLayout2 = QHBoxLayout() + self.horizontalLayout2.setObjectName("horizontalLayout2") + + self.caseCheckBox = QCheckBox(self) + self.caseCheckBox.setObjectName("caseCheckBox") + self.caseCheckBox.setText(self.tr("Match case")) + self.horizontalLayout2.addWidget(self.caseCheckBox) + + self.wordCheckBox = QCheckBox(self) + self.wordCheckBox.setObjectName("wordCheckBox") + self.wordCheckBox.setText(self.tr("Whole word")) + self.horizontalLayout2.addWidget(self.wordCheckBox) + + # layout for the navigation buttons + self.horizontalLayout3 = QHBoxLayout() + self.horizontalLayout3.setSpacing(0) + self.horizontalLayout3.setObjectName("horizontalLayout3") + + self.findPrevButton = QToolButton(self) + self.findPrevButton.setObjectName("findPrevButton") + self.findPrevButton.setToolTip(self.tr( + "Press to find the previous occurrence")) + self.findPrevButton.setIcon(UI.PixmapCache.getIcon("1leftarrow.png")) + self.horizontalLayout3.addWidget(self.findPrevButton) + + self.findNextButton = QToolButton(self) + self.findNextButton.setObjectName("findNextButton") + self.findNextButton.setToolTip(self.tr( + "Press to find the next occurrence")) + self.findNextButton.setIcon(UI.PixmapCache.getIcon("1rightarrow.png")) + self.horizontalLayout3.addWidget(self.findNextButton) + + self.horizontalLayout2.addLayout(self.horizontalLayout3) + + # info label (in row 2 or 3) + self.infoLabel = QLabel(self) + self.infoLabel.setText("") + self.infoLabel.setObjectName("infoLabel") + + # place everything together + self.verticalLayout.addLayout(self.horizontalLayout1) + if widthForHeight: + self.horizontalLayout1.addLayout(self.horizontalLayout2) + else: + self.verticalLayout.addLayout(self.horizontalLayout2) + self.verticalLayout.addWidget(self.infoLabel) + + QMetaObject.connectSlotsByName(self) + + self.setTabOrder(self.findtextCombo, self.caseCheckBox) + self.setTabOrder(self.caseCheckBox, self.wordCheckBox) + self.setTabOrder(self.wordCheckBox, self.findPrevButton) + self.setTabOrder(self.findPrevButton, self.findNextButton) + def attachTextEdit(self, textedit, editType="QTextEdit"): """ Public method to attach a QTextEdit widget.
--- a/E5Gui/E5TextEditSearchWidget.ui Fri Nov 03 17:24:01 2017 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,118 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<ui version="4.0"> - <class>E5TextEditSearchWidget</class> - <widget class="QWidget" name="E5TextEditSearchWidget"> - <property name="geometry"> - <rect> - <x>0</x> - <y>0</y> - <width>475</width> - <height>43</height> - </rect> - </property> - <layout class="QGridLayout" name="gridLayout"> - <property name="leftMargin"> - <number>0</number> - </property> - <property name="topMargin"> - <number>0</number> - </property> - <property name="rightMargin"> - <number>0</number> - </property> - <property name="bottomMargin"> - <number>0</number> - </property> - <item row="0" column="0"> - <widget class="QLabel" name="label"> - <property name="text"> - <string>Find:</string> - </property> - </widget> - </item> - <item row="0" column="1"> - <widget class="E5ClearableComboBox" name="findtextCombo"> - <property name="sizePolicy"> - <sizepolicy hsizetype="Expanding" vsizetype="Fixed"> - <horstretch>0</horstretch> - <verstretch>0</verstretch> - </sizepolicy> - </property> - <property name="minimumSize"> - <size> - <width>200</width> - <height>0</height> - </size> - </property> - <property name="editable"> - <bool>true</bool> - </property> - <property name="insertPolicy"> - <enum>QComboBox::InsertAtTop</enum> - </property> - <property name="duplicatesEnabled"> - <bool>false</bool> - </property> - </widget> - </item> - <item row="0" column="2"> - <widget class="QCheckBox" name="caseCheckBox"> - <property name="text"> - <string>Match case</string> - </property> - </widget> - </item> - <item row="0" column="3"> - <widget class="QCheckBox" name="wordCheckBox"> - <property name="text"> - <string>Whole word</string> - </property> - </widget> - </item> - <item row="0" column="4"> - <layout class="QHBoxLayout" name="horizontalLayout"> - <property name="spacing"> - <number>0</number> - </property> - <item> - <widget class="QToolButton" name="findPrevButton"> - <property name="toolTip"> - <string>Press to find the previous occurrence</string> - </property> - </widget> - </item> - <item> - <widget class="QToolButton" name="findNextButton"> - <property name="toolTip"> - <string>Press to find the next occurrence</string> - </property> - </widget> - </item> - </layout> - </item> - <item row="1" column="0" colspan="5"> - <widget class="QLabel" name="infoLabel"> - <property name="text"> - <string/> - </property> - </widget> - </item> - </layout> - </widget> - <customwidgets> - <customwidget> - <class>E5ClearableComboBox</class> - <extends>QComboBox</extends> - <header>E5Gui/E5ComboBox.h</header> - </customwidget> - </customwidgets> - <tabstops> - <tabstop>findtextCombo</tabstop> - <tabstop>caseCheckBox</tabstop> - <tabstop>wordCheckBox</tabstop> - <tabstop>findPrevButton</tabstop> - <tabstop>findNextButton</tabstop> - </tabstops> - <resources/> - <connections/> -</ui>
--- a/UI/CodeDocumentationViewer.py Fri Nov 03 17:24:01 2017 +0100 +++ b/UI/CodeDocumentationViewer.py Sun Nov 05 11:35:32 2017 +0100 @@ -59,7 +59,7 @@ self.__contents.setObjectName("contents") self.__verticalLayout.addWidget(self.__contents) - self.__searchWidget = E5TextEditSearchWidget(self) + self.__searchWidget = E5TextEditSearchWidget(self, False) self.__searchWidget.setFocusPolicy(Qt.WheelFocus) self.__searchWidget.setObjectName("searchWidget") self.__verticalLayout.addWidget(self.__searchWidget) @@ -139,7 +139,7 @@ self.__contents.setUrl(QUrl("about:blank")) self.__verticalLayout.addWidget(self.__contents) - self.__searchWidget = E5TextEditSearchWidget(self) + self.__searchWidget = E5TextEditSearchWidget(self, False) self.__searchWidget.setFocusPolicy(Qt.WheelFocus) self.__searchWidget.setObjectName("searchWidget") self.__verticalLayout.addWidget(self.__searchWidget) @@ -222,14 +222,15 @@ self.verticalLayout.setObjectName("verticalLayout") self.verticalLayout.setContentsMargins(3, 3, 3, 3) - # top row of widgets - self.horizontalLayout = QHBoxLayout() - self.horizontalLayout.setObjectName("horizontalLayout") + # top row 1 of widgets + self.horizontalLayout1 = QHBoxLayout() + self.horizontalLayout1.setObjectName("horizontalLayout1") self.label = QLabel(self) self.label.setObjectName("label") self.label.setText(self.tr("Code Info Provider:")) - self.horizontalLayout.addWidget(self.label) + self.label.setAlignment(Qt.AlignRight | Qt.AlignVCenter) + self.horizontalLayout1.addWidget(self.label) self.providerComboBox = QComboBox(self) sizePolicy = QSizePolicy(QSizePolicy.Preferred, QSizePolicy.Fixed) @@ -243,12 +244,16 @@ self.providerComboBox.setToolTip( self.tr("Select the code info provider")) self.providerComboBox.addItem(self.tr("<disabled>"), "disabled") - self.horizontalLayout.addWidget(self.providerComboBox) + self.horizontalLayout1.addWidget(self.providerComboBox) + + # top row 2 of widgets + self.horizontalLayout2 = QHBoxLayout() + self.horizontalLayout2.setObjectName("horizontalLayout2") self.objectLineEdit = QLineEdit(self) self.objectLineEdit.setReadOnly(True) self.objectLineEdit.setObjectName("objectLineEdit") - self.horizontalLayout.addWidget(self.objectLineEdit) + self.horizontalLayout2.addWidget(self.objectLineEdit) self.__toolButton = E5ToolButton(self) self.__toolButton.setObjectName( @@ -276,9 +281,10 @@ self.__optionsActionGroup.addAction(self.__plainTextAct) self.__toolButton.setMenu(self.__optionsMenu) - self.horizontalLayout.addWidget(self.__toolButton) + self.horizontalLayout2.addWidget(self.__toolButton) - self.verticalLayout.addLayout(self.horizontalLayout) + self.verticalLayout.addLayout(self.horizontalLayout1) + self.verticalLayout.addLayout(self.horizontalLayout2) # Plain Text Viewer self.__plainTextViewer = PlainTextDocumentationViewer(self)
--- a/UI/data/codeDocumentationViewer_rc.py Fri Nov 03 17:24:01 2017 +0100 +++ b/UI/data/codeDocumentationViewer_rc.py Sun Nov 05 11:35:32 2017 +0100 @@ -343,7 +343,7 @@ \x00\x00\x00\x00\x00\x02\x00\x00\x00\x01\x00\x00\x00\x01\ \x00\x00\x00\x00\x00\x00\x00\x00\ \x00\x00\x00\x00\x00\x00\x00\x00\x00\x01\x00\x00\x00\x00\ -\x00\x00\x01\x5f\x3f\x12\x31\xf2\ +\x00\x00\x01\x5f\x87\xf0\xf7\x48\ " qt_version = QtCore.qVersion().split('.')
--- a/eric6.e4p Fri Nov 03 17:24:01 2017 +0100 +++ b/eric6.e4p Sun Nov 05 11:35:32 2017 +0100 @@ -1582,7 +1582,6 @@ <Form>E5Gui/E5ListSelectionDialog.ui</Form> <Form>E5Gui/E5SimpleHelpDialog.ui</Form> <Form>E5Gui/E5StringListEditWidget.ui</Form> - <Form>E5Gui/E5TextEditSearchWidget.ui</Form> <Form>E5Gui/E5ToolBarDialog.ui</Form> <Form>E5Gui/E5ZoomWidget.ui</Form> <Form>E5Network/E5NetworkHeaderDetailsDialog.ui</Form>
