Added some resources.
authorRobert Dickenson <robd@reactos.org>
Tue, 9 Jul 2002 20:42:46 +0000 (20:42 +0000)
committerRobert Dickenson <robd@reactos.org>
Tue, 9 Jul 2002 20:42:46 +0000 (20:42 +0000)
svn path=/trunk/; revision=3200

rosapps/winfile/dialogs.c
rosapps/winfile/dialogs.h
rosapps/winfile/framewnd.c
rosapps/winfile/listview.c
rosapps/winfile/resource.h
rosapps/winfile/winfile.rc

index 5036b55..0bfe628 100644 (file)
 #include "debug.h"
 
 
-struct ExecuteDialog {
-       TCHAR   cmd[MAX_PATH];
-       int             cmdshow;
-};
-
-
 BOOL CALLBACK ExecuteDialogWndProg(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam)
 {
        static struct ExecuteDialog* dlg;
index 59844fb..c2197dd 100644 (file)
@@ -34,9 +34,14 @@ extern "C" {
 #include "resource.h"
 
 
-BOOL CALLBACK ExecuteDialogWndProg(HWND, UINT, WPARAM, LPARAM);
+struct ExecuteDialog {
+       TCHAR   cmd[MAX_PATH];
+       int             cmdshow;
+};
 
 
+BOOL CALLBACK ExecuteDialogWndProg(HWND, UINT, WPARAM, LPARAM);
+
 
 #ifdef __cplusplus
 };
index 142a7f5..aedd252 100644 (file)
@@ -46,6 +46,7 @@
 #include "utils.h"
 #include "run.h"
 #include "format.h"
+#include "dialogs.h"
 
 
 ////////////////////////////////////////////////////////////////////////////////
@@ -407,11 +408,24 @@ LRESULT _CmdWndProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam)
                                SetErrorMode(OldMode); // Put it back the way it was.                   
                        }
                        break;
-               case ID_OPTIONS_CONFIRMATION:
+        case ID_VIEW_BY_FILE_TYPE:
                        {
-//                     struct ExecuteDialog dlg = {{0}};
-//                     if (DialogBoxParam(Globals.hInstance, MAKEINTRESOURCE(IDD_EXECUTE), hWnd, ExecuteDialogWndProg, (LPARAM)&dlg) == IDOK)
+                       struct ExecuteDialog dlg = {{0}};
+            if (DialogBoxParam(Globals.hInstance, MAKEINTRESOURCE(IDD_DIALOG_VIEW_TYPE), hWnd, ExecuteDialogWndProg, (LPARAM)&dlg) == IDOK) {
+            }
+                       }
+                       break;
+        case ID_OPTIONS_CONFIRMATION:
+/*
+#define IDD_DIALOG_DIRECTORY            144
+#define IDD_DIALOG_VIEW_TYPE            145
+#define IDD_DIALOG_OPTIONS_CONFIRMATON  146
+ */
+                       {
+                       struct ExecuteDialog dlg = {{0}};
+            if (DialogBoxParam(Globals.hInstance, MAKEINTRESOURCE(IDD_DIALOG_OPTIONS_CONFIRMATON), hWnd, ExecuteDialogWndProg, (LPARAM)&dlg) == IDOK) {
 //                             ShellExecute(hWnd, _T("open")/*operation*/, dlg.cmd/*file*/, NULL/*parameters*/, NULL/*dir*/, dlg.cmdshow);
+            }
                        }
             break;
                case ID_OPTIONS_FONT:
