diff options
Diffstat (limited to 'plugins/TabSRMM/src/infopanel.cpp')
| -rw-r--r-- | plugins/TabSRMM/src/infopanel.cpp | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/plugins/TabSRMM/src/infopanel.cpp b/plugins/TabSRMM/src/infopanel.cpp index 96d4b09732..33dd5f359a 100644 --- a/plugins/TabSRMM/src/infopanel.cpp +++ b/plugins/TabSRMM/src/infopanel.cpp @@ -79,8 +79,8 @@ void CInfoPanel::loadHeight() m_height = M.GetDword(m_dat->m_hContact, "panelheight", -1);
if (m_height == -1 || HIWORD(m_height) == 0) {
- if (m_dat->m_pContainer->settings->fPrivate)
- m_height = m_dat->m_pContainer->settings->panelheight;
+ if (m_dat->m_pContainer->m_pSettings->fPrivate)
+ m_height = m_dat->m_pContainer->m_pSettings->panelheight;
else
m_height = bSync ? m_defaultHeight : (m_isChat ? m_defaultMUCHeight : m_defaultHeight);
m_fPrivateHeight = false;
@@ -106,8 +106,8 @@ void CInfoPanel::saveHeight(bool fFlush) if (m_height < 110 && m_height >= MIN_PANELHEIGHT) { // only save valid panel splitter positions
if (!m_fPrivateHeight) {
if (!m_isChat || bSync) {
- if (m_dat->m_pContainer->settings->fPrivate)
- m_dat->m_pContainer->settings->panelheight = m_height;
+ if (m_dat->m_pContainer->m_pSettings->fPrivate)
+ m_dat->m_pContainer->m_pSettings->panelheight = m_height;
else {
PluginConfig.m_panelHeight = m_height;
m_defaultHeight = m_height;
@@ -116,8 +116,8 @@ void CInfoPanel::saveHeight(bool fFlush) }
}
else if (m_isChat && !bSync) {
- if (m_dat->m_pContainer->settings->fPrivate)
- m_dat->m_pContainer->settings->panelheight = m_height;
+ if (m_dat->m_pContainer->m_pSettings->fPrivate)
+ m_dat->m_pContainer->m_pSettings->panelheight = m_height;
else {
PluginConfig.m_MUCpanelHeight = m_height;
m_defaultMUCHeight = m_height;
@@ -147,7 +147,7 @@ void CInfoPanel::setHeight(LONG newHeight, bool fBroadcast) if (fBroadcast) {
if (!m_fPrivateHeight) {
- if (!m_dat->m_pContainer->settings->fPrivate)
+ if (!m_dat->m_pContainer->m_pSettings->fPrivate)
Srmm_Broadcast(DM_SETINFOPANEL, (WPARAM)m_dat, (LPARAM)newHeight);
else
::BroadCastContainer(m_dat->m_pContainer, DM_SETINFOPANEL, (WPARAM)m_dat, (LPARAM)newHeight);
@@ -163,7 +163,7 @@ void CInfoPanel::Configure() const void CInfoPanel::showHide() const
{
- HBITMAP hbm = (m_active && m_dat->m_pContainer->avatarMode != 3) ? m_dat->m_hOwnPic : (m_dat->m_ace ? m_dat->m_ace->hbmPic : PluginConfig.g_hbmUnknown);
+ HBITMAP hbm = (m_active && m_dat->m_pContainer->m_avatarMode != 3) ? m_dat->m_hOwnPic : (m_dat->m_ace ? m_dat->m_ace->hbmPic : PluginConfig.g_hbmUnknown);
HWND hwndDlg = m_dat->GetHwnd();
if (!m_isChat) {
@@ -223,7 +223,7 @@ bool CInfoPanel::getVisibility() return false;
}
- BYTE bDefault = (m_dat->m_pContainer->dwFlags & CNT_INFOPANEL) ? 1 : 0;
+ BYTE bDefault = (m_dat->m_pContainer->m_dwFlags & CNT_INFOPANEL) ? 1 : 0;
BYTE bContact = M.GetByte(m_dat->m_hContact, "infopanel", 0);
BYTE visible = (bContact == 0 ? bDefault : (bContact == (BYTE)-1 ? 0 : 1));
@@ -1078,7 +1078,7 @@ INT_PTR CALLBACK CInfoPanel::ConfigDlgProc(HWND hwnd, UINT msg, WPARAM wParam, L ::CheckDlgButton(hwnd, IDC_NOSYNC, M.GetByte("syncAllPanels", 0) ? BST_UNCHECKED : BST_CHECKED);
- Utils::showDlgControl(hwnd, IDC_IPCONFIG_PRIVATECONTAINER, m_dat->m_pContainer->settings->fPrivate ? SW_SHOW : SW_HIDE);
+ Utils::showDlgControl(hwnd, IDC_IPCONFIG_PRIVATECONTAINER, m_dat->m_pContainer->m_pSettings->fPrivate ? SW_SHOW : SW_HIDE);
if (!m_isChat) {
v = db_get_b(m_dat->m_hContact, SRMSGMOD_T, "hideavatar", -1);
@@ -1193,13 +1193,13 @@ INT_PTR CALLBACK CInfoPanel::ConfigDlgProc(HWND hwnd, UINT msg, WPARAM wParam, L db_set_b(0, SRMSGMOD_T, "syncAllPanels", ::IsDlgButtonChecked(hwnd, IDC_NOSYNC) ? 0 : 1);
if (BST_UNCHECKED == IsDlgButtonChecked(hwnd, IDC_NOSYNC)) {
loadHeight();
- if (!m_dat->m_pContainer->settings->fPrivate)
+ if (!m_dat->m_pContainer->m_pSettings->fPrivate)
Srmm_Broadcast(DM_SETINFOPANEL, (WPARAM)m_dat, (LPARAM)m_defaultHeight);
else
::BroadCastContainer(m_dat->m_pContainer, DM_SETINFOPANEL, (WPARAM)m_dat, (LPARAM)m_defaultHeight);
}
else {
- if (!m_dat->m_pContainer->settings->fPrivate)
+ if (!m_dat->m_pContainer->m_pSettings->fPrivate)
Srmm_Broadcast(DM_SETINFOPANEL, (WPARAM)m_dat, 0);
else
::BroadCastContainer(m_dat->m_pContainer, DM_SETINFOPANEL, (WPARAM)m_dat, 0);
|