Remove name resolution from the file dialogs.

A single name resolution checkbox was added to the file dialog way back
in 2000 in g0f7cf64. At that time it was needed because resolution was
synchronous and could drastically affect your load time. Since then
we've added asynchronous name resolution and more recently made it
mandatory (ge005bc8). We've also added more name resolution checkboxes
and other controls.

Remove the name resolution checkboxes. You can just as easily change
resolution options before or after opening a file and they take up
valuable real estate.

Combine the size and packets in the Qt and Win32 dialogs and
pretty-print the size. Combine the start and elapsed times in the Qt,
Win32, and GTK+ dialogs. This lets us shrink the custom areas of the
file dialogs even further. Make the default file type combo item more
descriptive.

Change-Id: Id770adc0f284a4c7f08ee5a7db84f8435f4bf907
Reviewed-on: https://code.wireshark.org/review/17597
Tested-by: Gerald Combs <gerald@wireshark.org>
Petri-Dish: Gerald Combs <gerald@wireshark.org>
Reviewed-by: Gerald Combs <gerald@wireshark.org>

1 files changed, 28 insertions, 28 deletions

diff --git a/image/file_dlg_win32.rc b/image/file_dlg_win32.rc
index 72295880ae..359000985a 100644
--- a/image/file_dlg_win32.rc
+++ b/image/file_dlg_win32.rc
@@ -2,7 +2,11 @@
 #include "richedit.h"
 #include "../ui/win32/file_dlg_win32.h"
 
-WIRESHARK_OPENFILENAME_TEMPLATE DIALOGEX 0, 0, 421, 90
+// We should probably ensure that we're meeting the MS layout guidelines:
+// https://msdn.microsoft.com/en-us/library/windows/desktop/dn742486.aspx
+// Outer margin: 11px
+
+WIRESHARK_OPENFILENAME_TEMPLATE DIALOGEX 0, 0, 425, 47
 STYLE WS_CHILD | WS_VISIBLE | WS_CLIPSIBLINGS | DS_3DLOOK | DS_CONTROL
 FONT 8, "MS Shell Dlg"
 {
@@ -11,22 +15,20 @@ FONT 8, "MS Shell Dlg"
     LTEXT "Read filter:", EWFD_FILTER_LBL, 67, 2, 49, 14
     CONTROL    "",        EWFD_FILTER_EDIT, RICHEDIT_CLASS, ES_AUTOHSCROLL, 112, 0, 88, 12, WS_EX_CLIENTEDGE
 
-    COMBOBOX EWFD_FORMAT_TYPE, 67, 15, 135, 8, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
-    CHECKBOX "MAC name resolution", EWFD_MAC_NR_CB, 67, 30, 100, 8,  BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP
-    CHECKBOX "Transport name resolution", EWFD_TRANS_NR_CB, 67, 45, 100, 8,  BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP
-    CHECKBOX "Network name resolution", EWFD_NET_NR_CB, 67, 60, 100, 8,  BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP
-    CHECKBOX "Use external network name resolver", EWFD_EXTERNAL_NR_CB, 67, 75, 135, 8,  BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP
-
-    LTEXT "Format:", EWFD_PT_FORMAT, 224, 2, 40, 8
-    LTEXT "-", EWFD_PTX_FORMAT, 271, 2, 150, 8
-    LTEXT "Size:", EWFD_PT_SIZE, 224, 17, 40, 8
-    LTEXT "-", EWFD_PTX_SIZE, 271, 17, 150, 8
-    LTEXT "Packets:", EWFD_PT_PACKETS, 224, 32, 40, 8
-    LTEXT "-", EWFD_PTX_PACKETS, 271, 32, 150, 8
-    LTEXT "First Packet:", EWFD_PT_FIRST_PKT, 224, 47, 40, 8
-    LTEXT "-", EWFD_PTX_FIRST_PKT, 271, 47, 150, 8
-    LTEXT "Elapsed:", EWFD_PT_ELAPSED, 224, 62, 40, 8
-    LTEXT "-", EWFD_PTX_ELAPSED, 271, 62, 150, 8
+    COMBOBOX EWFD_FORMAT_TYPE, 67, 17, 135, 8, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
+    // CHECKBOX "MAC name resolution", EWFD_MAC_NR_CB, 67, 30, 100, 8,  BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP
+    // CHECKBOX "Transport name resolution", EWFD_TRANS_NR_CB, 67, 45, 100, 8,  BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP
+    // CHECKBOX "Network name resolution", EWFD_NET_NR_CB, 67, 60, 100, 8,  BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP
+    // CHECKBOX "Use external network name resolver", EWFD_EXTERNAL_NR_CB, 67, 75, 135, 8,  BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP
+
+    LTEXT "Format:", EWFD_PT_FORMAT, 224, 2, 60, 8
+    LTEXT "-", EWFD_PTX_FORMAT, 275, 2, 150, 8
+    LTEXT "Size:", EWFD_PT_SIZE, 224, 17, 60, 8
+    LTEXT "-", EWFD_PTX_SIZE, 275, 17, 150, 8
+    // LTEXT "Packets:", EWFD_PT_PACKETS, 224, 32, 60, 8
+    // LTEXT "-", EWFD_PTX_PACKETS, 275, 32, 150, 8
+    LTEXT "Start / elapsed:", EWFD_PT_START_ELAPSED, 224, 32, 60, 8
+    LTEXT "-", EWFD_PTX_START_ELAPSED, 275, 32, 150, 8
     // 164/211, 79, 40/150, 8
 
 }
