Changeset 211

Timestamp:

Jul 26, 2007, 8:02:16 AM (14 years ago)

Author:

Eugene Romanenko

Message:

TAB key switch between navigation pane and document (closes #112, #123)

Location:

trunk/Lucide

Files:

• SOURCE/gui/Lucide.rc (modified) (1 diff)
• SOURCE/gui/Lucide_res.H (modified) (1 diff)
• SOURCE/gui/docViewer.cpp (modified) (1 diff)
• SOURCE/gui/indexWindow.cpp (modified) (1 diff)
• SOURCE/gui/indexWindow.h (modified) (1 diff)
• SOURCE/gui/lucide.cpp (modified) (4 diffs)
• SOURCE/gui/lucide.h (modified) (3 diffs)
• changelog (modified) (1 diff)

trunk/Lucide/SOURCE/gui/Lucide.rc

@@ -106 +106 @@
     "n", CM_GOTOPAGE, CONTROL
     VK_F11, CM_MAXVIEW, VIRTUALKEY
+    VK_TAB, CM_SWITCHWINDOW, VIRTUALKEY
 END
 

trunk/Lucide/SOURCE/gui/Lucide_res.H

@@ -99 +99 @@
 #define CM_MINIMIZE     701
 #define CM_TOFULLSCREEN 702
+#define CM_SWITCHWINDOW 703
 
 #define TBID_PAGENUM    1

trunk/Lucide/SOURCE/gui/docViewer.cpp

@@ -2080 +2080 @@
             }
             break;
+
+        case WM_FOCUSCHANGE:
+            if ( SHORT1FROMMP( mp2 ) ) {
+                Lucide::activeWindow = AwView;
+            }
+            break;
     }
 

trunk/Lucide/SOURCE/gui/indexWindow.cpp

@@ -283 +283 @@
             }
             break;
+            
+        case WM_FOCUSCHANGE:
+            if ( SHORT1FROMMP( mp2 ) ) {
+                Lucide::activeWindow = AwIndex;
+            }
+            break;
     }
 

trunk/Lucide/SOURCE/gui/indexWindow.h

@@ -53 +53 @@
 
         HWND getHWND() { return hWndPanel; }
+        HWND getIndexHWND() { return hWndIndex; }
         
         void setDocument( LuDocument *_doc );

trunk/Lucide/SOURCE/gui/lucide.cpp

@@ -107 +107 @@
 char         Lucide::docFileName[ CCHMAXPATHCOMP ] = "";
 char        *Lucide::password                      = NULL;
+ActiveWindow Lucide::activeWindow                  = AwView;
 // static data for asynch loading document
 ProgressDlg *Lucide::loadProgressDlg               = NULL;
@@ -697 +698 @@
 }
 
+void Lucide::focusIndex()
+{
+    WinSetFocus( HWND_DESKTOP, indexWin->getIndexHWND() );
+}
+
+void Lucide::cmdSwitchWindow()
+{
+    if ( activeWindow == AwIndex ) {
+        focusDocview();
+    } else {
+        focusIndex();
+    }
+}
+
 void Lucide::toggleZoom()
 {
@@ -940 +955 @@
                         WinSendMsg( hVertSplitter, SBM_SETSPLITTERPOS,
                             MPFROMSHORT( Lucide::showIndex ? Lucide::splitterPos : 0 ), MPVOID );
+                        if ( !Lucide::showIndex ) {
+                            Lucide::focusDocview();
+                        }
                     }
                     return (MRESULT)FALSE;
@@ -961 +979 @@
                 case CM_TOFULLSCREEN:
                     Lucide::cmdSwitchToFullscreen();
+                    return (MRESULT)FALSE;
+
+                case CM_SWITCHWINDOW:
+                    Lucide::cmdSwitchWindow();
                     return (MRESULT)FALSE;
             }

trunk/Lucide/SOURCE/gui/lucide.h

@@ -43 +43 @@
 
 enum PgLayout { SinglePage = 0, Continuous = 1 };
+enum ActiveWindow { AwIndex, AwView };
 
 struct LuWindowPos
@@ -82 +83 @@
         static SHORT splitterPos;
         static bool showIndex;
+                static ActiveWindow activeWindow;
         
         static void newWindow();
@@ -101 +103 @@
         static void toggleFullscreen();
         static void focusDocview();
+        static void focusIndex();
         static void cmdMinimize();
         static void cmdSwitchToFullscreen();
+        static void cmdSwitchWindow();
         static void createThumbnail( LuDocument *_doc );
         static bool isThumbNeeded( const char *fn );

trunk/Lucide/changelog

@@ -4 +4 @@
   - DJVU plugin: fix opening files with non-latin chars in filename.
   - PDF plugin: freetype library updated to version 2.3.5.
+  - TAB key switch between navigation pane and document
   - Updated NLS-files: Czech, French, Dutch.