Changeset 238

Timestamp:

Aug 27, 2007, 8:11:21 PM (18 years ago)

Author:

Eugene Romanenko

Message:

fix for ticket #86, testing needed

Location:

trunk/Lucide

Files:

• BIN/Lucide.lng (modified) (1 diff)
• BIN/Lucide_ru.lng (modified) (1 diff)
• SOURCE/gui/lcdfdlg.cpp (modified) (8 diffs)
• SOURCE/gui/lucide.cpp (modified) (2 diffs)
• SOURCE/gui/messages.cpp (modified) (1 diff)
• SOURCE/gui/messages.h (modified) (1 diff)
• SOURCE/gui/pluginman.cpp (modified) (1 diff)
• SOURCE/gui/pluginman.h (modified) (1 diff)

trunk/Lucide/BIN/Lucide.lng ¶

@@ -247 +247 @@
 FDLG_CANCEL=~Cancel
 FDLG_NO_PREVIEW_AVAILABLE=No preview available
+FDLG_ALL_SUPPORTED_TYPES=<All supported types>

trunk/Lucide/BIN/Lucide_ru.lng ¶

@@ -246 +246 @@
 FDLG_CANCEL=Žâª §
 FDLG_NO_PREVIEW_AVAILABLE=à¥€¯à®á¬®âà ­¥€®áâ㯥­
+FDLG_ALL_SUPPORTED_TYPES=<‚ᥠ¯®€€¥àŠš¢ ¥¬ë¥ ⚯ë>

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

@@ -10 +10 @@
 
 #include "globals.h"
+#include "pluginman.h"
 #include "lucide_res.h"
 #include "luutils.h"
@@ -15 +16 @@
 
 
-static HWND hWndFrame = NULLHANDLE;
+static HWND hWndFrame            = NULLHANDLE;
+static char *szAllSupportedTypes = NULL;
 
 void previewFile( HWND hwnd, const char *fn );
@@ -143 +145 @@
 }
 
