Changeset 451

Timestamp:

May 5, 2010, 6:35:10 PM (15 years ago)

Author:

Silvan Scherrer

Message:

ticket:198

Location:

trunk/Lucide

Files:

• gui/dialogs.rc (modified) (1 diff)
• gui/findDlg.cpp (modified) (2 diffs)
• gui/lucide.cpp (modified) (3 diffs)
• gui/lucide.h (modified) (1 diff)
• gui/toolbar.cpp (modified) (2 diffs)
• lng/Lucide_de.lng (modified) (1 diff)

trunk/Lucide/gui/dialogs.rc ¶

@@ -122 +122 @@
                 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
+                CONTROL "", IDC_PAGE, 54, 31, 48, 8, WC_ENTRYFIELD, ES_CENTER | ES_MARGIN | ES_AUTOSCROLL | 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

trunk/Lucide/gui/findDlg.cpp ¶

@@ -168 +168 @@
             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 pgnum[ 32 ];
+
+            // set current page
+            snprintf(pgnum, sizeof(pgnum), "%d", _this->curpage);
+            WinSetDlgItemText(hwnd, IDC_PAGE, pgnum);
+
+            // set of pages
             char *pgfrm = newstrdupL( GTP_OF );
-            char pgnum[ 32 ];
             snprintf( pgnum, sizeof( pgnum ), pgfrm, _this->pages );
             delete pgfrm;
             WinSetDlgItemText( hwnd, IDC_PAGES, pgnum );
+
+            // highlight the text
+            WinSendDlgItemMsg( hwnd, IDC_PAGE, EM_SETSEL,
+                                      MPFROM2SHORT(0, 256), NULL);
+
             return (MRESULT)FALSE;
         }
-
-        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:
@@ -191 +192 @@
                 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;
+                        char szText[256];
+                        LONG newPage = 0;
+                        ULONG retLen = 0;
+                        retLen = WinQueryDlgItemText( hwnd, IDC_PAGE, sizeof(szText),
+                                            szText );
+
+                        if ( retLen > 0) {
+                                newPage = atol(szText);
+                                if (newPage > 0 && newPage <= _this->pages) {
+                                    _this->page = newPage;
+                                }
                         }
                         WinDismissDlg( hwnd, DID_OK );

trunk/Lucide/gui/lucide.cpp ¶

@@ -213 +213 @@
 void Lucide::setOfPages( long pages )
 {
+    char pgnum[ 32 ];
+
+    // set current page
+    snprintf(pgnum, sizeof(pgnum), "%i", pages >0 ? 1:0);
+    WinSetDlgItemText(hToolBar, TBID_PAGENUM, pgnum);
+
+    // set of pages
     char *pgfrm = newstrdupL( TB_PAGENUM );
-    char pgnum[ 32 ];
     snprintf( pgnum, sizeof( pgnum ), pgfrm, pages );
     delete pgfrm;
     WinSetDlgItemText( hToolBar, TBID_OFPAGES, pgnum );
-
-    // if pages are 0 also set limits to 0
-    long pageLimit = (pages >= 1 ? 1:0);
-    WinSendDlgItemMsg( hToolBar, TBID_PAGENUM, SPBM_SETLIMITS,
-                       MPFROMLONG( pages ), MPFROMLONG( pageLimit ) );
 }
 
@@ -241 +242 @@
     bool tmp = dontSwitchPage;
     dontSwitchPage = true;
-    WinSendDlgItemMsg( hToolBar, TBID_PAGENUM, SPBM_SETCURRENTVALUE,
-                       MPFROMLONG( docViewer->getCurrentPage() + 1 ), MPVOID );
+    char pgnum[32];
+    snprintf(pgnum, sizeof(pgnum), "%i", docViewer->getCurrentPage() + 1);
+    WinSetDlgItemText(hToolBar, TBID_PAGENUM, pgnum);
     dontSwitchPage = tmp;
     indexWin->goToPage( NULL, docViewer->getCurrentPage() );
