Changeset 87

Timestamp:

Jul 25, 2006, 5:22:20 PM (15 years ago)

Author:

Eugene Romanenko

Message:

'Go to page' dialog, some play with djvu plugin.

Location:

trunk/Lucide

Files:

• BIN/Lucide.lng (modified) (3 diffs)
• BIN/Lucide_de.lng (modified) (3 diffs)
• BIN/Lucide_fr.lng (modified) (3 diffs)
• BIN/Lucide_ru.lng (modified) (1 diff)
• BIN/Lucide_sv.lng (modified) (2 diffs)
• SOURCE/gui/Lucide.rc (modified) (1 diff)
• SOURCE/gui/Lucide_res.H (modified) (1 diff)
• SOURCE/gui/dialogs.rc (modified) (2 diffs)
• SOURCE/gui/docViewer.h (modified) (1 diff)
• SOURCE/gui/findDlg.cpp (modified) (3 diffs)
• SOURCE/gui/findDlg.h (modified) (1 diff)
• SOURCE/gui/lucide.cpp (modified) (2 diffs)
• SOURCE/gui/messages.cpp (modified) (1 diff)
• SOURCE/gui/messages.h (modified) (1 diff)
• SOURCE/gui/toolbar.cpp (modified) (1 diff)
• SOURCE/plugins/ludjvu/ludjvu.cpp (modified) (1 diff)

trunk/Lucide/BIN/Lucide.lng

@@ -27 +27 @@
 MENU_NEXT_PAGE=Next page\t+
 MENU_LAST_PAGE=Last page
-MENU_GO_TO_PAGE=Go to page...
+MENU_GO_TO_PAGE=Go to page...\tCtrl+N
 MENU_VIEW=~View
 MENU_FIT_WINDOW=Fit in window
@@ -110 +110 @@
 #
 FIND_FIND=Find
-FIND_FIND_WHAT=~Find what:
+FIND_FIND_WHAT=~Find what
 FIND_MATCH_CASE=~Match case
 FIND_OK=~OK
@@ -136 +136 @@
 #
 SD_SETTINGS=Settings
-SD_DEFAULT_PAGE_LAYOUT=Default Page Layout:
-SD_DEFAULT_ZOOM=Default Zoom:
+SD_DEFAULT_PAGE_LAYOUT=Default Page Layout
+SD_DEFAULT_ZOOM=Default Zoom
 SD_OK=~OK
 SD_CANCEL=~Cancel
+
+#
+# 'Go to page' dialog
+#
+GTP_GOTOPAGE=Go to page
+GTP_PAGE=Page
+GTP_OF=of %d
+GTP_OK=~OK
+GTP_CANCEL=~Cancel

trunk/Lucide/BIN/Lucide_de.lng

@@ -27 +27 @@
 MENU_NEXT_PAGE=N„chste Seite\t+
 MENU_LAST_PAGE=Letzte Seite
-MENU_GO_TO_PAGE=Gehe zu Seite...
+MENU_GO_TO_PAGE=Gehe zu Seite...\tStrg+N
 MENU_VIEW=~Anzeige
 MENU_FIT_WINDOW=Ganze Seite
@@ -110 +110 @@
 #
 FIND_FIND=Suchen
-FIND_FIND_WHAT=~Suchbegriff:
+FIND_FIND_WHAT=~Suchbegriff
 FIND_MATCH_CASE=~Groá-/Kleinschreibung beachten
 FIND_OK=~OK
@@ -136 +136 @@
 #
 SD_SETTINGS=Einstellungen
-SD_DEFAULT_PAGE_LAYOUT=Standard Seitenlayout:
-SD_DEFAULT_ZOOM=Standard-Zoom:
+SD_DEFAULT_PAGE_LAYOUT=Standard Seitenlayout
+SD_DEFAULT_ZOOM=Standard-Zoom
 SD_OK=~OK
 SD_CANCEL=~Abbruch

trunk/Lucide/BIN/Lucide_fr.lng

@@ -27 +27 @@
 MENU_LAST_PAGE=DerniŠre page
 MENU_GO_TO_PAGE=Aller 
- la page...
+ la page...\tCtrl+N
 MENU_VIEW=~Affichage
 MENU_FIT_WINDOW=Adapter 
