Mercurial Repositories > eric / file diff

--- a/QScintilla/Shell.py	Sat Jun 30 15:51:40 2018 +0200
+++ b/QScintilla/Shell.py	Sat Jun 30 16:58:20 2018 +0200
@@ -20,7 +20,7 @@
 from PyQt5.QtCore import pyqtSignal, QFileInfo, Qt, QEvent
 from PyQt5.QtGui import QClipboard, QPalette, QFont
 from PyQt5.QtWidgets import QDialog, QInputDialog, QApplication, QMenu, \
-    QWidget, QHBoxLayout, QVBoxLayout, QShortcut
+    QWidget, QHBoxLayout, QVBoxLayout, QShortcut, QSizePolicy
 from PyQt5.Qsci import QsciScintilla
 
 from E5Gui.E5Application import e5App
@@ -56,6 +56,8 @@
         
         from UI.SearchWidget import SearchWidget
         self.__searchWidget = SearchWidget(self.__shell, self, horizontal)
+        self.__searchWidget.setSizePolicy(QSizePolicy.Fixed,
+                                          QSizePolicy.Preferred)
         self.__searchWidget.hide()
         
         if horizontal:
@@ -2048,15 +2050,16 @@
             self.addActions(self.vm.editorActGrp.actions())
             self.addActions(self.vm.copyActGrp.actions())
             self.addActions(self.vm.viewActGrp.actions())
-            self.__searchShortcut = QShortcut(
-                self.vm.searchAct.shortcut(), self,
-                self.__find, self.__find)
-            self.__searchNextShortcut = QShortcut(
-                self.vm.searchNextAct.shortcut(), self,
-                self.__searchNext, self.__searchNext)
-            self.__searchPrevShortcut = QShortcut(
-                self.vm.searchPrevAct.shortcut(), self,
-                self.__searchPrev, self.__searchPrev)
+            if not self.__windowed:
+                self.__searchShortcut = QShortcut(
+                    self.vm.searchAct.shortcut(), self,
+                    self.__find, self.__find)
+                self.__searchNextShortcut = QShortcut(
+                    self.vm.searchNextAct.shortcut(), self,
+                    self.__searchNext, self.__searchNext)
+                self.__searchPrevShortcut = QShortcut(
+                    self.vm.searchPrevAct.shortcut(), self,
+                    self.__searchPrev, self.__searchPrev)
         
         try:
             self.vm.editActGrp.setEnabled(False)
@@ -2066,9 +2069,10 @@
             self.vm.searchActGrp.setEnabled(False)
         except AttributeError:
             pass
-        self.__searchShortcut.setEnabled(True)
-        self.__searchNextShortcut.setEnabled(True)
-        self.__searchPrevShortcut.setEnabled(True)
+        if not self.__windowed:
+            self.__searchShortcut.setEnabled(True)
+            self.__searchNextShortcut.setEnabled(True)
+            self.__searchPrevShortcut.setEnabled(True)
         self.setCaretWidth(self.caretWidth)
         self.setCursorFlashTime(QApplication.cursorFlashTime())
         
@@ -2084,9 +2088,10 @@
             self.vm.editorActGrp.setEnabled(False)
         except AttributeError:
             pass
-        self.__searchShortcut.setEnabled(False)
-        self.__searchNextShortcut.setEnabled(False)
-        self.__searchPrevShortcut.setEnabled(False)
+        if not self.__windowed:
+            self.__searchShortcut.setEnabled(False)
+            self.__searchNextShortcut.setEnabled(False)
+            self.__searchPrevShortcut.setEnabled(False)
         self.setCaretWidth(0)
         super(Shell, self).focusOutEvent(event)
         
@@ -2138,7 +2143,7 @@
         """
         self.__lastSearch = (txt, caseSensitive, wholeWord)
         ok = self.findFirst(
-            txt, False, caseSensitive, wholeWord, False, forward=True)
+            txt, False, caseSensitive, wholeWord, True, forward=True)
         self.searchStringFound.emit(ok)
     
     def __searchPrev(self):
@@ -2164,7 +2169,7 @@
         else:
             line, index = -1, -1
         ok = self.findFirst(
-            txt, False, caseSensitive, wholeWord, False,
+            txt, False, caseSensitive, wholeWord, True,
             forward=False, line=line, index=index)
         self.searchStringFound.emit(ok)