[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:15:56 UTC 2016
Gitweb-URL: http://git.debian.org/?p=pkg-kde/applications/ktp-text-ui.git;a=commitdiff;h=6855048
The following commit has been merged in the master branch:
commit 6855048e7609dc3615f388d5e8eae532f459aa6c
Author: David Edmundson <kde at davidedmundson.co.uk>
Date: Fri Jul 30 21:23:00 2010 +0000
Refactor to merge mainwindow and realclienthandler classes.
svn path=/trunk/playground/network/telepathy-chat-handler/; revision=1157369
---
CMakeLists.txt | 2 --
chatconnection.cpp | 2 --
main.cpp | 14 +++++--------
mainwindow.cpp | 57 +++++++++++++++++++++++----------------------------
mainwindow.h | 54 ++++++++++++++++++++++++++----------------------
mainwindow.ui | 41 ------------------------------------
realclienthandler.cpp | 40 ------------------------------------
realclienthandler.h | 41 ------------------------------------
8 files changed, 61 insertions(+), 190 deletions(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index cbb5a52..5e89a4f 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -27,7 +27,6 @@ include_directories (${KDE4_INCLUDES}
set(telepathy_chat_handler_SRCS
main.cpp
mainwindow.cpp
- realclienthandler.cpp
chatconnection.cpp
chatwindow.cpp
chatwindowstyle.cpp
@@ -39,7 +38,6 @@ set(telepathy_chat_handler_SRCS
set(telepathy_chat_handler_UI
chatwindow.ui
- mainwindow.ui
)
kde4_add_ui_files(telepathy_chat_handler_SRCS ${telepathy_chat_handler_UI})
diff --git a/chatconnection.cpp b/chatconnection.cpp
index a764d05..e6e2df8 100644
--- a/chatconnection.cpp
+++ b/chatconnection.cpp
@@ -18,9 +18,7 @@ ChatConnection::ChatConnection(QObject *parent, const AccountPtr account, const
);
-
connect(op, SIGNAL(finished(Tp::PendingOperation*)), this, SLOT(onChannelReady(Tp::PendingOperation*)));
-
}
else
{
diff --git a/main.cpp b/main.cpp
index 3714d32..2fa6f57 100644
--- a/main.cpp
+++ b/main.cpp
@@ -5,7 +5,7 @@
#include <TelepathyQt4/Channel>
#include <TelepathyQt4/ClientRegistrar>
-#include "realclienthandler.h"
+#include "mainwindow.h"
int main(int argc, char *argv[])
{
@@ -13,18 +13,14 @@ int main(int argc, char *argv[])
registerTypes();
- //I'd like to move this to mainwindow.cpp but this seemed to break it. I really don't understand why.
-
ClientRegistrarPtr registrar = ClientRegistrar::create();
- RealClientHandler* clientHandler = new RealClientHandler();
+ MainWindow* mainWindow = new MainWindow();
- AbstractClientPtr handler = AbstractClientPtr::dynamicCast(
- SharedPtr<RealClientHandler>(clientHandler));
+ AbstractClientPtr handler = AbstractClientPtr::dynamicCast(SharedPtr<MainWindow>(mainWindow));
registrar->registerClient(handler, "KDEChatHandler");
- MainWindow w(clientHandler);
- w.show();
+ mainWindow->show();
return a.exec();
- delete clientHandler;
+ delete mainWindow;
}
diff --git a/mainwindow.cpp b/mainwindow.cpp
index d4aa2ea..26e49ef 100644
--- a/mainwindow.cpp
+++ b/mainwindow.cpp
@@ -1,44 +1,39 @@
#include "mainwindow.h"
-#include "ui_mainwindow.h"
-#include <QDebug>
-#include "realclienthandler.h"
-#include <TelepathyQt4/AbstractClient>
-#include <QStatusBar>
-
#include "chatwindow.h"
-
-MainWindow::MainWindow(RealClientHandler *clientHandler, QWidget *parent) :
- QWidget(parent),
- ui(new Ui::MainWindow)
+inline ChannelClassList channelClassList()
{
- ui->setupUi(this);
- m_clientHandler = clientHandler;
-
- connect(m_clientHandler, SIGNAL(newConnection(ChatConnection*)), SLOT(handleNewConnection(ChatConnection*)));
+ ChannelClassList filters;
+ QMap<QString, QDBusVariant> filter;
+ filter.insert(QLatin1String(TELEPATHY_INTERFACE_CHANNEL ".ChannelType"),
+ QDBusVariant(TELEPATHY_INTERFACE_CHANNEL_TYPE_TEXT));
+ filters.append(filter);
+ return filters;
}
-MainWindow::~MainWindow()
-{
- delete ui;
-}
-void MainWindow::changeEvent(QEvent *e)
+MainWindow::MainWindow() :
+ KTabWidget(),
+ AbstractClientHandler(channelClassList())
{
- QWidget::changeEvent(e);
- switch (e->type())
- {
- case QEvent::LanguageChange:
- ui->retranslateUi(this);
- break;
- default:
- break;
- }
}
-void MainWindow::handleNewConnection(ChatConnection *connection)
+
+void MainWindow::handleChannels(const MethodInvocationContextPtr<> &context,
+ const AccountPtr & account,
+ const ConnectionPtr & connection,
+ const QList< ChannelPtr > & channels,
+ const QList< ChannelRequestPtr > & requestsSatisfied,
+ const QDateTime & userActionTime,
+ const QVariantMap & handlerInfo
+ )
{
- ChatWindow* newWindow = new ChatWindow(connection, this);
- ui->ktabwidget->addTab(newWindow, "test"); //FIXME get name from connection contact
+ ChatConnection* chatConnection = new ChatConnection(this, account, connection, channels);
+ ChatWindow* newWindow = new ChatWindow(chatConnection, this);
+
+ addTab(newWindow,"test");
+ resize(newWindow->sizeHint());// FUDGE
+
+ context->setFinished();
}
diff --git a/mainwindow.h b/mainwindow.h
index a12cb6b..8d89188 100644
--- a/mainwindow.h
+++ b/mainwindow.h
@@ -1,35 +1,41 @@
-#ifndef MAINWINDOW_H
-#define MAINWINDOW_H
+#ifndef REALCLIENTHANDLER_H
+#define REALCLIENTHANDLER_H
-#include <QMainWindow>
-#include "realclienthandler.h"
-#include "chatconnection.h"
+#include <KTabWidget>
+#include <TelepathyQt4/AbstractClientHandler>
+#include <TelepathyQt4/types.h>
+#include <TelepathyQt4/Channel>
+#include <TelepathyQt4/TextChannel>
+#include <TelepathyQt4/ReceivedMessage>
+#include <chatconnection.h>
-namespace Ui
-{
-class MainWindow;
-}
+using namespace Tp;
+
+inline ChannelClassList channelClassList();
+//In the future I want to have a (potential) list of tab widgets. Like Kopete presently. This may need a bit of a rewrite.
-class MainWindow : public QWidget
+class MainWindow : public KTabWidget, public AbstractClientHandler
{
Q_OBJECT
-
public:
- explicit MainWindow(RealClientHandler*, QWidget *parent = 0);
- ~MainWindow();
-
-protected:
- void changeEvent(QEvent *e);
-
-protected slots:
- void handleNewConnection(ChatConnection* connection);
-
+ MainWindow();
+
+ virtual void handleChannels(const MethodInvocationContextPtr<> &context,
+ const AccountPtr & account,
+ const ConnectionPtr & connection,
+ const QList< ChannelPtr > & channels,
+ const QList< ChannelRequestPtr > & requestsSatisfied,
+ const QDateTime & userActionTime,
+ const QVariantMap & handlerInfo
+ );
+
+ bool bypassApproval() const
+ {
+ return false;
+ }
-private:
- Ui::MainWindow *ui;
- RealClientHandler* m_clientHandler;
};
-#endif // MAINWINDOW_H
+#endif // REALCLIENTHANDLER_H
diff --git a/mainwindow.ui b/mainwindow.ui
deleted file mode 100644
index 92f3c44..0000000
--- a/mainwindow.ui
+++ /dev/null
@@ -1,41 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<ui version="4.0">
- <class>MainWindow</class>
- <widget class="QWidget" name="MainWindow">
- <property name="geometry">
- <rect>
- <x>0</x>
- <y>0</y>
- <width>400</width>
- <height>300</height>
- </rect>
- </property>
- <property name="windowTitle">
- <string>Form</string>
- </property>
- <layout class="QVBoxLayout" name="verticalLayout">
- <property name="sizeConstraint">
- <enum>QLayout::SetNoConstraint</enum>
- </property>
- <property name="leftMargin">
- <number>4</number>
- </property>
- <property name="topMargin">
- <number>1</number>
- </property>
- <item>
- <widget class="KTabWidget" name="ktabwidget"/>
- </item>
- </layout>
- </widget>
- <customwidgets>
- <customwidget>
- <class>KTabWidget</class>
- <extends>QTabWidget</extends>
- <header>ktabwidget.h</header>
- <container>1</container>
- </customwidget>
- </customwidgets>
- <resources/>
- <connections/>
-</ui>
diff --git a/realclienthandler.cpp b/realclienthandler.cpp
deleted file mode 100644
index 019b4db..0000000
--- a/realclienthandler.cpp
+++ /dev/null
@@ -1,40 +0,0 @@
-#include "realclienthandler.h"
-#include <QMessageBox>
-
-
-inline ChannelClassList channelClassList()
-{
- ChannelClassList filters;
- QMap<QString, QDBusVariant> filter;
- filter.insert(QLatin1String(TELEPATHY_INTERFACE_CHANNEL ".ChannelType"),
- QDBusVariant(TELEPATHY_INTERFACE_CHANNEL_TYPE_TEXT));
- // filter.insert(QLatin1String(TELEPATHY_INTERFACE_CHANNEL ".TargetHandleType"),
- // QDBusVariant((uint) Tp::HandleTypeContact));
- filters.append(filter);
- return filters;
-}
-
-
-RealClientHandler::RealClientHandler() :
- QObject(),
- AbstractClientHandler(channelClassList())
-{
-}
-
-
-void RealClientHandler::handleChannels(const MethodInvocationContextPtr<> &context,
- const AccountPtr & account,
- const ConnectionPtr & connection,
- const QList< ChannelPtr > & channels,
- const QList< ChannelRequestPtr > & requestsSatisfied,
- const QDateTime & userActionTime,
- const QVariantMap & handlerInfo
- )
-{
- ChatConnection* chatConnection = new ChatConnection(this, account, connection, channels);
- Q_EMIT(newConnection(chatConnection)); //FIXME FIXME FIXME I'm going all over the place with parenting here. It'll explode before I know it
-
- qDebug();
- context->setFinished();
-}
-
diff --git a/realclienthandler.h b/realclienthandler.h
deleted file mode 100644
index e068fd7..0000000
--- a/realclienthandler.h
+++ /dev/null
@@ -1,41 +0,0 @@
-#ifndef REALCLIENTHANDLER_H
-#define REALCLIENTHANDLER_H
-
-#include <TelepathyQt4/AbstractClientHandler>
-#include <TelepathyQt4/types.h>
-#include <TelepathyQt4/Channel>
-#include <TelepathyQt4/TextChannel>
-#include <TelepathyQt4/ReceivedMessage>
-#include <chatconnection.h>
-
-using namespace Tp;
-
-inline ChannelClassList channelClassList();
-
-//TODO rename to something better, when I think of it.
-class RealClientHandler : public QObject, public AbstractClientHandler
-{
- Q_OBJECT
-public:
- RealClientHandler();
-
- virtual void handleChannels(const MethodInvocationContextPtr<> &context,
- const AccountPtr & account,
- const ConnectionPtr & connection,
- const QList< ChannelPtr > & channels,
- const QList< ChannelRequestPtr > & requestsSatisfied,
- const QDateTime & userActionTime,
- const QVariantMap & handlerInfo
- );
-
- bool bypassApproval() const
- {
- return false;
- }
-
-signals:
- void newConnection(ChatConnection* newConnection);
-
-};
-
-#endif // REALCLIENTHANDLER_H
--
ktp-text-ui packaging
More information about the pkg-kde-commits
mailing list