@@ -111 +111 @@
 #
 FIND_FIND=Recherche
-FIND_FIND_WHAT=~Quoi chercher :
+FIND_FIND_WHAT=~Quoi chercher
 FIND_MATCH_CASE=~Respecter la casse
 FIND_OK=~OK
@@ -129 +129 @@
 #
 AD_ABOUT=Infos produit
-AD_COPYRIGHTS=Copyrights here.
 AD_OK=OK

trunk/Lucide/BIN/Lucide_ru.lng

@@ -3 +3 @@
 #
 
-MENU_FILE=~” ©«
 MENU_OPEN=Žâªàëâì...\tCtrl+O
 MENU_SAVE_AS=‘®åà ­šâì ª ª...

trunk/Lucide/BIN/Lucide_sv.lng

@@ -26 +26 @@
 MENU_NEXT_PAGE=N„sta sida\t+
 MENU_LAST_PAGE=Sista sidan
-MENU_GO_TO_PAGE=G† till sidan...
+MENU_GO_TO_PAGE=G† till sidan...\tCtrl+N
 MENU_VIEW=~Visa
 MENU_FIT_WINDOW=Passa f”nster
@@ -107 +107 @@
 #
 FIND_FIND=Finn
-FIND_FIND_WHAT=~Finn vad:
+FIND_FIND_WHAT=~Finn vad
 FIND_MATCH_CASE=~Matcha stor/liten bokstav
 FIND_OK=~OK

trunk/Lucide/SOURCE/gui/Lucide.rc

@@ -100 +100 @@
     "G", CM_FINDAGAIN, CONTROL
     "g", CM_FINDAGAIN, CONTROL
+    "N", CM_GOTOPAGE, CONTROL
+    "n", CM_GOTOPAGE, CONTROL
     VK_F11, CM_MAXVIEW, VIRTUALKEY
 END

trunk/Lucide/SOURCE/gui/Lucide_res.H

@@ -125 +125 @@
 #define IDC_DEFZOOM                     11
 
+#define IDD_GOTOPAGE            1007
+#define IDC_PAGE                        10
+#define IDC_PAGES                       11
+
 #endif // __LUCIDE_RES_H

trunk/Lucide/SOURCE/gui/dialogs.rc

@@ -91 +91 @@
                 PRESPARAMS PP_FONTNAMESIZE "9.WarpSans"
         END
-
 END
 
@@ -114 +113 @@
 END
 
+
+DLGTEMPLATE IDD_GOTOPAGE 
+BEGIN
+        DIALOG "GTP_GOTOPAGE", -1, 6, 116, 162, 49, WS_VISIBLE, FCF_SYSMENU | FCF_TITLEBAR
+        BEGIN
+                CONTROL "GTP_PAGE", -1, 5, 31, 45, 8, WC_STATIC, SS_TEXT | DT_LEFT | DT_TOP | DT_MNEMONIC | WS_VISIBLE | WS_GROUP
+                PRESPARAMS PP_FONTNAMESIZE "9.WarpSans"
+                CONTROL "", IDC_PAGE, 54, 31, 48, 10, WC_SPINBUTTON, SPBS_MASTER | SPBS_NUMERICONLY | SPBS_JUSTCENTER | WS_VISIBLE | WS_GROUP | WS_TABSTOP
+                PRESPARAMS PP_FONTNAMESIZE "9.WarpSans"
+                CONTROL "", IDC_PAGES, 106, 31, 52, 8, WC_STATIC, SS_TEXT | DT_LEFT | DT_TOP | DT_MNEMONIC | WS_VISIBLE | WS_GROUP
+                PRESPARAMS PP_FONTNAMESIZE "9.WarpSans"
+                DEFPUSHBUTTON "GTP_OK", DID_OK, 28, 7, 51, 14
+                PRESPARAMS PP_FONTNAMESIZE "9.WarpSans"
+                PUSHBUTTON "GTP_CANCEL", DID_CANCEL, 88, 7, 51, 14
+                PRESPARAMS PP_FONTNAMESIZE "9.WarpSans"
+        END
+END
+

trunk/Lucide/SOURCE/gui/docViewer.h

@@ -69 +69 @@
         void close();
         void goToPage( long page );