@@ -397 +399 @@
     if ( docViewer != NULL ) {
         docViewer->goToPage( page );
+    }
+}
+
+long Lucide::pageCount( void )
+{
+    if ( doc != NULL ) {
+        return doc->getPageCount( ev );
+    } else {
+        return 0;
     }
 }

trunk/Lucide/gui/lucide.h ¶

@@ -107 +107 @@
         static void checkNavpane();
         static void goToPage( long page );
+        static long pageCount();
         static void setZoom( double zoom );
         static void toggleZoom();

trunk/Lucide/gui/toolbar.cpp ¶

@@ -61 +61 @@
                 SHORT notifyCode = SHORT2FROMMP( mp1 );
 
-                if ( ( controlId == TBID_PAGENUM ) && ( notifyCode == SPBN_CHANGE )
+                if ( ( controlId == TBID_PAGENUM ) && ( notifyCode == EN_CHANGE )
                      && !Lucide::dontSwitchPage )
                 {
-                    LONG spbmValue = 0;
-                    BOOL rc = (BOOL)WinSendDlgItemMsg( hwnd, TBID_PAGENUM, SPBM_QUERYVALUE,
-                                       MPFROMP( &spbmValue ),
-                                       MPFROM2SHORT( 0, SPBQ_UPDATEIFVALID ) );
-
-                    if ( rc && ( spbmValue > 0 ) ) {
-                        Lucide::goToPage( spbmValue - 1 );
-                    }
+                        char szText[256];
+                        LONG newPage = 0;
+                        ULONG retLen = 0;
+                        retLen = WinQueryDlgItemText( hwnd, TBID_PAGENUM, sizeof(szText),
+                                            szText );
+
+                        if ( retLen > 0) {
+                                newPage = atol(szText);
+                                if (newPage > 0 && newPage <= Lucide::pageCount()) {
+                                    Lucide::goToPage(newPage - 1);
+                                }
+                        }
                 }
 
-                if ( ( controlId == TBID_PAGENUM ) && ( notifyCode == SPBN_SETFOCUS )
+                if ( ( controlId == TBID_PAGENUM ) && ( notifyCode == EN_SETFOCUS )
                      && !Lucide::dontSwitchPage )
                 {
-                // @todo highlight the text in the spinbutton (should work but looks like its not)
-                   BOOL rc = (BOOL)WinSendDlgItemMsg( hwnd, TBID_PAGENUM, EM_SETSEL,
-                                      MPFROM2SHORT(0,256), NULL);
+                // highlight the text
+                WinSendDlgItemMsg( hwnd, TBID_PAGENUM, EM_SETSEL,
+                                      MPFROM2SHORT(0, 256), NULL);
                 }
 
@@ -226 +230 @@
     WinSendMsg( hToolBar, TBM_ADDBUTTON, (MPARAM)&bs, MPVOID );
 
-    // pages spin
+    // pages text
     AddCtrlStruct cs;
-    cs.ctrlHandle = WinCreateWindow( hToolBar, WC_SPINBUTTON, NULL,
-                                     WS_VISIBLE|SPBS_MASTER|SPBS_NUMERICONLY|SPBS_JUSTCENTER,
+    cs.ctrlHandle = WinCreateWindow( hToolBar, WC_ENTRYFIELD, NULL,
+                                     WS_VISIBLE|ES_CENTER|ES_MARGIN|ES_AUTOSCROLL,
                                      0,0,0,0, hToolBar, HWND_TOP, TBID_PAGENUM, NULL, NULL );
-    WinSendMsg( cs.ctrlHandle, SPBM_SETLIMITS, MPFROMLONG( 0 ), MPFROMLONG( 0 ) );
     WinSetPresParam( cs.ctrlHandle, PP_FONTNAMESIZE, deffontlen, deffont );
-    cs.cx = 75;
+    cs.cx = 50;
     cs.cy = 0;
     cs.bubbleText = NULL;

trunk/Lucide/lng/Lucide_de.lng ¶

@@ -1 +1 @@
 #
-# Lucide language file, DE (1.3.1)
+# Lucide language file, DE (1.3.3)
 #