[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=7530ff0

The following commit has been merged in the master branch:
commit 7530ff096b4f1a283316ee49f9d0ebdee70c11ef
Author: Martin Klapetek <martin.klapetek at gmail.com>
Date:   Fri Apr 22 13:32:37 2011 +0200

    Move the Settings button to the right, it got forgotten when the actions were changed to KActions.Reviewed by: David Edmundson
---
 main-widget.cpp | 28 ++++++++++++++--------------
 1 file changed, 14 insertions(+), 14 deletions(-)

diff --git a/main-widget.cpp b/main-widget.cpp
index db4f4cd..442dbdc 100644
--- a/main-widget.cpp
+++ b/main-widget.cpp
@@ -103,20 +103,6 @@ MainWidget::MainWidget(QWidget *parent)
 
     m_userAccountIconButton->setMenu(m_avatarButtonMenu);
 
-    QToolButton *settingsButton = new QToolButton(this);
-    settingsButton->setIcon(KIcon("configure"));
-    settingsButton->setPopupMode(QToolButton::InstantPopup);
-
-    KMenu *settingsButtonMenu = new KMenu(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_addContactAction = new KAction(KIcon("list-add-user"), QString(), this);
     m_addContactAction->setToolTip(i18n("Add new contacts.."));
 
@@ -145,6 +131,20 @@ MainWidget::MainWidget(QWidget *parent)
 
     m_toolBar->addAction(m_searchContactAction);
 
+    QToolButton *settingsButton = new QToolButton(this);
+    settingsButton->setIcon(KIcon("configure"));
+    settingsButton->setPopupMode(QToolButton::InstantPopup);
+
+    KMenu *settingsButtonMenu = new KMenu(settingsButton);
+    settingsButtonMenu->addAction(i18n("Configure accounts..."), this, SLOT(showSettingsKCM()));
+    settingsButtonMenu->addSeparator();
+    settingsButtonMenu->addMenu(helpMenu());
+
+    settingsButton->setMenu(settingsButtonMenu);
+
+    m_toolBar->addSeparator();
+    m_toolBar->addWidget(settingsButton);
+
     // Start setting up the Telepathy AccountManager.
     Tp::AccountFactoryPtr  accountFactory = Tp::AccountFactory::create(QDBusConnection::sessionBus(),
                                                                        Tp::Features() << Tp::Account::FeatureCore

-- 
ktp-contact-list packaging