Fix the layout of the "Export Dissected Packets" template and tweak a

few other layouts.

svn path=/trunk/; revision=45434

1 files changed, 45 insertions, 47 deletions

diff --git a/image/file_dlg_win32.rc b/image/file_dlg_win32.rc
index ef399072de..9d7605d1cb 100644
--- a/image/file_dlg_win32.rc
+++ b/image/file_dlg_win32.rc
@@ -37,7 +37,7 @@ FONT 8, "MS Shell Dlg"
     CHECKBOX "Compress with gzip", EWFD_GZIP_CB, 67, 0, 100, 8,  BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP
 }
 
-WIRESHARK_EXPORT_SPECIFIED_PACKETS_FILENAME_TEMPLATE DIALOGEX 0, 0, 442, 107
+WIRESHARK_EXPORT_SPECIFIED_PACKETS_FILENAME_TEMPLATE DIALOGEX 0, 0, 453, 109
 STYLE WS_CHILD | WS_VISIBLE | WS_CLIPSIBLINGS | DS_3DLOOK | DS_CONTROL
 FONT 8, "MS Shell Dlg"
 {
@@ -46,13 +46,13 @@ FONT 8, "MS Shell Dlg"
     CONTROL  "Captured", EWFD_CAPTURED_BTN, "Button", BS_AUTORADIOBUTTON | WS_GROUP, 232, 11, 45, 10
     CONTROL  "Displayed", EWFD_DISPLAYED_BTN, "Button", BS_AUTORADIOBUTTON, 282, 11, 47, 10
 
-    CONTROL  "All packets", EWFD_ALL_PKTS_BTN, "Button", BS_AUTORADIOBUTTON | WS_GROUP, 78, 23, 51, 10
-    CONTROL  "Selected packet", EWFD_SEL_PKT_BTN, "Button", BS_AUTORADIOBUTTON,  78, 35, 68, 10
-    CONTROL  "Marked packets", EWFD_MARKED_BTN, "Button", BS_AUTORADIOBUTTON,  78, 47, 67, 10
-    CONTROL  "First to last marked", EWFD_FIRST_LAST_BTN, "Button",  BS_AUTORADIOBUTTON, 78, 59, 75, 10
-    CONTROL  "Range:", EWFD_RANGE_BTN, "Button",  BS_AUTORADIOBUTTON, 78, 71, 35, 10
-    CONTROL  "", EWFD_RANGE_EDIT, RICHEDIT_CLASS, ES_AUTOHSCROLL, 117, 70, 105, 12, WS_EX_CLIENTEDGE
-    CONTROL  "Remove Ignored packets", EWFD_REMOVE_IGN_CB, "Button",  BS_AUTOCHECKBOX | WS_TABSTOP, 78, 83, 100, 10
+    CONTROL  "All packets", EWFD_ALL_PKTS_BTN, "Button", BS_AUTORADIOBUTTON | WS_GROUP, 73, 23, 51, 10
+    CONTROL  "Selected packet", EWFD_SEL_PKT_BTN, "Button", BS_AUTORADIOBUTTON,  73, 35, 68, 10
+    CONTROL  "Marked packets", EWFD_MARKED_BTN, "Button", BS_AUTORADIOBUTTON,  73, 47, 67, 10
+    CONTROL  "First to last marked", EWFD_FIRST_LAST_BTN, "Button",  BS_AUTORADIOBUTTON, 73, 59, 75, 10
+    CONTROL  "Range:", EWFD_RANGE_BTN, "Button",  BS_AUTORADIOBUTTON, 73, 71, 35, 10
+    CONTROL  "", EWFD_RANGE_EDIT, RICHEDIT_CLASS, ES_AUTOHSCROLL, 112, 70, 110, 12, WS_EX_CLIENTEDGE
+    CONTROL  "Remove Ignored packets", EWFD_REMOVE_IGN_CB, "Button",  BS_AUTOCHECKBOX | WS_TABSTOP, 73, 83, 100, 10
 
     LTEXT "0", EWFD_ALL_PKTS_CAP, 232, 24, 39, 8, SS_RIGHT
     LTEXT "0", EWFD_SEL_PKT_CAP, 232, 36, 39, 8, SS_RIGHT
@@ -68,10 +68,10 @@ FONT 8, "MS Shell Dlg"
     LTEXT "0", EWFD_RANGE_DISP, 282, 72, 41, 8, SS_RIGHT
     LTEXT "0", EWFD_IGNORED_DISP, 282, 84, 41, 8, SS_RIGHT
 
-    CHECKBOX "Compress with gzip", EWFD_GZIP_CB, 342, 0, 100, 8,  BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP
+    CHECKBOX "Compress with gzip", EWFD_GZIP_CB, 344, 4, 100, 8,  BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP
 }
 
-WIRESHARK_MERGEFILENAME_TEMPLATE DIALOGEX 0, 0, 421, 77
+WIRESHARK_MERGEFILENAME_TEMPLATE DIALOGEX 0, 0, 428, 77
 STYLE WS_CHILD | WS_VISIBLE | WS_CLIPSIBLINGS | DS_3DLOOK | DS_CONTROL
 FONT 8, "MS Shell Dlg"
 {
@@ -97,46 +97,44 @@ FONT 8, "MS Shell Dlg"
     // 164/211, 79, 40/150, 8
 }
 
-WIRESHARK_EXPORTFILENAME_TEMPLATE DIALOGEX 0, 0, 319, 109
+WIRESHARK_EXPORTFILENAME_TEMPLATE DIALOGEX 0, 0, 469, 109
 STYLE WS_CHILD | WS_VISIBLE | WS_CLIPSIBLINGS | DS_3DLOOK | DS_CONTROL
 FONT 8, "MS Shell Dlg"
 {
-    // Provide hints for dialog layout and size
-    LTEXT    "", stc32, 1, 1, 260, 0
-
-    GROUPBOX "Packet Range", -1, 5, 2, 220, 102
-
-    CONTROL  "Captured", EWFD_CAPTURED_BTN, "Button", BS_AUTORADIOBUTTON | WS_GROUP, 120, 13, 45, 10
-    CONTROL  "Displayed", EWFD_DISPLAYED_BTN, "Button", BS_AUTORADIOBUTTON, 170,  13, 47, 10
-
-    CONTROL  "All packets", EWFD_ALL_PKTS_BTN, "Button", BS_AUTORADIOBUTTON | WS_GROUP, 16, 25, 51, 10
-    CONTROL  "Selected packet", EWFD_SEL_PKT_BTN, "Button", BS_AUTORADIOBUTTON,  16, 37, 68, 10
-    CONTROL  "Marked packets", EWFD_MARKED_BTN, "Button", BS_AUTORADIOBUTTON,  16, 49, 67, 10
-    CONTROL  "First to last marked", EWFD_FIRST_LAST_BTN, "Button",  BS_AUTORADIOBUTTON, 16, 61, 75, 10
-    CONTROL  "Range:", EWFD_RANGE_BTN, "Button",  BS_AUTORADIOBUTTON, 16, 73, 35, 10
-    EDITTEXT EWFD_RANGE_EDIT, 53, 72, 50, 12, ES_AUTOHSCROLL
-    CONTROL  "Remove Ignored packets", EWFD_REMOVE_IGN_CB, "Button",  BS_AUTOCHECKBOX | WS_TABSTOP, 16, 85, 100, 10
-
-    LTEXT "0", EWFD_ALL_PKTS_CAP,   120, 26, 39, 8, SS_RIGHT
-    LTEXT "0", EWFD_SEL_PKT_CAP,    120, 38, 39, 8, SS_RIGHT
-    LTEXT "0", EWFD_MARKED_CAP,     120, 50, 39, 8, SS_RIGHT
-    LTEXT "0", EWFD_FIRST_LAST_CAP, 120, 62, 39, 8, SS_RIGHT
-    LTEXT "0", EWFD_RANGE_CAP,      120, 74, 39, 8, SS_RIGHT
-    LTEXT "0", EWFD_IGNORED_CAP,    120, 86, 39, 8, SS_RIGHT
-
-    LTEXT "0", EWFD_ALL_PKTS_DISP,   170, 26, 41, 8, SS_RIGHT
-    LTEXT "0", EWFD_SEL_PKT_DISP,    170, 38, 41, 8, SS_RIGHT
-    LTEXT "0", EWFD_MARKED_DISP,     170, 50, 41, 8, SS_RIGHT
-    LTEXT "0", EWFD_FIRST_LAST_DISP, 170, 62, 41, 8, SS_RIGHT
-    LTEXT "0", EWFD_RANGE_DISP,      170, 74, 41, 8, SS_RIGHT
-    LTEXT "0", EWFD_IGNORED_DISP,    170, 86, 41, 8, SS_RIGHT
-
-    GROUPBOX "Packet Format", EWFD_PKT_FORMAT_GB, 234, 2, 119, 102
-    CONTROL  "Packet summary line", EWFD_PKT_SUMMARY_CB, "Button",  BS_AUTOCHECKBOX | WS_TABSTOP, 245, 15, 84, 10
-    CONTROL  "Packet details:", EWFD_PKT_DETAIL_CB, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 245, 27, 95, 10
-    COMBOBOX EWFD_PKT_DETAIL_COMBO, 257, 39, 74, 45, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
-    CONTROL  "Packet Bytes", EWFD_PKT_BYTES_CB, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 245, 56, 80, 10
-    CONTROL  "Each packet on a new page", EWFD_PKT_NEW_PAGE_CB, "Button",  BS_AUTOCHECKBOX | WS_TABSTOP, 245, 70, 106, 10
+    GROUPBOX "Packet Range", -1, 67, 0, 270, 102
+
+    CONTROL  "Captured", EWFD_CAPTURED_BTN, "Button", BS_AUTORADIOBUTTON | WS_GROUP, 232, 11, 45, 10
+    CONTROL  "Displayed", EWFD_DISPLAYED_BTN, "Button", BS_AUTORADIOBUTTON, 282, 11, 47, 10
+
+    CONTROL  "All packets", EWFD_ALL_PKTS_BTN, "Button", BS_AUTORADIOBUTTON | WS_GROUP, 73, 23, 51, 10
+    CONTROL  "Selected packet", EWFD_SEL_PKT_BTN, "Button", BS_AUTORADIOBUTTON,  73, 35, 68, 10
+    CONTROL  "Marked packets", EWFD_MARKED_BTN, "Button", BS_AUTORADIOBUTTON,  73, 47, 67, 10
+    CONTROL  "First to last marked", EWFD_FIRST_LAST_BTN, "Button",  BS_AUTORADIOBUTTON, 73, 59, 75, 10
+    CONTROL  "Range:", EWFD_RANGE_BTN, "Button",  BS_AUTORADIOBUTTON, 73, 71, 35, 10
+    CONTROL  "", EWFD_RANGE_EDIT, RICHEDIT_CLASS, ES_AUTOHSCROLL, 112, 70, 110, 12, WS_EX_CLIENTEDGE
+    CONTROL  "Remove Ignored packets", EWFD_REMOVE_IGN_CB, "Button",  BS_AUTOCHECKBOX | WS_TABSTOP, 73, 83, 100, 10
+
+    LTEXT "0", EWFD_ALL_PKTS_CAP, 232, 24, 39, 8, SS_RIGHT
+    LTEXT "0", EWFD_SEL_PKT_CAP, 232, 36, 39, 8, SS_RIGHT
+    LTEXT "0", EWFD_MARKED_CAP, 232, 48, 39, 8, SS_RIGHT
+    LTEXT "0", EWFD_FIRST_LAST_CAP, 232, 60, 39, 8, SS_RIGHT
+    LTEXT "0", EWFD_RANGE_CAP, 232, 72, 39, 8, SS_RIGHT
+    LTEXT "0", EWFD_IGNORED_CAP, 232, 84, 39, 8, SS_RIGHT
+
+    LTEXT "0", EWFD_ALL_PKTS_DISP, 282, 24, 41, 8, SS_RIGHT
+    LTEXT "0", EWFD_SEL_PKT_DISP, 282, 36, 41, 8, SS_RIGHT
+    LTEXT "0", EWFD_MARKED_DISP, 282, 48, 41, 8, SS_RIGHT
+    LTEXT "0", EWFD_FIRST_LAST_DISP, 282, 60, 41, 8, SS_RIGHT
+    LTEXT "0", EWFD_RANGE_DISP, 282, 72, 41, 8, SS_RIGHT
+    LTEXT "0", EWFD_IGNORED_DISP, 282, 84, 41, 8, SS_RIGHT
+
+
+    GROUPBOX "Packet Format", EWFD_PKT_FORMAT_GB, 344, 0, 118, 102
+    CONTROL  "Packet summary line", EWFD_PKT_SUMMARY_CB, "Button",  BS_AUTOCHECKBOX | WS_TABSTOP, 350, 15, 84, 10
+    CONTROL  "Packet details:", EWFD_PKT_DETAIL_CB, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 350, 27, 95, 10
+    COMBOBOX EWFD_PKT_DETAIL_COMBO, 366, 39, 74, 45, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
+    CONTROL  "Packet Bytes", EWFD_PKT_BYTES_CB, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 350, 56, 80, 10
+    CONTROL  "Each packet on a new page", EWFD_PKT_NEW_PAGE_CB, "Button",  BS_AUTOCHECKBOX | WS_TABSTOP, 350, 70, 106, 10
 
 }