diff options
| author | George Hazan <ghazan@miranda.im> | 2019-09-04 21:14:12 +0300 |
|---|---|---|
| committer | George Hazan <ghazan@miranda.im> | 2019-09-04 21:14:12 +0300 |
| commit | f64fcd4b52cd725e4ddb9afb168d5c4ec6fa256f (patch) | |
| tree | 16af4df624f1e87fe561bf237e40f5826b4630a7 /src | |
| parent | 84fdd0b18e45ea5d9fc84550387479b02bf2bfc1 (diff) | |
StdMsg: unneeded options removed
Diffstat (limited to 'src')
| -rw-r--r-- | src/core/stdmsg/src/chat_options.cpp | 2 | ||||
| -rw-r--r-- | src/core/stdmsg/src/msgdialog.cpp | 16 |
2 files changed, 1 insertions, 17 deletions
diff --git a/src/core/stdmsg/src/chat_options.cpp b/src/core/stdmsg/src/chat_options.cpp index 5c970a63fc..2b4089342a 100644 --- a/src/core/stdmsg/src/chat_options.cpp +++ b/src/core/stdmsg/src/chat_options.cpp @@ -34,8 +34,6 @@ static branch_t branch1[] = { { LPGENW("Flash window when someone speaks"), "FlashWindow", 0, false }, { LPGENW("Flash window when a word is highlighted"), "FlashWindowHighlight", 0, true }, { LPGENW("Show list of users in the chat room"), "ShowNicklist", 0, true }, - { LPGENW("Show buttons for controlling the chat room"), "ShowTopButtons", 0, true }, - { LPGENW("Show buttons for formatting the text you are typing"), "ShowFormatButtons", 0, true }, { LPGENW("Show button menus when right clicking the buttons"), "RightClickFilter", 0, false }, { LPGENW("Show the topic of the room on your contact list (if supported)"), "TopicOnClist", 0, false }, { LPGENW("Do not play sounds when the chat room is focused"), "SoundsFocus", 0, false }, diff --git a/src/core/stdmsg/src/msgdialog.cpp b/src/core/stdmsg/src/msgdialog.cpp index 92a66934e7..47db8d6669 100644 --- a/src/core/stdmsg/src/msgdialog.cpp +++ b/src/core/stdmsg/src/msgdialog.cpp @@ -463,9 +463,7 @@ void CMsgDialog::onChange_Text(CCtrlEdit*) int CMsgDialog::Resizer(UTILRESIZECONTROL *urc)
{
if (isChat()) {
- bool bControl = db_get_b(0, CHAT_MODULE, "ShowTopButtons", 1) != 0;
- bool bFormat = db_get_b(0, CHAT_MODULE, "ShowFormatButtons", 1) != 0;
- bool bToolbar = bFormat || bControl;
+ bool bToolbar = g_dat.bShowButtons;
bool bSend = g_dat.bSendButton;
bool bNick = m_si->iType != GCW_SERVER && m_bNicklistEnabled;
@@ -611,20 +609,8 @@ INT_PTR CMsgDialog::DlgProc(UINT uMsg, WPARAM wParam, LPARAM lParam) if (isChat()) {
bottomScroll = false;
bool bSend = g_dat.bSendButton;
- bool bFormat = db_get_b(0, CHAT_MODULE, "ShowFormatButtons", 1) != 0;
- bool bControl = db_get_b(0, CHAT_MODULE, "ShowTopButtons", 1) != 0;
bool bNick = m_si->iType != GCW_SERVER && m_bNicklistEnabled;
- m_btnBold.Show(bFormat);
- m_btnItalic.Show(bFormat);
- m_btnUnderline.Show(bFormat);
-
- m_btnColor.Show(bFormat);
- m_btnBkColor.Show(bFormat);
- m_btnHistory.Show(bControl);
- m_btnNickList.Show(bControl);
- m_btnFilter.Show(bControl);
- m_btnChannelMgr.Show(bControl);
m_btnOk.Show(bSend);
m_splitterX.Show(bNick);
if (m_si->iType != GCW_SERVER)
|