[SCM] ktp-contact-list packaging branch, master, updated. debian/15.12.1-2-1070-g6c56f91

[Maximiliano Curia]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/applications/ktp-contact-list.git;a=commitdiff;h=e07c33d

The following commit has been merged in the master branch:
commit e07c33df5d6de4ba45e8748d8857ed9db19d280c
Author: Martin Klapetek <martin.klapetek at gmail.com>
Date:   Wed Mar 23 13:59:22 2011 +0100

    Add Settings toolbar menu-button, which adds the standard help menu as well as Accounts settings KCM
---
 CMakeLists.txt  |  1 +
 main-widget.cpp | 29 ++++++++++++++++++++++++++++-
 main-widget.h   |  1 +
 main.cpp        |  3 ++-
 4 files changed, 32 insertions(+), 2 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 0164cb5..7581f10 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -47,6 +47,7 @@ kde4_add_executable (telepathy-kde-contactlist
 target_link_libraries (telepathy-kde-contactlist
                        ${TELEPATHY_QT4_LIBRARIES}
                        ${KDE4_KDEUI_LIBS}
+                       ${KDE4_KCMUTILS_LIBS}
 )
 
 # Install:
diff --git a/main-widget.cpp b/main-widget.cpp
index e4ac02f..f65d7fd 100644
--- a/main-widget.cpp
+++ b/main-widget.cpp
@@ -39,6 +39,7 @@
 #include <KDebug>
 #include <KUser>
 #include <KMenu>
+#include <KSettings/Dialog>
 
 #include "main-widget.h"
 #include "ui_main-widget.h"
@@ -65,7 +66,20 @@ MainWidget::MainWidget(QWidget *parent)
 
     m_userAccountIconButton->setIcon(QIcon(QPixmap::fromImage(QImage(user.faceIconPath()))));
     m_userAccountNameLabel->setText(user.property(KUser::FullName).toString());
-//     m_toolBar->hide();
+
+    QToolButton *settingsButton = new QToolButton(this);
+    settingsButton->setIcon(KIcon("configure"));
+    settingsButton->setPopupMode(QToolButton::InstantPopup);
+
+    QMenu *settingsButtonMenu = new QMenu(settingsButton);
+    settingsButtonMenu->addAction(i18n("Configure accounts..."), this, SLOT(showSettingsKCM()));
+    settingsButtonMenu->addSeparator();
+    settingsButtonMenu->addMenu(helpMenu());
+
+    settingsButton->setMenu(settingsButtonMenu);
+
+    m_toolBar->addSeparator();
+    m_toolBar->addWidget(settingsButton);
 
     m_actionAdd_contact->setIcon(KIcon("list-add-user"));
     m_actionAdd_contact->setText(QString());
@@ -189,6 +203,9 @@ void MainWidget::onAccountManagerReady(Tp::PendingOperation* op)
     connect(m_filterBar, SIGNAL(closeRequest()),
             m_actionSearch_contact, SLOT(toggle()));
 
+    connect(m_modelFilter, SIGNAL(rowsAboutToBeRemoved(QModelIndex, int, int)),
+        m_delegate, SLOT(contactRemoved(QModelIndex,int,int)));
+
     m_accountButtonsLayout->insertStretch(-1);
 
     QList<Tp::AccountPtr> accounts = m_accountManager->allAccounts();
@@ -625,4 +642,14 @@ void MainWidget::setCustomPresenceMessage(const QString& message)
     }
 
     m_presenceMessageEdit->clearFocus();
+}
+
+void MainWidget::showSettingsKCM()
+{
+    KSettings::Dialog *dialog = new KSettings::Dialog(this);
+
+    dialog->addModule("kcm_telepathy_accounts");
+
+    dialog->setAttribute(Qt::WA_DeleteOnClose);
+    dialog->show();
 }
\ No newline at end of file
diff --git a/main-widget.h b/main-widget.h
index 695de4c..daa6559 100644
--- a/main-widget.h
+++ b/main-widget.h
@@ -77,6 +77,7 @@ public Q_SLOTS:
     void onAccountRemoved();
     void toggleSearchWidget(bool show);
     void setCustomPresenceMessage(const QString &message);
+    void showSettingsKCM();
     //    void startAudioChannel();
     //    void startVideoChannel();
 
diff --git a/main.cpp b/main.cpp
index 8b951f7..1d4c0bc 100644
--- a/main.cpp
+++ b/main.cpp
@@ -54,8 +54,9 @@ int main(int argc, char *argv[])
                          ki18n("Telepathy KDE Contact List"), KAboutData::License_GPL,
                          ki18n("(C) 2011, Martin Klapetek"));
 
-    aboutData.addAuthor(ki18nc("@info:credit", "Martin Klapetek"), KLocalizedString(),
+    aboutData.addAuthor(ki18nc("@info:credit", "Martin Klapetek"), ki18n("Developer"),
                         "martin.klapetek at gmail.com");
+    aboutData.setProductName("telepathy/contactlist"); //set the correct name for bug reporting
 
     KCmdLineArgs::init(argc, argv, &aboutData);
 

-- 
ktp-contact-list packaging