summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--plugins/NewStory/res/resource.rc72
-rw-r--r--plugins/NewStory/src/calendartool.cpp2
-rw-r--r--plugins/NewStory/src/history.cpp4
-rw-r--r--plugins/NewStory/src/resource.h30
4 files changed, 7 insertions, 101 deletions
diff --git a/plugins/NewStory/res/resource.rc b/plugins/NewStory/res/resource.rc
index 80405345c5..dc38d17629 100644
--- a/plugins/NewStory/res/resource.rc
+++ b/plugins/NewStory/res/resource.rc
@@ -99,7 +99,7 @@ BEGIN
CONTROL "",IDC_LOGOPTIONS,"MButtonClass",WS_TABSTOP,116,99,16,14
CONTROL "",IDC_TIMETREEVIEW,"SysTreeView32",TVS_DISABLEDRAGDROP | TVS_HASBUTTONS | TVS_HASLINES | TVS_LINESATROOT | TVS_SHOWSELALWAYS | TVS_TRACKSELECT | TVS_FULLROWSELECT | TVS_SINGLEEXPAND | NOT WS_VISIBLE | WS_TABSTOP,0,134,84,160,WS_EX_STATICEDGE
CONTROL "",IDC_DATEPOPUP,"MButtonClass",WS_TABSTOP,148,99,16,14
- CONTROL "",IDC_ITEMS2,"NewstoryList",WS_TABSTOP,90,132,290,166
+ CONTROL "",IDC_HISTORYCONTROL,"NewstoryList",WS_TABSTOP,90,132,290,166
CONTROL "",IDC_IB_SEPARATOR,"Static",SS_ETCHEDHORZ,21,76,124,1
ICON "",IDC_ICO_MESSAGES,4,7,20,20
ICON "",IDC_ICO_FILES,123,7,20,20
@@ -136,7 +136,7 @@ STYLE DS_SETFONT | WS_POPUP | WS_BORDER
EXSTYLE WS_EX_TOOLWINDOW
FONT 8, "MS Shell Dlg", 0, 0, 0x1
BEGIN
- CONTROL "",IDC_MONTHCALENDAR1,"SysMonthCal32",MCS_NOTODAYCIRCLE | WS_TABSTOP,0,0,98,85
+ CONTROL "",IDC_MONTHCALENDAR,"SysMonthCal32",MCS_NOTODAYCIRCLE | WS_TABSTOP,0,0,98,85
END
IDD_OPT_ADVANCED DIALOGEX 0, 0, 307, 223
@@ -165,37 +165,6 @@ BEGIN
CONTROL "",IDC_VARHELP,"MButtonClass",WS_DISABLED | WS_TABSTOP,284,202,16,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
-
/////////////////////////////////////////////////////////////////////////////
//
@@ -239,38 +208,6 @@ BEGIN
HORZGUIDE, 197
HORZGUIDE, 202
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
@@ -282,11 +219,6 @@ END
IDR_POPUPS MENU
BEGIN
- POPUP "Export"
- BEGIN
- MENUITEM "Save as...", ID_EXPORT_SAVEAS
- MENUITEM "Save selected as...", ID_EXPORT_SAVESELECTEDAS
- END
POPUP "Filter"
BEGIN
MENUITEM "Show all events", ID_FILTER_SHOWALLEVENTS, GRAYED
diff --git a/plugins/NewStory/src/calendartool.cpp b/plugins/NewStory/src/calendartool.cpp
index ec3a4cabce..79461ebbbe 100644
--- a/plugins/NewStory/src/calendartool.cpp
+++ b/plugins/NewStory/src/calendartool.cpp
@@ -17,7 +17,7 @@ INT_PTR CALLBACK CalendarToolDlgProc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM
case WM_NOTIFY:
{
LPNMHDR hdr = (LPNMHDR)lParam;
- if ((hdr->idFrom == IDC_MONTHCALENDAR1) && (hdr->code == MCN_SELECT)) {
+ if ((hdr->idFrom == IDC_MONTHCALENDAR) && (hdr->code == MCN_SELECT)) {
LPNMSELCHANGE lpnmsc = (LPNMSELCHANGE)lParam;
struct tm tm_sel;
tm_sel.tm_hour = tm_sel.tm_min = tm_sel.tm_sec = 0;
diff --git a/plugins/NewStory/src/history.cpp b/plugins/NewStory/src/history.cpp
index e1aefa08eb..3d7046c0a7 100644
--- a/plugins/NewStory/src/history.cpp
+++ b/plugins/NewStory/src/history.cpp
@@ -403,7 +403,7 @@ public:
CDlgBase(g_plugin, IDD_HISTORY),
m_hContact(_hContact),
m_timeTree(this, IDC_TIMETREEVIEW),
- m_histControl(this, IDC_ITEMS2),
+ m_histControl(this, IDC_HISTORYCONTROL),
edtSearchText(this, IDC_SEARCHTEXT),
btnCopy(this, IDC_COPY, g_plugin.getIcon(ICO_COPY), LPGEN("Copy")),
btnExport(this, IDC_EXPORT, g_plugin.getIcon(ICO_EXPORT), LPGEN("Export...")),
@@ -1031,7 +1031,7 @@ public:
// case UM_REBUILDLIST:
// if (showFlags & HIST_TIMETREE)
// ShowWindow(GetDlgItem(m_hwnd, IDC_TIMETREE), SW_SHOW);
- // ShowWindow(GetDlgItem(m_hwnd, IDC_ITEMS2), SW_SHOW);
+ // ShowWindow(GetDlgItem(m_hwnd, IDC_HISTORYCONTROL), SW_SHOW);
// ShowWindow(GetDlgItem(m_hwnd, IDC_SEARCHICON), SW_SHOW);
};
diff --git a/plugins/NewStory/src/resource.h b/plugins/NewStory/src/resource.h
index c362c6241f..e6ba3c3c4c 100644
--- a/plugins/NewStory/src/resource.h
+++ b/plugins/NewStory/src/resource.h
@@ -8,7 +8,6 @@
#define IDR_CONTEXTMENU 106
#define IDR_POPUPS 113
#define IDD_CALENDARTOOL 118
-#define IDD_FILTERMODE 123
#define ICO_NEWSTORY 127
#define ICO_USERINFO 128
#define ICO_USERMENU 129
@@ -33,9 +32,7 @@
#define ICO_VARHELP 151
#define ICO_TIMETREE 152
#define IDC_GPREVIEW 1000
-#define IDC_ITEMS2 1001
-#define IDC_PROGRESS 1002
-#define IDC_EDIT1 1003
+#define IDC_HISTORYCONTROL 1001
#define IDC_SEARCHTEXT 1004
#define IDC_RESET 1005
#define IDC_MESSAGE 1010
@@ -49,9 +46,6 @@
#define IDC_LOGOPTIONS 1018
#define IDC_FINDPREV 1019
#define IDC_SEARCHICON 1020
-#define IDC_TEXT 1021
-#define IDC_USERNICK 1022
-#define IDC_MSGICON 1023
#define IDC_DATEPOPUP 1024
#define IDC_ICO_MESSAGES_IN 1025
#define IDC_ICO_MESSAGES_OUT 1026
@@ -64,26 +58,12 @@
#define IDC_PREVIEW 1033
#define IDC_DELETE 1034
#define IDC_TIMETREEVIEW 1035
-#define IDC_PROGRESS1 1037
-#define IDC_COMBO1 1038
#define IDC_TIMETREE 1039
-#define IDC_CHECK2 1040
-#define IDC_CHECK3 1041
-#define IDC_MONTHCALENDAR1 1044
+#define IDC_MONTHCALENDAR 1044
#define IDC_TEMPLATES 1057
#define IDC_VARHELP 1058
#define IDC_DISCARD 1060
#define IDC_UPDATEPREVIEW 1061
-#define IDC_CHK_FILE 1062
-#define IDC_CHK_URL 1063
-#define IDC_CHK_STATUS 1064
-#define IDC_CHK_OTHER 1065
-#define IDC_CHK_AUTOFILTER 1066
-#define IDC_DATETIMEPICKER1 1067
-#define IDC_DATETIMEPICKER2 1068
-#define IDC_CHK_IN 1069
-#define IDC_CHK_OUT 1070
-#define IDC_CHK_MESSAGES 1071
#define IDC_EDITTEMPLATE 1072
#define IDC_ICO_MESSAGES 1078
#define IDC_ICO_FILES 1079
@@ -106,7 +86,6 @@
#define IDC_DATE_TO 1104
#define IDC_CHK_DATE_FROM 1105
#define IDC_CHK_DATE_TO 1106
-#define IDC_CHECK1 1107
#define IDC_GROUPING 1107
#define ID_FILTER_INCOMING 40003
#define ID_FILTER_OUTGOING 40004
@@ -116,17 +95,12 @@
#define ID_FILTER_STATUS 40010
#define ID_FILTER_OTHER 40011
#define ID_CONTEXT_COPY 40012
-#define IDA_COPY 40020
-#define IDA_SEARCH 40021
#define ID_FILTER_AUTO 40022
#define ID_LOGOPTIONS_TEMPLATES 40023
#define ID_LOGOPTIONS_OPTIONS 40024
#define ID_CONTEXT_EDIT 40025
#define ID_CONTEXT_DELETE 40026
#define ID_CONTEXT_SELECTALL 40027
-#define ID_CONTEXT_CANCEL 40028
-#define ID_EXPORT_SAVEAS 40029
-#define ID_EXPORT_SAVESELECTEDAS 40031
#define ID_FILTER_SHOWALLEVENTS 40036
#define ID_FILTER_SHOWINCOMINGEVENTSONLY 40037
#define ID_FILTER_SHOWOUTGOINGEVENTSONLY 40038
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-18 06:50:40 +0000