[SCM] ktp-accounts-kcm packaging branch, master, updated. debian/15.12.1-1-1157-gc4589c5
Maximiliano Curia
maxy at moszumanska.debian.org
Sat May 28 00:00:43 UTC 2016
Gitweb-URL: http://git.debian.org/?p=pkg-kde/applications/ktp-accounts-kcm.git;a=commitdiff;h=ef8f205
The following commit has been merged in the master branch:
commit ef8f205ffeb5748d4bf38a99d608cba50f928928
Author: Dominik Cermak <d.cermak at arcor.de>
Date: Tue Dec 13 22:13:05 2011 +0100
Replaced all occurrences of FeedbackWidget with KMessageWidget.
Also turned two Informative messages into Error messages to make it consistent.
Signed-off-by: Dario Freddi <dario.freddi at collabora.com>
CCMAIL:d.cermak at arcor.de
BUG:283869
REVIEW:103398
---
src/KCMTelepathyAccounts/account-edit-widget.cpp | 11 ++---
src/KCMTelepathyAccounts/account-edit-widget.h | 4 +-
src/KCMTelepathyAccounts/feedback-widget.cpp | 57 ++++-------------------
src/KCMTelepathyAccounts/feedback-widget.h | 14 ++----
src/KCMTelepathyAccounts/parameter-edit-model.cpp | 4 +-
src/KCMTelepathyAccounts/parameter-edit-model.h | 4 +-
src/add-account-assistant.cpp | 12 ++---
src/add-account-assistant.h | 4 +-
src/salut-details-dialog.cpp | 4 +-
src/salut-details-dialog.h | 4 +-
src/salut-enabler.cpp | 8 ++--
src/salut-enabler.h | 4 +-
12 files changed, 42 insertions(+), 88 deletions(-)
diff --git a/src/KCMTelepathyAccounts/account-edit-widget.cpp b/src/KCMTelepathyAccounts/account-edit-widget.cpp
index 14f1b75..425e7b2 100644
--- a/src/KCMTelepathyAccounts/account-edit-widget.cpp
+++ b/src/KCMTelepathyAccounts/account-edit-widget.cpp
@@ -31,7 +31,7 @@
#include <KDebug>
#include <KLocale>
-#include <KTitleWidget>
+#include <KMessageWidget>
#include <TelepathyQt/Profile>
#include <QtCore/QList>
@@ -81,16 +81,15 @@ AccountEditWidget::AccountEditWidget(const Tp::ProfilePtr &profile,
this, SLOT(onAdvancedClicked()));
FeedbackWidget *feedback = new FeedbackWidget();
- feedback->setAutoHideTimeout(1000*15);
d->ui->verticalLayout->insertWidget(1, feedback);
connect(this,
- SIGNAL(feedbackMessage(QString,QString,KTitleWidget::MessageType)),
+ SIGNAL(feedbackMessage(QString,QString,KMessageWidget::MessageType)),
feedback,
- SLOT(setMessage(QString,QString,KTitleWidget::MessageType)));
+ SLOT(setMessage(QString,QString,KMessageWidget::MessageType)));
connect(d->parameterModel,
- SIGNAL(feedbackMessage(QString,QString,KTitleWidget::MessageType)),
+ SIGNAL(feedbackMessage(QString,QString,KMessageWidget::MessageType)),
feedback,
- SLOT(setMessage(QString,QString,KTitleWidget::MessageType)));
+ SLOT(setMessage(QString,QString,KMessageWidget::MessageType)));
d->ui->advancedButton->setIcon(KIcon("configure"));
//FIXME: Dictionary should not be needed anymore when distros ship profiles
diff --git a/src/KCMTelepathyAccounts/account-edit-widget.h b/src/KCMTelepathyAccounts/account-edit-widget.h
index 52dc89d..6609618 100644
--- a/src/KCMTelepathyAccounts/account-edit-widget.h
+++ b/src/KCMTelepathyAccounts/account-edit-widget.h
@@ -25,7 +25,7 @@
#include "kcm_telepathy_accounts_export.h"
#include <QWidget>
-#include <KTitleWidget>
+#include <KMessageWidget>
#include <TelepathyQt/ConnectionManager>
#include "parameter-edit-model.h"
@@ -60,7 +60,7 @@ private Q_SLOTS:
void onAdvancedClicked();
Q_SIGNALS:
- void feedbackMessage(const QString &text, const QString &comment, KTitleWidget::MessageType);
+ void feedbackMessage(const QString &text, const QString &comment, KMessageWidget::MessageType);
private:
Q_DISABLE_COPY(AccountEditWidget);
diff --git a/src/KCMTelepathyAccounts/feedback-widget.cpp b/src/KCMTelepathyAccounts/feedback-widget.cpp
index 057456a..51cd94d 100644
--- a/src/KCMTelepathyAccounts/feedback-widget.cpp
+++ b/src/KCMTelepathyAccounts/feedback-widget.cpp
@@ -23,7 +23,6 @@
#include "feedback-widget.h"
-#include <KTitleWidget>
#include <KDebug>
#include <KLocale>
#include <KIcon>
@@ -39,68 +38,28 @@
#include <QtCore/QTimer>
FeedbackWidget::FeedbackWidget(QWidget *parent)
- : KTitleWidget(parent)
+ : KMessageWidget(parent)
{
// Hide by default because we only want to show ourselfs when an error came up
this->hide();
- m_type = KTitleWidget::PlainMessage;
+ this->setMessageType(KMessageWidget::Information);
}
FeedbackWidget::~FeedbackWidget()
{
}
-void FeedbackWidget::setMessage(const QString &text, const QString &comment, KTitleWidget::MessageType type)
+void FeedbackWidget::setMessage(const QString &text, const QString &comment, KMessageWidget::MessageType type)
{
- setText(text, type);
- setComment(comment, type);
+ setText(QString("<b>%1</b><br />%2").arg(text).arg(comment), type);
}
-void FeedbackWidget::setText(const QString &text, KTitleWidget::MessageType type)
+void FeedbackWidget::setText(const QString &text, KMessageWidget::MessageType type)
{
- m_type = type;
- KTitleWidget::setText(text, type);
-}
-
-void FeedbackWidget::setComment(const QString &comment, KTitleWidget::MessageType type)
-{
- m_type = type;
- KTitleWidget::setComment(comment, type);
-}
-
-void FeedbackWidget::paintEvent(QPaintEvent *event)
-{
- const QRect r = rect();
-
- const KColorScheme colorScheme(QPalette::Active, KColorScheme::Window);
-
- QPainter p(this);
- p.setRenderHint(QPainter::Antialiasing);
-
- QPainterPath path;
- path.addRoundedRect(0, 0, r.width(), r.height(), 10, 10);
-
- QBrush brush;
-
- switch(m_type) {
- case KTitleWidget::PlainMessage:
- brush = colorScheme.background(KColorScheme::NormalBackground);
- break;
- case KTitleWidget::ErrorMessage:
- brush = colorScheme.background(KColorScheme::NegativeBackground);
- break;
- case KTitleWidget::WarningMessage:
- brush = colorScheme.background(KColorScheme::NeutralBackground);
- break;
- case KTitleWidget::InfoMessage:
- brush = QBrush(QColor(156,213,219));
- break;
- }
-
- p.fillPath(path, brush);
-
- KTitleWidget::paintEvent(event);
+ this->setMessageType(type);
+ KMessageWidget::setText(text);
+ this->animatedShow();
}
#include "feedback-widget.moc"
diff --git a/src/KCMTelepathyAccounts/feedback-widget.h b/src/KCMTelepathyAccounts/feedback-widget.h
index e547857..5a8f6a1 100644
--- a/src/KCMTelepathyAccounts/feedback-widget.h
+++ b/src/KCMTelepathyAccounts/feedback-widget.h
@@ -24,13 +24,13 @@
#ifndef TELEPATHY_ACCOUNTS_KCM_FEEDBACK_WIDGET_H
#define TELEPATHY_ACCOUNTS_KCM_FEEDBACK_WIDGET_H
-#include <KTitleWidget>
+#include <KMessageWidget>
class QLabel;
class QHBoxLayout;
class QTimer;
-class FeedbackWidget : public KTitleWidget
+class FeedbackWidget : public KMessageWidget
{
Q_OBJECT
public:
@@ -38,15 +38,11 @@ public:
virtual ~FeedbackWidget();
public slots:
- void setMessage(const QString &text, const QString &comment, KTitleWidget::MessageType type);
- void setText(const QString &text, KTitleWidget::MessageType type);
- void setComment(const QString &comment, KTitleWidget::MessageType type=KTitleWidget::PlainMessage);
-
-protected:
- virtual void paintEvent(QPaintEvent *event);
+ void setMessage(const QString &text, const QString &comment, KMessageWidget::MessageType type);
+ void setText(const QString &text, KMessageWidget::MessageType type);
private:
- KTitleWidget::MessageType m_type;
+ KMessageWidget::MessageType m_type;
};
#endif
diff --git a/src/KCMTelepathyAccounts/parameter-edit-model.cpp b/src/KCMTelepathyAccounts/parameter-edit-model.cpp
index f461674..70f5914 100644
--- a/src/KCMTelepathyAccounts/parameter-edit-model.cpp
+++ b/src/KCMTelepathyAccounts/parameter-edit-model.cpp
@@ -27,7 +27,7 @@
#include <KApplication>
#include <KDebug>
#include <KLocale>
-#include <KTitleWidget>
+#include <KMessageWidget>
#include <QtGui/QValidator>
@@ -305,7 +305,7 @@ bool ParameterEditModel::validateParameterValues()
emit feedbackMessage(i18n("Parameter \"<b>%1</b>\" is not valid.",
item->localizedName()),
QString(),
- KTitleWidget::ErrorMessage);
+ KMessageWidget::Error);
return false;
}
}
diff --git a/src/KCMTelepathyAccounts/parameter-edit-model.h b/src/KCMTelepathyAccounts/parameter-edit-model.h
index 3b2b08b..f53577b 100644
--- a/src/KCMTelepathyAccounts/parameter-edit-model.h
+++ b/src/KCMTelepathyAccounts/parameter-edit-model.h
@@ -30,7 +30,7 @@
#include <TelepathyQt/Profile>
#include <TelepathyQt/ProtocolParameter>
-#include <KTitleWidget>
+#include <KMessageWidget>
class ParameterItem;
@@ -84,7 +84,7 @@ public:
bool validateParameterValues();
Q_SIGNALS:
- void feedbackMessage(const QString &text, const QString &comment, KTitleWidget::MessageType);
+ void feedbackMessage(const QString &text, const QString &comment, KMessageWidget::MessageType);
private:
QList<ParameterItem*> m_items;
diff --git a/src/add-account-assistant.cpp b/src/add-account-assistant.cpp
index 1c2e90d..d2b33dd 100644
--- a/src/add-account-assistant.cpp
+++ b/src/add-account-assistant.cpp
@@ -155,7 +155,7 @@ void AddAccountAssistant::accept()
kDebug() << "A widget failed parameter validation. Not accepting wizard.";
Q_EMIT feedbackMessage(i18n("Failed to create account"),
d->accountEditWidget->errorMessage(),
- KTitleWidget::InfoMessage);
+ KMessageWidget::Error);
return;
}
@@ -165,7 +165,7 @@ void AddAccountAssistant::accept()
&& d->currentProfileItem->protocolName() == account->protocolName()) {
Q_EMIT feedbackMessage(i18n("Failed to create account"),
i18n("Account already exists. Old one will be used instead"),
- KTitleWidget::InfoMessage);
+ KMessageWidget::Error);
return;
}
}
@@ -228,7 +228,7 @@ void AddAccountAssistant::onAccountCreated(Tp::PendingOperation *op)
if (op->isError()) {
Q_EMIT feedbackMessage(i18n("Failed to create account"),
i18n("Possibly not all required fields are valid"),
- KTitleWidget::ErrorMessage);
+ KMessageWidget::Error);
kWarning() << "Adding Account failed:" << op->errorName() << op->errorMessage();
return;
}
@@ -238,7 +238,7 @@ void AddAccountAssistant::onAccountCreated(Tp::PendingOperation *op)
if (!pendingAccount) {
Q_EMIT feedbackMessage(i18n("Something went wrong with Telepathy"),
QString(),
- KTitleWidget::ErrorMessage);
+ KMessageWidget::Error);
kWarning() << "Method called with wrong type.";
return;
}
@@ -304,9 +304,9 @@ void AddAccountAssistant::pageTwo()
doConnectOnAdd,
d->pageTwoWidget);
connect(this,
- SIGNAL(feedbackMessage(QString,QString,KTitleWidget::MessageType)),
+ SIGNAL(feedbackMessage(QString,QString,KMessageWidget::MessageType)),
d->accountEditWidget,
- SIGNAL(feedbackMessage(QString,QString,KTitleWidget::MessageType)));
+ SIGNAL(feedbackMessage(QString,QString,KMessageWidget::MessageType)));
d->pageTwoWidget->layout()->addWidget(d->accountEditWidget);
KAssistantDialog::next();
diff --git a/src/add-account-assistant.h b/src/add-account-assistant.h
index b85d44e..2630531 100644
--- a/src/add-account-assistant.h
+++ b/src/add-account-assistant.h
@@ -23,7 +23,7 @@
#define TELEPATHY_ACCOUNTS_KCM_ADD_ACCOUNT_ASSISTANT_H
#include <KAssistantDialog>
-#include <KTitleWidget>
+#include <KMessageWidget>
#include <TelepathyQt/AccountManager>
@@ -46,7 +46,7 @@ protected Q_SLOTS:
Q_SIGNALS:
void cancelled();
- void feedbackMessage(const QString &text, const QString &comment, KTitleWidget::MessageType);
+ void feedbackMessage(const QString &text, const QString &comment, KMessageWidget::MessageType);
private Q_SLOTS:
void onAccountCreated(Tp::PendingOperation *op);
diff --git a/src/salut-details-dialog.cpp b/src/salut-details-dialog.cpp
index 46fb94c..465bde3 100644
--- a/src/salut-details-dialog.cpp
+++ b/src/salut-details-dialog.cpp
@@ -85,9 +85,9 @@ SalutDetailsDialog::SalutDetailsDialog(const Tp::ProfileManagerPtr profileManage
doNotConnectOnAdd,
this);
connect(this,
- SIGNAL(feedbackMessage(QString,QString,KTitleWidget::MessageType)),
+ SIGNAL(feedbackMessage(QString,QString,KMessageWidget::MessageType)),
d->widget,
- SIGNAL(feedbackMessage(QString,QString,KTitleWidget::MessageType)));
+ SIGNAL(feedbackMessage(QString,QString,KMessageWidget::MessageType)));
setMainWidget(d->widget);
}
diff --git a/src/salut-details-dialog.h b/src/salut-details-dialog.h
index 5a36adc..6d970b6 100644
--- a/src/salut-details-dialog.h
+++ b/src/salut-details-dialog.h
@@ -25,7 +25,7 @@
#define KCM_TELEPATHY_SALUT_ENABLE_ACCOUNT_DIALOG_H
#include <KDialog>
-#include <KTitleWidget>
+#include <KMessageWidget>
#include <TelepathyQt/Types>
@@ -39,7 +39,7 @@ public:
virtual ~SalutDetailsDialog();
Q_SIGNALS:
- void feedbackMessage(const QString &text, const QString &comment, KTitleWidget::MessageType);
+ void feedbackMessage(const QString &text, const QString &comment, KMessageWidget::MessageType);
void dialogAccepted(const QVariantMap &values);
private:
diff --git a/src/salut-enabler.cpp b/src/salut-enabler.cpp
index ca7a46e..9bc3ba2 100644
--- a/src/salut-enabler.cpp
+++ b/src/salut-enabler.cpp
@@ -240,7 +240,7 @@ void SalutEnabler::onAccountCreated(Tp::PendingOperation* op)
if (op->isError()) {
Q_EMIT feedbackMessage(i18n("Failed to create account"),
i18n("Possibly not all required fields are valid"),
- KTitleWidget::ErrorMessage);
+ KMessageWidget::Error);
kWarning() << "Adding Account failed:" << op->errorName() << op->errorMessage();
return;
}
@@ -250,7 +250,7 @@ void SalutEnabler::onAccountCreated(Tp::PendingOperation* op)
if (!pendingAccount) {
Q_EMIT feedbackMessage(i18n("Something went wrong with Telepathy"),
QString(),
- KTitleWidget::ErrorMessage);
+ KMessageWidget::Error);
kWarning() << "Method called with wrong type.";
return;
}
@@ -276,8 +276,8 @@ void SalutEnabler::onUserWantingChanges()
connect(d->detailsDialog, SIGNAL(rejected()),
this, SIGNAL(cancelled()));
- connect(d->detailsDialog, SIGNAL(feedbackMessage(QString,QString,KTitleWidget::MessageType)),
- this, SIGNAL(feedbackMessage(QString,QString,KTitleWidget::MessageType)));
+ connect(d->detailsDialog, SIGNAL(feedbackMessage(QString,QString,KMessageWidget::MessageType)),
+ this, SIGNAL(feedbackMessage(QString,QString,KMessageWidget::MessageType)));
d->detailsDialog->exec();
}
diff --git a/src/salut-enabler.h b/src/salut-enabler.h
index 8a86133..25bd4f8 100644
--- a/src/salut-enabler.h
+++ b/src/salut-enabler.h
@@ -24,7 +24,7 @@
#include <QObject>
#include <TelepathyQt/Types>
-#include <KTitleWidget>
+#include <KMessageWidget>
class QFrame;
class QWidget;
@@ -46,7 +46,7 @@ Q_SIGNALS:
void userInfoReady();
void done();
void cancelled();
- void feedbackMessage(const QString &text, const QString &comment, KTitleWidget::MessageType);
+ void feedbackMessage(const QString &text, const QString &comment, KMessageWidget::MessageType);
public Q_SLOTS:
void onUserAccepted();
--
ktp-accounts-kcm packaging
More information about the pkg-kde-commits
mailing list