diff -uraN src/mainwin.h src~/mainwin.h --- src/mainwin.h 2004-09-15 19:14:06.000000000 +0400 +++ src~/mainwin.h 2004-09-28 19:16:56.485815523 +0400 @@ -150,6 +150,7 @@ m_bAutoPosReplyWin, m_bAutoSendThroughServer, m_bEnableMainwinMouseMovement, + m_bShowKoloboks, m_bPopEmail, m_bPopPhone, m_bPopFax, diff -uraN src/mlview3.cpp src~/mlview3.cpp --- src/mlview3.cpp 2004-01-17 16:18:18.000000000 +0300 +++ src~/mlview3.cpp 2004-09-28 19:17:53.767142190 +0400 @@ -83,7 +83,8 @@ // not used for html now QString text = QStyleSheet::escape(s); QString text = useHTML ? s: QStyleSheet::escape(s); - gMainWindow->emoticons->ParseMessage(text); + if (gMainWindow->m_bShowKoloboks) + gMainWindow->emoticons->ParseMessage(text); // We must hightlight URLs at this step, before we convert // linebreaks to richtext tags and such. Also, check to make sure diff -uraN src/optionsdlg.cpp src~/optionsdlg.cpp --- src/optionsdlg.cpp 2004-09-06 16:50:56.000000000 +0400 +++ src~/optionsdlg.cpp 2004-09-28 19:19:38.975690580 +0400 @@ -216,6 +216,7 @@ chkAutoPosReplyWin->setChecked(mainwin->m_bAutoPosReplyWin); chkAutoSendThroughServer->setChecked(mainwin->m_bAutoSendThroughServer); chkEnableMainwinMouseMovement->setChecked(mainwin->m_bEnableMainwinMouseMovement); + chkShowKoloboks->setChecked(mainwin->m_bShowKoloboks); popEmail->setChecked(mainwin->m_bPopEmail); popPhone->setChecked(mainwin->m_bPopPhone); popFax->setChecked(mainwin->m_bPopFax); @@ -494,6 +495,7 @@ mainwin->m_bAutoPosReplyWin = chkAutoPosReplyWin->isChecked(); mainwin->m_bAutoSendThroughServer = chkAutoSendThroughServer->isChecked(); mainwin->m_bEnableMainwinMouseMovement = chkEnableMainwinMouseMovement->isChecked(); + mainwin->m_bShowKoloboks = chkShowKoloboks->isChecked(); mainwin->m_bPopEmail= popEmail->isChecked(); mainwin->m_bPopPhone= popPhone->isChecked(); @@ -768,6 +770,8 @@ chkEnableMainwinMouseMovement = new QCheckBox(tr("Allow dragging main window"), boxMainWin); QWhatsThis::add(chkEnableMainwinMouseMovement, tr("Lets you drag around the main window " "with your mouse")); + chkShowKoloboks = new QCheckBox(tr("Show graphical smiles instead of text ones"), boxMainWin); + QWhatsThis::add(chkShowKoloboks, tr("Lets you see only text messages, without any emotional icons")); chkMsgChatView = new QCheckBox(tr("Chatmode Messageview"), boxMainWin); QWhatsThis::add(chkMsgChatView, tr("Show the current chat history in Send Window")); diff -uraN src/optionsdlg.h src~/optionsdlg.h --- src/optionsdlg.h 2004-07-12 05:36:17.000000000 +0400 +++ src~/optionsdlg.h 2004-09-28 19:19:52.303971975 +0400 @@ -79,7 +79,8 @@ *chkAlwaysShowONU, *chkScrollBar, *chkShowExtIcons, *chkSysBack, *chkSendFromClipboard, *chkMsgChatView, *chkAutoPosReplyWin, *chkAutoSendThroughServer, *chkTabbedChatting, - *chkEnableMainwinMouseMovement; + *chkEnableMainwinMouseMovement, + *chkShowKoloboks; QRadioButton *rdbDockDefault, *rdbDockThemed, *rdbDockSmall; QComboBox *cmbDockTheme, *cmbSortBy;