Changeset 211
- Timestamp:
- Jul 26, 2007, 8:02:16 AM (14 years ago)
- Location:
- trunk/Lucide
- Files:
-
- 8 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/Lucide/SOURCE/gui/Lucide.rc
r161 r211 106 106 "n", CM_GOTOPAGE, CONTROL 107 107 VK_F11, CM_MAXVIEW, VIRTUALKEY 108 VK_TAB, CM_SWITCHWINDOW, VIRTUALKEY 108 109 END 109 110 -
trunk/Lucide/SOURCE/gui/Lucide_res.H
r183 r211 99 99 #define CM_MINIMIZE 701 100 100 #define CM_TOFULLSCREEN 702 101 #define CM_SWITCHWINDOW 703 101 102 102 103 #define TBID_PAGENUM 1 -
trunk/Lucide/SOURCE/gui/docViewer.cpp
r171 r211 2080 2080 } 2081 2081 break; 2082 2083 case WM_FOCUSCHANGE: 2084 if ( SHORT1FROMMP( mp2 ) ) { 2085 Lucide::activeWindow = AwView; 2086 } 2087 break; 2082 2088 } 2083 2089 -
trunk/Lucide/SOURCE/gui/indexWindow.cpp
r94 r211 283 283 } 284 284 break; 285 286 case WM_FOCUSCHANGE: 287 if ( SHORT1FROMMP( mp2 ) ) { 288 Lucide::activeWindow = AwIndex; 289 } 290 break; 285 291 } 286 292 -
trunk/Lucide/SOURCE/gui/indexWindow.h
r91 r211 53 53 54 54 HWND getHWND() { return hWndPanel; } 55 HWND getIndexHWND() { return hWndIndex; } 55 56 56 57 void setDocument( LuDocument *_doc ); -
trunk/Lucide/SOURCE/gui/lucide.cpp
r177 r211 107 107 char Lucide::docFileName[ CCHMAXPATHCOMP ] = ""; 108 108 char *Lucide::password = NULL; 109 ActiveWindow Lucide::activeWindow = AwView; 109 110 // static data for asynch loading document 110 111 ProgressDlg *Lucide::loadProgressDlg = NULL; … … 697 698 } 698 699 700 void Lucide::focusIndex() 701 { 702 WinSetFocus( HWND_DESKTOP, indexWin->getIndexHWND() ); 703 } 704 705 void Lucide::cmdSwitchWindow() 706 { 707 if ( activeWindow == AwIndex ) { 708 focusDocview(); 709 } else { 710 focusIndex(); 711 } 712 } 713 699 714 void Lucide::toggleZoom() 700 715 { … … 940 955 WinSendMsg( hVertSplitter, SBM_SETSPLITTERPOS, 941 956 MPFROMSHORT( Lucide::showIndex ? Lucide::splitterPos : 0 ), MPVOID ); 957 if ( !Lucide::showIndex ) { 958 Lucide::focusDocview(); 959 } 942 960 } 943 961 return (MRESULT)FALSE; … … 961 979 case CM_TOFULLSCREEN: 962 980 Lucide::cmdSwitchToFullscreen(); 981 return (MRESULT)FALSE; 982 983 case CM_SWITCHWINDOW: 984 Lucide::cmdSwitchWindow(); 963 985 return (MRESULT)FALSE; 964 986 } -
trunk/Lucide/SOURCE/gui/lucide.h
r177 r211 43 43 44 44 enum PgLayout { SinglePage = 0, Continuous = 1 }; 45 enum ActiveWindow { AwIndex, AwView }; 45 46 46 47 struct LuWindowPos … … 82 83 static SHORT splitterPos; 83 84 static bool showIndex; 85 static ActiveWindow activeWindow; 84 86 85 87 static void newWindow(); … … 101 103 static void toggleFullscreen(); 102 104 static void focusDocview(); 105 static void focusIndex(); 103 106 static void cmdMinimize(); 104 107 static void cmdSwitchToFullscreen(); 108 static void cmdSwitchWindow(); 105 109 static void createThumbnail( LuDocument *_doc ); 106 110 static bool isThumbNeeded( const char *fn ); -
trunk/Lucide/changelog
r210 r211 4 4 - DJVU plugin: fix opening files with non-latin chars in filename. 5 5 - PDF plugin: freetype library updated to version 2.3.5. 6 - TAB key switch between navigation pane and document 6 7 - Updated NLS-files: Czech, French, Dutch. 7 8
Note: See TracChangeset
for help on using the changeset viewer.