summaryrefslogtreecommitdiff
path: root/plugins/NewStory
diff options
context:
space:
mode:
Diffstat (limited to 'plugins/NewStory')
-rw-r--r--plugins/NewStory/NewStory_icons/res/resource.rc56
-rw-r--r--plugins/NewStory/res/resource.rc395
-rw-r--r--plugins/NewStory/src/calendartool.cpp6
-rw-r--r--plugins/NewStory/src/fonts.h2
-rw-r--r--plugins/NewStory/src/history.cpp34
-rw-r--r--plugins/NewStory/src/history_array.cpp4
-rw-r--r--plugins/NewStory/src/history_control.cpp54
-rw-r--r--plugins/NewStory/src/icons.cpp4
-rw-r--r--plugins/NewStory/src/opt_passwords.cpp2
-rw-r--r--plugins/NewStory/src/options.cpp2
-rw-r--r--plugins/NewStory/src/password.cpp12
-rw-r--r--plugins/NewStory/src/resource.h6
-rw-r--r--plugins/NewStory/src/stdafx.h2
-rw-r--r--plugins/NewStory/src/utils.cpp6
14 files changed, 254 insertions, 331 deletions
diff --git a/plugins/NewStory/NewStory_icons/res/resource.rc b/plugins/NewStory/NewStory_icons/res/resource.rc
index e3211adf0a..28031af17c 100644
--- a/plugins/NewStory/NewStory_icons/res/resource.rc
+++ b/plugins/NewStory/NewStory_icons/res/resource.rc
@@ -1,6 +1,6 @@
//Microsoft Developer Studio generated resource script.
//
-#include "resource.h"
+#include "..\src\resource.h"
#define APSTUDIO_READONLY_SYMBOLS
/////////////////////////////////////////////////////////////////////////////
@@ -29,7 +29,7 @@ LANGUAGE 0x22, 0x1
1 TEXTINCLUDE DISCARDABLE
BEGIN
- "resource.h\0"
+ "..\\src\\resource.h\0"
END
2 TEXTINCLUDE DISCARDABLE
@@ -54,32 +54,32 @@ END
// Icon with lowest ID value placed first to ensure application icon
// remains consistent on all systems.
-1 ICON DISCARDABLE "icons\\01 newstory.ico"
-2 ICON DISCARDABLE "icons\\02 userinfo.ico"
-3 ICON DISCARDABLE "icons\\03 usermenu.ico"
-4 ICON DISCARDABLE "icons\\04 search.ico"
-5 ICON DISCARDABLE "icons\\05 options.ico"
-6 ICON DISCARDABLE "icons\\06 filter.ico"
-7 ICON DISCARDABLE "icons\\07 export.ico"
-8 ICON DISCARDABLE "icons\\09 copy.ico"
-9 ICON DISCARDABLE "icons\\10 sendmsg.ico"
-10 ICON DISCARDABLE "icons\\11 close.ico"
-11 ICON DISCARDABLE "icons\\12 msgin.ico"
-12 ICON DISCARDABLE "icons\\13 msgout.ico"
-13 ICON DISCARDABLE "icons\\14 signin.ico"
-14 ICON DISCARDABLE "icons\\16 file.ico"
-15 ICON DISCARDABLE "icons\\17 url.ico"
-16 ICON DISCARDABLE "icons\\18 unknown.ico"
-17 ICON DISCARDABLE "icons\\19 findprev.ico"
-18 ICON DISCARDABLE "icons\\20 findnext.ico"
-19 ICON DISCARDABLE "icons\\nopassword.ico"
-20 ICON DISCARDABLE "icons\\password.ico"
-21 ICON DISCARDABLE "icons\\Calendar.ico"
-23 ICON DISCARDABLE "icons\\reset.ico"
-24 ICON DISCARDABLE "icons\\reload.ico"
-25 ICON DISCARDABLE "icons\\vars.ico"
-22 ICON DISCARDABLE "icons\\folder.ico"
-26 ICON DISCARDABLE "icons\\save pass.ico"
+1 ICON DISCARDABLE "01 newstory.ico"
+2 ICON DISCARDABLE "02 userinfo.ico"
+3 ICON DISCARDABLE "03 usermenu.ico"
+4 ICON DISCARDABLE "04 search.ico"
+5 ICON DISCARDABLE "05 options.ico"
+6 ICON DISCARDABLE "06 filter.ico"
+7 ICON DISCARDABLE "07 export.ico"
+8 ICON DISCARDABLE "09 copy.ico"
+9 ICON DISCARDABLE "10 sendmsg.ico"
+10 ICON DISCARDABLE "11 close.ico"
+11 ICON DISCARDABLE "12 msgin.ico"
+12 ICON DISCARDABLE "13 msgout.ico"
+13 ICON DISCARDABLE "14 signin.ico"
+14 ICON DISCARDABLE "16 file.ico"
+15 ICON DISCARDABLE "17 url.ico"
+16 ICON DISCARDABLE "18 unknown.ico"
+17 ICON DISCARDABLE "19 findprev.ico"
+18 ICON DISCARDABLE "20 findnext.ico"
+19 ICON DISCARDABLE "nopassword.ico"
+20 ICON DISCARDABLE "password.ico"
+21 ICON DISCARDABLE "Calendar.ico"
+23 ICON DISCARDABLE "reset.ico"
+24 ICON DISCARDABLE "reload.ico"
+25 ICON DISCARDABLE "vars.ico"
+22 ICON DISCARDABLE "folder.ico"
+26 ICON DISCARDABLE "save pass.ico"
#endif // Unknown language: 0x22, 0x1 resources
/////////////////////////////////////////////////////////////////////////////
diff --git a/plugins/NewStory/res/resource.rc b/plugins/NewStory/res/resource.rc
index 7963b06071..861b6ec10b 100644
--- a/plugins/NewStory/res/resource.rc
+++ b/plugins/NewStory/res/resource.rc
@@ -1,4 +1,4 @@
-//Microsoft Developer Studio generated resource script.
+// Microsoft Visual C++ generated resource script.
//
#include "..\src\resource.h"
@@ -7,7 +7,7 @@
//
// Generated from the TEXTINCLUDE 2 resource.
//
-#include "winres.h"
+#include "afxres.h"
/////////////////////////////////////////////////////////////////////////////
#undef APSTUDIO_READONLY_SYMBOLS
@@ -16,56 +16,47 @@
// Neutral resources
#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_NEU)
-#ifdef _WIN32
LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL
-#pragma code_page(1251)
-#endif //_WIN32
+#pragma code_page(1252)
/////////////////////////////////////////////////////////////////////////////
//
// Dialog
//
-IDD_SEARCH DIALOG DISCARDABLE 0, 0, 264, 132
-STYLE DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU
+IDD_SEARCH DIALOGEX 0, 0, 264, 132
+STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU
CAPTION "Search Newstory"
-FONT 8, "MS Shell Dlg"
+FONT 8, "MS Shell Dlg", 0, 0, 0x1
BEGIN
DEFPUSHBUTTON "OK",IDOK,152,111,51,15
PUSHBUTTON "Cancel",IDCANCEL,207,111,51,15
- CONTROL "Progress1",IDC_PROGRESS,"msctls_progress32",WS_DISABLED |
- WS_BORDER,7,92,250,14
+ CONTROL "Progress1",IDC_PROGRESS,"msctls_progress32",WS_DISABLED | WS_BORDER,7,92,250,14
RTEXT "Search for:",IDC_STATIC,7,24,45,14,SS_CENTERIMAGE
- CONTROL "Progress1",IDC_PROGRESS1,"msctls_progress32",WS_BORDER,
- 7,73,250,14
- COMBOBOX IDC_COMBO1,57,7,200,55,CBS_DROPDOWN | CBS_SORT |
- WS_VSCROLL | WS_TABSTOP
+ CONTROL "Progress1",IDC_PROGRESS1,"msctls_progress32",WS_BORDER,7,73,250,14
+ COMBOBOX IDC_COMBO1,57,7,200,55,CBS_DROPDOWN | CBS_SORT | WS_VSCROLL | WS_TABSTOP
EDITTEXT IDC_EDIT1,57,24,200,14,ES_AUTOHSCROLL
RTEXT "Search in:",IDC_STATIC,7,7,45,12,SS_CENTERIMAGE
- CONTROL "Match case",IDC_CHECK2,"Button",BS_AUTOCHECKBOX |
- WS_TABSTOP,57,43,100,10
- CONTROL "Tokenize search string",IDC_CHECK3,"Button",
- BS_AUTOCHECKBOX | WS_TABSTOP,57,58,100,10
+ CONTROL "Match case",IDC_CHECK2,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,57,43,100,10
+ CONTROL "Tokenize search string",IDC_CHECK3,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,57,58,100,10
END
-IDD_MESSAGE DIALOG DISCARDABLE 0, 0, 224, 173
-STYLE DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU
+IDD_MESSAGE DIALOGEX 0, 0, 224, 173
+STYLE DS_SETFONT | DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU
CAPTION "View Single Message"
-FONT 8, "MS Shell Dlg"
+FONT 8, "MS Shell Dlg", 0, 0, 0x1
BEGIN
DEFPUSHBUTTON "Close",IDCANCEL,167,149,50,17
- EDITTEXT IDC_USERNICK,28,9,189,12,ES_AUTOHSCROLL | ES_READONLY |
- NOT WS_BORDER
+ EDITTEXT IDC_USERNICK,28,9,189,12,ES_AUTOHSCROLL | ES_READONLY | NOT WS_BORDER
ICON "",IDC_MSGICON,7,7,16,14
- CONTROL "Sample text. With smileys: :) :D and hyperlinks: http://www.miranda-im.org/",
- IDC_TEXT,"MTextControl",WS_TABSTOP,7,26,210,118
+ CONTROL "Sample text. With smileys: :) :D and hyperlinks: http://www.miranda-ng.org/",IDC_TEXT,
+ "MTextControl",WS_TABSTOP,7,26,210,118
END
IDD_HISTORY DIALOGEX 0, 0, 380, 319
-STYLE DS_NOIDLEMSG | DS_CENTER | WS_MINIMIZEBOX | WS_MAXIMIZEBOX | WS_POPUP |
- WS_CAPTION | WS_SYSMENU | WS_THICKFRAME
+STYLE DS_SETFONT | DS_NOIDLEMSG | DS_CENTER | WS_MINIMIZEBOX | WS_MAXIMIZEBOX | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_THICKFRAME
CAPTION "NewStory - New History for Miranda IM"
-FONT 8, "MS Shell Dlg"
+FONT 8, "MS Shell Dlg", 0, 0, 0x1
BEGIN
CONTROL "",IDC_CLOSE,"MButtonClass",WS_TABSTOP,364,99,16,14
CONTROL "",IDC_MESSAGE,"MButtonClass",WS_TABSTOP,37,99,16,14
@@ -80,10 +71,7 @@ BEGIN
EDITTEXT IDC_SEARCHTEXT,19,305,305,14,ES_AUTOHSCROLL
ICON "",IDC_SEARCHICON,1,298,20,20,SS_CENTERIMAGE
CONTROL "",IDC_LOGOPTIONS,"MButtonClass",WS_TABSTOP,116,99,16,14
- CONTROL "Tree1",IDC_TIMETREE,"SysTreeView32",TVS_DISABLEDRAGDROP |
- TVS_SHOWSELALWAYS | TVS_TRACKSELECT | TVS_SINGLEEXPAND |
- TVS_FULLROWSELECT | NOT WS_VISIBLE | WS_TABSTOP,0,134,84,
- 160,WS_EX_STATICEDGE
+ CONTROL "Tree1",IDC_TIMETREE,"SysTreeView32",TVS_DISABLEDRAGDROP | TVS_SHOWSELALWAYS | TVS_TRACKSELECT | TVS_FULLROWSELECT | TVS_SINGLEEXPAND | NOT WS_VISIBLE | WS_TABSTOP,0,134,84,160,WS_EX_STATICEDGE
CONTROL "",IDC_SECURITY,"MButtonClass",WS_TABSTOP,347,99,16,14
CONTROL "",IDC_DATEPOPUP,"MButtonClass",WS_TABSTOP,148,99,16,14
CONTROL "",IDC_ITEMS2,"NewstoryList",WS_TABSTOP,90,132,290,166
@@ -100,65 +88,47 @@ BEGIN
LTEXT "237562",IDC_TXT_MESSAGES_OUT,45,52,25,8,SS_CENTERIMAGE
LTEXT "237562",IDC_TXT_FILES_OUT,169,55,25,8,SS_CENTERIMAGE
LTEXT "237562",IDC_TXT_TOTAL_OUT,327,54,25,8,SS_CENTERIMAGE
- CONTROL "",IDC_ICO_MESSAGES_IN,"MButtonClass",WS_TABSTOP,17,36,
- 16,14
- CONTROL "",IDC_ICO_MESSAGES_OUT,"MButtonClass",WS_TABSTOP,17,52,
- 16,14
- CONTROL "",IDC_ICO_FILES_IN,"MButtonClass",WS_TABSTOP,143,36,16,
- 14
- CONTROL "",IDC_ICO_FILES_OUT,"MButtonClass",WS_TABSTOP,143,52,16,
- 14
- CONTROL "",IDC_ICO_TOTAL_IN,"MButtonClass",WS_TABSTOP,305,36,16,
- 14
- CONTROL "",IDC_ICO_TOTAL_OUT,"MButtonClass",WS_TABSTOP,305,52,16,
- 14
+ CONTROL "",IDC_ICO_MESSAGES_IN,"MButtonClass",WS_TABSTOP,17,36,16,14
+ CONTROL "",IDC_ICO_MESSAGES_OUT,"MButtonClass",WS_TABSTOP,17,52,16,14
+ CONTROL "",IDC_ICO_FILES_IN,"MButtonClass",WS_TABSTOP,143,36,16,14
+ CONTROL "",IDC_ICO_FILES_OUT,"MButtonClass",WS_TABSTOP,143,52,16,14
+ CONTROL "",IDC_ICO_TOTAL_IN,"MButtonClass",WS_TABSTOP,305,36,16,14
+ CONTROL "",IDC_ICO_TOTAL_OUT,"MButtonClass",WS_TABSTOP,305,52,16,14
ICON "",IDC_ICO_URLS,205,9,20,20
LTEXT "424356",IDC_TXT_URLS,237,15,25,8,SS_CENTERIMAGE
LTEXT "237562",IDC_TXT_URLS_IN,249,44,25,8,SS_CENTERIMAGE
LTEXT "237562",IDC_TXT_URLS_OUT,251,57,25,8,SS_CENTERIMAGE
- CONTROL "",IDC_ICO_URLS_IN,"MButtonClass",WS_TABSTOP,225,38,16,
- 14
- CONTROL "",IDC_ICO_URLS_OUT,"MButtonClass",WS_TABSTOP,225,54,16,
- 14
- CONTROL "DateTimePicker1",IDC_DATE_TO,"SysDateTimePick32",
- DTS_RIGHTALIGN | DTS_UPDOWN | DTS_LONGDATEFORMAT |
- WS_TABSTOP,246,94,90,15
- CONTROL "DateTimePicker1",IDC_DATE_FROM,"SysDateTimePick32",
- DTS_RIGHTALIGN | DTS_UPDOWN | DTS_LONGDATEFORMAT |
- WS_TABSTOP,247,76,90,15
- CONTROL "since",IDC_CHK_DATE_FROM,"Button",BS_AUTOCHECKBOX |
- BS_RIGHT | BS_VCENTER | BS_FLAT | WS_TABSTOP,209,80,33,
- 10,WS_EX_TRANSPARENT | WS_EX_RIGHT
- CONTROL "till",IDC_CHK_DATE_TO,"Button",BS_AUTOCHECKBOX |
- BS_RIGHT | BS_VCENTER | BS_FLAT | WS_TABSTOP,210,97,33,
- 10,WS_EX_TRANSPARENT | WS_EX_RIGHT
+ CONTROL "",IDC_ICO_URLS_IN,"MButtonClass",WS_TABSTOP,225,38,16,14
+ CONTROL "",IDC_ICO_URLS_OUT,"MButtonClass",WS_TABSTOP,225,54,16,14
+ CONTROL "DateTimePicker1",IDC_DATE_TO,"SysDateTimePick32",DTS_RIGHTALIGN | DTS_UPDOWN | DTS_LONGDATEFORMAT | WS_TABSTOP,246,94,90,15
+ CONTROL "DateTimePicker1",IDC_DATE_FROM,"SysDateTimePick32",DTS_RIGHTALIGN | DTS_UPDOWN | DTS_LONGDATEFORMAT | WS_TABSTOP,247,76,90,15
+ CONTROL "since",IDC_CHK_DATE_FROM,"Button",BS_AUTOCHECKBOX | BS_RIGHT | BS_VCENTER | BS_FLAT | WS_TABSTOP,209,80,33,10,WS_EX_TRANSPARENT | WS_EX_RIGHT
+ CONTROL "till",IDC_CHK_DATE_TO,"Button",BS_AUTOCHECKBOX | BS_RIGHT | BS_VCENTER | BS_FLAT | WS_TABSTOP,210,97,33,10,WS_EX_TRANSPARENT | WS_EX_RIGHT
END
-IDD_PASSWORD DIALOG DISCARDABLE 0, 0, 259, 61
-STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION
+IDD_PASSWORD DIALOGEX 0, 0, 259, 61
+STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION
CAPTION "Newstory"
-FONT 8, "MS Shell Dlg"
+FONT 8, "MS Shell Dlg", 0, 0, 0x1
BEGIN
DEFPUSHBUTTON "OK",IDOK,147,39,50,15
PUSHBUTTON "Cancel",IDCANCEL,202,39,50,15
- LTEXT "Ooops! This is a protected area, so type your password here:",
- IDC_STATIC,7,7,192,8
+ LTEXT "Ooops! This is a protected area, so type your password here:",IDC_STATIC,7,7,192,8
EDITTEXT IDC_PASSWORD,12,20,240,14,ES_PASSWORD | ES_AUTOHSCROLL
END
IDD_CALENDARTOOL DIALOGEX 0, 0, 98, 85
-STYLE WS_POPUP | WS_BORDER
+STYLE DS_SETFONT | WS_POPUP | WS_BORDER
EXSTYLE WS_EX_TOOLWINDOW
FONT 8, "MS Shell Dlg", 0, 0, 0x1
BEGIN
- CONTROL "MonthCalendar1",IDC_MONTHCALENDAR1,"SysMonthCal32",
- WS_TABSTOP | 0x8,0,0,98,85
+ CONTROL "MonthCalendar1",IDC_MONTHCALENDAR1,"SysMonthCal32",MCS_NOTODAYCIRCLE | WS_TABSTOP,0,0,98,85
END
-IDD_CHANGEPASSWORD DIALOG DISCARDABLE 0, 0, 259, 126
-STYLE DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_CAPTION
+IDD_CHANGEPASSWORD DIALOGEX 0, 0, 259, 126
+STYLE DS_SETFONT | DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_CAPTION
CAPTION "Change Newstory Password"
-FONT 8, "MS Shell Dlg"
+FONT 8, "MS Shell Dlg", 0, 0, 0x1
BEGIN
DEFPUSHBUTTON "OK",IDOK,148,103,50,16
PUSHBUTTON "Cancel",IDCANCEL,202,103,50,16
@@ -170,75 +140,89 @@ BEGIN
EDITTEXT IDC_PASSWORD3,12,84,240,14,ES_PASSWORD | ES_AUTOHSCROLL
END
-IDD_OPTIONS DIALOG DISCARDABLE 0, 0, 314, 240
-STYLE WS_CHILD
-FONT 8, "MS Shell Dlg"
+IDD_OPTIONS DIALOGEX 0, 0, 314, 240
+STYLE DS_SETFONT | WS_CHILD
+FONT 8, "MS Shell Dlg", 0, 0, 0x1
BEGIN
CONTROL "Tab1",IDC_TAB,"SysTabControl32",0x0,0,0,314,240
END
-IDD_OPT_TEMPLATES DIALOG DISCARDABLE 0, 0, 307, 223
-STYLE WS_CHILD
-FONT 8, "MS Shell Dlg"
+IDD_OPT_TEMPLATES DIALOGEX 0, 0, 307, 223
+STYLE DS_SETFONT | WS_CHILD
+FONT 8, "MS Shell Dlg", 0, 0, 0x1
BEGIN
- CONTROL "Tree1",IDC_TEMPLATES,"SysTreeView32",
- TVS_DISABLEDRAGDROP | TVS_SHOWSELALWAYS |
- TVS_FULLROWSELECT | WS_BORDER | WS_TABSTOP,12,20,135,117
+ CONTROL "Tree1",IDC_TEMPLATES,"SysTreeView32",TVS_DISABLEDRAGDROP | TVS_SHOWSELALWAYS | TVS_FULLROWSELECT | WS_BORDER | WS_TABSTOP,12,20,135,117
LTEXT "Edit template:",IDC_STATIC,7,142,293,8
- EDITTEXT IDC_EDITTEMPLATE,12,155,288,42,ES_MULTILINE |
- ES_AUTOVSCROLL | ES_AUTOHSCROLL | ES_WANTRETURN
- CONTROL "",IDC_VARHELP,"MButtonClass",WS_DISABLED | WS_TABSTOP,
- 284,202,16,14
- EDITTEXT IDC_PREVIEW,162,20,138,42,ES_MULTILINE | ES_AUTOVSCROLL |
- ES_READONLY
+ EDITTEXT IDC_EDITTEMPLATE,12,155,288,42,ES_MULTILINE | ES_AUTOVSCROLL | ES_AUTOHSCROLL | ES_WANTRETURN
+ CONTROL "",IDC_VARHELP,"MButtonClass",WS_DISABLED | WS_TABSTOP,284,202,16,14
+ EDITTEXT IDC_PREVIEW,162,20,138,42,ES_MULTILINE | ES_AUTOVSCROLL | ES_READONLY
LTEXT "Template list:",IDC_STATIC,7,7,140,8
LTEXT "Text preview:",IDC_STATIC,157,7,143,8
CONTROL "",IDC_DISCARD,"MButtonClass",WS_TABSTOP,252,202,16,14
LTEXT "Graphic preview:",IDC_STATIC,157,67,143,8
CONTROL "",IDC_GPREVIEW,"MTextControl",WS_TABSTOP,162,80,138,57
- CONTROL "",IDC_UPDATEPREVIEW,"MButtonClass",WS_TABSTOP,268,202,
- 16,14
+ CONTROL "",IDC_UPDATEPREVIEW,"MButtonClass",WS_TABSTOP,268,202,16,14
END
-IDD_OPT_GENERAL DIALOG DISCARDABLE 0, 0, 307, 223
-STYLE WS_CHILD
-FONT 8, "MS Shell Dlg"
+IDD_OPT_GENERAL DIALOGEX 0, 0, 307, 223
+STYLE DS_SETFONT | WS_CHILD
+FONT 8, "MS Shell Dlg", 0, 0, 0x1
BEGIN
CTEXT "Coming soon...",IDC_STATIC,7,7,293,209,SS_CENTERIMAGE
END
-IDD_OPT_PASSWORDS DIALOG DISCARDABLE 0, 0, 307, 223
-STYLE WS_CHILD
-FONT 8, "MS Shell Dlg"
+IDD_OPT_PASSWORDS DIALOGEX 0, 0, 307, 223
+STYLE DS_SETFONT | WS_CHILD
+FONT 8, "MS Shell Dlg", 0, 0, 0x1
BEGIN
LTEXT "Edit password for:",IDC_STATIC,7,7,125,8
LTEXT "Current password:",IDC_STATIC,137,20,163,8
- CONTROL "",IDC_LIST,"CListControl",WS_TABSTOP | 0x1d0,13,21,118,
- 194
- EDITTEXT IDC_CHANGEPASS,142,34,158,14,ES_PASSWORD |
- ES_AUTOHSCROLL
+ CONTROL "",IDC_LIST,"CListControl",WS_TABSTOP | 0x1d0,13,21,118,194
+ EDITTEXT IDC_CHANGEPASS,142,34,158,14,ES_PASSWORD | ES_AUTOHSCROLL
LTEXT "New password:",IDC_STATIC,137,54,163,8
- EDITTEXT IDC_CHANGEPASS2,142,67,158,14,ES_PASSWORD |
- ES_AUTOHSCROLL
+ EDITTEXT IDC_CHANGEPASS2,142,67,158,14,ES_PASSWORD | ES_AUTOHSCROLL
LTEXT "Confirm new password",IDC_STATIC,137,86,163,8
- EDITTEXT IDC_CHANGEPASS3,142,99,158,14,ES_PASSWORD |
- ES_AUTOHSCROLL
- CONTROL "",IDC_SAVEPASSWORD,"MButtonClass",WS_TABSTOP,284,118,16,
- 14
+ EDITTEXT IDC_CHANGEPASS3,142,99,158,14,ES_PASSWORD | ES_AUTOHSCROLL
+ CONTROL "",IDC_SAVEPASSWORD,"MButtonClass",WS_TABSTOP,284,118,16,14
CONTROL "",IDC_STATIC,"Static",SS_BLACKFRAME,12,20,120,196
CONTROL "",IDC_STATIC,"Static",SS_ETCHEDHORZ,137,139,163,1
- LTEXT "Password is NOT set for the contact",IDC_STATIC,158,146,
- 142,14,SS_CENTERIMAGE
- LTEXT "Password is set for the contact",IDC_STATIC,158,160,142,
- 14,SS_CENTERIMAGE
- ICON "",IDC_ICO_PASSWORD,137,160,16,14,SS_CENTERIMAGE |
- SS_REALSIZEIMAGE
- ICON "",IDC_ICO_NOPASSWORD,137,146,16,14,SS_CENTERIMAGE |
- SS_REALSIZEIMAGE
- LTEXT "Global password is password used to access history of contacts with no password set.",
- IDC_STATIC,137,179,163,16
- LTEXT "Master password can be used to override ANY password. This may be useful if you forget some...",
- IDC_STATIC,137,200,163,16
+ LTEXT "Password is NOT set for the contact",IDC_STATIC,158,146,142,14,SS_CENTERIMAGE
+ LTEXT "Password is set for the contact",IDC_STATIC,158,160,142,14,SS_CENTERIMAGE
+ ICON "",IDC_ICO_PASSWORD,137,160,16,14,SS_CENTERIMAGE | SS_REALSIZEIMAGE
+ ICON "",IDC_ICO_NOPASSWORD,137,146,16,14,SS_CENTERIMAGE | SS_REALSIZEIMAGE
+ LTEXT "Global password is password used to access history of contacts with no password set.",IDC_STATIC,137,179,163,16
+ LTEXT "Master password can be used to override ANY password. This may be useful if you forget some...",IDC_STATIC,137,200,163,16
+END
+
+IDD_FILTERMODE DIALOGEX 0, 0, 219, 171
+STYLE DS_SETFONT | DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU
+EXSTYLE WS_EX_NOPARENTNOTIFY
+CAPTION "Message Filter"
+FONT 8, "MS Shell Dlg", 0, 0, 0x1
+BEGIN
+ DEFPUSHBUTTON "OK",IDOK,107,150,50,14
+ PUSHBUTTON "Cancel",IDCANCEL,161,150,50,14
+ LTEXT "By Direction",IDC_STATIC,7,7,100,8
+ CONTROL "",IDC_STATIC,"Static",SS_ETCHEDHORZ,7,15,100,1
+ CONTROL "Incoming Events",IDC_CHK_IN,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,12,21,95,10
+ CONTROL "Outgoing Events",IDC_CHK_OUT,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,12,31,95,10
+ LTEXT "By Type",IDC_STATIC,7,46,100,8
+ CONTROL "",IDC_STATIC,"Static",SS_ETCHEDHORZ,7,54,100,1
+ CONTROL "Messages",IDC_CHK_MESSAGES,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,12,60,95,10
+ CONTROL "File Transfers",IDC_CHK_FILE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,12,70,95,10
+ CONTROL "URL Events",IDC_CHK_URL,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,12,80,95,10
+ CONTROL "Status Changes",IDC_CHK_STATUS,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,12,90,95,10
+ CONTROL "Other Events",IDC_CHK_OTHER,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,12,100,95,10
+ CONTROL "Other",IDC_STATIC,"Static",SS_LEFTNOWORDWRAP | WS_GROUP,7,115,100,8
+ CONTROL "",IDC_STATIC,"Static",SS_ETCHEDHORZ,7,123,100,1
+ CONTROL "Search-Filter",IDC_CHK_AUTOFILTER,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,12,129,95,10
+ LTEXT "By Date",IDC_STATIC,112,7,100,8,WS_DISABLED
+ CONTROL "",IDC_STATIC,"Static",SS_ETCHEDHORZ,112,15,99,1
+ CONTROL "DateTimePicker1",IDC_DATETIMEPICKER1,"SysDateTimePick32",DTS_RIGHTALIGN | DTS_UPDOWN | DTS_LONGDATEFORMAT | WS_DISABLED | WS_TABSTOP,117,29,95,15
+ LTEXT "Since",IDC_STATIC,112,21,100,8,WS_DISABLED
+ LTEXT "Until",IDC_STATIC,112,46,100,8,WS_DISABLED
+ CONTROL "DateTimePicker2",IDC_DATETIMEPICKER2,"SysDateTimePick32",DTS_RIGHTALIGN | DTS_UPDOWN | DTS_LONGDATEFORMAT | WS_DISABLED | WS_TABSTOP,117,55,95,15
+ CONTROL "",IDC_STATIC,"Static",SS_ETCHEDHORZ,7,144,205,1
END
@@ -248,7 +232,7 @@ END
//
#ifdef APSTUDIO_INVOKED
-GUIDELINES DESIGNINFO DISCARDABLE
+GUIDELINES DESIGNINFO
BEGIN
IDD_SEARCH, DIALOG
BEGIN
@@ -305,6 +289,10 @@ BEGIN
HORZGUIDE, 39
END
+ IDD_CALENDARTOOL, DIALOG
+ BEGIN
+ END
+
IDD_CHANGEPASSWORD, DIALOG
BEGIN
LEFTMARGIN, 7
@@ -403,6 +391,38 @@ BEGIN
HORZGUIDE, 195
HORZGUIDE, 200
END
+
+ IDD_FILTERMODE, DIALOG
+ BEGIN
+ LEFTMARGIN, 7
+ RIGHTMARGIN, 212
+ VERTGUIDE, 12
+ VERTGUIDE, 107
+ VERTGUIDE, 112
+ VERTGUIDE, 117
+ VERTGUIDE, 156
+ VERTGUIDE, 161
+ TOPMARGIN, 7
+ BOTTOMMARGIN, 164
+ HORZGUIDE, 15
+ HORZGUIDE, 16
+ HORZGUIDE, 21
+ HORZGUIDE, 29
+ HORZGUIDE, 41
+ HORZGUIDE, 46
+ HORZGUIDE, 54
+ HORZGUIDE, 55
+ HORZGUIDE, 60
+ HORZGUIDE, 110
+ HORZGUIDE, 115
+ HORZGUIDE, 123
+ HORZGUIDE, 124
+ HORZGUIDE, 129
+ HORZGUIDE, 139
+ HORZGUIDE, 144
+ HORZGUIDE, 145
+ HORZGUIDE, 150
+ END
END
#endif // APSTUDIO_INVOKED
@@ -412,7 +432,7 @@ END
// Menu
//
-IDR_POPUPS MENU DISCARDABLE
+IDR_POPUPS MENU
BEGIN
POPUP "Export"
BEGIN
@@ -421,14 +441,10 @@ BEGIN
END
POPUP "Filter"
BEGIN
- MENUITEM "Show All Events", ID_FILTER_SHOWALLEVENTS
- , GRAYED
- MENUITEM "Show Incoming Events Only", ID_FILTER_SHOWINCOMINGEVENTSONLY
- , GRAYED
- MENUITEM "Show Outgoing Events Only", ID_FILTER_SHOWOUTGOINGEVENTSONLY
- , GRAYED
- MENUITEM "Use Custom Filter...", ID_FILTER_USECUSTOMFILTER
- , GRAYED
+ MENUITEM "Show All Events", ID_FILTER_SHOWALLEVENTS, GRAYED
+ MENUITEM "Show Incoming Events Only", ID_FILTER_SHOWINCOMINGEVENTSONLY, GRAYED
+ MENUITEM "Show Outgoing Events Only", ID_FILTER_SHOWOUTGOINGEVENTSONLY, GRAYED
+ MENUITEM "Use Custom Filter...", ID_FILTER_USECUSTOMFILTER, GRAYED
MENUITEM SEPARATOR
MENUITEM "Incoming Events", ID_FILTER_INCOMING, CHECKED
MENUITEM "Outgoing Events", ID_FILTER_OUTGOING, CHECKED
@@ -467,117 +483,12 @@ END
// Accelerator
//
-IDR_ACCEL ACCELERATORS DISCARDABLE
+IDR_ACCEL ACCELERATORS
BEGIN
"C", IDA_COPY, VIRTKEY, CONTROL, NOINVERT
"F", IDA_SEARCH, VIRTKEY, CONTROL, NOINVERT
END
-#endif // Neutral resources
-/////////////////////////////////////////////////////////////////////////////
-
-
-/////////////////////////////////////////////////////////////////////////////
-// Unknown language: 0x22, 0x1 resources
-
-#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_UKR)
-#ifdef _WIN32
-LANGUAGE 0x22, 0x1
-#pragma code_page(1251)
-#endif //_WIN32
-
-/////////////////////////////////////////////////////////////////////////////
-//
-// Dialog
-//
-
-IDD_FILTERMODE DIALOGEX 0, 0, 219, 171
-STYLE DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU
-EXSTYLE WS_EX_NOPARENTNOTIFY
-CAPTION "Message Filter"
-FONT 8, "MS Shell Dlg", 0, 0, 0x1
-BEGIN
- DEFPUSHBUTTON "OK",IDOK,107,150,50,14
- PUSHBUTTON "Cancel",IDCANCEL,161,150,50,14
- LTEXT "By Direction",IDC_STATIC,7,7,100,8
- CONTROL "",IDC_STATIC,"Static",SS_ETCHEDHORZ,7,15,100,1
- CONTROL "Incoming Events",IDC_CHK_IN,"Button",BS_AUTOCHECKBOX |
- WS_TABSTOP,12,21,95,10
- CONTROL "Outgoing Events",IDC_CHK_OUT,"Button",BS_AUTOCHECKBOX |
- WS_TABSTOP,12,31,95,10
- LTEXT "By Type",IDC_STATIC,7,46,100,8
- CONTROL "",IDC_STATIC,"Static",SS_ETCHEDHORZ,7,54,100,1
- CONTROL "Messages",IDC_CHK_MESSAGES,"Button",BS_AUTOCHECKBOX |
- WS_TABSTOP,12,60,95,10
- CONTROL "File Transfers",IDC_CHK_FILE,"Button",BS_AUTOCHECKBOX |
- WS_TABSTOP,12,70,95,10
- CONTROL "URL Events",IDC_CHK_URL,"Button",BS_AUTOCHECKBOX |
- WS_TABSTOP,12,80,95,10
- CONTROL "Status Changes",IDC_CHK_STATUS,"Button",BS_AUTOCHECKBOX |
- WS_TABSTOP,12,90,95,10
- CONTROL "Other Events",IDC_CHK_OTHER,"Button",BS_AUTOCHECKBOX |
- WS_TABSTOP,12,100,95,10
- CONTROL "Other",IDC_STATIC,"Static",SS_LEFTNOWORDWRAP | WS_GROUP,
- 7,115,100,8
- CONTROL "",IDC_STATIC,"Static",SS_ETCHEDHORZ,7,123,100,1
- CONTROL "Search-Filter",IDC_CHK_AUTOFILTER,"Button",
- BS_AUTOCHECKBOX | WS_TABSTOP,12,129,95,10
- LTEXT "By Date",IDC_STATIC,112,7,100,8,WS_DISABLED
- CONTROL "",IDC_STATIC,"Static",SS_ETCHEDHORZ,112,15,99,1
- CONTROL "DateTimePicker1",IDC_DATETIMEPICKER1,"SysDateTimePick32",
- DTS_RIGHTALIGN | DTS_UPDOWN | DTS_LONGDATEFORMAT |
- WS_DISABLED | WS_TABSTOP,117,29,95,15
- LTEXT "Since",IDC_STATIC,112,21,100,8,WS_DISABLED
- LTEXT "Until",IDC_STATIC,112,46,100,8,WS_DISABLED
- CONTROL "DateTimePicker2",IDC_DATETIMEPICKER2,"SysDateTimePick32",
- DTS_RIGHTALIGN | DTS_UPDOWN | DTS_LONGDATEFORMAT |
- WS_DISABLED | WS_TABSTOP,117,55,95,15
- CONTROL "",IDC_STATIC,"Static",SS_ETCHEDHORZ,7,144,205,1
-END
-
-
-/////////////////////////////////////////////////////////////////////////////
-//
-// DESIGNINFO
-//
-
-#ifdef APSTUDIO_INVOKED
-GUIDELINES DESIGNINFO DISCARDABLE
-BEGIN
- IDD_FILTERMODE, DIALOG
- BEGIN
- LEFTMARGIN, 7
- RIGHTMARGIN, 212
- VERTGUIDE, 12
- VERTGUIDE, 107
- VERTGUIDE, 112
- VERTGUIDE, 117
- VERTGUIDE, 156
- VERTGUIDE, 161
- TOPMARGIN, 7
- BOTTOMMARGIN, 164
- HORZGUIDE, 15
- HORZGUIDE, 16
- HORZGUIDE, 21
- HORZGUIDE, 29
- HORZGUIDE, 41
- HORZGUIDE, 46
- HORZGUIDE, 54
- HORZGUIDE, 55
- HORZGUIDE, 60
- HORZGUIDE, 110
- HORZGUIDE, 115
- HORZGUIDE, 123
- HORZGUIDE, 124
- HORZGUIDE, 129
- HORZGUIDE, 139
- HORZGUIDE, 144
- HORZGUIDE, 145
- HORZGUIDE, 150
- END
-END
-#endif // APSTUDIO_INVOKED
-
#ifdef APSTUDIO_INVOKED
/////////////////////////////////////////////////////////////////////////////
@@ -585,18 +496,18 @@ END
// TEXTINCLUDE
//
-1 TEXTINCLUDE DISCARDABLE
+1 TEXTINCLUDE
BEGIN
- "resource.h\0"
+ "..\\src\\resource.h\0"
END
-2 TEXTINCLUDE DISCARDABLE
+2 TEXTINCLUDE
BEGIN
"#include ""afxres.h""\r\n"
"\0"
END
-3 TEXTINCLUDE DISCARDABLE
+3 TEXTINCLUDE
BEGIN
"\r\n"
"\0"
@@ -605,7 +516,17 @@ END
#endif // APSTUDIO_INVOKED
-#endif // Unknown language: 0x22, 0x1 resources
+/////////////////////////////////////////////////////////////////////////////
+//
+// AFX_DIALOG_LAYOUT
+//
+
+IDD_SEARCH AFX_DIALOG_LAYOUT
+BEGIN
+ 0
+END
+
+#endif // Neutral resources
/////////////////////////////////////////////////////////////////////////////
diff --git a/plugins/NewStory/src/calendartool.cpp b/plugins/NewStory/src/calendartool.cpp
index e7cd6041dd..c9ca60ab64 100644
--- a/plugins/NewStory/src/calendartool.cpp
+++ b/plugins/NewStory/src/calendartool.cpp
@@ -7,13 +7,13 @@ struct CalendarToolData
INT_PTR CALLBACK CalendarToolDlgProc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam)
{
- CalendarToolData *data = (CalendarToolData *)GetWindowLong(hwnd, GWLP_USERDATA);
+ CalendarToolData *data = (CalendarToolData *)GetWindowLongPtr(hwnd, GWLP_USERDATA);
switch (msg)
{
case WM_INITDIALOG:
{
data = (CalendarToolData *)lParam;
- SetWindowLong(hwnd, GWLP_USERDATA, (LONG)data);
+ SetWindowLongPtr(hwnd, GWLP_USERDATA, (LONG_PTR)data);
// This causes ALL miranda dialogs to have drop-shadow enabled. That's bad =(
// SetClassLong(hwnd, GCL_STYLE, GetClassLong(hwnd, GCL_STYLE)|CS_DROPSHADOW);
@@ -73,7 +73,7 @@ INT_PTR CALLBACK CalendarToolDlgProc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM
{
delete data;
data = 0;
- SetWindowLong(hwnd, GWLP_USERDATA, 0);
+ SetWindowLongPtr(hwnd, GWLP_USERDATA, 0);
}
}
return FALSE;
diff --git a/plugins/NewStory/src/fonts.h b/plugins/NewStory/src/fonts.h
index 020e61d68a..4718aacb72 100644
--- a/plugins/NewStory/src/fonts.h
+++ b/plugins/NewStory/src/fonts.h
@@ -23,6 +23,8 @@ struct MyColourID
COLORREF defaultValue, cl;
};
+
+
extern MyColourID colors[];
enum
diff --git a/plugins/NewStory/src/history.cpp b/plugins/NewStory/src/history.cpp
index 267b2f42c1..e27f9a9603 100644
--- a/plugins/NewStory/src/history.cpp
+++ b/plugins/NewStory/src/history.cpp
@@ -408,12 +408,12 @@ INT_PTR CALLBACK HistoryDlgProc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lPara
{
//CallSnappingWindowProc(hwnd, msg, wParam, lParam);
- WindowData *data = (WindowData *)GetWindowLong(hwnd, GWLP_USERDATA);
+ WindowData *data = (WindowData *)GetWindowLongPtr(hwnd, GWLP_USERDATA);
if ((msg >= NSM_FIRST) && (msg < NSM_LAST))
{
int result = SendMessage(GetDlgItem(hwnd, IDC_ITEMS2), msg, wParam, lParam);
- SetWindowLong(hwnd, DWLP_MSGRESULT, result);
+ SetWindowLongPtr(hwnd, DWLP_MSGRESULT, result);
return result;
}
@@ -511,7 +511,7 @@ INT_PTR CALLBACK HistoryDlgProc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lPara
SendMessage(data->ibTotal.hwndIcoOut, BM_SETCHECK, BST_CHECKED, 0);
data->ibTotal.hwndTxtOut = GetDlgItem(hwnd, IDC_TXT_TOTAL_OUT);
- SetWindowLong(hwnd, GWLP_USERDATA, (LONG)data);
+ SetWindowLongPtr(hwnd, GWLP_USERDATA, (LONG_PTR)data);
data->hMenu = LoadMenu(g_plugin.getInst(), MAKEINTRESOURCE(IDR_POPUPS));
//CallService(MS_LANGPACK_TRANSLATEMENU, (WPARAM)data->hMenu, 0);
@@ -597,10 +597,10 @@ INT_PTR CALLBACK HistoryDlgProc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lPara
RECT rc
{
- db_get_dw(data->hContact, MODULENAME, "left"),
- db_get_dw(data->hContact, MODULENAME, "top"),
- db_get_dw(data->hContact, MODULENAME, "right"),
- db_get_dw(data->hContact, MODULENAME, "bottom")
+ (LONG)db_get_dw(data->hContact, MODULENAME, "left"),
+ (LONG)db_get_dw(data->hContact, MODULENAME, "top"),
+ (LONG)db_get_dw(data->hContact, MODULENAME, "right"),
+ (LONG)db_get_dw(data->hContact, MODULENAME, "bottom")
};
if ((rc.left-rc.right) && (rc.top-rc.bottom))
MoveWindow(hwnd, rc.left, rc.top, rc.right-rc.left, rc.bottom-rc.top, TRUE);
@@ -766,8 +766,8 @@ INT_PTR CALLBACK HistoryDlgProc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lPara
data->disableTimeTreeChange = false;
} else
{
- LPNMTREEVIEW pnmtv = (LPNMTREEVIEW)lParam;
- int id = pnmtv->itemNew.lParam;
+// LPNMTREEVIEW pnmtv = (LPNMTREEVIEW)lParam;
+// int id = pnmtv->itemNew.lParam;
// SendMessage(GetDlgItem(hwnd, IDC_ITEMS), LB_SETCARETINDEX, id, 0);
// SendMessage(hwnd, WM_COMMAND, MAKEWPARAM(IDC_ITEMS, LBN_SELCHANGE), (LPARAM)GetDlgItem(hwnd, IDC_ITEMS));
// SendMessage(GetDlgItem(hwnd, IDC_ITEMS), LB_SETTOPINDEX, id, 0);
@@ -825,7 +825,7 @@ INT_PTR CALLBACK HistoryDlgProc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lPara
{
RECT rc;
GetWindowRect(GetDlgItem(hwnd, LOWORD(wParam)), &rc);
- DWORD itemID = 0;
+// DWORD itemID = 0;
switch (TrackPopupMenu(GetSubMenu(data->hMenu, 2), TPM_RETURNCMD, rc.left, rc.bottom, 0, hwnd, NULL))
{
// case ID_LOGOPTIONS_SHOWTIMETREE:
@@ -887,9 +887,9 @@ INT_PTR CALLBACK HistoryDlgProc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lPara
LayoutHistoryWnd(hwnd, data);
break;
- RECT rc;
+ /*RECT rc;
GetWindowRect(GetDlgItem(hwnd, LOWORD(wParam)), &rc);
- DWORD itemID = 0;
+// DWORD itemID = 0;
bool doFilter = true;
switch (TrackPopupMenu(GetSubMenu(data->hMenu, 1), TPM_RETURNCMD, rc.left, rc.bottom, 0, hwnd, NULL))
{
@@ -957,7 +957,7 @@ INT_PTR CALLBACK HistoryDlgProc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lPara
}
if (doFilter)
PostMessage(hwnd, UM_REBUILDLIST, 0, 0);
- break;
+ break;*/
}
case IDC_SECURITY:
@@ -1041,8 +1041,8 @@ INT_PTR svcShowNewstory(WPARAM wParam, LPARAM)
} else
if (AskPassword((MCONTACT)wParam))
{
- HWND hwnd = CreateDialogParam(g_plugin.getInst(), MAKEINTRESOURCE(IDD_HISTORY), 0, HistoryDlgProc, wParam);
- ShowWindow(hwnd, SW_SHOWNORMAL);
+ HWND hwnd2 = CreateDialogParam(g_plugin.getInst(), MAKEINTRESOURCE(IDD_HISTORY), 0, HistoryDlgProc, wParam);
+ ShowWindow(hwnd2, SW_SHOWNORMAL);
}
return 0;
}
@@ -1057,8 +1057,8 @@ INT_PTR svcShowSystemNewstory(WPARAM, LPARAM)
} else
if (AskPassword(0))
{
- HWND hwnd = CreateDialogParam(g_plugin.getInst(), MAKEINTRESOURCE(IDD_HISTORY), 0, HistoryDlgProc, 0);
- ShowWindow(hwnd, SW_SHOWNORMAL);
+ HWND hwnd2 = CreateDialogParam(g_plugin.getInst(), MAKEINTRESOURCE(IDD_HISTORY), 0, HistoryDlgProc, 0);
+ ShowWindow(hwnd2, SW_SHOWNORMAL);
}
return 0;
}
diff --git a/plugins/NewStory/src/history_array.cpp b/plugins/NewStory/src/history_array.cpp
index 6d34d9043d..38d16de58e 100644
--- a/plugins/NewStory/src/history_array.cpp
+++ b/plugins/NewStory/src/history_array.cpp
@@ -34,7 +34,7 @@ bool HistoryArray::ItemData::load(EventLoadMode mode)
atext = (char *)dbe.pBlob;
atext_del = false;
aLength = lstrlenA(atext);
- if (dbe.cbBlob > aLength+1)
+ if (dbe.cbBlob > (DWORD)aLength + 1)
{
wtext = (WCHAR *)(dbe.pBlob + aLength + 1);
wtext_del = false;
@@ -181,7 +181,7 @@ bool HistoryArray::addHistory(MCONTACT hContact, EventLoadMode)
++i;
hEvent = db_event_next(hEvent, 0);
}
- char buf[666];
+// char buf[666];
return true;
}
diff --git a/plugins/NewStory/src/history_control.cpp b/plugins/NewStory/src/history_control.cpp
index 8467503026..e0e82d0501 100644
--- a/plugins/NewStory/src/history_control.cpp
+++ b/plugins/NewStory/src/history_control.cpp
@@ -71,7 +71,7 @@ static LRESULT CALLBACK HistoryEditWndProc(HWND hwnd, UINT msg, WPARAM wParam, L
{
case VK_ESCAPE:
{
- EndEditItem(GetParent(hwnd), (NewstoryListData *)GetWindowLong(GetParent(hwnd), 0));
+ EndEditItem(GetParent(hwnd), (NewstoryListData *)GetWindowLongPtr(GetParent(hwnd), 0));
return 0;
}
}
@@ -81,10 +81,10 @@ static LRESULT CALLBACK HistoryEditWndProc(HWND hwnd, UINT msg, WPARAM wParam, L
{
if (lParam)
{
- MSG *msg = (MSG *)lParam;
- if (msg->message == WM_KEYDOWN && msg->wParam == VK_TAB)
+ MSG *msg2 = (MSG *)lParam;
+ if (msg2->message == WM_KEYDOWN && msg2->wParam == VK_TAB)
return 0;
- if (msg->message == WM_CHAR && msg->wParam == '\t')
+ if (msg2->message == WM_CHAR && msg2->wParam == '\t')
return 0;
}
return DLGC_WANTMESSAGE;
@@ -102,7 +102,7 @@ static LRESULT CALLBACK HistoryEditWndProc(HWND hwnd, UINT msg, WPARAM wParam, L
// WndProc
LRESULT CALLBACK NewstoryListWndProc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam)
{
- NewstoryListData *data = (NewstoryListData *)GetWindowLong(hwnd, 0);
+ NewstoryListData *data = (NewstoryListData *)GetWindowLongPtr(hwnd, 0);
switch (msg)
{
@@ -114,7 +114,7 @@ LRESULT CALLBACK NewstoryListWndProc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM
data->cachedMaxTopItem = 0;
data->cachedMaxTopPixel = 0;
data->hwndEditBox = 0;
- SetWindowLong(hwnd, 0, (int)data);
+ SetWindowLongPtr(hwnd, 0, (LONG_PTR)data);
RecalcScrollBar(hwnd, data);
break;
@@ -138,8 +138,8 @@ LRESULT CALLBACK NewstoryListWndProc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM
case NSM_SELECTITEMS:
{
- DWORD start = min(data->items.getCount()-1, max(0, wParam));
- DWORD end = min(data->items.getCount()-1, max(0, lParam));
+ int start = min(data->items.getCount()-1, max(0, wParam));
+ int end = min(data->items.getCount()-1, max(0, lParam));
if (start > end)
{
start ^= end;
@@ -154,8 +154,8 @@ LRESULT CALLBACK NewstoryListWndProc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM
case NSM_TOGGLEITEMS:
{
- DWORD start = min(data->items.getCount()-1, max(0, wParam));
- DWORD end = min(data->items.getCount()-1, max(0, lParam));
+ int start = min(data->items.getCount()-1, max(0, wParam));
+ int end = min(data->items.getCount()-1, max(0, lParam));
if (start > end)
{
start ^= end;
@@ -178,15 +178,15 @@ LRESULT CALLBACK NewstoryListWndProc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM
case NSM_SELECTITEMS2:
{
- DWORD start = min(data->items.getCount()-1, max(0, wParam));
- DWORD end = min(data->items.getCount()-1, max(0, lParam));
+ int start = min(data->items.getCount()-1, max(0, wParam));
+ int end = min(data->items.getCount()-1, max(0, lParam));
if (start > end)
{
start ^= end;
end ^= start;
start ^= end;
}
- DWORD count = data->items.getCount();
+ int count = data->items.getCount();
for (int i = 0; i < count; ++i)
{
if ((i >= start) && (i <= end))
@@ -203,8 +203,8 @@ LRESULT CALLBACK NewstoryListWndProc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM
case NSM_DESELECTITEMS:
{
- DWORD start = min(data->items.getCount()-1, max(0, wParam));
- DWORD end = min(data->items.getCount()-1, max(0, lParam));
+ int start = min(data->items.getCount()-1, max(0, wParam));
+ int end = min(data->items.getCount()-1, max(0, lParam));
if (start > end)
{
start ^= end;
@@ -375,12 +375,12 @@ LRESULT CALLBACK NewstoryListWndProc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM
if (top <= height)
{
- RECT rc;
- SetRect(&rc, 0, top, width, height);
+ RECT rc2;
+ SetRect(&rc2, 0, top, width, height);
HBRUSH hbr;
hbr = CreateSolidBrush(RGB(0xff,0xff,0xff));
- FillRect(hdc, &rc, hbr);
+ FillRect(hdc, &rc2, hbr);
DeleteObject(hbr);
}
@@ -407,19 +407,19 @@ LRESULT CALLBACK NewstoryListWndProc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM
{
if (lParam)
{
- MSG *msg = (MSG *) lParam;
- if (msg->message == WM_KEYDOWN)
+ MSG *msg2 = (MSG *) lParam;
+ if (msg2->message == WM_KEYDOWN)
{
- if (msg->wParam == VK_TAB)
+ if (msg2->wParam == VK_TAB)
return 0;
- if (msg->wParam == VK_ESCAPE && !data->hwndEditBox)
+ if (msg2->wParam == VK_ESCAPE && !data->hwndEditBox)
return 0;
} else
- if (msg->message == WM_CHAR)
+ if (msg2->message == WM_CHAR)
{
- if (msg->wParam == '\t')
+ if (msg2->wParam == '\t')
return 0;
- if (msg->wParam == 27 && !data->hwndEditBox)
+ if (msg2->wParam == 27 && !data->hwndEditBox)
return 0;
}
}
@@ -604,7 +604,7 @@ LRESULT CALLBACK NewstoryListWndProc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM
case WM_DESTROY:
{
delete data;
- SetWindowLong(hwnd, 0, 0);
+ SetWindowLongPtr(hwnd, 0, 0);
break;
}
}
@@ -807,7 +807,7 @@ static void BeginEditItem(HWND hwnd, NewstoryListData *data, int index)
TCHAR *text = TplFormatString(tpl, item->hContact, item);
data->hwndEditBox = CreateWindow(_T("EDIT"), text, WS_CHILD|WS_BORDER|ES_READONLY|ES_MULTILINE|ES_AUTOVSCROLL, 0, top, rc.right-rc.left, itemHeight, hwnd, NULL, g_plugin.getInst(), NULL);
- OldEditWndProc = (WNDPROC)SetWindowLong(data->hwndEditBox, GWLP_WNDPROC, (LONG)HistoryEditWndProc);
+ OldEditWndProc = (WNDPROC)SetWindowLongPtr(data->hwndEditBox, GWLP_WNDPROC, (LONG_PTR)HistoryEditWndProc);
SendMessage(data->hwndEditBox, WM_SETFONT, (WPARAM)fonts[fontid].hfnt, 0);
SendMessage(data->hwndEditBox, EM_SETMARGINS, EC_RIGHTMARGIN, 100);
SendMessage(data->hwndEditBox, EM_SETSEL, 0, (LPARAM) (-1));
diff --git a/plugins/NewStory/src/icons.cpp b/plugins/NewStory/src/icons.cpp
index 26a8f01360..36bf44344b 100644
--- a/plugins/NewStory/src/icons.cpp
+++ b/plugins/NewStory/src/icons.cpp
@@ -48,12 +48,12 @@ void InitIcons()
HookEvent(ME_SKIN2_ICONSCHANGED, evtIconsChanged);
}
-void RefreshIcons(IconItem *icons, int count)
+/*void RefreshIcons(IconItem *icons, int count)
{
//if (ServiceExists(MS_SKIN2_ADDICON))
// for (int i = 0; i < count; i++)
// icons[i].hIcon = (HICON)CallService(MS_SKIN2_GETICON, 0, (LPARAM)icons[i].szId);
-}
+}*/
HICON GetIcon(int iconId)
{
diff --git a/plugins/NewStory/src/opt_passwords.cpp b/plugins/NewStory/src/opt_passwords.cpp
index 16efd37ec2..eb9be44eaa 100644
--- a/plugins/NewStory/src/opt_passwords.cpp
+++ b/plugins/NewStory/src/opt_passwords.cpp
@@ -19,7 +19,7 @@ static void ResetListOptions(HWND hwndList)
SendMessage(hwndList, CLM_SETINDENT, 10, 0);
for (int i = 0; i <= FONTID_MAX; i++)
SendMessage(hwndList, CLM_SETTEXTCOLOR, i, GetSysColor(COLOR_WINDOWTEXT));
- SetWindowLong(hwndList, GWL_STYLE, GetWindowLong(hwndList, GWL_STYLE) | CLS_SHOWHIDDEN);
+ SetWindowLongPtr(hwndList, GWL_STYLE, GetWindowLongPtr(hwndList, GWL_STYLE) | CLS_SHOWHIDDEN);
}
INT_PTR CALLBACK OptPasswordsDlgProc(HWND hwnd, UINT msg, WPARAM, LPARAM lParam)
diff --git a/plugins/NewStory/src/options.cpp b/plugins/NewStory/src/options.cpp
index 0fba7ed390..96c51b3c69 100644
--- a/plugins/NewStory/src/options.cpp
+++ b/plugins/NewStory/src/options.cpp
@@ -20,7 +20,7 @@ void InitOptions()
INT_PTR CALLBACK OptionsDlgProc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam);
-static int OptionsInitialize(WPARAM wParam, LPARAM lParam)
+static int OptionsInitialize(WPARAM wParam, LPARAM)
{
OPTIONSDIALOGPAGE odp = { 0 };
odp.position = 100000000;
diff --git a/plugins/NewStory/src/password.cpp b/plugins/NewStory/src/password.cpp
index 31cd062b8e..88a8d55f36 100644
--- a/plugins/NewStory/src/password.cpp
+++ b/plugins/NewStory/src/password.cpp
@@ -55,7 +55,7 @@ void SetPassword(MCONTACT hContact, char *password)
INT_PTR CALLBACK PasswordDlgProc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam)
{
- PasswordData *data = (PasswordData *)GetWindowLong(hwnd, GWLP_USERDATA);
+ PasswordData *data = (PasswordData *)GetWindowLongPtr(hwnd, GWLP_USERDATA);
switch (msg)
{
case WM_INITDIALOG:
@@ -63,7 +63,7 @@ INT_PTR CALLBACK PasswordDlgProc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lPar
data = new PasswordData;
data->attempt = 0;
data->hContact = (MCONTACT)lParam;
- SetWindowLong(hwnd, GWLP_USERDATA, (LONG)data);
+ SetWindowLongPtr(hwnd, GWLP_USERDATA, (LONG_PTR)data);
RECT rc, rcMe;
SystemParametersInfo(SPI_GETWORKAREA, 0, &rc, 0);
@@ -126,7 +126,7 @@ INT_PTR CALLBACK PasswordDlgProc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lPar
{
delete data;
data = 0;
- SetWindowLong(hwnd, GWLP_USERDATA, 0);
+ SetWindowLongPtr(hwnd, GWLP_USERDATA, 0);
}
}
return FALSE;
@@ -150,13 +150,13 @@ bool AskPassword(MCONTACT hContact)
INT_PTR CALLBACK ChangePasswordDlgProc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam)
{
- MCONTACT hContact = (MCONTACT)GetWindowLong(hwnd, GWLP_USERDATA);
+ MCONTACT hContact = (MCONTACT)GetWindowLongPtr(hwnd, GWLP_USERDATA);
switch (msg)
{
case WM_INITDIALOG:
{
hContact = (MCONTACT)lParam;
- SetWindowLong(hwnd, GWLP_USERDATA, (LONG)hContact);
+ SetWindowLongPtr(hwnd, GWLP_USERDATA, (LONG_PTR)hContact);
// RECT rc, rcMe;
// SystemParametersInfo(SPI_GETWORKAREA, 0, &rc, 0);
@@ -225,7 +225,7 @@ INT_PTR CALLBACK ChangePasswordDlgProc(HWND hwnd, UINT msg, WPARAM wParam, LPARA
case WM_DESTROY:
{
- SetWindowLong(hwnd, GWLP_USERDATA, 0);
+ SetWindowLongPtr(hwnd, GWLP_USERDATA, 0);
}
}
return FALSE;
diff --git a/plugins/NewStory/src/resource.h b/plugins/NewStory/src/resource.h
index 6d29c53451..0aa0f83820 100644
--- a/plugins/NewStory/src/resource.h
+++ b/plugins/NewStory/src/resource.h
@@ -1,6 +1,6 @@
//{{NO_DEPENDENCIES}}
-// Microsoft Developer Studio generated include file.
-// Used by resource.rc
+// Microsoft Visual C++ generated include file.
+// Used by D:\Miranda NG Git_orig_commit\miranda-ng\plugins\NewStory\res\resource.rc
//
#define IDD_HISTORY 101
#define IDI_NEWSTORY 102
@@ -174,7 +174,7 @@
//
#ifdef APSTUDIO_INVOKED
#ifndef APSTUDIO_READONLY_SYMBOLS
-#define _APS_NEXT_RESOURCE_VALUE 127
+#define _APS_NEXT_RESOURCE_VALUE 128
#define _APS_NEXT_COMMAND_VALUE 40041
#define _APS_NEXT_CONTROL_VALUE 1107
#define _APS_NEXT_SYMED_VALUE 101
diff --git a/plugins/NewStory/src/stdafx.h b/plugins/NewStory/src/stdafx.h
index b9e774aa86..1d86e347f2 100644
--- a/plugins/NewStory/src/stdafx.h
+++ b/plugins/NewStory/src/stdafx.h
@@ -24,7 +24,7 @@ Boston, MA 02111-1307, USA.
#include <process.h>
#include <tchar.h>
#include <commctrl.h>
-#include <stdio.h>
+//#include <stdio.h>
#include <time.h>
//Miranda headers
diff --git a/plugins/NewStory/src/utils.cpp b/plugins/NewStory/src/utils.cpp
index 717fe67042..96e7525e19 100644
--- a/plugins/NewStory/src/utils.cpp
+++ b/plugins/NewStory/src/utils.cpp
@@ -35,7 +35,7 @@ void CopyText(HWND hwnd, TCHAR *text)
// GlobalFree(hMem);
}
-void ExportHistory(HANDLE hContact, char *fnTemplate, char *fn, HWND hwndHistory)
+/*void ExportHistory(HANDLE hContact, char *fnTemplate, char *fn, HWND hwndHistory)
{
/*
char *szHeader = "---header---";
@@ -206,8 +206,8 @@ void ExportHistory(HANDLE hContact, char *fnTemplate, char *fn, HWND hwndHistory
free(tOther);
free(tFooter);
free(tEnd);
-*/
-}
+
+}*/
char *appendString(char *s1, char *s2)
{
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-20 17:24:50 +0000