Remove the filename from the Win32 file dialog preview. It's already

shown in two places and there's no reason to show it in a third.

Use CommDlg_OpenSave_GetFilePath instead of CommDlg_OpenSave_GetSpec so
that previews work properly for folders.

svn path=/trunk/; revision=43877

1 files changed, 23 insertions, 24 deletions

diff --git a/image/file_dlg_win32.rc b/image/file_dlg_win32.rc
index 01e1463ea9..5fc7a27441 100644
--- a/image/file_dlg_win32.rc
+++ b/image/file_dlg_win32.rc
@@ -16,18 +16,18 @@ FONT 8, "MS Shell Dlg"
     CHECKBOX "Network name resolution", EWFD_NET_NR_CB, 7, 62, 100, 8,  BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP
     CHECKBOX "Use external network name resolver", EWFD_EXTERNAL_NR_CB, 7, 77, 135, 8,  BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP
 
-    LTEXT "Filename:", EWFD_PT_FILENAME, 164, 4, 40, 8
-    LTEXT "-", EWFD_PTX_FILENAME, 211, 4, 150, 8
-    LTEXT "Format:", EWFD_PT_FORMAT, 164, 19, 40, 8
-    LTEXT "-", EWFD_PTX_FORMAT, 211, 19, 150, 8
-    LTEXT "Size:", EWFD_PT_SIZE, 164, 34, 40, 8
-    LTEXT "-", EWFD_PTX_SIZE, 211, 34, 150, 8
-    LTEXT "Packets:", EWFD_PT_PACKETS, 164, 49, 40, 8
-    LTEXT "-", EWFD_PTX_PACKETS, 211, 49, 150, 8
-    LTEXT "First Packet:", EWFD_PT_FIRST_PKT, 164, 64, 40, 8
-    LTEXT "-", EWFD_PTX_FIRST_PKT, 211, 64, 150, 8
-    LTEXT "Elapsed:", EWFD_PT_ELAPSED, 164, 79, 40, 8
-    LTEXT "-", EWFD_PTX_ELAPSED, 211, 79, 150, 8
+    LTEXT "Format:", EWFD_PT_FORMAT, 164, 4, 40, 8
+    LTEXT "-", EWFD_PTX_FORMAT, 211, 4, 150, 8
+    LTEXT "Size:", EWFD_PT_SIZE, 164, 19, 40, 8
+    LTEXT "-", EWFD_PTX_SIZE, 211, 19, 150, 8
+    LTEXT "Packets:", EWFD_PT_PACKETS, 164, 34, 40, 8
+    LTEXT "-", EWFD_PTX_PACKETS, 211, 34, 150, 8
+    LTEXT "First Packet:", EWFD_PT_FIRST_PKT, 164, 49, 40, 8
+    LTEXT "-", EWFD_PTX_FIRST_PKT, 211, 49, 150, 8
+    LTEXT "Elapsed:", EWFD_PT_ELAPSED, 164, 64, 40, 8
+    LTEXT "-", EWFD_PTX_ELAPSED, 211, 64, 150, 8
+    // 164/211, 79, 40/150, 8
+    
 }
 
 WIRESHARK_EXPORT_SPECIFIED_PACKETS_FILENAME_TEMPLATE DIALOGEX 0, 0, 368, 128
@@ -75,18 +75,17 @@ FONT 8, "MS Shell Dlg"
     CONTROL  "Merge packets chronologically", EWFD_MERGE_CHRONO_BTN, "Button", BS_AUTORADIOBUTTON, 7, 47, 120, 8
     CONTROL  "Append packets to existing file", EWFD_MERGE_APPEND_BTN, "Button", BS_AUTORADIOBUTTON, 7, 62, 120, 8
 
-    LTEXT "Filename:", EWFD_PT_FILENAME, 164, 4, 40, 8
-    LTEXT "-", EWFD_PTX_FILENAME, 211, 4, 150, 8
-    LTEXT "Format:", EWFD_PT_FORMAT, 164, 19, 40, 8
-    LTEXT "-", EWFD_PTX_FORMAT, 211, 19, 150, 8
-    LTEXT "Size:", EWFD_PT_SIZE, 164, 34, 40, 8
-    LTEXT "-", EWFD_PTX_SIZE, 211, 34, 150, 8
-    LTEXT "Packets:", EWFD_PT_PACKETS, 164, 49, 40, 8
-    LTEXT "-", EWFD_PTX_PACKETS, 211, 49, 150, 8
-    LTEXT "First Packet:", EWFD_PT_FIRST_PKT, 164, 64, 40, 8
-    LTEXT "-", EWFD_PTX_FIRST_PKT, 211, 64, 150, 8
-    LTEXT "Elapsed:", EWFD_PT_ELAPSED, 164, 79, 40, 8
-    LTEXT "-", EWFD_PTX_ELAPSED, 211, 79, 150, 8
+    LTEXT "Format:", EWFD_PT_FORMAT, 164, 4, 40, 8
+    LTEXT "-", EWFD_PTX_FORMAT, 211, 4, 150, 8
+    LTEXT "Size:", EWFD_PT_SIZE, 164, 19, 40, 8
+    LTEXT "-", EWFD_PTX_SIZE, 211, 19, 150, 8
+    LTEXT "Packets:", EWFD_PT_PACKETS, 164, 34, 40, 8
+    LTEXT "-", EWFD_PTX_PACKETS, 211, 34, 150, 8
+    LTEXT "First Packet:", EWFD_PT_FIRST_PKT, 164, 49, 40, 8
+    LTEXT "-", EWFD_PTX_FIRST_PKT, 211, 49, 150, 8
+    LTEXT "Elapsed:", EWFD_PT_ELAPSED, 164, 64, 40, 8
+    LTEXT "-", EWFD_PTX_ELAPSED, 211, 64, 150, 8
+    // 164/211, 79, 40/150, 8
 }
 
 WIRESHARK_EXPORTFILENAME_TEMPLATE DIALOGEX 0, 0, 319, 109