Changeset 230

Timestamp:

Aug 18, 2007, 11:35:31 AM (14 years ago)

Author:

Eugene Romanenko

Message:

custom file dialog with preview

Location:

trunk/Lucide

Files:

• BIN/Lucide.lng (modified) (1 diff)
• BIN/Lucide_ru.lng (modified) (1 diff)
• SOURCE/gui/Lucide_res.H (modified) (1 diff)
• SOURCE/gui/dialogs.rc (modified) (3 diffs)
• SOURCE/gui/lcdfdlg.cpp (added)
• SOURCE/gui/lucide.cpp (modified) (2 diffs)
• SOURCE/gui/lucidethumbs.cpp (modified) (3 diffs)
• SOURCE/gui/makefile (modified) (4 diffs)
• SOURCE/gui/messages.cpp (modified) (1 diff)
• SOURCE/gui/messages.h (modified) (1 diff)
• SOURCE/gui/pluginman.cpp (modified) (1 diff)
• changelog (modified) (2 diffs)

trunk/Lucide/BIN/Lucide.lng

@@ -234 +234 @@
 PSW_OK=~OK
 PSW_CANCEL=~Cancel
+
+#
+# Open file dialog
+#
+FDLG_OPEN=Open
+FDLG_FILENAME=File~name
+FDLG_DRIVE=D~rive
+FDLG_FILETYPE=File ~Type
+FDLG_FILE=~File
+FDLG_DIRECTORY=~Directory
+FDLG_OK=~OK
+FDLG_CANCEL=~Cancel
+FDLG_NO_PREVIEW_AVAILABLE=No preview available

trunk/Lucide/BIN/Lucide_ru.lng

@@ -233 +233 @@
 PSW_OK=ŽŠ
 PSW_CANCEL=Žâª §
+
+#
+# Open file dialog
+#
+FDLG_OPEN=Žâªàëâì
+#FDLG_FILENAME=File~name
+#FDLG_DRIVE=D~rive
+#FDLG_FILETYPE=File ~Type
+#FDLG_FILE=~File
+#FDLG_DIRECTORY=~Directory
+#FDLG_OK=~OK
+FDLG_CANCEL=Žâª §
+FDLG_NO_PREVIEW_AVAILABLE=à¥€¯à®á¬®âà ­¥€®áâ㯥­

trunk/Lucide/SOURCE/gui/Lucide_res.H

@@ -176 +176 @@
 #define IDC_PASSWORD        10
 
+#define IDD_LCD_FILEDLG     1010
+#define IDC_PREVIEW                     5000
+
 
 #endif // __LUCIDE_RES_H

trunk/Lucide/SOURCE/gui/dialogs.rc

@@ -56 +56 @@
                 PRESPARAMS PP_FONTNAMESIZE "9.WarpSans"
         END
-
 END
 
@@ -216 +215 @@
                 PRESPARAMS PP_FONTNAMESIZE "9.WarpSans"
         END
-
 END
 
@@ -233 +231 @@
                 PRESPARAMS PP_FONTNAMESIZE "9.WarpSans"
         END
