Changeset 450

Timestamp:

May 3, 2010, 10:34:50 PM (11 years ago)

Author:

Silvan Scherrer

Message:

fixes ticket:190

Location:

trunk/Lucide

Files:

• gui/Lucide_res.H (modified) (1 diff)
• gui/dialogs.rc (modified) (1 diff)
• gui/docViewer.cpp (modified) (4 diffs)
• gui/docViewer.h (modified) (2 diffs)
• gui/findDlg.cpp (modified) (4 diffs)
• gui/findDlg.h (modified) (2 diffs)
• gui/lucide.cpp (modified) (2 diffs)
• gui/toolbar.cpp (modified) (1 diff)
• lng/Lucide.lng (modified) (1 diff)
• lng/Lucide_de.lng (modified) (1 diff)
• plugins/ludoc/ludoc.cpp (modified) (1 diff)
• plugins/ludoc/ludoc.idl (modified) (1 diff)
• plugins/lupoppler/lupoppler.cpp (modified) (1 diff)

trunk/Lucide/gui/Lucide_res.H

@@ -133 +133 @@
 #define IDC_FINDFIELD       10
 #define IDC_FINDMATCHCASE   11
+#define IDC_FINDBACK 12
 
 #define IDD_PROGRESS        1004

trunk/Lucide/gui/dialogs.rc

@@ -49 +49 @@
                 CONTROL "", IDC_FINDFIELD, 73, 30, 111, 8, WC_ENTRYFIELD, ES_LEFT | ES_AUTOSCROLL | ES_MARGIN | ES_ANY | WS_VISIBLE | WS_GROUP | WS_TABSTOP
                 PRESPARAMS PP_FONTNAMESIZE "9.WarpSans"
-                CONTROL "FIND_MATCH_CASE", IDC_FINDMATCHCASE, 8, 6, 177, 10, WC_BUTTON, BS_AUTOCHECKBOX | WS_VISIBLE | WS_GROUP | WS_TABSTOP
+                CONTROL "FIND_MATCH_CASE", IDC_FINDMATCHCASE, 8, 12, 177, 10, WC_BUTTON, BS_AUTOCHECKBOX | WS_VISIBLE | WS_GROUP | WS_TABSTOP
+                PRESPARAMS PP_FONTNAMESIZE "9.WarpSans"
+                CONTROL "FIND_BACK", IDC_FINDBACK, 8, 2, 177, 10, WC_BUTTON, BS_AUTOCHECKBOX | WS_VISIBLE | WS_GROUP | WS_TABSTOP
                 PRESPARAMS PP_FONTNAMESIZE "9.WarpSans"
                 DEFPUSHBUTTON "FIND_OK", DID_OK, 201, 27, 51, 14

trunk/Lucide/gui/docViewer.cpp

@@ -658 +658 @@
 // perform search in document
 void DocumentViewer::searchDocument( const char *_searchString, bool _caseSensitive,
-                                     bool _continueSearch )
+                                     bool _continueSearch, bool _findBack )
 {
     abortSearch = false;
@@ -669 +669 @@
     caseSensitive = _caseSensitive;
     continueSearch = _continueSearch;
+    findBack = _findBack;
 
     progressDlg->setBreakFunc( searchabort, this );
@@ -691 +692 @@
 
     long i = _this->currentpage;
+if (!_this->findBack) {
     if ( _this->continueSearch && ( _this->currentpage < ( _this->totalpages - 1 ) ) ) {
         i = _this->currentpage + 1;
     }
+} else {
+    if ( _this->continueSearch && ( _this->currentpage >= 1 ) ) {
+        i = _this->currentpage - 1;
+    }
+}
 
     bool found = false;
-    for ( ; i < _this->totalpages; i++ )
+    for ( ; _this->findBack ? i >=0 : i < _this->totalpages; _this->findBack ? i-- : i++ )
     {
         char *fmt = newstrdupL( FIND_SEARCH_PAGE_OF );
@@ -706 +713 @@
 
         _this->foundrects[ i ] = _this->doc->searchText( ev, i,
-                                        (char *)_this->searchString, _this->caseSensitive );
+                                        (char *)_this->searchString, _this->caseSensitive, _this->findBack );
         if ( _this->foundrects[ i ] != NULL )
         {

trunk/Lucide/gui/docViewer.h

@@ -99 +99 @@
         void copyToClipbrd();
         void searchDocument( const char *_searchString, bool _caseSensitive,
-                             bool _continueSearch );
+                             bool _continueSearch, bool _findBack );
         void setPresentation( bool _presentation );
         void zoomInOut( bool zoomIn );
@@ -244 +244 @@
         bool caseSensitive;
         bool continueSearch;
+        bool findBack;
         bool abortSearch;
 

trunk/Lucide/gui/findDlg.cpp

@@ -50 +50 @@
     searchString  = newstrdup( "" );
     caseSensitive = false;
+    findBack = false;
 }
 
@@ -91 +92 @@
             WinSendDlgItemMsg( hwnd, IDC_FINDFIELD, EM_SETSEL, MPFROM2SHORT( 0, MAXSEARCHLENGTH ), MPVOID );
             WinCheckButton( hwnd, IDC_FINDMATCHCASE, _this->caseSensitive );
+            WinCheckButton( hwnd, IDC_FINDBACK, _this->findBack );
+
 
             return (MRESULT)FALSE;
@@ -105 +108 @@
                         _this->searchString = newstrdup( buf );
                         _this->caseSensitive = WinQueryButtonCheckstate( hwnd, IDC_FINDMATCHCASE );
+                        _this->findBack = WinQueryButtonCheckstate( hwnd, IDC_FINDBACK );
                         WinDismissDlg( hwnd, DID_OK );
                     }
@@ -176 +180 @@
         }
 
+        case WM_CONTROL:
+        // @todo highlight the text in the spinbutton (should work but looks like its not)
+        WinSendDlgItemMsg( hwnd, IDC_PAGE, EM_SETSEL,
+                                      MPFROM2SHORT(0, 256), NULL);
+        return (MRESULT)FALSE;
+
         case WM_COMMAND:
             switch (SHORT1FROMMP(mp1))

trunk/Lucide/gui/findDlg.h

@@ -46 +46 @@
         char *getSearchString() { return searchString; }
         bool isCaseSensitive() { return caseSensitive; }
+        bool doFindBack() { return findBack; }
 
     private:
@@ -54 +55 @@
         char *searchString;
         bool caseSensitive;
+        bool findBack;
 };
 

trunk/Lucide/gui/lucide.cpp

@@ -1419 +1419 @@
                         {
                             docViewer->searchDocument( findDlg->getSearchString(),
-                                            findDlg->isCaseSensitive(), false );
+                                            findDlg->isCaseSensitive(), false, findDlg->doFindBack() );
 
                             WinEnableMenuItem( hWndMenu, CM_FINDAGAIN, TRUE );
@@ -1429 +1429 @@
                 case CM_FINDAGAIN:
                     docViewer->searchDocument( findDlg->getSearchString(),
-                                               findDlg->isCaseSensitive(), true );
+                                               findDlg->isCaseSensitive(), true, findDlg->doFindBack() );
                     return (MRESULT)FALSE;
 

trunk/Lucide/gui/toolbar.cpp

@@ -77 +77 @@
                      && !Lucide::dontSwitchPage )
                 {
-/* @todo highlight the text in the spinbutton (is that possible at all???)
+                // @todo highlight the text in the spinbutton (should work but looks like its not)
                    BOOL rc = (BOOL)WinSendDlgItemMsg( hwnd, TBID_PAGENUM, EM_SETSEL,
-                                      MPFROM2SHORT(1,10), NULL); */
+                                      MPFROM2SHORT(0,256), NULL);
                 }
 

trunk/Lucide/lng/Lucide.lng

@@ -148 +148 @@
 FIND_FIND_WHAT=~Find what
 FIND_MATCH_CASE=~Match case
+FIND_BACK=Find ~Backwards
 FIND_OK=~OK
 FIND_CANCEL=~Cancel

trunk/Lucide/lng/Lucide_de.lng

@@ -148 +148 @@
 FIND_FIND_WHAT=~Suchbegriff
 FIND_MATCH_CASE=~Groá-/Kleinschreibung beachten
+FIND_BACK=~Rckw„rts suchen
 FIND_OK=~OK
 FIND_CANCEL=~Abbruch

trunk/Lucide/plugins/ludoc/ludoc.cpp

@@ -445 +445 @@
 
 
-SOM_Scope LuDocument_LuRectSequence*  SOMLINK searchText(LuDocument *somSelf,
-                                                          Environment *ev,
-                                                         long pagenum,
-                                                         string text,
-                                                         boolean caseSensitive )
+
+/*
+ * SOM_Scope LuDocument_LuRectSequence*  SOMLINK searchText(LuDocument *somSelf,
+ *                                                           Environment *ev,
+ *                                                          long pagenum,
+ *                                                          string text,
+ *                                                          boolean caseSensitive
+ *                                                          boolean findBack)
+ */
+
+/*
+ * The prototype for searchText was replaced by the following prototype:
+ */
+SOM_Scope LuDocument_LuRectSequence*  SOMLINK searchText(LuDocument *somSelf, 
+                                                          Environment *ev, 
+                                                         long pagenum, 
+                                                         string text, 
+                                                         boolean caseSensitive, 
+                                                         boolean findBack)
 {
     // Abstract method does nothing

trunk/Lucide/plugins/ludoc/ludoc.idl

@@ -524 +524 @@
      * Note: SOMMalloc() must be used for all memory allocations.
      **/
-    LuRectSequence *searchText( in long pagenum, in string text, in boolean caseSensitive );
+    LuRectSequence *searchText( in long pagenum, in string text, in boolean caseSensitive, in boolean findBack );
 
 

trunk/Lucide/plugins/lupoppler/lupoppler.cpp

@@ -1333 +1333 @@
                                                          long pagenum,
                                                          string text,
-                                                         boolean caseSensitive)
+                                                         boolean caseSensitive,
+                                                         boolean findBack)
 {
     LuPopplerDocumentData *somThis = LuPopplerDocumentGetData(somSelf);