[SCM] ktp-text-ui packaging branch, master, updated. debian/15.12.1-1-1918-gdf4b0ec
Maximiliano Curia
maxy at moszumanska.debian.org
Sat May 28 00:24:36 UTC 2016
Gitweb-URL: http://git.debian.org/?p=pkg-kde/applications/ktp-text-ui.git;a=commitdiff;h=cfa13da
The following commit has been merged in the master branch:
commit cfa13da6148a0610632adb8530db9271104fe8b4
Author: Daniel Cohen <analoguecolour at gmail.com>
Date: Mon Apr 21 13:41:52 2014 +0100
Added join message capability, configuration tied with leave messages
---
config/appearance-config-tab.cpp | 21 ++++++++++++++-------
config/appearance-config-tab.h | 2 +-
config/appearance-config.ui | 4 ++--
lib/adium-theme-view.cpp | 10 +++++-----
lib/adium-theme-view.h | 6 +++---
lib/chat-widget.cpp | 25 +++++++++++++++++++------
lib/chat-widget.h | 6 +++++-
7 files changed, 49 insertions(+), 25 deletions(-)
diff --git a/config/appearance-config-tab.cpp b/config/appearance-config-tab.cpp
index f8314d8..7d69192 100644
--- a/config/appearance-config-tab.cpp
+++ b/config/appearance-config-tab.cpp
@@ -60,7 +60,7 @@ AppearanceConfigTab::AppearanceConfigTab(QWidget *parent, TabMode mode)
connect(ui->fontFamily, SIGNAL(currentFontChanged(QFont)), SLOT(onFontFamilyChanged(QFont)));
connect(ui->fontSize, SIGNAL(valueChanged(int)), SLOT(onFontSizeChanged(int)));
connect(ui->showPresenceCheckBox, SIGNAL(toggled(bool)), SLOT(onShowPresenceChangesChanged(bool)));
- connect(ui->showLeaveCheckBox, SIGNAL(toggled(bool)), SLOT(onShowLeaveChangesChanged(bool)));
+ connect(ui->showJoinLeaveCheckBox, SIGNAL(toggled(bool)), SLOT(onShowJoinLeaveChangesChanged(bool)));
}
AppearanceConfigTab::~AppearanceConfigTab()
@@ -108,9 +108,9 @@ void AppearanceConfigTab::onShowPresenceChangesChanged(bool stateChanged)
tabChanged();
}
-void AppearanceConfigTab::onShowLeaveChangesChanged(bool leaveChanged)
+void AppearanceConfigTab::onShowJoinLeaveChangesChanged(bool joinLeaveChanged)
{
- ui->chatView->setShowLeaveChanges(leaveChanged);
+ ui->chatView->setShowJoinLeaveChanges(joinLeaveChanged);
ui->chatView->initialise(m_demoChatHeader);
tabChanged();
}
@@ -206,13 +206,20 @@ void AppearanceConfigTab::sendDemoMessages()
statusMessage.setTime(QDateTime::currentDateTime());
ui->chatView->addAdiumStatusMessage(statusMessage);
- if (ui->chatView->showLeaveChanges()) {
+ if (ui->chatView->showJoinLeaveChanges()) {
statusMessage = AdiumThemeStatusInfo(true);
statusMessage.setMessage(i18nc("Example message in preview conversation","Ted Example has left the chat.")); //FIXME sync this with chat text logic.
statusMessage.setSender(i18nc("Example name", "Ted Example"));
statusMessage.setTime(QDateTime::currentDateTime());
statusMessage.setStatus(QLatin1String("away"));
ui->chatView->addAdiumStatusMessage(statusMessage);
+
+ statusMessage = AdiumThemeStatusInfo(false);
+ statusMessage.setMessage(i18nc("Example message in preview conversation","Ted Example has joined the chat.")); //FIXME sync this with chat text logic.
+ statusMessage.setSender(i18nc("Example name", "Ted Example"));
+ statusMessage.setTime(QDateTime::currentDateTime());
+ statusMessage.setStatus(QLatin1String("away"));
+ ui->chatView->addAdiumStatusMessage(statusMessage);
}
message = AdiumThemeContentInfo(AdiumThemeMessageInfo::RemoteToLocal);
@@ -282,7 +289,7 @@ void AppearanceConfigTab::saveTab(KConfigGroup appearanceConfigGroup)
appearanceConfigGroup.writeEntry(QLatin1String("fontFamily"), ui->fontFamily->currentFont().family());
appearanceConfigGroup.writeEntry(QLatin1String("fontSize"), ui->fontSize->value());
appearanceConfigGroup.writeEntry(QLatin1String("showPresenceChanges"), ui->showPresenceCheckBox->isChecked());
- appearanceConfigGroup.writeEntry(QLatin1String("showLeaveChanges"), ui->showLeaveCheckBox->isChecked());
+ appearanceConfigGroup.writeEntry(QLatin1String("showJoinLeaveChanges"), ui->showJoinLeaveCheckBox->isChecked());
appearanceConfigGroup.sync();
}
@@ -308,7 +315,7 @@ void AppearanceConfigTab::loadTab()
ui->fontFamily->setCurrentFont(QFont(ui->chatView->fontFamily()));
ui->fontSize->setValue(ui->chatView->fontSize());
ui->showPresenceCheckBox->setChecked(ui->chatView->showPresenceChanges());
- ui->showLeaveCheckBox->setChecked(ui->chatView->showLeaveChanges());
+ ui->showJoinLeaveCheckBox->setChecked(ui->chatView->showJoinLeaveChanges());
}
void AppearanceConfigTab::defaultTab()
@@ -329,6 +336,6 @@ void AppearanceConfigTab::defaultTab()
ui->fontFamily->setCurrentFont(KGlobalSettings::generalFont());
ui->fontSize->setValue(QWebSettings::DefaultFontSize);
ui->showPresenceCheckBox->setChecked(!m_groupChat);
- ui->showLeaveCheckBox->setChecked(!m_groupChat);
+ ui->showJoinLeaveCheckBox->setChecked(!m_groupChat);
}
diff --git a/config/appearance-config-tab.h b/config/appearance-config-tab.h
index 9582660..a9521b9 100644
--- a/config/appearance-config-tab.h
+++ b/config/appearance-config-tab.h
@@ -66,7 +66,7 @@ private Q_SLOTS:
void onFontFamilyChanged(const QFont &font);
void onFontSizeChanged(int fontSize);
void onShowPresenceChangesChanged(bool stateChanged);
- void onShowLeaveChangesChanged(bool leaveChanged);
+ void onShowJoinLeaveChangesChanged(bool joinLeaveChanged);
private:
Ui::ChatWindowConfig *ui;
diff --git a/config/appearance-config.ui b/config/appearance-config.ui
index 6440cba..92b78d2 100644
--- a/config/appearance-config.ui
+++ b/config/appearance-config.ui
@@ -131,7 +131,7 @@
</widget>
</item>
<item row="4" column="1">
- <widget class="QCheckBox" name="showLeaveCheckBox">
+ <widget class="QCheckBox" name="showJoinLeaveCheckBox">
<property name="sizePolicy">
<sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
<horstretch>0</horstretch>
@@ -139,7 +139,7 @@
</sizepolicy>
</property>
<property name="text">
- <string>Show when contacts leave chat</string>
+ <string>Show when contacts join/leave chat</string>
</property>
</widget>
</item>
diff --git a/lib/adium-theme-view.cpp b/lib/adium-theme-view.cpp
index e0ad0b1..a3429cf 100644
--- a/lib/adium-theme-view.cpp
+++ b/lib/adium-theme-view.cpp
@@ -123,7 +123,7 @@ void AdiumThemeView::load(ChatType chatType) {
m_fontSize = appearanceConfig.readEntry("fontSize", QWebSettings::globalSettings()->fontSize(QWebSettings::DefaultFontSize));
m_showPresenceChanges = appearanceConfig.readEntry("showPresenceChanges", true);
- m_showLeaveChanges = appearanceConfig.readEntry("showLeaveChanges", true);
+ m_showJoinLeaveChanges = appearanceConfig.readEntry("showJoinLeaveChanges", true);
}
void AdiumThemeView::viewLoadFinished()
@@ -386,14 +386,14 @@ bool AdiumThemeView::showPresenceChanges() const
return m_showPresenceChanges;
}
-void AdiumThemeView::setShowLeaveChanges(bool showLeaveChanges)
+void AdiumThemeView::setShowJoinLeaveChanges(bool showLeaveChanges)
{
- m_showLeaveChanges = showLeaveChanges;
+ m_showJoinLeaveChanges = showLeaveChanges;
}
-bool AdiumThemeView::showLeaveChanges() const
+bool AdiumThemeView::showJoinLeaveChanges() const
{
- return m_showLeaveChanges;
+ return m_showJoinLeaveChanges;
}
bool AdiumThemeView::isHeaderDisplayed() const
diff --git a/lib/adium-theme-view.h b/lib/adium-theme-view.h
index 5eaab55..881d0d7 100644
--- a/lib/adium-theme-view.h
+++ b/lib/adium-theme-view.h
@@ -97,8 +97,8 @@ public:
void setShowPresenceChanges(bool showPresenceChanges);
bool showPresenceChanges() const;
- void setShowLeaveChanges(bool showLeaveChanges);
- bool showLeaveChanges() const;
+ void setShowJoinLeaveChanges(bool showJoinLeaveChanges);
+ bool showJoinLeaveChanges() const;
void clear();
@@ -133,7 +133,7 @@ private:
QString m_fontFamily;
int m_fontSize;
bool m_showPresenceChanges;
- bool m_showLeaveChanges;
+ bool m_showJoinLeaveChanges;
QString appendScript(AppendMode mode);
AppendMode appendMode(const AdiumThemeMessageInfo &message,
diff --git a/lib/chat-widget.cpp b/lib/chat-widget.cpp
index 3929e45..1c6963f 100644
--- a/lib/chat-widget.cpp
+++ b/lib/chat-widget.cpp
@@ -507,7 +507,11 @@ void ChatWidget::setupChannelSignals()
Tp::Contacts,
Tp::Contacts,
Tp::Channel::GroupMemberChangeDetails)),
- this, SLOT(onParticipantsChanged()));
+ this, SLOT(onParticipantsChanged(Tp::Contacts,
+ Tp::Contacts,
+ Tp::Contacts,
+ Tp::Contacts,
+ Tp::Channel::GroupMemberChangeDetails)));
if (d->channel->hasChatStateInterface()) {
connect(d->ui.sendMessageBox, SIGNAL(textChanged()), SLOT(onInputBoxChanged()));
@@ -750,7 +754,7 @@ void ChatWidget::onChatStatusChanged(const Tp::ContactPtr & contact, Tp::Channel
}
if (state == Tp::ChannelChatStateGone) {
- if (d->ui.chatArea->showLeaveChanges()) {
+ if (d->ui.chatArea->showJoinLeaveChanges()) {
d->ui.chatArea->addStatusMessage(i18n("%1 has left the chat", contact->alias()), contact->alias());
}
}
@@ -783,8 +787,6 @@ void ChatWidget::onChatStatusChanged(const Tp::ContactPtr & contact, Tp::Channel
}
}
-
-
void ChatWidget::onContactPresenceChange(const Tp::ContactPtr & contact, const KTp::Presence &presence)
{
QString message;
@@ -879,8 +881,19 @@ void ChatWidget::onContactClientTypesChanged(const Tp::ContactPtr &contact, cons
}
}
-void ChatWidget::onParticipantsChanged()
-{
+void ChatWidget::onParticipantsChanged(Tp::Contacts groupMembersAdded,
+ Tp::Contacts groupLocalPendingMembersAdded,
+ Tp::Contacts groupRemotePendingMembersAdded,
+ Tp::Contacts groupMembersRemoved,
+ Tp::Channel::GroupMemberChangeDetails details) {
+ Q_UNUSED(groupLocalPendingMembersAdded);
+ Q_UNUSED(groupRemotePendingMembersAdded);
+ Q_UNUSED(groupMembersRemoved);
+ Q_UNUSED(details);
+
+ if (groupMembersAdded.count() > 0 && (d->ui.chatArea->showJoinLeaveChanges())) {
+ d->ui.chatArea->addStatusMessage(i18n("%1 has joined the chat", groupMembersAdded.toList().value(0).data()->alias()), groupMembersAdded.toList().value(0).data()->alias());
+ }
// Temporarily detect on-demand rooms by checking for gabble-created string "private-chat"
if (d->isGroupChat && d->channel->targetId().startsWith(QLatin1String("private-chat"))) {
QList<QString> contactAliasList;
diff --git a/lib/chat-widget.h b/lib/chat-widget.h
index 5428104..5287abf 100644
--- a/lib/chat-widget.h
+++ b/lib/chat-widget.h
@@ -148,7 +148,11 @@ protected Q_SLOTS:
void onContactClientTypesChanged(const Tp::ContactPtr &contact, const QStringList &clientTypes);
- void onParticipantsChanged();
+ void onParticipantsChanged(Tp::Contacts groupMembersAdded,
+ Tp::Contacts groupLocalPendingMembersAdded,
+ Tp::Contacts groupRemotePendingMembersAdded,
+ Tp::Contacts groupMembersRemoved,
+ Tp::Channel::GroupMemberChangeDetails details);
void onChannelInvalidated();
--
ktp-text-ui packaging
More information about the pkg-kde-commits
mailing list