-
-END
-
+END
+
+DLGTEMPLATE IDD_LCD_FILEDLG
+BEGIN
+        DIALOG "FDLG_OPEN", -1, 4, 3, 291, 188, FS_NOBYTEALIGN | FS_DLGBORDER | WS_CLIPSIBLINGS | WS_SAVEBITS, FCF_SYSMENU | FCF_TITLEBAR | FCF_DLGBORDER
+        BEGIN
+                CONTROL "FDLG_FILENAME", DID_FILENAME_TXT, 5, 174, 36, 7, WC_STATIC, SS_TEXT | DT_LEFT | DT_TOP | WS_VISIBLE | WS_GROUP
+                PRESPARAMS PP_FONTNAMESIZE , "9.WarpSans"
+                CONTROL "", DID_FILENAME_ED, 45, 175, 238, 6, WC_ENTRYFIELD, ES_AUTOSCROLL | ES_LEFT | ES_MARGIN | WS_TABSTOP | WS_VISIBLE
+                PRESPARAMS PP_FONTNAMESIZE , "9.WarpSans"
+                CONTROL "FDLG_DRIVE", DID_DRIVE_TXT, 5, 160, 36, 8, WC_STATIC, SS_TEXT | DT_LEFT | DT_TOP | WS_VISIBLE | WS_GROUP
+                PRESPARAMS PP_FONTNAMESIZE , "9.WarpSans"
+                CONTROL "", DID_DRIVE_CB, 43, 118, 83, 51, WC_COMBOBOX, CBS_DROPDOWNLIST | WS_TABSTOP | WS_VISIBLE
+                PRESPARAMS PP_FONTNAMESIZE , "9.WarpSans"
+                CONTROL "FDLG_FILETYPE", DID_FILTER_TXT, 135, 160, 42, 8, WC_STATIC, SS_TEXT | DT_LEFT | DT_TOP | WS_VISIBLE | WS_GROUP
+                PRESPARAMS PP_FONTNAMESIZE , "9.WarpSans"
+                CONTROL "", DID_FILTER_CB, 178, 43, 107, 126, WC_COMBOBOX, CBS_DROPDOWNLIST | WS_TABSTOP | WS_VISIBLE
+                PRESPARAMS PP_FONTNAMESIZE , "9.WarpSans"
+                CONTROL "FDLG_FILE", DID_FILES_TXT, 130, 146, 118, 8, WC_STATIC, SS_TEXT | DT_LEFT | DT_TOP | WS_VISIBLE | WS_GROUP
+                PRESPARAMS PP_FONTNAMESIZE , "9.WarpSans"
+                CONTROL "", DID_FILES_LB, 129, 23, 120, 120, WC_LISTBOX, LS_HORZSCROLL | LS_NOADJUSTPOS | WS_VISIBLE | WS_TABSTOP
+                PRESPARAMS PP_FONTNAMESIZE , "9.WarpSans"
+                CONTROL "FDLG_DIRECTORY", DID_DIRECTORY_TXT, 5, 146, 119, 8, WC_STATIC, SS_TEXT | DT_LEFT | DT_TOP | WS_VISIBLE | WS_GROUP
+                PRESPARAMS PP_FONTNAMESIZE , "9.WarpSans"
+                CONTROL "", DID_DIRECTORY_LB, 4, 23, 120, 120, WC_LISTBOX, LS_HORZSCROLL | LS_OWNERDRAW | LS_NOADJUSTPOS | WS_VISIBLE | WS_TABSTOP
+                PRESPARAMS PP_FONTNAMESIZE , "9.WarpSans"
+                CONTROL "FDLG_OK", DID_OK_PB, 4, 3, 50, 14, WC_BUTTON, BS_DEFAULT | BS_PUSHBUTTON | WS_TABSTOP | WS_VISIBLE | WS_GROUP
+                PRESPARAMS PP_FONTNAMESIZE , "9.WarpSans"
+                CONTROL "FDLG_CANCEL", DID_CANCEL_PB, 57, 3, 50, 14, WC_BUTTON, BS_PUSHBUTTON | WS_VISIBLE
+                PRESPARAMS PP_FONTNAMESIZE , "9.WarpSans"
+                CONTROL "Preview", IDC_PREVIEW, 256, 5, 28, 138, WC_STATIC, SS_TEXT | DT_CENTER | DT_VCENTER | DT_MNEMONIC | WS_VISIBLE | WS_GROUP
+                PRESPARAMS PP_FONTNAMESIZE , "9.WarpSans"
+        END
+END
+

trunk/Lucide/SOURCE/gui/lucide.cpp

@@ -81 +81 @@
 void initPipeMon( HWND hWndFrame );
 void unInitPipeMon();
+HWND LcdFileDlg( HWND hwndP, HWND hwndO, FILEDLG *pfild );
+
 
 HAB   hab            = NULLHANDLE;
@@ -584 +586 @@
     snprintf( fd->szFullFile, sizeof( fd->szFullFile ),
               "%s%s", dirbuf, pluginMan->getExtsMask().c_str() );
