#include "dolphin_generalsettings.h"
-#include <kiconloader.h>
-#include <kicon.h>
-#include <klocale.h>
-#include <kmenu.h>
-#include <kvbox.h>
+#include <KIconLoader>
+#include <KIcon>
+#include <KLocale>
+#include <KMenu>
+#include <KVBox>
-#include "settings/dolphinsettings.h"
#include "statusbarspaceinfo.h"
#include <QApplication>
#include <QLabel>
#include <QProgressBar>
#include <QToolButton>
+#include <QTime>
#include <QTimer>
#include <views/dolphinview.h>
m_view(view),
m_messageLabel(0),
m_spaceInfo(0),
- m_zoomWidget(0),
- m_zoomOut(0),
m_zoomSlider(0),
- m_zoomIn(0),
m_progressBar(0),
+ m_stopButton(0),
m_progress(100),
+ m_showProgressBarTimer(0),
m_messageTimeStamp()
{
- connect(m_view, SIGNAL(urlChanged(const KUrl&)),
- this, SLOT(updateSpaceInfoContent(const KUrl&)));
+ connect(m_view, SIGNAL(urlChanged(KUrl)),
+ this, SLOT(updateSpaceInfoContent(KUrl)));
// Initialize message label
m_messageLabel = new KonqStatusBarMessageLabel(this);
- // Initialize zoom slider
- m_zoomWidget = new QWidget(this);
-
- m_zoomOut = new QToolButton(m_zoomWidget);
- m_zoomOut->setIcon(KIcon("zoom-out"));
- m_zoomOut->setAutoRaise(true);
-
- m_zoomSlider = new QSlider(Qt::Horizontal, m_zoomWidget);
+ // Initialize zoom widget
+ m_zoomSlider = new QSlider(Qt::Horizontal, this);
+ m_zoomSlider->setAccessibleName(i18n("Zoom slider"));
m_zoomSlider->setPageStep(1);
const int min = ZoomLevelInfo::minimumLevel();
m_zoomSlider->setValue(view->zoomLevel());
updateZoomSliderToolTip(view->zoomLevel());
- m_zoomIn = new QToolButton(m_zoomWidget);
- m_zoomIn->setIcon(KIcon("zoom-in"));
- m_zoomIn->setAutoRaise(true);
-
- // Initialize zoom widget layout
- QHBoxLayout* zoomWidgetLayout = new QHBoxLayout(m_zoomWidget);
- zoomWidgetLayout->setSpacing(0);
- zoomWidgetLayout->setMargin(0);
- zoomWidgetLayout->addWidget(m_zoomOut);
- zoomWidgetLayout->addWidget(m_zoomSlider);
- zoomWidgetLayout->addWidget(m_zoomIn);
-
connect(m_zoomSlider, SIGNAL(valueChanged(int)), this, SLOT(setZoomLevel(int)));
connect(m_zoomSlider, SIGNAL(sliderMoved(int)), this, SLOT(showZoomSliderToolTip(int)));
- connect(m_view, SIGNAL(zoomLevelChanged(int)), m_zoomSlider, SLOT(setValue(int)));
- connect(m_zoomOut, SIGNAL(clicked()), this, SLOT(zoomOut()));
- connect(m_zoomIn, SIGNAL(clicked()), this, SLOT(zoomIn()));
+ connect(m_view, SIGNAL(zoomLevelChanged(int,int)), this, SLOT(slotZoomLevelChanged(int,int)));
// Initialize space information
m_spaceInfo = new StatusBarSpaceInfo(this);
m_spaceInfo->setUrl(m_view->url());
// Initialize progress information
+ m_stopButton = new QToolButton(this);
+ m_stopButton->setIcon(KIcon("process-stop"));
+ m_stopButton->setAccessibleName(i18n("Stop"));
+ // TODO: Add tooltip for KDE SC 4.7.0, if new strings are allowed again
+ m_stopButton->setAutoRaise(true);
+ m_stopButton->hide();
+ connect(m_stopButton, SIGNAL(clicked()), this, SIGNAL(stopPressed()));
+
m_progressText = new QLabel(this);
m_progressText->hide();
m_progressBar = new QProgressBar(this);
m_progressBar->hide();
+ m_showProgressBarTimer = new QTimer(this);
+ m_showProgressBarTimer->setInterval(1000);
+ m_showProgressBarTimer->setSingleShot(true);
+ connect(m_showProgressBarTimer, SIGNAL(timeout()), this, SLOT(updateProgressInfo()));
+
// Initialize top layout and size policies
const int fontHeight = QFontMetrics(m_messageLabel->font()).height();
- const int zoomWidgetHeight = m_zoomWidget->minimumSizeHint().height();
- const int contentHeight = qMax(fontHeight, zoomWidgetHeight);
+ const int zoomSliderHeight = m_zoomSlider->minimumSizeHint().height();
+ const int contentHeight = qMax(fontHeight, zoomSliderHeight);
m_messageLabel->setMinimumTextHeight(contentHeight);
m_spaceInfo->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Fixed);
m_progressBar->setMaximumSize(200, contentHeight);
- m_zoomWidget->setMaximumSize(150, contentHeight);
+ m_zoomSlider->setMaximumSize(150, contentHeight);
m_zoomSlider->setMinimumWidth(30);
QHBoxLayout* topLayout = new QHBoxLayout(this);
topLayout->setMargin(0);
topLayout->setSpacing(4);
topLayout->addWidget(m_messageLabel);
- topLayout->addWidget(m_zoomWidget);
+ topLayout->addWidget(m_zoomSlider);
topLayout->addWidget(m_spaceInfo);
+ topLayout->addWidget(m_stopButton);
topLayout->addWidget(m_progressText);
topLayout->addWidget(m_progressBar);
percent = 100;
}
+ const bool progressRestarted = (percent < 100) && (percent < m_progress);
m_progress = percent;
if (m_messageLabel->type() == KonqStatusBarMessageLabel::Error) {
// Don't update any widget or status bar text if an
return;
}
+ if (progressRestarted && !m_progressBar->isVisible()) {
+ // Show the progress bar delayed: In the case if 100 % are reached within
+ // a short time, no progress bar will be shown at all.
+ m_showProgressBarTimer->start();
+ }
+
m_progressBar->setValue(m_progress);
- if (!m_progressBar->isVisible() || (percent == 100)) {
+ if (percent == 100) {
+ // The end of the progress has been reached. Assure that the progress bar
+ // gets hidden and the extensions widgets get visible again.
+ m_showProgressBarTimer->stop();
updateProgressInfo();
}
default: break;
}
- GeneralSettings* settings = DolphinSettings::instance().generalSettings();
-
QAction* showZoomSliderAction = menu.addAction(i18nc("@action:inmenu", "Show Zoom Slider"));
showZoomSliderAction->setCheckable(true);
- showZoomSliderAction->setChecked(settings->showZoomSlider());
+ showZoomSliderAction->setChecked(GeneralSettings::showZoomSlider());
QAction* showSpaceInfoAction = menu.addAction(i18nc("@action:inmenu", "Show Space Information"));
showSpaceInfoAction->setCheckable(true);
- showSpaceInfoAction->setChecked(settings->showSpaceInfo());
+ showSpaceInfoAction->setChecked(GeneralSettings::showSpaceInfo());
const QAction* action = menu.exec(QCursor::pos());
if (action == copyAction) {
QApplication::clipboard()->setMimeData(mimeData);
} else if (action == showZoomSliderAction) {
const bool visible = showZoomSliderAction->isChecked();
- settings->setShowZoomSlider(visible);
- m_zoomWidget->setVisible(visible);
+ GeneralSettings::setShowZoomSlider(visible);
+ m_zoomSlider->setVisible(visible);
} else if (action == showSpaceInfoAction) {
const bool visible = showSpaceInfoAction->isChecked();
- settings->setShowSpaceInfo(visible);
+ GeneralSettings::setShowSpaceInfo(visible);
m_spaceInfo->setVisible(visible);
}
}
void DolphinStatusBar::setZoomLevel(int zoomLevel)
{
- m_zoomOut->setEnabled(zoomLevel > m_zoomSlider->minimum());
- m_zoomIn->setEnabled(zoomLevel < m_zoomSlider->maximum());
m_view->setZoomLevel(zoomLevel);
updateZoomSliderToolTip(zoomLevel);
}
-void DolphinStatusBar::zoomOut()
-{
- const int value = m_zoomSlider->value();
- m_zoomSlider->setValue(value - 1);
-}
-
-void DolphinStatusBar::zoomIn()
-{
- const int value = m_zoomSlider->value();
- m_zoomSlider->setValue(value + 1);
-}
-
void DolphinStatusBar::showZoomSliderToolTip(int zoomLevel)
{
updateZoomSliderToolTip(zoomLevel);
QApplication::sendEvent(m_zoomSlider, &toolTipEvent);
}
+void DolphinStatusBar::slotZoomLevelChanged(int current, int previous)
+{
+ Q_UNUSED(previous);
+ m_zoomSlider->setValue(current);
+}
+
void DolphinStatusBar::updateProgressInfo()
{
const bool isErrorShown = (m_messageLabel->type() == KonqStatusBarMessageLabel::Error);
// Show the progress information and hide the extensions
setExtensionsVisible(false);
if (!isErrorShown) {
+ m_stopButton->show();
m_progressText->show();
m_progressBar->show();
}
} else {
// Hide the progress information and show the extensions
+ m_stopButton->hide();
m_progressText->hide();
m_progressBar->hide();
setExtensionsVisible(true);
void DolphinStatusBar::setExtensionsVisible(bool visible)
{
bool showSpaceInfo = visible;
- bool showZoomWidget = visible;
+ bool showZoomSlider = visible;
if (visible) {
- const GeneralSettings* settings = DolphinSettings::instance().generalSettings();
- showSpaceInfo = settings->showSpaceInfo();
- showZoomWidget = settings->showZoomSlider();
+ showSpaceInfo = GeneralSettings::showSpaceInfo();
+ showZoomSlider = GeneralSettings::showZoomSlider();
}
m_spaceInfo->setVisible(showSpaceInfo);
- m_zoomWidget->setVisible(showZoomWidget);
+ m_zoomSlider->setVisible(showZoomSlider);
}
void DolphinStatusBar::updateZoomSliderToolTip(int zoomLevel)
projects / dolphin.git / blobdiff