Changeset 267

Timestamp:

Feb 24, 2009, 3:52:22 PM (12 years ago)

Author:

Eugene Romanenko

Message:

close menuitem

Location:

trunk/Lucide

Files:

• BIN/Lucide.lng (modified) (1 diff)
• BIN/Lucide_ru.lng (modified) (1 diff)
• SOURCE/gui/Lucide.rc (modified) (1 diff)
• SOURCE/gui/Lucide_res.H (modified) (1 diff)
• SOURCE/gui/lucide.cpp (modified) (4 diffs)

trunk/Lucide/BIN/Lucide.lng

@@ -17 +17 @@
 MENU_CLEAR_LIST=~Clear list
 MENU_SAVE_AS=~Save As...
+MENU_CLOSE=~Close
 # MENU_PAGE_SETUP: to delete
 MENU_PAGE_SETUP=Pa~ge setup...

trunk/Lucide/BIN/Lucide_ru.lng

@@ -14 +14 @@
 MENU_NEXT=‘«¥€ãîéš©\tShift+PgDn
 MENU_LAST=®á«¥€­š©\tShift+End
+MENU_RECENT_FILES=¥~€ ¢­š¥ ä ©«ë
+MENU_CLEAR_LIST=~Žçšáâšâì
 MENU_SAVE_AS=~‘®åà ­šâì ª ª...
+MENU_CLOSE=~‡ ªàëâì
 # MENU_PAGE_SETUP: to delete
 MENU_PAGE_SETUP= ~à ¬¥âàë áâà ­šæë...

trunk/Lucide/SOURCE/gui/Lucide.rc

@@ -40 +40 @@
         END
         MENUITEM "MENU_SAVE_AS", CM_SAVEAS
+        MENUITEM "MENU_CLOSE", CM_CLOSE
         MENUITEM SEPARATOR
         MENUITEM "MENU_PRINT", CM_PRINT

trunk/Lucide/SOURCE/gui/Lucide_res.H

@@ -63 +63 @@
 #define CM_OPEN         102
 #define CM_SAVEAS       103
-#define CM_PRINT        104
-#define CM_PLUGINSLIST  105
-#define CM_EXIT         106
+#define CM_CLOSE        104
+#define CM_PRINT        105
+#define CM_PLUGINSLIST  106
+#define CM_EXIT         107
 
 #define CM_FILEFIRST    151

trunk/Lucide/SOURCE/gui/lucide.cpp

@@ -263 +263 @@
 
         WinEnableMenuItem( hWndMenu, CM_SAVEAS, FALSE );
+        WinEnableMenuItem( hWndMenu, CM_CLOSE, FALSE );
         WinEnableMenuItem( hWndMenu, CM_PRINT, FALSE );
         WinSendMsg( hToolBar, TBM_ENABLEITEM, MPFROMSHORT(CM_PRINT), (MPARAM)FALSE );
@@ -313 +314 @@
     WinSendMsg( hToolBar, TBM_ENABLEITEM, MPFROMSHORT(CM_PRINT), (MPARAM)TRUE );
     WinEnableMenuItem( hWndMenu, CM_SAVEAS, doc->isSaveable( ev ) );
+    WinEnableMenuItem( hWndMenu, CM_CLOSE, TRUE );
     setOfPages( doc->getPageCount( ev ) );
     WinEnableMenuItem( hWndMenu, CM_FONTSINFO, doc->isHaveFontInfo( ev ) );
@@ -365 +367 @@
 void Lucide::closeDocument()
 {
-    docViewer->close();
-    delete doc;
-    doc = NULL;
-    WinSetWindowText( hWndFrame, title );
-    checkMenus( false );
+    if ( doc != NULL ) {    
+        docViewer->close();
+        delete doc;
+        doc = NULL;
+        WinSetWindowText( hWndFrame, title );
+        checkMenus( false );
+    }
 
     if ( thumbnailData != NULL ) {
@@ -961 +965 @@
                     Lucide::saveDocumentAs();
                     return (MRESULT)FALSE;
+                    
+                case CM_CLOSE:
+                    Lucide::closeDocument();
+                    return (MRESULT)FALSE;
 
                 case CM_PRINT: