[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:34 UTC 2016
Gitweb-URL: http://git.debian.org/?p=pkg-kde/applications/ktp-text-ui.git;a=commitdiff;h=b4f8833
The following commit has been merged in the master branch:
commit b4f8833f97c8bfa01df441d3dd18c1ba16b3a9d5
Author: Daniele E. Domenichelli <daniele.domenichelli at iit.it>
Date: Sun Apr 13 22:12:04 2014 +0200
Revert "Fix %service% replacement in adium themes"
This reverts commit adce30e515afc26ad7e364ed10e612fbf306f617.
---
config/appearance-config-tab.cpp | 15 +++++++++++++--
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 | 6 +++---
9 files changed, 33 insertions(+), 30 deletions(-)
diff --git a/config/appearance-config-tab.cpp b/config/appearance-config-tab.cpp
index 855d943..0d9c6c5 100644
--- a/config/appearance-config-tab.cpp
+++ b/config/appearance-config-tab.cpp
@@ -42,8 +42,6 @@ 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"));
- m_demoChatHeader.setServiceIconPath(KIconLoader::global()->iconPath(QLatin1String("im-jabber"), -KIconLoader::SizeMedium));
ChatWindowStyleManager *manager = ChatWindowStyleManager::self();
connect(manager, SIGNAL(loadStylesFinished()), SLOT(onStylesLoaded()));
@@ -175,6 +173,7 @@ 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);
@@ -182,6 +181,7 @@ 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,6 +189,7 @@ 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);
@@ -196,6 +197,7 @@ 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);
@@ -203,6 +205,7 @@ 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()) {
@@ -210,6 +213,7 @@ 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);
}
@@ -218,6 +222,7 @@ 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);
@@ -226,6 +231,7 @@ 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);
@@ -235,6 +241,7 @@ 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);
@@ -243,6 +250,7 @@ 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);
}
@@ -251,6 +259,7 @@ 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);
@@ -259,6 +268,7 @@ 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);
@@ -266,6 +276,7 @@ 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 51c6a82..a4febf8 100644
--- a/lib/adium-theme-header-info.cpp
+++ b/lib/adium-theme-header-info.cpp
@@ -33,7 +33,6 @@ public:
QUrl incomingIconPath;
QUrl outgoingIconPath;
QDateTime timeOpened;
- QString service;
QString serviceIconPath;
bool isGroupChat;
};
@@ -134,16 +133,6 @@ 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 7b2288b..ecb27e5 100644
--- a/lib/adium-theme-header-info.h
+++ b/lib/adium-theme-header-info.h
@@ -73,10 +73,6 @@ 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 ce1d5cd..6f85285 100644
--- a/lib/adium-theme-message-info.cpp
+++ b/lib/adium-theme-message-info.cpp
@@ -29,6 +29,7 @@ public:
QString message;
QDateTime time;
QString sender;
+ QString service;
QStringList messageClasses;
AdiumThemeMessageInfo::MessageType type;
QString script;
@@ -99,6 +100,16 @@ 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 b432cd9..64341ef 100644
--- a/lib/adium-theme-message-info.h
+++ b/lib/adium-theme-message-info.h
@@ -59,6 +59,9 @@ 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 0013bf9..6211be4 100644
--- a/lib/adium-theme-view.cpp
+++ b/lib/adium-theme-view.cpp
@@ -307,8 +307,6 @@ void AdiumThemeView::initialise(const AdiumThemeHeaderInfo &chatInfo)
setHtml(templateHtml);
- m_service = chatInfo.service();
- m_serviceIconPath = chatInfo.serviceIconPath();
}
void AdiumThemeView::setVariant(const QString &variant)
@@ -685,10 +683,9 @@ 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;
}
@@ -738,7 +735,7 @@ QString AdiumThemeView::replaceMessageKeywords(QString &htmlTemplate, const Adiu
htmlTemplate.replace(QLatin1String("%message%"), message);
//service
- htmlTemplate.replace(QLatin1String("%service%"), m_service);
+ htmlTemplate.replace(QLatin1String("%service%"), info.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 5eaab55..100df9d 100644
--- a/lib/adium-theme-view.h
+++ b/lib/adium-theme-view.h
@@ -154,8 +154,6 @@ 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 46e5cd8..d130529 100644
--- a/lib/chat-widget.cpp
+++ b/lib/chat-widget.cpp
@@ -1035,9 +1035,7 @@ void ChatWidget::initChatArea()
info.setTimeOpened(QDateTime::currentDateTime());
}
- info.setService(d->account->serviceName());
- info.setServiceIconPath(KIconLoader::global()->iconPath(d->account->iconName(),
- -KIconLoader::SizeMedium)); // KIconLoader::iconPath searches on size if group_or_size is < 0;
+ info.setServiceIconPath(KIconLoader::global()->iconPath(d->account->iconName(), KIconLoader::Panel));
d->ui.chatArea->initialise(info);
//set the title of this chat.
diff --git a/logviewer/message-view.cpp b/logviewer/message-view.cpp
index a8a3b1c..ba69532 100644
--- a/logviewer/message-view.cpp
+++ b/logviewer/message-view.cpp
@@ -24,7 +24,6 @@
#include <KTp/message-processor.h>
#include <KDebug>
-#include <KIconLoader>
#include <QLabel>
#include <QResizeEvent>
@@ -126,8 +125,7 @@ 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());
- headerInfo.setServiceIconPath(KIconLoader::global()->iconPath(m_account->iconName(), -KIconLoader::SizeMedium));
+
if (pl->logs().count() > 0) {
headerInfo.setTimeOpened(pl->logs().first().time());
}
@@ -151,6 +149,7 @@ 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));
}
@@ -158,6 +157,7 @@ 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