Merge lp:~sinzui/ubuntu/quantal/gedit-developer-plugins/0.5.15 into lp:ubuntu/quantal/gedit-developer-plugins

[Curtis Hovey]

Update the package to the current release of 0.5.15. The release Fixes a few bugs in the the find panel and introduces a new UI for the find panel.

[Martin Pitt (pitti)]

Thanks! Merged with fixing LP: # syntax in debian/changelog.

review: Approve

=== modified file 'ChangeLog'
--- ChangeLog	2012-03-30 14:24:59 +0000
+++ ChangeLog	2012-06-18 13:32:54 +0000
@@ -1,5 +1,44 @@
 <Generated by bzr log --log-format=gnu>
 
[phone]  Curtis Hovey <[e-mail]>
+
+	[579] Increment version.
+
[phone]  Curtis Hovey <[e-mail]>
+
+	[578] Show relative path in find results.
+
[phone]  Curtis Hovey <[e-mail]>
+
+	[577] Do not mutate gsettings.
+
[phone]  Curtis Hovey <[e-mail]>
+
+	[576] Use the FileChooserDialog to set the directory to find in.
+
[phone]  Curtis Hovey <[e-mail]>
+
+	[575] Extend object.
+
[phone]  Curtis Hovey <[e-mail]>
+
+	[574] Warn when the directory path does not exist. Convert the path
+	from a uri to a directory path.
+
[phone]  Curtis Hovey <[e-mail]>
+
+	[573] Added on_replace_in_files_icon_press for substituion entry.
+
[phone]  Curtis Hovey <[e-mail]>
+
+	[572] Introduce on_find_in_files_icon_press to handle the icon-press
+	event from the entry.
+
[phone]  Curtis Hovey <[e-mail]>
+
+	[571] Quick glade hack to make the panel use less space by using
+	secondary icons instead buttons.
+
 2012-03-29  Curtis Hovey <[e-mail]>
 
 	[570] Do not look for missing in a branch without a parent.
 
=== modified file 'configure'
--- configure	2012-03-30 14:24:59 +0000
+++ configure	2012-06-18 13:32:54 +0000
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.68 for gedit-developer-plugins 0.5.14.
+# Generated by GNU Autoconf 2.68 for gedit-developer-plugins 0.5.15.
 #
 # Report bugs to <[e-mail]>.
 #
@@ -560,8 +560,8 @@
 # Identity of this package.
 PACKAGE_NAME='gedit-developer-plugins'
 PACKAGE_TARNAME='gedit-developer-plugins'
-PACKAGE_VERSION='0.5.14'
-PACKAGE_STRING='gedit-developer-plugins 0.5.14'
+PACKAGE_VERSION='0.5.15'
+PACKAGE_STRING='gedit-developer-plugins 0.5.15'
 PACKAGE_BUGREPORT='[e-mail]'
 PACKAGE_URL=''
 
