From 7572c2f49fc29f3f5b20128cdb96e6087f89ab9a Mon Sep 17 00:00:00 2001 From: George Hazan Date: Mon, 13 Aug 2018 19:16:38 +0300 Subject: MsgExport: options diivded into two separate dialogs, code cleaning --- plugins/Msg_Export/res/resource.rc | 87 ++++++++++++++++++++++++++------------ 1 file changed, 61 insertions(+), 26 deletions(-) (limited to 'plugins/Msg_Export/res/resource.rc') diff --git a/plugins/Msg_Export/res/resource.rc b/plugins/Msg_Export/res/resource.rc index 99a517a8b9..7341a8be4f 100755 --- a/plugins/Msg_Export/res/resource.rc +++ b/plugins/Msg_Export/res/resource.rc @@ -50,37 +50,50 @@ END // Dialog // -IDD_OPT_MSGEXPORT DIALOGEX 0, 0, 310, 234 +IDD_OPT_MSGEXPORT DIALOGEX 0, 0, 310, 208 STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD EXSTYLE WS_EX_CONTROLPARENT FONT 8, "MS Shell Dlg", 0, 0, 0x1 BEGIN - COMBOBOX IDC_EXPORT_DIR,11,12,125,114,CBS_DROPDOWN | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP - PUSHBUTTON "Browse",IDC_EXPORT_DIR_BROWSE,141,11,43,14 - COMBOBOX IDC_DEFAULT_FILE,53,29,83,112,CBS_DROPDOWN | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP - CONTROL "Use internal viewer",IDC_USE_INTERNAL_VIEWER,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,11,61,78,10 - CONTROL "Replace Miranda history",IDC_REPLACE_MIRANDA_HISTORY, - "Button",BS_AUTOCHECKBOX | WS_TABSTOP,91,61,90,10 - COMBOBOX IDC_FILE_VIEWER,11,75,125,89,CBS_DROPDOWN | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP - PUSHBUTTON "Browse",IDC_FILE_VIEWER_BROWSE,141,74,43,14 - EDITTEXT IDC_MAX_CLOUMN_WIDTH,259,11,39,14,ES_AUTOHSCROLL | ES_NUMBER - COMBOBOX IDC_EXPORT_TIMEFORMAT,241,38,57,122,CBS_DROPDOWN | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP - CONTROL "Use UTF8 in new files",IDC_USE_UTF8_IN_NEW_FILES,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,194,55,104,10 - CONTROL "Append extra new line",IDC_APPEND_NEWLINE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,194,68,104,10 - CONTROL "Use << and >>",IDC_USE_LESS_AND_GREATER_IN_EXPORT, - "Button",BS_AUTOCHECKBOX | WS_TABSTOP,194,81,104,10 - CONTROL "List1",IDC_MAP_USER_LIST,"SysListView32",LVS_REPORT | LVS_SHOWSELALWAYS | LVS_EDITLABELS | WS_BORDER | WS_TABSTOP,5,100,299,114 + GROUPBOX "Export directory",IDC_STATIC,5,0,299,46 + COMBOBOX IDC_EXPORT_DIR,11,12,233,114,CBS_DROPDOWN | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP + PUSHBUTTON "Browse",IDC_EXPORT_DIR_BROWSE,255,11,43,14 + + LTEXT "Default file",IDC_STATIC,11,32,34,8 + COMBOBOX IDC_DEFAULT_FILE,53,29,191,112,CBS_DROPDOWN | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP + + GROUPBOX "File viewer",IDC_STATIC,5,49,299,45 + CONTROL "Use internal viewer",IDC_USE_INTERNAL_VIEWER,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,11,59,130,10 + CONTROL "Replace Miranda history",IDC_REPLACE_MIRANDA_HISTORY,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,149,59,149,10 + + COMBOBOX IDC_FILE_VIEWER,11,75,233,89,CBS_DROPDOWN | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP + PUSHBUTTON "Browse",IDC_FILE_VIEWER_BROWSE,255,74,43,14 + + GROUPBOX "Export format",IDC_STATIC,5,98,299,105 + + LTEXT "Max column width",IDC_STATIC,11,113,58,8 + EDITTEXT IDC_MAX_CLOUMN_WIDTH,141,111,39,14,ES_AUTOHSCROLL | ES_NUMBER + LTEXT "Note: 0 = no limit",IDC_STATIC,193,113,105,8 + + LTEXT "Time format",IDC_STATIC,11,132,38,8 + COMBOBOX IDC_EXPORT_TIMEFORMAT,141,130,57,122,CBS_DROPDOWN | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP + + CONTROL "Use JSON format for export",IDC_USE_JSON,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,11,150,287,10 + CONTROL "Use UTF8 in new files",IDC_USE_UTF8_IN_NEW_FILES,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,11,163,287,10 + CONTROL "Append extra new line",IDC_APPEND_NEWLINE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,11,176,287,10 + CONTROL "Use << and >>",IDC_USE_LESS_AND_GREATER_IN_EXPORT,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,11,188,287,10 +END + +IDD_OPT_CONTACTS DIALOGEX 0, 0, 310, 234 +STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD +EXSTYLE WS_EX_CONTROLPARENT +FONT 8, "MS Shell Dlg", 0, 0, 0x1 +BEGIN + CONTROL "List1",IDC_MAP_USER_LIST,"SysListView32",LVS_REPORT | LVS_SHOWSELALWAYS | LVS_EDITLABELS | WS_BORDER | WS_TABSTOP,5,5,299,209 PUSHBUTTON "Auto filename",IDC_AUTO_FILENAME,5,218,63,14 PUSHBUTTON "Clear all",IDC_CLEAR_ALL,86,218,63,14 PUSHBUTTON "Help",IDC_OPEN_HELP,161,218,63,14 PUSHBUTTON "Export all history",IDC_EXPORTALL,235,218,63,14 - GROUPBOX "Export directory",IDC_STATIC,5,0,181,46 - LTEXT "Max column width",IDC_STATIC,194,14,58,8 - LTEXT "Note: 0 = no limit",IDC_STATIC,194,26,104,8 - LTEXT "Time format",IDC_STATIC,194,40,38,8 - GROUPBOX "Export format",IDC_STATIC,190,0,114,94 - LTEXT "Default file",IDC_STATIC,11,32,34,8 - GROUPBOX "File viewer",IDC_STATIC,5,49,181,45 END IDD_EXPORT_ALL_DLG DIALOGEX 0, 0, 252, 46 @@ -136,14 +149,17 @@ BEGIN VERTGUIDE, 11 VERTGUIDE, 136 VERTGUIDE, 141 - VERTGUIDE, 186 - VERTGUIDE, 194 + VERTGUIDE, 193 VERTGUIDE, 298 VERTGUIDE, 304 HORZGUIDE, 18 HORZGUIDE, 36 HORZGUIDE, 46 - HORZGUIDE, 66 + HORZGUIDE, 64 + END + + IDD_OPT_CONTACTS, DIALOG + BEGIN END IDD_EXPORT_ALL_DLG, DIALOG @@ -186,9 +202,12 @@ END // Icon with lowest ID value placed first to ensure application icon // remains consistent on all systems. IDI_EXPORT_MESSAGE ICON "export_m.ico" + IDI_TICK ICON "tick.ico" + IDI_NOTICK ICON "notick.ico" + ///////////////////////////////////////////////////////////////////////////// // // Menu @@ -215,6 +234,22 @@ BEGIN END END + +///////////////////////////////////////////////////////////////////////////// +// +// AFX_DIALOG_LAYOUT +// + +IDD_OPT_CONTACTS AFX_DIALOG_LAYOUT +BEGIN + 0 +END + +IDD_OPT_MSGEXPORT AFX_DIALOG_LAYOUT +BEGIN + 0 +END + #endif // Russian (Russia) resources ///////////////////////////////////////////////////////////////////////////// -- cgit v1.2.3