[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=61f2a72

The following commit has been merged in the master branch:
commit 61f2a7211b05c34c4c75abe938aa13952fbe9608
Author: Daniele E. Domenichelli <ddomenichelli at kde.org>
Date:   Tue Feb 12 16:30:47 2013 +0100

    Use QToolButton instead of KPushButton for close in search-bar
    
    Reviewed-by: Dan Vrátil <dvratil at redhat.com>
---
 lib/chat-search-bar.cpp | 6 +++++-
 lib/chat-search-bar.h   | 7 ++++---
 2 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/lib/chat-search-bar.cpp b/lib/chat-search-bar.cpp
index d0a3480..e92d863 100644
--- a/lib/chat-search-bar.cpp
+++ b/lib/chat-search-bar.cpp
@@ -28,16 +28,18 @@
 #include <QCheckBox>
 #include <QDebug>
 #include <QHBoxLayout>
+#include <QToolButton>
 
 ChatSearchBar::ChatSearchBar(QWidget *parent)
     : QWidget(parent)
     , m_searchInput(new KLineEdit(this))
-    , m_closeButton(new KPushButton(this))
+    , m_closeButton(new QToolButton(this))
     , m_nextButton(new KPushButton(KIcon(QLatin1String("go-down-search")), i18nc("Next search result" ,"&Next"), this))
     , m_previousButton(new KPushButton(KIcon(QLatin1String("go-up-search")), i18nc("Previous search result" ,"&Previous"), this))
     , m_caseSensitive(false)
 {
     // close button setup
+    m_closeButton->setAutoRaise(true);
     m_closeButton->setIcon(KIcon(QLatin1String("dialog-close")));
     connect(m_closeButton, SIGNAL(clicked(bool)), this, SLOT(toggleView(bool)));
 
@@ -60,6 +62,8 @@ ChatSearchBar::ChatSearchBar(QWidget *parent)
 
     QHBoxLayout *layout = new QHBoxLayout(this);
     layout->addWidget(m_closeButton);
+    layout->setAlignment(m_closeButton, Qt::AlignLeft | Qt::AlignTop);
+
     layout->addWidget(m_searchInput);
     layout->addWidget(m_nextButton);
     layout->addWidget(m_previousButton);
diff --git a/lib/chat-search-bar.h b/lib/chat-search-bar.h
index 2b3b11c..25ba27e 100644
--- a/lib/chat-search-bar.h
+++ b/lib/chat-search-bar.h
@@ -27,6 +27,7 @@
 
 class KLineEdit;
 class KPushButton;
+class QToolButton;
 
 /**
  * @brief Input field for user to insert text to look for inside a chat window
@@ -80,9 +81,9 @@ private:
     QWebPage::FindFlags findFlags();
 
     KLineEdit *m_searchInput;
-    KPushButton *m_closeButton
-    , *m_nextButton
-    , *m_previousButton;
+    QToolButton *m_closeButton;
+    KPushButton *m_nextButton;
+    KPushButton *m_previousButton;
 
     // search criteria variables
     bool m_highlightAll

-- 
ktp-text-ui packaging