diff options
Diffstat (limited to 'plugins')
| -rw-r--r-- | plugins/Scriver/res/resource.rc | 445 | ||||
| -rw-r--r-- | plugins/Scriver/src/msgoptions.cpp | 81 | ||||
| -rw-r--r-- | plugins/Scriver/src/resource.h | 207 | 
3 files changed, 330 insertions, 403 deletions
| diff --git a/plugins/Scriver/res/resource.rc b/plugins/Scriver/res/resource.rc index f7db02a804..61cc5a7c0c 100644 --- a/plugins/Scriver/res/resource.rc +++ b/plugins/Scriver/res/resource.rc @@ -1,81 +1,70 @@ +// Microsoft Visual C++ generated resource script.
 +//
  #include "..\src\resource.h"
 +
 +#define APSTUDIO_READONLY_SYMBOLS
 +/////////////////////////////////////////////////////////////////////////////
 +//
 +// Generated from the TEXTINCLUDE 2 resource.
 +//
  #include <winres.h>
 -#undef RICHEDIT_CLASS
 +/////////////////////////////////////////////////////////////////////////////
 +#undef APSTUDIO_READONLY_SYMBOLS
 -#define RICHEDIT_CLASS "RichEdit20W"
 +/////////////////////////////////////////////////////////////////////////////
 +// Neutral resources
 -#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU)
 -#ifdef _WIN32
 +#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_NEU)
  LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL
 -#pragma code_page(1252)
 -#endif //_WIN32
 +#pragma code_page(1250)
 +
  /////////////////////////////////////////////////////////////////////////////
  //
  // Dialog
  //
  IDD_OPT_MSGDLG DIALOGEX 2, 0, 304, 230
 -STYLE DS_FIXEDSYS | WS_CHILD | WS_VISIBLE
 +STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_VISIBLE
  EXSTYLE WS_EX_CONTROLPARENT
  FONT 8, "MS Shell Dlg", 0, 0, 0x1
  BEGIN
      GROUPBOX        "Behavior",IDC_STATIC,0,0,304,176
 -    CONTROL         "Automatically pop up the window when",
 -					IDC_AUTOPOPUP,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,8,12,
 -					155,10
 -    CONTROL         "Tree1",IDC_POPLIST,"SysTreeView32",TVS_DISABLEDRAGDROP |
 -					TVS_NOTOOLTIPS | TVS_NONEVENHEIGHT | WS_BORDER |
 -					WS_TABSTOP,163,12,98,44
 -    CONTROL         "and stay minimized",IDC_STAYMINIMIZED,"Button",
 -					BS_AUTOCHECKBOX | WS_TABSTOP,20,23,141,10
 -    CONTROL         "Cascade new windows",IDC_CASCADE,"Button",
 -					BS_AUTOCHECKBOX | WS_TABSTOP,8,58,292,10
 -    CONTROL         "Save size and location for each contact",
 -					IDC_SAVEPERCONTACT,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,
 -					8,69,292,10
 -    CONTROL         "Minimize on send",IDC_AUTOMIN,"Button",
 -					BS_AUTOCHECKBOX | WS_TABSTOP,8,80,292,10
 -    CONTROL         "Hide windows on close",
 -					IDC_HIDECONTAINERS,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,
 -					8,91,292,10
 -    CONTROL         "Send message on 'Enter'",IDC_SENDONENTER,"Button",
 -					BS_AUTOCHECKBOX | WS_TABSTOP,8,102,292,10
 +    CONTROL         "Automatically pop up the window when",IDC_AUTOPOPUP,
 +                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,8,12,155,10
 +    CONTROL         "Tree1",IDC_POPLIST,"SysTreeView32",TVS_DISABLEDRAGDROP | TVS_NOTOOLTIPS | TVS_NONEVENHEIGHT | WS_BORDER | WS_TABSTOP,163,12,98,44
 +    CONTROL         "and stay minimized",IDC_STAYMINIMIZED,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,20,23,141,10
 +    CONTROL         "Cascade new windows",IDC_CASCADE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,8,58,292,10
 +    CONTROL         "Save size and location for each contact",IDC_SAVEPERCONTACT,
 +                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,8,69,292,10
 +    CONTROL         "Minimize on send",IDC_AUTOMIN,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,8,80,292,10
 +    CONTROL         "Hide windows on close",IDC_HIDECONTAINERS,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,8,91,292,10
 +    CONTROL         "Send message on 'Enter'",IDC_SENDONENTER,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,8,102,292,10
      CONTROL         "Send message on double 'Enter'",IDC_SENDONDBLENTER,
                      "Button",BS_AUTOCHECKBOX | WS_TABSTOP,8,113,292,10
 -    CONTROL         "Remember unsent messages",
 -					IDC_SAVEDRAFTS,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,8,
 -					124,292,10
 -    CONTROL         "Delete temporary contacts on closing",
 -					IDC_DELTEMP,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,8,135,
 -					292,10
 -    LTEXT           "Show warning when message has not been received after",
 -					IDC_STATIC,8,148,211,8
 +    CONTROL         "Remember unsent messages",IDC_SAVEDRAFTS,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,8,124,292,10
 +    CONTROL         "Delete temporary contacts on closing",IDC_DELTEMP,
 +                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,8,135,292,10
 +    LTEXT           "Show warning when message has not been received after",IDC_STATIC,8,148,211,8
      EDITTEXT        IDC_SECONDS,223,146,25,12,ES_AUTOHSCROLL
      LTEXT           "seconds",IDC_STATIC,253,148,44,8
 -
  END
  IDD_OPT_MSGTABS DIALOGEX 2, 0, 304, 230
 -STYLE DS_FIXEDSYS | WS_CHILD | WS_VISIBLE
 +STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_VISIBLE
  EXSTYLE WS_EX_CONTROLPARENT
  FONT 8, "MS Shell Dlg", 0, 0, 0x1
  BEGIN
      GROUPBOX        "Tabs",IDC_STATIC,0,0,304,118
 -    CONTROL         "Enable tabs",IDC_USETABS,"Button",BS_AUTOCHECKBOX |
 -					WS_TABSTOP,8,12,260,10
 -    CONTROL         "Always show tab bar",IDC_ALWAYSSHOWTABS,
 -					"Button",BS_AUTOCHECKBOX | WS_TABSTOP,20,23,252,10
 -    CONTROL         "Tabs at the bottom",IDC_TABSATBOTTOM,"Button",
 -					BS_AUTOCHECKBOX | WS_TABSTOP,20,34,252,10
 -    CONTROL         "Limit names on tabs to",IDC_LIMITNAMES,
 -					"Button",BS_AUTOCHECKBOX | WS_TABSTOP,20,45,126,10
 +    CONTROL         "Enable tabs",IDC_USETABS,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,8,12,260,10
 +    CONTROL         "Always show tab bar",IDC_ALWAYSSHOWTABS,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,20,23,252,10
 +    CONTROL         "Tabs at the bottom",IDC_TABSATBOTTOM,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,20,34,252,10
 +    CONTROL         "Limit names on tabs to",IDC_LIMITNAMES,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,20,45,126,10
      EDITTEXT        IDC_LIMITNAMESLEN,212,44,20,12,ES_RIGHT | ES_NUMBER
      LTEXT           "characters",IDC_CHARS,236,45,65,8,WS_DISABLED
      CONTROL         "Show close button on each tab",IDC_TABCLOSEBUTTON,
                      "Button",BS_AUTOCHECKBOX | WS_TABSTOP,20,56,192,10
 -    CONTROL         "Switch to active tab",IDC_SWITCHTOACTIVE,
 -					"Button",BS_AUTOCHECKBOX | WS_TABSTOP,20,67,252,10
 +    CONTROL         "Switch to active tab",IDC_SWITCHTOACTIVE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,20,67,252,10
      CONTROL         "Limit number of tabs per window to",IDC_LIMITTABS,
                      "Button",BS_AUTOCHECKBOX | WS_TABSTOP,20,78,180,10
      EDITTEXT        IDC_LIMITTABSNUM,212,77,20,12,ES_RIGHT | ES_NUMBER
 @@ -87,251 +76,180 @@ BEGIN  END
  IDD_OPT_LAYOUT DIALOGEX 2, 0, 304, 230
 -STYLE DS_FIXEDSYS | WS_CHILD | WS_VISIBLE
 +STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_VISIBLE
  EXSTYLE WS_EX_CONTROLPARENT
  FONT 8, "MS Shell Dlg", 0, 0, 0x1
  BEGIN
      GROUPBOX        "Layout",IDC_STATIC,0,0,304,138
 -    CONTROL         "Show title bar",IDC_SHOWTITLEBAR,"Button",
 -					BS_AUTOCHECKBOX | WS_TABSTOP,8,12,180,10
 -    CONTROL         "Show status bar",IDC_SHOWSTATUSBAR,"Button",
 -					BS_AUTOCHECKBOX | WS_TABSTOP,8,23,180,10
 -    CONTROL         "Show toolbar",IDC_SHOWTOOLBAR,"Button",
 -					BS_AUTOCHECKBOX | WS_TABSTOP,8,34,180,10
 -    CONTROL         "Show info bar",IDC_SHOWINFOBAR,"Button",
 -					BS_AUTOCHECKBOX | WS_TABSTOP,8,45,180,10
 -    CONTROL         "Show avatars", IDC_AVATARSUPPORT,"Button",
 -					BS_AUTOCHECKBOX | WS_TABSTOP,8,56,180,10
 -    CONTROL         "Use the contact's status icon as the window icon",
 -					IDC_STATUSWIN,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,8,67,
 -					292,10
 -    CONTROL         "Show progress indicator",IDC_SHOWPROGRESS,
 -					"Button",BS_AUTOCHECKBOX | WS_TABSTOP,8,78,180,10
 -    CONTROL         "Enable transparency",IDC_TRANSPARENCY,"Button",
 -					BS_AUTOCHECKBOX | WS_TABSTOP,8,95,140,10
 +    CONTROL         "Show title bar",IDC_SHOWTITLEBAR,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,8,12,180,10
 +    CONTROL         "Show status bar",IDC_SHOWSTATUSBAR,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,8,23,180,10
 +    CONTROL         "Show toolbar",IDC_SHOWTOOLBAR,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,8,34,180,10
 +    CONTROL         "Show info bar",IDC_SHOWINFOBAR,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,8,45,180,10
 +    CONTROL         "Show avatars",IDC_AVATARSUPPORT,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,8,56,180,10
 +    CONTROL         "Use the contact's status icon as the window icon",IDC_STATUSWIN,
 +                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,8,67,292,10
 +    CONTROL         "Show progress indicator",IDC_SHOWPROGRESS,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,8,78,180,10
 +    CONTROL         "Enable transparency",IDC_TRANSPARENCY,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,8,95,140,10
      LTEXT           "active",IDC_TRANSPARENCYTEXT1,152,91,36,8
 -    CONTROL         "Slider1",IDC_ATRANSPARENCYVALUE,"msctls_trackbar32",
 -					TBS_BOTH | TBS_NOTICKS | WS_TABSTOP,194,91,70,12
 +    CONTROL         "Slider1",IDC_ATRANSPARENCYVALUE,"msctls_trackbar32",TBS_BOTH | TBS_NOTICKS | WS_TABSTOP,194,91,70,12
      LTEXT           "100%",IDC_ATRANSPARENCYPERC,264,91,30,8
      LTEXT           "inactive",IDC_TRANSPARENCYTEXT2,152,102,36,8
 -    CONTROL         "Slider1",IDC_ITRANSPARENCYVALUE,"msctls_trackbar32",
 -					TBS_BOTH | TBS_NOTICKS | WS_TABSTOP,194,102,70,12
 +    CONTROL         "Slider1",IDC_ITRANSPARENCYVALUE,"msctls_trackbar32",TBS_BOTH | TBS_NOTICKS | WS_TABSTOP,194,102,70,12
      LTEXT           "100%",IDC_ITRANSPARENCYPERC,264,102,30,8
      LTEXT           "Min input area size",IDC_STATIC,8,119,139,8
      EDITTEXT        IDC_INPUTLINES,154,117,30,12,ES_RIGHT | ES_NUMBER
 -    CONTROL         "Spin1",IDC_INPUTLINESSPIN,"msctls_updown32",
 -					UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY |
 -					UDS_ARROWKEYS | UDS_NOTHOUSANDS | UDS_HOTTRACK
 -					,180,116,10,14
 +    CONTROL         "Spin1",IDC_INPUTLINESSPIN,"msctls_updown32",UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | UDS_NOTHOUSANDS | UDS_HOTTRACK,180,116,10,14
      LTEXT           "lines",IDC_STATIC,188,119,43,8
 -
  END
 -
  IDD_OPT_MSGLOG DIALOGEX 2, 0, 304, 232
 -STYLE DS_FIXEDSYS | WS_CHILD | WS_VISIBLE
 +STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_VISIBLE
  EXSTYLE WS_EX_CONTROLPARENT
 -FONT 8, "MS Shell Dlg"
 +FONT 8, "MS Shell Dlg", 0, 0, 0x1
  BEGIN
      GROUPBOX        "Message Window Event Log",IDC_STMSGLOGGROUP,0,0,304,181
 -	 CONTROL         "Enable IEView", IDC_USEIEVIEW, "Button", BS_AUTOCHECKBOX | BS_FLAT |
 -					WS_TABSTOP,8,12,140,10
 -    CONTROL         "Show icons",IDC_SHOWLOGICONS,"Button",BS_AUTOCHECKBOX |
 -					WS_TABSTOP,8,25,140,10
 -    CONTROL         "Show time",IDC_SHOWTIMES,"Button",BS_AUTOCHECKBOX |
 -					WS_TABSTOP,8,36,140,10
 -    CONTROL         "Show seconds",IDC_SHOWSECONDS,"Button",BS_AUTOCHECKBOX |
 -					WS_TABSTOP,16,47,132,10
 -    CONTROL         "Show date",IDC_SHOWDATES,"Button",BS_AUTOCHECKBOX |
 -					WS_TABSTOP,16,58,132,10
 -    CONTROL         "Long date format",IDC_USELONGDATE,"Button",
 -					BS_AUTOCHECKBOX | WS_TABSTOP,25,69,123,10
 -    CONTROL         "Relative date",IDC_USERELATIVEDATE,"Button",
 -					BS_AUTOCHECKBOX | WS_TABSTOP,25,80,123,10
 -    CONTROL         "Show names",IDC_SHOWNAMES,"Button",BS_AUTOCHECKBOX |
 -					WS_TABSTOP,160,25,140,10
 -    CONTROL         "Enable message grouping",IDC_GROUPMESSAGES,"Button",
 -					BS_AUTOCHECKBOX | WS_TABSTOP,160,36,140,10
 +    CONTROL         "Enable IEView",IDC_USEIEVIEW,"Button",BS_AUTOCHECKBOX | BS_FLAT | WS_TABSTOP,8,12,140,10
 +    CONTROL         "Show icons",IDC_SHOWLOGICONS,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,8,25,140,10
 +    CONTROL         "Show time",IDC_SHOWTIMES,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,8,36,140,10
 +    CONTROL         "Show seconds",IDC_SHOWSECONDS,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,16,47,132,10
 +    CONTROL         "Show date",IDC_SHOWDATES,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,16,58,132,10
 +    CONTROL         "Long date format",IDC_USELONGDATE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,25,69,123,10
 +    CONTROL         "Relative date",IDC_USERELATIVEDATE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,25,80,123,10
 +    CONTROL         "Show names",IDC_SHOWNAMES,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,160,25,140,10
 +    CONTROL         "Enable message grouping",IDC_GROUPMESSAGES,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,160,36,140,10
      CONTROL         "Mark follow-up msgs with timestamp",IDC_MARKFOLLOWUPS,
                      "Button",BS_AUTOCHECKBOX | WS_TABSTOP,168,47,132,10
      CONTROL         "Start message text on a new line",IDC_MESSAGEONNEWLINE,
                      "Button",BS_AUTOCHECKBOX | WS_TABSTOP,160,58,140,10
 -    CONTROL         "Show lines between messages",IDC_DRAWLINES,"Button",
 -					BS_AUTOCHECKBOX | WS_TABSTOP,160,69,120,10
 +    CONTROL         "Show lines between messages",IDC_DRAWLINES,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,160,69,120,10
      CONTROL         "",IDC_LINECOLOUR,"ColourPicker",WS_TABSTOP,280,69,16,11
 -    CONTROL         "Indent text",IDC_INDENTTEXT,"Button",
 -					BS_AUTOCHECKBOX | WS_TABSTOP,160,80,102,10
 -    EDITTEXT        IDC_INDENTSIZE,262,79,33,12,ES_RIGHT | ES_NUMBER |
 -					WS_DISABLED
 -    CONTROL         "Spin1",IDC_INDENTSPIN,"msctls_updown32",
 -					UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY |
 -					UDS_ARROWKEYS | UDS_NOTHOUSANDS | UDS_HOTTRACK |
 -					WS_DISABLED,290,79,10,12
 -    CONTROL         "Customize fonts and colors",IDC_FONTSCOLORS,"Hyperlink", 0,8,91,200,8
 -    CONTROL         "",IDC_LOG,RICHEDIT_CLASS, WS_VSCROLL |
 -                    WS_TABSTOP | ES_MULTILINE | ES_AUTOVSCROLL | ES_READONLY,8,105,288,68,WS_EX_STATICEDGE
 -
 +    CONTROL         "Indent text",IDC_INDENTTEXT,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,160,80,102,10
 +    EDITTEXT        IDC_INDENTSIZE,262,79,33,12,ES_RIGHT | ES_NUMBER | WS_DISABLED
 +    CONTROL         "Spin1",IDC_INDENTSPIN,"msctls_updown32",UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | UDS_NOTHOUSANDS | UDS_HOTTRACK | WS_DISABLED,290,79,10,12
 +    CONTROL         "Customize fonts and colors",IDC_FONTSCOLORS,"Hyperlink",0x0,8,91,200,8
 +    CONTROL         "",IDC_LOG,"RichEdit20W",ES_MULTILINE | ES_AUTOVSCROLL | ES_READONLY | WS_VSCROLL | WS_TABSTOP,8,105,288,68,WS_EX_STATICEDGE
      GROUPBOX        "Preload",IDC_STATIC,0,181,304,50
 -    CONTROL         "Unread events only",IDC_LOADUNREAD,"Button",
 -					BS_AUTORADIOBUTTON | WS_TABSTOP,8,192,138,10
 -    CONTROL         "Last",IDC_LOADCOUNT,"Button",
 -					BS_AUTORADIOBUTTON | WS_TABSTOP,8,204,138,10
 -    CONTROL         "Events in the last",IDC_LOADTIME,"Button",
 -					BS_AUTORADIOBUTTON | WS_TABSTOP,8,216,138,10
 -    EDITTEXT        IDC_LOADCOUNTN,148,202,33,12,ES_RIGHT | ES_NUMBER |
 -					WS_DISABLED
 -    CONTROL         "Spin1",IDC_LOADCOUNTSPIN,"msctls_updown32",
 -					UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY |
 -					UDS_ARROWKEYS | UDS_NOTHOUSANDS | UDS_HOTTRACK |
 -					WS_DISABLED,170,201,10,14
 -    LTEXT           "events",IDC_LOADCOUNTTEXT2,185,202,90,8
 -    EDITTEXT        IDC_LOADTIMEN,148,215,33,12,ES_RIGHT | ES_NUMBER |
 -					WS_DISABLED
 -    CONTROL         "Spin1",IDC_LOADTIMESPIN,"msctls_updown32",
 -					UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY |
 -					UDS_ARROWKEYS | UDS_NOTHOUSANDS | UDS_HOTTRACK |
 -					WS_DISABLED,170,214,10,14
 +    CONTROL         "Unread events only",IDC_LOADUNREAD,"Button",BS_AUTORADIOBUTTON | WS_TABSTOP,8,192,138,10
 +    CONTROL         "Last",IDC_LOADCOUNT,"Button",BS_AUTORADIOBUTTON | WS_TABSTOP,8,204,138,10
 +    CONTROL         "Events in the last",IDC_LOADTIME,"Button",BS_AUTORADIOBUTTON | WS_TABSTOP,8,216,138,10
 +    EDITTEXT        IDC_LOADCOUNTN,148,202,33,12,ES_RIGHT | ES_NUMBER | WS_DISABLED
 +    CONTROL         "Spin1",IDC_LOADCOUNTSPIN,"msctls_updown32",UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | UDS_NOTHOUSANDS | UDS_HOTTRACK | WS_DISABLED,170,201,10,14
 +    LTEXT           "events",IDC_LOADCOUNTTEXT2,185,202,90,8,WS_DISABLED
 +    EDITTEXT        IDC_LOADTIMEN,148,215,33,12,ES_RIGHT | ES_NUMBER | WS_DISABLED
 +    CONTROL         "Spin1",IDC_LOADTIMESPIN,"msctls_updown32",UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | UDS_NOTHOUSANDS | UDS_HOTTRACK | WS_DISABLED,170,214,10,14
      LTEXT           "minutes",IDC_STMINSOLD,185,216,90,8,WS_DISABLED
  END
 -
  IDD_OPT_MSGTYPE DIALOGEX 0, 0, 283, 252
 -STYLE DS_FIXEDSYS | WS_CHILD | WS_VISIBLE
 +STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_VISIBLE
  EXSTYLE WS_EX_CONTROLPARENT
  FONT 8, "MS Shell Dlg", 0, 0, 0x1
  BEGIN
      GROUPBOX        "Typing Notification Options",IDC_STATIC,7,4,269,244
 -    LTEXT           "Send typing notifications to the following users when you are typing a message to them:",
 -					IDC_STATIC,19,18,245,19
 -    CONTROL         "",IDC_CLIST,"CListControl",WS_TABSTOP | 0x348,18,37,248,
 -					130,WS_EX_CLIENTEDGE
 -    CONTROL         "Show typing notification switch in the status bar",
 -					IDC_TYPINGSWITCH,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,18,
 -					170,247,13
 -    CONTROL         "Show typing notifications when a user is typing a message",
 -					IDC_SHOWNOTIFY,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,18,
 -					182,247,13
 -    CONTROL         "Update message window icons when a user is typing",
 -					IDC_TYPEWIN,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,29,197,
 -					235,10
 -    CONTROL         "Show typing notification when no message dialog is open",
 -					IDC_TYPETRAY,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,29,
 -					210,235,10
 -    CONTROL         "Flash in the system tray and in the contact list",
 -					IDC_NOTIFYTRAY,"Button",BS_AUTORADIOBUTTON,44,223,221,10
 -    CONTROL         "Show balloon popup",IDC_NOTIFYBALLOON,"Button",
 -					BS_AUTORADIOBUTTON,44,235,224,10
 +    LTEXT           "Send typing notifications to the following users when you are typing a message to them:",IDC_STATIC,19,18,245,19
 +    CONTROL         "",IDC_CLIST,"CListControl",WS_TABSTOP | 0x348,18,37,248,130,WS_EX_CLIENTEDGE
 +    CONTROL         "Show typing notification switch in the status bar",IDC_TYPINGSWITCH,
 +                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,18,170,247,13
 +    CONTROL         "Show typing notifications when a user is typing a message",IDC_SHOWNOTIFY,
 +                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,18,182,247,13
 +    CONTROL         "Update message window icons when a user is typing",IDC_TYPEWIN,
 +                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,29,197,235,10
 +    CONTROL         "Show typing notification when no message dialog is open",IDC_TYPETRAY,
 +                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,29,210,235,10
 +    CONTROL         "Flash in the system tray and in the contact list",IDC_NOTIFYTRAY,
 +                    "Button",BS_AUTORADIOBUTTON,44,223,221,10
 +    CONTROL         "Show balloon popup",IDC_NOTIFYBALLOON,"Button",BS_AUTORADIOBUTTON,44,235,224,10
  END
 -
 -IDD_MSGSENDERROR DIALOG DISCARDABLE  0, 0, 187, 110
 -STYLE DS_MODALFRAME | DS_SETFOREGROUND | DS_3DLOOK | DS_FIXEDSYS | DS_CENTER |
 -    WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
 +IDD_MSGSENDERROR DIALOG 0, 0, 187, 110
 +STYLE DS_SETFONT | DS_MODALFRAME | DS_SETFOREGROUND | DS_3DLOOK | DS_FIXEDSYS | DS_CENTER | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
  CAPTION "Send Error"
  FONT 8, "MS Shell Dlg"
  BEGIN
 -    LTEXT           "An error has occurred. The protocol reported the following error:",
 -                    IDC_STATIC,5,4,177,20
 +    LTEXT           "An error has occurred. The protocol reported the following error:",IDC_STATIC,5,4,177,20
      EDITTEXT        IDC_ERRORTEXT,5,24,177,21,ES_MULTILINE | ES_READONLY
 -    LTEXT           "while sending the following message:",IDC_STATIC,6,48,
 -                    175,8
 -    CONTROL         "",IDC_MSGTEXT,RICHEDIT_CLASS,WS_CLIPSIBLINGS | WS_VSCROLL |
 -                    WS_TABSTOP | ES_MULTILINE | ES_AUTOVSCROLL | ES_READONLY,5,60,177,26,WS_EX_STATICEDGE
 +    LTEXT           "while sending the following message:",IDC_STATIC,6,48,175,8
 +    CONTROL         "",IDC_MSGTEXT,"RichEdit20W",WS_CLIPSIBLINGS | WS_VSCROLL | WS_TABSTOP | 0x844,5,60,177,26,WS_EX_STATICEDGE
      DEFPUSHBUTTON   "Try again",IDOK,22,91,63,14
      PUSHBUTTON      "Cancel",IDCANCEL,104,91,61,14
  END
  IDD_MSGWIN DIALOGEX 0, 0, 300, 200
 -STYLE DS_3DLOOK | DS_FIXEDSYS |
 -    WS_MINIMIZEBOX | WS_MAXIMIZEBOX | WS_CAPTION | WS_SYSMENU |
 -    WS_THICKFRAME | WS_DISABLED  | NOT WS_VISIBLE
 +STYLE DS_SETFONT | DS_3DLOOK | DS_FIXEDSYS | WS_MINIMIZEBOX | WS_MAXIMIZEBOX | WS_DISABLED | WS_CAPTION | WS_SYSMENU | WS_THICKFRAME
  EXSTYLE WS_EX_ACCEPTFILES
  CAPTION "Message Session"
  FONT 8, "MS Shell Dlg", 0, 0, 0x1
  BEGIN
 -    CONTROL         "",IDC_TABS,"SysTabControl32",TCS_MULTILINE |
 -                    TCS_FOCUSNEVER | WS_CLIPSIBLINGS,0,0,300,200
 +    CONTROL         "",IDC_TABS,"SysTabControl32",TCS_MULTILINE | TCS_FOCUSNEVER | WS_CLIPSIBLINGS,0,0,300,200
  END
  IDD_INFOBAR DIALOGEX 0, 0, 184, 100
 -STYLE DS_FIXEDSYS | DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN
 +STYLE DS_SETFONT | DS_FIXEDSYS | DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN
  EXSTYLE WS_EX_ACCEPTFILES | WS_EX_STATICEDGE
  FONT 8, "MS Shell Dlg", 0, 0, 0x1
  BEGIN
 -    CONTROL         "",IDC_INFOBAR_NAME,RICHEDIT_CLASS,WS_CLIPSIBLINGS |
 -                    ES_READONLY | NOT WS_BORDER,0,0,129,20
 -    CONTROL         "",IDC_INFOBAR_STATUS,RICHEDIT_CLASS,WS_CLIPSIBLINGS |
 -                    ES_MULTILINE | ES_READONLY | NOT WS_BORDER,0,20,139,20
 -    ICON			0, IDC_XSTATUSICON, 130, 0, 10, 10
 -    CONTROL         "",IDC_AVATAR,"Static", SS_OWNERDRAW,140,0,40,40
 +    CONTROL         "",IDC_INFOBAR_NAME,"RichEdit20W",WS_CLIPSIBLINGS | 0x800,0,0,129,20
 +    CONTROL         "",IDC_INFOBAR_STATUS,"RichEdit20W",WS_CLIPSIBLINGS | 0x804,0,20,139,20
 +    ICON            0,IDC_XSTATUSICON,130,0,10,10
 +    CONTROL         "",IDC_AVATAR,"Static",SS_OWNERDRAW,140,0,40,40
  END
  IDD_MSG DIALOGEX 0, 0, 184, 100
 -STYLE DS_FIXEDSYS | DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN
 +STYLE DS_SETFONT | DS_FIXEDSYS | DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN
  EXSTYLE WS_EX_ACCEPTFILES
  FONT 8, "MS Shell Dlg", 0, 0, 0x1
  BEGIN
 -//    CONTROL         "",IDC_INFOBAR,"Static", SS_OWNERDRAW,0,0,184,40
 -    CONTROL         "",IDC_LOG,RICHEDIT_CLASS,WS_CLIPSIBLINGS | WS_VSCROLL |
 -                    WS_TABSTOP | ES_MULTILINE | ES_AUTOVSCROLL | ES_READONLY,1,41,181,28,WS_EX_STATICEDGE
 -    CONTROL         "",IDC_MESSAGE,RICHEDIT_CLASS,WS_VSCROLL | WS_TABSTOP |
 -                    ES_MULTILINE | ES_AUTOVSCROLL | ES_NOHIDESEL | ES_WANTRETURN,0,87,181,13,WS_EX_ACCEPTFILES | WS_EX_STATICEDGE
 -    CONTROL         "&User menu",IDC_USERMENU,"MButtonClass",0x0,1,71,16,14,
 -					0x18000000L
 -    CONTROL         "User &details",IDC_DETAILS,"MButtonClass",0x0,17,71,16,14,
 -					0x18000000L
 -    CONTROL         "&Emoticons",IDC_SMILEYS,"MButtonClass",0x0,41,71,16,14,
 -					0x18000000L
 -    CONTROL         "&Add",IDC_ADD,"MButtonClass",0x0,110,71,16,14,0x18000000L
 -    CONTROL         "&History",IDC_HISTORY,"MButtonClass",0x0,130,71,16,14,
 -					0x18000000L
 -    CONTROL         "&Quote",IDC_QUOTE,"MButtonClass",0x0,130,71,16,14,
 -					0x18000000L
 -    CONTROL         "&OK",IDOK,"MButtonClass",0x0,162,71,20,14,0x18000000L
 +    CONTROL         "",IDC_LOG,"RichEdit20W",WS_CLIPSIBLINGS | WS_VSCROLL | WS_TABSTOP | 0x844,1,41,181,28,WS_EX_STATICEDGE
 +    CONTROL         "",IDC_MESSAGE,"RichEdit20W",WS_VSCROLL | WS_TABSTOP | 0x1144,0,87,181,13,WS_EX_ACCEPTFILES | WS_EX_STATICEDGE
 +    CONTROL         "&User menu",IDC_USERMENU,"MButtonClass",0x0,1,71,16,14,WS_EX_NOACTIVATE | 0x10000000L
 +    CONTROL         "User &details",IDC_DETAILS,"MButtonClass",0x0,17,71,16,14,WS_EX_NOACTIVATE | 0x10000000L
 +    CONTROL         "&Emoticons",IDC_SMILEYS,"MButtonClass",0x0,41,71,16,14,WS_EX_NOACTIVATE | 0x10000000L
 +    CONTROL         "&Add",IDC_ADD,"MButtonClass",0x0,110,71,16,14,WS_EX_NOACTIVATE | 0x10000000L
 +    CONTROL         "&History",IDC_HISTORY,"MButtonClass",0x0,130,71,16,14,WS_EX_NOACTIVATE | 0x10000000L
 +    CONTROL         "&Quote",IDC_QUOTE,"MButtonClass",0x0,130,71,16,14,WS_EX_NOACTIVATE | 0x10000000L
 +    CONTROL         "&OK",IDOK,"MButtonClass",0x0,162,71,20,14,WS_EX_NOACTIVATE | 0x10000000L
      CONTROL         "",IDC_SPLITTER,"Static",SS_ENHMETAFILE | WS_CLIPSIBLINGS,0,85,183,2
 -    CONTROL         "",IDC_AVATAR,"Static", SS_OWNERDRAW,180,80,0,0
 +    CONTROL         "",IDC_AVATAR,"Static",SS_OWNERDRAW,180,80,0,0
  END
  IDD_CONFIRM_SENDALL DIALOGEX 0, 0, 220, 80
 -STYLE DS_SETFONT | DS_3DLOOK | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION
 +STYLE DS_SETFONT | DS_MODALFRAME | DS_3DLOOK | DS_FIXEDSYS | WS_POPUP | WS_CAPTION
  CAPTION "Send To All Tabs"
  FONT 8, "MS Shell Dlg", 0, 0, 0x1
  BEGIN
 -    ICON            IDI_QUESTION, IDC_STATIC, 10, 10, 21, 21
 -    LTEXT           "You are about to send a message to all open tabs.\nAre you sure?",
 -                    IDC_STATIC,40,10,175,20
 -    CONTROL         "Remember my choice for this container",
 -                    IDC_REMEMBER,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,40,39,
 -                    175,10
 +    ICON            32514,IDC_STATIC,10,10,21,21
 +    LTEXT           "You are about to send a message to all open tabs.\nAre you sure?",IDC_STATIC,40,10,175,20
 +    CONTROL         "Remember my choice for this container",IDC_REMEMBER,
 +                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,40,39,175,10
      DEFPUSHBUTTON   "Yes",IDYES,20,58,60,14
      PUSHBUTTON      "No",IDCANCEL,141,58,60,14
  END
  IDD_CHANNEL DIALOGEX 0, 0, 252, 140
 -STYLE DS_FIXEDSYS | DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN
 +STYLE DS_SETFONT | DS_FIXEDSYS | DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN
  FONT 8, "MS Shell Dlg", 0, 0, 0x1
  BEGIN
 -    CONTROL         "",IDC_CHAT_MESSAGE,RICHEDIT_CLASS,ES_MULTILINE | ES_AUTOVSCROLL | ES_NOHIDESEL | ES_WANTRETURN | WS_VSCROLL | WS_TABSTOP,0,128,127,12,WS_EX_STATICEDGE
 -    CONTROL         "&Emoticons",IDC_CHAT_SMILEY,"MButtonClass",WS_DISABLED | WS_TABSTOP,8,108,15,13,0x18000000L
 -    CONTROL         "&Bold",IDC_CHAT_BOLD,"MButtonClass",WS_DISABLED | WS_TABSTOP,24,108,15,13,0x18000000L
 -    CONTROL         "&Italic",IDC_CHAT_ITALICS,"MButtonClass",WS_DISABLED | WS_TABSTOP,36,108,15,13,0x18000000L
 -    CONTROL         "&Underline",IDC_CHAT_UNDERLINE,"MButtonClass",WS_DISABLED | WS_TABSTOP,52,108,15,13,0x18000000L
 -    CONTROL         "&Color",IDC_CHAT_COLOR,"MButtonClass",WS_DISABLED | WS_TABSTOP,80,108,15,13,0x18000000L
 -    CONTROL         "&Background color",IDC_CHAT_BKGCOLOR,"MButtonClass",WS_DISABLED | WS_TABSTOP,96,108,15,13,0x18000000L
 -  //  COMBOBOX        IDC_CHAT_FONTSIZE,112,108,27,80,CBS_DROPDOWNLIST | WS_DISABLED | WS_VSCROLL | WS_TABSTOP
 -    CONTROL         "&History",IDC_CHAT_HISTORY,"MButtonClass",WS_TABSTOP,188,108,15,13,0x18000000L
 -    CONTROL         "&OK",IDOK,"MButtonClass",0x0,162,71,20,14,0x18000000L
 -    CONTROL         "&Filter",IDC_CHAT_FILTER,"MButtonClass",WS_TABSTOP,220,108,15,13,0x18000000L
 -    CONTROL         "&Room Settings",IDC_CHAT_CHANMGR,"MButtonClass",WS_DISABLED | WS_TABSTOP,204,108,15,13,0x18000000L
 -    CONTROL         "&Show/hide nick list",IDC_CHAT_SHOWNICKLIST,"MButtonClass",WS_TABSTOP,236,108,15,13,0x18000000L
 -    CONTROL         "",IDC_CHAT_LOG,RICHEDIT_CLASS,ES_MULTILINE | ES_AUTOVSCROLL | ES_READONLY | WS_VSCROLL | WS_TABSTOP,8,23,164,73,WS_EX_STATICEDGE
 +    CONTROL         "",IDC_CHAT_MESSAGE,"RichEdit20W",WS_VSCROLL | WS_TABSTOP | 0x1144,0,128,127,12,WS_EX_STATICEDGE
 +    CONTROL         "&Emoticons",IDC_CHAT_SMILEY,"MButtonClass",WS_DISABLED | WS_TABSTOP,8,108,15,13,WS_EX_NOACTIVATE | 0x10000000L
 +    CONTROL         "&Bold",IDC_CHAT_BOLD,"MButtonClass",WS_DISABLED | WS_TABSTOP,24,108,15,13,WS_EX_NOACTIVATE | 0x10000000L
 +    CONTROL         "&Italic",IDC_CHAT_ITALICS,"MButtonClass",WS_DISABLED | WS_TABSTOP,36,108,15,13,WS_EX_NOACTIVATE | 0x10000000L
 +    CONTROL         "&Underline",IDC_CHAT_UNDERLINE,"MButtonClass",WS_DISABLED | WS_TABSTOP,52,108,15,13,WS_EX_NOACTIVATE | 0x10000000L
 +    CONTROL         "&Color",IDC_CHAT_COLOR,"MButtonClass",WS_DISABLED | WS_TABSTOP,80,108,15,13,WS_EX_NOACTIVATE | 0x10000000L
 +    CONTROL         "&Background color",IDC_CHAT_BKGCOLOR,"MButtonClass",WS_DISABLED | WS_TABSTOP,96,108,15,13,WS_EX_NOACTIVATE | 0x10000000L
 +    CONTROL         "&History",IDC_CHAT_HISTORY,"MButtonClass",WS_TABSTOP,188,108,15,13,WS_EX_NOACTIVATE | 0x10000000L
 +    CONTROL         "&OK",IDOK,"MButtonClass",0x0,162,71,20,14,WS_EX_NOACTIVATE | 0x10000000L
 +    CONTROL         "&Filter",IDC_CHAT_FILTER,"MButtonClass",WS_TABSTOP,220,108,15,13,WS_EX_NOACTIVATE | 0x10000000L
 +    CONTROL         "&Room Settings",IDC_CHAT_CHANMGR,"MButtonClass",WS_DISABLED | WS_TABSTOP,204,108,15,13,WS_EX_NOACTIVATE | 0x10000000L
 +    CONTROL         "&Show/hide nick list",IDC_CHAT_SHOWNICKLIST,
 +                    "MButtonClass",WS_TABSTOP,236,108,15,13,WS_EX_NOACTIVATE | 0x10000000L
 +    CONTROL         "",IDC_CHAT_LOG,"RichEdit20W",WS_VSCROLL | WS_TABSTOP | 0x844,8,23,164,73,WS_EX_STATICEDGE
      CONTROL         "",IDC_CHAT_SPLITTERX,"Static",SS_ENHMETAFILE,172,23,10,73
      CONTROL         "",IDC_CHAT_SPLITTERY,"Static",SS_ENHMETAFILE,0,102,251,6
      LISTBOX         IDC_CHAT_LIST,182,23,69,73,LBS_OWNERDRAWFIXED | LBS_HASSTRINGS | LBS_NOINTEGRALHEIGHT | NOT WS_BORDER | WS_VSCROLL | WS_TABSTOP,WS_EX_STATICEDGE
  END
  IDD_FILTER DIALOGEX 0, 0, 83, 125
 -STYLE DS_FIXEDSYS | DS_SETFONT | WS_POPUP | WS_BORDER
 +STYLE DS_SETFONT | DS_FIXEDSYS | WS_POPUP | WS_BORDER
  EXSTYLE WS_EX_CONTROLPARENT
  FONT 8, "MS Shell Dlg", 0, 0, 0x1
  BEGIN
 @@ -351,7 +269,7 @@ BEGIN  END
  IDD_OPTIONS1 DIALOGEX 2, 0, 304, 232
 -STYLE DS_FIXEDSYS | DS_SETFONT | WS_CHILD | WS_VISIBLE
 +STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_VISIBLE
  EXSTYLE WS_EX_CONTROLPARENT
  FONT 8, "MS Shell Dlg", 0, 0, 0x1
  BEGIN
 @@ -367,7 +285,7 @@ BEGIN  END
  IDD_OPTIONS2 DIALOGEX 2, 0, 304, 232
 -STYLE DS_FIXEDSYS | DS_SETFONT | WS_CHILD | WS_VISIBLE
 +STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_VISIBLE
  EXSTYLE WS_EX_CONTROLPARENT
  FONT 8, "MS Shell Dlg", 0, 0, 0x1
  BEGIN
 @@ -400,23 +318,24 @@ BEGIN  END
  IDD_OPTIONSPOPUP DIALOGEX 0, 0, 304, 232
 -STYLE DS_FIXEDSYS | DS_SETFONT | WS_POPUP | WS_VISIBLE
 +STYLE DS_SETFONT | DS_FIXEDSYS | WS_POPUP | WS_VISIBLE
  EXSTYLE WS_EX_CONTROLPARENT
  FONT 8, "MS Shell Dlg", 0, 0, 0x1
  BEGIN
      GROUPBOX        "Group Chat",IDC_STATIC,0,0,304,229
      CONTROL         "Tree1",IDC_CHAT_CHECKBOXES,"SysTreeView32",TVS_HASBUTTONS | TVS_HASLINES | TVS_DISABLEDRAGDROP | TVS_FULLROWSELECT | WS_BORDER | WS_TABSTOP,8,12,288,132
 -    CONTROL         "Use same style as in the message log",IDC_CHAT_RADIO1,"Button",BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP,8,149,225,10
 +    CONTROL         "Use same style as in the message log",IDC_CHAT_RADIO1,
 +                    "Button",BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP,8,149,225,10
      CONTROL         "Use default colors",IDC_CHAT_RADIO2,"Button",BS_AUTORADIOBUTTON,8,160,200,10
      CONTROL         "Use custom colors",IDC_CHAT_RADIO3,"Button",BS_AUTORADIOBUTTON,8,171,200,10
      LTEXT           "Text",IDC_STATIC,20,182,200,8
 -    CONTROL         "Custom1",IDC_CHAT_TEXT,"ColourPicker",WS_TABSTOP,120,182,40,11,0x18000000L
 +    CONTROL         "Custom1",IDC_CHAT_TEXT,"ColourPicker",WS_TABSTOP,120,182,40,11,WS_EX_NOACTIVATE | 0x10000000L
      LTEXT           "Background",IDC_STATIC,20,194,67,8
 -    CONTROL         "Custom2",IDC_CHAT_BKG,"ColourPicker",WS_TABSTOP,120,194,40,11,0x18000000L
 +    CONTROL         "Custom2",IDC_CHAT_BKG,"ColourPicker",WS_TABSTOP,120,194,40,11,WS_EX_NOACTIVATE | 0x10000000L
      LTEXT           "Timeout (s)",IDC_STATIC,8,213,92,8
      EDITTEXT        IDC_CHAT_TIMEOUT,125,209,30,12,ES_RIGHT | ES_AUTOHSCROLL | ES_NUMBER
      CONTROL         "Spin1",IDC_CHAT_SPIN1,"msctls_updown32",UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | UDS_NOTHOUSANDS | UDS_HOTTRACK,155,210,11,12
 -    LTEXT           "(0 means default setting, -1 means indefinite time)",IDC_STATIC,170, 208, 130, 19
 +    LTEXT           "(0 means default setting, -1 means indefinite time)",IDC_STATIC,170,208,130,19
  END
  IDD_COLORCHOOSER DIALOGEX 0, 0, 198, 150
 @@ -428,13 +347,14 @@ BEGIN      CTEXT           "",IDC_CHAT_COLORTEXT,0,0,197,12,SS_CENTERIMAGE
  END
 +
  /////////////////////////////////////////////////////////////////////////////
  //
  // DESIGNINFO
  //
  #ifdef APSTUDIO_INVOKED
 -GUIDELINES DESIGNINFO DISCARDABLE
 +GUIDELINES DESIGNINFO
  BEGIN
      IDD_OPT_MSGDLG, DIALOG
      BEGIN
 @@ -445,23 +365,6 @@ BEGIN          VERTGUIDE, 300
      END
 -    IDD_MSGSENDERROR, DIALOG
 -    BEGIN
 -        LEFTMARGIN, 5
 -        RIGHTMARGIN, 182
 -        TOPMARGIN, 5
 -        BOTTOMMARGIN, 105
 -    END
 -
 -    IDD_MSG, DIALOG
 -    BEGIN
 -        LEFTMARGIN, 5
 -        RIGHTMARGIN, 179
 -        TOPMARGIN, 5
 -        HORZGUIDE, 16
 -        HORZGUIDE, 53
 -    END
 -
      IDD_OPT_MSGLOG, DIALOG
      BEGIN
          VERTGUIDE, 10
 @@ -482,6 +385,23 @@ BEGIN          TOPMARGIN, 7
          BOTTOMMARGIN, 245
      END
 +
 +    IDD_MSGSENDERROR, DIALOG
 +    BEGIN
 +        LEFTMARGIN, 5
 +        RIGHTMARGIN, 182
 +        TOPMARGIN, 5
 +        BOTTOMMARGIN, 105
 +    END
 +
 +    IDD_MSG, DIALOG
 +    BEGIN
 +        LEFTMARGIN, 5
 +        RIGHTMARGIN, 179
 +        TOPMARGIN, 5
 +        HORZGUIDE, 16
 +        HORZGUIDE, 53
 +    END
  END
  #endif    // APSTUDIO_INVOKED
 @@ -492,18 +412,18 @@ END  // TEXTINCLUDE
  //
 -1 TEXTINCLUDE
 +1 TEXTINCLUDE 
  BEGIN
      "..\\src\\resource.h\0"
  END
 -2 TEXTINCLUDE
 +2 TEXTINCLUDE 
  BEGIN
      "#include <winres.h>\r\n"
      "\0"
  END
 -3 TEXTINCLUDE
 +3 TEXTINCLUDE 
  BEGIN
      "\r\n"
      "\0"
 @@ -534,7 +454,6 @@ IDI_INCOMING            ICON                    "message.ico"  IDI_OUTGOING            ICON                    "messageout.ico"
  IDI_NOTICE              ICON                    "highlight.ico"
  IDI_CLOSEX              ICON                    "closex.ico"
 -// chat icons
  IDI_BUNDERLINE          ICON                    "chat/underline.ico"
  IDI_BBOLD               ICON                    "chat/bold.ico"
  IDI_BITALICS            ICON                    "chat/italic.ico"
 @@ -564,7 +483,6 @@ IDI_STATUS5             ICON                    "chat/6.ico"  IDI_OVERLAY             ICON                    "chat/overlay.ico"
  IDI_NICKLIST2           ICON                    "chat/nicklist2.ico"
  IDI_FILTER2             ICON                    "chat/filter2.ico"
 -
  IDI_GOOGLE              ICON                    "google.ico"
  IDI_BING                ICON                    "bing.ico"
  IDI_YANDEX              ICON                    "yandex.ico"
 @@ -574,7 +492,6 @@ IDI_GOOGLE_TRANSLATE    ICON                    "gtranslate.ico"  IDI_YAHOO               ICON                    "yahoo.ico"
  IDI_FOODNETWORK         ICON                    "foodnetwork.ico"
 -
  /////////////////////////////////////////////////////////////////////////////
  //
  // Cursor
 @@ -601,14 +518,14 @@ BEGIN          BEGIN
              MENUITEM "Google",                      IDM_SEARCH_GOOGLE
              MENUITEM "Bing",                        IDM_SEARCH_BING
 -            MENUITEM "Yandex",                        IDM_SEARCH_YANDEX
 -            MENUITEM "Wikipedia (en)",          IDM_SEARCH_WIKIPEDIA
 -	        MENUITEM SEPARATOR
 -            MENUITEM "Google Maps",             IDM_SEARCH_GOOGLE_MAPS
 -            MENUITEM "Google Translate",        IDM_SEARCH_GOOGLE_TRANSLATE
 -	        MENUITEM SEPARATOR
 +            MENUITEM "Yandex",                      IDM_SEARCH_YANDEX
 +            MENUITEM "Wikipedia (en)",              IDM_SEARCH_WIKIPEDIA
 +            MENUITEM SEPARATOR
 +            MENUITEM "Google Maps",                 IDM_SEARCH_GOOGLE_MAPS
 +            MENUITEM "Google Translate",            IDM_SEARCH_GOOGLE_TRANSLATE
 +            MENUITEM SEPARATOR
              MENUITEM "Yahoo",                       IDM_SEARCH_YAHOO
 -            MENUITEM "Foodnetwork",             IDM_SEARCH_FOODNETWORK
 +            MENUITEM "Foodnetwork",                 IDM_SEARCH_FOODNETWORK
          END
          MENUITEM SEPARATOR
          MENUITEM "C&lear Log",                  IDM_CLEAR
 @@ -635,7 +552,6 @@ BEGIN      END
      POPUP "Tabs"
      BEGIN
 -//        MENUITEM SEPARATOR
          MENUITEM "Close Other Tabs",            IDM_CLOSEOTHERTABS
          MENUITEM "Close Tab",                   IDM_CLOSETAB
      END
 @@ -655,22 +571,21 @@ BEGIN          MENUITEM SEPARATOR
          POPUP "Word lookup", GRAYED
          BEGIN
 -            MENUITEM "Google",                  IDM_SEARCH_GOOGLE
 -            MENUITEM "Bing",                    IDM_SEARCH_BING
 -            MENUITEM "Yandex",                    IDM_SEARCH_YANDEX
 -            MENUITEM "Wikipedia (en)",          IDM_SEARCH_WIKIPEDIA
 -	        MENUITEM SEPARATOR
 -            MENUITEM "Google Maps",             IDM_SEARCH_GOOGLE_MAPS
 -            MENUITEM "Google Translate",        IDM_SEARCH_GOOGLE_TRANSLATE
 -	        MENUITEM SEPARATOR
 -            MENUITEM "Yahoo",                   IDM_SEARCH_YAHOO
 -            MENUITEM "Foodnetwork",             IDM_SEARCH_FOODNETWORK
 +            MENUITEM "Google",                      IDM_SEARCH_GOOGLE
 +            MENUITEM "Bing",                        IDM_SEARCH_BING
 +            MENUITEM "Yandex",                      IDM_SEARCH_YANDEX
 +            MENUITEM "Wikipedia (en)",              IDM_SEARCH_WIKIPEDIA
 +            MENUITEM SEPARATOR
 +            MENUITEM "Google Maps",                 IDM_SEARCH_GOOGLE_MAPS
 +            MENUITEM "Google Translate",            IDM_SEARCH_GOOGLE_TRANSLATE
 +            MENUITEM SEPARATOR
 +            MENUITEM "Yahoo",                       IDM_SEARCH_YAHOO
 +            MENUITEM "Foodnetwork",                 IDM_SEARCH_FOODNETWORK
          END
      END
  END
 -
 -#endif    // English (U.S.) resources
 +#endif    // Neutral resources
  /////////////////////////////////////////////////////////////////////////////
 diff --git a/plugins/Scriver/src/msgoptions.cpp b/plugins/Scriver/src/msgoptions.cpp index 95b95325bb..9ad6119688 100644 --- a/plugins/Scriver/src/msgoptions.cpp +++ b/plugins/Scriver/src/msgoptions.cpp @@ -46,8 +46,8 @@ static const TabDef tabPages[] = {  	{ DlgProcOptions2, IDD_OPTIONS2, LPGEN("Group Chat Log") }
  };
 -#define FONTF_BOLD   1
 -#define FONTF_ITALIC 2
 +#define FONTF_BOLD		1
 +#define FONTF_ITALIC	2
  typedef struct FontOptionsListStruct
  {
 @@ -57,7 +57,7 @@ typedef struct FontOptionsListStruct  	BYTE defStyle;
  	char defSize;
  	const TCHAR *szBkgName;
 -}FontOptionsList;
 +} FontOptionsList;
  static const FontOptionsList fontOptionsList[] = {
  	{ LPGENT("Outgoing messages"), RGB(106, 106, 106), _T("Arial"), 0, -12, LPGENT("Outgoing background")},
 @@ -102,7 +102,7 @@ int FontServiceFontsChanged(WPARAM wParam, LPARAM lParam)  	return 0;
  }
 -static BYTE MsgDlgGetFontDefaultCharset(const TCHAR* szFont)
 +static BYTE MsgDlgGetFontDefaultCharset(const TCHAR *szFont)
  {
  	return DEFAULT_CHARSET;
  }
 @@ -113,7 +113,7 @@ void RegisterFontServiceFonts()  	FontIDT fid = { sizeof(fid) };
  	mir_sntprintf(fid.group, SIZEOF(fid.group), _T("%s"), LPGENT("Messaging"));
  	mir_sntprintf(fid.backgroundGroup, SIZEOF(fid.backgroundGroup), _T("%s"), LPGENT("Messaging"));
 -	strncpy(fid.dbSettingsGroup, (SRMMMOD), SIZEOF(fid.dbSettingsGroup));
 +	strncpy(fid.dbSettingsGroup, SRMMMOD, SIZEOF(fid.dbSettingsGroup));
  	fid.flags = FIDF_DEFAULTVALID | FIDF_DEFAULTVALID;
  	for (i = 0; i < SIZEOF(fontOptionsList); i++) {
  		fid.order = i;
 @@ -133,7 +133,7 @@ void RegisterFontServiceFonts()  	ColourIDT cid = { sizeof(cid) };
  	mir_sntprintf(cid.group, SIZEOF(cid.group), _T("%s"), LPGENT("Messaging"));
 -	strncpy(cid.dbSettingsGroup, (SRMMMOD), SIZEOF(fid.dbSettingsGroup));
 +	strncpy(cid.dbSettingsGroup, SRMMMOD, SIZEOF(fid.dbSettingsGroup));
  	cid.flags = 0;
  	for (i = 0; i < SIZEOF(colourOptionsList); i++) {
  		cid.order = i;
 @@ -206,8 +206,8 @@ void LoadMsgDlgFont(int i, LOGFONT *lf, COLORREF *colour)  struct CheckBoxValues_t
  {
 -	DWORD  style;
 -	const TCHAR* szDescr;
 +	DWORD style;
 +	const TCHAR *szDescr;
  };
  static const struct CheckBoxValues_t statusValues[] =
 @@ -300,22 +300,22 @@ static INT_PTR CALLBACK DlgProcTabsOptions(HWND hwndDlg, UINT msg, WPARAM wParam  			CheckDlgButton(hwndDlg, IDC_SEPARATECHATSCONTAINERS, db_get_b(NULL, SRMMMOD, SRMSGSET_SEPARATECHATSCONTAINERS, SRMSGDEFSET_SEPARATECHATSCONTAINERS));
  			bChecked = IsDlgButtonChecked(hwndDlg, IDC_USETABS);
 -			EnableWindow(GetDlgItem(hwndDlg, IDC_ALWAYSSHOWTABS), bChecked );
 -			EnableWindow(GetDlgItem(hwndDlg, IDC_TABSATBOTTOM), bChecked );
 -			EnableWindow(GetDlgItem(hwndDlg, IDC_SWITCHTOACTIVE), bChecked );
 -			EnableWindow(GetDlgItem(hwndDlg, IDC_TABCLOSEBUTTON), bChecked );
 -			EnableWindow(GetDlgItem(hwndDlg, IDC_LIMITNAMES), bChecked );
 -			EnableWindow(GetDlgItem(hwndDlg, IDC_SEPARATECHATSCONTAINERS), bChecked );
 -			EnableWindow(GetDlgItem(hwndDlg, IDC_LIMITTABS), bChecked );
 +			EnableWindow(GetDlgItem(hwndDlg, IDC_ALWAYSSHOWTABS), bChecked);
 +			EnableWindow(GetDlgItem(hwndDlg, IDC_TABSATBOTTOM), bChecked);
 +			EnableWindow(GetDlgItem(hwndDlg, IDC_SWITCHTOACTIVE), bChecked);
 +			EnableWindow(GetDlgItem(hwndDlg, IDC_TABCLOSEBUTTON), bChecked);
 +			EnableWindow(GetDlgItem(hwndDlg, IDC_LIMITNAMES), bChecked);
 +			EnableWindow(GetDlgItem(hwndDlg, IDC_SEPARATECHATSCONTAINERS), bChecked);
 +			EnableWindow(GetDlgItem(hwndDlg, IDC_LIMITTABS), bChecked);
  			bChecked = IsDlgButtonChecked(hwndDlg, IDC_USETABS) && IsDlgButtonChecked(hwndDlg, IDC_LIMITNAMES);
  			EnableWindow(GetDlgItem(hwndDlg, IDC_LIMITNAMESLEN), bChecked);
  			EnableWindow(GetDlgItem(hwndDlg, IDC_CHARS), bChecked);
  			bChecked = IsDlgButtonChecked(hwndDlg, IDC_USETABS) && IsDlgButtonChecked(hwndDlg, IDC_LIMITTABS);
 -			EnableWindow(GetDlgItem(hwndDlg, IDC_LIMITTABSNUM), bChecked );
 +			EnableWindow(GetDlgItem(hwndDlg, IDC_LIMITTABSNUM), bChecked);
  			bChecked = IsDlgButtonChecked(hwndDlg, IDC_USETABS) && IsDlgButtonChecked(hwndDlg, IDC_SEPARATECHATSCONTAINERS);
 -			EnableWindow(GetDlgItem(hwndDlg, IDC_LIMITCHATSTABS), bChecked );
 +			EnableWindow(GetDlgItem(hwndDlg, IDC_LIMITCHATSTABS), bChecked);
  			bChecked = bChecked && IsDlgButtonChecked(hwndDlg, IDC_LIMITCHATSTABS);
 -			EnableWindow(GetDlgItem(hwndDlg, IDC_LIMITCHATSTABSNUM), bChecked );
 +			EnableWindow(GetDlgItem(hwndDlg, IDC_LIMITCHATSTABSNUM), bChecked);
  		}
  		return TRUE;
 @@ -360,28 +360,28 @@ static INT_PTR CALLBACK DlgProcTabsOptions(HWND hwndDlg, UINT msg, WPARAM wParam  		break;
  	case WM_NOTIFY:
 -		switch (((LPNMHDR) lParam)->idFrom) {
 +		switch (((LPNMHDR)lParam)->idFrom) {
  		case 0:
 -			switch (((LPNMHDR) lParam)->code) {
 +			switch (((LPNMHDR)lParam)->code) {
  			case PSN_APPLY:
  				int limitLength;
 -				db_set_b(NULL, SRMMMOD, SRMSGSET_USETABS, (BYTE) IsDlgButtonChecked(hwndDlg, IDC_USETABS));
 -				db_set_b(NULL, SRMMMOD, SRMSGSET_TABSATBOTTOM, (BYTE) IsDlgButtonChecked(hwndDlg, IDC_TABSATBOTTOM));
 -				db_set_b(NULL, SRMMMOD, SRMSGSET_LIMITNAMES, (BYTE) IsDlgButtonChecked(hwndDlg, IDC_LIMITNAMES));
 +				db_set_b(NULL, SRMMMOD, SRMSGSET_USETABS, (BYTE)IsDlgButtonChecked(hwndDlg, IDC_USETABS));
 +				db_set_b(NULL, SRMMMOD, SRMSGSET_TABSATBOTTOM, (BYTE)IsDlgButtonChecked(hwndDlg, IDC_TABSATBOTTOM));
 +				db_set_b(NULL, SRMMMOD, SRMSGSET_LIMITNAMES, (BYTE)IsDlgButtonChecked(hwndDlg, IDC_LIMITNAMES));
  				(limitLength = GetDlgItemInt(hwndDlg, IDC_LIMITNAMESLEN, NULL, TRUE)) >= SRMSGSET_LIMITNAMESLEN_MIN ? GetDlgItemInt(hwndDlg, IDC_LIMITNAMESLEN, NULL, TRUE) : SRMSGSET_LIMITNAMESLEN_MIN;
  				db_set_dw(NULL, SRMMMOD, SRMSGSET_LIMITNAMESLEN, limitLength);
 -				db_set_b(NULL, SRMMMOD, SRMSGSET_LIMITTABS, (BYTE) IsDlgButtonChecked(hwndDlg, IDC_LIMITTABS));
 +				db_set_b(NULL, SRMMMOD, SRMSGSET_LIMITTABS, (BYTE)IsDlgButtonChecked(hwndDlg, IDC_LIMITTABS));
  				limitLength = GetDlgItemInt(hwndDlg, IDC_LIMITTABSNUM, NULL, TRUE) >= 1 ? GetDlgItemInt(hwndDlg, IDC_LIMITTABSNUM, NULL, TRUE) : 1;
  				db_set_dw(NULL, SRMMMOD, SRMSGSET_LIMITTABSNUM, limitLength);
 -				db_set_b(NULL, SRMMMOD, SRMSGSET_LIMITCHATSTABS, (BYTE) IsDlgButtonChecked(hwndDlg, IDC_LIMITCHATSTABS));
 +				db_set_b(NULL, SRMMMOD, SRMSGSET_LIMITCHATSTABS, (BYTE)IsDlgButtonChecked(hwndDlg, IDC_LIMITCHATSTABS));
  				limitLength = GetDlgItemInt(hwndDlg, IDC_LIMITCHATSTABSNUM, NULL, TRUE) >= 1 ? GetDlgItemInt(hwndDlg, IDC_LIMITCHATSTABSNUM, NULL, TRUE) : 1;
  				db_set_dw(NULL, SRMMMOD, SRMSGSET_LIMITCHATSTABSNUM, limitLength);
 -				db_set_b(NULL, SRMMMOD, SRMSGSET_HIDEONETAB, (BYTE) !IsDlgButtonChecked(hwndDlg, IDC_ALWAYSSHOWTABS));
 -				db_set_b(NULL, SRMMMOD, SRMSGSET_SWITCHTOACTIVE, (BYTE) IsDlgButtonChecked(hwndDlg, IDC_SWITCHTOACTIVE));
 -				db_set_b(NULL, SRMMMOD, SRMSGSET_TABCLOSEBUTTON, (BYTE) IsDlgButtonChecked(hwndDlg, IDC_TABCLOSEBUTTON));
 -				db_set_b(NULL, SRMMMOD, SRMSGSET_SEPARATECHATSCONTAINERS, (BYTE) IsDlgButtonChecked(hwndDlg, IDC_SEPARATECHATSCONTAINERS));
 +				db_set_b(NULL, SRMMMOD, SRMSGSET_HIDEONETAB, (BYTE)!IsDlgButtonChecked(hwndDlg, IDC_ALWAYSSHOWTABS));
 +				db_set_b(NULL, SRMMMOD, SRMSGSET_SWITCHTOACTIVE, (BYTE)IsDlgButtonChecked(hwndDlg, IDC_SWITCHTOACTIVE));
 +				db_set_b(NULL, SRMMMOD, SRMSGSET_TABCLOSEBUTTON, (BYTE)IsDlgButtonChecked(hwndDlg, IDC_TABCLOSEBUTTON));
 +				db_set_b(NULL, SRMMMOD, SRMSGSET_SEPARATECHATSCONTAINERS, (BYTE)IsDlgButtonChecked(hwndDlg, IDC_SEPARATECHATSCONTAINERS));
  				ApplyChanges(8);
  				return TRUE;
 @@ -427,7 +427,7 @@ static INT_PTR CALLBACK DlgProcLayoutOptions(HWND hwndDlg, UINT msg, WPARAM wPar  			CheckDlgButton(hwndDlg, IDC_STATUSWIN, db_get_b(NULL, SRMMMOD, SRMSGSET_STATUSICON, SRMSGDEFSET_STATUSICON));
  			CheckDlgButton(hwndDlg, IDC_SHOWPROGRESS, db_get_b(NULL, SRMMMOD, SRMSGSET_SHOWPROGRESS, SRMSGDEFSET_SHOWPROGRESS));
 -			CheckDlgButton(hwndDlg, IDC_AVATARSUPPORT, g_dat.flags&SMF_AVATAR);
 +			CheckDlgButton(hwndDlg, IDC_AVATARSUPPORT, g_dat.flags & SMF_AVATAR);
  			return TRUE;
  		}
 @@ -446,7 +446,7 @@ static INT_PTR CALLBACK DlgProcLayoutOptions(HWND hwndDlg, UINT msg, WPARAM wPar  			break;
  		case IDC_INPUTLINES:
 -			if (HIWORD(wParam) != EN_CHANGE || (HWND) lParam != GetFocus())
 +			if (HIWORD(wParam) != EN_CHANGE || (HWND)lParam != GetFocus())
  				return 0;
  			break;
  		}
 @@ -615,7 +615,7 @@ static INT_PTR CALLBACK DlgProcOptions(HWND hwndDlg, UINT msg, WPARAM wParam, LP  	return FALSE;
  }
 -static void ShowPreview(HWND hwndDlg) 
 +static void ShowPreview(HWND hwndDlg)
  {
  	struct GlobalMessageData gdat = { 0 };
  	PARAFORMAT2 pf2;
 @@ -632,10 +632,10 @@ static void ShowPreview(HWND hwndDlg)  	gdat.flags |= IsDlgButtonChecked(hwndDlg, IDC_DRAWLINES) ? SMF_DRAWLINES : 0;
  	gdat.flags |= IsDlgButtonChecked(hwndDlg, IDC_INDENTTEXT) ? SMF_INDENTTEXT : 0;
  	gdat.logLineColour = SendDlgItemMessage(hwndDlg, IDC_LINECOLOUR, CPM_GETCOLOUR, 0, 0);
 -	gdat.indentSize = (int) SendDlgItemMessage(hwndDlg, IDC_INDENTSPIN, UDM_GETPOS, 0, 0);
 +	gdat.indentSize = (int)SendDlgItemMessage(hwndDlg, IDC_INDENTSPIN, UDM_GETPOS, 0, 0);
  	pf2.cbSize = sizeof(pf2);
  	pf2.dwMask = PFM_OFFSET;
 -	pf2.dxOffset = (gdat.flags & SMF_INDENTTEXT) ? gdat.indentSize * 1440 /g_dat.logPixelSX : 0;
 +	pf2.dxOffset = (gdat.flags & SMF_INDENTTEXT) ? gdat.indentSize * 1440 / g_dat.logPixelSX : 0;
  	SetDlgItemText(hwndDlg, IDC_LOG, _T(""));
  	SendDlgItemMessage(hwndDlg, IDC_LOG, EM_SETPARAFORMAT, 0, (LPARAM)&pf2);
  	StreamInTestEvents(GetDlgItem(hwndDlg, IDC_LOG), &gdat);
 @@ -711,7 +711,7 @@ static INT_PTR CALLBACK DlgProcLogOptions(HWND hwndDlg, UINT msg, WPARAM wParam,  			SendDlgItemMessage(hwndDlg, IDC_LOG, EM_SETEDITSTYLE, SES_EXTENDBACKCOLOR, SES_EXTENDBACKCOLOR);
  			SendDlgItemMessage(hwndDlg, IDC_LOG, EM_SETMARGINS, EC_LEFTMARGIN | EC_RIGHTMARGIN, MAKELONG(0, 0));
  			SendDlgItemMessage(hwndDlg, IDC_LOG, EM_AUTOURLDETECT, TRUE, 0);
 -			SendDlgItemMessage(hwndDlg, IDC_LOG, EM_SETOLECALLBACK, 0, (LPARAM)& reOleCallback);
 +			SendDlgItemMessage(hwndDlg, IDC_LOG, EM_SETOLECALLBACK, 0, (LPARAM)&reOleCallback);
  		}
  		ShowPreview(hwndDlg);
  		return TRUE;
 @@ -728,6 +728,7 @@ static INT_PTR CALLBACK DlgProcLogOptions(HWND hwndDlg, UINT msg, WPARAM wParam,  				Options_Open(&ood);
  			}
  			break;
 +		case IDC_LOADUNREAD:
  		case IDC_LOADCOUNT:
  		case IDC_LOADTIME:
  			EnableWindow(GetDlgItem(hwndDlg, IDC_LOADCOUNTN), IsDlgButtonChecked(hwndDlg, IDC_LOADCOUNT));
 @@ -776,6 +777,8 @@ static INT_PTR CALLBACK DlgProcLogOptions(HWND hwndDlg, UINT msg, WPARAM wParam,  			if (HIWORD(wParam) != EN_CHANGE || (HWND)lParam != GetFocus())
  				return TRUE;
  			break;
 +		case IDC_LOG:
 +			return 0;
  		}
  		MarkChanges(4, hwndDlg);
  		break;
 @@ -878,11 +881,11 @@ static INT_PTR CALLBACK DlgProcTypeOptions(HWND hwndDlg, UINT msg, WPARAM wParam  			CLCINFOITEM cii = { sizeof(cii) };
  			cii.flags = CLCIIF_GROUPFONT | CLCIIF_CHECKBOX;
  			cii.pszText = (TCHAR *)TranslateT("** New contacts **");
 -			hItemNew = (HANDLE)SendDlgItemMessage(hwndDlg, IDC_CLIST, CLM_ADDINFOITEM, 0, (LPARAM)& cii);
 +			hItemNew = (HANDLE)SendDlgItemMessage(hwndDlg, IDC_CLIST, CLM_ADDINFOITEM, 0, (LPARAM)&cii);
  			cii.pszText = (TCHAR *)TranslateT("** Unknown contacts **");
 -			hItemUnknown = (HANDLE)SendDlgItemMessage(hwndDlg, IDC_CLIST, CLM_ADDINFOITEM, 0, (LPARAM)& cii);
 +			hItemUnknown = (HANDLE)SendDlgItemMessage(hwndDlg, IDC_CLIST, CLM_ADDINFOITEM, 0, (LPARAM)&cii);
  		}
 -		SetWindowLongPtr(GetDlgItem(hwndDlg, IDC_CLIST), GWL_STYLE, GetWindowLongPtr(GetDlgItem(hwndDlg, IDC_CLIST), GWL_STYLE) | (CLS_SHOWHIDDEN) | (CLS_NOHIDEOFFLINE));
 +		SetWindowLongPtr(GetDlgItem(hwndDlg, IDC_CLIST), GWL_STYLE, GetWindowLongPtr(GetDlgItem(hwndDlg, IDC_CLIST), GWL_STYLE) | CLS_SHOWHIDDEN | CLS_NOHIDEOFFLINE);
  		ResetCList(hwndDlg);
  		RebuildList(hwndDlg, hItemNew, hItemUnknown);
  		CheckDlgButton(hwndDlg, IDC_SHOWNOTIFY, db_get_b(NULL, SRMMMOD, SRMSGSET_SHOWTYPING, SRMSGDEFSET_SHOWTYPING));
 @@ -975,7 +978,7 @@ int OptInitialise(WPARAM wParam, LPARAM lParam)  	for (int i = 0; i < SIZEOF(tabPages); i++) {
  		odp.pszTemplate = MAKEINTRESOURCEA(tabPages[i].dlgId);
  		odp.pfnDlgProc = tabPages[i].dlgProc;
 -		odp.pszTab = (char*)tabPages[i].tabName;
 +		odp.pszTab = (char *)tabPages[i].tabName;
  		Options_AddPage(wParam, &odp);
  	}
 diff --git a/plugins/Scriver/src/resource.h b/plugins/Scriver/src/resource.h index 4ec3aabdf2..b3fbcafad0 100644 --- a/plugins/Scriver/src/resource.h +++ b/plugins/Scriver/src/resource.h @@ -1,3 +1,8 @@ +//{{NO_DEPENDENCIES}}
 +// Microsoft Visual C++ generated include file.
 +// Used by ..\res\resource.rc
 +//
 +#define VS_VERSION_INFO                 1
  #define IDD_MSGWIN                      100
  #define IDD_MSG                         101
  #define IDD_MSGSENDERROR                102
 @@ -22,7 +27,6 @@  #define IDI_OUTGOING                    133
  #define IDI_NOTICE                      134
  #define IDI_CLOSEX                      135
 -
  #define IDI_GOOGLE                      140
  #define IDI_BING                        141
  #define IDI_YANDEX                      142
 @@ -32,10 +36,7 @@  #define IDI_YAHOO                       146
  #define IDI_FOODNETWORK                 147
  #define IDI_LASTICON                    148
 -
  #define IDR_CONTEXT                     180
 -
 -/* chat dll */
  #define IDD_CHANNEL                     401
  #define IDD_OPTIONS1                    402
  #define IDD_OPTIONS2                    403
 @@ -73,31 +74,29 @@  #define IDI_NICKLIST2                   461
  #define IDI_FILTER2                     462
  #define IDI_TYPINGOFF                   463
 -
  #define IDC_HYPERLINKHAND               600
 -#define IDC_DRAGCURSOR					601
 -
 +#define IDC_DRAGCURSOR                  601
  #define IDC_TABS                        1000
  #define IDC_LOG                         1001
  #define IDC_MESSAGE                     1002
  #define IDC_AUTOPOPUP                   1003
  #define IDC_AUTOMIN                     1005
 -#define IDC_STAYMINIMIZED				1006
 -#define IDC_SWITCHTOACTIVE				1007
 -#define IDC_SEPARATECHATSCONTAINERS		1008
 -#define IDC_TABCLOSEBUTTON				1009
 -#define IDC_LIMITTABS					1010
 -#define IDC_LIMITTABSNUM				1011
 -#define IDC_LIMITCHATSTABS				1012
 -#define IDC_LIMITCHATSTABSNUM			1013
 +#define IDC_STAYMINIMIZED               1006
 +#define IDC_SWITCHTOACTIVE              1007
 +#define IDC_SEPARATECHATSCONTAINERS     1008
 +#define IDC_TABCLOSEBUTTON              1009
 +#define IDC_LIMITTABS                   1010
 +#define IDC_LIMITTABSNUM                1011
 +#define IDC_LIMITCHATSTABS              1012
 +#define IDC_LIMITCHATSTABSNUM           1013
  #define IDC_SPLITTER                    1017
  #define IDC_SHOWNAMES                   1020
  #define IDC_USETABS                     1022
  #define IDC_SHOWSECONDS                 1023
  #define IDC_USELONGDATE                 1024
  #define IDC_USERELATIVEDATE             1025
 -#define IDC_USEIEVIEW					1026
 -#define IDC_FONTSCOLORS					1027
 +#define IDC_USEIEVIEW                   1026
 +#define IDC_FONTSCOLORS                 1027
  #define IDC_SHOWLOGICONS                1032
  #define IDC_SHOWTIMES                   1033
  #define IDC_SHOWDATES                   1034
 @@ -123,12 +122,12 @@  #define IDC_DETAILS                     1069
  #define IDC_ADD                         1070
  #define IDC_USERMENU                    1071
 -#define IDC_QUOTE						1072
 +#define IDC_QUOTE                       1072
  #define IDC_HISTORY                     1080
  #define IDC_SMILEYS                     1081
 -#define IDC_REMEMBER					1082
 -#define IDC_INFOBAR_NAME				1090
 -#define IDC_INFOBAR_STATUS				1091
 +#define IDC_REMEMBER                    1082
 +#define IDC_INFOBAR_NAME                1090
 +#define IDC_INFOBAR_STATUS              1091
  #define IDC_STMSGLOGGROUP               1442
  #define IDC_ERRORTEXT                   1596
  #define IDC_MSGTEXT                     1597
 @@ -148,34 +147,86 @@  #define IDC_TRANSPARENCY                1616
  #define IDC_MARKFOLLOWUPS               1617
  #define IDC_MESSAGEONNEWLINE            1618
 -#define IDC_ATRANSPARENCYVALUE			1619
 +#define IDC_ATRANSPARENCYVALUE          1619
  #define IDC_ATRANSPARENCYPERC           1620
 -#define IDC_ITRANSPARENCYVALUE			1621
 +#define IDC_ITRANSPARENCYVALUE          1621
  #define IDC_ITRANSPARENCYPERC           1622
  #define IDC_ALWAYSSHOWTABS              1623
 -#define IDC_SENDALL						1624
 -#define IDC_TRANSPARENCYTEXT1			1627
 -#define IDC_TRANSPARENCYTEXT2			1628
 -#define IDC_DRAWLINES					1629
 -#define IDC_LINECOLOUR					1630
 -#define IDC_SAVEDRAFTS					1631
 -#define IDC_POPLIST						1632
 -#define IDC_LIMITNAMESLEN	            1633
 -#define IDC_CHARS						1634
 -#define IDC_INDENTTEXT					1635
 -#define IDC_INDENTSIZE					1636
 -#define IDC_INDENTSPIN					1637
 -#define IDC_HIDECONTAINERS				1638
 +#define IDC_SENDALL                     1624
 +#define IDC_TRANSPARENCYTEXT1           1627
 +#define IDC_TRANSPARENCYTEXT2           1628
 +#define IDC_DRAWLINES                   1629
 +#define IDC_LINECOLOUR                  1630
 +#define IDC_SAVEDRAFTS                  1631
 +#define IDC_POPLIST                     1632
 +#define IDC_LIMITNAMESLEN               1633
 +#define IDC_CHARS                       1634
 +#define IDC_INDENTTEXT                  1635
 +#define IDC_INDENTSIZE                  1636
 +#define IDC_INDENTSPIN                  1637
 +#define IDC_HIDECONTAINERS              1638
  #define IDC_ORIGINALAVATARH             1639
 -#define IDC_TYPINGSWITCH				1640
 -#define IDC_LOADCOUNTTEXT2				1641
 -#define IDC_CHAT_NICKROWTEXT2			1642
 -#define IDC_CHAT_LIMITTEXT2				1643
 -#define IDC_INFOBAR						1644
 -#define IDC_AVATAR						1645
 +#define IDC_TYPINGSWITCH                1640
 +#define IDC_LOADCOUNTTEXT2              1641
 +#define IDC_CHAT_NICKROWTEXT2           1642
 +#define IDC_CHAT_LIMITTEXT2             1643
 +#define IDC_INFOBAR                     1644
 +#define IDC_AVATAR                      1645
  #define IDC_XSTATUSICON                 1646
  #define IDC_INPUTLINES                  1647
  #define IDC_INPUTLINESSPIN              1648
 +#define IDC_CHAT_LOG                    5005
 +#define IDC_CHAT_SPLITTERX              5006
 +#define IDC_CHAT_SMILEY                 5007
 +#define IDC_CHAT_SPLITTERY              5008
 +#define IDC_CHAT_MESSAGE                5009
 +#define IDC_CHAT_BOLD                   5010
 +#define IDC_CHAT_ITALICS                5011
 +#define IDC_CHAT_UNDERLINE              5012
 +#define IDC_CHAT_FILTER                 5013
 +#define IDC_CHAT_CHANMGR                5014
 +#define IDC_CHAT_SHOWNICKLIST           5016
 +#define IDC_CHAT_COLOR                  5017
 +#define IDC_CHAT_BKGCOLOR               5019
 +#define IDC_CHAT_FONTSIZE               5020
 +#define IDC_CHAT_CHECKBOXES             5021
 +#define IDC_CHAT_HISTORY                5022
 +#define IDC_CHAT_NICKROW                5024
 +#define IDC_CHAT_LOGLIMIT               5024
 +#define IDC_CHAT_SPIN1                  5028
 +#define IDC_CHAT_SPIN2                  5029
 +#define IDC_CHAT_SPIN3                  5030
 +#define IDC_CHAT_HIGHLIGHTWORDS         5040
 +#define IDC_CHAT_INSTAMP                5041
 +#define IDC_CHAT_OUTSTAMP               5043
 +#define IDC_CHAT_TIMESTAMP              5046
 +#define IDC_CHAT_LOGDIRCHOOSE           5047
 +#define IDC_CHAT_LOGDIRECTORY           5048
 +#define IDC_CHAT_LIMIT                  5050
 +#define IDC_CHAT_LOGTIMESTAMP           5051
 +#define IDC_CHAT_GROUP                  5057
 +#define IDC_CHAT_RADIO1                 5061
 +#define IDC_CHAT_RADIO2                 5062
 +#define IDC_CHAT_RADIO3                 5063
 +#define IDC_CHAT_TEXT                   5064
 +#define IDC_CHAT_BKG                    5065
 +#define IDC_CHAT_TIMEOUT                5067
 +#define IDC_CHAT_HIGHLIGHT              5068
 +#define IDC_CHAT_TEXTO                  5069
 +#define IDC_CHAT_LOGGING                5069
 +#define IDC_CHAT_COLORTEXT              5070
 +#define IDC_CHAT_LIST                   5072
 +#define IDC_CHAT_1                      5075
 +#define IDC_CHAT_2                      5076
 +#define IDC_CHAT_3                      5077
 +#define IDC_CHAT_4                      5078
 +#define IDC_CHAT_5                      5079
 +#define IDC_CHAT_6                      5080
 +#define IDC_CHAT_7                      5081
 +#define IDC_CHAT_8                      5082
 +#define IDC_CHAT_9                      5083
 +#define IDC_CHAT_10                     5084
 +#define IDC_CHAT_11                     5085
  #define IDM_CUT                         40000
  #define IDM_COPY                        40001
  #define IDM_PASTE                       40002
 @@ -188,9 +239,9 @@  #define IDM_CLEAR                       40013
  #define IDM_OPENLINK                    40014
  #define IDM_COPYLINK                    40016
 -#define IDM_CLOSETAB					       40020
 -#define IDM_CLOSEOTHERTABS				    40021
 -#define IDM_TOPMOST						    40040
 +#define IDM_CLOSETAB                    40020
 +#define IDM_CLOSEOTHERTABS              40021
 +#define IDM_TOPMOST                     40040
  #define IDM_SEARCH_GOOGLE               40080
  #define IDM_SEARCH_BING                 40081
  #define IDM_SEARCH_YANDEX               40082
 @@ -199,60 +250,18 @@  #define IDM_SEARCH_GOOGLE_TRANSLATE     40085
  #define IDM_SEARCH_YAHOO                40086
  #define IDM_SEARCH_FOODNETWORK          40087
 -/* chat.dll resources */
 -
 -#define IDC_CHAT_LOG                         5005
 -#define IDC_CHAT_SPLITTERX                   5006
 -#define IDC_CHAT_SMILEY                      5007
 -#define IDC_CHAT_SPLITTERY                   5008
 -#define IDC_CHAT_MESSAGE                     5009
 -#define IDC_CHAT_BOLD                        5010
 -#define IDC_CHAT_ITALICS                     5011
 -#define IDC_CHAT_UNDERLINE                   5012
 -#define IDC_CHAT_FILTER                      5013
 -#define IDC_CHAT_CHANMGR                     5014
 -#define IDC_CHAT_SHOWNICKLIST                5016
 -#define IDC_CHAT_COLOR                       5017
 -#define IDC_CHAT_BKGCOLOR                    5019
 -#define IDC_CHAT_FONTSIZE			5020
 -#define IDC_CHAT_CHECKBOXES                  5021
 -#define IDC_CHAT_HISTORY                     5022
 -#define IDC_CHAT_NICKROW                     5024
 -#define IDC_CHAT_LOGLIMIT                    5024
 -#define IDC_CHAT_SPIN1                       5028
 -#define IDC_CHAT_SPIN2                       5029
 -#define IDC_CHAT_SPIN3                       5030
 -#define IDC_CHAT_HIGHLIGHTWORDS              5040
 -#define IDC_CHAT_INSTAMP                     5041
 -#define IDC_CHAT_OUTSTAMP                    5043
 -#define IDC_CHAT_TIMESTAMP                   5046
 -#define IDC_CHAT_LOGDIRCHOOSE                5047
 -#define IDC_CHAT_LOGDIRECTORY                5048
 -#define IDC_CHAT_LIMIT                       5050
 -#define IDC_CHAT_LOGTIMESTAMP                5051
 -#define IDC_CHAT_GROUP                       5057
 -#define IDC_CHAT_RADIO1                      5061
 -#define IDC_CHAT_RADIO2                      5062
 -#define IDC_CHAT_RADIO3                      5063
 -#define IDC_CHAT_TEXT                        5064
 -#define IDC_CHAT_BKG                         5065
 -#define IDC_CHAT_TIMEOUT                     5067
 -#define IDC_CHAT_HIGHLIGHT                   5068
 -#define IDC_CHAT_TEXTO                       5069
 -#define IDC_CHAT_LOGGING                     5069
 -#define IDC_CHAT_COLORTEXT                   5070
 -#define IDC_CHAT_LIST                        5072
 -#define IDC_CHAT_1                           5075
 -#define IDC_CHAT_2                           5076
 -#define IDC_CHAT_3                           5077
 -#define IDC_CHAT_4                           5078
 -#define IDC_CHAT_5                           5079
 -#define IDC_CHAT_6                           5080
 -#define IDC_CHAT_7                           5081
 -#define IDC_CHAT_8                           5082
 -#define IDC_CHAT_9                           5083
 -#define IDC_CHAT_10                          5084
 -#define IDC_CHAT_11                          5085
  #define ID_MESS                         50001
  #define ID_COPYALL                      50006
  #define ID_Menu                         50026
 +#define IDC_STATIC                      -1
 +
 +// Next default values for new objects
 +// 
 +#ifdef APSTUDIO_INVOKED
 +#ifndef APSTUDIO_READONLY_SYMBOLS
 +#define _APS_NEXT_RESOURCE_VALUE        101
 +#define _APS_NEXT_COMMAND_VALUE         40001
 +#define _APS_NEXT_CONTROL_VALUE         1000
 +#define _APS_NEXT_SYMED_VALUE           101
 +#endif
 +#endif
 | 
