diff options
author | Eike Ziller <[email protected]> | 2017-12-01 11:21:10 +0100 |
---|---|---|
committer | Eike Ziller <[email protected]> | 2017-12-07 12:49:15 +0000 |
commit | 9687593bce10dcfbb5a891a0d809143c7bfdebb4 (patch) | |
tree | 6951cf7781f8f61c878d589efc3e07d0b55009a5 /src/libs | |
parent | 6d05ba7bfcd6f0ae1e1af100cd4aab1cdc0c3a8c (diff) |
Rename LineColumnLabel
It is not only used for line and column.
Change-Id: I544244dbca0b9f084e45ff2d7e4f28f79d2cae09
Reviewed-by: David Schulz <[email protected]>
Diffstat (limited to 'src/libs')
-rw-r--r-- | src/libs/utils/fixedsizeclicklabel.cpp (renamed from src/libs/utils/linecolumnlabel.cpp) | 26 | ||||
-rw-r--r-- | src/libs/utils/fixedsizeclicklabel.h (renamed from src/libs/utils/linecolumnlabel.h) | 4 | ||||
-rw-r--r-- | src/libs/utils/utils-lib.pri | 8 | ||||
-rw-r--r-- | src/libs/utils/utils.qbs | 4 |
4 files changed, 22 insertions, 20 deletions
diff --git a/src/libs/utils/linecolumnlabel.cpp b/src/libs/utils/fixedsizeclicklabel.cpp index 88b10340b2b..f3fd104cb40 100644 --- a/src/libs/utils/linecolumnlabel.cpp +++ b/src/libs/utils/fixedsizeclicklabel.cpp @@ -23,55 +23,57 @@ ** ****************************************************************************/ -#include "linecolumnlabel.h" +#include "fixedsizeclicklabel.h" #include <QMouseEvent> /*! - \class Utils::LineColumnLabel + \class Utils::FixedSizeClickLabel - \brief The LineColumnLabel class is a label suitable for displaying cursor - positions, and so on, with a fixed - width derived from a sample text. + \brief The FixedSizeClickLabel class is a label with a size hint derived from a sample text + that can be different to the text that is shown. + + For convenience it also has a clicked signal that is emitted whenever the label receives a mouse + click. */ namespace Utils { -LineColumnLabel::LineColumnLabel(QWidget *parent) +FixedSizeClickLabel::FixedSizeClickLabel(QWidget *parent) : QLabel(parent) , m_pressed(false) { } -void LineColumnLabel::setText(const QString &text, const QString &maxText) +void FixedSizeClickLabel::setText(const QString &text, const QString &maxText) { QLabel::setText(text); m_maxText = maxText; } -QSize LineColumnLabel::sizeHint() const +QSize FixedSizeClickLabel::sizeHint() const { return fontMetrics().boundingRect(m_maxText).size(); } -QString LineColumnLabel::maxText() const +QString FixedSizeClickLabel::maxText() const { return m_maxText; } -void LineColumnLabel::setMaxText(const QString &maxText) +void FixedSizeClickLabel::setMaxText(const QString &maxText) { m_maxText = maxText; } -void LineColumnLabel::mousePressEvent(QMouseEvent *ev) +void FixedSizeClickLabel::mousePressEvent(QMouseEvent *ev) { QLabel::mousePressEvent(ev); if (ev->button() == Qt::LeftButton) m_pressed = true; } -void LineColumnLabel::mouseReleaseEvent(QMouseEvent *ev) +void FixedSizeClickLabel::mouseReleaseEvent(QMouseEvent *ev) { QLabel::mouseReleaseEvent(ev); if (ev->button() != Qt::LeftButton) diff --git a/src/libs/utils/linecolumnlabel.h b/src/libs/utils/fixedsizeclicklabel.h index 4eeb55f2575..c34b69f63f7 100644 --- a/src/libs/utils/linecolumnlabel.h +++ b/src/libs/utils/fixedsizeclicklabel.h @@ -30,13 +30,13 @@ namespace Utils { -class QTCREATOR_UTILS_EXPORT LineColumnLabel : public QLabel +class QTCREATOR_UTILS_EXPORT FixedSizeClickLabel : public QLabel { Q_OBJECT Q_PROPERTY(QString maxText READ maxText WRITE setMaxText DESIGNABLE true) public: - explicit LineColumnLabel(QWidget *parent = 0); + explicit FixedSizeClickLabel(QWidget *parent = 0); void setText(const QString &text, const QString &maxText); QSize sizeHint() const; diff --git a/src/libs/utils/utils-lib.pri b/src/libs/utils/utils-lib.pri index 1549ec774fd..268ab2597db 100644 --- a/src/libs/utils/utils-lib.pri +++ b/src/libs/utils/utils-lib.pri @@ -50,7 +50,6 @@ SOURCES += \ $$PWD/codegeneration.cpp \ $$PWD/newclasswidget.cpp \ $$PWD/classnamevalidatinglineedit.cpp \ - $$PWD/linecolumnlabel.cpp \ $$PWD/fancylineedit.cpp \ $$PWD/qtcolorbutton.cpp \ $$PWD/savedaction.cpp \ @@ -120,7 +119,8 @@ SOURCES += \ $$PWD/fuzzymatcher.cpp \ $$PWD/textutils.cpp \ $$PWD/url.cpp \ - $$PWD/filecrumblabel.cpp + $$PWD/filecrumblabel.cpp \ + $$PWD/fixedsizeclicklabel.cpp win32:SOURCES += $$PWD/consoleprocess_win.cpp else:SOURCES += $$PWD/consoleprocess_unix.cpp @@ -156,7 +156,6 @@ HEADERS += \ $$PWD/codegeneration.h \ $$PWD/newclasswidget.h \ $$PWD/classnamevalidatinglineedit.h \ - $$PWD/linecolumnlabel.h \ $$PWD/fancylineedit.h \ $$PWD/qtcolorbutton.h \ $$PWD/savedaction.h \ @@ -256,7 +255,8 @@ HEADERS += \ $$PWD/url.h \ $$PWD/filecrumblabel.h \ $$PWD/linecolumn.h \ - $$PWD/link.h + $$PWD/link.h \ + $$PWD/fixedsizeclicklabel.h FORMS += $$PWD/filewizardpage.ui \ $$PWD/projectintropage.ui \ diff --git a/src/libs/utils/utils.qbs b/src/libs/utils/utils.qbs index 82cdd8e44ec..5606c114ba3 100644 --- a/src/libs/utils/utils.qbs +++ b/src/libs/utils/utils.qbs @@ -114,6 +114,8 @@ Project { "filewizardpage.cpp", "filewizardpage.h", "filewizardpage.ui", + "fixedsizeclicklabel.cpp", + "fixedsizeclicklabel.h", "flowlayout.cpp", "flowlayout.h", "functiontraits.h", @@ -136,8 +138,6 @@ Project { "json.cpp", "json.h", "linecolumn.h", - "linecolumnlabel.cpp", - "linecolumnlabel.h", "link.h", "listutils.h", "macroexpander.cpp", |