summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--plugins/Scriver/src/globals.cpp24
-rw-r--r--plugins/Scriver/src/msgdialog.cpp5
-rw-r--r--plugins/Scriver/src/msgoptions.cpp77
-rw-r--r--plugins/Scriver/src/msgs.h28
-rw-r--r--plugins/Scriver/src/srmm.cpp20
-rw-r--r--plugins/Scriver/src/stdafx.h5
6 files changed, 69 insertions, 90 deletions
diff --git a/plugins/Scriver/src/globals.cpp b/plugins/Scriver/src/globals.cpp
index 9c2fc48bc3..4ed0d44778 100644
--- a/plugins/Scriver/src/globals.cpp
+++ b/plugins/Scriver/src/globals.cpp
@@ -271,7 +271,7 @@ void LoadInfobarFonts()
{
LOGFONT lf;
LoadMsgDlgFont(MSGFONTID_MESSAGEAREA, &lf, nullptr);
- g_dat.minInputAreaHeight = g_plugin.getDword(SRMSGSET_AUTORESIZELINES, SRMSGDEFSET_AUTORESIZELINES) * abs(lf.lfHeight) * g_dat.logPixelSY / 72;
+ g_dat.minInputAreaHeight = g_plugin.iAutoResizeLines * abs(lf.lfHeight) * g_dat.logPixelSY / 72;
if (g_dat.hInfobarBrush != nullptr)
DeleteObject(g_dat.hInfobarBrush);
@@ -364,10 +364,11 @@ void ReloadGlobals()
g_dat.flags.bStayMinimized = g_plugin.bStayMinimized;
g_dat.flags.bSaveDrafts = g_plugin.bSaveDrafts;
g_dat.flags.bDelTemp = g_plugin.bDelTemp;
+ g_dat.flags.bUseIeview = g_plugin.bUseIeview;
g_dat.sendMode = (SendMode)g_plugin.getByte(SRMSGSET_SENDMODE, SRMSGDEFSET_SENDMODE);
g_dat.openFlags = g_plugin.getDword(SRMSGSET_POPFLAGS, SRMSGDEFSET_POPFLAGS);
- g_dat.indentSize = g_plugin.getWord(SRMSGSET_INDENTSIZE, SRMSGDEFSET_INDENTSIZE);
+ g_dat.indentSize = g_plugin.iIndentSize;
g_dat.logLineColour = g_plugin.getDword(SRMSGSET_LINECOLOUR, SRMSGDEFSET_LINECOLOUR);
g_dat.flags2.bUseTabs = g_plugin.bUseTabs;
@@ -380,25 +381,22 @@ void ReloadGlobals()
g_dat.flags2.bLimitTabs = g_plugin.bLimitTabs;
g_dat.flags2.bLimitChatTabs = g_plugin.bLimitChatTabs;
g_dat.flags2.bHideContainer = g_plugin.bHideContainer;
-
+ g_dat.flags2.bUseTransparency = g_plugin.bUseTransparency;
+
g_dat.flags2.bShowStatusBar = g_plugin.bShowStatusBar;
g_dat.flags2.bShowTitleBar = g_plugin.bShowTitleBar;
g_dat.flags2.bShowToolBar = g_plugin.bShowToolBar;
g_dat.flags2.bShowInfoBar = g_plugin.bShowInfoBar;
- g_dat.flags2.bShowTyping = g_plugin.getBool(SRMSGSET_SHOWTYPING, SRMSGDEFSET_SHOWTYPING);
- g_dat.flags2.bShowTypingWin = g_plugin.getBool(SRMSGSET_SHOWTYPINGWIN, SRMSGDEFSET_SHOWTYPINGWIN);
- g_dat.flags2.bShowTypingTray = g_plugin.getBool(SRMSGSET_SHOWTYPINGNOWIN, SRMSGDEFSET_SHOWTYPINGNOWIN);
- g_dat.flags2.bShowTypingClist = g_plugin.getBool(SRMSGSET_SHOWTYPINGCLIST, SRMSGDEFSET_SHOWTYPINGCLIST);
- g_dat.flags2.bShowTypingSwitch = g_plugin.getBool(SRMSGSET_SHOWTYPINGSWITCH, SRMSGDEFSET_SHOWTYPINGSWITCH);
- g_dat.flags2.bUseTransparency = g_plugin.getBool(SRMSGSET_USETRANSPARENCY, SRMSGDEFSET_USETRANSPARENCY);
+ g_dat.flags2.bShowTyping = g_plugin.bShowTyping;
+ g_dat.flags2.bShowTypingWin = g_plugin.bShowTypingWin;
+ g_dat.flags2.bShowTypingTray = g_plugin.bShowTypingTray;
+ g_dat.flags2.bShowTypingClist = g_plugin.bShowTypingClist;
+ g_dat.flags2.bShowTypingSwitch = g_plugin.bShowTypingSwitch;
g_dat.activeAlpha = g_plugin.getDword(SRMSGSET_ACTIVEALPHA, SRMSGDEFSET_ACTIVEALPHA);
g_dat.inactiveAlpha = g_plugin.getDword(SRMSGSET_INACTIVEALPHA, SRMSGDEFSET_INACTIVEALPHA);
-
- if (g_plugin.getBool(SRMSGSET_USEIEVIEW, SRMSGDEFSET_USEIEVIEW))
- g_dat.flags.bUseIeview;
-
+
g_dat.limitNamesLength = g_plugin.iLimitNames;
g_dat.limitTabsNum = g_plugin.iLimitTabs;
g_dat.limitChatsTabsNum = g_plugin.iLimitChatTabs;
diff --git a/plugins/Scriver/src/msgdialog.cpp b/plugins/Scriver/src/msgdialog.cpp
index 0503bf29f8..93b09eea58 100644
--- a/plugins/Scriver/src/msgdialog.cpp
+++ b/plugins/Scriver/src/msgdialog.cpp
@@ -302,7 +302,7 @@ bool CSrmmWindow::OnInitDialog()
MEVENT hPrevEvent;
switch (historyMode) {
case LOADHISTORY_COUNT:
- for (int i = g_plugin.getWord(SRMSGSET_LOADCOUNT, SRMSGDEFSET_LOADCOUNT); i > 0; i--) {
+ for (int i = g_plugin.iLoadCount; i > 0; i--) {
if (m_hDbEventFirst == 0)
hPrevEvent = db_event_last(m_hContact);
else
@@ -326,7 +326,8 @@ bool CSrmmWindow::OnInitDialog()
db_event_get(m_hDbEventFirst, &dbei);
hPrevEvent = db_event_prev(m_hContact, m_hDbEventFirst);
}
- DWORD firstTime = dbei.timestamp - 60 * g_plugin.getWord(SRMSGSET_LOADTIME, SRMSGDEFSET_LOADTIME);
+
+ DWORD firstTime = dbei.timestamp - 60 * g_plugin.iLoadTime;
for (;;) {
if (hPrevEvent == 0)
break;
diff --git a/plugins/Scriver/src/msgoptions.cpp b/plugins/Scriver/src/msgoptions.cpp
index e72e60d770..8805ce6cee 100644
--- a/plugins/Scriver/src/msgoptions.cpp
+++ b/plugins/Scriver/src/msgoptions.cpp
@@ -431,6 +431,7 @@ public:
class CLayoutOptionsDlg : public CBaseOptionDlg
{
+ CCtrlSpin spinInput;
CCtrlCheck chkTransparency, chkShowTitlebar, chkShowStatusBar, chkShowToolbar, chkShowInfobar, chkShowProgress, chkShowAvatar;
public:
@@ -442,14 +443,17 @@ public:
chkShowToolbar(this, IDC_SHOWTOOLBAR),
chkShowTitlebar(this, IDC_SHOWTITLEBAR),
chkShowProgress(this, IDC_SHOWPROGRESS),
- chkShowStatusBar(this, IDC_SHOWSTATUSBAR)
+ chkShowStatusBar(this, IDC_SHOWSTATUSBAR),
+ spinInput(this, IDC_INPUTLINESSPIN, 100, 1)
{
+ CreateLink(spinInput, g_plugin.iAutoResizeLines);
CreateLink(chkShowAvatar, g_plugin.bShowAvatar);
CreateLink(chkShowInfobar, g_plugin.bShowInfoBar);
CreateLink(chkShowToolbar, g_plugin.bShowToolBar);
CreateLink(chkShowTitlebar, g_plugin.bShowTitleBar);
CreateLink(chkShowProgress, g_plugin.bShowProgress);
CreateLink(chkShowStatusBar, g_plugin.bShowStatusBar);
+ CreateLink(chkTransparency, g_plugin.bUseTransparency);
chkTransparency.OnChange = Callback(this, &CLayoutOptionsDlg::onChange_Transparency);
chkShowTitlebar.OnChange = Callback(this, &CLayoutOptionsDlg::onChange_ShowTitlebar);
@@ -458,7 +462,7 @@ public:
bool OnInitDialog() override
{
SetWindowText(GetDlgItem(m_hwnd, IDC_TITLEFORMAT), g_dat.wszTitleFormat);
- CheckDlgButton(m_hwnd, IDC_TRANSPARENCY, g_plugin.getByte(SRMSGSET_USETRANSPARENCY, SRMSGDEFSET_USETRANSPARENCY) ? BST_CHECKED : BST_UNCHECKED);
+
SendDlgItemMessage(m_hwnd, IDC_ATRANSPARENCYVALUE, TBM_SETRANGE, FALSE, MAKELONG(0, 255));
SendDlgItemMessage(m_hwnd, IDC_ATRANSPARENCYVALUE, TBM_SETPOS, TRUE, g_plugin.getDword(SRMSGSET_ACTIVEALPHA, SRMSGDEFSET_ACTIVEALPHA));
SendDlgItemMessage(m_hwnd, IDC_ITRANSPARENCYVALUE, TBM_SETRANGE, FALSE, MAKELONG(0, 255));
@@ -471,13 +475,8 @@ public:
mir_snprintf(str, "%d%%", (int)(100 * SendDlgItemMessage(m_hwnd, IDC_ITRANSPARENCYVALUE, TBM_GETPOS, 0, 0) / 255));
SetDlgItemTextA(m_hwnd, IDC_ITRANSPARENCYPERC, str);
- SendDlgItemMessage(m_hwnd, IDC_INPUTLINESSPIN, UDM_SETRANGE, 0, MAKELONG(100, 1));
- SendDlgItemMessage(m_hwnd, IDC_INPUTLINESSPIN, UDM_SETPOS, 0, g_plugin.getWord(SRMSGSET_AUTORESIZELINES, SRMSGDEFSET_AUTORESIZELINES));
-
onChange_Transparency(0);
onChange_ShowTitlebar(0);
-
- CheckDlgButton(m_hwnd, IDC_AVATARSUPPORT, g_dat.flags.bShowAvatar);
return true;
}
@@ -486,18 +485,16 @@ public:
GetWindowText(GetDlgItem(m_hwnd, IDC_TITLEFORMAT), g_dat.wszTitleFormat, _countof(g_dat.wszTitleFormat));
g_plugin.setWString(SRMSGSET_WINDOWTITLE, g_dat.wszTitleFormat);
- g_plugin.setByte(SRMSGSET_USETRANSPARENCY, (BYTE)IsDlgButtonChecked(m_hwnd, IDC_TRANSPARENCY));
g_plugin.setDword(SRMSGSET_ACTIVEALPHA, SendDlgItemMessage(m_hwnd, IDC_ATRANSPARENCYVALUE, TBM_GETPOS, 0, 0));
g_plugin.setDword(SRMSGSET_INACTIVEALPHA, SendDlgItemMessage(m_hwnd, IDC_ITRANSPARENCYVALUE, TBM_GETPOS, 0, 0));
- g_plugin.setWord(SRMSGSET_AUTORESIZELINES, (WORD)SendDlgItemMessage(m_hwnd, IDC_INPUTLINESSPIN, UDM_GETPOS, 0, 0));
LoadInfobarFonts();
return true;
}
void onChange_Transparency(CCtrlCheck*)
{
- int bChecked = IsDlgButtonChecked(m_hwnd, IDC_TRANSPARENCY);
+ int bChecked = chkTransparency.GetState();
EnableWindow(GetDlgItem(m_hwnd, IDC_ATRANSPARENCYVALUE), bChecked);
EnableWindow(GetDlgItem(m_hwnd, IDC_ATRANSPARENCYPERC), bChecked);
EnableWindow(GetDlgItem(m_hwnd, IDC_ITRANSPARENCYVALUE), bChecked);
@@ -532,7 +529,8 @@ public:
class CLogOptionsDlg : public CBaseOptionDlg
{
- CCtrlCheck chkLoadUnread, chkLoadCount, chkLoadTime;
+ CCtrlSpin spinCount, spinTime, spinIndent;
+ CCtrlCheck chkLoadUnread, chkLoadCount, chkLoadTime, chkUseIeview;
CCtrlCheck chkShowIcons, chkShowTime, chkShowSecs, chkShowDate, chkLongDate, chkRelativeDate;
CCtrlCheck chkGroupMsg, chkIndentText, chkHideNames, chkMarkFollowups, chkMsgOnNewline, chkDrawLines;
CCtrlRichEdit m_log;
@@ -555,7 +553,7 @@ class CLogOptionsDlg : public CBaseOptionDlg
gdat.flags.bMsgOnNewline = chkMsgOnNewline.GetState();
gdat.flags.bDrawLines = chkDrawLines.GetState();
gdat.flags.bIndentText = chkIndentText.GetState();
- gdat.indentSize = (int)SendDlgItemMessage(m_hwnd, IDC_INDENTSPIN, UDM_GETPOS, 0, 0);
+ gdat.indentSize = spinIndent.GetPosition();
PARAFORMAT2 pf2;
pf2.cbSize = sizeof(pf2);
@@ -582,10 +580,14 @@ public:
chkShowIcons(this, IDC_SHOWLOGICONS),
chkIndentText(this, IDC_INDENTTEXT),
chkHideNames(this, IDC_HIDENAMES),
+ chkUseIeview(this, IDC_USEIEVIEW),
chkMsgOnNewline(this, IDC_MESSAGEONNEWLINE),
chkLoadTime(this, IDC_LOADTIME),
chkLoadCount(this, IDC_LOADCOUNT),
- chkLoadUnread(this, IDC_LOADUNREAD)
+ chkLoadUnread(this, IDC_LOADUNREAD),
+ spinTime(this, IDC_LOADTIMESPIN, 12 * 60),
+ spinCount(this, IDC_LOADCOUNTSPIN, 100),
+ spinIndent(this, IDC_INDENTSPIN, 999)
{
m_fonts.OnClick = Callback(this, &CLogOptionsDlg::onClick_Fonts);
@@ -594,6 +596,7 @@ public:
CreateLink(chkShowDate, g_plugin.bShowDate);
CreateLink(chkLongDate, g_plugin.bLongDate);
CreateLink(chkGroupMsg, g_plugin.bGroupMessages);
+ CreateLink(chkUseIeview, g_plugin.bUseIeview);
CreateLink(chkShowIcons, g_plugin.bShowIcons);
CreateLink(chkHideNames, g_plugin.bHideNames);
CreateLink(chkDrawLines, g_plugin.bDrawLines);
@@ -602,6 +605,10 @@ public:
CreateLink(chkRelativeDate, g_plugin.bRelativeDate);
CreateLink(chkMarkFollowups, g_plugin.bMarkFollowups);
+ CreateLink(spinTime, g_plugin.iLoadTime);
+ CreateLink(spinCount, g_plugin.iLoadCount);
+ CreateLink(spinIndent, g_plugin.iIndentSize);
+
chkLoadTime.OnChange = chkLoadCount.OnChange = chkLoadUnread.OnChange = Callback(this, &CLogOptionsDlg::onChange_Time);
chkShowDate.OnChange = Callback(this, &CLogOptionsDlg::onChange_Dates);
chkShowTime.OnChange = Callback(this, &CLogOptionsDlg::onChange_Times);
@@ -624,12 +631,6 @@ public:
}
onChange_Time(0);
- SendDlgItemMessage(m_hwnd, IDC_LOADCOUNTSPIN, UDM_SETRANGE, 0, MAKELONG(100, 0));
- SendDlgItemMessage(m_hwnd, IDC_LOADCOUNTSPIN, UDM_SETPOS, 0, g_plugin.getWord(SRMSGSET_LOADCOUNT, SRMSGDEFSET_LOADCOUNT));
- SendDlgItemMessage(m_hwnd, IDC_LOADTIMESPIN, UDM_SETRANGE, 0, MAKELONG(12 * 60, 0));
- SendDlgItemMessage(m_hwnd, IDC_LOADTIMESPIN, UDM_SETPOS, 0, g_plugin.getWord(SRMSGSET_LOADTIME, SRMSGDEFSET_LOADTIME));
-
- CheckDlgButton(m_hwnd, IDC_USEIEVIEW, g_plugin.getByte(SRMSGSET_USEIEVIEW, SRMSGDEFSET_USEIEVIEW) ? BST_CHECKED : BST_UNCHECKED);
if (!g_dat.ieviewInstalled)
EnableWindow(GetDlgItem(m_hwnd, IDC_USEIEVIEW), FALSE);
@@ -638,9 +639,6 @@ public:
onChange_GroupMsg(0);
onChange_IndentText(0);
- SendDlgItemMessage(m_hwnd, IDC_INDENTSPIN, UDM_SETRANGE, 0, MAKELONG(999, 0));
- SendDlgItemMessage(m_hwnd, IDC_INDENTSPIN, UDM_SETPOS, 0, g_plugin.getWord(SRMSGSET_INDENTSIZE, SRMSGDEFSET_INDENTSIZE));
-
PARAFORMAT2 pf2;
memset(&pf2, 0, sizeof(pf2));
pf2.cbSize = sizeof(pf2);
@@ -648,6 +646,7 @@ public:
pf2.dxStartIndent = 30;
pf2.dxRightIndent = 30;
m_log.SendMsg(EM_SETPARAFORMAT, 0, (LPARAM)&pf2);
+
m_log.SendMsg(EM_SETEDITSTYLE, SES_EXTENDBACKCOLOR, SES_EXTENDBACKCOLOR);
m_log.SendMsg(EM_SETMARGINS, EC_LEFTMARGIN | EC_RIGHTMARGIN, MAKELONG(0, 0));
m_log.SendMsg(EM_AUTOURLDETECT, TRUE, 0);
@@ -665,11 +664,6 @@ public:
g_plugin.setByte(SRMSGSET_LOADHISTORY, LOADHISTORY_TIME);
else
g_plugin.setByte(SRMSGSET_LOADHISTORY, LOADHISTORY_UNREAD);
- g_plugin.setWord(SRMSGSET_LOADCOUNT, (WORD)SendDlgItemMessage(m_hwnd, IDC_LOADCOUNTSPIN, UDM_GETPOS, 0, 0));
- g_plugin.setWord(SRMSGSET_LOADTIME, (WORD)SendDlgItemMessage(m_hwnd, IDC_LOADTIMESPIN, UDM_GETPOS, 0, 0));
-
- g_plugin.setByte(SRMSGSET_USEIEVIEW, (BYTE)IsDlgButtonChecked(m_hwnd, IDC_USEIEVIEW));
- g_plugin.setWord(SRMSGSET_INDENTSIZE, (WORD)SendDlgItemMessage(m_hwnd, IDC_INDENTSPIN, UDM_GETPOS, 0, 0));
FreeMsgLogIcons();
LoadMsgLogIcons();
@@ -685,12 +679,12 @@ public:
{
int bChecked = IsDlgButtonChecked(m_hwnd, IDC_LOADCOUNT);
EnableWindow(GetDlgItem(m_hwnd, IDC_LOADCOUNTN), bChecked);
- EnableWindow(GetDlgItem(m_hwnd, IDC_LOADCOUNTSPIN), bChecked);
+ spinCount.Enable(bChecked);
EnableWindow(GetDlgItem(m_hwnd, IDC_LOADCOUNTTEXT2), bChecked);
bChecked = IsDlgButtonChecked(m_hwnd, IDC_LOADTIME);
EnableWindow(GetDlgItem(m_hwnd, IDC_LOADTIMEN), bChecked);
- EnableWindow(GetDlgItem(m_hwnd, IDC_LOADTIMESPIN), bChecked);
+ spinTime.Enable(bChecked);
EnableWindow(GetDlgItem(m_hwnd, IDC_STMINSOLD), bChecked);
}
@@ -719,7 +713,7 @@ public:
{
int bChecked = chkIndentText.GetState();
EnableWindow(GetDlgItem(m_hwnd, IDC_INDENTSIZE), bChecked);
- EnableWindow(GetDlgItem(m_hwnd, IDC_INDENTSPIN), bChecked);
+ spinIndent.Enable(bChecked);
}
};
@@ -784,12 +778,12 @@ static INT_PTR CALLBACK DlgProcTypeOptions(HWND hwndDlg, UINT msg, WPARAM wParam
SetWindowLongPtr(GetDlgItem(hwndDlg, IDC_CLIST), GWL_STYLE, GetWindowLongPtr(GetDlgItem(hwndDlg, IDC_CLIST), GWL_STYLE) | CLS_SHOWHIDDEN | CLS_NOHIDEOFFLINE);
ResetCList(hwndDlg);
- CheckDlgButton(hwndDlg, IDC_SHOWNOTIFY, g_plugin.getByte(SRMSGSET_SHOWTYPING, SRMSGDEFSET_SHOWTYPING) ? BST_CHECKED : BST_UNCHECKED);
- CheckDlgButton(hwndDlg, IDC_TYPEWIN, g_plugin.getByte(SRMSGSET_SHOWTYPINGWIN, SRMSGDEFSET_SHOWTYPINGWIN) ? BST_CHECKED : BST_UNCHECKED);
- CheckDlgButton(hwndDlg, IDC_TYPETRAY, g_plugin.getByte(SRMSGSET_SHOWTYPINGNOWIN, SRMSGDEFSET_SHOWTYPINGNOWIN) ? BST_CHECKED : BST_UNCHECKED);
- CheckDlgButton(hwndDlg, IDC_NOTIFYTRAY, g_plugin.getByte(SRMSGSET_SHOWTYPINGCLIST, SRMSGDEFSET_SHOWTYPINGCLIST) ? BST_CHECKED : BST_UNCHECKED);
- CheckDlgButton(hwndDlg, IDC_NOTIFYBALLOON, !g_plugin.getByte(SRMSGSET_SHOWTYPINGCLIST, SRMSGDEFSET_SHOWTYPINGCLIST) ? BST_CHECKED : BST_UNCHECKED);
- CheckDlgButton(hwndDlg, IDC_TYPINGSWITCH, g_plugin.getByte(SRMSGSET_SHOWTYPINGSWITCH, SRMSGDEFSET_SHOWTYPINGSWITCH) ? BST_CHECKED : BST_UNCHECKED);
+ CheckDlgButton(hwndDlg, IDC_SHOWNOTIFY, g_plugin.bShowTyping ? BST_CHECKED : BST_UNCHECKED);
+ CheckDlgButton(hwndDlg, IDC_TYPEWIN, g_plugin.bShowTypingWin ? BST_CHECKED : BST_UNCHECKED);
+ CheckDlgButton(hwndDlg, IDC_TYPETRAY, g_plugin.bShowTypingTray ? BST_CHECKED : BST_UNCHECKED);
+ CheckDlgButton(hwndDlg, IDC_NOTIFYTRAY, g_plugin.bShowTypingClist ? BST_CHECKED : BST_UNCHECKED);
+ CheckDlgButton(hwndDlg, IDC_NOTIFYBALLOON, !g_plugin.bShowTypingClist ? BST_CHECKED : BST_UNCHECKED);
+ CheckDlgButton(hwndDlg, IDC_TYPINGSWITCH, g_plugin.bShowTypingSwitch ? BST_CHECKED : BST_UNCHECKED);
EnableWindow(GetDlgItem(hwndDlg, IDC_TYPEWIN), IsDlgButtonChecked(hwndDlg, IDC_SHOWNOTIFY));
EnableWindow(GetDlgItem(hwndDlg, IDC_TYPETRAY), IsDlgButtonChecked(hwndDlg, IDC_SHOWNOTIFY));
EnableWindow(GetDlgItem(hwndDlg, IDC_NOTIFYTRAY), IsDlgButtonChecked(hwndDlg, IDC_TYPETRAY));
@@ -846,11 +840,11 @@ static INT_PTR CALLBACK DlgProcTypeOptions(HWND hwndDlg, UINT msg, WPARAM wParam
switch (((LPNMHDR)lParam)->code) {
case PSN_APPLY:
SaveList(hwndDlg, hItemNew, hItemUnknown);
- g_plugin.setByte(SRMSGSET_SHOWTYPING, (BYTE)IsDlgButtonChecked(hwndDlg, IDC_SHOWNOTIFY));
- g_plugin.setByte(SRMSGSET_SHOWTYPINGWIN, (BYTE)IsDlgButtonChecked(hwndDlg, IDC_TYPEWIN));
- g_plugin.setByte(SRMSGSET_SHOWTYPINGNOWIN, (BYTE)IsDlgButtonChecked(hwndDlg, IDC_TYPETRAY));
- g_plugin.setByte(SRMSGSET_SHOWTYPINGCLIST, (BYTE)IsDlgButtonChecked(hwndDlg, IDC_NOTIFYTRAY));
- g_plugin.setByte(SRMSGSET_SHOWTYPINGSWITCH, (BYTE)IsDlgButtonChecked(hwndDlg, IDC_TYPINGSWITCH));
+ g_plugin.bShowTyping = IsDlgButtonChecked(hwndDlg, IDC_SHOWNOTIFY);
+ g_plugin.bShowTypingWin = IsDlgButtonChecked(hwndDlg, IDC_TYPEWIN);
+ g_plugin.bShowTypingTray = IsDlgButtonChecked(hwndDlg, IDC_TYPETRAY);
+ g_plugin.bShowTypingClist = IsDlgButtonChecked(hwndDlg, IDC_NOTIFYTRAY);
+ g_plugin.bShowTypingSwitch = IsDlgButtonChecked(hwndDlg, IDC_TYPINGSWITCH);
ReloadGlobals();
Srmm_Broadcast(DM_OPTIONSAPPLIED, 0, 0);
}
@@ -914,7 +908,6 @@ int OptInitialise(WPARAM wParam, LPARAM)
odp.szGroup.a = LPGEN("Popups");
odp.szTitle.a = LPGEN("Messaging");
odp.pfnDlgProc = DlgProcOptionsPopup;
- odp.flags = ODPF_BOLDGROUPS;
g_plugin.addOptions(wParam, &odp);
return 0;
}
diff --git a/plugins/Scriver/src/msgs.h b/plugins/Scriver/src/msgs.h
index 4159a556c0..569b2d9238 100644
--- a/plugins/Scriver/src/msgs.h
+++ b/plugins/Scriver/src/msgs.h
@@ -340,13 +340,6 @@ extern int fontOptionsListSize;
#define SRMSGSET_LOADHISTORY "LoadHistory"
#define SRMSGDEFSET_LOADHISTORY LOADHISTORY_UNREAD
-#define SRMSGSET_LOADCOUNT "LoadCount"
-#define SRMSGDEFSET_LOADCOUNT 10
-#define SRMSGSET_LOADTIME "LoadTime"
-#define SRMSGDEFSET_LOADTIME 10
-
-#define SRMSGSET_INDENTSIZE "IndentSize"
-#define SRMSGDEFSET_INDENTSIZE 0
#define SRMSGSET_BKGCOLOUR "BkgColour"
#define SRMSGDEFSET_BKGCOLOUR GetSysColor(COLOR_WINDOW)
@@ -361,28 +354,12 @@ extern int fontOptionsListSize;
#define SRMSGSET_LINECOLOUR "LineColour"
#define SRMSGDEFSET_LINECOLOUR GetSysColor(COLOR_WINDOW)
-#define SRMSGSET_USEIEVIEW "UseIEView"
-#define SRMSGDEFSET_USEIEVIEW 1
-
-
#define SRMSGSET_TYPING "SupportTyping"
#define SRMSGSET_TYPINGNEW "DefaultTyping"
#define SRMSGDEFSET_TYPINGNEW 1
#define SRMSGSET_TYPINGUNKNOWN "UnknownTyping"
#define SRMSGDEFSET_TYPINGUNKNOWN 0
-#define SRMSGSET_SHOWTYPING "ShowTyping"
-#define SRMSGDEFSET_SHOWTYPING 1
-#define SRMSGSET_SHOWTYPINGWIN "ShowTypingWin"
-#define SRMSGDEFSET_SHOWTYPINGWIN 1
-#define SRMSGSET_SHOWTYPINGNOWIN "ShowTypingTray"
-#define SRMSGDEFSET_SHOWTYPINGNOWIN 0
-#define SRMSGSET_SHOWTYPINGCLIST "ShowTypingClist"
-#define SRMSGDEFSET_SHOWTYPINGCLIST 1
-#define SRMSGSET_SHOWTYPINGSWITCH "ShowTypingSwitch"
-#define SRMSGDEFSET_SHOWTYPINGSWITCH 1
-
-#define SRMSGSET_USETRANSPARENCY "UseTransparency"
-#define SRMSGDEFSET_USETRANSPARENCY 0
+
#define SRMSGSET_ACTIVEALPHA "ActiveAlpha"
#define SRMSGDEFSET_ACTIVEALPHA 0
#define SRMSGSET_INACTIVEALPHA "InactiveAlpha"
@@ -393,9 +370,6 @@ extern int fontOptionsListSize;
#define SRMSGSET_CHATBUTTONVISIBILITY "ChatButtonVisibility"
#define SRMSGDEFSET_CHATBUTTONVISIBILITY 0xFFFF
-#define SRMSGSET_AUTORESIZELINES "AutoResizeLines"
-#define SRMSGDEFSET_AUTORESIZELINES 2
-
#define SRMSGSET_SENDMODE "SendMode"
#define SRMSGDEFSET_SENDMODE 0
diff --git a/plugins/Scriver/src/srmm.cpp b/plugins/Scriver/src/srmm.cpp
index 86886facc7..018b02fda1 100644
--- a/plugins/Scriver/src/srmm.cpp
+++ b/plugins/Scriver/src/srmm.cpp
@@ -51,6 +51,7 @@ CMPlugin::CMPlugin() :
bAutoMin(SRMM_MODULE, "AutoMin", 0),
bDelTemp(SRMM_MODULE, "DeleteTempCont", 0),
bAutoPopup(SRMM_MODULE, "AutoPopupMsg", 0),
+ bUseIeview(SRMM_MODULE, "UseIEView", 1),
bSaveDrafts(SRMM_MODULE, "SaveDrafts", 0),
bHideContainer(SRMM_MODULE, "HideContainers", 0),
bStayMinimized(SRMM_MODULE, "StayMinimized", 0),
@@ -64,12 +65,13 @@ CMPlugin::CMPlugin() :
bShowDate(SRMM_MODULE, "ShowDate", 0),
bLongDate(SRMM_MODULE, "UseLongDate", 0),
bRelativeDate(SRMM_MODULE, "UseRelativeDate", 0),
- bGroupMessages(SRMM_MODULE, "GroupMessages", 0),
- bMarkFollowups(SRMM_MODULE, "MarkFollowUps", 0),
- bMsgOnNewline(SRMM_MODULE, "MessageOnNewLine", 0),
bDrawLines(SRMM_MODULE, "DrawLines", 0),
bHideNames(SRMM_MODULE, "HideNames", 1),
bIndentText(SRMM_MODULE, "IndentText", 0),
+ bGroupMessages(SRMM_MODULE, "GroupMessages", 0),
+ bMarkFollowups(SRMM_MODULE, "MarkFollowUps", 0),
+ bMsgOnNewline(SRMM_MODULE, "MessageOnNewLine", 0),
+ bUseTransparency(SRMM_MODULE, "UseTransparency", 0),
bShowToolBar(SRMM_MODULE, "ShowButtonLine", 1),
bShowInfoBar(SRMM_MODULE, "ShowInfoBar", 1),
@@ -86,9 +88,19 @@ CMPlugin::CMPlugin() :
bTabCloseButton(SRMM_MODULE, "TabCloseButton", 0),
bSwitchToActive(SRMM_MODULE, "SwitchToActiveTab", 0),
+ bShowTyping(SRMM_MODULE, "ShowTyping", 1),
+ bShowTypingWin(SRMM_MODULE, "ShowTypingWin", 1),
+ bShowTypingTray(SRMM_MODULE, "ShowTypingTray", 0),
+ bShowTypingClist(SRMM_MODULE, "ShowTypingClist", 1),
+ bShowTypingSwitch(SRMM_MODULE, "ShowTypingSwitch", 1),
+
iLimitNames(SRMM_MODULE, "LimitNamesLength", 20),
iLimitTabs(SRMM_MODULE, "LimitTabsNum", 10),
- iLimitChatTabs(SRMM_MODULE, "LimitChatsTabsNum", 10)
+ iLimitChatTabs(SRMM_MODULE, "LimitChatsTabsNum", 10),
+ iLoadCount(SRMM_MODULE, "LoadCount", 10),
+ iLoadTime(SRMM_MODULE, "LoadTime", 10),
+ iIndentSize(SRMM_MODULE, "IndentSize", 0),
+ iAutoResizeLines(SRMM_MODULE, "AutoResizeLines", 2)
{
}
diff --git a/plugins/Scriver/src/stdafx.h b/plugins/Scriver/src/stdafx.h
index bec34bb73c..91e2b5068c 100644
--- a/plugins/Scriver/src/stdafx.h
+++ b/plugins/Scriver/src/stdafx.h
@@ -70,12 +70,13 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
struct CMPlugin : public PLUGIN<CMPlugin>
{
- CMOption<BYTE> bSavePerContact, bCascade, bStayMinimized, bAutoMin, bSaveDrafts, bDelTemp, bHideContainer, bAutoPopup;
+ CMOption<BYTE> bSavePerContact, bCascade, bStayMinimized, bAutoMin, bSaveDrafts, bDelTemp, bHideContainer, bAutoPopup, bUseIeview, bUseTransparency;
CMOption<BYTE> bShowTitleBar, bShowStatusBar, bShowToolBar, bShowInfoBar;
CMOption<BYTE> bShowAvatar, bShowProgress, bShowIcons, bShowTime, bShowSeconds, bShowDate, bLongDate, bRelativeDate;
CMOption<BYTE> bGroupMessages, bMarkFollowups, bMsgOnNewline, bDrawLines, bHideNames, bIndentText;
CMOption<BYTE> bUseTabs, bLimitTabs, bLimitChatTabs, bLimitNames, bSeparateChats, bTabCloseButton, bHideOneTab, bTabsAtBottom, bSwitchToActive;
- CMOption<WORD> iLimitNames, iLimitTabs, iLimitChatTabs;
+ CMOption<BYTE> bShowTyping, bShowTypingWin, bShowTypingTray, bShowTypingClist, bShowTypingSwitch;
+ CMOption<WORD> iLimitNames, iLimitTabs, iLimitChatTabs, iLoadCount, iLoadTime, iIndentSize, iAutoResizeLines;
CMPlugin();
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-15 07:09:34 +0000