From 858c7dbcbfa84deda9a71b4f4d25b1555bae3cc1 Mon Sep 17 00:00:00 2001 From: Marcus Eggenberger Date: Wed, 12 Mar 2008 13:51:48 +0000 Subject: [PATCH 1/1] topic line edit has now a clear button --- src/qtui/ui/topicwidget.ui | 22 +++++++++--- src/uisupport/clearablelineedit.cpp | 54 +++++++++++++++++++++++++++++ src/uisupport/clearablelineedit.h | 44 +++++++++++++++++++++++ src/uisupport/uisupport.pri | 4 +-- version.inc | 2 +- 5 files changed, 118 insertions(+), 8 deletions(-) create mode 100644 src/uisupport/clearablelineedit.cpp create mode 100644 src/uisupport/clearablelineedit.h diff --git a/src/qtui/ui/topicwidget.ui b/src/qtui/ui/topicwidget.ui index 4993bf88..528fc214 100644 --- a/src/qtui/ui/topicwidget.ui +++ b/src/qtui/ui/topicwidget.ui @@ -31,11 +31,20 @@ Form - + + 2 + + + 2 + + + 2 + + 2 - + @@ -56,9 +65,7 @@ ... - - - + @@ -77,6 +84,11 @@
topicbutton.h
1 + + ClearableLineEdit + QLineEdit +
clearablelineedit.h
+ diff --git a/src/uisupport/clearablelineedit.cpp b/src/uisupport/clearablelineedit.cpp new file mode 100644 index 00000000..ae99be6f --- /dev/null +++ b/src/uisupport/clearablelineedit.cpp @@ -0,0 +1,54 @@ +/*************************************************************************** + * Copyright (C) 2005/06 by the Quassel Project * + * devel@quassel-irc.org * + * * + * This program is free software; you can redistribute it and/or modify * + * it under the terms of the GNU General Public License as published by * + * the Free Software Foundation; either version 2 of the License, or * + * (at your option) version 3. * + * * + * This program is distributed in the hope that it will be useful, * + * but WITHOUT ANY WARRANTY; without even the implied warranty of * + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * + * GNU General Public License for more details. * + * * + * You should have received a copy of the GNU General Public License * + * along with this program; if not, write to the * + * Free Software Foundation, Inc., * + * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * + ***************************************************************************/ + +#include "clearablelineedit.h" + +#include +#include + +ClearableLineEdit::ClearableLineEdit(QWidget *parent) + : QLineEdit(parent) +{ + clearButton = new QToolButton(this); + clearButton->setIcon(QIcon(":/22x22/actions/oxygen/22x22/actions/edit-clear-locationbar-rtl.png")); + clearButton->setCursor(Qt::ArrowCursor); + clearButton->setStyleSheet("QToolButton { border: none; padding: 0px; }"); + clearButton->hide(); + + connect(clearButton, SIGNAL(clicked()), this, SLOT(clear())); + connect(this, SIGNAL(textChanged(const QString&)), this, SLOT(updateClearButton(const QString&))); + + int frameWidth = style()->pixelMetric(QStyle::PM_DefaultFrameWidth); + setStyleSheet(QString("QLineEdit { padding-right: %1px; } ").arg(clearButton->sizeHint().width() + frameWidth + 1)); + QSize msz = minimumSizeHint(); + setMinimumSize(qMax(msz.width(), clearButton->sizeHint().height() + frameWidth * 2 + 2), + qMax(msz.height(), clearButton->sizeHint().height() + frameWidth * 2 + 2)); +} + +void ClearableLineEdit::resizeEvent(QResizeEvent *) { + QSize size = clearButton->sizeHint(); + int frameWidth = style()->pixelMetric(QStyle::PM_DefaultFrameWidth); + clearButton->move(rect().right() - frameWidth - size.width(), + (rect().bottom() + 1 - size.height())/2); +} + +void ClearableLineEdit::updateClearButton(const QString& text) { + clearButton->setVisible(!text.isEmpty()); +} diff --git a/src/uisupport/clearablelineedit.h b/src/uisupport/clearablelineedit.h new file mode 100644 index 00000000..2bef8eba --- /dev/null +++ b/src/uisupport/clearablelineedit.h @@ -0,0 +1,44 @@ +/*************************************************************************** + * Copyright (C) 2005/06 by the Quassel Project * + * devel@quassel-irc.org * + * * + * This program is free software; you can redistribute it and/or modify * + * it under the terms of the GNU General Public License as published by * + * the Free Software Foundation; either version 2 of the License, or * + * (at your option) version 3. * + * * + * This program is distributed in the hope that it will be useful, * + * but WITHOUT ANY WARRANTY; without even the implied warranty of * + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * + * GNU General Public License for more details. * + * * + * You should have received a copy of the GNU General Public License * + * along with this program; if not, write to the * + * Free Software Foundation, Inc., * + * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * + ***************************************************************************/ + +#ifndef CLEARABLELINEEDIT_H +#define CLEARABLELINEEDIT_H + +#include + +class QToolButton; + +class ClearableLineEdit : public QLineEdit { + Q_OBJECT + +public: + ClearableLineEdit(QWidget *parent = 0); + +protected: + void resizeEvent(QResizeEvent *event); + +private slots: + void updateClearButton(const QString &text); + +private: + QToolButton *clearButton; +}; + +#endif // CLEARABLELINEEDIT_H diff --git a/src/uisupport/uisupport.pri b/src/uisupport/uisupport.pri index 496382ba..426515ab 100644 --- a/src/uisupport/uisupport.pri +++ b/src/uisupport/uisupport.pri @@ -1,8 +1,8 @@ DEPMOD = common client QT_MOD = core gui network -SRCS += abstractitemview.cpp bufferview.cpp bufferviewfilter.cpp colorbutton.cpp nickviewfilter.cpp inputline.cpp nickview.cpp settingspage.cpp tabcompleter.cpp uisettings.cpp uistyle.cpp uistylesettings.cpp -HDRS += abstractitemview.h bufferview.h bufferviewfilter.h colorbutton.h nickviewfilter.h inputline.h nickview.h settingspage.h tabcompleter.h uisettings.h uistyle.h uistylesettings.h +SRCS += abstractitemview.cpp bufferview.cpp bufferviewfilter.cpp clearablelineedit.cpp colorbutton.cpp nickviewfilter.cpp inputline.cpp nickview.cpp settingspage.cpp tabcompleter.cpp uisettings.cpp uistyle.cpp uistylesettings.cpp +HDRS += abstractitemview.h bufferview.h bufferviewfilter.h clearablelineedit.h colorbutton.h nickviewfilter.h inputline.h nickview.h settingspage.h tabcompleter.h uisettings.h uistyle.h uistylesettings.h FORMNAMES = diff --git a/version.inc b/version.inc index dc19cb6a..a20557bd 100644 --- a/version.inc +++ b/version.inc @@ -5,7 +5,7 @@ quasselVersion = "0.2.0-alpha3-pre"; quasselDate = "2008-03-12"; - quasselBuild = 630; + quasselBuild = 632; //! Minimum client build number the core needs clientBuildNeeded = 628; -- 2.20.1