@@ -78,7 +80,7 @@ FONT 8, "MS Shell Dlg"
     CHECKBOX "Compress with gzip", EWFD_GZIP_CB, 344, 4, 100, 8,  BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP
 }
 
-WIRESHARK_MERGEFILENAME_TEMPLATE DIALOGEX 0, 0, 428, 77
+WIRESHARK_MERGEFILENAME_TEMPLATE DIALOGEX 0, 0, 428, 47
 STYLE WS_CHILD | WS_VISIBLE | WS_CLIPSIBLINGS | DS_3DLOOK | DS_CONTROL
 FONT 8, "MS Shell Dlg"
 {
@@ -91,16 +93,14 @@ FONT 8, "MS Shell Dlg"
     CONTROL  "Merge packets chronologically", EWFD_MERGE_CHRONO_BTN, "Button", BS_AUTORADIOBUTTON, 67, 45, 120, 8
     CONTROL  "Append packets to existing file", EWFD_MERGE_APPEND_BTN, "Button", BS_AUTORADIOBUTTON, 67, 60, 120, 8
 
-    LTEXT "Format:", EWFD_PT_FORMAT, 224, 2, 40, 8
-    LTEXT "-", EWFD_PTX_FORMAT, 271, 2, 150, 8
-    LTEXT "Size:", EWFD_PT_SIZE, 224, 17, 40, 8
-    LTEXT "-", EWFD_PTX_SIZE, 271, 17, 150, 8
-    LTEXT "Packets:", EWFD_PT_PACKETS, 224, 32, 40, 8
-    LTEXT "-", EWFD_PTX_PACKETS, 271, 32, 150, 8
-    LTEXT "First Packet:", EWFD_PT_FIRST_PKT, 224, 47, 40, 8
-    LTEXT "-", EWFD_PTX_FIRST_PKT, 271, 47, 150, 8
-    LTEXT "Elapsed:", EWFD_PT_ELAPSED, 224, 62, 40, 8
-    LTEXT "-", EWFD_PTX_ELAPSED, 271, 62, 150, 8
+    LTEXT "Format:", EWFD_PT_FORMAT, 224, 2, 60, 8
+    LTEXT "-", EWFD_PTX_FORMAT, 275, 2, 150, 8
+    LTEXT "Size:", EWFD_PT_SIZE, 224, 17, 60, 8
+    LTEXT "-", EWFD_PTX_SIZE, 275, 17, 150, 8
+    // LTEXT "Packets:", EWFD_PT_PACKETS, 224, 32, 60, 8
+    // LTEXT "-", EWFD_PTX_PACKETS, 275, 32, 150, 8
+    LTEXT "Start / elapsed:", EWFD_PT_START_ELAPSED, 224, 32, 60, 8
+    LTEXT "-", EWFD_PTX_START_ELAPSED, 275, 32, 150, 8
     // 164/211, 79, 40/150, 8
 }