-        long getCurrentPage() { return currentpage; }
+        long getCurrentPage() { return currentpage; }  // Zero based
         void setZoom( double _zoom );
         double getZoom() { return zoom; }

trunk/Lucide/SOURCE/gui/findDlg.cpp

@@ -22 +22 @@
  * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
  * in which case the provisions of the LGPL are applicable instead of those
- * above. If you wish to allow use of your version of this file only under the 
+ * above. If you wish to allow use of your version of this file only under the
  * terms of the LGPL, and not to allow others to use your version of this file
  * under the terms of the CDDL, indicate your decision by deleting the
  * provisions above and replace them with the notice and other provisions
  * required by the LGPL. If you do not delete the provisions above, a recipient
- * may use your version of this file under the terms of any one of the CDDL 
+ * may use your version of this file under the terms of any one of the CDDL
  * or the LGPL.
  *
@@ -35 +35 @@
 #define INCL_WIN
 #include <os2.h>
+
+#include <stdio.h>
 
 #include "findDlg.h"
 #include "Lucide_res.h"
 #include "luutils.h"
+#include "messages.h"
 
 #define MAXSEARCHLENGTH 100
@@ -115 +118 @@
 
 
+//
+// ------------------ GotoDlg ---------------------
+//
+
+GotoDlg::GotoDlg( HWND hWndFrame, long _pages, long _curpage )
+{
+    hFrame  = hWndFrame;
+    page    = -1;
+    pages   = _pages;
+    curpage = _curpage;
+}
+
+GotoDlg::~GotoDlg()
+{
+}
+
+ULONG GotoDlg::showDialog()
+{
+    return WinDlgBox( HWND_DESKTOP, hFrame, gotoDlgProc,
+                      NULLHANDLE, IDD_GOTOPAGE, this );
+}
+
+
+
+MRESULT EXPENTRY GotoDlg::gotoDlgProc( HWND hwnd, ULONG msg, MPARAM mp1, MPARAM mp2 )
+{
+    // This is a static method, so we don't know which instantiation we're
+    // dealing with. But we can get a pseudo-this from the parameter to
+    // WM_INITDLG, which we therafter store with the window and retrieve
+    // as follows:
+    GotoDlg *_this = (GotoDlg *)WinQueryWindowULong( hwnd, QWL_USER );
+
+    switch (msg)
+    {
+
+        // Dialog has just been created
+        case WM_INITDLG:
+        {
+            // Save the mp2 into our user data so that subsequent calls have
+            // access to the parent C++ object
+            WinSetWindowULong( hwnd, QWL_USER, (ULONG)mp2 );
+            _this = (GotoDlg *)mp2;
+            localizeDialog( hwnd );
+            centerWindow( _this->hFrame, hwnd );
+
+            WinSendDlgItemMsg( hwnd, IDC_PAGE, SPBM_SETLIMITS,
+                               MPFROMLONG( _this->pages ), MPFROMLONG( 1 ) );
+            WinSendDlgItemMsg( hwnd, IDC_PAGE, SPBM_SETCURRENTVALUE,
+                               MPFROMLONG( _this->curpage ), MPVOID );
+            char *pgfrm = newstrdupL( GTP_OF );
+            char pgnum[ 32 ];
+            snprintf( pgnum, sizeof( pgnum ), pgfrm, _this->pages );
+            delete pgfrm;
+            WinSetDlgItemText( hwnd, IDC_PAGES, pgnum );
+            return (MRESULT)FALSE;
+        }
+
+        case WM_COMMAND:
+            switch (SHORT1FROMMP(mp1))
+            {
+                case DID_OK:
+                    {
+                        LONG spbmValue = 0;
+                        BOOL rc = (BOOL)WinSendDlgItemMsg( hwnd, IDC_PAGE, SPBM_QUERYVALUE,
+                                            MPFROMP( &spbmValue ),
+                                            MPFROM2SHORT( 0, SPBQ_UPDATEIFVALID ) );
+
+                        if ( rc && ( spbmValue > 0 ) ) {
+                            _this->page = spbmValue;
+                        }
+                        WinDismissDlg( hwnd, DID_OK );
+                    }
+                    return (MRESULT)FALSE;
+
+                case DID_CANCEL:
+                    WinDismissDlg( hwnd, DID_CANCEL );
+                    return (MRESULT)FALSE;
+            };
+            return (MRESULT)FALSE;
+    }
+    return WinDefDlgProc( hwnd, msg, mp1, mp2 );
+}
+