-    WinFileDlg( HWND_DESKTOP, hWndFrame, fd );
+    LcdFileDlg( HWND_DESKTOP, hWndFrame, fd );
     if ( fd->lReturn == DID_OK )
     {

trunk/Lucide/SOURCE/gui/lucidethumbs.cpp

@@ -73 +73 @@
 ULONG  APIENTRY (*pMmioSetHeader)(HMMIO,PVOID,LONG,PLONG,ULONG,ULONG);
 USHORT APIENTRY (*pMmioClose)(HMMIO,USHORT);
+ULONG  APIENTRY (*pMmioIdentifyFile)(PSZ,PMMIOINFO,PMMFORMATINFO,PFOURCC,ULONG,ULONG);
+ULONG  APIENTRY (*pMmioQueryHeaderLength)(HMMIO,PLONG,ULONG,ULONG);
+ULONG  APIENTRY (*pMmioGetHeader)(HMMIO,PVOID,LONG,PLONG,ULONG,ULONG);
+LONG   APIENTRY (*pMmioRead)(HMMIO,PCHAR,LONG);
 
 static bool loadMMIOFuncs()
@@ -88 +92 @@
             break;
         if ( DosQueryProcAddr( mmioHndl, 0, "mmioClose", (PFN *)&pMmioClose ) != 0 )
+            break;
+        if ( DosQueryProcAddr( mmioHndl, 0, "mmioIdentifyFile", (PFN *)&pMmioIdentifyFile ) != 0 )
+            break;
+        if ( DosQueryProcAddr( mmioHndl, 0, "mmioQueryHeaderLength", (PFN *)&pMmioQueryHeaderLength ) != 0 )
+            break;
+        if ( DosQueryProcAddr( mmioHndl, 0, "mmioGetHeader", (PFN *)&pMmioGetHeader ) != 0 )
+            break;
+        if ( DosQueryProcAddr( mmioHndl, 0, "mmioRead", (PFN *)&pMmioRead ) != 0 )
             break;
 
@@ -347 +359 @@
 }
 
+
+HBITMAP LoadBitmap( HAB hab, HDC hdc, HPS *hps, PSZ pszFileName )
+{
+    HBITMAP       hbm;
+    MMIOINFO      mmioinfo;
+    MMFORMATINFO  mmFormatInfo;
+    HMMIO         hmmio;
+    ULONG         ulImageHeaderLength;
+    MMIMAGEHEADER mmImgHdr;
+    ULONG         ulBytesRead;
+    ULONG         dwNumRowBytes;
+    PBYTE         pRowBuffer;
+    ULONG         dwRowCount;
+    SIZEL         ImageSize;
+    ULONG         dwHeight, dwWidth;
+    SHORT         wBitCount;
+    FOURCC        fccStorageSystem;
+    ULONG         dwPadBytes;
+    ULONG         dwRowBits;
+    ULONG         ulReturnCode;
+    ULONG         dwReturnCode;
+    HBITMAP       hbReturnCode;
+    LONG          lReturnCode;
+    FOURCC        fccIOProc;
+
+
+    ulReturnCode = pMmioIdentifyFile( pszFileName, 0L, &mmFormatInfo,
+                                      &fccStorageSystem, 0L, 0L );
+    if ( ulReturnCode == MMIO_ERROR ) {
+         return NULLHANDLE;
+    }
+
+    if( mmFormatInfo.fccIOProc == FOURCC_DOS ) {
+         return NULLHANDLE;
+    }
+
+    if ( (mmFormatInfo.ulMediaType != MMIO_MEDIATYPE_IMAGE) ||
+         ((mmFormatInfo.ulFlags & MMIO_CANREADTRANSLATED) == 0) ) {
+         return NULLHANDLE;
+    }
+    else {
+         fccIOProc = mmFormatInfo.fccIOProc;
+    }
+
+    memset( &mmioinfo, 0L, sizeof( MMIOINFO ) );
+    mmioinfo.fccIOProc = fccIOProc;
+    mmioinfo.ulTranslate = MMIO_TRANSLATEHEADER | MMIO_TRANSLATEDATA;
+
+    hmmio = pMmioOpen( (PSZ)pszFileName, &mmioinfo,
+                      MMIO_READ | MMIO_DENYWRITE | MMIO_NOIDENTIFY );
+
+    if ( !hmmio ) {
+         return NULLHANDLE;
+    }
+
+    dwReturnCode = pMmioQueryHeaderLength( hmmio, (PLONG)&ulImageHeaderLength, 0L, 0L );
+
+    if ( ulImageHeaderLength != sizeof ( MMIMAGEHEADER ) ) {
+         pMmioClose( hmmio, 0L );
+         return NULLHANDLE;
+    }
+
+    ulReturnCode = pMmioGetHeader( hmmio, &mmImgHdr, sizeof( MMIMAGEHEADER ),
+                                   (PLONG)&ulBytesRead, 0L, 0L );
+
+    if ( ulReturnCode != MMIO_SUCCESS ) {
+         pMmioClose( hmmio, 0L );
+         return NULLHANDLE;
+    }
+
+    dwHeight = mmImgHdr.mmXDIBHeader.BMPInfoHeader2.cy;
+    dwWidth = mmImgHdr.mmXDIBHeader.BMPInfoHeader2.cx;
+    wBitCount = mmImgHdr.mmXDIBHeader.BMPInfoHeader2.cBitCount;
+    dwRowBits = dwWidth * mmImgHdr.mmXDIBHeader.BMPInfoHeader2.cBitCount;
+    dwNumRowBytes = dwRowBits >> 3;
+
+    if ( dwRowBits % 8 ) {
+         dwNumRowBytes++;
+    }
+
+    dwPadBytes = ( dwNumRowBytes % 4 );
+
+    if ( dwPadBytes ) {
+         dwNumRowBytes += 4 - dwPadBytes;
+    }
+
+    pRowBuffer = (PBYTE)malloc( dwNumRowBytes );
+
+    ImageSize.cx = dwWidth;
+    ImageSize.cy = dwHeight;
+
+    *hps = GpiCreatePS( hab, hdc, &ImageSize,
+                        PU_PELS | GPIF_DEFAULT | GPIT_MICRO | GPIA_ASSOC );
+
+    if ( !*hps ) {
+        free( pRowBuffer );
+        pMmioClose( hmmio, 0L );
+        return NULLHANDLE;
+    }
+
+    hbm = GpiCreateBitmap( *hps, &mmImgHdr.mmXDIBHeader.BMPInfoHeader2, 0L, NULL, NULL );
+
+    if ( !hbm )
+    {
+        free( pRowBuffer );
+        pMmioClose( hmmio, 0L );
+        return NULLHANDLE;
+    }
+
+    hbReturnCode = GpiSetBitmap( *hps, hbm );
+
+    for ( dwRowCount = 0; dwRowCount < dwHeight; dwRowCount++ )
+    {
+         ulBytesRead = pMmioRead( hmmio, pRowBuffer, dwNumRowBytes );
+
+         if ( !ulBytesRead ) {
+              break;
+         }
+
+         lReturnCode = GpiSetBitmapBits( *hps, dwRowCount, 1, pRowBuffer,
+                                         (PBITMAPINFO2)&mmImgHdr.mmXDIBHeader.BMPInfoHeader2 );
+    }
+
+    pMmioClose( hmmio, 0L );
+    free( pRowBuffer );
+
+    return hbm;
+}
+

