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

QmlProfiler: remove broken zoom toolbar

Browse Source 
The zoom slider has to be rebuilt in QML as positioning QWidgets on
top of QQuickViews creates various problems we don't want to solve
for such a simple element.

Task-number: QTCREATORBUG-10635

Change-Id: I9aa22edd3e3a4fddb1d04545260ceacf22184260
Reviewed-by: Kai Koehne <kai.koehne@digia.com>
This commit is contained in:
Ulf Hermann
2013-11-12 13:11:47 +01:00
parent c9731152ac
commit 9a1da15739
2 changed files with 0 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files

49
src/plugins/qmlprofiler/qmlprofilertraceview.cpp
View File

@@ -136,7 +136,6 @@ public:
QToolButton *m_buttonRange; QToolButton *m_buttonRange;
QToolButton *m_buttonLock; QToolButton *m_buttonLock;
QWidget *m_zoomToolbar;
int m_currentZoomLevel; int m_currentZoomLevel;
}; };
@@ -173,10 +172,6 @@ QmlProfilerTraceView::QmlProfilerTraceView(QWidget *parent, Analyzer::IAnalyzerT
overviewContainer->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Fixed); overviewContainer->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Fixed);
overviewContainer->setMaximumHeight(50); overviewContainer->setMaximumHeight(50);
d->m_zoomToolbar = createZoomToolbar();
d->m_zoomToolbar->move(0, d->m_timebar->height());
d->m_zoomToolbar->setVisible(false);
toolsLayout->addWidget(createToolbar()); toolsLayout->addWidget(createToolbar());
toolsLayout->addWidget(timeBarContainer); toolsLayout->addWidget(timeBarContainer);
emit enableToolbar(false); emit enableToolbar(false);
@@ -269,7 +264,6 @@ QWidget *QmlProfilerTraceView::createToolbar()
buttonZoomControls->setToolTip(tr("Show zoom slider")); buttonZoomControls->setToolTip(tr("Show zoom slider"));
buttonZoomControls->setCheckable(true); buttonZoomControls->setCheckable(true);
buttonZoomControls->setChecked(false); buttonZoomControls->setChecked(false);
connect(buttonZoomControls, SIGNAL(toggled(bool)), d->m_zoomToolbar, SLOT(setVisible(bool)));
connect(this, SIGNAL(enableToolbar(bool)), buttonZoomControls, SLOT(setEnabled(bool))); connect(this, SIGNAL(enableToolbar(bool)), buttonZoomControls, SLOT(setEnabled(bool)));
d->m_buttonRange = new QToolButton; d->m_buttonRange = new QToolButton;
@@ -301,49 +295,6 @@ QWidget *QmlProfilerTraceView::createToolbar()
return bar; return bar;
} }
QWidget *QmlProfilerTraceView::createZoomToolbar()
{
Utils::StyledBar *bar = new Utils::StyledBar(this);
bar->setStyleSheet(QLatin1String("background: #9B9B9B"));
bar->setSingleRow(true);
bar->setFixedWidth(150);
bar->setFixedHeight(24);
QHBoxLayout *toolBarLayout = new QHBoxLayout(bar);
toolBarLayout->setMargin(0);
toolBarLayout->setSpacing(0);
QSlider *zoomSlider = new QSlider(Qt::Horizontal);
zoomSlider->setFocusPolicy(Qt::NoFocus);
zoomSlider->setRange(1, sliderTicks);
zoomSlider->setInvertedAppearance(true);
zoomSlider->setPageStep(sliderTicks/100);
connect(this, SIGNAL(enableToolbar(bool)), zoomSlider, SLOT(setEnabled(bool)));
connect(zoomSlider, SIGNAL(valueChanged(int)), this, SLOT(setZoomLevel(int)));
connect(this, SIGNAL(zoomLevelChanged(int)), zoomSlider, SLOT(setValue(int)));
zoomSlider->setStyleSheet(QLatin1String("\
QSlider:horizontal {\
background: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #444444, stop: 1 #5a5a5a);\
border: 1px #313131;\
height: 20px;\
margin: 0px 0px 0px 0px;\
}\
QSlider::add-page:horizontal {\
background: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #5a5a5a, stop: 1 #444444);\
border: 1px #313131;\
}\
QSlider::sub-page:horizontal {\
background: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #5a5a5a, stop: 1 #444444);\
border: 1px #313131;\
}\
"));
toolBarLayout->addWidget(zoomSlider);
return bar;
}
///////////////////////////////////////////////////////// /////////////////////////////////////////////////////////
bool QmlProfilerTraceView::hasValidSelection() const bool QmlProfilerTraceView::hasValidSelection() const
{ {

1
src/plugins/qmlprofiler/qmlprofilertraceview.h
View File

@@ -143,7 +143,6 @@ signals:
private: private:
void contextMenuEvent(QContextMenuEvent *); void contextMenuEvent(QContextMenuEvent *);
QWidget *createToolbar(); QWidget *createToolbar();
QWidget *createZoomToolbar();
void setRecording(bool recording); void setRecording(bool recording);
void setAppKilled(); void setAppKilled();