[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:31 UTC 2016
Gitweb-URL: http://git.debian.org/?p=pkg-kde/applications/ktp-text-ui.git;a=commitdiff;h=7d54886
The following commit has been merged in the master branch:
commit 7d548860eece6f5a32fae86c873cd75ff039e500
Author: Daniel Cohen <analoguecolour at gmail.com>
Date: Fri Apr 11 15:06:47 2014 +0200
Added option to show when contacts leave chat
---
config/appearance-config-tab.cpp | 36 ++++++++++++----
config/appearance-config-tab.h | 1 +
config/appearance-config.ui | 91 +++++++++++++++++++++++++---------------
lib/adium-theme-view.cpp | 11 +++++
lib/adium-theme-view.h | 3 ++
lib/chat-widget.cpp | 4 +-
6 files changed, 103 insertions(+), 43 deletions(-)
diff --git a/config/appearance-config-tab.cpp b/config/appearance-config-tab.cpp
index 1e2666a..5f90c29 100644
--- a/config/appearance-config-tab.cpp
+++ b/config/appearance-config-tab.cpp
@@ -57,6 +57,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(stateChanged(int)), SLOT(onShowPresenceChangesChanged(int)));
+ connect(ui->showLeaveCheckBox, SIGNAL(stateChanged(int)), SLOT(onShowLeaveChangesChanged(int)));
}
AppearanceConfigTab::~AppearanceConfigTab()
@@ -108,6 +109,17 @@ void AppearanceConfigTab::onShowPresenceChangesChanged(int state)
tabChanged();
}
+void AppearanceConfigTab::onShowLeaveChangesChanged(int state)
+{
+ if (state == Qt::Checked) {
+ ui->chatView->setShowLeaveChanges(true);
+ } else {
+ ui->chatView->setShowLeaveChanges(false);
+ }
+ ui->chatView->initialise(m_demoChatHeader);
+ tabChanged();
+}
+
void AppearanceConfigTab::onShowHeaderChanged(bool showHeader)
{
ui->chatView->setHeaderDisplayed(showHeader);
@@ -203,12 +215,14 @@ void AppearanceConfigTab::sendDemoMessages()
statusMessage.setService(i18n("Jabber"));
ui->chatView->addAdiumStatusMessage(statusMessage);
- 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.setTime(QDateTime::currentDateTime());
- statusMessage.setService(i18n("Jabber"));
- statusMessage.setStatus(QLatin1String("away"));
- ui->chatView->addAdiumStatusMessage(statusMessage);
+ if (ui->chatView->showLeaveChanges()) {
+ 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.setTime(QDateTime::currentDateTime());
+ statusMessage.setService(i18n("Jabber"));
+ statusMessage.setStatus(QLatin1String("away"));
+ ui->chatView->addAdiumStatusMessage(statusMessage);
+ }
message = AdiumThemeContentInfo(AdiumThemeMessageInfo::RemoteToLocal);
message.setMessage(i18nc("Example message in preview conversation","Hello Ted"));
@@ -288,7 +302,8 @@ void AppearanceConfigTab::saveTab(KConfigGroup appearanceConfigGroup)
appearanceConfigGroup.writeEntry(QLatin1String("useCustomFont"), ui->customFontBox->isChecked());
appearanceConfigGroup.writeEntry(QLatin1String("fontFamily"), ui->fontFamily->currentFont().family());
appearanceConfigGroup.writeEntry(QLatin1String("fontSize"), ui->fontSize->value());
- appearanceConfigGroup.writeEntry(QLatin1String("showPresenceChanges"), ui->showPresenceCheckBox->checkState() == Qt::Checked ? true : false);
+ appearanceConfigGroup.writeEntry(QLatin1String("showPresenceChanges"), ui->showPresenceCheckBox->isChecked());
+ appearanceConfigGroup.writeEntry(QLatin1String("showLeaveChanges"), ui->showLeaveCheckBox->isChecked());
appearanceConfigGroup.sync();
}
@@ -314,6 +329,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());
}
void AppearanceConfigTab::defaultTab()
@@ -333,5 +349,9 @@ void AppearanceConfigTab::defaultTab()
ui->chatView->setUseCustomFont(false);
ui->fontFamily->setCurrentFont(KGlobalSettings::generalFont());
ui->fontSize->setValue(QWebSettings::DefaultFontSize);
- ui->showPresenceCheckBox->setChecked(true);
+ if (m_groupChat) {
+ ui->showPresenceCheckBox->setChecked(false);
+ } else {
+ ui->showPresenceCheckBox->setChecked(true);
+ }
}
diff --git a/config/appearance-config-tab.h b/config/appearance-config-tab.h
index 9f3022f..ab0789a 100644
--- a/config/appearance-config-tab.h
+++ b/config/appearance-config-tab.h
@@ -66,6 +66,7 @@ private Q_SLOTS:
void onFontFamilyChanged(const QFont &font);
void onFontSizeChanged(int fontSize);
void onShowPresenceChangesChanged(int stateChanged);
+ void onShowLeaveChangesChanged(int joinLeaveChanged);
private:
Ui::ChatWindowConfig *ui;
diff --git a/config/appearance-config.ui b/config/appearance-config.ui
index 52ecfed..6440cba 100644
--- a/config/appearance-config.ui
+++ b/config/appearance-config.ui
@@ -43,6 +43,9 @@
<layout class="QHBoxLayout" name="horizontalLayout_2">
<item>
<layout class="QFormLayout" name="formLayout_2">
+ <property name="fieldGrowthPolicy">
+ <enum>QFormLayout::ExpandingFieldsGrow</enum>
+ </property>
<item row="0" column="0">
<widget class="QLabel" name="styleLabel">
<property name="text">
@@ -95,6 +98,9 @@
</property>
</widget>
</item>
+ <item row="2" column="0">
+ <widget class="QWidget" name="widget" native="true"/>
+ </item>
<item row="2" column="1">
<widget class="QCheckBox" name="showHeader">
<property name="sizePolicy">
@@ -108,6 +114,9 @@
</property>
</widget>
</item>
+ <item row="3" column="0">
+ <widget class="QWidget" name="widget_2" native="true"/>
+ </item>
<item row="3" column="1">
<widget class="QCheckBox" name="showPresenceCheckBox">
<property name="sizePolicy">
@@ -121,11 +130,21 @@
</property>
</widget>
</item>
- <item row="2" column="0">
- <widget class="QWidget" name="widget" native="true"/>
+ <item row="4" column="1">
+ <widget class="QCheckBox" name="showLeaveCheckBox">
+ <property name="sizePolicy">
+ <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
+ <horstretch>0</horstretch>
+ <verstretch>0</verstretch>
+ </sizepolicy>
+ </property>
+ <property name="text">
+ <string>Show when contacts leave chat</string>
+ </property>
+ </widget>
</item>
- <item row="3" column="0">
- <widget class="QWidget" name="widget_2" native="true"/>
+ <item row="4" column="0">
+ <widget class="QWidget" name="widget_3" native="true"/>
</item>
</layout>
</item>
@@ -136,7 +155,7 @@
</property>
<property name="sizeHint" stdset="0">
<size>
- <width>77</width>
+ <width>40</width>
<height>20</height>
</size>
</property>
@@ -157,38 +176,42 @@
<property name="fieldGrowthPolicy">
<enum>QFormLayout::ExpandingFieldsGrow</enum>
</property>
- <item row="1" column="0">
- <widget class="QLabel" name="fontFamilyLabel">
- <property name="text">
- <string>Select Font:</string>
- </property>
- <property name="alignment">
- <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
- </property>
- </widget>
- </item>
- <item row="1" column="1">
- <widget class="KFontComboBox" name="fontFamily"/>
- </item>
- <item row="2" column="0">
- <widget class="QLabel" name="fontSizeLabel">
- <property name="text">
- <string>Select Size:</string>
- </property>
- <property name="alignment">
- <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
- </property>
- </widget>
+ <item row="0" column="0">
+ <layout class="QFormLayout" name="formLayout_3">
+ <item row="1" column="0">
+ <widget class="QLabel" name="fontFamilyLabel">
+ <property name="text">
+ <string>Select Font:</string>
+ </property>
+ </widget>
+ </item>
+ <item row="1" column="1">
+ <widget class="KFontComboBox" name="fontFamily"/>
+ </item>
+ <item row="2" column="0">
+ <widget class="QLabel" name="fontSizeLabel">
+ <property name="text">
+ <string>Select Size:</string>
+ </property>
+ </widget>
+ </item>
+ <item row="2" column="1">
+ <widget class="KIntNumInput" name="fontSize"/>
+ </item>
+ </layout>
</item>
- <item row="2" column="1">
- <widget class="KIntNumInput" name="fontSize">
- <property name="minimum">
- <number>1</number>
+ <item row="0" column="1">
+ <spacer name="horizontalSpacer_3">
+ <property name="orientation">
+ <enum>Qt::Horizontal</enum>
</property>
- <property name="maximum">
- <number>128</number>
+ <property name="sizeHint" stdset="0">
+ <size>
+ <width>40</width>
+ <height>20</height>
+ </size>
</property>
- </widget>
+ </spacer>
</item>
</layout>
</widget>
diff --git a/lib/adium-theme-view.cpp b/lib/adium-theme-view.cpp
index 350e2b0..72306a6 100644
--- a/lib/adium-theme-view.cpp
+++ b/lib/adium-theme-view.cpp
@@ -123,6 +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);
}
void AdiumThemeView::viewLoadFinished()
@@ -384,6 +385,16 @@ bool AdiumThemeView::showPresenceChanges() const
return m_showPresenceChanges;
}
+void AdiumThemeView::setShowLeaveChanges(bool showLeaveChanges)
+{
+ m_showLeaveChanges = showLeaveChanges;
+}
+
+bool AdiumThemeView::showLeaveChanges() const
+{
+ return m_showLeaveChanges;
+}
+
bool AdiumThemeView::isHeaderDisplayed() const
{
return m_displayHeader;
diff --git a/lib/adium-theme-view.h b/lib/adium-theme-view.h
index 3ec51b2..2628ba8 100644
--- a/lib/adium-theme-view.h
+++ b/lib/adium-theme-view.h
@@ -97,6 +97,8 @@ public:
void setShowPresenceChanges(bool showPresenceChanges);
bool showPresenceChanges() const;
+ void setShowLeaveChanges(bool showLeaveChanges);
+ bool showLeaveChanges() const;
void clear();
@@ -129,6 +131,7 @@ private:
QString m_fontFamily;
int m_fontSize;
bool m_showPresenceChanges;
+ bool m_showLeaveChanges;
QString appendScript(AppendMode mode);
AppendMode appendMode(const AdiumThemeMessageInfo &message,
diff --git a/lib/chat-widget.cpp b/lib/chat-widget.cpp
index 7f20c1b..0920eb0 100644
--- a/lib/chat-widget.cpp
+++ b/lib/chat-widget.cpp
@@ -706,7 +706,9 @@ void ChatWidget::onChatStatusChanged(const Tp::ContactPtr & contact, Tp::Channel
}
if (state == Tp::ChannelChatStateGone) {
- d->ui.chatArea->addStatusMessage(i18n("%1 has left the chat", contact->alias()));
+ if (d->ui.chatArea->showLeaveChanges()) {
+ d->ui.chatArea->addStatusMessage(i18n("%1 has left the chat", contact->alias()));
+ }
}
if (d->isGroupChat) {
--
ktp-text-ui packaging
More information about the pkg-kde-commits
mailing list