X-Git-Url: https://cloud.milkyroute.net/gitweb/dolphin.git/blobdiff_plain/d67de9dfef9a9e317c0b1b11014e80c95793bb5a..b1c9b5126d:/src/dolphinstatusbar.cpp diff --git a/src/dolphinstatusbar.cpp b/src/dolphinstatusbar.cpp index df67ac28f..7a9b5dc8a 100644 --- a/src/dolphinstatusbar.cpp +++ b/src/dolphinstatusbar.cpp @@ -19,48 +19,103 @@ ***************************************************************************/ #include "dolphinstatusbar.h" +#include "settings/dolphinsettings.h" #include "dolphinview.h" +#include "dolphin_generalsettings.h" #include "statusbarmessagelabel.h" #include "statusbarspaceinfo.h" +#include "zoomlevelinfo.h" -#include -#include -#include +#include +#include +#include +#include +#include +#include #include +#include +#include #include -DolphinStatusBar::DolphinStatusBar(QWidget* parent, const KUrl& url) : +DolphinStatusBar::DolphinStatusBar(QWidget* parent, DolphinView* view) : KHBox(parent), + 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_progress(100) { + setMargin(0); setSpacing(4); + connect(m_view, SIGNAL(urlChanged(const KUrl&)), + this, SLOT(updateSpaceInfoContent(const KUrl&))); + + // initialize message label m_messageLabel = new StatusBarMessageLabel(this); m_messageLabel->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Fixed); + // 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); + m_zoomSlider->setPageStep(1); + + const int min = ZoomLevelInfo::minimumLevel(); + const int max = ZoomLevelInfo::maximumLevel(); + m_zoomSlider->setRange(min, max); + m_zoomSlider->setValue(view->zoomLevel()); + updateZoomSliderToolTip(view->zoomLevel()); + + m_zoomIn = new QToolButton(m_zoomWidget); + m_zoomIn->setIcon(KIcon("zoom-in")); + m_zoomIn->setAutoRaise(true); + + 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())); + + // initialize space information m_spaceInfo = new StatusBarSpaceInfo(this); - m_spaceInfo->setUrl(url); + m_spaceInfo->setUrl(m_view->url()); + // initialize progress information m_progressText = new QLabel(this); m_progressText->hide(); m_progressBar = new QProgressBar(this); m_progressBar->hide(); - const int contentHeight = QFontMetrics(m_messageLabel->font()).height(); - const int barHeight = contentHeight + 8; + // initialize sizes + const int fontHeight = QFontMetrics(m_messageLabel->font()).height(); + const int zoomWidgetHeight = m_zoomWidget->minimumSizeHint().height(); + const int contentHeight = (fontHeight < zoomWidgetHeight) ? zoomWidgetHeight : fontHeight; - setMinimumHeight(barHeight); - m_messageLabel->setMinimumTextHeight(barHeight); + m_messageLabel->setMinimumTextHeight(contentHeight); m_spaceInfo->setFixedHeight(contentHeight); - m_progressBar->setFixedHeight(contentHeight); - m_progressBar->setMaximumWidth(200); -} + m_progressBar->setFixedSize(200, contentHeight); + m_zoomWidget->setFixedSize(150, contentHeight); + setExtensionsVisible(true); +} DolphinStatusBar::~DolphinStatusBar() { @@ -69,6 +124,10 @@ DolphinStatusBar::~DolphinStatusBar() void DolphinStatusBar::setMessage(const QString& msg, Type type) { + if ((msg == m_messageLabel->text()) && (type == m_messageLabel->type())) { + return; + } + m_messageLabel->setMessage(msg, type); const int widthGap = m_messageLabel->widthGap(); @@ -76,7 +135,7 @@ void DolphinStatusBar::setMessage(const QString& msg, m_progressBar->hide(); m_progressText->hide(); } - showSpaceInfo(); + assureVisibleText(); } DolphinStatusBar::Type DolphinStatusBar::type() const @@ -116,7 +175,7 @@ void DolphinStatusBar::setProgress(int percent) m_progressBar->setValue(m_progress); if (!m_progressBar->isVisible() || (percent == 100)) { - QTimer::singleShot(500, this, SLOT(updateProgressInfo())); + QTimer::singleShot(300, this, SLOT(updateProgressInfo())); } const QString& defaultText = m_messageLabel->defaultText(); @@ -143,51 +202,111 @@ const QString& DolphinStatusBar::defaultText() const return m_messageLabel->defaultText(); } +void DolphinStatusBar::refresh() +{ + setExtensionsVisible(true); + assureVisibleText(); +} + void DolphinStatusBar::resizeEvent(QResizeEvent* event) { QWidget::resizeEvent(event); - QMetaObject::invokeMethod(this, "showSpaceInfo", Qt::QueuedConnection); + QMetaObject::invokeMethod(this, "assureVisibleText", Qt::QueuedConnection); } void DolphinStatusBar::updateProgressInfo() { const bool isErrorShown = (m_messageLabel->type() == Error); if (m_progress < 100) { - // show the progress information and hide the space information - m_spaceInfo->hide(); + // show the progress information and hide the extensions + setExtensionsVisible(false); if (!isErrorShown) { m_progressText->show(); m_progressBar->show(); } } else { - // hide the progress information and show the space information + // hide the progress information and show the extensions m_progressText->hide(); m_progressBar->hide(); - showSpaceInfo(); + assureVisibleText(); } } void DolphinStatusBar::updateSpaceInfoContent(const KUrl& url) { m_spaceInfo->setUrl(url); - showSpaceInfo(); + assureVisibleText(); +} + +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::showSpaceInfo() +void DolphinStatusBar::assureVisibleText() { const int widthGap = m_messageLabel->widthGap(); - const bool isProgressBarVisible = m_progressBar->isVisible(); - - if (m_spaceInfo->isVisible()) { - // The space information is shown currently. Hide it - // if the progress bar is visible or if the status bar - // text does not fit into the available width. - if (isProgressBarVisible || (widthGap > 0)) { - m_spaceInfo->hide(); + if (m_spaceInfo->isVisible() || m_zoomWidget->isVisible()) { + // At least the space information or the zoom slider is shown. + // Hide them if the status bar text does not fit into the available width. + if (widthGap > 0) { + setExtensionsVisible(false); } - } else if (widthGap + m_spaceInfo->width() <= 0) { - m_spaceInfo->show(); + } else if (!m_progressBar->isVisible()) { + const GeneralSettings* settings = DolphinSettings::instance().generalSettings(); + const int spaceInfoWidth = settings->showSpaceInfo() ? m_spaceInfo->minimumWidth() : 0; + const int zoomWidgetWidth = settings->showZoomSlider() ? m_zoomWidget->minimumWidth() : 0; + const int widgetsWidth = spaceInfoWidth + zoomWidgetWidth; + + if (widthGap + widgetsWidth <= 0) { + setExtensionsVisible(true); + } + } +} + +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); + + QPoint global = m_zoomSlider->rect().topLeft(); + global.ry() += m_zoomSlider->height() / 2; + QHelpEvent toolTipEvent(QEvent::ToolTip, QPoint(0, 0), m_zoomSlider->mapToGlobal(global)); + QApplication::sendEvent(m_zoomSlider, &toolTipEvent); +} + +void DolphinStatusBar::setExtensionsVisible(bool visible) +{ + bool spaceInfoVisible = visible; + bool zoomSliderVisible = visible; + if (visible) { + const GeneralSettings* settings = DolphinSettings::instance().generalSettings(); + spaceInfoVisible = settings->showSpaceInfo(); + zoomSliderVisible = settings->showZoomSlider(); } + + m_spaceInfo->setVisible(spaceInfoVisible); + m_zoomWidget->setVisible(zoomSliderVisible); +} + +void DolphinStatusBar::updateZoomSliderToolTip(int zoomLevel) +{ + const int size = ZoomLevelInfo::iconSizeForZoomLevel(zoomLevel); + m_zoomSlider->setToolTip(i18ncp("@info:tooltip", "Size: 1 pixel", "Size: %1 pixels", size)); } #include "dolphinstatusbar.moc"