Mercurial > octave-nkf

changeset 16511:eee1b78d031f

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
gui: fix backward search in find dialog * find-dialog.cc(handle_backward_search_changed): new slot which toggles the text of the start from serach check box * find-dialog.cc(constructor): connect checked state signal of backward search checkbox to new slot andle_backward_search_changed, new icon * find-dialog.cc(search_next): fix cursor position for start from search/end and for backward search, show message box if no more matches are found * find-dialog.h: new slot handle_backward_search_changed
author Torsten <ttl@justmail.de>
date Sat, 13 Apr 2013 16:04:16 +0200
parents e22604d4bf85
children 7f2395651a1c
files libgui/src/m-editor/find-dialog.cc libgui/src/m-editor/find-dialog.h
diffstat 2 files changed, 41 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- a/libgui/src/m-editor/find-dialog.cc	Sat Apr 13 08:26:56 2013 +0200
+++ b/libgui/src/m-editor/find-dialog.cc	Sat Apr 13 16:04:16 2013 +0200
@@ -53,7 +53,7 @@
   : QDialog (p)
 {
   setWindowTitle ("Find and Replace");
-  setWindowIcon (QIcon(":/actions/icons/logo.png"));
+  setWindowIcon (QIcon(":/actions/icons/search.png"));
 
   _search_label = new QLabel (tr ("Find &what:"));
   _search_line_edit = new QLineEdit;
@@ -98,6 +98,8 @@
            this,                SLOT (replace ()));
   connect (_replace_all_button, SIGNAL (clicked ()),
            this,                SLOT (replace_all ()));
+  connect (_backward_check_box, SIGNAL (stateChanged (int)),
+           this,                SLOT (handle_backward_search_changed (int)));
 
   QVBoxLayout *extension_layout = new QVBoxLayout ();
   extension_layout->setMargin (0);
@@ -128,8 +130,20 @@
   setLayout (main_layout);
 
   _extension->hide ();
+
+  _find_result_available = false;
+
 }
 
+// set text of "search from start" depending on backward search
+void
+find_dialog::handle_backward_search_changed (int backward)
+{
+  if (backward)
+    _from_start_check_box->setText (tr ("Search from end"));
+  else
+    _from_start_check_box->setText (tr ("Search from start"));
+}
 
 // initialize search text with selected text if this is in one single line
 void
@@ -149,12 +163,26 @@
 find_dialog::search_next ()
 {
   int line = -1, col = -1;
+  bool do_wrap = _wrap_check_box->isChecked ();
+
+  if (_find_result_available)
+    { // we found a match last time
+      if (_backward_check_box->isChecked ())
+        {  // backward: go back one position or we will find the same again
+          _edit_area->getCursorPosition (&line,&col);
+          if (col > 0)
+            _edit_area->setCursorPosition (line,--col);
+        }
+    }
 
   _find_result_available = false;
+
   if (_from_start_check_box->isChecked ())
     {
-      line = 1;
-      col  = 1;
+      line = 0;
+      col  = 0;
+      if (_backward_check_box->isChecked ())
+        do_wrap = true;
     }
 
   if (_edit_area)
@@ -163,7 +191,7 @@
                                                       _regex_check_box->isChecked (),
                                                       _case_check_box->isChecked (),
                                                       _whole_words_check_box->isChecked (),
-                                                      _wrap_check_box->isChecked (),
+                                                      do_wrap,
                                                       !_backward_check_box->isChecked (),
                                                       line,col,
                                                       true
@@ -172,6 +200,14 @@
 #endif
                                                       );
     }
+  if (_find_result_available)
+    _from_start_check_box->setChecked (0);
+  else
+    {
+     	QMessageBox msg_box (QMessageBox::Information, tr ("Find Result"),
+                           tr ("No more matches found"), QMessageBox::Ok, this);
+      msg_box.exec ();
+    }
 }
 
 
--- a/libgui/src/m-editor/find-dialog.h	Sat Apr 13 08:26:56 2013 +0200
+++ b/libgui/src/m-editor/find-dialog.h	Sat Apr 13 16:04:16 2013 +0200
@@ -60,6 +60,7 @@
   void init_search_text ();
 
 private slots:
+  void handle_backward_search_changed (int);
   void search_next ();
   void replace ();
   void replace_all ();