[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:35 UTC 2016
Gitweb-URL: http://git.debian.org/?p=pkg-kde/applications/ktp-text-ui.git;a=commitdiff;h=7dd5c88
The following commit has been merged in the master branch:
commit 7dd5c88aba04751aeaeb747dfb1de61ad78ae51e
Author: Daniele E. Domenichelli <daniele.domenichelli at iit.it>
Date: Sun Apr 13 21:04:22 2014 +0200
Fix %service% replacement in adium themes
The service is set just once for the chat instead of for every message
Also set service icon in logviewer and demo chat
REVIEW: 117552
Reviewed-by: Leon Handreke <leonh at ndreke.de>
---
config/appearance-config-tab.cpp | 16 +++-------------
lib/adium-theme-header-info.cpp | 11 +++++++++++
lib/adium-theme-header-info.h | 4 ++++
lib/adium-theme-message-info.cpp | 11 -----------
lib/adium-theme-message-info.h | 3 ---
lib/adium-theme-view.cpp | 7 +++++--
lib/adium-theme-view.h | 2 ++
lib/chat-widget.cpp | 4 +++-
logviewer/message-view.cpp | 7 ++++---
9 files changed, 32 insertions(+), 33 deletions(-)
diff --git a/config/appearance-config-tab.cpp b/config/appearance-config-tab.cpp
index 0d9c6c5..a4d7d6e 100644
--- a/config/appearance-config-tab.cpp
+++ b/config/appearance-config-tab.cpp
@@ -42,6 +42,9 @@ AppearanceConfigTab::AppearanceConfigTab(QWidget *parent, TabMode mode)
m_demoChatHeader.setDestinationName(i18nc("Example email", "ted at example.com"));
m_demoChatHeader.setDestinationDisplayName(i18nc("Example name", "Ted"));
m_demoChatHeader.setGroupChat(m_groupChat);
+ m_demoChatHeader.setService(QLatin1String("jabber"));
+ // check iconPath docs for minus sign in -KIconLoader::SizeMedium
+ m_demoChatHeader.setServiceIconPath(KIconLoader::global()->iconPath(QLatin1String("im-jabber"), -KIconLoader::SizeMedium));
ChatWindowStyleManager *manager = ChatWindowStyleManager::self();
connect(manager, SIGNAL(loadStylesFinished()), SLOT(onStylesLoaded()));
@@ -173,7 +176,6 @@ void AppearanceConfigTab::sendDemoMessages()
message.setMessage(i18nc("Example message in preview conversation","Ok!"));
message.setSenderDisplayName(i18nc("Example email", "larry at example.com"));
message.setSenderScreenName(i18nc("Example name", "Larry Demo"));
- message.setService(i18nc("XMPP Protocol name" , "Jabber"));
message.setTime(QDateTime::currentDateTime());
ui->chatView->addAdiumContentMessage(message);
@@ -181,7 +183,6 @@ void AppearanceConfigTab::sendDemoMessages()
message.setMessage(i18nc("Example message in preview conversation","Bye Bye"));
message.setSenderDisplayName(i18nc("Example email", "larry at example.com"));
message.setSenderScreenName(i18nc("Example name", "Larry Demo"));
- message.setService(i18n("Jabber"));
message.setTime(QDateTime::currentDateTime());
ui->chatView->addAdiumContentMessage(message);
@@ -189,7 +190,6 @@ void AppearanceConfigTab::sendDemoMessages()
message.setMessage(i18nc("Example message in preview conversation","Have fun!"));
message.setSenderDisplayName(i18nc("Example email", "ted at example.com"));
message.setSenderScreenName(i18nc("Example name", "Ted Example"));
- message.setService(i18n("Jabber"));
message.setTime(QDateTime::currentDateTime());
ui->chatView->addAdiumContentMessage(message);
@@ -197,7 +197,6 @@ void AppearanceConfigTab::sendDemoMessages()
message.setMessage(i18nc("Example message in preview conversation","cya"));
message.setSenderDisplayName(i18nc("Example email", "ted at example.com"));
message.setSenderScreenName(i18nc("Example name", "Ted Example"));
- message.setService(i18n("Jabber"));
message.setTime(QDateTime::currentDateTime());
ui->chatView->addAdiumContentMessage(message);
@@ -205,7 +204,6 @@ void AppearanceConfigTab::sendDemoMessages()
statusMessage.setMessage(i18nc("Example message", "Ted Example waves."));
statusMessage.setSender(i18nc("Example name", "Ted Example"));
statusMessage.setTime(QDateTime::currentDateTime());
- statusMessage.setService(i18n("Jabber"));
ui->chatView->addAdiumStatusMessage(statusMessage);
if (ui->chatView->showLeaveChanges()) {
@@ -213,7 +211,6 @@ void AppearanceConfigTab::sendDemoMessages()
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.setService(i18n("Jabber"));
statusMessage.setStatus(QLatin1String("away"));
ui->chatView->addAdiumStatusMessage(statusMessage);
}
@@ -222,7 +219,6 @@ void AppearanceConfigTab::sendDemoMessages()
message.setMessage(i18nc("Example message in preview conversation","Hello Ted"));
message.setSenderDisplayName(i18nc("Example email", "larry at example.com"));
message.setSenderScreenName(i18nc("Example name", "Larry Demo"));
- message.setService(i18n("Jabber"));
message.appendMessageClass(QLatin1String("mention"));
message.setTime(QDateTime::currentDateTime());
ui->chatView->addAdiumContentMessage(message);
@@ -231,7 +227,6 @@ void AppearanceConfigTab::sendDemoMessages()
message.setMessage(i18nc("Example message in preview conversation","What's up?"));
message.setSenderDisplayName(i18nc("Example email", "larry at example.com"));
message.setSenderScreenName(i18nc("Example name", "Larry Demo"));
- message.setService(i18n("Jabber"));
message.setTime(QDateTime::currentDateTime());
ui->chatView->addAdiumContentMessage(message);
@@ -241,7 +236,6 @@ void AppearanceConfigTab::sendDemoMessages()
"here</a>!"));
message.setSenderDisplayName(i18nc("Example email", "ted at example.com"));
message.setSenderScreenName(i18nc("Example name", "Ted Example"));
- message.setService(i18n("Jabber"));
message.setTime(QDateTime::currentDateTime());
ui->chatView->addAdiumContentMessage(message);
@@ -250,7 +244,6 @@ void AppearanceConfigTab::sendDemoMessages()
message.setMessage(i18nc("Example message in preview conversation","Hello"));
message.setSenderDisplayName(i18nc("Example email", "bob at example.com"));
message.setSenderScreenName(i18nc("Example name", "Bob Example"));
- message.setService(i18n("Jabber"));
message.setTime(QDateTime::currentDateTime());
ui->chatView->addAdiumContentMessage(message);
}
@@ -259,7 +252,6 @@ void AppearanceConfigTab::sendDemoMessages()
message.setMessage(i18nc("Example message in preview conversation","A different example message"));
message.setSenderDisplayName(i18nc("Example email", "ted at example.com"));
message.setSenderScreenName(i18nc("Example name", "Ted Example"));
- message.setService(i18n("Jabber"));
message.setTime(QDateTime::currentDateTime());
ui->chatView->addAdiumContentMessage(message);
@@ -268,7 +260,6 @@ void AppearanceConfigTab::sendDemoMessages()
statusMessage.setMessage(i18nc("Example message in preview conversation","Ted Example is now Away.")); //FIXME sync this with chat text logic.
statusMessage.setSender(i18nc("Example name", "Ted Example"));
statusMessage.setTime(QDateTime::currentDateTime());
- statusMessage.setService(i18n("Jabber"));
statusMessage.setStatus(QLatin1String("away"));
ui->chatView->addAdiumStatusMessage(statusMessage);
@@ -276,7 +267,6 @@ void AppearanceConfigTab::sendDemoMessages()
statusMessage.setMessage(i18nc("Example message in preview conversations","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.setService(i18n("Jabber"));
statusMessage.setStatus(QLatin1String("away"));
ui->chatView->addAdiumStatusMessage(statusMessage);
}
diff --git a/lib/adium-theme-header-info.cpp b/lib/adium-theme-header-info.cpp
index a4febf8..51c6a82 100644
--- a/lib/adium-theme-header-info.cpp
+++ b/lib/adium-theme-header-info.cpp
@@ -33,6 +33,7 @@ public:
QUrl incomingIconPath;
QUrl outgoingIconPath;
QDateTime timeOpened;
+ QString service;
QString serviceIconPath;
bool isGroupChat;
};
@@ -133,6 +134,16 @@ void AdiumThemeHeaderInfo::setTimeOpened(const QDateTime& timeOpened)
d->timeOpened = timeOpened;
};
+QString AdiumThemeHeaderInfo::service() const
+{
+ return d->service;
+}
+
+void AdiumThemeHeaderInfo::setService(const QString& service)
+{
+ d->service = service;
+}
+
QString AdiumThemeHeaderInfo::serviceIconPath() const
{
return d->serviceIconPath;
diff --git a/lib/adium-theme-header-info.h b/lib/adium-theme-header-info.h
index ecb27e5..7b2288b 100644
--- a/lib/adium-theme-header-info.h
+++ b/lib/adium-theme-header-info.h
@@ -73,6 +73,10 @@ public:
QDateTime timeOpened() const;
void setTimeOpened(const QDateTime &timeOpened);
+ /** The service name */
+ QString service() const;
+ void setService(const QString &service);
+
/** Path to the protocol image of the service */
QString serviceIconPath() const;
void setServiceIconPath(const QString &serviceIconPath);
diff --git a/lib/adium-theme-message-info.cpp b/lib/adium-theme-message-info.cpp
index 6f85285..ce1d5cd 100644
--- a/lib/adium-theme-message-info.cpp
+++ b/lib/adium-theme-message-info.cpp
@@ -29,7 +29,6 @@ public:
QString message;
QDateTime time;
QString sender;
- QString service;
QStringList messageClasses;
AdiumThemeMessageInfo::MessageType type;
QString script;
@@ -100,16 +99,6 @@ void AdiumThemeMessageInfo::setSender(const QString& sender)
d->sender = sender;
}
-QString AdiumThemeMessageInfo::service() const
-{
- return d->service;
-}
-
-void AdiumThemeMessageInfo::setService(const QString& service)
-{
- d->service = service;
-}
-
QString AdiumThemeMessageInfo::userIcons() const
{
//FIXME.
diff --git a/lib/adium-theme-message-info.h b/lib/adium-theme-message-info.h
index 64341ef..b432cd9 100644
--- a/lib/adium-theme-message-info.h
+++ b/lib/adium-theme-message-info.h
@@ -59,9 +59,6 @@ public:
QString sender() const;
void setSender(const QString& sender);
- QString service() const;
- void setService(const QString& service);
-
/** Will be replaced with "showIcons" if the "Show user icons" checkbox is selected,*/
//FIXME in here or in AdiumThemeView..?
QString userIcons() const;
diff --git a/lib/adium-theme-view.cpp b/lib/adium-theme-view.cpp
index 6211be4..0013bf9 100644
--- a/lib/adium-theme-view.cpp
+++ b/lib/adium-theme-view.cpp
@@ -307,6 +307,8 @@ void AdiumThemeView::initialise(const AdiumThemeHeaderInfo &chatInfo)
setHtml(templateHtml);
+ m_service = chatInfo.service();
+ m_serviceIconPath = chatInfo.serviceIconPath();
}
void AdiumThemeView::setVariant(const QString &variant)
@@ -683,9 +685,10 @@ QString AdiumThemeView::replaceHeaderKeywords(QString htmlTemplate, const AdiumT
QString timeKeyword = formatTime(timeRegExp.cap(1), info.timeOpened());
htmlTemplate.replace(pos , timeRegExp.cap(0).length() , timeKeyword);
}
+ htmlTemplate.replace(QLatin1String("%service%"), info.service());
+ htmlTemplate.replace(QLatin1String("%serviceIconPath%"), info.serviceIconPath());
htmlTemplate.replace(QLatin1String("%serviceIconImg%"),
QString::fromLatin1("<img src=\"%1\" class=\"serviceIcon\" />").arg(info.serviceIconPath()));
- htmlTemplate.replace(QLatin1String("%serviceIconPath%"), info.serviceIconPath());
return htmlTemplate;
}
@@ -735,7 +738,7 @@ QString AdiumThemeView::replaceMessageKeywords(QString &htmlTemplate, const Adiu
htmlTemplate.replace(QLatin1String("%message%"), message);
//service
- htmlTemplate.replace(QLatin1String("%service%"), info.service());
+ htmlTemplate.replace(QLatin1String("%service%"), m_service);
//time
htmlTemplate.replace(QLatin1String("%time%"), KGlobal::locale()->formatLocaleTime(info.time().time()));
//shortTime
diff --git a/lib/adium-theme-view.h b/lib/adium-theme-view.h
index 100df9d..5eaab55 100644
--- a/lib/adium-theme-view.h
+++ b/lib/adium-theme-view.h
@@ -154,6 +154,8 @@ private:
bool m_displayHeader;
KAction *m_openLinkAction;
+ QString m_service;
+ QString m_serviceIconPath;
bool m_webInspector;
diff --git a/lib/chat-widget.cpp b/lib/chat-widget.cpp
index 56d6c81..d334921 100644
--- a/lib/chat-widget.cpp
+++ b/lib/chat-widget.cpp
@@ -1036,7 +1036,9 @@ void ChatWidget::initChatArea()
info.setTimeOpened(QDateTime::currentDateTime());
}
- info.setServiceIconPath(KIconLoader::global()->iconPath(d->account->iconName(), KIconLoader::Panel));
+ info.setService(d->account->serviceName());
+ // check iconPath docs for minus sign in -KIconLoader::SizeMedium
+ info.setServiceIconPath(KIconLoader::global()->iconPath(d->account->iconName(), -KIconLoader::SizeMedium));
d->ui.chatArea->initialise(info);
//set the title of this chat.
diff --git a/logviewer/message-view.cpp b/logviewer/message-view.cpp
index ba69532..2143f54 100644
--- a/logviewer/message-view.cpp
+++ b/logviewer/message-view.cpp
@@ -24,6 +24,7 @@
#include <KTp/message-processor.h>
#include <KDebug>
+#include <KIconLoader>
#include <QLabel>
#include <QResizeEvent>
@@ -125,7 +126,9 @@ void MessageView::onEventsLoaded(KTp::PendingLoggerOperation *po)
headerInfo.setGroupChat(m_entity.entityType() == Tp::HandleTypeRoom);
headerInfo.setSourceName(m_account->displayName());
headerInfo.setIncomingIconPath(m_contact.isNull() ? QString() : m_contact->avatarData().fileName);
-
+ headerInfo.setService(m_account->serviceName());
+ // check iconPath docs for minus sign in -KIconLoader::SizeMedium
+ headerInfo.setServiceIconPath(KIconLoader::global()->iconPath(m_account->iconName(), -KIconLoader::SizeMedium));
if (pl->logs().count() > 0) {
headerInfo.setTimeOpened(pl->logs().first().time());
}
@@ -149,7 +152,6 @@ void MessageView::processStoredEvents()
if (m_prev.isValid()) {
prevConversation = AdiumThemeStatusInfo(AdiumThemeMessageInfo::HistoryStatus);
prevConversation.setMessage(QString(QLatin1String("<a href=\"#x-prevConversation\"><<< %1</a>")).arg(i18n("Older conversation")));
- prevConversation.setService(m_account->serviceName());
prevConversation.setTime(QDateTime(m_prev));
}
@@ -157,7 +159,6 @@ void MessageView::processStoredEvents()
if (m_next.isValid()) {
nextConversation = AdiumThemeStatusInfo(AdiumThemeMessageInfo::HistoryStatus);
nextConversation.setMessage(QString(QLatin1String("<a href=\"#x-nextConversation\">%1 >>></a>")).arg(i18n("Newer conversation")));
- nextConversation.setService(m_account->serviceName());
nextConversation.setTime(QDateTime(m_next));
}
--
ktp-text-ui packaging
More information about the pkg-kde-commits
mailing list