Implement file filtering (matching of file name patterns and file

types).

Implement file filtering (matching of file name patterns and file
4e3fd5f3 · Martin Fuchs · Alexandre Julliard · 98b2e381 · 4e3fd5f3 · 4e3fd5f3
Commit 4e3fd5f3 authored May 29, 2005 by Martin Fuchs Committed by Alexandre Julliard May 29, 2005
17 changed files
--- a/programs/winefile/Cs.rc
+++ b/programs/winefile/Cs.rc
@@ -98,7 +98,7 @@ IDM_WINEFILE MENU FIXED IMPURE
 		MENUITEM "Tdit dle Velikost&i" , 		406
 		MENUITEM "Tdit dle &data" , 		407
 		MENUITEM SEPARATOR
-		MENUITEM "Tdit dle  &..." ,			409
+		MENUITEM "Tdit dle  &..." ,			ID_VIEW_FILTER
 	}

 	POPUP "&Nastaven"  {

--- a/programs/winefile/De.rc
+++ b/programs/winefile/De.rc
@@ -2,7 +2,7 @@
 * Winefile
 * German Language Support
 *
- * Copyright 2000 Martin Fuchs
+ * Copyright 2000, 2005 Martin Fuchs
 * Copyright 2002 Steven Edwards
 * Copyright 2002 Alexandre Julliard
 *
@@ -98,7 +98,7 @@ IDM_WINEFILE MENU FIXED IMPURE
 		MENUITEM "Nach &Gre" , 	ID_VIEW_SORT_SIZE
 		MENUITEM "Nach &Datum" , 	ID_VIEW_SORT_DATE
 		MENUITEM SEPARATOR
-		MENUITEM "Angaben ausw&hlen..." ,			409
+		MENUITEM "Angaben ausw&hlen..." ,			ID_VIEW_FILTER
 	}

 	POPUP "&Optionen"  {
@@ -178,6 +178,29 @@ FONT 8, "MS Shell Dlg"
 	PUSHBUTTON		"&Durchsuchen" , 254, 158, 43, 47, 14
 }

+IDD_DIALOG_VIEW_TYPE DIALOG DISCARDABLE 15, 13, 161, 97
+STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
+CAPTION "Angaben auswhlen"
+FONT 8, "MS Sans Serif"
+BEGIN
+    LTEXT           "&Name:",-1,7,8,22,10
+    EDITTEXT        IDC_VIEW_PATTERN,31,7,63,12,ES_AUTOHSCROLL
+    GROUPBOX        "Dateityp",-1,7,23,87,56
+    CONTROL         "&Verzeichnisse",IDC_VIEW_TYPE_DIRECTORIES,"Button",
+                    BS_AUTOCHECKBOX | WS_TABSTOP,13,32,70,10
+    CONTROL         "&Programme",IDC_VIEW_TYPE_PROGRAMS,"Button",
+                    BS_AUTOCHECKBOX | WS_TABSTOP,13,43,70,10
+    CONTROL         "&Dokumente",IDC_VIEW_TYPE_DOCUMENTS,"Button",
+                    BS_AUTOCHECKBOX | WS_TABSTOP,13,54,70,10
+    CONTROL         "&Andere Dateien",IDC_VIEW_TYPE_OTHERS,"Button",
+                    BS_AUTOCHECKBOX | WS_TABSTOP,13,65,70,10
+    CONTROL         "Vers&teckte/Systemdateien anzeigen",IDC_VIEW_TYPE_HIDDEN,
+                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,81,106,9
+    DEFPUSHBUTTON   "OK",IDOK,104,7,50,14
+    PUSHBUTTON      "Cancel",IDCANCEL,104,24,50,14
+END
+
+
 STRINGTABLE
 {
 	IDS_FONT_SEL_DLG_NAME	"Anwenden der Schriftarteinstellung"

--- a/programs/winefile/En.rc
+++ b/programs/winefile/En.rc
@@ -97,7 +97,7 @@ IDM_WINEFILE MENU FIXED IMPURE
 		MENUITEM "Sort by Si&ze" , 		ID_VIEW_SORT_SIZE
 		MENUITEM "Sort by &Date" , 		ID_VIEW_SORT_DATE
 		MENUITEM SEPARATOR
-		MENUITEM "Filter by &..." ,			409
+		MENUITEM "Filter by &..." ,			ID_VIEW_FILTER
 	}

 	POPUP "&Options"  {
@@ -178,6 +178,29 @@ FONT 8, "MS Shell Dlg"
 	PUSHBUTTON		"&Browse" , 254, 158, 43, 47, 14
 }