index 04f0f14..ebbe775 100644 (file)
@@ -172,7 +172,7 @@ static HWND CreateListView(HWND hwndParent, int id)
  
 void OnGetDispInfo(NMLVDISPINFO* plvdi)
 {
-    static buffer[200];
+    static char buffer[200];
 
 //    LVITEM* pItem = &(plvdi->item);
 //    Entry* entry = (Entry*)pItem->lParam;
@@ -192,7 +192,7 @@ void OnGetDispInfo(NMLVDISPINFO* plvdi)
 
             //entry->bhfi.ftCreationTime
 
-            sprintf(buffer, "%u", entry->bhfi.nFileSizeLow);
+            wsprintf(buffer, "%u", entry->bhfi.nFileSizeLow);
             plvdi->item.pszText = buffer;
         } else {
             plvdi->item.pszText = "unknown";
index 624fe2c..118de7f 100644 (file)
 #define ID_SECURITY_MENU                5
 #define ID_WINDOW_MENU                  6
 #define ID_HELP_MENU                    7
-
-
-#define IDS_LIST_COLUMN_FIRST   91
-#define IDS_LIST_COLUMN_NAME    91
-#define IDS_LIST_COLUMN_SIZE    92
-#define IDS_LIST_COLUMN_DATE    93
-#define IDS_LIST_COLUMN_ATTRIB  94
-#define IDS_LIST_COLUMN_DOSNAME 95
-#define IDS_LIST_COLUMN_LAST    95
-
+#define IDS_LIST_COLUMN_FIRST           91
+#define IDS_LIST_COLUMN_NAME            91
+#define IDS_LIST_COLUMN_SIZE            92
+#define IDS_LIST_COLUMN_DATE            93
+#define IDS_LIST_COLUMN_ATTRIB          94
+#define IDS_LIST_COLUMN_DOSNAME         95
+#define IDS_LIST_COLUMN_LAST            95
 #define IDD_ABOUTBOX                    104
 #define IDS_APP_TITLE                   105
 #define IDI_WINFILE                     107
 #define IDI_SMALL                       108
 #define IDC_WINFILE                     109
 #define IDC_WINFILE_CHILD               110
-//#define IDR_WINFILE_MENU              130
 #define IDD_DIALOG1                     131
-
+#define IDD_DIALOG_FILE_MOVE            131
 #define IDB_FOLDER                      132
 #define IDB_FOLDER_RED                  133
-#define        IDB_FOLDER_OPEN                         134
-
+#define IDB_FOLDER_OPEN                 134
 #define IDB_ROOT                        135
-#define        IDB_TOOLBAR                                 136
-#define        IDB_DRIVEBAR                            137
-#define        IDB_IMAGES                      138
-
-//#define      IDB_FOLDER_PLUS                 139
-//#define      IDB_FOLDER_MINUS                140
-//#define      IDB_FOLDER_OPEN_PLUS            142
-//#define      IDB_FOLDER_OPEN_MINUS           143
-
-
+#define IDB_TOOLBAR                     136
+#define IDB_DRIVEBAR                    137
+#define IDB_IMAGES                      138
+#define IDD_DIALOG_DIRECTORY            144
+#define IDD_DIALOG_VIEW_TYPE            145
+#define IDD_DIALOG_OPTIONS_CONFIRMATON  146
 #define ID_WINDOW_CLOSE                 798
 #define ID_WINDOW_CLOSEALL              799
-
-#define ID_FILE_OPEN                          32769
-#define ID_FILE_MOVE                          32770
-#define ID_FILE_COPY                          32771
-#define ID_FILE_COPY_CLIPBOARD                32772
-#define ID_FILE_DELETE                        32773
-#define ID_FILE_RENAME                        32774
-#define ID_FILE_PROPERTIES                    32775
-#define ID_FILE_COMPRESS                      32776
-#define ID_FILE_UNCOMPRESS                    32777
-#define ID_FILE_RUN                           32778
-#define ID_FILE_PRINT                         32779
-#define ID_FILE_ASSOCIATE                     32780
-#define ID_FILE_CREATE_DIRECTORY              32781
-#define ID_FILE_SEARCH                        32782
-#define ID_FILE_SELECT_FILES                  32783
-#define ID_FILE_EXIT                          32784
-
-#define ID_DISK_COPY_DISK                     32785
-#define ID_DISK_LABEL_DISK                    32786
-#define ID_DISK_FORMAT_DISK                   32787
-#define ID_DISK_CONNECT_NETWORK_DRIVE         32788
-#define ID_DISK_DISCONNECT_NETWORK_DRIVE      32789
-#define ID_DISK_SHARE_AS                      32790
-#define ID_DISK_STOP_SHARING                  32791
-#define ID_DISK_SELECT_DRIVE                  32792
-
-#define ID_TREE_EXPAND_ONE_LEVEL              32793
-#define ID_TREE_EXPAND_BRANCH                 32794
-#define ID_TREE_EXPAND_ALL                    32795
-#define ID_TREE_INDICATE_EXPANDABLE_BRANCHES  32796
-
-#define ID_VIEW_TREE_DIRECTORY                32797
-#define ID_VIEW_TREE_ONLY                     32798
-#define ID_VIEW_DIRECTORY_ONLY                32799
-#define ID_VIEW_SPLIT                         32800
-#define ID_VIEW_NAME                          32801
-#define ID_VIEW_ALL_FILE_DETAILS              32802
-#define ID_VIEW_PARTIAL_DETAILS               32803
-#define ID_VIEW_SORT_BY_NAME                  32804
-#define ID_VIEW_SORT_BY_TYPE                  32805
-#define ID_VIEW_SORT_BY_SIZE                  32806
-#define ID_VIEW_SORT_BY_DATE                  32807
-#define ID_VIEW_BY_FILE_TYPE                  32808
-
-#define ID_OPTIONS_CONFIRMATION               32809
-#define ID_OPTIONS_FONT                       32810
-#define ID_OPTIONS_CUSTOMISE_TOOLBAR          32811
-#define ID_OPTIONS_TOOLBAR                    32812
-#define ID_OPTIONS_DRIVEBAR                   32813
-#define ID_OPTIONS_STATUSBAR                  32814
+#define IDC_EDIT1                       1000
+#define IDC_VIEW_TYPE_DIRECTORIES       1001
+#define IDC_EDIT2                       1001
+#define IDC_VIEW_TYPE_PROGRAMS          1002
+#define IDC_VIEW_TYPE_DOCUMENTS         1003
+#define IDC_VIEW_TYPE_OTHERS            1004
+#define IDC_VIEW_TYPE_SYSFILES          1005
+#define IDC_CONFIRMATION_FILE_DELETE    1006
+#define IDC_CONFIRMATION_DIR_DELETE     1007
+#define IDC_CONFIRMATION_FILE_REPLACE   1008
+#define IDC_CONFIRMATION_MOUSE_ACTIONS  1009
+#define IDC_CONFIRMATION_DISK_COMMANDS  1010
+#define IDC_CONFIRMATION_MODIFY_SYSTEM  1011
+#define ID_FILE_OPEN                    32769
+#define ID_FILE_MOVE                    32770
+#define ID_FILE_COPY                    32771
+#define ID_FILE_COPY_CLIPBOARD          32772
+#define ID_FILE_DELETE                  32773
+#define ID_FILE_RENAME                  32774
+#define ID_FILE_PROPERTIES              32775
+#define ID_FILE_COMPRESS                32776
+#define ID_FILE_UNCOMPRESS              32777
+#define ID_FILE_RUN                     32778
+#define ID_FILE_PRINT                   32779
+#define ID_FILE_ASSOCIATE               32780
+#define ID_FILE_CREATE_DIRECTORY        32781
+#define ID_FILE_SEARCH                  32782
+#define ID_FILE_SELECT_FILES            32783
+#define ID_FILE_EXIT                    32784
+#define ID_DISK_COPY_DISK               32785
+#define ID_DISK_LABEL_DISK              32786
+#define ID_DISK_FORMAT_DISK             32787
+#define ID_DISK_CONNECT_NETWORK_DRIVE   32788
+#define ID_DISK_DISCONNECT_NETWORK_DRIVE 32789
+#define ID_DISK_SHARE_AS                32790
+#define ID_DISK_STOP_SHARING            32791
+#define ID_DISK_SELECT_DRIVE            32792
+#define ID_TREE_EXPAND_ONE_LEVEL        32793
+#define ID_TREE_EXPAND_BRANCH           32794
+#define ID_TREE_EXPAND_ALL              32795
+#define ID_TREE_INDICATE_EXPANDABLE_BRANCHES 32796
+#define ID_VIEW_TREE_DIRECTORY          32797
+#define ID_VIEW_TREE_ONLY               32798
+#define ID_VIEW_DIRECTORY_ONLY          32799
+#define ID_VIEW_SPLIT                   32800
+#define ID_VIEW_NAME                    32801
+#define ID_VIEW_ALL_FILE_DETAILS        32802
+#define ID_VIEW_PARTIAL_DETAILS         32803
+#define ID_VIEW_SORT_BY_NAME            32804
+#define ID_VIEW_SORT_BY_TYPE            32805
+#define ID_VIEW_SORT_BY_SIZE            32806
+#define ID_VIEW_SORT_BY_DATE            32807
+#define ID_VIEW_BY_FILE_TYPE            32808
+#define ID_OPTIONS_CONFIRMATION         32809
+#define ID_OPTIONS_FONT                 32810
+#define ID_OPTIONS_CUSTOMISE_TOOLBAR    32811
+#define ID_OPTIONS_TOOLBAR              32812
+#define ID_OPTIONS_DRIVEBAR             32813
+#define ID_OPTIONS_STATUSBAR            32814
 #define ID_OPTIONS_OPEN_NEW_WINDOW_ON_CONNECT 32815
-#define ID_OPTIONS_MINIMISE_ON_USE            32816
-#define ID_OPTIONS_SAVE_ON_EXIT               32817
-
-#define ID_SECURITY_PERMISSIONS               32818
-#define ID_SECURITY_AUDITING                  32819
-#define ID_SECURITY_OWNER                     32820
-
-#define ID_WINDOW_NEW_WINDOW                  32821
-#define ID_WINDOW_CASCADE                     32822
-#define ID_WINDOW_TILE_HORZ                   32823
-#define ID_WINDOW_TILE_VERT                   32824
-#define ID_WINDOW_ARRANGE_ICONS               32825
-#define ID_WINDOW_REFRESH                     32826
-
-#define ID_HELP_CONTENTS                      32827
-#define ID_HELP_SEARCH_HELP                   32828
-#define ID_HELP_HOW_TO_USE_HELP               32829
-#define ID_HELP_ABOUT                         32830
-
-#define IDC_LICENSE_EDIT                      32831
-#define IDS_LICENSE                           32832
-
-
+#define ID_OPTIONS_MINIMISE_ON_USE      32816
+#define ID_OPTIONS_SAVE_ON_EXIT         32817
+#define ID_SECURITY_PERMISSIONS         32818
+#define ID_SECURITY_AUDITING            32819
+#define ID_SECURITY_OWNER               32820
+#define ID_WINDOW_NEW_WINDOW            32821
+#define ID_WINDOW_CASCADE               32822
+#define ID_WINDOW_TILE_HORZ             32823
+#define ID_WINDOW_TILE_VERT             32824
+#define ID_WINDOW_ARRANGE_ICONS         32825
+#define ID_WINDOW_REFRESH               32826
+#define ID_HELP_CONTENTS                32827
+#define ID_HELP_SEARCH_HELP             32828
+#define ID_HELP_HOW_TO_USE_HELP         32829
+#define ID_HELP_ABOUT                   32830
+#define IDC_LICENSE_EDIT                32831
+#define IDS_LICENSE                     32832
 #define IDC_STATIC                      -1
 
 // Next default values for new objects
 // 
 #ifdef APSTUDIO_INVOKED
 #ifndef APSTUDIO_READONLY_SYMBOLS
-#define _APS_NEXT_RESOURCE_VALUE        144
+#define _APS_NEXT_RESOURCE_VALUE        147
 #define _APS_NEXT_COMMAND_VALUE         32832
-#define _APS_NEXT_CONTROL_VALUE         1000
+#define _APS_NEXT_CONTROL_VALUE         1007
 #define _APS_NEXT_SYMED_VALUE           110
 #endif
 #endif
index 56071fa..197d37b 100644 (file)
@@ -34,24 +34,18 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
 IDI_WINFILE             ICON    DISCARDABLE     "res/winfile.ico"
 IDI_SMALL               ICON    DISCARDABLE     "res/small.ico"
 
-////////////////////////////////////////////////////////////////////////////////
-// Bitmaps
+/////////////////////////////////////////////////////////////////////////////
+//
+// Bitmap
 //
 
-//IDB_FOLDER_PLUS         BITMAP       DISCARDABLE     "res/folder_plus.bmp"
-//IDB_FOLDER_MINUS        BITMAP       DISCARDABLE     "res/folder_minus.bmp"
-//IDB_FOLDER_OPEN_PLUS BITMAP  DISCARDABLE     "res/folder_open_plus.bmp"
-//IDB_FOLDER_OPEN_MINUS        BITMAP  DISCARDABLE     "res/folder_open_minus.bmp"
-
-IDB_FOLDER              BITMAP DISCARDABLE     "res/folder1.bmp"
-IDB_FOLDER_RED          BITMAP DISCARDABLE     "res/folder3.bmp"
-IDB_FOLDER_OPEN         BITMAP DISCARDABLE     "res/folder_open.bmp"
-
-IDB_ROOT                BITMAP DISCARDABLE     "res/folder2.bmp"
-
-IDB_TOOLBAR                            BITMAP  DISCARDABLE     "res/toolbar.bmp"
-IDB_DRIVEBAR                   BITMAP  DISCARDABLE     "res/drivebar.bmp"
-IDB_IMAGES                         BITMAP      DISCARDABLE     "res/images.bmp"
+IDB_FOLDER              BITMAP  DISCARDABLE     "res/folder1.bmp"
+IDB_FOLDER_RED          BITMAP  DISCARDABLE     "res/folder3.bmp"
+IDB_FOLDER_OPEN         BITMAP  DISCARDABLE     "res/folder_open.bmp"
+IDB_ROOT                BITMAP  DISCARDABLE     "res/folder2.bmp"
+IDB_TOOLBAR             BITMAP  DISCARDABLE     "res/toolbar.bmp"
+IDB_DRIVEBAR            BITMAP  DISCARDABLE     "res/drivebar.bmp"
+IDB_IMAGES              BITMAP  DISCARDABLE     "res/images.bmp"
 
 /////////////////////////////////////////////////////////////////////////////
 //
@@ -63,9 +57,10 @@ BEGIN
     POPUP "&File"
     BEGIN
         MENUITEM "&Open\tEnter",                ID_FILE_OPEN, GRAYED
-        MENUITEM "&Move...\tF8",                ID_FILE_MOVE, GRAYED
+        MENUITEM "&Move...\tF8",                ID_FILE_MOVE
         MENUITEM "&Copy...\tF9",                ID_FILE_COPY, GRAYED
-        MENUITEM "Copy to Clip&board...\tF9",   ID_FILE_COPY_CLIPBOARD, GRAYED
+        MENUITEM "Copy to Clip&board...\tF9",   ID_FILE_COPY_CLIPBOARD
+        , GRAYED
         MENUITEM "&Delete...\tDel",             ID_FILE_DELETE, GRAYED
         MENUITEM "Re&name...\t",                ID_FILE_RENAME, GRAYED
         MENUITEM "Proper&ties...\tAlt+Enter",   ID_FILE_PROPERTIES, GRAYED
@@ -77,7 +72,8 @@ BEGIN
         MENUITEM "&Print...\t",                 ID_FILE_PRINT, GRAYED
         MENUITEM "&Associate...\t",             ID_FILE_ASSOCIATE, GRAYED
         MENUITEM SEPARATOR
-        MENUITEM "Cr&eate directory...\t",      ID_FILE_CREATE_DIRECTORY, GRAYED
+        MENUITEM "Cr&eate directory...\t",      ID_FILE_CREATE_DIRECTORY
+        , GRAYED
         MENUITEM "Searc&h...\t",                ID_FILE_SEARCH, GRAYED
         MENUITEM "Select &Files...\t",          ID_FILE_SELECT_FILES, GRAYED
         MENUITEM SEPARATOR
@@ -90,8 +86,11 @@ BEGIN
         MENUITEM SEPARATOR
         MENUITEM "&Format Disk..\t",            ID_DISK_FORMAT_DISK
         MENUITEM SEPARATOR
-        MENUITEM "Connect &Network Drive...",   ID_DISK_CONNECT_NETWORK_DRIVE, GRAYED
-        MENUITEM "&Disconnect Network Drive...",ID_DISK_DISCONNECT_NETWORK_DRIVE, GRAYED
+        MENUITEM "Connect &Network Drive...",   ID_DISK_CONNECT_NETWORK_DRIVE
+        , GRAYED
+        MENUITEM "&Disconnect Network Drive...", 
+                                                ID_DISK_DISCONNECT_NETWORK_DRIVE
+        , GRAYED
         MENUITEM SEPARATOR
         MENUITEM "Share &As...",                ID_DISK_SHARE_AS, GRAYED
         MENUITEM "S&top Sharing...",            ID_DISK_STOP_SHARING, GRAYED
@@ -104,44 +103,52 @@ BEGIN
         MENUITEM "Expand &Branch\t*",           ID_TREE_EXPAND_BRANCH
         MENUITEM "Expand &All\tCtrl+*",         ID_TREE_EXPAND_ALL
         MENUITEM SEPARATOR
-        MENUITEM "&Indicate Expandable Branches",ID_TREE_INDICATE_EXPANDABLE_BRANCHES
+        MENUITEM "&Indicate Expandable Branches", 
+                                                ID_TREE_INDICATE_EXPANDABLE_BRANCHES
+
     END
     POPUP "&View"
     BEGIN
-        MENUITEM "T&ree and Directory",         ID_VIEW_TREE_DIRECTORY, GRAYED
+        MENUITEM "T&ree and Directory",         ID_VIEW_TREE_DIRECTORY
+        , GRAYED
         MENUITEM "Tr&ee Only",                  ID_VIEW_TREE_ONLY, GRAYED
-        MENUITEM "Directory &Only",             ID_VIEW_DIRECTORY_ONLY, GRAYED
+        MENUITEM "Directory &Only",             ID_VIEW_DIRECTORY_ONLY
+        , GRAYED
         MENUITEM SEPARATOR
         MENUITEM "Sp&lit",                      ID_VIEW_SPLIT, GRAYED
         MENUITEM SEPARATOR
         MENUITEM "&Name",                       ID_VIEW_NAME
         MENUITEM "&All File Details",           ID_VIEW_ALL_FILE_DETAILS
-        MENUITEM "&Partial Details...",         ID_VIEW_PARTIAL_DETAILS, GRAYED
+        MENUITEM "&Partial Details...",         ID_VIEW_PARTIAL_DETAILS
+        , GRAYED
         MENUITEM SEPARATOR
         MENUITEM "&Sort by Name",               ID_VIEW_SORT_BY_NAME
         MENUITEM "Sort &by Type",               ID_VIEW_SORT_BY_TYPE
         MENUITEM "Sort by Si&ze",               ID_VIEW_SORT_BY_SIZE
         MENUITEM "Sort by &Date",               ID_VIEW_SORT_BY_DATE
         MENUITEM SEPARATOR
-        MENUITEM "By File &Type...",            ID_VIEW_BY_FILE_TYPE, GRAYED
+        MENUITEM "By File &Type...",            ID_VIEW_BY_FILE_TYPE
     END
     POPUP "&Options"
     BEGIN
-        MENUITEM "&Confirmation...",            ID_OPTIONS_CONFIRMATION, GRAYED
+        MENUITEM "&Confirmation...",            ID_OPTIONS_CONFIRMATION
         MENUITEM "&Font...",                    ID_OPTIONS_FONT, GRAYED
-        MENUITEM "Customise Tool&bar...",       ID_OPTIONS_CUSTOMISE_TOOLBAR, GRAYED
+        MENUITEM "Customise Tool&bar...",       ID_OPTIONS_CUSTOMISE_TOOLBAR
+        , GRAYED
         MENUITEM SEPARATOR
         MENUITEM "&Toolbar",                    ID_OPTIONS_TOOLBAR
         MENUITEM "&Drivebar",                   ID_OPTIONS_DRIVEBAR
         MENUITEM "&Statusbar",                  ID_OPTIONS_STATUSBAR
         MENUITEM SEPARATOR
         MENUITEM "&Open New Window on Connect", ID_OPTIONS_OPEN_NEW_WINDOW_ON_CONNECT
+
         MENUITEM "&Minimise on Use",            ID_OPTIONS_MINIMISE_ON_USE
         MENUITEM "&Save Settings on Exit",      ID_OPTIONS_SAVE_ON_EXIT
     END
     POPUP "&Security"
     BEGIN
-        MENUITEM "&Permissions...",             ID_SECURITY_PERMISSIONS, GRAYED
+        MENUITEM "&Permissions...",             ID_SECURITY_PERMISSIONS
+        , GRAYED
         MENUITEM "&Auditing...",                ID_SECURITY_AUDITING, GRAYED
         MENUITEM "&Owner...",                   ID_SECURITY_OWNER, GRAYED
     END
@@ -153,13 +160,13 @@ BEGIN
         MENUITEM "&Tile Vertically\tShift+F4",  ID_WINDOW_TILE_VERT
         MENUITEM "&Arrange Icons",              ID_WINDOW_ARRANGE_ICONS
         MENUITEM "&Refresh\tF5",                ID_WINDOW_REFRESH
-//        MENUITEM SEPARATOR
     END
     POPUP "&Help"
     BEGIN
         MENUITEM "&Contents",                   ID_HELP_CONTENTS, GRAYED
         MENUITEM "&Search for Help on...",      ID_HELP_SEARCH_HELP, GRAYED
-        MENUITEM "&How to Use Help",            ID_HELP_HOW_TO_USE_HELP, GRAYED
+        MENUITEM "&How to Use Help",            ID_HELP_HOW_TO_USE_HELP
+        , GRAYED
         MENUITEM SEPARATOR
         MENUITEM "&About File Manager",         ID_HELP_ABOUT
     END
@@ -216,89 +223,104 @@ END
 STRINGTABLE DISCARDABLE 
 BEGIN
     IDS_APP_TITLE           "ReactOS File Manager"
+    IDC_WINFILE             "ROSFILE"
+    IDC_WINFILE_CHILD       "ROSFILE_CHILD"
+END
 
+STRINGTABLE DISCARDABLE 
+BEGIN
     ID_FILE_MENU            "Commands for working with files"
     ID_DISK_MENU            "Commands for working with disk"
     ID_TREE_MENU            "Commands for working in the tree window"
     ID_VIEW_MENU            "Commands for determining how information is displayed"
-       ID_OPTIONS_MENU         "Commands for setting options"
+    ID_OPTIONS_MENU         "Commands for setting options"
     ID_SECURITY_MENU        "Commands for manipulating file and directory security"
     ID_WINDOW_MENU          "Commands for manipulating windows"
     ID_HELP_MENU            "Commands for displaying help and information about file manager"
+END
 
-    ID_FILE_OPEN             "Opens selected item"
-    ID_FILE_MOVE                        "Moves selected item"
-    ID_FILE_COPY                        "Copies files and directories"
-    ID_FILE_COPY_CLIPBOARD      "Copies selected item to the clipboard"
-    ID_FILE_DELETE                      "Deletes files and directories"
-    ID_FILE_RENAME                      "Renames a file or directory"
-    ID_FILE_PROPERTIES          "Set file attributes and display file properties"
-    ID_FILE_COMPRESS            "Compresses files or directories"
-    ID_FILE_UNCOMPRESS          "Uncompresses files or directories"
-    ID_FILE_RUN                                 "Starts or opens and application or file"
-    ID_FILE_PRINT                       "Prints a file"
-    ID_FILE_ASSOCIATE           "associates a file type with an application"
+STRINGTABLE DISCARDABLE 
+BEGIN
+    ID_FILE_OPEN            "Opens selected item"
+    ID_FILE_MOVE            "Moves selected item"
+    ID_FILE_COPY            "Copies files and directories"
+    ID_FILE_COPY_CLIPBOARD  "Copies selected item to the clipboard"
+    ID_FILE_DELETE          "Deletes files and directories"
+    ID_FILE_RENAME          "Renames a file or directory"
+    ID_FILE_PROPERTIES      "Set file attributes and display file properties"
+    ID_FILE_COMPRESS        "Compresses files or directories"
+    ID_FILE_UNCOMPRESS      "Uncompresses files or directories"
+    ID_FILE_RUN             "Starts or opens and application or file"
+    ID_FILE_PRINT           "Prints a file"
+    ID_FILE_ASSOCIATE       "associates a file type with an application"
     ID_FILE_CREATE_DIRECTORY "Creates a directory"
-    ID_FILE_SEARCH                      "Searches for files and directories"
-    ID_FILE_SELECT_FILES        "Selects files and directories"
-    ID_FILE_EXIT             "Quits the file manager"
-
-    ID_DISK_COPY_DISK                           "Copies a floppy disk"
-    ID_DISK_LABEL_DISK                          "Assigns or changes the volume lable of the disk"
-    ID_DISK_FORMAT_DISK                                 "Formats a floppy disk"
-    ID_DISK_CONNECT_NETWORK_DRIVE       "Connects to a network drive"
+    ID_FILE_SEARCH          "Searches for files and directories"
+    ID_FILE_SELECT_FILES    "Selects files and directories"
+END
+
+STRINGTABLE DISCARDABLE 
+BEGIN
+    ID_FILE_EXIT            "Quits the file manager"
+    ID_DISK_COPY_DISK       "Copies a floppy disk"
+    ID_DISK_LABEL_DISK      "Assigns or changes the volume lable of the disk"
+    ID_DISK_FORMAT_DISK     "Formats a floppy disk"
+    ID_DISK_CONNECT_NETWORK_DRIVE "Connects to a network drive"
     ID_DISK_DISCONNECT_NETWORK_DRIVE "Disconnects from a network drive"
-    ID_DISK_SHARE_AS                            "Shares a directory"
-    ID_DISK_STOP_SHARING                        "Stops sharing a directory"
-    ID_DISK_SELECT_DRIVE                        "Selects a different drive or volume"
-
-    ID_TREE_EXPAND_ONE_LEVEL             "Displays another level of a directory"
-    ID_TREE_EXPAND_BRANCH                               "Displays all levels of a directory"
-    ID_TREE_EXPAND_ALL                                  "Displays all levels of all directories"
-    ID_TREE_INDICATE_EXPANDABLE_BRANCHES "Indicates directories that have sub-directories"
-
-    ID_VIEW_TREE_DIRECTORY      "Displays the directory tree and the contents of the current directory"
-    ID_VIEW_TREE_ONLY           "Displays the directory tree"
-    ID_VIEW_DIRECTORY_ONLY      "Displays the contents of the current directory"
-    ID_VIEW_SPLIT                       "Splits a directory window or moves the split bar"
-    ID_VIEW_NAME                        "Show filenames only"
+    ID_DISK_SHARE_AS        "Shares a directory"
+    ID_DISK_STOP_SHARING    "Stops sharing a directory"
+    ID_DISK_SELECT_DRIVE    "Selects a different drive or volume"
+    ID_TREE_EXPAND_ONE_LEVEL "Displays another level of a directory"
+    ID_TREE_EXPAND_BRANCH   "Displays all levels of a directory"
+    ID_TREE_EXPAND_ALL      "Displays all levels of all directories"
+    ID_TREE_INDICATE_EXPANDABLE_BRANCHES 
+                            "Indicates directories that have sub-directories"
+    ID_VIEW_TREE_DIRECTORY  "Displays the directory tree and the contents of the current directory"
+    ID_VIEW_TREE_ONLY       "Displays the directory tree"
+    ID_VIEW_DIRECTORY_ONLY  "Displays the contents of the current directory"
+END
+
+STRINGTABLE DISCARDABLE 
+BEGIN
+    ID_VIEW_SPLIT           "Splits a directory window or moves the split bar"
+    ID_VIEW_NAME            "Show filenames only"
     ID_VIEW_ALL_FILE_DETAILS "Show all file details"
-    ID_VIEW_PARTIAL_DETAILS     "Show partial file details"
-    ID_VIEW_SORT_BY_NAME        "Sorts files by name"
-    ID_VIEW_SORT_BY_TYPE        "Sorts files by type"
-    ID_VIEW_SORT_BY_SIZE        "Sorts files by size"
-    ID_VIEW_SORT_BY_DATE        "Sorts files by date"
-    ID_VIEW_BY_FILE_TYPE     "Shows files of a specified type and filters filenames"
-
-    ID_OPTIONS_CONFIRMATION      "Controls confirmation messages..."
-    ID_OPTIONS_FONT              "Changes the File Manager Font..."
+    ID_VIEW_PARTIAL_DETAILS "Show partial file details"
+    ID_VIEW_SORT_BY_NAME    "Sorts files by name"
+    ID_VIEW_SORT_BY_TYPE    "Sorts files by type"
+    ID_VIEW_SORT_BY_SIZE    "Sorts files by size"
+    ID_VIEW_SORT_BY_DATE    "Sorts files by date"
+    ID_VIEW_BY_FILE_TYPE    "Shows files of a specified type and filters filenames"
+    ID_OPTIONS_CONFIRMATION "Controls confirmation messages..."
+    ID_OPTIONS_FONT         "Changes the File Manager Font..."
     ID_OPTIONS_CUSTOMISE_TOOLBAR "Customises the toolbar..."
-    ID_OPTIONS_TOOLBAR           "Shows or hides the tool bar"
-    ID_OPTIONS_DRIVEBAR          "Shows or hides the drive bar"
-    ID_OPTIONS_STATUSBAR         "Shows or hides the status bar"
-    ID_OPTIONS_OPEN_NEW_WINDOW_ON_CONNECT "Opens a new window when connnecting"            
-    ID_OPTIONS_MINIMISE_ON_USE   "Reduces File Manager to an icon at startup"
-    ID_OPTIONS_SAVE_ON_EXIT      "Saves settings when exiting File Manager"
+    ID_OPTIONS_TOOLBAR      "Shows or hides the tool bar"
+    ID_OPTIONS_DRIVEBAR     "Shows or hides the drive bar"
+    ID_OPTIONS_STATUSBAR    "Shows or hides the status bar"
+    ID_OPTIONS_OPEN_NEW_WINDOW_ON_CONNECT 
+                            "Opens a new window when connnecting"
+END
 
+STRINGTABLE DISCARDABLE 
+BEGIN
+    ID_OPTIONS_MINIMISE_ON_USE "Reduces File Manager to an icon at startup"
+    ID_OPTIONS_SAVE_ON_EXIT "Saves settings when exiting File Manager"
     ID_SECURITY_PERMISSIONS "View or set permission information on the selected items"
     ID_SECURITY_AUDITING    "View or set auditing information on the selected items"
     ID_SECURITY_OWNER       "View or take ownership of the selected items"
-
     ID_WINDOW_NEW_WINDOW    "Opens a new window"
-    ID_WINDOW_CASCADE      "Cascades windows"
-    ID_WINDOW_TILE_HORZ                "Tiles windows horizontally"
-    ID_WINDOW_TILE_VERT                "Tiles windows vertically"
-    ID_WINDOW_ARRANGE_ICONS    "Arranges icons"
+    ID_WINDOW_CASCADE       "Cascades windows"
+    ID_WINDOW_TILE_HORZ     "Tiles windows horizontally"
+    ID_WINDOW_TILE_VERT     "Tiles windows vertically"
+    ID_WINDOW_ARRANGE_ICONS "Arranges icons"
     ID_WINDOW_REFRESH       "Updates the contents of a window"
-
-       ID_HELP_CONTENTS        "Displays contents for File Manager Help"
-       ID_HELP_SEARCH_HELP     "Searches for a topic in File Manager Help"
-       ID_HELP_HOW_TO_USE_HELP "Displays information about using help"
+    ID_HELP_CONTENTS        "Displays contents for File Manager Help"
+    ID_HELP_SEARCH_HELP     "Searches for a topic in File Manager Help"
+    ID_HELP_HOW_TO_USE_HELP "Displays information about using help"
     ID_HELP_ABOUT           "Displays program information, version number and copyright"
+END
 
-    IDC_WINFILE             "ROSFILE"
-    IDC_WINFILE_CHILD       "ROSFILE_CHILD"
-
+STRINGTABLE DISCARDABLE 
+BEGIN
     IDS_LIST_COLUMN_NAME    "Name"
     IDS_LIST_COLUMN_SIZE    "Size"
     IDS_LIST_COLUMN_DATE    "Date"
@@ -324,13 +346,73 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_AUS
 // Dialog
 //
 
-IDD_DIALOG1 DIALOG DISCARDABLE  0, 0, 186, 95
+IDD_DIALOG_FILE_MOVE DIALOG DISCARDABLE  0, 0, 268, 64
+STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
+CAPTION "Move"
+FONT 8, "MS Sans Serif"
+BEGIN
+    DEFPUSHBUTTON   "OK",IDOK,211,7,50,14
+    PUSHBUTTON      "Cancel",IDCANCEL,211,24,50,14
+    LTEXT           "Current Directory:",IDC_STATIC,7,7,54,10
+    EDITTEXT        IDC_EDIT1,36,26,168,13,ES_AUTOHSCROLL
+    EDITTEXT        IDC_EDIT2,36,44,168,13,ES_AUTOHSCROLL
+    LTEXT           "From:",IDC_STATIC,7,28,27,9
+    LTEXT           "To:",IDC_STATIC,7,48,23,9
+    LTEXT           "",IDC_STATIC,65,7,139,12
+END
+
+IDD_DIALOG_DIRECTORY DIALOG DISCARDABLE  0, 0, 187, 95
 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "Dialog"
 FONT 8, "MS Sans Serif"
 BEGIN
-    DEFPUSHBUTTON   "OK",IDOK,129,7,50,14
-    PUSHBUTTON      "Cancel",IDCANCEL,129,24,50,14
+    DEFPUSHBUTTON   "OK",IDOK,130,7,50,14
+    PUSHBUTTON      "Cancel",IDCANCEL,130,24,50,14
+END
+
+IDD_DIALOG_VIEW_TYPE DIALOG DISCARDABLE  0, 0, 161, 97
+STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
+CAPTION "By File Type"
+FONT 8, "MS Sans Serif"
+BEGIN
+    DEFPUSHBUTTON   "OK",IDOK,104,7,50,14
+    PUSHBUTTON      "Cancel",IDCANCEL,104,24,50,14
+    EDITTEXT        IDC_EDIT1,31,7,63,12,ES_AUTOHSCROLL
+    GROUPBOX        "File Type",IDC_STATIC,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_SYSFILES,
+                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,81,106,9
+    LTEXT           "&Name:",IDC_STATIC,7,8,22,10
+END
+
+IDD_DIALOG_OPTIONS_CONFIRMATON DIALOG DISCARDABLE  0, 0, 221, 89
+STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
+CAPTION "Confirmation"
+FONT 8, "MS Sans Serif"
+BEGIN
+    DEFPUSHBUTTON   "OK",IDOK,164,7,50,14
+    PUSHBUTTON      "Cancel",IDCANCEL,164,24,50,14
+    GROUPBOX        "Confirm On",IDC_STATIC,7,7,152,75
+    CONTROL         "File &Delete",IDC_CONFIRMATION_FILE_DELETE,"Button",
+                    BS_AUTOCHECKBOX | WS_TABSTOP,13,18,132,8
+    CONTROL         "D&irectory Delete",IDC_CONFIRMATION_DIR_DELETE,"Button",
+                    BS_AUTOCHECKBOX | WS_TABSTOP,13,29,132,8
+    CONTROL         "File &Replace",IDC_CONFIRMATION_FILE_REPLACE,"Button",
+                    BS_AUTOCHECKBOX | WS_TABSTOP,13,40,132,8
+    CONTROL         "&Mouse Actions",IDC_CONFIRMATION_MOUSE_ACTIONS,"Button",
+                    BS_AUTOCHECKBOX | WS_TABSTOP,13,50,132,8
+    CONTROL         "Dis&k Commands",IDC_CONFIRMATION_DISK_COMMANDS,"Button",
+                    BS_AUTOCHECKBOX | WS_TABSTOP,13,60,132,8
+    CONTROL         "Modify &System, Hidden, Read Only files",
+                    IDC_CONFIRMATION_MODIFY_SYSTEM,"Button",BS_AUTOCHECKBOX | 
+                    WS_TABSTOP,13,71,132,8
 END
 
 
@@ -356,13 +438,37 @@ END
 #ifdef APSTUDIO_INVOKED
 GUIDELINES DESIGNINFO DISCARDABLE 
 BEGIN
-    IDD_DIALOG1, DIALOG
+    IDD_DIALOG_FILE_MOVE, DIALOG
+    BEGIN
+        LEFTMARGIN, 7
+        RIGHTMARGIN, 261
+        TOPMARGIN, 7
+        BOTTOMMARGIN, 57
+    END
+
+    IDD_DIALOG_DIRECTORY, DIALOG
     BEGIN
         LEFTMARGIN, 7
-        RIGHTMARGIN, 179
+        RIGHTMARGIN, 180
         TOPMARGIN, 7
         BOTTOMMARGIN, 88
     END
+
+    IDD_DIALOG_VIEW_TYPE, DIALOG
+    BEGIN
+        LEFTMARGIN, 7
+        RIGHTMARGIN, 154
+        TOPMARGIN, 7
+        BOTTOMMARGIN, 90
+    END
+
+    IDD_DIALOG_OPTIONS_CONFIRMATON, DIALOG
+    BEGIN
+        LEFTMARGIN, 7
+        RIGHTMARGIN, 214
+        TOPMARGIN, 7
+        BOTTOMMARGIN, 82
+    END
 END
 #endif    // APSTUDIO_INVOKED