From 7e01ecab6995e32f7d0f8b2c07f9485fb6a066fc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=A9r=C3=A9my=20Quentin?=
<jquentin@jquentin-laptop-kub2.(none)>
Date: Tue, 21 Jul 2009 18:21:47 -0400
Subject: [PATCH] [#1886] separated initCallItem in two functions
---
sflphone-client-kde/src/Call.cpp | 59 +++++++++++++++++---------------
sflphone-client-kde/src/Call.h | 1 +
2 files changed, 32 insertions(+), 28 deletions(-)
diff --git a/sflphone-client-kde/src/Call.cpp b/sflphone-client-kde/src/Call.cpp
index ef0975796a..99395a0d77 100644
--- a/sflphone-client-kde/src/Call.cpp
+++ b/sflphone-client-kde/src/Call.cpp
@@ -108,7 +108,11 @@ void Call::initCallItem()
item = new QListWidgetItem();
item->setSizeHint(QSize(140,45));
item->setFlags(Qt::ItemIsSelectable|Qt::ItemIsDragEnabled|Qt::ItemIsDropEnabled|Qt::ItemIsEnabled);
-
+ initCallItemWidget();
+}
+
+void Call::initCallItemWidget()
+{
itemWidget = new QWidget();
labelIcon = new QLabel();
labelCallNumber = new QLabel(peerPhoneNumber);
@@ -393,34 +397,33 @@ QListWidgetItem * Call::getHistoryItem()
QWidget * Call::getHistoryItemWidget()
{
- historyItemWidget = new QWidget();
- labelHistoryIcon = new QLabel();
- labelHistoryIcon->setPixmap(QPixmap(historyIcons[historyState]));
- labelHistoryCallNumber = new QLabel(peerPhoneNumber);
- labelHistoryTime = new QLabel(startTime->toString(Qt::LocaleDate));
-
- QSpacerItem * horizontalSpacer = new QSpacerItem(16777215, 20, QSizePolicy::Preferred, QSizePolicy::Minimum);
+ historyItemWidget = new QWidget();
+ labelHistoryIcon = new QLabel();
+ labelHistoryIcon->setPixmap(QPixmap(historyIcons[historyState]));
+ labelHistoryCallNumber = new QLabel(peerPhoneNumber);
+ labelHistoryTime = new QLabel(startTime->toString(Qt::LocaleDate));
- QHBoxLayout * mainLayout = new QHBoxLayout();
- mainLayout->setContentsMargins ( 3, 1, 2, 1);
- mainLayout->setSpacing(4);
- QVBoxLayout * descr = new QVBoxLayout();
- descr->setMargin(1);
- descr->setSpacing(1);
- descr->setMargin(0);
- descr->setSpacing(1);
- mainLayout->addWidget(labelHistoryIcon);
- if(! peerName.isEmpty())
- {
- labelHistoryPeerName = new QLabel(peerName);
- descr->addWidget(labelHistoryPeerName);
- }
- descr->addWidget(labelHistoryCallNumber);
- descr->addWidget(labelHistoryTime);
- mainLayout->addLayout(descr);
- mainLayout->addItem(horizontalSpacer);
- historyItemWidget->setLayout(mainLayout);
-// }
+ QSpacerItem * horizontalSpacer = new QSpacerItem(16777215, 20, QSizePolicy::Preferred, QSizePolicy::Minimum);
+
+ QHBoxLayout * mainLayout = new QHBoxLayout();
+ mainLayout->setContentsMargins ( 3, 1, 2, 1);
+ mainLayout->setSpacing(4);
+ QVBoxLayout * descr = new QVBoxLayout();
+ descr->setMargin(1);
+ descr->setSpacing(1);
+ descr->setMargin(0);
+ descr->setSpacing(1);
+ mainLayout->addWidget(labelHistoryIcon);
+ if(! peerName.isEmpty())
+ {
+ labelHistoryPeerName = new QLabel(peerName);
+ descr->addWidget(labelHistoryPeerName);
+ }
+ descr->addWidget(labelHistoryCallNumber);
+ descr->addWidget(labelHistoryTime);
+ mainLayout->addLayout(descr);
+ mainLayout->addItem(horizontalSpacer);
+ historyItemWidget->setLayout(mainLayout);
return historyItemWidget;
}
diff --git a/sflphone-client-kde/src/Call.h b/sflphone-client-kde/src/Call.h
index 3d3ae20fc7..690dce8ffd 100644
--- a/sflphone-client-kde/src/Call.h
+++ b/sflphone-client-kde/src/Call.h
@@ -235,6 +235,7 @@ public:
//Constructors & Destructors
~Call();
void initCallItem();
+ void initCallItemWidget();
static Call * buildDialingCall(QString callId, const QString & peerName, QString account = "");
static Call * buildIncomingCall(const QString & callId);
static Call * buildRingingCall(const QString & callId);
--
GitLab