@@ -1319,7 +1319,7 @@
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-\`configure' configures gedit-developer-plugins 0.5.14 to adapt to many kinds of systems.
+\`configure' configures gedit-developer-plugins 0.5.15 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1386,7 +1386,7 @@
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of gedit-developer-plugins 0.5.14:";;
+     short | recursive ) echo "Configuration of gedit-developer-plugins 0.5.15:";;
    esac
   cat <<\_ACEOF
 
@@ -1491,7 +1491,7 @@
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-gedit-developer-plugins configure 0.5.14
+gedit-developer-plugins configure 0.5.15
 generated by GNU Autoconf 2.68
 
 Copyright (C) 2010 Free Software Foundation, Inc.
@@ -1860,7 +1860,7 @@
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by gedit-developer-plugins $as_me 0.5.14, which was
+It was created by gedit-developer-plugins $as_me 0.5.15, which was
 generated by GNU Autoconf 2.68.  Invocation command line was
 
   $ $0 $@
@@ -2675,7 +2675,7 @@
 
 # Define the identity of the package.
  PACKAGE='gedit-developer-plugins'
- VERSION='0.5.14'
+ VERSION='0.5.15'
 
 
 cat >>confdefs.h <<_ACEOF
@@ -6525,7 +6525,7 @@
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
-This file was extended by gedit-developer-plugins $as_me 0.5.14, which was
+This file was extended by gedit-developer-plugins $as_me 0.5.15, which was
 generated by GNU Autoconf 2.68.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -6582,7 +6582,7 @@
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
 ac_cs_version="\\
-gedit-developer-plugins config.status 0.5.14
+gedit-developer-plugins config.status 0.5.15
 configured by $0, generated by GNU Autoconf 2.68,
   with options \\"\$ac_cs_config\\"
 
 
=== modified file 'configure.ac'
--- configure.ac	2012-03-30 14:24:59 +0000
+++ configure.ac	2012-06-18 13:32:54 +0000
@@ -4,7 +4,7 @@
 
 m4_define(gdp_major_version, 0)
 m4_define(gdp_minor_version, 5)
-m4_define(gdp_micro_version, 14)
+m4_define(gdp_micro_version, 15)
 m4_define(gdp_version, gdp_major_version.gdp_minor_version.gdp_micro_version)
 
 AC_INIT(gedit-developer-plugins, gdp_version, [e-mail])
 
=== modified file 'debian/changelog'
--- debian/changelog	2012-03-30 14:30:40 +0000
+++ debian/changelog	2012-06-18 13:32:54 +0000
@@ -1,3 +1,9 @@
+gedit-developer-plugins (0.5.15-0ubuntu1) quantal; urgency=low
+
+  * New upstream release. Fixes LP:#990561, LP:#990585, LP:#990688
+
+ -- Curtis C. Hovey <[e-mail]>  Mon, 18 Jun 2012 09:25:07 -0400
+
 gedit-developer-plugins (0.5.14-0ubuntu1) precise; urgency=low
 
   * New upstream bug-fix release.
 
=== modified file 'plugins/gdp/__init__.py'
--- plugins/gdp/__init__.py	2012-03-12 13:04:13 +0000
+++ plugins/gdp/__init__.py	2012-06-18 13:32:54 +0000
@@ -147,7 +147,13 @@
     text = model.get_value(piter, 3)
     if text is None:
         if cell_type == 'text':
-            cell.props.text = file_path
+            relative_file_path = file_path
+            base_dir = model.get_value(piter, 4)
+            if base_dir:
+                if base_dir[-1] != '/':
+                    base_dir = '%s/' % base_dir
+                relative_file_path = file_path.replace(base_dir, './')
+            cell.props.text = relative_file_path
         else:
             # cell_type == 'line_no'
             cell.props.text = ''
 
=== modified file 'plugins/gdp/find.py'
--- plugins/gdp/find.py	2012-03-12 13:04:13 +0000
+++ plugins/gdp/find.py	2012-06-18 13:32:54 +0000
@@ -247,8 +247,13 @@
     def ui_callbacks(self):
         """The dict of callbacks for the ui widgets."""
         return {
+            'on_choose_directory_icon_press':
+                self.on_choose_directory_icon_press,
             'on_find_in_files': self.on_find_in_files,
+            'on_find_in_files_icon_press': self.on_find_in_files_icon_press,
             'on_replace_in_files': self.on_replace_in_files,
+            'on_replace_in_files_icon_press':
+                self.on_replace_in_files_icon_press,
             'on_save_results': self.on_save_results,
             }
 
@@ -272,7 +277,8 @@
             path_ = '.'
         elif path_ == self.CURRENT_FILE:
             document = self.active_document
-            path_ = os.path.dirname(document.get_uri_for_display())
+            path_ = document.get_uri_for_display().replace('file://', '')
+            path_ = os.path.dirname(path_)
         return path_
 
     @property
@@ -323,11 +329,31 @@
             self.widgets.get_object('match_case_checkbox').get_active(),
             self.file_pattern)
 
+    def on_choose_directory_icon_press(self, widget, position, event):
+        """Choose a directory using a dialog."""
+        dialog = Gtk.FileChooserDialog(
+            title="Choose a directory to find in", parent=self.window,
+            action=Gtk.FileChooserAction.SELECT_FOLDER,
+            buttons=(Gtk.STOCK_CANCEL, Gtk.ResponseType.CANCEL,
+                     Gtk.STOCK_OPEN, Gtk.ResponseType.ACCEPT))
+        dialog.set_current_folder(os.getcwd())
+        if dialog.run() == Gtk.ResponseType.ACCEPT:
+            path = dialog.get_filename()
+            if path:
+                self.path_comboentry.get_child().set_text(path)
+        dialog.destroy()
+
     def on_find_in_files(self, widget=None, substitution=None):
         """Find and present the matches."""
         treestore = self.file_lines_view.get_model()
         treestore.clear()
         find_params = self.get_find_params()
+        if (find_params.path != self.CURRENT_FILE
+            and not os.path.exists(find_params.path)):
+            message = 'The directory path does not exist!'
+            self.file_lines_view.get_model().append(
+                    None, (message, 'stock_dialog-info', 0, None, None))
+            return
         self.last_find = find_params
         pattern = find_params.pattern
         self.save_find_data()
@@ -339,6 +365,10 @@
         # of this method.
         GObject.idle_add(find_worker.start)
 
+    def on_find_in_files_icon_press(self, widget, position, event):
+        """Handle find pattern entry icon-press event."""
+        self.on_find_in_files()
+
     def on_find_complete(self):
         if self.path_comboentry.get_active_text() == self.CURRENT_FILE:
             self.file_lines_view.expand_all()
@@ -394,6 +424,10 @@
         elif response == Gtk.ResponseType.ACCEPT:
             self.on_find_in_files(substitution=substitution)
 
+    def on_replace_in_files_icon_press(self, widget, position, event):
+        """Handle replace pattern entry icon-press event."""
+        self.on_replace_in_files()
+
     def on_save_results(self, widget=None):
         """Save the search results to a file."""
         dialog = Gtk.FileChooserDialog(
 
=== modified file 'plugins/gdp/find.ui'
--- plugins/gdp/find.ui	2012-03-12 13:04:13 +0000
+++ plugins/gdp/find.ui	2012-06-18 13:32:54 +0000
@@ -13,128 +13,24 @@
         <property name="orientation">vertical</property>
         <property name="spacing">2</property>
         <child>
-          <object class="GtkGrid" id="find_controls">
+          <object class="GtkComboBoxText" id="path_comboentry">
             <property name="visible">True</property>
             <property name="can_focus">False</property>
-            <property name="row_spacing">6</property>
-            <property name="column_spacing">6</property>
-            <child>
-              <object class="GtkLabel" id="path_label">
-                <property name="visible">True</property>
-                <property name="can_focus">False</property>
-                <property name="xalign">0</property>
-                <property name="ypad">5</property>
-                <property name="label" translatable="yes">Look in:     </property>
-              </object>
-              <packing>
-                <property name="left_attach">0</property>
-                <property name="top_attach">0</property>
-                <property name="width">1</property>
-                <property name="height">1</property>
-              </packing>
-            </child>
-            <child>
-              <object class="GtkLabel" id="match_label">
-                <property name="visible">True</property>
-                <property name="can_focus">False</property>
-                <property name="label" translatable="yes">Search for:</property>
-              </object>
-              <packing>
-                <property name="left_attach">0</property>
-                <property name="top_attach">1</property>
-                <property name="width">1</property>
-                <property name="height">1</property>
-              </packing>
-            </child>
-            <child>
-              <object class="GtkBox" id="hbox1">
-                <property name="visible">True</property>
-                <property name="can_focus">False</property>
-                <property name="spacing">6</property>
-                <child>
-                  <object class="GtkComboBoxText" id="pattern_comboentry">
-                    <property name="visible">True</property>
-                    <property name="can_focus">False</property>
-                    <property name="has_tooltip">True</property>
-                    <property name="tooltip_markup" translatable="yes">The plain text or Python regular expression to find in files.</property>
-                    <property name="tooltip_text" translatable="yes">The plain text or Python regular expression to find in files.</property>
-                    <property name="has_entry">True</property>
-                    <child internal-child="entry">
-                      <object class="GtkEntry" id="comboboxtext-entry3">
-                        <property name="can_focus">True</property>
-                        <property name="invisible_char">•</property>
-                        <signal name="activate" handler="on_find_in_files" swapped="no"/>
-                      </object>
-                    </child>
-                  </object>
-                  <packing>
-                    <property name="expand">True</property>
-                    <property name="fill">True</property>
-                    <property name="position">0</property>
-                  </packing>
-                </child>
-                <child>
-                  <object class="GtkButton" id="find_in_files_button">
-                    <property name="label" translatable="yes">   Find   </property>
-                    <property name="use_action_appearance">False</property>
-                    <property name="visible">True</property>
-                    <property name="can_focus">True</property>
-                    <property name="receives_default">True</property>
-                    <property name="use_action_appearance">False</property>
-                    <signal name="clicked" handler="on_find_in_files" swapped="no"/>
-                  </object>
-                  <packing>
-                    <property name="expand">False</property>
-                    <property name="fill">True</property>
-                    <property name="position">1</property>
-                  </packing>
-                </child>
-              </object>
-              <packing>
-                <property name="left_attach">1</property>
-                <property name="top_attach">1</property>
-                <property name="width">1</property>
-                <property name="height">1</property>
-              </packing>
-            </child>
-            <child>
-              <object class="GtkComboBoxText" id="path_comboentry">
-                <property name="visible">True</property>
-                <property name="can_focus">False</property>
-                <property name="has_tooltip">True</property>
-                <property name="tooltip_markup" translatable="yes">The directory to start searching in.</property>
-                <property name="tooltip_text" translatable="yes">The directory to start searching in.</property>
-                <property name="hexpand">True</property>
-                <property name="has_entry">True</property>
-                <child internal-child="entry">
-                  <object class="GtkEntry" id="comboboxtext-entry4">
-                    <property name="can_focus">True</property>
-                    <property name="invisible_char">•</property>
-                    <signal name="activate" handler="on_find_in_files" swapped="no"/>
-                  </object>
-                </child>
-              </object>
-              <packing>
-                <property name="left_attach">1</property>
-                <property name="top_attach">0</property>
-                <property name="width">1</property>
-                <property name="height">1</property>
-              </packing>
-            </child>
-            <child>
-              <placeholder/>
-            </child>
-            <child>
-              <placeholder/>
-            </child>
-            <child>
-              <placeholder/>
-            </child>
-            <child>
-              <placeholder/>
-            </child>
-            <child>
-              <placeholder/>
+            <property name="has_tooltip">True</property>
+            <property name="tooltip_markup" translatable="yes">The directory to start searching in.</property>
+            <property name="tooltip_text" translatable="yes">The directory to start searching in.</property>
+            <property name="hexpand">True</property>
+            <property name="has_entry">True</property>
+            <child internal-child="entry">
+              <object class="GtkEntry" id="comboboxtext-entry4">
+                <property name="can_focus">True</property>
+                <property name="invisible_char">•</property>
+                <property name="primary_icon_stock">gtk-directory</property>
+                <property name="secondary_icon_activatable">False</property>
+                <property name="secondary_icon_sensitive">False</property>
+                <signal name="activate" handler="on_find_in_files" swapped="no"/>
+                <signal name="icon-press" handler="on_choose_directory_icon_press" swapped="no"/>
+              </object>
             </child>
           </object>
           <packing>
@@ -144,6 +40,35 @@
           </packing>
         </child>
         <child>
+          <object class="GtkComboBoxText" id="pattern_comboentry">
+            <property name="visible">True</property>
+            <property name="can_focus">False</property>
+            <property name="has_tooltip">True</property>
+            <property name="tooltip_markup" translatable="yes">The plain text or Python regular expression to find in files.</property>
+            <property name="tooltip_text" translatable="yes">The plain text or Python regular expression to find in files.</property>
+            <property name="has_entry">True</property>
+            <property name="entry_text_column">0</property>
+            <property name="id_column">1</property>
+            <child internal-child="entry">
+              <object class="GtkEntry" id="comboboxtext-entry">
+                <property name="can_focus">True</property>
+                <property name="invisible_char">•</property>
+                <property name="primary_icon_stock">gtk-find</property>
+                <property name="secondary_icon_stock">gtk-refresh</property>
+                <property name="primary_icon_activatable">False</property>
+                <property name="placeholder_text">Matching text</property>
+                <signal name="activate" handler="on_find_in_files" swapped="no"/>
+                <signal name="icon-press" handler="on_find_in_files_icon_press" swapped="no"/>
+              </object>
+            </child>
+          </object>
+          <packing>
+            <property name="expand">False</property>
+            <property name="fill">True</property>
+            <property name="position">1</property>
+          </packing>
+        </child>
+        <child>
           <object class="GtkExpander" id="options">
             <property name="visible">True</property>
             <property name="can_focus">True</property>
@@ -193,42 +118,22 @@
                   </packing>
                 </child>
                 <child>
-                  <object class="GtkBox" id="hbox4">
+                  <object class="GtkComboBoxText" id="file_comboentry">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
-                    <property name="spacing">6</property>
-                    <child>
-                      <object class="GtkLabel" id="file_name_label">
-                        <property name="visible">True</property>
-                        <property name="can_focus">False</property>
-                        <property name="label" translatable="yes">File name pattern:</property>
-                      </object>
-                      <packing>
-                        <property name="expand">False</property>
-                        <property name="fill">True</property>
-                        <property name="position">0</property>
-                      </packing>
-                    </child>
-                    <child>
-                      <object class="GtkComboBoxText" id="file_comboentry">
-                        <property name="visible">True</property>
-                        <property name="can_focus">False</property>
-                        <property name="has_entry">True</property>
-                        <child internal-child="entry">
-                          <object class="GtkEntry" id="comboboxtext-entry25">
-                            <property name="can_focus">True</property>
-                            <property name="tooltip_text" translatable="yes">A regular expression pattern used to match the directory or file name.
+                    <property name="has_entry">True</property>
+                    <child internal-child="entry">
+                      <object class="GtkEntry" id="comboboxtext-entry25">
+                        <property name="can_focus">True</property>
+                        <property name="tooltip_text" translatable="yes">A regular expression pattern used to match the directory or file name.
 eg. py or tests/ or \.(py|html)$</property>
-                            <property name="invisible_char">•</property>
-                            <signal name="activate" handler="on_find_in_files" swapped="no"/>
-                          </object>
-                        </child>
+                        <property name="invisible_char">•</property>
+                        <property name="primary_icon_stock">gtk-file</property>
+                        <property name="secondary_icon_activatable">False</property>
+                        <property name="secondary_icon_sensitive">False</property>
+                        <property name="placeholder_text">File name pattern</property>
+                        <signal name="activate" handler="on_find_in_files" swapped="no"/>
                       </object>
-                      <packing>
-                        <property name="expand">True</property>
-                        <property name="fill">True</property>
-                        <property name="position">1</property>
-                      </packing>
                     </child>
                   </object>
                   <packing>
@@ -250,7 +155,7 @@
           <packing>
             <property name="expand">False</property>
             <property name="fill">True</property>
-            <property name="position">1</property>
+            <property name="position">2</property>
           </packing>
         </child>
         <child>
@@ -274,7 +179,7 @@
           <packing>
             <property name="expand">True</property>
             <property name="fill">True</property>
-            <property name="position">2</property>
+            <property name="position">3</property>
           </packing>
         </child>
         <child>
@@ -288,64 +193,26 @@
                 <property name="orientation">vertical</property>
                 <property name="spacing">6</property>
                 <child>
-                  <object class="GtkBox" id="hbox5">
+                  <object class="GtkComboBoxText" id="substitution_comboentry">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
-                    <property name="spacing">6</property>
-                    <child>
-                      <object class="GtkLabel" id="label2">
-                        <property name="visible">True</property>
-                        <property name="can_focus">False</property>
-                        <property name="label" translatable="yes">Replace with:</property>
-                      </object>
-                      <packing>
-                        <property name="expand">False</property>
-                        <property name="fill">False</property>
-                        <property name="position">0</property>
-                      </packing>
-                    </child>
-                    <child>
-                      <object class="GtkComboBoxText" id="substitution_comboentry">
-                        <property name="visible">True</property>
-                        <property name="can_focus">False</property>
-                        <property name="has_tooltip">True</property>
-                        <property name="tooltip_markup" translatable="yes">The text to replace each found match with.
-The replacement may use backslash escapes to access groups in match expression</property>
-                        <property name="tooltip_text" translatable="yes">The text to replace each found match with.
-The replacement may use backslash escapes to access groups in match expression</property>
-                        <property name="has_entry">True</property>
-                        <child internal-child="entry">
-                          <object class="GtkEntry" id="comboboxtext-entry23">
-                            <property name="can_focus">True</property>
-                            <property name="invisible_char">•</property>
-                          </object>
-                        </child>
-                      </object>
-                      <packing>
-                        <property name="expand">True</property>
-                        <property name="fill">True</property>
-                        <property name="position">1</property>
-                      </packing>
-                    </child>
-                    <child>
-                      <object class="GtkButton" id="replace_in_files_button">
-                        <property name="label" translatable="yes">Replace</property>
-                        <property name="use_action_appearance">False</property>
-                        <property name="visible">True</property>
+                    <property name="has_tooltip">True</property>
+                    <property name="tooltip_markup" translatable="yes">The text to replace each found match with.
+The replacement may use backslash escapes to access groups in match expression</property>
+                    <property name="tooltip_text" translatable="yes">The text to replace each found match with.
+The replacement may use backslash escapes to access groups in match expression</property>
+                    <property name="has_entry">True</property>
+                    <child internal-child="entry">
+                      <object class="GtkEntry" id="comboboxtext-entry23">
                         <property name="can_focus">True</property>
-                        <property name="receives_default">True</property>
-                        <property name="has_tooltip">True</property>
-                        <property name="tooltip_markup" translatable="yes">Replace the matched text.</property>
-                        <property name="tooltip_text" translatable="yes">Replace the matched text.</property>
-                        <property name="use_action_appearance">False</property>
-                        <signal name="clicked" handler="on_replace_in_files" swapped="no"/>
+                        <property name="invisible_char">•</property>
+                        <property name="primary_icon_stock">gtk-find-and-replace</property>
+                        <property name="secondary_icon_stock">gtk-refresh</property>
+                        <property name="primary_icon_activatable">False</property>
+                        <property name="placeholder_text">Replacement text</property>
+                        <signal name="activate" handler="on_replace_in_files" swapped="no"/>
+                        <signal name="icon-press" handler="on_replace_in_files_icon_press" swapped="no"/>
                       </object>
-                      <packing>
-                        <property name="expand">False</property>
-                        <property name="fill">False</property>
-                        <property name="pack_type">end</property>
-                        <property name="position">2</property>
-                      </packing>
                     </child>
                   </object>
                   <packing>
@@ -400,7 +267,7 @@
             <property name="expand">False</property>
             <property name="fill">True</property>
             <property name="padding">6</property>
-            <property name="position">3</property>
+            <property name="position">4</property>
           </packing>
         </child>
       </object>
 
=== modified file 'plugins/gdp/tests/test_find.py'
--- plugins/gdp/tests/test_find.py	2012-03-12 13:04:13 +0000
+++ plugins/gdp/tests/test_find.py	2012-06-18 13:32:54 +0000
@@ -13,7 +13,10 @@
     Finder,
     FinderWorker,
     )
-from testing import GeditTestCase
+from testing import (
+    GeditTestCase,
+    MockMethod,
+    )
 
 
 class TestCallback:
@@ -182,6 +185,39 @@
         self.assertEqual(['one', 'three', 'two'], words)
         self.assertEqual('two', comboentry.get_active_text())
 
+    def test_path(self):
+        self.make_config(find, Config)
+        window, view, document = self.make_gedit(
+            'plugins/gdp/data/snark12.txt')
+        finder = Finder(window)
+        finder.update_comboentry(
+            finder.path_comboentry, '/fnord/pting', True)
+        self.assertEqual('/fnord/pting', finder.path)
+        finder.update_comboentry(
+            finder.path_comboentry, '<Working Directory>', True)
+        self.assertEqual('.', finder.path)
+        finder.update_comboentry(
+            finder.path_comboentry, '<Current File>', True)
+        self.assertIs(False, finder.path.startswith('file://'))
+        self.assertIs(True, finder.path.endswith('plugins/gdp/data'))
+
+    def test_file_pattern(self):
+        self.make_config(find, Config)
+        window, view, document = self.make_gedit(
+            'plugins/gdp/data/snark12.txt')
+        finder = Finder(window)
+        finder.update_comboentry(
+            finder.file_comboentry, 'txt', True)
+        self.assertEqual('txt', finder.file_pattern)
+        finder.update_comboentry(
+            finder.file_comboentry, '<Any Text File>', True)
+        self.assertEqual('.', finder.file_pattern)
+        finder.update_comboentry(
+            finder.path_comboentry, '<Current File>', True)
+        finder.update_comboentry(
+            finder.file_comboentry, 'ignored', True)
+        self.assertEqual('snark12.txt', finder.file_pattern)
+
     def test_save_find_data(self):
         # Setup a test config so that the singleton is not mutated.
         file_ = self.make_config(find, Config)
@@ -210,6 +246,23 @@
         self.assertIn('matches = eleven\n', config_data)
         self.assertNotIn('\t.\n', config_data)
 
+    def test_on_choose_directory_icon_press(self):
+        # Setup a test config so that the singleton is not mutated.
+        self.make_config(find, Config)
+        window, view, document = self.make_gedit(
+            'plugins/gdp/data/snark12.txt')
+        finder = Finder(window)
+        expected_path = os.path.abspath('plugins/gdp/data/snark12.txt')
+        MockMethod.bind(
+            self, Gtk.FileChooserDialog, 'run', Gtk.ResponseType.ACCEPT)
+        MockMethod.bind(
+            self, Gtk.FileChooserDialog, 'get_filename', expected_path)
+        finder.on_choose_directory_icon_press(
+            finder.path_comboentry, Gtk.EntryIconPosition.SECONDARY, None)
+        self.assertIs(True, Gtk.FileChooserDialog.run.called)
+        self.assertEqual(
+            expected_path, finder.path_comboentry.get_active_text())
+
     def test_on_find_in_files(self):
         # Setup a test config so that the singleton is not mutated.
         file_ = self.make_config(find, Config)
@@ -226,6 +279,37 @@
             finder.file_lines_view.get_column(0).props.title)
         self.assertIn('matches = snark\n', file_.read())
 
+    def test_on_find_in_files_icon_press(self):
+        # Setup a test config so that the singleton is not mutated.
+        self.make_config(find, Config)
+        window, view, document = self.make_gedit(
+            'plugins/gdp/data/snark12.txt')
+        finder = Finder(window)
+        finder.update_comboentry(finder.pattern_comboentry, 'snark', True)
+        finder.update_comboentry(
+            finder.path_comboentry, '<Current File>', True)
+        MockMethod.bind(self, finder, 'on_find_in_files')
+        finder.on_find_in_files_icon_press(
+            finder.pattern_comboentry, Gtk.EntryIconPosition.SECONDARY, None)
+        self.assertTrue(finder.on_find_in_files.called)
+
+    def test_on_find_in_files_nonexistant_path(self):
+        # Setup a test config so that the singleton is not mutated.
+        self.make_config(find, Config)
+        window, view, document = self.make_gedit(
+            'plugins/gdp/data/snark12.txt')
+        finder = Finder(window)
+        finder.update_comboentry(finder.pattern_comboentry, 'snark', True)
+        finder.update_comboentry(
+            finder.path_comboentry, '/fnord/pting/snarf', True)
+        MockMethod.bind(self, find, 'FinderWorker')
+        finder.on_find_in_files()
+        self.assertIs(False, find.FinderWorker.called)
+        self.assertIs(None, finder.last_find)
+        self.assertEqual(
+            'The directory path does not exist!',
+            finder.file_lines_view.get_model()[0][0])
+
     def test_show_replace(self):
         window, view, document = self.make_gedit(
             'plugins/gdp/data/snark12.txt')
@@ -235,6 +319,21 @@
         finder.show_replace(None)
         self.assertTrue(panel.props.visible)
 
+    def test_on_replace_in_files_icon_press(self):
+        # Setup a test config so that the singleton is not mutated.
+        self.make_config(find, Config)
+        window, view, document = self.make_gedit(
+            'plugins/gdp/data/snark12.txt')
+        finder = Finder(window)
+        finder.update_comboentry(finder.pattern_comboentry, 'snark', True)
+        finder.update_comboentry(
+            finder.path_comboentry, '<Current File>', True)
+        MockMethod.bind(self, finder, 'on_replace_in_files')
+        finder.on_replace_in_files_icon_press(
+            finder.substitution_comboentry,
+            Gtk.EntryIconPosition.SECONDARY, None)
+        self.assertTrue(finder.on_replace_in_files.called)
+
     def test_get_untested_replacement_dialog(self):
         # If the plugin's last_find is not equal to the current find,
         # a window is presented to confirm the replace.
 
=== modified file 'plugins/gdp/tests/test_gdp.py'
--- plugins/gdp/tests/test_gdp.py	2012-02-07 12:20:48 +0000
+++ plugins/gdp/tests/test_gdp.py	2012-06-18 13:32:54 +0000
@@ -6,12 +6,74 @@
 
 from xdg import BaseDirectory
 
+from gi.repository import (
+    GObject,
+    Gtk,
+    )
+
 from gdp import (
     Config,
+    set_file_line,
     )
 from testing import GeditTestCase
 
 
+class FileLinesViewTestCase(GeditTestCase):
+
+    def makeTreeStore(self):
+        return Gtk.TreeStore(
+            GObject.TYPE_STRING, GObject.TYPE_STRING, GObject.TYPE_INT,
+            GObject.TYPE_STRING, GObject.TYPE_STRING)
+
+    def test_set_file_type_line_no_and_message(self):
+        model = self.makeTreeStore()
+        piter = model.append(
+            None, ('/fnord/pting', 'some-icon', 5, 'message', '/fnord'))
+        cell = Gtk.CellRendererText()
+        set_file_line(None, cell, model, piter, 'line_no')
+        self.assertEqual('5', cell.props.text)
+
+    def test_set_file_type_line_no_without_message(self):
+        model = self.makeTreeStore()
+        piter = model.append(
+            None, ('/fnord/pting', 'some-icon', 5, None, '/fnord'))
+        cell = Gtk.CellRendererText()
+        set_file_line(None, cell, model, piter, 'line_no')
+        self.assertEqual('', cell.props.text)
+
+    def test_set_file_type_text_and_message(self):
+        model = self.makeTreeStore()
+        piter = model.append(
+            None, ('/fnord/pting', 'some-icon', 5, 'message', '/fnord'))
+        cell = Gtk.CellRendererText()
+        set_file_line(None, cell, model, piter, 'text')
+        self.assertEqual('message', cell.props.text)
+
+    def test_set_file_type_text_without_message(self):
+        model = self.makeTreeStore()
+        piter = model.append(
+            None, ('/fnord/pting', 'some-icon', 5, None, '/fnord'))
+        cell = Gtk.CellRendererText()
+        set_file_line(None, cell, model, piter, 'text')
+        self.assertEqual('./pting', cell.props.text)
+
+    def test_set_file_type_text_without_message_with_trailing_slash(self):
+        model = self.makeTreeStore()
+        piter = model.append(
+            None, ('/fnord/pting', 'some-icon', 5, None, '/fnord/'))
+        cell = Gtk.CellRendererText()
+        set_file_line(None, cell, model, piter, 'text')
+        self.assertEqual('./pting', cell.props.text)
+
+    def test_set_file_type_text_without_message_or_base_dir(self):
+        model = self.makeTreeStore()
+        piter = model.append(
+            None, ('/fnord/pting', 'some-icon', 5, None, None))
+        cell = Gtk.CellRendererText()
+        set_file_line(None, cell, model, piter, 'text')
+        self.assertEqual('/fnord/pting', cell.props.text)
+
+
 class ConfigTestCase(GeditTestCase):
 
     def make_config(self, text=''):
 
=== modified file 'testing/__init__.py'
--- testing/__init__.py	2012-03-12 13:04:13 +0000
+++ testing/__init__.py	2012-06-18 13:32:54 +0000
@@ -50,8 +50,8 @@
             self.addCleanup(
                 os.environ.update, {'GSETTINGS_BACKEND': old_backend})
         else:
-            os.environ['GSETTINGS_BACKEND'] = 'memory'
             self.addCleanup(os.environ.__delitem__, 'GSETTINGS_BACKEND')
+        os.environ['GSETTINGS_BACKEND'] = 'memory'
         settings = Gio.Settings.new('org.gnome.gedit.plugins')
         return settings
 
@@ -74,7 +74,7 @@
         return text_file
 
 
-class MockMethod:
+class MockMethod(object):
 
     @classmethod
     def bind(klass, test_instance, obj, method_name,
 
=== modified file 'testing/testrunner.py'
--- testing/testrunner.py	2012-03-12 13:04:13 +0000
+++ testing/testrunner.py	2012-06-18 13:32:54 +0000
@@ -196,6 +196,7 @@
     setup_env(params)
     os.chdir(project_dir())
     os.environ['use_fake_gedit'] = 'true'
+    os.environ['GSETTINGS_BACKEND'] = 'memory'
     # Format the output.
     unittest.runner._WritelnDecorator = Env.write_decorator
     suite = unittest.TestSuite()