Mercurial > hg > svgui
changeset 385:c0818f064e66
...
author | Chris Cannam |
---|---|
date | Mon, 12 May 2008 15:30:11 +0000 |
parents | c1e5af9f2c3c |
children | 590b899b7e45 |
files | view/Pane.cpp view/View.cpp view/View.h |
diffstat | 3 files changed, 8 insertions(+), 5 deletions(-) [+] |
line wrap: on
line diff
--- a/view/Pane.cpp Mon May 12 12:38:59 2008 +0000 +++ b/view/Pane.cpp Mon May 12 15:30:11 2008 +0000 @@ -978,8 +978,6 @@ int pbw = getProgressBarWidth(); if (x < pbw + 5) x = pbw + 5; - std::cerr << "x = " << x << ", pbw = " << pbw << std::endl; - if (r.x() < x + paint.fontMetrics().width(desc)) { drawVisibleText(paint, x, height() - fontHeight + fontAscent - 6,
--- a/view/View.cpp Mon May 12 12:38:59 2008 +0000 +++ b/view/View.cpp Mon May 12 15:30:11 2008 +0000 @@ -527,10 +527,14 @@ m_layers.push_back(layer); - m_progressBars[layer] = new LayerProgressBar(this); +// m_progressBars[layer] = new LayerProgressBar(this); + m_progressBars[layer] = new QProgressBar(this); m_progressBars[layer]->setMinimum(0); m_progressBars[layer]->setMaximum(100); - m_progressBars[layer]->setMinimumWidth(80); +// m_progressBars[layer]->setMinimumWidth(80); + m_progressBars[layer]->setFixedWidth(80); +// m_progressBars[layer]->setText(""); //!!! + m_progressBars[layer]->setTextVisible(false); QFont f(m_progressBars[layer]->font()); int fs = Preferences::getInstance()->getViewFontSize();
--- a/view/View.h Mon May 12 12:38:59 2008 +0000 +++ b/view/View.h Mon May 12 15:30:11 2008 +0000 @@ -370,7 +370,8 @@ QString m_text; }; - typedef std::map<Layer *, LayerProgressBar *> ProgressMap; +// typedef std::map<Layer *, LayerProgressBar *> ProgressMap; + typedef std::map<Layer *, QProgressBar *> ProgressMap; ProgressMap m_progressBars; // I own the ProgressBars ViewManager *m_manager; // I don't own this