summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--plugins/NewAwaySysMod/NewAwaySys.vcxproj17
-rw-r--r--plugins/NewAwaySysMod/res/NewAwaySys.rc599
-rw-r--r--plugins/NewAwaySysMod/res/Status_Other.icobin1406 -> 0 bytes
-rw-r--r--plugins/NewAwaySysMod/res/Variables.icobin2550 -> 0 bytes
-rw-r--r--plugins/NewAwaySysMod/src/AwayOpt.cpp15
-rw-r--r--plugins/NewAwaySysMod/src/AwaySys.cpp39
-rw-r--r--plugins/NewAwaySysMod/src/MsgTree.cpp6
-rw-r--r--plugins/NewAwaySysMod/src/Properties.h5
-rw-r--r--plugins/NewAwaySysMod/src/SetAwayMsg.cpp13
-rw-r--r--plugins/NewAwaySysMod/src/resource.h4
-rw-r--r--plugins/NewAwaySysMod/src/stdafx.h4
-rw-r--r--plugins/NewAwaySysMod/src/version.h2
12 files changed, 244 insertions, 460 deletions
diff --git a/plugins/NewAwaySysMod/NewAwaySys.vcxproj b/plugins/NewAwaySysMod/NewAwaySys.vcxproj
index 32e8b3861a..7df05f7ab7 100644
--- a/plugins/NewAwaySysMod/NewAwaySys.vcxproj
+++ b/plugins/NewAwaySysMod/NewAwaySys.vcxproj
@@ -18,6 +18,23 @@
<Platform>x64</Platform>
</ProjectConfiguration>
</ItemGroup>
+ <ItemGroup>
+ <Image Include="res\Delete.ico" />
+ <Image Include="res\Dot.ico" />
+ <Image Include="res\Ignore.ico" />
+ <Image Include="res\Indefinite.ico" />
+ <Image Include="res\MsgIcon.ico" />
+ <Image Include="res\NewCat.ico" />
+ <Image Include="res\NewMessage.ico" />
+ <Image Include="res\off.ico" />
+ <Image Include="res\on.ico" />
+ <Image Include="res\SaveAsNew.ico" />
+ <Image Include="res\SaveMsg.ico" />
+ <Image Include="res\Settings.ico" />
+ </ItemGroup>
+ <ItemGroup>
+ <ClInclude Include="res\resource.h" />
+ </ItemGroup>
<PropertyGroup Label="Globals">
<ProjectGuid>{6A516E27-AC50-5374-756B-A1558DB2EFA9}</ProjectGuid>
<ProjectName>NewAwaySys</ProjectName>
diff --git a/plugins/NewAwaySysMod/res/NewAwaySys.rc b/plugins/NewAwaySysMod/res/NewAwaySys.rc
index b9b641eb21..0e45e5467f 100644
--- a/plugins/NewAwaySysMod/res/NewAwaySys.rc
+++ b/plugins/NewAwaySysMod/res/NewAwaySys.rc
@@ -1,4 +1,4 @@
-//Microsoft Developer Studio generated resource script.
+// Microsoft Visual C++ generated resource script.
//
#include "..\src\resource.h"
@@ -13,13 +13,11 @@
#undef APSTUDIO_READONLY_SYMBOLS
/////////////////////////////////////////////////////////////////////////////
-// Russian resources
+// Russian (Russia) resources
#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_RUS)
-#ifdef _WIN32
LANGUAGE LANG_RUSSIAN, SUBLANG_DEFAULT
#pragma code_page(1251)
-#endif //_WIN32
#ifdef APSTUDIO_INVOKED
/////////////////////////////////////////////////////////////////////////////
@@ -27,7 +25,7 @@ LANGUAGE LANG_RUSSIAN, SUBLANG_DEFAULT
// TEXTINCLUDE
//
-3 TEXTINCLUDE DISCARDABLE
+3 TEXTINCLUDE
BEGIN
"\r\n"
"\0"
@@ -35,18 +33,16 @@ END
#endif // APSTUDIO_INVOKED
-#endif // Russian resources
+#endif // Russian (Russia) resources
/////////////////////////////////////////////////////////////////////////////
/////////////////////////////////////////////////////////////////////////////
-// English (U.S.) resources
+// English (United States) resources
#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU)
-#ifdef _WIN32
LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
#pragma code_page(1252)
-#endif //_WIN32
#ifdef APSTUDIO_INVOKED
/////////////////////////////////////////////////////////////////////////////
@@ -54,12 +50,12 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
// TEXTINCLUDE
//
-1 TEXTINCLUDE MOVEABLE PURE
+1 TEXTINCLUDE
BEGIN
- "resource.h\0"
+ "..\\src\\resource.h\0"
END
-2 TEXTINCLUDE MOVEABLE PURE
+2 TEXTINCLUDE
BEGIN
"#include ""afxres.h""\r\n"
"\0"
@@ -73,366 +69,184 @@ END
// Dialog
//
-IDD_POPUPOPTDLG DIALOG DISCARDABLE 0, 0, 312, 237
-STYLE DS_SETFOREGROUND | DS_FIXEDSYS | DS_CONTROL | DS_CENTER | WS_CHILD
-FONT 8, "MS Shell Dlg"
-BEGIN
- GROUPBOX "",IDC_POPUPOPTDLG_GROUP_NOTIFICATION,6,6,300,208
- CONTROL "Popup notification",IDC_POPUPOPTDLG_USEPOPUPS,"Button",
- BS_AUTOCHECKBOX | WS_TABSTOP,12,5,108,10
- GROUPBOX "Popup text format",IDC_STATIC,12,18,288,76
- EDITTEXT IDC_POPUPOPTDLG_POPUPFORMAT,18,30,222,48,ES_MULTILINE |
- ES_AUTOVSCROLL | ES_AUTOHSCROLL | ES_WANTRETURN |
- WS_VSCROLL | WS_HSCROLL
- PUSHBUTTON "Preview",IDC_POPUPOPTDLG_POPUPPREVIEW,246,30,48,14
- CONTROL "V",IDC_POPUPOPTDLG_VARS,"MButtonClass",WS_TABSTOP,246,
- 50,16,14,0x18000000L
- LTEXT "%extratext% is your status message",
- IDC_POPUPOPTDLG_STATIC_EXTRATEXT,18,81,276,8
- GROUPBOX "Click action",IDC_STATIC,12,100,199,54
- RTEXT "On left click",IDC_POPUPOPTDLG_STATIC_LCLICK,17,115,55,
- 8
- COMBOBOX IDC_POPUPOPTDLG_LCLICK_ACTION,78,112,125,86,
- CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
- RTEXT "On right click",IDC_POPUPOPTDLG_STATIC_RCLICK,17,133,55,
- 8
- COMBOBOX IDC_POPUPOPTDLG_RCLICK_ACTION,78,130,125,86,
- CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
- GROUPBOX "Delay",IDC_STATIC,217,100,83,54
- EDITTEXT IDC_POPUPOPTDLG_POPUPDELAY,240,112,32,12,ES_AUTOHSCROLL
- CONTROL "",IDC_POPUPOPTDLG_POPUPDELAY_SPIN,"msctls_updown32",
- UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY |
- UDS_ARROWKEYS | UDS_NOTHOUSANDS,260,112,12,12
- LTEXT "Sec",IDC_POPUPOPTDLG_STATIC_SEC,275,114,21,8
- CTEXT "0 = Default",IDC_POPUPOPTDLG_STATIC_DEFAULT,224,128,70,
- 8
- CTEXT "-1 = Infinite",IDC_POPUPOPTDLG_STATIC_INFINITE,224,140,
- 70,8
- GROUPBOX "Colors",IDC_STATIC,12,160,155,48
- CONTROL "",IDC_POPUPOPTDLG_BGCOLOUR,"ColourPicker",WS_TABSTOP,19,
- 172,19,12
- LTEXT "Background",IDC_POPUPOPTDLG_STATIC_BGCOLOUR,43,175,39,8
- CONTROL "Use default",IDC_POPUPOPTDLG_DEFBGCOLOUR,"Button",
- BS_AUTOCHECKBOX | WS_TABSTOP,90,175,73,10
- CONTROL "",IDC_POPUPOPTDLG_TEXTCOLOUR,"ColourPicker",WS_TABSTOP,
- 19,190,19,12
- LTEXT "Text",IDC_POPUPOPTDLG_STATIC_TEXTCOLOUR,43,193,15,8
- CONTROL "Use default",IDC_POPUPOPTDLG_DEFTEXTCOLOUR,"Button",
- BS_AUTOCHECKBOX | WS_TABSTOP,90,193,73,10
- GROUPBOX "Only notify when:",IDC_STATIC,174,160,125,32
- CONTROL "On&line",IDC_POPUPOPTDLG_ONLNOTIFY,"MButtonClass",
- WS_TABSTOP,180,172,16,14,0x18000000L
- CONTROL "&Away",IDC_POPUPOPTDLG_AWAYNOTIFY,"MButtonClass",
- WS_TABSTOP,196,172,16,14,0x18000000L
- CONTROL "&NA",IDC_POPUPOPTDLG_NANOTIFY,"MButtonClass",WS_TABSTOP,
- 212,172,16,14,0x18000000L
- CONTROL "Occ&upied",IDC_POPUPOPTDLG_OCCNOTIFY,"MButtonClass",
- WS_TABSTOP,228,172,16,14,0x18000000L
- CONTROL "&DND",IDC_POPUPOPTDLG_DNDNOTIFY,"MButtonClass",
- WS_TABSTOP,244,172,16,14,0x18000000L
- CONTROL "&Free for chat",IDC_POPUPOPTDLG_FFCNOTIFY,"MButtonClass",
- WS_TABSTOP,260,172,16,14,0x18000000L
- CONTROL "&Other",IDC_POPUPOPTDLG_OTHERNOTIFY,"MButtonClass",
- WS_TABSTOP,276,172,16,14,0x18000000L
- CONTROL "Log to a file only when popup notification for a contact is enabled",
- IDC_POPUPOPTDLG_LOGONLYWITHPOPUP,"Button",
- BS_AUTOCHECKBOX | WS_TABSTOP,6,219,300,10
-END
-
-IDD_AUTOREPLY DIALOGEX DISCARDABLE 0, 0, 312, 231
+IDD_AUTOREPLY DIALOGEX 0, 0, 312, 231
STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD
EXSTYLE WS_EX_CONTROLPARENT
FONT 8, "MS Shell Dlg", 0, 0, 0x1
BEGIN
GROUPBOX "",IDC_MOREOPTDLG_PANEL,6,6,300,220
- CONTROL "Enable autoreply",IDC_REPLYDLG_ENABLEREPLY,"Button",
- BS_AUTOCHECKBOX | WS_TABSTOP,12,5,139,10
+ CONTROL "Enable autoreply",IDC_REPLYDLG_ENABLEREPLY,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,12,5,139,10
RTEXT "On event...",IDC_REPLYDLG_STATIC_ONEVENT,43,19,59,8
- CONTROL "",IDC_REPLYDLG_EVENTMSG,"Button",BS_AUTOCHECKBOX |
- BS_ICON | WS_TABSTOP,110,17,29,12
- CONTROL "",IDC_REPLYDLG_EVENTURL,"Button",BS_AUTOCHECKBOX |
- BS_ICON | WS_TABSTOP,145,17,29,12
- CONTROL "",IDC_REPLYDLG_EVENTFILE,"Button",BS_AUTOCHECKBOX |
- BS_ICON | WS_TABSTOP,180,17,29,12
+ CONTROL "",IDC_REPLYDLG_EVENTMSG,"Button",BS_AUTOCHECKBOX | BS_ICON | WS_TABSTOP,110,17,29,12
+ CONTROL "",IDC_REPLYDLG_EVENTURL,"Button",BS_AUTOCHECKBOX | BS_ICON | WS_TABSTOP,145,17,29,12
+ CONTROL "",IDC_REPLYDLG_EVENTFILE,"Button",BS_AUTOCHECKBOX | BS_ICON | WS_TABSTOP,180,17,29,12
CONTROL "Don't reply to ICQ contacts",IDC_REPLYDLG_DONTSENDTOICQ,
"Button",BS_AUTOCHECKBOX | WS_TABSTOP,21,119,275,10
- CONTROL "Don't reply when I'm invisible to the contact",
- IDC_REPLYDLG_DONTREPLYINVISIBLE,"Button",BS_AUTOCHECKBOX |
- WS_TABSTOP,21,107,275,10
+ CONTROL "Don't reply when I'm invisible to the contact",IDC_REPLYDLG_DONTREPLYINVISIBLE,
+ "Button",BS_AUTOCHECKBOX | WS_TABSTOP,21,107,275,10
CONTROL "Save autoreply to the history",IDC_REPLYDLG_LOGREPLY,
"Button",BS_AUTOCHECKBOX | WS_TABSTOP,21,34,275,10
- CONTROL "Reply only when Idle",IDC_REPLYDLG_ONLYIDLEREPLY,"Button",
- BS_AUTOCHECKBOX | WS_TABSTOP,21,48,275,10
- CONTROL "Reply only when contact's message window is closed",
- IDC_REPLYDLG_ONLYCLOSEDDLGREPLY,"Button",BS_AUTOCHECKBOX |
- WS_TABSTOP,21,59,275,10
+ CONTROL "Reply only when Idle",IDC_REPLYDLG_ONLYIDLEREPLY,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,21,48,275,10
+ CONTROL "Reply only when contact's message window is closed",IDC_REPLYDLG_ONLYCLOSEDDLGREPLY,
+ "Button",BS_AUTOCHECKBOX | WS_TABSTOP,21,59,275,10
LTEXT "Send maximum",IDC_REPLYDLG_STATIC_SEND,33,72,90,8
EDITTEXT IDC_REPLYDLG_SENDCOUNT,127,70,40,12,ES_AUTOHSCROLL
- CONTROL "",IDC_REPLYDLG_SENDCOUNT_SPIN,"msctls_updown32",
- UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY |
- UDS_ARROWKEYS | UDS_NOTHOUSANDS,156,70,12,12
- LTEXT "times (-1=infinite)",IDC_REPLYDLG_STATIC_TIMES,172,72,
- 124,8
- CONTROL "Reset this counter also when I just change my status text\n(when status icon remains the same)",
- IDC_REPLYDLG_RESETCOUNTERWHENSAMEICON,"Button",
- BS_AUTOCHECKBOX | BS_TOP | BS_MULTILINE | WS_TABSTOP,34,
- 84,262,18
- LTEXT "Disable autoreply when...",
- IDC_REPLYDLG_STATIC_DISABLEWHENSTATUS,13,134,283,8
- CONTROL "On&line",IDC_REPLYDLG_DISABLE_ONL,"MButtonClass",
- WS_TABSTOP,21,146,16,14,0x18000000L
- CONTROL "&Away",IDC_REPLYDLG_DISABLE_AWAY,"MButtonClass",
- WS_TABSTOP,37,146,16,14,0x18000000L
- CONTROL "&NA",IDC_REPLYDLG_DISABLE_NA,"MButtonClass",WS_TABSTOP,
- 53,146,16,14,0x18000000L
- CONTROL "Occ&upied",IDC_REPLYDLG_DISABLE_OCC,"MButtonClass",
- WS_TABSTOP,69,146,16,14,0x18000000L
- CONTROL "&DND",IDC_REPLYDLG_DISABLE_DND,"MButtonClass",
- WS_TABSTOP,85,146,16,14,0x18000000L
- CONTROL "&Free for chat",IDC_REPLYDLG_DISABLE_FFC,"MButtonClass",
- WS_TABSTOP,101,146,16,14,0x18000000L
- CONTROL "&Invisible",IDC_REPLYDLG_DISABLE_INV,"MButtonClass",
- WS_TABSTOP,117,146,16,14,0x18000000L
- CONTROL "On the &phone",IDC_REPLYDLG_DISABLE_OTP,"MButtonClass",
- WS_TABSTOP,133,146,16,14,0x18000000L
- CONTROL "Out to &lunch",IDC_REPLYDLG_DISABLE_OTL,"MButtonClass",
- WS_TABSTOP,149,146,16,14,0x18000000L
- LTEXT "Autoreply format:",IDC_REPLYDLG_STATIC_FORMAT,13,168,
- 283,8
- EDITTEXT IDC_REPLYDLG_PREFIX,21,180,209,30,ES_MULTILINE |
- ES_AUTOVSCROLL | ES_WANTRETURN | WS_VSCROLL
- CONTROL "V",IDC_REPLYDLG_VARS,"MButtonClass",WS_TABSTOP,231,180,
- 16,14,0x18000000L
- LTEXT "%extratext% is your status message",
- IDC_REPLYDLG_STATIC_EXTRATEXT,21,212,234,8
+ CONTROL "",IDC_REPLYDLG_SENDCOUNT_SPIN,"msctls_updown32",UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | UDS_NOTHOUSANDS,156,70,12,12
+ LTEXT "times (-1=infinite)",IDC_REPLYDLG_STATIC_TIMES,172,72,124,8
+ CONTROL "Reset this counter also when I just change my status text\n(when status icon remains the same)",IDC_REPLYDLG_RESETCOUNTERWHENSAMEICON,
+ "Button",BS_AUTOCHECKBOX | BS_TOP | BS_MULTILINE | WS_TABSTOP,34,84,262,18
+ LTEXT "Disable autoreply when...",IDC_REPLYDLG_STATIC_DISABLEWHENSTATUS,13,134,283,8
+ CONTROL "On&line",IDC_REPLYDLG_DISABLE_ONL,"MButtonClass",WS_TABSTOP,21,146,16,14,WS_EX_NOACTIVATE | 0x10000000L
+ CONTROL "&Away",IDC_REPLYDLG_DISABLE_AWAY,"MButtonClass",WS_TABSTOP,37,146,16,14,WS_EX_NOACTIVATE | 0x10000000L
+ CONTROL "&NA",IDC_REPLYDLG_DISABLE_NA,"MButtonClass",WS_TABSTOP,53,146,16,14,WS_EX_NOACTIVATE | 0x10000000L
+ CONTROL "Occ&upied",IDC_REPLYDLG_DISABLE_OCC,"MButtonClass",WS_TABSTOP,69,146,16,14,WS_EX_NOACTIVATE | 0x10000000L
+ CONTROL "&DND",IDC_REPLYDLG_DISABLE_DND,"MButtonClass",WS_TABSTOP,85,146,16,14,WS_EX_NOACTIVATE | 0x10000000L
+ CONTROL "&Free for chat",IDC_REPLYDLG_DISABLE_FFC,"MButtonClass",WS_TABSTOP,101,146,16,14,WS_EX_NOACTIVATE | 0x10000000L
+ CONTROL "&Invisible",IDC_REPLYDLG_DISABLE_INV,"MButtonClass",WS_TABSTOP,117,146,16,14,WS_EX_NOACTIVATE | 0x10000000L
+ CONTROL "On the &phone",IDC_REPLYDLG_DISABLE_OTP,"MButtonClass",WS_TABSTOP,133,146,16,14,WS_EX_NOACTIVATE | 0x10000000L
+ CONTROL "Out to &lunch",IDC_REPLYDLG_DISABLE_OTL,"MButtonClass",WS_TABSTOP,149,146,16,14,WS_EX_NOACTIVATE | 0x10000000L
+ LTEXT "Autoreply format:",IDC_REPLYDLG_STATIC_FORMAT,13,168,283,8
+ EDITTEXT IDC_REPLYDLG_PREFIX,21,180,209,30,ES_MULTILINE | ES_AUTOVSCROLL | ES_WANTRETURN | WS_VSCROLL
+ CONTROL "V",IDC_REPLYDLG_VARS,"MButtonClass",WS_TABSTOP,231,180,16,14,WS_EX_NOACTIVATE | 0x10000000L
+ LTEXT "%extratext% is your status message",IDC_REPLYDLG_STATIC_EXTRATEXT,21,212,234,8
END
-IDD_SETAWAYMSG DIALOGEX 0, 0, 398, 132
-STYLE DS_3DLOOK | DS_FIXEDSYS | DS_CENTER | WS_POPUP | WS_VISIBLE |
- WS_CAPTION | WS_SYSMENU | WS_THICKFRAME
+IDD_SETAWAYMSG DIALOGEX 0, 0, 399, 137
+STYLE DS_SETFONT | DS_3DLOOK | DS_FIXEDSYS | DS_CENTER | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU | WS_THICKFRAME
FONT 8, "MS Shell Dlg", 0, 0, 0x1
BEGIN
- EDITTEXT IDC_SAWAYMSG_MSGDATA,116,1,170,114,ES_MULTILINE |
- ES_AUTOVSCROLL | ES_WANTRETURN | WS_VSCROLL
- PUSHBUTTON "OK",IDC_OK,115,117,60,14
- CONTROL "&Variables",IDC_SAWAYMSG_VARS,"MButtonClass",WS_TABSTOP,
- 255,117,16,14,0x18000000L
- CONTROL "Se&ttings",IDC_SAWAYMSG_OPTIONS,"MButtonClass",
- WS_TABSTOP,271,117,16,14,0x18000000L
- ICON IDI_IGNORE,IDC_SAWAYMSG_STATIC_IGNOREICON,382,109,16,16,
- SS_CENTERIMAGE | SS_REALSIZEIMAGE
- ICON IDI_SOE_ENABLED,IDC_SAWAYMSG_STATIC_REPLYICON,382,118,16,
- 16,SS_CENTERIMAGE | SS_REALSIZEIMAGE
- CONTROL "",IDC_SAWAYMSG_CONTACTSTREE,"SysTreeView32",
- TVS_DISABLEDRAGDROP | TVS_SHOWSELALWAYS |
- TVS_TRACKSELECT | WS_BORDER | WS_TABSTOP,289,1,108,114
- CONTROL "Ignore requests",IDC_SAWAYMSG_IGNOREREQ,"Button",
- BS_AUTOCHECKBOX | BS_LEFTTEXT | WS_TABSTOP,307,116,80,8,
- WS_EX_RIGHT
- CONTROL "Send an autoreply",IDC_SAWAYMSG_SENDMSG,"Button",
- BS_AUTO3STATE | BS_LEFTTEXT | WS_TABSTOP,307,124,80,8,
- WS_EX_RIGHT
- CONTROL "",IDC_SAWAYMSG_TREE,"SysTreeView32",TVS_HASBUTTONS |
- TVS_HASLINES | TVS_LINESATROOT | TVS_EDITLABELS |
- TVS_SHOWSELALWAYS | TVS_TRACKSELECT | WS_BORDER |
- WS_TABSTOP,1,1,112,114
- CONTROL "&Delete",IDC_SAWAYMSG_DELETE,"MButtonClass",WS_TABSTOP,
- 58,116,16,14,0x18000000L
- CONTROL "New &category",IDC_SAWAYMSG_NEWCATEGORY,"MButtonClass",
- WS_TABSTOP,2,116,16,14,0x18000000L
- CONTROL "Save as &new",IDC_SAWAYMSG_SAVEASNEW,"MButtonClass",
- WS_TABSTOP,18,116,16,14,0x18000000L
- CONTROL "&Save",IDC_SAWAYMSG_SAVEMSG,"MButtonClass",WS_TABSTOP,
- 34,116,16,14,0x18000000L
- CONTROL "",IDC_SAWAYMSG_MSGSPLITTER,"Static",SS_ENHMETAFILE |
- SS_SUNKEN,114,0,1,115
- CONTROL "",IDC_SAWAYMSG_CONTACTSPLITTER,"Static",SS_ENHMETAFILE |
- SS_SUNKEN,287,0,1,115
+ EDITTEXT IDC_SAWAYMSG_MSGDATA,116,1,170,114,ES_MULTILINE | ES_AUTOVSCROLL | ES_WANTRETURN | WS_VSCROLL
+ PUSHBUTTON "OK",IDC_OK,115,119,60,14
+ CONTROL "&Variables",IDC_SAWAYMSG_VARS,"MButtonClass",WS_TABSTOP,255,119,16,14,WS_EX_NOACTIVATE | 0x10000000L
+ CONTROL "Se&ttings",IDC_SAWAYMSG_OPTIONS,"MButtonClass",WS_TABSTOP,271,119,16,14,WS_EX_NOACTIVATE | 0x10000000L
+ ICON IDI_IGNORE,IDC_SAWAYMSG_STATIC_IGNOREICON,377,105,21,20,SS_CENTERIMAGE | SS_REALSIZEIMAGE
+ ICON IDI_SOE_ENABLED,IDC_SAWAYMSG_STATIC_REPLYICON,377,116,21,20,SS_CENTERIMAGE | SS_REALSIZEIMAGE
+ CONTROL "",IDC_SAWAYMSG_CONTACTSTREE,"SysTreeView32",TVS_DISABLEDRAGDROP | TVS_SHOWSELALWAYS | TVS_TRACKSELECT | WS_BORDER | WS_HSCROLL | WS_TABSTOP,289,1,108,114
+ CONTROL "Ignore requests",IDC_SAWAYMSG_IGNOREREQ,"Button",BS_AUTOCHECKBOX | BS_LEFTTEXT | WS_TABSTOP,306,117,80,8,WS_EX_RIGHT
+ CONTROL "Send an autoreply",IDC_SAWAYMSG_SENDMSG,"Button",BS_AUTO3STATE | BS_LEFTTEXT | WS_TABSTOP,306,127,80,8,WS_EX_RIGHT
+ CONTROL "",IDC_SAWAYMSG_TREE,"SysTreeView32",TVS_HASBUTTONS | TVS_HASLINES | TVS_LINESATROOT | TVS_EDITLABELS | TVS_SHOWSELALWAYS | TVS_TRACKSELECT | WS_BORDER | WS_HSCROLL | WS_TABSTOP,1,1,112,114
+ CONTROL "&Delete",IDC_SAWAYMSG_DELETE,"MButtonClass",WS_TABSTOP,58,119,16,14,WS_EX_NOACTIVATE | 0x10000000L
+ CONTROL "New &category",IDC_SAWAYMSG_NEWCATEGORY,"MButtonClass",WS_TABSTOP,2,119,16,14,WS_EX_NOACTIVATE | 0x10000000L
+ CONTROL "Save as &new",IDC_SAWAYMSG_SAVEASNEW,"MButtonClass",WS_TABSTOP,18,119,16,14,WS_EX_NOACTIVATE | 0x10000000L
+ CONTROL "&Save",IDC_SAWAYMSG_SAVEMSG,"MButtonClass",WS_TABSTOP,34,119,16,14,WS_EX_NOACTIVATE | 0x10000000L
+ CONTROL "",IDC_SAWAYMSG_MSGSPLITTER,"Static",SS_ENHMETAFILE | SS_SUNKEN,114,0,1,115
+ CONTROL "",IDC_SAWAYMSG_CONTACTSPLITTER,"Static",SS_ENHMETAFILE | SS_SUNKEN,287,0,1,115
END
-IDD_MESSAGES DIALOGEX DISCARDABLE 0, 0, 311, 221
+IDD_MESSAGES DIALOGEX 0, 0, 311, 221
STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD
EXSTYLE WS_EX_CONTROLPARENT
FONT 8, "MS Shell Dlg", 0, 0, 0x1
BEGIN
- CONTROL "",IDC_MESSAGEDLG_MSGTREE,"SysTreeView32",TVS_HASBUTTONS |
- TVS_HASLINES | TVS_LINESATROOT | TVS_EDITLABELS |
- TVS_SHOWSELALWAYS | TVS_TRACKSELECT | WS_BORDER |
- WS_TABSTOP,6,6,126,210
+ CONTROL "",IDC_MESSAGEDLG_MSGTREE,"SysTreeView32",TVS_HASBUTTONS | TVS_HASLINES | TVS_LINESATROOT | TVS_EDITLABELS | TVS_SHOWSELALWAYS | TVS_TRACKSELECT | WS_BORDER | WS_TABSTOP,6,6,126,210
RTEXT "Title:",IDC_STATIC,136,8,51,8
EDITTEXT IDC_MESSAGEDLG_MSGTITLE,189,6,115,12,ES_AUTOHSCROLL
- EDITTEXT IDC_MESSAGEDLG_MSGDATA,138,24,166,138,ES_MULTILINE |
- ES_AUTOVSCROLL | ES_WANTRETURN | WS_VSCROLL
- GROUPBOX "Use this message as default for",IDC_STATIC,138,186,166,
- 30,BS_LEFT
- CONTROL "On&line",IDC_MESSAGEDLG_DEF_ONL,"MButtonClass",
- WS_TABSTOP,149,197,16,14,0x18000000L
- CONTROL "&Away",IDC_MESSAGEDLG_DEF_AWAY,"MButtonClass",
- WS_TABSTOP,165,197,16,14,0x18000000L
- CONTROL "&NA",IDC_MESSAGEDLG_DEF_NA,"MButtonClass",WS_TABSTOP,
- 181,197,16,14,0x18000000L
- CONTROL "Occ&upied",IDC_MESSAGEDLG_DEF_OCC,"MButtonClass",
- WS_TABSTOP,197,197,16,14,0x18000000L
- CONTROL "&DND",IDC_MESSAGEDLG_DEF_DND,"MButtonClass",WS_TABSTOP,
- 213,197,16,14,0x18000000L
- CONTROL "&Free for chat",IDC_MESSAGEDLG_DEF_FFC,"MButtonClass",
- WS_TABSTOP,229,197,16,14,0x18000000L
- CONTROL "&Invisible",IDC_MESSAGEDLG_DEF_INV,"MButtonClass",
- WS_TABSTOP,245,197,16,14,0x18000000L
- CONTROL "On the &phone",IDC_MESSAGEDLG_DEF_OTP,"MButtonClass",
- WS_TABSTOP,261,197,16,14,0x18000000L
- CONTROL "Out to &lunch",IDC_MESSAGEDLG_DEF_OTL,"MButtonClass",
- WS_TABSTOP,277,197,16,14,0x18000000L
- CONTROL "New message",IDC_MESSAGEDLG_NEWMSG,"MButtonClass",
- WS_TABSTOP,138,166,16,14,0x18000000L
- CONTROL "New category",IDC_MESSAGEDLG_NEWCAT,"MButtonClass",
- WS_TABSTOP,154,166,16,14,0x18000000L
- CONTROL "Delete",IDC_MESSAGEDLG_DEL,"MButtonClass",WS_TABSTOP,
- 170,166,16,14,0x18000000L
- CONTROL "V",IDC_MESSAGEDLG_VARS,"MButtonClass",WS_TABSTOP,288,
- 166,16,14,0x18000000L
+ EDITTEXT IDC_MESSAGEDLG_MSGDATA,138,24,166,138,ES_MULTILINE | ES_AUTOVSCROLL | ES_WANTRETURN | WS_VSCROLL
+ GROUPBOX "Use this message as default for",IDC_STATIC,138,186,166,30,BS_LEFT
+ CONTROL "On&line",IDC_MESSAGEDLG_DEF_ONL,"MButtonClass",WS_TABSTOP,149,197,16,14,WS_EX_NOACTIVATE | 0x10000000L
+ CONTROL "&Away",IDC_MESSAGEDLG_DEF_AWAY,"MButtonClass",WS_TABSTOP,165,197,16,14,WS_EX_NOACTIVATE | 0x10000000L
+ CONTROL "&NA",IDC_MESSAGEDLG_DEF_NA,"MButtonClass",WS_TABSTOP,181,197,16,14,WS_EX_NOACTIVATE | 0x10000000L
+ CONTROL "Occ&upied",IDC_MESSAGEDLG_DEF_OCC,"MButtonClass",WS_TABSTOP,197,197,16,14,WS_EX_NOACTIVATE | 0x10000000L
+ CONTROL "&DND",IDC_MESSAGEDLG_DEF_DND,"MButtonClass",WS_TABSTOP,213,197,16,14,WS_EX_NOACTIVATE | 0x10000000L
+ CONTROL "&Free for chat",IDC_MESSAGEDLG_DEF_FFC,"MButtonClass",WS_TABSTOP,229,197,16,14,WS_EX_NOACTIVATE | 0x10000000L
+ CONTROL "&Invisible",IDC_MESSAGEDLG_DEF_INV,"MButtonClass",WS_TABSTOP,245,197,16,14,WS_EX_NOACTIVATE | 0x10000000L
+ CONTROL "On the &phone",IDC_MESSAGEDLG_DEF_OTP,"MButtonClass",WS_TABSTOP,261,197,16,14,WS_EX_NOACTIVATE | 0x10000000L
+ CONTROL "Out to &lunch",IDC_MESSAGEDLG_DEF_OTL,"MButtonClass",WS_TABSTOP,277,197,16,14,WS_EX_NOACTIVATE | 0x10000000L
+ CONTROL "New message",IDC_MESSAGEDLG_NEWMSG,"MButtonClass",WS_TABSTOP,138,166,16,14,WS_EX_NOACTIVATE | 0x10000000L
+ CONTROL "New category",IDC_MESSAGEDLG_NEWCAT,"MButtonClass",WS_TABSTOP,154,166,16,14,WS_EX_NOACTIVATE | 0x10000000L
+ CONTROL "Delete",IDC_MESSAGEDLG_DEL,"MButtonClass",WS_TABSTOP,170,166,16,14,WS_EX_NOACTIVATE | 0x10000000L
+ CONTROL "V",IDC_MESSAGEDLG_VARS,"MButtonClass",WS_TABSTOP,288,166,16,14,WS_EX_NOACTIVATE | 0x10000000L
END
-IDD_MODERNOPT_MESSAGES DIALOG DISCARDABLE 0, 0, 373, 154
-STYLE DS_SETFOREGROUND | DS_FIXEDSYS | DS_CONTROL | DS_CENTER | WS_CHILD
+IDD_MODERNOPT_MESSAGES DIALOG 0, 0, 373, 154
+STYLE DS_SETFONT | DS_SETFOREGROUND | DS_FIXEDSYS | DS_CONTROL | DS_CENTER | WS_CHILD
FONT 8, "MS Shell Dlg"
BEGIN
- CONTROL "",IDC_MESSAGEDLG_MSGTREE,"SysTreeView32",TVS_HASBUTTONS |
- TVS_HASLINES | TVS_LINESATROOT | TVS_EDITLABELS |
- TVS_SHOWSELALWAYS | TVS_TRACKSELECT | WS_BORDER |
- WS_TABSTOP,6,13,126,128
+ CONTROL "",IDC_MESSAGEDLG_MSGTREE,"SysTreeView32",TVS_HASBUTTONS | TVS_HASLINES | TVS_LINESATROOT | TVS_EDITLABELS | TVS_SHOWSELALWAYS | TVS_TRACKSELECT | WS_BORDER | WS_TABSTOP,6,13,126,128
LTEXT "Title:",IDC_TXT_TITLE2,138,14,51,8
EDITTEXT IDC_MESSAGEDLG_MSGTITLE,194,13,172,12,ES_AUTOHSCROLL
- EDITTEXT IDC_MESSAGEDLG_MSGDATA,138,30,228,57,ES_MULTILINE |
- ES_AUTOVSCROLL | ES_WANTRETURN | WS_VSCROLL
- GROUPBOX "Use this message as default for",IDC_TXT_TITLE3,138,111,
- 228,30,BS_LEFT
- CONTROL "On&line",IDC_MESSAGEDLG_DEF_ONL,"MButtonClass",
- WS_TABSTOP,144,122,16,14,0x18000000L
- CONTROL "&Away",IDC_MESSAGEDLG_DEF_AWAY,"MButtonClass",
- WS_TABSTOP,160,122,16,14,0x18000000L
- CONTROL "&NA",IDC_MESSAGEDLG_DEF_NA,"MButtonClass",WS_TABSTOP,
- 176,122,16,14,0x18000000L
- CONTROL "Occ&upied",IDC_MESSAGEDLG_DEF_OCC,"MButtonClass",
- WS_TABSTOP,192,122,16,14,0x18000000L
- CONTROL "&DND",IDC_MESSAGEDLG_DEF_DND,"MButtonClass",WS_TABSTOP,
- 208,122,16,14,0x18000000L
- CONTROL "&Free for chat",IDC_MESSAGEDLG_DEF_FFC,"MButtonClass",
- WS_TABSTOP,224,122,16,14,0x18000000L
- CONTROL "&Invisible",IDC_MESSAGEDLG_DEF_INV,"MButtonClass",
- WS_TABSTOP,240,122,16,14,0x18000000L
- CONTROL "On the &phone",IDC_MESSAGEDLG_DEF_OTP,"MButtonClass",
- WS_TABSTOP,256,122,16,14,0x18000000L
- CONTROL "Out to &lunch",IDC_MESSAGEDLG_DEF_OTL,"MButtonClass",
- WS_TABSTOP,272,122,16,14,0x18000000L
- CONTROL "New message",IDC_MESSAGEDLG_NEWMSG,"MButtonClass",
- WS_TABSTOP,138,95,16,14,0x18000000L
- CONTROL "New category",IDC_MESSAGEDLG_NEWCAT,"MButtonClass",
- WS_TABSTOP,154,95,16,14,0x18000000L
- CONTROL "Delete",IDC_MESSAGEDLG_DEL,"MButtonClass",WS_TABSTOP,
- 170,95,16,14,0x18000000L
- CONTROL "V",IDC_MESSAGEDLG_VARS,"MButtonClass",WS_TABSTOP,350,95,
- 16,14,0x18000000L
+ EDITTEXT IDC_MESSAGEDLG_MSGDATA,138,30,228,57,ES_MULTILINE | ES_AUTOVSCROLL | ES_WANTRETURN | WS_VSCROLL
+ GROUPBOX "Use this message as default for",IDC_TXT_TITLE3,138,111,228,30,BS_LEFT
+ CONTROL "On&line",IDC_MESSAGEDLG_DEF_ONL,"MButtonClass",WS_TABSTOP,144,122,16,14,WS_EX_NOACTIVATE | 0x10000000L
+ CONTROL "&Away",IDC_MESSAGEDLG_DEF_AWAY,"MButtonClass",WS_TABSTOP,160,122,16,14,WS_EX_NOACTIVATE | 0x10000000L
+ CONTROL "&NA",IDC_MESSAGEDLG_DEF_NA,"MButtonClass",WS_TABSTOP,176,122,16,14,WS_EX_NOACTIVATE | 0x10000000L
+ CONTROL "Occ&upied",IDC_MESSAGEDLG_DEF_OCC,"MButtonClass",WS_TABSTOP,192,122,16,14,WS_EX_NOACTIVATE | 0x10000000L
+ CONTROL "&DND",IDC_MESSAGEDLG_DEF_DND,"MButtonClass",WS_TABSTOP,208,122,16,14,WS_EX_NOACTIVATE | 0x10000000L
+ CONTROL "&Free for chat",IDC_MESSAGEDLG_DEF_FFC,"MButtonClass",WS_TABSTOP,224,122,16,14,WS_EX_NOACTIVATE | 0x10000000L
+ CONTROL "&Invisible",IDC_MESSAGEDLG_DEF_INV,"MButtonClass",WS_TABSTOP,240,122,16,14,WS_EX_NOACTIVATE | 0x10000000L
+ CONTROL "On the &phone",IDC_MESSAGEDLG_DEF_OTP,"MButtonClass",WS_TABSTOP,256,122,16,14,WS_EX_NOACTIVATE | 0x10000000L
+ CONTROL "Out to &lunch",IDC_MESSAGEDLG_DEF_OTL,"MButtonClass",WS_TABSTOP,272,122,16,14,WS_EX_NOACTIVATE | 0x10000000L
+ CONTROL "New message",IDC_MESSAGEDLG_NEWMSG,"MButtonClass",WS_TABSTOP,138,95,16,14,WS_EX_NOACTIVATE | 0x10000000L
+ CONTROL "New category",IDC_MESSAGEDLG_NEWCAT,"MButtonClass",WS_TABSTOP,154,95,16,14,WS_EX_NOACTIVATE | 0x10000000L
+ CONTROL "Delete",IDC_MESSAGEDLG_DEL,"MButtonClass",WS_TABSTOP,170,95,16,14,WS_EX_NOACTIVATE | 0x10000000L
+ CONTROL "V",IDC_MESSAGEDLG_VARS,"MButtonClass",WS_TABSTOP,350,95,16,14,WS_EX_NOACTIVATE | 0x10000000L
LTEXT "Status messages:",IDC_TXT_TITLE1,0,2,99,9
- CONTROL "Configure autoaway",IDC_LNK_AUTOAWAY,"Hyperlink",
- WS_TABSTOP,6,142,126,11
+ CONTROL "Configure autoaway",IDC_LNK_AUTOAWAY,"Hyperlink",WS_TABSTOP,6,142,126,11
END
-IDD_MOREOPTDIALOG DIALOGEX DISCARDABLE 0, 0, 311, 235
+IDD_MOREOPTDIALOG DIALOGEX 0, 0, 311, 235
STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD
EXSTYLE WS_EX_CONTROLPARENT
FONT 8, "MS Shell Dlg", 0, 0, 0x1
BEGIN
RTEXT "Wait",IDC_STATIC_MOREOPTDLG_WAIT,2,10,36,8
EDITTEXT IDC_MOREOPTDLG_WAITFORMSG,41,8,28,12,ES_AUTOHSCROLL
- CONTROL "",IDC_MOREOPTDLG_WAITFORMSG_SPIN,"msctls_updown32",
- UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY |
- UDS_ARROWKEYS | UDS_NOTHOUSANDS,57,8,12,12
- LTEXT "seconds before closing the status message dialog (-1=don't close)",
- IDC_STATIC_MOREOPTDLG_SECONDSREMAIN,74,10,235,8
+ CONTROL "",IDC_MOREOPTDLG_WAITFORMSG_SPIN,"msctls_updown32",UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | UDS_NOTHOUSANDS,57,8,12,12
+ LTEXT "seconds before closing the status message dialog (-1=don't close)",IDC_STATIC_MOREOPTDLG_SECONDSREMAIN,74,10,235,8
RTEXT "Store",IDC_STATIC,2,28,36,8
- EDITTEXT IDC_MOREOPTDLG_RECENTMSGSCOUNT,41,26,28,12,
- ES_AUTOHSCROLL | ES_NUMBER
- CONTROL "",IDC_MOREOPTDLG_RECENTMSGSCOUNT_SPIN,"msctls_updown32",
- UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY |
- UDS_ARROWKEYS | UDS_NOTHOUSANDS,57,26,12,12
- LTEXT "most recent messages (0=disable)",IDC_STATIC,74,28,119,
- 8
- CONTROL "Store for each status separately",
- IDC_MOREOPTDLG_PERSTATUSMRM,"Button",BS_AUTOCHECKBOX |
- WS_TABSTOP,41,42,267,10
+ EDITTEXT IDC_MOREOPTDLG_RECENTMSGSCOUNT,41,26,28,12,ES_AUTOHSCROLL | ES_NUMBER
+ CONTROL "",IDC_MOREOPTDLG_RECENTMSGSCOUNT_SPIN,"msctls_updown32",UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | UDS_NOTHOUSANDS,57,26,12,12
+ LTEXT "most recent messages (0=disable)",IDC_STATIC,74,28,119,8
+ CONTROL "Store for each status separately",IDC_MOREOPTDLG_PERSTATUSMRM,
+ "Button",BS_AUTOCHECKBOX | WS_TABSTOP,41,42,267,10
GROUPBOX "Use default...",IDC_STATIC,6,58,294,30
CONTROL "Use the most recent message",IDC_MOREOPTDLG_USELASTMSG,
"Button",BS_AUTORADIOBUTTON | WS_TABSTOP,12,70,138,10
CONTROL "Use the default message",IDC_MOREOPTDLG_USEDEFMSG,
"Button",BS_AUTORADIOBUTTON | WS_TABSTOP,156,70,138,10
- CONTROL "Reset per-protocol messages when changing global status",
- IDC_MOREOPTDLG_RESETPROTOMSGS,"Button",BS_AUTOCHECKBOX |
- WS_TABSTOP,7,95,300,10
- CONTROL "Store protocol messages for each status separately",
- IDC_MOREOPTDLG_PERSTATUSPROTOMSGS,"Button",
- BS_AUTOCHECKBOX | WS_TABSTOP,15,107,294,10
- CONTROL "Store protocol autoreply settings for each status separately",
- IDC_MOREOPTDLG_PERSTATUSPROTOSETTINGS,"Button",
- BS_AUTOCHECKBOX | WS_TABSTOP,15,119,294,10
- CONTROL "Remember last message used for a contact...",
- IDC_MOREOPTDLG_SAVEPERSONALMSGS,"Button",BS_AUTOCHECKBOX |
- WS_TABSTOP,6,133,297,10
- CONTROL "Store for each status separately",
- IDC_MOREOPTDLG_PERSTATUSPERSONAL,"Button",
- BS_AUTOCHECKBOX | WS_TABSTOP,15,146,288,10
- CONTROL "Store contact autoreply/ignore settings for each status separately",
- IDC_MOREOPTDLG_PERSTATUSPERSONALSETTINGS,"Button",
- BS_AUTOCHECKBOX | BS_TOP | BS_MULTILINE | WS_TABSTOP,15,
- 157,294,16
+ CONTROL "Reset per-protocol messages when changing global status",IDC_MOREOPTDLG_RESETPROTOMSGS,
+ "Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,95,300,10
+ CONTROL "Store protocol messages for each status separately",IDC_MOREOPTDLG_PERSTATUSPROTOMSGS,
+ "Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,107,294,10
+ CONTROL "Store protocol autoreply settings for each status separately",IDC_MOREOPTDLG_PERSTATUSPROTOSETTINGS,
+ "Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,119,294,10
+ CONTROL "Remember last message used for a contact...",IDC_MOREOPTDLG_SAVEPERSONALMSGS,
+ "Button",BS_AUTOCHECKBOX | WS_TABSTOP,6,133,297,10
+ CONTROL "Store for each status separately",IDC_MOREOPTDLG_PERSTATUSPERSONAL,
+ "Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,146,288,10
+ CONTROL "Store contact autoreply/ignore settings for each status separately",IDC_MOREOPTDLG_PERSTATUSPERSONALSETTINGS,
+ "Button",BS_AUTOCHECKBOX | BS_TOP | BS_MULTILINE | WS_TABSTOP,15,157,294,16
CONTROL "Enable contact menu items",IDC_MOREOPTDLG_USEMENUITEM,
- "Button",BS_AUTOCHECKBOX | BS_TOP | BS_MULTILINE |
- WS_TABSTOP,167,203,142,17
- CONTROL "Use protocol specific nick for %nas_mynick%",
- IDC_MOREOPTDLG_MYNICKPERPROTO,"Button",BS_AUTOCHECKBOX |
- BS_MULTILINE | WS_TABSTOP,6,175,294,8
- CONTROL "Update status messages for non-ICQ protocols every",
- IDC_MOREOPTDLG_UPDATEMSGS,"Button",BS_AUTOCHECKBOX |
- WS_TABSTOP,6,187,199,10
- EDITTEXT IDC_MOREOPTDLG_UPDATEMSGSPERIOD,207,186,38,12,
- ES_AUTOHSCROLL | ES_NUMBER
- CONTROL "",IDC_MOREOPTDLG_UPDATEMSGSPERIOD_SPIN,"msctls_updown32",
- UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY |
- UDS_ARROWKEYS | UDS_NOTHOUSANDS,230,186,12,12
+ "Button",BS_AUTOCHECKBOX | BS_TOP | BS_MULTILINE | WS_TABSTOP,167,203,142,17
+ CONTROL "Use protocol specific nick for %nas_mynick%",IDC_MOREOPTDLG_MYNICKPERPROTO,
+ "Button",BS_AUTOCHECKBOX | BS_MULTILINE | WS_TABSTOP,6,175,294,8
+ CONTROL "Update status messages for non-ICQ protocols every",IDC_MOREOPTDLG_UPDATEMSGS,
+ "Button",BS_AUTOCHECKBOX | WS_TABSTOP,6,187,199,10
+ EDITTEXT IDC_MOREOPTDLG_UPDATEMSGSPERIOD,207,186,38,12,ES_AUTOHSCROLL | ES_NUMBER
+ CONTROL "",IDC_MOREOPTDLG_UPDATEMSGSPERIOD_SPIN,"msctls_updown32",UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | UDS_NOTHOUSANDS,230,186,12,12
LTEXT "seconds",IDC_STATIC,249,187,60,8
- GROUPBOX "Don't show the message dialog for",IDC_STATIC,6,200,156,
- 31
- CONTROL "On&line",IDC_MOREOPTDLG_DONTPOPDLG_ONL,"MButtonClass",
- WS_TABSTOP,12,212,16,14,0x18000000L
- CONTROL "&Away",IDC_MOREOPTDLG_DONTPOPDLG_AWAY,"MButtonClass",
- WS_TABSTOP,28,212,16,14,0x18000000L
- CONTROL "&NA",IDC_MOREOPTDLG_DONTPOPDLG_NA,"MButtonClass",
- WS_TABSTOP,44,212,16,14,0x18000000L
- CONTROL "Occ&upied",IDC_MOREOPTDLG_DONTPOPDLG_OCC,"MButtonClass",
- WS_TABSTOP,60,212,16,14,0x18000000L
- CONTROL "&DND",IDC_MOREOPTDLG_DONTPOPDLG_DND,"MButtonClass",
- WS_TABSTOP,76,212,16,14,0x18000000L
+ GROUPBOX "Don't show the message dialog for",IDC_STATIC,6,200,156,31
+ CONTROL "On&line",IDC_MOREOPTDLG_DONTPOPDLG_ONL,"MButtonClass",WS_TABSTOP,12,212,16,14,WS_EX_NOACTIVATE | 0x10000000L
+ CONTROL "&Away",IDC_MOREOPTDLG_DONTPOPDLG_AWAY,"MButtonClass",WS_TABSTOP,28,212,16,14,WS_EX_NOACTIVATE | 0x10000000L
+ CONTROL "&NA",IDC_MOREOPTDLG_DONTPOPDLG_NA,"MButtonClass",WS_TABSTOP,44,212,16,14,WS_EX_NOACTIVATE | 0x10000000L
+ CONTROL "Occ&upied",IDC_MOREOPTDLG_DONTPOPDLG_OCC,"MButtonClass",WS_TABSTOP,60,212,16,14,WS_EX_NOACTIVATE | 0x10000000L
+ CONTROL "&DND",IDC_MOREOPTDLG_DONTPOPDLG_DND,"MButtonClass",WS_TABSTOP,76,212,16,14,WS_EX_NOACTIVATE | 0x10000000L
CONTROL "&Free for chat",IDC_MOREOPTDLG_DONTPOPDLG_FFC,
- "MButtonClass",WS_TABSTOP,92,212,16,14,0x18000000L
- CONTROL "&Invisible",IDC_MOREOPTDLG_DONTPOPDLG_INV,"MButtonClass",
- WS_TABSTOP,108,212,16,14,0x18000000L
+ "MButtonClass",WS_TABSTOP,92,212,16,14,WS_EX_NOACTIVATE | 0x10000000L
+ CONTROL "&Invisible",IDC_MOREOPTDLG_DONTPOPDLG_INV,"MButtonClass",WS_TABSTOP,108,212,16,14,WS_EX_NOACTIVATE | 0x10000000L
CONTROL "On the &phone",IDC_MOREOPTDLG_DONTPOPDLG_OTP,
- "MButtonClass",WS_TABSTOP,124,212,16,14,0x18000000L
+ "MButtonClass",WS_TABSTOP,124,212,16,14,WS_EX_NOACTIVATE | 0x10000000L
CONTROL "Out to &lunch",IDC_MOREOPTDLG_DONTPOPDLG_OTL,
- "MButtonClass",WS_TABSTOP,140,212,16,14,0x18000000L
+ "MButtonClass",WS_TABSTOP,140,212,16,14,WS_EX_NOACTIVATE | 0x10000000L
END
IDD_READAWAYMSG DIALOGEX 0, 0, 186, 72
-STYLE DS_SETFOREGROUND | DS_3DLOOK | DS_FIXEDSYS | DS_CENTER | WS_POPUP |
- WS_VISIBLE | WS_CAPTION | WS_SYSMENU | WS_THICKFRAME
+STYLE DS_SETFONT | DS_SETFOREGROUND | DS_3DLOOK | DS_FIXEDSYS | DS_CENTER | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU | WS_THICKFRAME
CAPTION "%s message for %s"
FONT 8, "MS Shell Dlg", 0, 0, 0x1
BEGIN
- EDITTEXT IDC_READAWAYMSG_MSG,5,5,177,43,ES_MULTILINE |
- ES_AUTOVSCROLL | ES_READONLY | NOT WS_VISIBLE |
- WS_VSCROLL
- CTEXT "Retrieving %s message...",IDC_READAWAYMSG_RETRIEVE,5,21,
- 177,8,SS_NOPREFIX
+ EDITTEXT IDC_READAWAYMSG_MSG,5,5,177,43,ES_MULTILINE | ES_AUTOVSCROLL | ES_READONLY | NOT WS_VISIBLE | WS_VSCROLL
+ CTEXT "Retrieving %s message...",IDC_READAWAYMSG_RETRIEVE,5,21,177,8,SS_NOPREFIX
DEFPUSHBUTTON "&Cancel",IDOK,69,53,50,14,BS_NOTIFY
END
@@ -441,77 +255,20 @@ STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD
EXSTYLE WS_EX_CONTROLPARENT
FONT 8, "MS Shell Dlg", 0, 0, 0x1
BEGIN
- CONTROL "",IDC_CONTACTSDLG_LIST,"CListControl",WS_TABSTOP |
- 0x1f0,6,30,299,160,WS_EX_CLIENTEDGE
- ICON 141,IDC_STATIC,197,0,20,20,SS_CENTERIMAGE |
- SS_REALSIZEIMAGE | NOT WS_VISIBLE
- LTEXT "Notify of requests",IDC_STATIC,217,5,87,8,SS_NOPREFIX |
- SS_CENTERIMAGE | NOT WS_VISIBLE
- ICON 140,IDC_STATIC,197,12,20,20,SS_CENTERIMAGE |
- SS_REALSIZEIMAGE | NOT WS_VISIBLE
- LTEXT "Don't notify of requests",IDC_STATIC,217,18,87,8,
- SS_NOPREFIX | SS_CENTERIMAGE | NOT WS_VISIBLE
- ICON IDI_SOE_ENABLED,IDC_STATIC,3,190,20,20,SS_CENTERIMAGE |
- SS_REALSIZEIMAGE
- LTEXT "Autoreply on",IDC_STATIC,24,196,106,8,SS_NOPREFIX |
- SS_CENTERIMAGE
- ICON IDI_SOE_DISABLED,IDC_STATIC,3,204,20,20,SS_CENTERIMAGE |
- SS_REALSIZEIMAGE
- LTEXT "Autoreply off",IDC_STATIC,24,210,107,8,SS_NOPREFIX |
- SS_CENTERIMAGE
- ICON IDI_IGNORE,IDC_STATIC,132,190,20,20,SS_CENTERIMAGE |
- SS_REALSIZEIMAGE
- LTEXT "Don't send status message",IDC_STATIC,151,196,153,8,
- SS_NOPREFIX | SS_CENTERIMAGE
- LTEXT "Note: these settings are applied to all status modes at once.",
- IDC_STATIC,6,1,300,9
- ICON IDI_INDEFINITE,IDC_STATIC,6,13,16,16,SS_CENTERIMAGE |
- SS_REALSIZEIMAGE
- LTEXT "Means the setting is different for different status modes / contacts",
- IDC_STATIC,22,17,281,8,SS_NOPREFIX | SS_CENTERIMAGE
-END
-
-IDD_SETAWAYMSG_BAK DIALOGEX 0, 0, 398, 133
-STYLE DS_3DLOOK | DS_FIXEDSYS | DS_CENTER | WS_POPUP | WS_VISIBLE |
- WS_CAPTION | WS_SYSMENU | WS_THICKFRAME
-FONT 8, "MS Shell Dlg", 0, 0, 0x1
-BEGIN
- EDITTEXT IDC_SAWAYMSG_MSGDATA,115,1,172,114,ES_MULTILINE |
- ES_AUTOVSCROLL | ES_WANTRETURN | WS_VSCROLL
- PUSHBUTTON "OK",IDC_OK,115,117,60,14
- CONTROL "&Variables",IDC_SAWAYMSG_VARS,"MButtonClass",WS_TABSTOP,
- 255,117,16,14,0x18000000L
- CONTROL "Se&ttings",IDC_SAWAYMSG_OPTIONS,"MButtonClass",
- WS_TABSTOP,271,117,16,14,0x18000000L
- ICON IDI_IGNORE,IDC_SAWAYMSG_STATIC_IGNOREICON,379,108,18,16,
- SS_CENTERIMAGE | SS_REALSIZEIMAGE
- ICON IDI_SOE_ENABLED,IDC_SAWAYMSG_STATIC_REPLYICON,379,116,18,
- 16,SS_CENTERIMAGE | SS_REALSIZEIMAGE
- CONTROL "",IDC_SAWAYMSG_CONTACTSTREE,"SysTreeView32",
- TVS_DISABLEDRAGDROP | TVS_SHOWSELALWAYS |
- TVS_TRACKSELECT | WS_BORDER | WS_TABSTOP,289,1,108,114
- CONTROL "Ignore requests",IDC_SAWAYMSG_IGNOREREQ,"Button",
- BS_AUTOCHECKBOX | BS_LEFTTEXT | WS_TABSTOP,307,116,80,8,
- WS_EX_RIGHT
- CONTROL "Send an autoreply",IDC_SAWAYMSG_SENDMSG,"Button",
- BS_AUTO3STATE | BS_LEFTTEXT | WS_TABSTOP,307,124,80,8,
- WS_EX_RIGHT
- CONTROL "",IDC_SAWAYMSG_TREE,"SysTreeView32",TVS_HASBUTTONS |
- TVS_HASLINES | TVS_LINESATROOT | TVS_EDITLABELS |
- TVS_SHOWSELALWAYS | TVS_TRACKSELECT | WS_BORDER |
- WS_TABSTOP,1,1,112,114
- CONTROL "&Delete",IDC_SAWAYMSG_DELETE,"MButtonClass",WS_TABSTOP,
- 2,117,16,14,0x18000000L
- CONTROL "New &category",IDC_SAWAYMSG_NEWCATEGORY,"MButtonClass",
- WS_TABSTOP,18,117,16,14,0x18000000L
- CONTROL "Save as &new",IDC_SAWAYMSG_SAVEASNEW,"MButtonClass",
- WS_TABSTOP,34,117,16,14,0x18000000L
- CONTROL "&Save",IDC_SAWAYMSG_SAVEMSG,"MButtonClass",WS_TABSTOP,
- 50,117,16,14,0x18000000L
- CONTROL "",IDC_SAWAYMSG_MSGSPLITTER,"Static",SS_ENHMETAFILE,113,
- 0,2,115,WS_EX_STATICEDGE
- CONTROL "",IDC_SAWAYMSG_CONTACTSPLITTER,"Static",SS_ENHMETAFILE,
- 287,0,2,115,WS_EX_STATICEDGE
+ CONTROL "",IDC_CONTACTSDLG_LIST,"CListControl",WS_TABSTOP | 0x1f0,6,30,299,160,WS_EX_CLIENTEDGE
+ ICON IDI_ENABLENOTIFY,IDC_STATIC,197,0,20,20,SS_CENTERIMAGE | SS_REALSIZEIMAGE | NOT WS_VISIBLE
+ LTEXT "Notify of requests",IDC_STATIC,217,5,87,8,SS_NOPREFIX | SS_CENTERIMAGE | NOT WS_VISIBLE
+ ICON IDI_DISABLENOTIFY,IDC_STATIC,197,12,20,20,SS_CENTERIMAGE | SS_REALSIZEIMAGE | NOT WS_VISIBLE
+ LTEXT "Don't notify of requests",IDC_STATIC,217,18,87,8,SS_NOPREFIX | SS_CENTERIMAGE | NOT WS_VISIBLE
+ ICON IDI_SOE_ENABLED,IDC_SI_SOE_ENABLED,3,190,20,20,SS_CENTERIMAGE | SS_REALSIZEIMAGE
+ LTEXT "Autoreply on",IDC_STATIC,24,196,106,8,SS_NOPREFIX | SS_CENTERIMAGE
+ ICON IDI_SOE_DISABLED,IDC_SI_SOE_DISABLED,3,204,21,20,SS_CENTERIMAGE | SS_REALSIZEIMAGE
+ LTEXT "Autoreply off",IDC_STATIC,24,210,107,8,SS_NOPREFIX | SS_CENTERIMAGE
+ ICON IDI_IGNORE,IDC_SI_IGNORE,132,190,20,20,SS_CENTERIMAGE | SS_REALSIZEIMAGE
+ LTEXT "Don't send status message",IDC_STATIC,151,196,153,8,SS_NOPREFIX | SS_CENTERIMAGE
+ LTEXT "Note: these settings are applied to all status modes at once.",IDC_STATIC,6,1,300,9
+ ICON IDI_INDEFINITE,IDC_SI_INDEFINITE,6,13,20,20,SS_CENTERIMAGE | SS_REALSIZEIMAGE
+ LTEXT "Means the setting is different for different status modes / contacts",IDC_STATIC,22,17,281,8,SS_NOPREFIX | SS_CENTERIMAGE
END
@@ -521,18 +278,8 @@ END
//
#ifdef APSTUDIO_INVOKED
-GUIDELINES DESIGNINFO MOVEABLE PURE
+GUIDELINES DESIGNINFO
BEGIN
- IDD_POPUPOPTDLG, DIALOG
- BEGIN
- LEFTMARGIN, 7
- RIGHTMARGIN, 305
- VERTGUIDE, 90
- VERTGUIDE, 163
- TOPMARGIN, 7
- BOTTOMMARGIN, 230
- END
-
IDD_AUTOREPLY, DIALOG
BEGIN
RIGHTMARGIN, 297
@@ -546,7 +293,8 @@ BEGIN
IDD_SETAWAYMSG, DIALOG
BEGIN
- BOTTOMMARGIN, 124
+ RIGHTMARGIN, 398
+ BOTTOMMARGIN, 136
END
IDD_MESSAGES, DIALOG
@@ -587,12 +335,6 @@ BEGIN
TOPMARGIN, 7
BOTTOMMARGIN, 214
END
-
- IDD_SETAWAYMSG_BAK, DIALOG
- BEGIN
- VERTGUIDE, 98
- HORZGUIDE, 111
- END
END
#endif // APSTUDIO_INVOKED
@@ -604,48 +346,39 @@ END
// Icon with lowest ID value placed first to ensure application icon
// remains consistent on all systems.
-IDI_MSGICON ICON DISCARDABLE "MsgIcon.ico"
-IDI_SOE_ENABLED ICON DISCARDABLE "on.ico"
-IDI_SOE_DISABLED ICON DISCARDABLE "off.ico"
-IDI_DOT ICON DISCARDABLE "Dot.ico"
-IDI_IGNORE ICON DISCARDABLE "Ignore.ico"
-IDI_SAVE ICON DISCARDABLE "SaveMsg.ico"
-IDI_SAVEASNEW ICON DISCARDABLE "SaveAsNew.ico"
-IDI_DELETE ICON DISCARDABLE "Delete.ico"
-IDI_NEWCATEGORY ICON DISCARDABLE "NewCat.ico"
-IDI_VARIABLES ICON DISCARDABLE "Variables.ico"
-IDI_NEWMESSAGE ICON DISCARDABLE "NewMessage.ico"
-IDI_SETTINGS ICON DISCARDABLE "Settings.ico"
-IDI_STATUS_OTHER ICON DISCARDABLE "Status_Other.ico"
-IDI_INDEFINITE ICON DISCARDABLE "Indefinite.ico"
+IDI_MSGICON ICON "MsgIcon.ico"
+IDI_SOE_ENABLED ICON "on.ico"
+IDI_SOE_DISABLED ICON "off.ico"
+IDI_DOT ICON "Dot.ico"
+IDI_IGNORE ICON "Ignore.ico"
+IDI_SAVE ICON "SaveMsg.ico"
+IDI_SAVEASNEW ICON "SaveAsNew.ico"
+IDI_DELETE ICON "Delete.ico"
+IDI_NEWCATEGORY ICON "NewCat.ico"
+IDI_NEWMESSAGE ICON "NewMessage.ico"
+IDI_SETTINGS ICON "Settings.ico"
+IDI_INDEFINITE ICON "Indefinite.ico"
/////////////////////////////////////////////////////////////////////////////
//
// Menu
//
-IDR_SAM_OPTIONS MENU DISCARDABLE
+IDR_SAM_OPTIONS MENU
BEGIN
POPUP "Set away message window options"
BEGIN
MENUITEM "Show predefined &messages", IDM_SAM_OPTIONS_SHOWMSGTREE
MENUITEM "Show &contacts", IDM_SAM_OPTIONS_SHOWCONTACTTREE
-
MENUITEM SEPARATOR
- MENUITEM "Save default window settings &automatically",
- IDM_SAM_OPTIONS_AUTOSAVEDLGSETTINGS
-
- MENUITEM "&Save current window settings as default",
- IDM_SAM_OPTIONS_SAVEDLGSETTINGSNOW
-
+ MENUITEM "Save default window settings &automatically", IDM_SAM_OPTIONS_AUTOSAVEDLGSETTINGS
+ MENUITEM "&Save current window settings as default", IDM_SAM_OPTIONS_SAVEDLGSETTINGSNOW
MENUITEM SEPARATOR
- MENUITEM "Disable parsing of status messages by Variables plugin",
- IDM_SAM_OPTIONS_DISABLEVARIABLES
-
+ MENUITEM "Disable parsing of status messages by Variables plugin", IDM_SAM_OPTIONS_DISABLEVARIABLES
END
END
-IDR_MSGTREE_CATEGORYMENU MENU DISCARDABLE
+IDR_MSGTREE_CATEGORYMENU MENU
BEGIN
POPUP "Message tree menu"
BEGIN
@@ -656,7 +389,7 @@ BEGIN
END
END
-IDR_MSGTREE_MESSAGEMENU MENU DISCARDABLE
+IDR_MSGTREE_MESSAGEMENU MENU
BEGIN
POPUP "Message tree category menu"
BEGIN
@@ -680,7 +413,7 @@ BEGIN
END
END
-#endif // English (U.S.) resources
+#endif // English (United States) resources
/////////////////////////////////////////////////////////////////////////////
diff --git a/plugins/NewAwaySysMod/res/Status_Other.ico b/plugins/NewAwaySysMod/res/Status_Other.ico
deleted file mode 100644
index 922d911bbb..0000000000
--- a/plugins/NewAwaySysMod/res/Status_Other.ico
+++ /dev/null
Binary files differ
diff --git a/plugins/NewAwaySysMod/res/Variables.ico b/plugins/NewAwaySysMod/res/Variables.ico
deleted file mode 100644
index 7fd7196664..0000000000
--- a/plugins/NewAwaySysMod/res/Variables.ico
+++ /dev/null
Binary files differ
diff --git a/plugins/NewAwaySysMod/src/AwayOpt.cpp b/plugins/NewAwaySysMod/src/AwayOpt.cpp
index 46be9c321a..62a346a1da 100644
--- a/plugins/NewAwaySysMod/src/AwayOpt.cpp
+++ b/plugins/NewAwaySysMod/src/AwayOpt.cpp
@@ -1109,15 +1109,20 @@ INT_PTR CALLBACK ContactsOptDlg(HWND hwndDlg, UINT msg, WPARAM, LPARAM lParam)
{
MySetPos(hwndDlg);
HIMAGELIST hIml = ImageList_Create(GetSystemMetrics(SM_CXSMICON), GetSystemMetrics(SM_CYSMICON), ILC_COLOR32 | ILC_MASK, 5, 2);
- ImageList_AddIcon(hIml, LoadIcon(g_hInstance, MAKEINTRESOURCE(IDI_DOT)));
- ImageList_AddIcon(hIml, LoadIcon(g_hInstance, MAKEINTRESOURCE(IDI_IGNORE)));
- ImageList_AddIcon(hIml, LoadIcon(g_hInstance, MAKEINTRESOURCE(IDI_SOE_ENABLED)));
- ImageList_AddIcon(hIml, LoadIcon(g_hInstance, MAKEINTRESOURCE(IDI_SOE_DISABLED)));
- ImageList_AddIcon(hIml, LoadIcon(g_hInstance, MAKEINTRESOURCE(IDI_INDEFINITE)));
+ ImageList_AddIcon(hIml, GetIcon(IDI_DOT));
+ ImageList_AddIcon(hIml, GetIcon(IDI_IGNORE));
+ ImageList_AddIcon(hIml, GetIcon(IDI_SOE_ENABLED));
+ ImageList_AddIcon(hIml, GetIcon(IDI_SOE_DISABLED));
+ ImageList_AddIcon(hIml, GetIcon(IDI_INDEFINITE));
SendMessage(hwndList, CLM_SETEXTRAIMAGELIST, 0, (LPARAM)hIml);
SendMessage(hwndDlg, UM_CONTACTSDLG_RESETLISTOPTIONS, 0, 0);
SendMessage(hwndList, CLM_SETEXTRACOLUMNS, EXTRACOLUMNSCOUNT, 0);
+
+ SendDlgItemMessage(hwndDlg, IDC_SI_INDEFINITE, STM_SETIMAGE, (WPARAM)IMAGE_ICON, (LPARAM)GetIcon(IDI_INDEFINITE));
+ SendDlgItemMessage(hwndDlg, IDC_SI_SOE_ENABLED, STM_SETIMAGE, (WPARAM)IMAGE_ICON, (LPARAM)GetIcon(IDI_SOE_ENABLED));
+ SendDlgItemMessage(hwndDlg, IDC_SI_SOE_DISABLED, STM_SETIMAGE, (WPARAM)IMAGE_ICON, (LPARAM)GetIcon(IDI_SOE_DISABLED));
+ SendDlgItemMessage(hwndDlg, IDC_SI_IGNORE, STM_SETIMAGE, (WPARAM)IMAGE_ICON, (LPARAM)GetIcon(IDI_IGNORE));
CLCINFOITEM cii = { 0 };
cii.cbSize = sizeof(cii);
diff --git a/plugins/NewAwaySysMod/src/AwaySys.cpp b/plugins/NewAwaySysMod/src/AwaySys.cpp
index b3ac695fb9..2652a89873 100644
--- a/plugins/NewAwaySysMod/src/AwaySys.cpp
+++ b/plugins/NewAwaySysMod/src/AwaySys.cpp
@@ -54,11 +54,30 @@ bool g_fNoProcessing = false; // tells the status change proc not to do anything
int g_bIsIdle = false;
VAR_PARSE_DATA VarParseData;
-static IconItem iconList[] = {
- { LPGEN("Toggle On"), "on", IDI_SOE_DISABLED },
- { LPGEN("Toggle Off"), "off", IDI_SOE_ENABLED }
+IconItem iconList[] = {
+ { LPGEN("Toggle Off"), "off", IDI_SOE_DISABLED },
+ { LPGEN("Toggle On"), "on", IDI_SOE_ENABLED },
+ { LPGEN("New message"), "new_msg", IDI_NEWMESSAGE },
+ { LPGEN("New category"), "new_cat", IDI_NEWCATEGORY },
+ { LPGEN("Delete"), "delete", IDI_DELETE },
+ { LPGEN("Dot"), "dot", IDI_DOT },
+ { LPGEN("Ignore"), "ignore", IDI_IGNORE },
+ { LPGEN("Indefinite"), "indefinite", IDI_INDEFINITE },
+ { LPGEN("Set status message"), "msg_icon", IDI_MSGICON },
+ { LPGEN("Add"), "add", IDI_SAVEASNEW },
+ { LPGEN("Save"), "save", IDI_SAVE },
+ { LPGEN("Settings"), "settings", IDI_SETTINGS }
};
+HICON GetIcon(int iconId, bool size)
+{
+ for (size_t i = 0; i < _countof(iconList); i++)
+ if (iconList[i].defIconID == iconId)
+ return IcoLib_GetIconByHandle(iconList[i].hIcolib, size);
+
+ return NULL;
+}
+
PLUGININFOEX pluginInfo = {
sizeof(PLUGININFOEX),
__PLUGIN_NAME,
@@ -318,21 +337,21 @@ int PreBuildContactMenu(WPARAM hContact, LPARAM)
if (szSetStr[0] == 0)
Menu_ShowItem(g_hContactMenuItem, false);
else
- Menu_ModifyItem(g_hContactMenuItem, szSetStr, INVALID_HANDLE_VALUE, 0);
+ Menu_ModifyItem(g_hContactMenuItem, szSetStr, iconList[8].hIcolib, 0);
// if this contact supports sending/receiving messages
if ((Flag1 & PF1_IM) == PF1_IM) {
int iAutoreply = CContactSettings(g_ProtoStates[szProto].m_status, hContact).Autoreply;
HANDLE hIcon;
switch (iAutoreply) {
- case VAL_USEDEFAULT: hIcon = LoadIcon(g_hInstance, MAKEINTRESOURCE(IDI_DOT)); break;
+ case VAL_USEDEFAULT: hIcon = Skin_LoadIcon(IDI_DOT); break;
case 0: hIcon = iconList[0].hIcolib; break;
default: iAutoreply = 1; hIcon = iconList[1].hIcolib; break;
}
Menu_ModifyItem(g_hToggleSOEContactMenuItem, NULL, hIcon, 0);
- Menu_ModifyItem(g_hAutoreplyOnContactMenuItem, NULL, INVALID_HANDLE_VALUE, (iAutoreply == 1) ? CMIF_CHECKED : 0);
- Menu_ModifyItem(g_hAutoreplyOffContactMenuItem, NULL, INVALID_HANDLE_VALUE, (iAutoreply == 0) ? CMIF_CHECKED : 0);
- Menu_ModifyItem(g_hAutoreplyUseDefaultContactMenuItem, NULL, INVALID_HANDLE_VALUE, (iAutoreply == VAL_USEDEFAULT) ? CMIF_CHECKED : 0);
+ Menu_ModifyItem(g_hAutoreplyOnContactMenuItem, NULL, iconList[1].hIcolib, (iAutoreply == 1) ? CMIF_CHECKED : 0);
+ Menu_ModifyItem(g_hAutoreplyOffContactMenuItem, NULL, iconList[0].hIcolib, (iAutoreply == 0) ? CMIF_CHECKED : 0);
+ Menu_ModifyItem(g_hAutoreplyUseDefaultContactMenuItem, NULL, iconList[5].hIcolib, (iAutoreply == VAL_USEDEFAULT) ? CMIF_CHECKED : 0);
}
else // hide the Autoreply menu item
Menu_ShowItem(g_hToggleSOEContactMenuItem, false);
@@ -634,7 +653,7 @@ int MirandaLoaded(WPARAM, LPARAM)
mi.flags = CMIF_TCHAR | CMIF_HIDDEN;
mi.name.t = LPGENT("Set status message"); // will never be shown
mi.position = 1000020000;
- mi.hIcolibItem = LoadIcon(g_hInstance, MAKEINTRESOURCE(IDI_MSGICON));
+ mi.hIcolibItem = iconList[8].hIcolib;
mi.pszService = MS_AWAYSYS_SETCONTACTSTATMSG;
g_hContactMenuItem = Menu_AddContactMenuItem(&mi);
@@ -663,7 +682,7 @@ int MirandaLoaded(WPARAM, LPARAM)
g_hAutoreplyOffContactMenuItem = Menu_AddContactMenuItem(&mi);
SET_UID(mi, 0x101471b9, 0x4309, 0x4062, 0xa8, 0x5e, 0xa2, 0xae, 0x14, 0x7e, 0x4a, 0xb3);
- mi.hIcolibItem = LoadIcon(g_hInstance, MAKEINTRESOURCE(IDI_DOT));
+ mi.hIcolibItem = iconList[5].hIcolib;
mi.name.t = LPGENT("Use the default setting");
mi.pszService = MS_AWAYSYS_AUTOREPLY_USEDEFAULT;
g_hAutoreplyUseDefaultContactMenuItem = Menu_AddContactMenuItem(&mi);
diff --git a/plugins/NewAwaySysMod/src/MsgTree.cpp b/plugins/NewAwaySysMod/src/MsgTree.cpp
index 4ac3d313c6..0cb9c2674c 100644
--- a/plugins/NewAwaySysMod/src/MsgTree.cpp
+++ b/plugins/NewAwaySysMod/src/MsgTree.cpp
@@ -470,9 +470,9 @@ CMsgTree::CMsgTree(HWND hTreeView) : MsgTreePage(g_MsgTreePage), hTreeView(hTree
COptItem_TreeCtrl* TreeCtrl = (COptItem_TreeCtrl*)MsgTreePage.Find(IDV_MSGTREE);
TreeCtrl->SetDlgItemID(GetDlgCtrlID(hTreeView));
hImageList = ImageList_Create(GetSystemMetrics(SM_CXSMICON), GetSystemMetrics(SM_CYSMICON), ILC_COLOR32 | ILC_MASK, 5, 2);
- ImageList_AddIcon(hImageList, LoadIcon(g_hInstance, MAKEINTRESOURCE(IDI_NEWMESSAGE)));
- ImageList_AddIcon(hImageList, LoadIcon(g_hInstance, MAKEINTRESOURCE(IDI_NEWCATEGORY)));
- ImageList_AddIcon(hImageList, LoadIcon(g_hInstance, MAKEINTRESOURCE(IDI_DELETE)));
+ ImageList_AddIcon(hImageList, GetIcon(IDI_NEWMESSAGE));
+ ImageList_AddIcon(hImageList, GetIcon(IDI_NEWCATEGORY));
+ ImageList_AddIcon(hImageList, GetIcon(IDI_DELETE));
MsgTreePage.DBToMemToPage();
if (!g_MoreOptPage.GetDBValueCopy(IDC_MOREOPTDLG_RECENTMSGSCOUNT)) // show "Recent messages" group only when RECENTMSGSCOUNT is not set to 0.
TreeView_DeleteItem(hTreeView, TreeCtrl->RootItems[g_Messages_RecentRootID].hItem);
diff --git a/plugins/NewAwaySysMod/src/Properties.h b/plugins/NewAwaySysMod/src/Properties.h
index f9231be443..e31053ef42 100644
--- a/plugins/NewAwaySysMod/src/Properties.h
+++ b/plugins/NewAwaySysMod/src/Properties.h
@@ -98,12 +98,11 @@ private:
#define ILI_SAVEASNEW 20
#define ILI_DELETE 21
#define ILI_SETTINGS 22
-#define ILI_STATUS_OTHER 23
static unsigned Icons[] = {
SKINICON_EVENT_MESSAGE | IL_SKINICON, SKINICON_EVENT_URL | IL_SKINICON, SKINICON_EVENT_FILE | IL_SKINICON,
ID_STATUS_ONLINE | IL_PROTOICON, ID_STATUS_AWAY | IL_PROTOICON, ID_STATUS_NA | IL_PROTOICON, ID_STATUS_OCCUPIED | IL_PROTOICON, ID_STATUS_DND | IL_PROTOICON, ID_STATUS_FREECHAT | IL_PROTOICON, ID_STATUS_INVISIBLE | IL_PROTOICON, ID_STATUS_ONTHEPHONE | IL_PROTOICON, ID_STATUS_OUTTOLUNCH | IL_PROTOICON,
- IDI_DOT, IDI_MSGICON, IDI_IGNORE, IDI_SOE_ENABLED, IDI_SOE_DISABLED, IDI_NEWMESSAGE, IDI_NEWCATEGORY, IDI_SAVE, IDI_SAVEASNEW, IDI_DELETE, IDI_SETTINGS, IDI_STATUS_OTHER
+ IDI_DOT, IDI_MSGICON, IDI_IGNORE, IDI_SOE_ENABLED, IDI_SOE_DISABLED, IDI_NEWMESSAGE, IDI_NEWCATEGORY, IDI_SAVE, IDI_SAVEASNEW, IDI_DELETE, IDI_SETTINGS
};
@@ -132,7 +131,7 @@ public:
else if (Icons[i] & IL_PROTOICON)
IconList.SetAtGrow(i) = (HICON)CopyImage(Skin_LoadProtoIcon(NULL, Icons[i] & ~IL_PROTOICON), IMAGE_ICON, cxIcon, cyIcon, LR_COPYFROMRESOURCE);
else
- IconList.SetAtGrow(i) = (HICON)LoadImage(g_hInstance, MAKEINTRESOURCE(Icons[i]), IMAGE_ICON, cxIcon, cyIcon, 0);
+ IconList.SetAtGrow(i) = (HICON)GetIcon(Icons[i]);
}
}
diff --git a/plugins/NewAwaySysMod/src/SetAwayMsg.cpp b/plugins/NewAwaySysMod/src/SetAwayMsg.cpp
index d974547d69..08a1a30865 100644
--- a/plugins/NewAwaySysMod/src/SetAwayMsg.cpp
+++ b/plugins/NewAwaySysMod/src/SetAwayMsg.cpp
@@ -495,6 +495,9 @@ INT_PTR CALLBACK SetAwayMsgDlgProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARA
SendMessage(hwndDlg, WM_SETICON, ICON_SMALL, (LPARAM)hTitleIcon);
SendDlgItemMessage(hwndDlg, IDC_SAWAYMSG_MSGDATA, EM_LIMITTEXT, AWAY_MSGDATA_MAX, 0);
+ SendDlgItemMessage(hwndDlg, IDC_SAWAYMSG_STATIC_IGNOREICON, STM_SETIMAGE, IMAGE_ICON, (LPARAM)GetIcon(IDI_IGNORE));
+ SendDlgItemMessage(hwndDlg, IDC_SAWAYMSG_STATIC_REPLYICON, STM_SETIMAGE, IMAGE_ICON, (LPARAM)GetIcon(IDI_SOE_ENABLED));
+
// init window size variables / resize the window
RECT rc;
POINT pt;
@@ -860,11 +863,11 @@ INT_PTR CALLBACK SetAwayMsgDlgProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARA
{
// init contact tree
HIMAGELIST hil = ImageList_Create(GetSystemMetrics(SM_CXSMICON), GetSystemMetrics(SM_CYSMICON), ILC_COLOR32 | ILC_MASK, 5, 2);
- ImageList_AddIcon(hil, LoadIcon(g_hInstance, MAKEINTRESOURCE(IDI_DOT)));
- ImageList_AddIcon(hil, LoadIcon(g_hInstance, MAKEINTRESOURCE(IDI_IGNORE)));
- ImageList_AddIcon(hil, LoadIcon(g_hInstance, MAKEINTRESOURCE(IDI_MSGICON)));
- ImageList_AddIcon(hil, LoadIcon(g_hInstance, MAKEINTRESOURCE(IDI_SOE_ENABLED)));
- ImageList_AddIcon(hil, LoadIcon(g_hInstance, MAKEINTRESOURCE(IDI_SOE_DISABLED)));
+ ImageList_AddIcon(hil, GetIcon(IDI_DOT));
+ ImageList_AddIcon(hil, GetIcon(IDI_IGNORE));
+ ImageList_AddIcon(hil, GetIcon(IDI_MSGICON));
+ ImageList_AddIcon(hil, GetIcon(IDI_SOE_ENABLED));
+ ImageList_AddIcon(hil, GetIcon(IDI_SOE_DISABLED));
CList->SetExtraImageList(hil);
HTREEITEM hSelItem;
diff --git a/plugins/NewAwaySysMod/src/resource.h b/plugins/NewAwaySysMod/src/resource.h
index 5d3d715b5b..17b0647bce 100644
--- a/plugins/NewAwaySysMod/src/resource.h
+++ b/plugins/NewAwaySysMod/src/resource.h
@@ -33,6 +33,10 @@
#define IDD_SETAWAYMSG 216
#define IDD_MOREOPTDIALOG 217
#define IDD_POPUPOPTDLG 218
+#define IDC_SI_INDEFINITE 301
+#define IDC_SI_SOE_ENABLED 302
+#define IDC_SI_SOE_DISABLED 303
+#define IDC_SI_IGNORE 304
#define IDC_STATUSBAR 999
#define IDC_SAWAYMSG_MSGNAME 1001
#define IDC_MESSAGEDLG_DEL 1002
diff --git a/plugins/NewAwaySysMod/src/stdafx.h b/plugins/NewAwaySysMod/src/stdafx.h
index b87211b678..8453aa8fae 100644
--- a/plugins/NewAwaySysMod/src/stdafx.h
+++ b/plugins/NewAwaySysMod/src/stdafx.h
@@ -339,3 +339,7 @@ static __inline int my_variables_showhelp(HWND hwndDlg, UINT uIDEdit, int flags
return -1;
}
}
+
+//icons
+extern IconItem iconList[];
+HICON GetIcon(int iconId, bool size = false); \ No newline at end of file
diff --git a/plugins/NewAwaySysMod/src/version.h b/plugins/NewAwaySysMod/src/version.h
index 0076dc1647..1dd0a85c9a 100644
--- a/plugins/NewAwaySysMod/src/version.h
+++ b/plugins/NewAwaySysMod/src/version.h
@@ -1,7 +1,7 @@
#define __MAJOR_VERSION 0
#define __MINOR_VERSION 4
#define __RELEASE_NUM 0
-#define __BUILD_NUM 3
+#define __BUILD_NUM 4
#include <stdver.h>
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-27 10:32:23 +0000