+IDD_DIALOG_VIEW_TYPE DIALOG DISCARDABLE 15, 13, 161, 97
+STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
+CAPTION "By File Type"
+FONT 8, "MS Sans Serif"
+BEGIN
+    LTEXT           "&Name:",-1,7,8,22,10
+    EDITTEXT        IDC_VIEW_PATTERN,31,7,63,12,ES_AUTOHSCROLL
+    GROUPBOX        "File Type",-1,7,23,87,56
+    CONTROL         "&Directories",IDC_VIEW_TYPE_DIRECTORIES,"Button",
+                    BS_AUTOCHECKBOX | WS_TABSTOP,13,32,70,10
+    CONTROL         "&Programs",IDC_VIEW_TYPE_PROGRAMS,"Button",
+                    BS_AUTOCHECKBOX | WS_TABSTOP,13,43,70,10
+    CONTROL         "Docu&ments",IDC_VIEW_TYPE_DOCUMENTS,"Button",
+                    BS_AUTOCHECKBOX | WS_TABSTOP,13,54,70,10
+    CONTROL         "&Other files",IDC_VIEW_TYPE_OTHERS,"Button",
+                    BS_AUTOCHECKBOX | WS_TABSTOP,13,65,70,10
+    CONTROL         "Show Hidden/&System Files",IDC_VIEW_TYPE_HIDDEN,
+                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,81,106,9
+    DEFPUSHBUTTON   "OK",IDOK,104,7,50,14
+    PUSHBUTTON      "Cancel",IDCANCEL,104,24,50,14
+END
+
+
 STRINGTABLE
 {
 	IDS_FONT_SEL_DLG_NAME	"Applying font settings"

--- a/programs/winefile/Es.rc
+++ b/programs/winefile/Es.rc
@@ -95,7 +95,7 @@ IDM_WINEFILE MENU FIXED IMPURE
 		MENUITEM "Ordenar por t&amao" , 		ID_VIEW_SORT_SIZE
 		MENUITEM "Ordenar por &fecha" , 		ID_VIEW_SORT_DATE
 		MENUITEM SEPARATOR
-		MENUITEM "Ordenar por &..." ,			409
+		MENUITEM "Ordenar por &..." ,			ID_VIEW_FILTER
 	}

 	POPUP "&Opciones"  {

--- a/programs/winefile/Fr.rc
+++ b/programs/winefile/Fr.rc
@@ -98,7 +98,7 @@ IDM_WINEFILE MENU FIXED IMPURE
 		MENUITEM "Trier par Ta&ille" , 		ID_VIEW_SORT_SIZE
 		MENUITEM "Trier par Dat&e" , 		ID_VIEW_SORT_DATE
 		MENUITEM SEPARATOR
-		MENUITEM "Trier par &..." ,			409
+		MENUITEM "Trier par &..." ,			ID_VIEW_FILTER
 	}

 	POPUP "&Options"  {

--- a/programs/winefile/Hu.rc
+++ b/programs/winefile/Hu.rc
@@ -98,7 +98,7 @@ IDM_WINEFILE MENU FIXED IMPURE
 		MENUITEM "Rendezs &mret szerint" , 		ID_VIEW_SORT_SIZE
 		MENUITEM "Rendezs &dtum szerint" , 		ID_VIEW_SORT_DATE
 		MENUITEM SEPARATOR
-		MENUITEM "Egyedi rendezs &..." ,			409
+		MENUITEM "Egyedi rendezs &..." ,			ID_VIEW_FILTER
 	}

 	POPUP "&Belltsok"  {

--- a/programs/winefile/It.rc
+++ b/programs/winefile/It.rc
@@ -98,7 +98,7 @@ IDM_WINEFILE MENU FIXED IMPURE
 		MENUITEM "&Ordina per Dimensione" , 	ID_VIEW_SORT_SIZE
 		MENUITEM "&Ordina per Data" , 		ID_VIEW_SORT_DATE
 		MENUITEM SEPARATOR
-		MENUITEM "Ordina per &..." ,			409
+		MENUITEM "Ordina per &..." ,			ID_VIEW_FILTER
 	}

 	POPUP "&Opzioni"  {

--- a/programs/winefile/Makefile.in
+++ b/programs/winefile/Makefile.in
@@ -5,7 +5,7 @@ SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = winefile.exe
 APPMODE   = -mwindows
-IMPORTS   = shell32 comdlg32 comctl32 ole32 user32 gdi32 kernel32 mpr
+IMPORTS   = shell32 comdlg32 comctl32 ole32 mpr user32 gdi32 advapi32 kernel32
 EXTRALIBS = -luuid

 C_SRCS = \

--- a/programs/winefile/Nl.rc
+++ b/programs/winefile/Nl.rc
@@ -94,7 +94,7 @@ IDM_WINEFILE MENU FIXED IMPURE
 		MENUITEM "Sorteer op &grootte" , ID_VIEW_SORT_SIZE
 		MENUITEM "Sorteer op &datum" ,   ID_VIEW_SORT_DATE
 		MENUITEM SEPARATOR
-		MENUITEM "Sorteer op &..." ,     409
+		MENUITEM "Sorteer op &..." ,     ID_VIEW_FILTER
 	}

 	POPUP "&Opties"  {

--- a/programs/winefile/Pl.rc
+++ b/programs/winefile/Pl.rc
@@ -98,7 +98,7 @@ IDM_WINEFILE MENU FIXED IMPURE
 		MENUITEM "Rozmie &po wielkoci" , 		406
 		MENUITEM "&Sortuj po dacie" , 		407
 		MENUITEM SEPARATOR
-		MENUITEM "Sortuj po &..." ,			409
+		MENUITEM "Sortuj po &..." ,			ID_VIEW_FILTER
 	}

 	POPUP "&Opcje"  {

--- a/programs/winefile/Pt.rc
+++ b/programs/winefile/Pt.rc
@@ -97,7 +97,7 @@ IDM_WINEFILE MENU FIXED IMPURE
 		MENUITEM "Cl&assificar por tamanho" , 		ID_VIEW_SORT_SIZE
 		MENUITEM "Cla&ssificar por &data" , 		ID_VIEW_SORT_DATE
 		MENUITEM SEPARATOR
-		MENUITEM "Classificar &por..." ,			409
+		MENUITEM "Classificar &por..." ,			ID_VIEW_FILTER
 	}

 	POPUP "&Opes"  {
@@ -224,7 +224,7 @@ IDM_WINEFILE MENU FIXED IMPURE
 		MENUITEM "Cl&assificar por tamanho" , 		ID_VIEW_SORT_SIZE
 		MENUITEM "Cla&ssificar por &data" , 		ID_VIEW_SORT_DATE
 		MENUITEM SEPARATOR
-		MENUITEM "Classificar &por..." ,			409
+		MENUITEM "Classificar &por..." ,			ID_VIEW_FILTER
 	}

 	POPUP "&Opes"  {

--- a/programs/winefile/Ru.rc
+++ b/programs/winefile/Ru.rc
@@ -94,7 +94,7 @@ IDM_WINEFILE MENU FIXED IMPURE
 		MENUITEM "  &" , 		ID_VIEW_SORT_SIZE
 		MENUITEM "  &" , 		ID_VIEW_SORT_DATE
 		MENUITEM SEPARATOR
-		MENUITEM "  &..." ,			409
+		MENUITEM "  &..." ,			ID_VIEW_FILTER
 	}

 	POPUP "&"  {

--- a/programs/winefile/Si.rc
+++ b/programs/winefile/Si.rc
@@ -95,7 +95,7 @@ IDM_WINEFILE MENU FIXED IMPURE
 		MENUITEM "Sort by Si&ze" , 		ID_VIEW_SORT_SIZE
 		MENUITEM "Sort by &Date" , 		ID_VIEW_SORT_DATE
 		MENUITEM SEPARATOR
-		MENUITEM "Filter by &..." ,			409
+		MENUITEM "Filter by &..." ,			ID_VIEW_FILTER
 	}

 	POPUP "&Options"  {

--- a/programs/winefile/Sv.rc
+++ b/programs/winefile/Sv.rc
@@ -98,7 +98,7 @@ IDM_WINEFILE MENU FIXED IMPURE
 	MENUITEM "Sortera efter st&orlek",	ID_VIEW_SORT_SIZE
 	MENUITEM "Sortera efter &datum",	ID_VIEW_SORT_DATE
        MENUITEM SEPARATOR
-        MENUITEM "Sortera efter &...",                409
+        MENUITEM "Sortera efter &...",                ID_VIEW_FILTER
 	}

 	POPUP "&Instllningar"  {

--- a/programs/winefile/Zh.rc
+++ b/programs/winefile/Zh.rc
@@ -95,7 +95,7 @@ IDM_WINEFILE MENU FIXED IMPURE
 		MENUITEM "按大小排序（&Z）" , 		ID_VIEW_SORT_SIZE
 		MENUITEM "按日期排序（&D）" , 		ID_VIEW_SORT_DATE
 		MENUITEM SEPARATOR
-		MENUITEM "定制排序..." ,			409
+		MENUITEM "定制排序..." ,			ID_VIEW_FILTER
 	}

 	POPUP "选项（&O）"  {

--- a/programs/winefile/resource.h
+++ b/programs/winefile/resource.h
@@ -33,6 +33,7 @@

 #define	IDD_EXECUTE					103
 #define IDD_SELECT_DESTINATION				104
+#define IDD_DIALOG_VIEW_TYPE				105


 /* control ids */
@@ -51,6 +52,7 @@
 #define	ID_VIEW_SORT_TYPE				405
 #define	ID_VIEW_SORT_SIZE				406
 #define	ID_VIEW_SORT_DATE				407
+#define	ID_VIEW_FILTER					409
 #define	ID_VIEW_SPLIT					414
 #define ID_SELECT_FONT					510
 #define	ID_VIEW_TOOL_BAR				508
@@ -69,6 +71,13 @@
 #define	ID_HELP_USING					0xE144
 #define	ID_HELP 					0xE146

+#define IDC_VIEW_PATTERN				1000
+#define IDC_VIEW_TYPE_DIRECTORIES		1001
+#define IDC_VIEW_TYPE_PROGRAMS			1002
+#define IDC_VIEW_TYPE_DOCUMENTS 		1003
+#define IDC_VIEW_TYPE_OTHERS			1004
+#define IDC_VIEW_TYPE_HIDDEN			1005
+

 /* winefile extensions */
 #define	ID_ABOUT_WINE					0x8000

--- a/programs/winefile/winefile.c
+++ b/programs/winefile/winefile.c