[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    kdegraphics/kviewshell
From:       Wilfried Huss <Wilfried.Huss () gmx ! at>
Date:       2005-04-22 18:25:55
Message-ID: 20050422182555.9513E5FA () office ! kde ! org
[Download RAW message or body]

CVS commit by whuss: 

Give feedback in the statusbar during search.


  M +19 -3     kmultipage.cpp   1.82


--- kdegraphics/kviewshell/kmultipage.cpp  #1.81:1.82
@@ -583,5 +583,5 @@ void KMultiPage::goto_page(PageNumber pa
 
     // Set current page number.
-    setCurrentPageNumber(page);
+    setCurrentPageNumber(page+1);
   }
   else if (widgetList.size() == 1)
@@ -631,5 +631,5 @@ void KMultiPage::goto_page(PageNumber pa
     }
     // Set current page number.
-    setCurrentPageNumber(page);
+    setCurrentPageNumber(page+1);
     ptr->update();
   }
@@ -1203,4 +1203,7 @@ void KMultiPage::findNextText()
     unsigned int pageNumber = (i + startingPage - 1) % renderer->totalPages() + 1;
 
+    if (i != 0)
+      setStatusBarText(i18n("Search page %1 of \
%2").arg(pageNumber).arg(renderer->totalPages())); +
     documentPagePixmap searchPage;
 
@@ -1240,11 +1243,15 @@ void KMultiPage::findNextText()
 
         if (answ != KMessageBox::Yes)
+        {
+          setStatusBarText(QString::null);
           return;
       }
     }
+    }
     else
     {
       userSelection = foundSelection;
       gotoPage(userSelection);
+      setStatusBarText(QString::null);
       return;
     }
@@ -1252,4 +1259,5 @@ void KMultiPage::findNextText()
 
   KMessageBox::sorry(scrollView(), i18n("<qt>The search string <strong>%1</strong> \
could not be found.</qt>").arg(searchText)); +  setStatusBarText(QString::null);
 }
 
@@ -1293,8 +1301,11 @@ void KMultiPage::findPrevText()
   for(unsigned int i = 0; i < renderer->totalPages(); i++)
   {
-    unsigned int pageNumber = startingPage - i;
+    int pageNumber = startingPage - i;
     if (pageNumber <= 0)
       pageNumber += renderer->totalPages();
 
+    if (i != 0)
+      setStatusBarText(i18n("Search page %1 of \
%2").arg(pageNumber).arg(renderer->totalPages())); +
     documentPagePixmap searchPage;
 
@@ -1334,11 +1345,15 @@ void KMultiPage::findPrevText()
 
         if (answ != KMessageBox::Yes)
+        {
+          setStatusBarText(QString::null);
           return;
       }
     }
+    }
     else
     {
       userSelection = foundSelection;
       gotoPage(userSelection);
+      setStatusBarText(QString::null);
       return;
     }
@@ -1346,4 +1361,5 @@ void KMultiPage::findPrevText()
 
   KMessageBox::sorry(scrollView(), i18n("<qt>The search string <strong>%1</strong> \
could not be found.</qt>").arg(searchText)); +  setStatusBarText(QString::null);
 }
 


[prev in list] [next in list] [prev in thread] [next in thread]