Mercurial Repositories > eric / changeset

--- a/Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.py	Sat Jan 17 14:20:09 2015 +0100
+++ b/Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.py	Sat Jan 17 14:34:26 2015 +0100
@@ -28,7 +28,6 @@
 import Preferences
 
 
-# TODO: add simple search functionality (s. LogViewer)
 class HgDiffDialog(QWidget, Ui_HgDiffDialog):
     """
     Class implementing a dialog to show the output of the hg diff command
@@ -47,6 +46,8 @@
         self.buttonBox.button(QDialogButtonBox.Save).setEnabled(False)
         self.buttonBox.button(QDialogButtonBox.Close).setDefault(True)
         
+        self.searchWidget.attachTextEdit(self.contents)
+        
         self.process = QProcess()
         self.vcs = vcs
         self.__hgClient = self.vcs.getClient()

--- a/Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.ui	Sat Jan 17 14:20:09 2015 +0100
+++ b/Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.ui	Sat Jan 17 14:34:26 2015 +0100
@@ -30,6 +30,13 @@
        <widget class="QComboBox" name="filesCombo"/>
       </item>
       <item>
+       <widget class="E5TextEditSearchWidget" name="searchWidget" native="true">
+        <property name="focusPolicy">
+         <enum>Qt::WheelFocus</enum>
+        </property>
+       </widget>
+      </item>
+      <item>
        <widget class="QTextEdit" name="contents">
         <property name="whatsThis">
          <string>&lt;b&gt;Mercurial Diff&lt;/b&gt;&lt;p&gt;This shows the output of the hg diff command.&lt;/p&gt;</string>
@@ -146,14 +153,22 @@
    </item>
   </layout>
  </widget>
+ <customwidgets>
+  <customwidget>
+   <class>E5TextEditSearchWidget</class>
+   <extends>QWidget</extends>
+   <header>E5Gui/E5TextEditSearchWidget.h</header>
+   <container>1</container>
+  </customwidget>
+ </customwidgets>
  <tabstops>
   <tabstop>filesCombo</tabstop>
+  <tabstop>searchWidget</tabstop>
   <tabstop>contents</tabstop>
   <tabstop>errors</tabstop>
   <tabstop>input</tabstop>
   <tabstop>passwordCheckBox</tabstop>
   <tabstop>sendButton</tabstop>
-  <tabstop>buttonBox</tabstop>
  </tabstops>
  <resources/>
  <connections>

--- a/Plugins/VcsPlugins/vcsPySvn/SvnDiffDialog.py	Sat Jan 17 14:20:09 2015 +0100
+++ b/Plugins/VcsPlugins/vcsPySvn/SvnDiffDialog.py	Sat Jan 17 14:34:26 2015 +0100
@@ -29,7 +29,6 @@
 import Preferences
 
 
-# TODO: add simple search functionality (s. LogViewer)
 class SvnDiffDialog(QWidget, SvnDialogMixin, Ui_SvnDiffDialog):
     """
     Class implementing a dialog to show the output of the svn diff command.
@@ -49,6 +48,8 @@
         self.buttonBox.button(QDialogButtonBox.Close).setEnabled(False)
         self.buttonBox.button(QDialogButtonBox.Cancel).setDefault(True)
         
+        self.searchWidget.attachTextEdit(self.contents)
+        
         self.vcs = vcs
         
         font = Preferences.getEditorOtherFonts("MonospacedFont")

--- a/Plugins/VcsPlugins/vcsPySvn/SvnDiffDialog.ui	Sat Jan 17 14:20:09 2015 +0100
+++ b/Plugins/VcsPlugins/vcsPySvn/SvnDiffDialog.ui	Sat Jan 17 14:34:26 2015 +0100
@@ -30,6 +30,13 @@
        <widget class="QComboBox" name="filesCombo"/>
       </item>
       <item>
+       <widget class="E5TextEditSearchWidget" name="searchWidget" native="true">
+        <property name="focusPolicy">
+         <enum>Qt::WheelFocus</enum>
+        </property>
+       </widget>
+      </item>
+      <item>
        <widget class="QTextEdit" name="contents">
         <property name="whatsThis">
          <string>&lt;b&gt;Subversion Diff&lt;/b&gt;&lt;p&gt;This shows the output of the svn diff command.&lt;/p&gt;</string>
@@ -88,11 +95,19 @@
    </item>
   </layout>
  </widget>
