Changeset 129

Timestamp:

Sep 17, 2006, 5:55:13 PM (19 years ago)

Author:

Eugene Romanenko

Message:

find/findagain bitmaps replaced (closes #71), added 'zoom in/out' toolbar button

Location:

trunk/Lucide

Files:

• BIN/Lucide.lng (modified) (1 diff)
• SOURCE/gui/BITMAPS/find.bmp (modified) ( previous)
• SOURCE/gui/BITMAPS/findagain.bmp (modified) ( previous)
• SOURCE/gui/BITMAPS/mglass.bmp (added)
• SOURCE/gui/Lucide.rc (modified) (1 diff)
• SOURCE/gui/Lucide_res.H (modified) (1 diff)
• SOURCE/gui/lucide.cpp (modified) (3 diffs)
• SOURCE/gui/messages.cpp (modified) (1 diff)
• SOURCE/gui/messages.h (modified) (1 diff)
• SOURCE/gui/toolbar.cpp (modified) (1 diff)
• changelog (modified) (1 diff)

trunk/Lucide/BIN/Lucide.lng ¶

@@ -58 +58 @@
 TBHINT_FIND=Find...
 TBHINT_FINDAGAIN=Find again
+TBHINT_ZOOM_IN_OUT=Zoom in/out
 # toolbar's page number
 TB_PAGENUM=of %d

trunk/Lucide/SOURCE/gui/Lucide.rc ¶

@@ -17 +17 @@
 BITMAP IDB_FIND         "bitmaps\\find.bmp"
 BITMAP IDB_FINDAGAIN    "bitmaps\\findagain.bmp"
+BITMAP IDB_MGLASS       "bitmaps\\mglass.bmp"
 
 POINTER IDP_HAND        "bitmaps\\hand.ptr"

trunk/Lucide/SOURCE/gui/Lucide_res.H ¶

@@ -55 +55 @@
 #define IDB_FIND        30
 #define IDB_FINDAGAIN   31
+#define IDB_MGLASS              32
 
 #define IDM_MAINMENU    100

trunk/Lucide/SOURCE/gui/lucide.cpp ¶

@@ -159 +159 @@
     WinSendMsg( hToolBar, TBM_ENABLEITEM, MPFROMSHORT(CM_FITWIDTH), (MPARAM)scalable );
     WinEnableMenuItem( hWndMenu, CM_ZOOM_IN_OUT, scalable );
+    WinSendMsg( hToolBar, TBM_ENABLEITEM, MPFROMSHORT(CM_ZOOM_IN_OUT), (MPARAM)scalable );
     WinEnableControl( hToolBar, TBID_ZOOM, scalable );
     BOOL rotable = doc->isRotable( ev );
@@ -257 +258 @@
         WinSendMsg( hToolBar, TBM_ENABLEITEM, MPFROMSHORT(CM_FITWIDTH), (MPARAM)FALSE );
         WinEnableMenuItem( hWndMenu, CM_ZOOM_IN_OUT, FALSE );
+        WinSendMsg( hToolBar, TBM_ENABLEITEM, MPFROMSHORT(CM_ZOOM_IN_OUT), (MPARAM)FALSE );
         WinEnableControl( hToolBar, TBID_ZOOM, FALSE );
 
@@ -615 +617 @@
         WinSendMsg( hWndMenu, MM_SETITEMATTR, MPFROM2SHORT( CM_ZOOM_IN_OUT, TRUE ),
                 MPFROM2SHORT( MIA_CHECKED, isZoom ? MIA_CHECKED : FALSE ) );
+        WinSendMsg( hToolBar, TBM_SETCHECK, MPFROMSHORT( CM_ZOOM_IN_OUT ), (MPARAM)isZoom );
         docViewer->setZoomMode( isZoom );
     }

trunk/Lucide/SOURCE/gui/messages.cpp ¶

@@ -49 +49 @@
 const char *TBHINT_FIND          = "TBHINT_FIND";
 const char *TBHINT_FINDAGAIN     = "TBHINT_FINDAGAIN";
+const char *TBHINT_ZOOM_IN_OUT   = "TBHINT_ZOOM_IN_OUT";
 // toolbar's page number
 const char *TB_PAGENUM           = "TB_PAGENUM";

trunk/Lucide/SOURCE/gui/messages.h ¶

@@ -50 +50 @@
 extern const char *TBHINT_FIND;
 extern const char *TBHINT_FINDAGAIN;
+extern const char *TBHINT_ZOOM_IN_OUT;
 // toolbar's page number
 extern const char *TB_PAGENUM;

trunk/Lucide/SOURCE/gui/toolbar.cpp ¶

@@ -348 +348 @@
     WinSendMsg( hToolBar, TBM_ADDBUTTON, (MPARAM)&bs, MPVOID );
 
+    WinSendMsg( hToolBar, TBM_ADDSEPARATOR, MPVOID, MPVOID );
+
+    bs.cmd = CM_ZOOM_IN_OUT;
+    bs.bubbleText = newstrdupL( TBHINT_ZOOM_IN_OUT );
+    bs.bubbleRes = 0;
+    bs.bubbleHmod = NULLHANDLE;
+    bs.pictRes = IDB_MGLASS;
+    bs.pictHmod = NULLHANDLE;
+    bs.menuRes = 0;
+    bs.menuHmod = NULLHANDLE;
+    bs.checked = FALSE;
+    bs.enabled = TRUE;
+    WinSendMsg( hToolBar, TBM_ADDBUTTON, (MPARAM)&bs, MPVOID );
+
     return hToolBar;
 }

trunk/Lucide/changelog ¶

@@ -1 +1 @@
 Beta-4:
+  - Added 'Zoom In/Out' button to zoom in/out with mouse click/ctrl+click.
   - Replace ligatures when converting text from unicode to system 
     codepage (closed ticket #45).