[SCM] ktp-common-internals packaging branch, master, updated. debian/15.12.1-2-1839-gf0635e9
Maximiliano Curia
maxy at moszumanska.debian.org
Mon May 9 09:08:16 UTC 2016
Gitweb-URL: http://git.debian.org/?p=pkg-kde/applications/ktp-common-internals.git;a=commitdiff;h=8b660ef
The following commit has been merged in the master branch:
commit 8b660ef716f1104abe9d7515fab8e565f5eb299f
Merge: de9926a57222f7c4bd0303dab7c980b781f8e366 f8d506c794b3be7c5b491ac73ae7e61758207eba
Author: David Edmundson <davidedmundson at kde.org>
Date: Fri Jun 13 19:25:51 2014 +0200
Merge branch 'master' into frameworks
Conflicts:
CMakeLists.txt
KTp/Widgets/join-chat-room-dialog.cpp
tools/debugger/main-window.cpp
KTp/Declarative/telepathy-manager.cpp | 17 -
KTp/Declarative/telepathy-manager.h | 1 -
KTp/Logger/ktp_logger_plugin.desktop | 1 +
.../ktploggerplugin_tplogger.desktop.cmake | 2 +
KTp/Models/accounts-tree-proxy-model.cpp | 8 +-
KTp/Models/contacts-filter-model.cpp | 93 +----
KTp/Models/contacts-filter-model.h | 4 +-
KTp/Models/rooms-model.cpp | 67 +++-
KTp/Models/rooms-model.h | 15 +-
KTp/Widgets/contact-view-widget.cpp | 22 +-
KTp/Widgets/contact-view-widget.h | 5 +
KTp/Widgets/join-chat-room-dialog.cpp | 364 +++++++++----------
KTp/Widgets/join-chat-room-dialog.h | 21 +-
KTp/Widgets/join-chat-room-dialog.ui | 388 ++++++++++-----------
KTp/actions.cpp | 24 +-
KTp/actions.h | 3 +
KTp/contact.cpp | 9 +
KTp/contact.h | 1 +
KTp/global-contact-manager.cpp | 6 +-
KTp/global-presence.cpp | 5 +
KTp/global-presence.h | 11 +-
data/ktelepathy.notifyrc | 36 ++
.../datasourceplugin/im-persons-data-source.cpp | 36 +-
tools/debugger/main-window.cpp | 64 +++-
tools/debugger/main-window.h | 9 +
tools/debugger/main-window.ui | 40 ---
26 files changed, 634 insertions(+), 618 deletions(-)
diff --cc KTp/Widgets/join-chat-room-dialog.cpp
index 0a7e286,94f1d24..d8bddd2
--- a/KTp/Widgets/join-chat-room-dialog.cpp
+++ b/KTp/Widgets/join-chat-room-dialog.cpp
@@@ -28,13 -28,10 +28,12 @@@
#include <KDebug>
#include <KInputDialog>
#include <KMessageBox>
++#include <KLocalizedString>
#include <KNotification>
#include <KPushButton>
- #include <KCompletionBox>
- #include <KIcon>
- #include <KGlobalSettings>
-
++#include <KIconLoader>
+ #include <TelepathyQt/Account>
#include <TelepathyQt/AccountSet>
#include <TelepathyQt/AccountCapabilityFilter>
#include <TelepathyQt/AccountManager>
@@@ -59,8 -56,14 +58,14 @@@ KTp::JoinChatRoomDialog::JoinChatRoomDi
{
QWidget *joinChatRoomDialog = new QWidget(this);
ui->setupUi(joinChatRoomDialog);
+ ui->feedbackWidget->hide();
+
setMainWidget(joinChatRoomDialog);
- setWindowIcon(KIcon(QLatin1String("telepathy-kde")));
- setWindowIcon(KIcon(QLatin1String("im-irc")));
++ setWindowIcon(QIcon::fromTheme(QLatin1String("im-irc")));
+ setWindowTitle(i18nc("Dialog title", "Join Chat Room"));
+
+ ui->filterPicture->clear();
+ ui->filterPicture->setPixmap(KIconLoader::global()->loadIcon(QLatin1String("view-filter"), KIconLoader::Small));
// config
KSharedConfigPtr commonConfig = KSharedConfig::openConfig(QLatin1String("ktelepathyrc"));
@@@ -77,14 -75,9 +77,9 @@@
// disable OK button on start
button(Ok)->setEnabled(false);
-
- //set icons
- ui->addFavoritePushButton->setIcon(KIcon(QLatin1String("list-add")));
- ui->editFavoritePushButton->setIcon(KIcon(QLatin1String("list-edit")));
- ui->removeFavoritePushButton->setIcon(KIcon(QLatin1String("list-remove")));
- ui->removeRecentPushButton->setIcon(KIcon(QLatin1String("list-remove")));
- ui->clearRecentPushButton->setIcon(KIcon(QLatin1String("edit-clear-list")));
-
+ button(Ok)->setText(i18nc("button", "Join/Create"));
- button(Ok)->setIcon(KIcon(QLatin1String("im-irc")));
++ button(Ok)->setIcon(QIcon::fromTheme(QLatin1String("im-irc")));
+ onAccountSelectionChanged(ui->comboBox->currentIndex());
connect(accountManager->becomeReady(), SIGNAL(finished(Tp::PendingOperation*)),
this, SLOT(onAccountManagerReady(Tp::PendingOperation*)));
@@@ -436,8 -354,12 +356,12 @@@ void KTp::JoinChatRoomDialog::onRoomLis
QString errorMsg(operation->errorName() + QLatin1String(": ") + operation->errorMessage());
sendNotificationToUser(errorMsg);
} else {
- ui->queryPushButton->setEnabled(true);
- ui->stopPushButton->setEnabled(false);
+ ui->queryButton->setEnabled(true);
- ui->queryButton->setIcon(KIcon(QLatin1String("media-playback-start")));
++ ui->queryButton->setIcon(QIcon::fromTheme(QLatin1String("media-playback-start")));
+ ui->queryButton->setText(i18nc("Button text", "Query"));
+ ui->queryButton->setToolTip(i18nc("Tooltip text", "Start query"));
+ connect(ui->queryButton, SIGNAL(clicked(bool)), this, SLOT(getRoomList()));
+ disconnect(ui->queryButton, SIGNAL(clicked(bool)), this, SLOT(stopListing()));
}
}
@@@ -445,8 -367,12 +369,12 @@@ void KTp::JoinChatRoomDialog::onListing
{
if (isListing) {
kDebug() << "listing";
- ui->queryPushButton->setEnabled(false);
- ui->stopPushButton->setEnabled(true);
+ ui->queryButton->setEnabled(true);
- ui->queryButton->setIcon(KIcon(QLatin1String("media-playback-stop")));
++ ui->queryButton->setIcon(QIcon::fromTheme(QLatin1String("media-playback-stop")));
+ ui->queryButton->setText(i18nc("Button text", "Stop"));
+ ui->queryButton->setToolTip(i18nc("Tooltip text", "Stop query"));
+ disconnect(ui->queryButton, SIGNAL(clicked(bool)), this, SLOT(getRoomList()));
+ connect(ui->queryButton, SIGNAL(clicked(bool)), this, SLOT(stopListing()));
} else {
kDebug() << "finished listing";
Tp::PendingOperation *op = m_roomListChannel->requestClose();
diff --cc tools/debugger/main-window.cpp
index 5d9c1e1,52ba74d..ad9ba56
--- a/tools/debugger/main-window.cpp
+++ b/tools/debugger/main-window.cpp
@@@ -21,10 -28,7 +28,8 @@@
#include <KIcon>
#include <KStatusBar>
#include <KToolBar>
- #include <KIconLoader>
+#include <KLocalizedString>
-
MainWindow::MainWindow(QWidget *parent)
: KXmlGuiWindow(parent)
{
@@@ -33,12 -37,12 +38,12 @@@
setupGUI();
m_ui.mcLogsView->setService(QLatin1String("org.freedesktop.Telepathy.MissionControl5"));
- m_ui.gabbleLogsView->setService(QLatin1String("org.freedesktop.Telepathy.ConnectionManager.gabble"));
- m_ui.hazeLogsView->setService(QLatin1String("org.freedesktop.Telepathy.ConnectionManager.haze"));
- m_ui.salutLogsView->setService(QLatin1String("org.freedesktop.Telepathy.ConnectionManager.salut"));
- m_ui.rakiaLogsView->setService(QLatin1String("org.freedesktop.Telepathy.ConnectionManager.rakia"));
- KAction *saveLogAction = new KAction(KIcon(QLatin1String("document-save-as"), KIconLoader::global()), i18n("Save Log"), this);
+ m_AccountManager = Tp::AccountManager::create();
+ Tp::PendingReady *pendingReady = m_AccountManager->becomeReady();
+ connect(pendingReady, SIGNAL(finished(Tp::PendingOperation*)), this, SLOT(onAccountManagerBecameReady(Tp::PendingOperation*)));
+
- KAction *saveLogAction = new KAction(KIcon(QLatin1String("document-save-as"), KIconLoader::global()), i18n("Save Log"), this);
++ KAction *saveLogAction = new KAction(QIcon::fromTheme(QLatin1String("document-save-as")), i18n("Save Log"), this);
saveLogAction->setToolTip(i18nc("Toolbar icon tooltip", "Save log of the current tab"));
toolBar()->addAction(saveLogAction);
@@@ -59,3 -59,44 +60,44 @@@ void MainWindow::saveLogFile(
{
m_ui.tabWidget->currentWidget()->findChild<DebugMessageView *>()->saveLogFile();
}
+
+ void MainWindow::onAccountManagerBecameReady(Tp::PendingOperation* op)
+ {
+ if (op->isError()) {
- kError() << "Failed to initialize Tp::AccountManager"
++ qCritical() << "Failed to initialize Tp::AccountManager"
+ << "Error was:" << op->errorName() << "-" << op->errorMessage();
+ } else {
+ QSet<QString> connectionManagers;
+
+ Tp::AccountSetPtr accountSetPtr = m_AccountManager->onlineAccounts();
+ QList<Tp::AccountPtr> accountList = accountSetPtr->accounts();
+
+ Q_FOREACH(Tp::AccountPtr account, accountList) {
+ connectionManagers.insert(account->cmName());
+ }
+
+ initConnectionManagerTabs(connectionManagers);
+ }
+ }
+
+ void MainWindow::initConnectionManagerTabs(const QSet<QString>& connectionManagerSet)
+ {
+ QStringList connectionManagerStringList = connectionManagerSet.toList();
+ qSort(connectionManagerStringList);
+
+ Q_FOREACH(QString connectionManager, connectionManagerStringList) {
+ QWidget *cmTab = new QWidget();
+ QHBoxLayout *horizontalLayout = new QHBoxLayout(cmTab);
+ DebugMessageView *cmDebugMessageView = new DebugMessageView(cmTab);
+ cmDebugMessageView->setService(QString(QLatin1String("org.freedesktop.Telepathy.ConnectionManager.%1")).arg(connectionManager));
+
+ horizontalLayout->addWidget(cmDebugMessageView);
+
+ // Convert the connectionManager to title case. eg. haze to Haze
+ QString tabText = connectionManager;
+ tabText[0] = tabText[0].toTitleCase();
+ m_ui.tabWidget->addTab(cmTab, tabText);
+
+ connect(cmDebugMessageView, SIGNAL(statusMessage(QString)), statusBar(), SLOT(showMessage(QString)));
+ }
+ }
--
ktp-common-internals packaging
More information about the pkg-kde-commits
mailing list