+ <customwidgets>
+  <customwidget>
+   <class>E5TextEditSearchWidget</class>
+   <extends>QWidget</extends>
+   <header>E5Gui/E5TextEditSearchWidget.h</header>
+   <container>1</container>
+  </customwidget>
+ </customwidgets>
  <tabstops>
   <tabstop>filesCombo</tabstop>
+  <tabstop>searchWidget</tabstop>
   <tabstop>contents</tabstop>
   <tabstop>errors</tabstop>
-  <tabstop>buttonBox</tabstop>
  </tabstops>
  <resources/>
  <connections/>

--- a/Plugins/VcsPlugins/vcsSubversion/SvnDiffDialog.py	Sat Jan 17 14:20:09 2015 +0100
+++ b/Plugins/VcsPlugins/vcsSubversion/SvnDiffDialog.py	Sat Jan 17 14:34:26 2015 +0100
@@ -29,7 +29,6 @@
 import Preferences
 
 
-# TODO: add simple search functionality (s. LogViewer)
 class SvnDiffDialog(QWidget, Ui_SvnDiffDialog):
     """
     Class implementing a dialog to show the output of the svn diff command
@@ -48,6 +47,8 @@
         self.buttonBox.button(QDialogButtonBox.Save).setEnabled(False)
         self.buttonBox.button(QDialogButtonBox.Close).setDefault(True)
         
+        self.searchWidget.attachTextEdit(self.contents)
+        
         self.process = QProcess()
         self.vcs = vcs
         

--- a/Plugins/VcsPlugins/vcsSubversion/SvnDiffDialog.ui	Sat Jan 17 14:20:09 2015 +0100
+++ b/Plugins/VcsPlugins/vcsSubversion/SvnDiffDialog.ui	Sat Jan 17 14:34:26 2015 +0100
@@ -30,6 +30,13 @@
        <widget class="QComboBox" name="filesCombo"/>
       </item>
       <item>
+       <widget class="E5TextEditSearchWidget" name="searchWidget" native="true">
+        <property name="focusPolicy">
+         <enum>Qt::WheelFocus</enum>
+        </property>
+       </widget>
+      </item>
+      <item>
        <widget class="QTextEdit" name="contents">
         <property name="whatsThis">
          <string>&lt;b&gt;Subversion Diff&lt;/b&gt;&lt;p&gt;This shows the output of the svn diff command.&lt;/p&gt;</string>
@@ -146,14 +153,22 @@
    </item>
   </layout>
  </widget>
+ <customwidgets>
+  <customwidget>
+   <class>E5TextEditSearchWidget</class>
+   <extends>QWidget</extends>
+   <header>E5Gui/E5TextEditSearchWidget.h</header>
+   <container>1</container>
+  </customwidget>
+ </customwidgets>
  <tabstops>
   <tabstop>filesCombo</tabstop>
+  <tabstop>searchWidget</tabstop>
   <tabstop>contents</tabstop>
   <tabstop>errors</tabstop>
   <tabstop>input</tabstop>
   <tabstop>passwordCheckBox</tabstop>
   <tabstop>sendButton</tabstop>
-  <tabstop>buttonBox</tabstop>
  </tabstops>
  <resources/>
  <connections>

--- a/UI/DiffDialog.py	Sat Jan 17 14:20:09 2015 +0100
+++ b/UI/DiffDialog.py	Sat Jan 17 14:34:26 2015 +0100
@@ -200,7 +200,6 @@
                         yield prefixmap[tag] + line
 
 
-# TODO: add simple search functionality (s. LogViewer)
 class DiffDialog(QWidget, Ui_DiffDialog):
     """
     Class implementing a dialog to compare two files.

--- a/UI/DiffDialog.ui	Sat Jan 17 14:20:09 2015 +0100
+++ b/UI/DiffDialog.ui	Sat Jan 17 14:34:26 2015 +0100
@@ -125,7 +125,11 @@
     </widget>
    </item>
    <item>
-    <widget class="E5TextEditSearchWidget" name="searchWidget" native="true"/>
+    <widget class="E5TextEditSearchWidget" name="searchWidget" native="true">
+     <property name="focusPolicy">
+      <enum>Qt::WheelFocus</enum>
+     </property>
+    </widget>
    </item>
    <item>
     <widget class="QTextEdit" name="contents">

--- a/changelog	Sat Jan 17 14:20:09 2015 +0100
+++ b/changelog	Sat Jan 17 14:34:26 2015 +0100
@@ -10,6 +10,9 @@
 - Tools
   -- Diff Dialog
      --- added capability to search in the output
+- Version Control System Interfaces
+  -- All
+     --- added capability to search in the output of Diff dialogs
 
 Version 6.0.0:
 - bug fixes