trunk/Lucide/SOURCE/gui/makefile

@@ -2 +2 @@
 
 TEST=0
-VERSION=1.02
+VERSION=1.10-test
 
 !if $(TEST)==1
@@ -38 +38 @@
        aboutDlg.obj settingsDlg.obj lusettings.obj printDlg.obj \
        print.obj stbrowser.obj pipemon.obj lucidethumbs.obj \
-       passwordDlg.obj recent.obj
+       passwordDlg.obj recent.obj lcdfdlg.obj
 
 lucide.dll: $(OBJS) lucide.res
@@ -74 +74 @@
 file $(OBJDIR)\passwordDlg.obj
 file $(OBJDIR)\recent.obj
+file $(OBJDIR)\lcdfdlg.obj
 name $(EXEDIR)\lucide
 lib ..\plugins\ludoc\ludoc
@@ -137 +138 @@
 passwordDlg.obj:    passwordDlg.cpp
 recent.obj:         recent.cpp
+lcdfdlg.obj:        lcdfdlg.cpp
 lcd.obj:            lcd.c               makefile
 

trunk/Lucide/SOURCE/gui/messages.cpp

@@ -129 +129 @@
 const char *PRINT_FAILED                = "PRINT_FAILED";
 
+// Open file dialog
+const char *FDLG_NO_PREVIEW_AVAILABLE = "FDLG_NO_PREVIEW_AVAILABLE";

trunk/Lucide/SOURCE/gui/messages.h

@@ -130 +130 @@
 extern const char *PRINT_FAILED;
 
+// Open file dialog
+extern const char *FDLG_NO_PREVIEW_AVAILABLE;
+
 
 #endif // __MESSAGES_H

trunk/Lucide/SOURCE/gui/pluginman.cpp

@@ -310 +310 @@
         char *p = strtok( tmpexts, ";" );
         while ( p != NULL ) {
-            cRet += "*.";
+            cRet += '*';
             cRet += p;
-            cRet += ";";
+            cRet += ';';
             p = strtok( NULL, ";" );
         }

trunk/Lucide/changelog

@@ -1 @@
-1.02:
+1.10-test:
   - JPG plugin: added support for quality image scaling.  
   - If the filename does not have an extension or the extension is unknown,
@@ -7 +7 @@
     directory.
   - List of recent files.
+  - Custom file dialog with preview.
   - Hotkeys (Ctrl+0/1/2) for predefined zoom levels.
   - UClip package is optional now.