summaryrefslogtreecommitdiff
blob: a76080c2845eb69bc54a292303a8869410f7f0eb (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
Only in src~: 1.3.0-no_stupid_koloboks.patch
Common subdirectories: src/CVS and src~/CVS
diff -u src/mainwin.h src~/mainwin.h
--- src/mainwin.h	2004-08-10 17:49:24.000000000 +0400
+++ src~/mainwin.h	2004-08-20 22:49:01.383931834 +0400
@@ -131,6 +131,7 @@
        m_bAutoPosReplyWin,
        m_bAutoSendThroughServer,
        m_bEnableMainwinMouseMovement,
+       m_bShowKoloboks,
        m_bPopEmail,
        m_bPopPhone,
        m_bPopFax,
diff -u src/mlview3.cpp src~/mlview3.cpp
--- src/mlview3.cpp	2004-08-20 23:21:25.338742474 +0400
+++ src~/mlview3.cpp	2004-08-20 23:26:33.794602521 +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
Common subdirectories: src/moc and src~/moc
Common subdirectories: src/obj and src~/obj
diff -u src/optionsdlg.cpp src~/optionsdlg.cpp
--- src/optionsdlg.cpp	2004-07-12 05:36:17.000000000 +0400
+++ src~/optionsdlg.cpp	2004-08-20 22:53:43.592957691 +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);
@@ -491,6 +492,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();
@@ -752,6 +754,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 -u src/optionsdlg.h src~/optionsdlg.h
--- src/optionsdlg.h	2004-07-12 05:36:17.000000000 +0400
+++ src~/optionsdlg.h	2004-08-20 23:22:49.063329574 +0400
@@ -79,7 +79,7 @@
              *chkAlwaysShowONU, *chkScrollBar, *chkShowExtIcons,
              *chkSysBack, *chkSendFromClipboard, *chkMsgChatView, *chkAutoPosReplyWin,
 	     *chkAutoSendThroughServer, *chkTabbedChatting,
-             *chkEnableMainwinMouseMovement;
+             *chkEnableMainwinMouseMovement, *chkShowKoloboks;
    QRadioButton *rdbDockDefault, *rdbDockThemed, *rdbDockSmall;
    QComboBox *cmbDockTheme, *cmbSortBy;
 
Common subdirectories: src/xpm and src~/xpm