+static bool isAllFiles( HWND hwnd )
+{
+    char ftext[ 200 ];
+    WinQueryDlgItemText( hwnd, DID_FILTER_CB, sizeof( ftext ), ftext );
+    return ( strcmp( ftext, szAllSupportedTypes ) != 0 );
+}
+
+static BOOL checkFile( char *file, std::vector<std::string> *extList )
+{
+    BOOL rVal = FALSE;
+    std::vector<std::string>::const_iterator iter;
+    for ( iter = extList->begin(); iter != extList->end(); iter++ )
+    {
+        char ext[ 100 ];
+        ext[0] = '.';
+        ext[1] = 0;
+        strcat( ext, (*iter).c_str() );
+        int flen = strlen( file );
+        int elen = strlen( ext );
+
+        if ( flen < elen ) {
+            continue;
+        }
+
+        char *compare_pos = file + flen - elen;
+        if ( stricmp( compare_pos, ext ) == 0 ) {
+            rVal = TRUE;
+            break;
+        }
+    }
+
+    return rVal;
+}
+
+
+struct LcdFDlgData
+{
+    bool isAllFiles;
+    std::vector<std::string> *extList;
+
+    LcdFDlgData() {
+        isAllFiles = false;
+        extList = new std::vector<std::string>;
+    }
+
+    ~LcdFDlgData() {
+        delete extList;
+    }
+};
 
 static MRESULT EXPENTRY LcdFileDlgProc( HWND hwnd, ULONG msg, MPARAM mp1, MPARAM mp2 )
 {
+    FILEDLG *pfild = (FILEDLG *)WinQueryWindowULong( hwnd, QWL_USER );
+
     switch ( msg )
     {
@@ -154 +207 @@
             centerWindow( hWndFrame, hwnd );
             previewImageCreate( WinWindowFromID( hwnd, IDC_PREVIEW ) );
+            SHORT sInx = SHORT1FROMMR( WinSendDlgItemMsg( hwnd, DID_FILTER_CB, LM_SEARCHSTRING,
+                    MPFROM2SHORT( LSS_CASESENSITIVE, 0 ), MPFROMP( szAllSupportedTypes ) ) );
+            WinSendDlgItemMsg( hwnd, DID_FILTER_CB, LM_SELECTITEM,
+                               MPFROMSHORT( sInx ), MPFROMSHORT( TRUE ) );
+
+            ((LcdFDlgData *)pfild->ulUser)->isAllFiles = isAllFiles( hwnd );
         }
         break;
 
+        case FDM_FILTER:
+            if ( ((LcdFDlgData *)pfild->ulUser)->isAllFiles ) {
+                return (MRESULT)TRUE;
+            }
+            else {
+                return (MRESULT)checkFile( (char *)mp1,
+                                           ((LcdFDlgData *)pfild->ulUser)->extList );
+            }
+
         case WM_CONTROL:
         {
-            switch (SHORT1FROMMP(mp1))
+            switch ( SHORT1FROMMP(mp1) )
             {
                 case DID_FILES_LB:
                     if (SHORT2FROMMP(mp1) == LN_SELECT)
                     {
-                        const MRESULT mr = WinDefFileDlgProc(hwnd, msg, mp1, mp2);
+                        const MRESULT mr = WinDefFileDlgProc( hwnd, msg, mp1, mp2 );
 
                         const HWND lbHwnd = HWNDFROMMP(mp2);
@@ -170 +238 @@
 
                         char itemText[ CCHMAXPATH ] = { 0 };
-
 
                         if ( index >= 0 )
                         {
                             char fn[ CCHMAXPATH ] = { 0 };
-                            FILEDLG *pfild = (FILEDLG *)WinQueryWindowULong(hwnd, QWL_USER);
                             WinQueryLboxItemText( lbHwnd, (SHORT)index, itemText, CCHMAXPATH );
                             strcpy( fn, pfild->szFullFile );
@@ -185 +251 @@
                     }
                     break;
+
+                case DID_FILTER_CB:
+                    ((LcdFDlgData *)pfild->ulUser)->isAllFiles = isAllFiles( hwnd );
+                    break;
             }
         }
@@ -198 +268 @@
 {
     hWndFrame = hwndO;
+    if ( szAllSupportedTypes == NULL ) {
+        szAllSupportedTypes = newstrdupL( FDLG_ALL_SUPPORTED_TYPES );
+    }
 
     pfild->fl |= FDS_CUSTOM;
@@ -208 +281 @@
     pfild->usDlgId = IDD_LCD_FILEDLG;
 
-    return WinFileDlg( hwndP, hwndO, pfild );
+    char **apsz;
+    apsz = (char **)malloc( sizeof( char* ) * 2 );
+    apsz[ 0 ] = szAllSupportedTypes;
+    apsz[ 1 ] = NULL;
+    pfild->papszITypeList = (PAPSZ)apsz;
+    pfild->ulUser = (ULONG)new LcdFDlgData;
+    pluginMan->getExtsList( ((LcdFDlgData *)pfild->ulUser)->extList );
+    HWND hDlg = WinFileDlg( hwndP, hwndO, pfild );
+    free( apsz );
+    delete ((LcdFDlgData *)pfild->ulUser);
+    return hDlg;
 }
 

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

@@ -588 +588 @@
 void Lucide::openDocument()
 {
-    char dirbuf[ CCHMAXPATH ];
     PFILEDLG fd = new FILEDLG;
     memset( fd, 0, sizeof( FILEDLG ) );
@@ -594 +593 @@
     fd->fl = FDS_CENTER | FDS_OPEN_DIALOG;
     PrfQueryProfileString( HINI_USERPROFILE, appName, lvd, "",
-                           dirbuf, sizeof( dirbuf ) );
-    snprintf( fd->szFullFile, sizeof( fd->szFullFile ),
-              "%s%s", dirbuf, pluginMan->getExtsMask().c_str() );
+                           fd->szFullFile, sizeof( fd->szFullFile ) );
     LcdFileDlg( HWND_DESKTOP, hWndFrame, fd );
     if ( fd->lReturn == DID_OK )

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

@@ -131 +131 @@
 // Open file dialog
 const char *FDLG_NO_PREVIEW_AVAILABLE = "FDLG_NO_PREVIEW_AVAILABLE";
+const char *FDLG_ALL_SUPPORTED_TYPES  = "FDLG_ALL_SUPPORTED_TYPES";

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

@@ -132 +132 @@
 // Open file dialog
 extern const char *FDLG_NO_PREVIEW_AVAILABLE;
+extern const char *FDLG_ALL_SUPPORTED_TYPES;
 
 

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

@@ -315 +315 @@
             p = strtok( NULL, ";" );
         }
+        delete tmpexts;
     }
     return cRet;
 }
 
-
+void PluginManager::getExtsList( std::vector<std::string> *list )
+{
+    for ( int i = 0; i < plugins->size(); i++ )
+    {
+        PluginInfo *pi = &(*plugins)[ i ];
+        char *tmpexts = newstrdup( pi->extensions.c_str() );
+        char *p = strtok( tmpexts, ";" );
+        while ( p != NULL ) {
+            list->push_back( p );
+            p = strtok( NULL, ";" );
+        }
+        delete tmpexts;
+    }
+}
+
+

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

@@ -67 +67 @@
         LuDocument *createDocumentForExt( const char *ext, bool checkOnly );
         std::string getExtsMask();
+        void getExtsList( std::vector<std::string> *list );
 };