diff options
| -rwxr-xr-x | plugins/Msg_Export/res/resource.rc | 83 | ||||
| -rwxr-xr-x | plugins/Msg_Export/src/main.cpp | 2 |
2 files changed, 43 insertions, 42 deletions
diff --git a/plugins/Msg_Export/res/resource.rc b/plugins/Msg_Export/res/resource.rc index ffdae4a7e8..83034a22bc 100755 --- a/plugins/Msg_Export/res/resource.rc +++ b/plugins/Msg_Export/res/resource.rc @@ -48,7 +48,7 @@ END // Dialog
//
-IDD_OPT_MSGEXPORT DIALOGEX 0, 0, 314, 240
+IDD_OPT_MSGEXPORT DIALOGEX 0, 0, 310, 234
STYLE DS_SETFONT | DS_3DLOOK | DS_FIXEDSYS | DS_CENTER | WS_CHILD | WS_VISIBLE
EXSTYLE WS_EX_CONTROLPARENT
FONT 8, "MS Shell Dlg", 0, 0, 0x1
@@ -56,28 +56,28 @@ 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,76,10
+ 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,96,61,91,10
+ "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,264,11,39,14,ES_AUTOHSCROLL | ES_NUMBER
- COMBOBOX IDC_EXPORT_TIMEFORMAT,246,29,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,201,46,102,10
- CONTROL "Append extra new line",IDC_APPEND_NEWLINE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,201,59,102,10
+ EDITTEXT IDC_MAX_CLOUMN_WIDTH,259,11,39,14,ES_AUTOHSCROLL | ES_NUMBER
+ COMBOBOX IDC_EXPORT_TIMEFORMAT,241,29,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,46,104,10
+ CONTROL "Append extra new line",IDC_APPEND_NEWLINE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,194,59,104,10
CONTROL "Use << and >>",IDC_USE_LESS_AND_GREATER_IN_EXPORT,
- "Button",BS_AUTOCHECKBOX | WS_TABSTOP,201,72,102,10
- CONTROL "List1",IDC_MAP_USER_LIST,"SysListView32",LVS_REPORT | LVS_SHOWSELALWAYS | LVS_EDITLABELS | WS_BORDER | WS_TABSTOP,5,100,304,120
- PUSHBUTTON "Auto filename",IDC_AUTO_FILENAME,5,226,63,14
- PUSHBUTTON "Clear all",IDC_CLEAR_ALL,86,226,63,14
- PUSHBUTTON "Help",IDC_OPEN_HELP,161,226,63,14
- PUSHBUTTON "Export all history",IDC_EXPORTALL,242,226,63,14
- GROUPBOX "Export directory",IDC_STATIC,5,0,186,46
- LTEXT "Max column width",IDC_STATIC,201,14,58,8
- LTEXT "Time format",IDC_STATIC,201,31,38,8
- GROUPBOX "Export format",IDC_STATIC,195,0,114,94
+ "Button",BS_AUTOCHECKBOX | WS_TABSTOP,194,72,104,10
+ CONTROL "List1",IDC_MAP_USER_LIST,"SysListView32",LVS_REPORT | LVS_SHOWSELALWAYS | LVS_EDITLABELS | WS_BORDER | WS_TABSTOP,5,100,299,114
+ 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 "Time format",IDC_STATIC,194,31,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,186,45
+ GROUPBOX "File viewer",IDC_STATIC,5,49,181,45
END
IDD_EXPORT_ALL_DLG DIALOGEX 0, 0, 252, 46
@@ -101,21 +101,21 @@ BEGIN DEFPUSHBUTTON "&Close",IDOK,246,238,50,14
END
-IDD_OPT_MSGEXPORT2 DIALOGEX 0, 0, 314, 240
+IDD_OPT_MSGEXPORT2 DIALOGEX 0, 0, 302, 227
STYLE DS_SETFONT | DS_3DLOOK | DS_CENTER | WS_CHILD | WS_VISIBLE
EXSTYLE WS_EX_CONTROLPARENT
FONT 8, "MS Sans Serif", 0, 0, 0x1
BEGIN
- GROUPBOX "When filename changes",IDC_STATIC,13,9,131,56
- CONTROL "Prompt for action",IDC_FC_PROMPT,"Button",BS_AUTORADIOBUTTON | WS_GROUP,24,24,114,10
- CONTROL "Rename file",IDC_FC_RENAME,"Button",BS_AUTORADIOBUTTON,24,37,80,10
- CONTROL "Do nothing",IDC_FC_NOTHING,"Button",BS_AUTORADIOBUTTON,24,50,78,10
- GROUPBOX "When user is deleted",IDC_STATIC,153,10,147,56
- CONTROL "Prompt for action",IDC_FD_PROMPT,"Button",BS_AUTORADIOBUTTON | WS_GROUP,161,24,131,10
- CONTROL "Delete file",IDC_FD_DELETE,"Button",BS_AUTORADIOBUTTON,161,37,131,10
- CONTROL "Do nothing",IDC_FD_NOTHING,"Button",BS_AUTORADIOBUTTON,161,50,131,10
- CONTROL "List1",IDC_EXPORT_PROTOS,"SysListView32",LVS_REPORT | LVS_SHOWSELALWAYS | LVS_EDITLABELS | WS_BORDER | WS_TABSTOP,13,72,287,144
- PUSHBUTTON "Debug",IDC_DEBUG_INFO,263,222,37,13
+ GROUPBOX "When filename changes",IDC_STATIC,8,9,138,56
+ CONTROL "Prompt for action",IDC_FC_PROMPT,"Button",BS_AUTORADIOBUTTON | WS_GROUP,14,24,125,10
+ CONTROL "Rename file",IDC_FC_RENAME,"Button",BS_AUTORADIOBUTTON,14,37,125,10
+ CONTROL "Do nothing",IDC_FC_NOTHING,"Button",BS_AUTORADIOBUTTON,14,50,125,10
+ GROUPBOX "When user is deleted",IDC_STATIC,152,10,138,56
+ CONTROL "Prompt for action",IDC_FD_PROMPT,"Button",BS_AUTORADIOBUTTON | WS_GROUP,161,24,121,10
+ CONTROL "Delete file",IDC_FD_DELETE,"Button",BS_AUTORADIOBUTTON,161,37,121,10
+ CONTROL "Do nothing",IDC_FD_NOTHING,"Button",BS_AUTORADIOBUTTON,161,50,121,10
+ CONTROL "List1",IDC_EXPORT_PROTOS,"SysListView32",LVS_REPORT | LVS_SHOWSELALWAYS | LVS_EDITLABELS | WS_BORDER | WS_TABSTOP,8,72,282,134
+ PUSHBUTTON "Debug",IDC_DEBUG_INFO,253,210,37,13
END
@@ -129,14 +129,15 @@ GUIDELINES DESIGNINFO BEGIN
IDD_OPT_MSGEXPORT, DIALOG
BEGIN
- RIGHTMARGIN, 313
+ RIGHTMARGIN, 307
VERTGUIDE, 5
VERTGUIDE, 11
VERTGUIDE, 136
VERTGUIDE, 141
- VERTGUIDE, 201
- VERTGUIDE, 303
- VERTGUIDE, 309
+ VERTGUIDE, 186
+ VERTGUIDE, 194
+ VERTGUIDE, 298
+ VERTGUIDE, 304
HORZGUIDE, 18
HORZGUIDE, 36
HORZGUIDE, 46
@@ -161,14 +162,15 @@ BEGIN IDD_OPT_MSGEXPORT2, DIALOG
BEGIN
- VERTGUIDE, 13
- VERTGUIDE, 24
- VERTGUIDE, 138
- VERTGUIDE, 144
- VERTGUIDE, 153
+ RIGHTMARGIN, 294
+ VERTGUIDE, 8
+ VERTGUIDE, 14
+ VERTGUIDE, 139
+ VERTGUIDE, 146
+ VERTGUIDE, 152
VERTGUIDE, 161
- VERTGUIDE, 292
- VERTGUIDE, 300
+ VERTGUIDE, 282
+ VERTGUIDE, 290
END
END
#endif // APSTUDIO_INVOKED
@@ -211,7 +213,6 @@ BEGIN END
END
-
#endif // Russian (Russia) resources
/////////////////////////////////////////////////////////////////////////////
diff --git a/plugins/Msg_Export/src/main.cpp b/plugins/Msg_Export/src/main.cpp index 48aa0b9afe..25f08c78f2 100755 --- a/plugins/Msg_Export/src/main.cpp +++ b/plugins/Msg_Export/src/main.cpp @@ -228,7 +228,7 @@ BOOL WINAPI DllMain(HINSTANCE hinst, DWORD /*fdwReason*/, LPVOID /*lpvReserved*/ // Developer : KN
/////////////////////////////////////////////////////////////////////
-extern "C" __declspec(dllexport) PLUGININFOEX* MirandaPluginInfoEx(DWORD mirandaVersion)
+extern "C" __declspec(dllexport) PLUGININFOEX* MirandaPluginInfoEx(DWORD)
{
return &pluginInfo;
}
|