[SCM] ktp-text-ui packaging branch, master, updated. debian/15.12.1-1-1918-gdf4b0ec

[Maximiliano Curia]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/applications/ktp-text-ui.git;a=commitdiff;h=2c02cbb

The following commit has been merged in the master branch:
commit 2c02cbbec25e19644cd1c3aec7327d0ccdb27579
Author: Dominik Schmidt <dev at dominik-schmidt.de>
Date:   Fri Feb 4 02:51:22 2011 +0100

    Add configuration dialog to the chat-ui
---
 app/chatwindow.cpp | 18 ++++++++++++++++--
 app/chatwindow.h   |  3 +++
 2 files changed, 19 insertions(+), 2 deletions(-)

diff --git a/app/chatwindow.cpp b/app/chatwindow.cpp
index 0e776ff..5cf2ea0 100644
--- a/app/chatwindow.cpp
+++ b/app/chatwindow.cpp
@@ -30,12 +30,14 @@
 #include <KIcon>
 #include <KColorScheme>
 #include <KTabBar>
+#include <KSettings/Dialog>
 
 ChatWindow::ChatWindow()
 {
     //setup actions
-    KStandardAction::quit(KApplication::instance(), SLOT(quit()),
-                        actionCollection());
+    KStandardAction::quit(KApplication::instance(), SLOT(quit()), actionCollection());
+    KStandardAction::preferences(this, SLOT(showSettingsDialog()), actionCollection());
+
 
     // set up m_tabWidget
     m_tabWidget = new KTabWidget(this);
@@ -134,5 +136,17 @@ void ChatWindow::onUserTypingChanged(bool isTyping)
     }
 }
 
+void ChatWindow::showSettingsDialog()
+{
+    kDebug();
+
+    KSettings::Dialog *dialog = new KSettings::Dialog(this);
+
+    dialog->addModule("kcm_telepathy_chat");
+    dialog->addModule("kcm_telepathy_accounts");
+
+    dialog->setAttribute(Qt::WA_DeleteOnClose);
+    dialog->show();
+}
 
 #include "chatwindow.moc"
\ No newline at end of file
diff --git a/app/chatwindow.h b/app/chatwindow.h
index 0e424e3..e6e2ffd 100644
--- a/app/chatwindow.h
+++ b/app/chatwindow.h
@@ -44,6 +44,9 @@ public slots:
     void updateTabIcon(const KIcon &newIcon);
     void onUserTypingChanged(bool isTyping);
 
+protected slots:
+    void showSettingsDialog();
+
 private:
     KTabWidget *m_tabWidget;
 };

-- 
ktp-text-ui packaging