Ticket #1441: licq-1.3.4-patch-1441

File licq-1.3.4-patch-1441, 4.0 kB (added by flynd, 22 months ago)

Patch that implements this enhancment in 1.3.4.

Line 
1diff -Naur licq-1.3.4-orig/plugins/qt-gui/src/mainwin.cpp licq-1.3.4/plugins/qt-gui/src/mainwin.cpp
2--- licq-1.3.4-orig/plugins/qt-gui/src/mainwin.cpp  2006-10-15 14:11:41.000000000 +0200
3+++ licq-1.3.4/plugins/qt-gui/src/mainwin.cpp   2006-11-01 21:50:13.000000000 +0100
4@@ -471,6 +471,7 @@
5   licqConf.ReadStr("ChatBackground", szTemp, "white");
6   m_colorChatBkg = QColor(szTemp);
7 
8+  licqConf.ReadBool("showPopPicture", m_bPopPicture, true);
9   licqConf.ReadBool("showPopAlias", m_bPopAlias, false);
10   licqConf.ReadBool("showPopName", m_bPopName, false);
11   licqConf.ReadBool("showPopEmail", m_bPopEmail, false);
12@@ -3682,6 +3683,7 @@
13   licqConf.WriteStr("TabOnTypingColor", m_colorTabTyping.name());
14   licqConf.WriteStr("ChatBackground", m_colorChatBkg.name());
15   
16+  licqConf.WriteBool("showPopPicture", m_bPopPicture);
17   licqConf.WriteBool("showPopAlias", m_bPopAlias);
18   licqConf.WriteBool("showPopName", m_bPopName);
19   licqConf.WriteBool("showPopEmail", m_bPopEmail);
20diff -Naur licq-1.3.4-orig/plugins/qt-gui/src/mainwin.h licq-1.3.4/plugins/qt-gui/src/mainwin.h
21--- licq-1.3.4-orig/plugins/qt-gui/src/mainwin.h    2006-10-15 14:11:40.000000000 +0200
22+++ licq-1.3.4/plugins/qt-gui/src/mainwin.h 2006-11-01 21:49:14.000000000 +0100
23@@ -137,6 +137,7 @@
24        m_bAutoPosReplyWin,
25        m_bAutoSendThroughServer,
26        m_bEnableMainwinMouseMovement,
27+       m_bPopPicture,
28        m_bPopAlias,
29        m_bPopName,
30        m_bPopEmail,
31diff -Naur licq-1.3.4-orig/plugins/qt-gui/src/optionsdlg.cpp licq-1.3.4/plugins/qt-gui/src/optionsdlg.cpp
32--- licq-1.3.4-orig/plugins/qt-gui/src/optionsdlg.cpp   2006-10-15 14:11:41.000000000 +0200
33+++ licq-1.3.4/plugins/qt-gui/src/optionsdlg.cpp    2006-11-01 21:52:18.000000000 +0100
34@@ -243,6 +243,7 @@
35   chkMainWinSticky->setChecked(mainwin->m_bMainWinSticky);
36   chkMsgWinSticky->setChecked(mainwin->m_bMsgWinSticky);
37   chkSingleLineChatMode->setChecked(mainwin->m_bSingleLineChatMode);
38+  popPicture->setChecked(mainwin->m_bPopPicture);
39   popAlias->setChecked(mainwin->m_bPopAlias);
40   popName->setChecked(mainwin->m_bPopName);
41   popEmail->setChecked(mainwin->m_bPopEmail);
42@@ -545,6 +546,7 @@
43   mainwin->m_bMsgWinSticky = chkMsgWinSticky->isChecked();
44   mainwin->m_bSingleLineChatMode = chkSingleLineChatMode->isChecked();
45 
46+  mainwin->m_bPopPicture = popPicture->isChecked();
47   mainwin->m_bPopAlias = popAlias->isChecked();
48   mainwin->m_bPopName = popName->isChecked();
49   mainwin->m_bPopEmail = popEmail->isChecked();
50@@ -1460,6 +1462,7 @@
51 
52   boxPopWin = new QGroupBox(1, Horizontal, tr("Popup info"), w);
53 
54+  popPicture= new QCheckBox(tr("Picture"), boxPopWin);
55   popAlias  = new QCheckBox(tr("Alias"), boxPopWin);
56   popName   = new QCheckBox(tr("Name"),  boxPopWin);
57   popEmail  = new QCheckBox(tr("Email"), boxPopWin);
58diff -Naur licq-1.3.4-orig/plugins/qt-gui/src/optionsdlg.h licq-1.3.4/plugins/qt-gui/src/optionsdlg.h
59--- licq-1.3.4-orig/plugins/qt-gui/src/optionsdlg.h 2006-10-15 14:11:41.000000000 +0200
60+++ licq-1.3.4/plugins/qt-gui/src/optionsdlg.h  2006-11-01 21:51:43.000000000 +0100
61@@ -135,7 +135,7 @@
62    // display tab
63    QWidget* new_popup_options();
64    QGroupBox *boxPopWin;
65-   QCheckBox *popAlias, *popName, *popEmail, *popPhone,
66+   QCheckBox *popPicture, *popAlias, *popName, *popEmail, *popPhone,
67              *popFax, *popCellular, *popIP,
68              *popLastOnline, *popOnlineSince, *popIdleTime, *popID;
69 
70diff -Naur licq-1.3.4-orig/plugins/qt-gui/src/userbox.cpp licq-1.3.4/plugins/qt-gui/src/userbox.cpp
71--- licq-1.3.4-orig/plugins/qt-gui/src/userbox.cpp  2006-10-15 14:11:41.000000000 +0200
72+++ licq-1.3.4/plugins/qt-gui/src/userbox.cpp   2006-11-01 21:47:12.000000000 +0100
73@@ -1678,7 +1678,7 @@
74     ICQUser *u = gUserManager.FetchUser(item->m_szId, item->m_nPPID, LOCK_R);
75     QTextCodec * codec = UserCodec::codecForICQUser(u);
76     QString strFileName = "";
77-    if (u && u->GetPicturePresent())
78+    if (u && u->GetPicturePresent() && gMainWindow->m_bPopPicture)
79     {
80       const QString file = QString("%1/%2/%3.pic").arg(BASE_DIR).arg(USER_DIR).arg(u->IdString());
81       const QImage picture = QImage(file);