feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

QmlDesigner: Add validators to timeline toolbar

Browse Source 
Cherry-picked from: 7bf3972665f7069605f32b01ddadbd4ae0bc5a98

Task-number: QDS-301
Change-Id: I6b74119589d0f735b6f3471fce914af8210bb953
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
This commit is contained in:
Alessandro Portale
2018-12-21 17:20:15 +01:00
parent 10958d88f6
commit f79908fc9d
2 changed files with 12 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/plugins/qmldesigner/qmldesignerextension/timelineeditor/timelinetoolbar.cpp
View File

@@ -48,6 +48,7 @@
#include <QLineEdit> #include <QLineEdit>
#include <QResizeEvent> #include <QResizeEvent>
#include <QSlider> #include <QSlider>
#include <QIntValidator>
namespace QmlDesigner { namespace QmlDesigner {
@@ -154,6 +155,7 @@ void TimelineToolBar::setStartFrame(qreal frame)
{ {
auto text = QString::number(frame, 'f', 0); auto text = QString::number(frame, 'f', 0);
m_firstFrame->setText(text); m_firstFrame->setText(text);
setupCurrentFrameValidator();
} }
void TimelineToolBar::setCurrentFrame(qreal frame) void TimelineToolBar::setCurrentFrame(qreal frame)
@@ -166,6 +168,7 @@ void TimelineToolBar::setEndFrame(qreal frame)
{ {
auto text = QString::number(frame, 'f', 0); auto text = QString::number(frame, 'f', 0);
m_lastFrame->setText(text); m_lastFrame->setText(text);
setupCurrentFrameValidator();
} }
void TimelineToolBar::setScaleFactor(int factor) void TimelineToolBar::setScaleFactor(int factor)
@@ -234,6 +237,8 @@ static QLineEdit *createToolBarLineEdit(QWidget *parent)
QPalette pal = parent->palette(); QPalette pal = parent->palette();
pal.setColor(QPalette::Text, Theme::instance()->color(Utils::Theme::PanelTextColorLight)); pal.setColor(QPalette::Text, Theme::instance()->color(Utils::Theme::PanelTextColorLight));
lineEdit->setPalette(pal); lineEdit->setPalette(pal);
QValidator *validator = new QIntValidator(-100000, 100000, lineEdit);
lineEdit->setValidator(validator);
return lineEdit; return lineEdit;
} }
@@ -427,6 +432,12 @@ void TimelineToolBar::addSpacing(int width)
addWidget(widget); addWidget(widget);
} }
void TimelineToolBar::setupCurrentFrameValidator()
{
auto validator = static_cast<const QIntValidator*>(m_currentFrame->validator());
const_cast<QIntValidator*>(validator)->setRange(m_firstFrame->text().toInt(), m_lastFrame->text().toInt());
}
void TimelineToolBar::resizeEvent(QResizeEvent *event) void TimelineToolBar::resizeEvent(QResizeEvent *event)
{ {
Q_UNUSED(event) Q_UNUSED(event)

1
src/plugins/qmldesigner/qmldesignerextension/timelineeditor/timelinetoolbar.h
View File

@@ -91,6 +91,7 @@ private:
void createCenterControls(); void createCenterControls();
void createRightControls(); void createRightControls();
void addSpacing(int width); void addSpacing(int width);
void setupCurrentFrameValidator();
QList<QObject *> m_grp; QList<QObject *> m_grp;