trunk/Lucide/SOURCE/gui/findDlg.h

@@ -56 +56 @@
 };
 
+class GotoDlg
+{
+    public:
+        GotoDlg( HWND hWndFrame, long _pages, long _curpage );
+        virtual ~GotoDlg();
+
+        ULONG showDialog();
+        long getPage() { return page; }
+
+    private:
+
+        static MRESULT EXPENTRY gotoDlgProc( HWND hwnd, ULONG msg, MPARAM mp1, MPARAM mp2 );
+
+        HWND hFrame;
+        long page;
+        long pages;
+        long curpage;
+};
+
 #endif // __FINDDLG_H

trunk/Lucide/SOURCE/gui/lucide.cpp

@@ -113 +113 @@
     delete pgfrm;
     WinSetDlgItemText( hToolBar, TBID_OFPAGES, pgnum );
-    WinSendDlgItemMsg( hToolBar, TBID_PAGENUM, SPBM_SETLIMITS, (MPARAM)pages, (MPARAM)1 );
+    WinSendDlgItemMsg( hToolBar, TBID_PAGENUM, SPBM_SETLIMITS,
+                       MPFROMLONG( pages ), MPFROMLONG( 1 ) );
 }
 
 void Lucide::checkNavigationMenus()
 {
+    WinEnableMenuItem( hWndMenu, CM_GOTOPAGE, TRUE );
     BOOL enfirst = ( docViewer->getCurrentPage() != 0 );
     BOOL enlast = ( docViewer->getCurrentPage() != ( doc->getPageCount( ev ) - 1 ) );
@@ -655 +657 @@
                     return (MRESULT)FALSE;
 
+                case CM_GOTOPAGE:
+                {
+                    GotoDlg *d = new GotoDlg( hWndFrame, doc->getPageCount( ev ),
+                                                docViewer->getCurrentPage() + 1 );
+                    if ( d->showDialog() == DID_OK ) {
+                        long pg = d->getPage();
+                        if ( pg > 0 ) {
+                            Lucide::goToPage( pg - 1 );
+                        }
+                    }
+                    delete d;
+                    return (MRESULT)FALSE;
+                }
+
                 case CM_FITWINDOW:
                     Lucide::setZoom( -2 );

trunk/Lucide/SOURCE/gui/messages.cpp

@@ -89 +89 @@
 const char *FIND_SEARCH_PAGE_OF = "FIND_SEARCH_PAGE_OF";
 const char *FIND_NOT_FOUND      = "FIND_NOT_FOUND";
+
+// 'Go to page' dialog
+const char *GTP_OF = "GTP_OF";

trunk/Lucide/SOURCE/gui/messages.h

@@ -89 +89 @@
 extern const char *FIND_NOT_FOUND;
 
+// 'Go to page' dialog
+extern const char *GTP_OF;
+
 
 #endif // __MESSAGES_H

trunk/Lucide/SOURCE/gui/toolbar.cpp

@@ -182 +182 @@
                                      WS_VISIBLE|SPBS_MASTER|SPBS_NUMERICONLY|SPBS_JUSTCENTER,
                                      0,0,0,0, hToolBar, HWND_TOP, TBID_PAGENUM, NULL, NULL );
-    WinSendMsg( cs.ctrlHandle, SPBM_SETLIMITS, (MPARAM)0, (MPARAM)0 );
+    WinSendMsg( cs.ctrlHandle, SPBM_SETLIMITS, MPFROMLONG( 0 ), MPFROMLONG( 0 ) );
     WinSetPresParam( cs.ctrlHandle, PP_FONTNAMESIZE, deffontlen, deffont );
     cs.cx = 50;

trunk/Lucide/SOURCE/plugins/ludjvu/ludjvu.cpp

@@ -42 +42 @@
 #include <ddjvuapi.h>
 #endif
+#ifdef __GNUC__
+#define __min(a,b)  (((a) < (b)) ? (a) : (b))
+#endif
 
 #define SCALE_FACTOR 0.2