X-Git-Url: https://cloud.milkyroute.net/gitweb/dolphin.git/blobdiff_plain/5f57256a2f293622c7a10844adae29190907b9eb..c6bccbf6de33ba907f1cddfa64dadb8cfeea4d2c:/src/statusbar/dolphinstatusbar.cpp diff --git a/src/statusbar/dolphinstatusbar.cpp b/src/statusbar/dolphinstatusbar.cpp index 16683309d..87dce7e0a 100644 --- a/src/statusbar/dolphinstatusbar.cpp +++ b/src/statusbar/dolphinstatusbar.cpp @@ -1,49 +1,32 @@ -/*************************************************************************** - * Copyright (C) 2006-2012 by Peter Penz * - * * - * This program is free software; you can redistribute it and/or modify * - * it under the terms of the GNU General Public License as published by * - * the Free Software Foundation; either version 2 of the License, or * - * (at your option) any later version. * - * * - * This program is distributed in the hope that it will be useful, * - * but WITHOUT ANY WARRANTY; without even the implied warranty of * - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * - * GNU General Public License for more details. * - * * - * You should have received a copy of the GNU General Public License * - * along with this program; if not, write to the * - * Free Software Foundation, Inc., * - * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA * - ***************************************************************************/ +/* + * SPDX-FileCopyrightText: 2006-2012 Peter Penz + * + * SPDX-License-Identifier: GPL-2.0-or-later + */ #include "dolphinstatusbar.h" #include "dolphin_generalsettings.h" +#include "statusbarspaceinfo.h" +#include "views/dolphinview.h" +#include "views/zoomlevelinfo.h" -#include #include #include -#include - -#include "statusbarspaceinfo.h" #include #include -#include +#include +#include +#include #include -#include -#include -#include #include #include -#include - -#include -#include +#include +#include namespace { - const int ResetToDefaultTimeout = 1000; + const int UpdateDelay = 50; } DolphinStatusBar::DolphinStatusBar(QWidget* parent) : @@ -51,13 +34,14 @@ DolphinStatusBar::DolphinStatusBar(QWidget* parent) : m_text(), m_defaultText(), m_label(nullptr), + m_zoomLabel(nullptr), m_spaceInfo(nullptr), m_zoomSlider(nullptr), m_progressBar(nullptr), m_stopButton(nullptr), m_progress(100), m_showProgressBarTimer(nullptr), - m_resetToDefaultTextTimer(nullptr), + m_delayUpdateTimer(nullptr), m_textTimestamp() { // Initialize text label @@ -65,6 +49,9 @@ DolphinStatusBar::DolphinStatusBar(QWidget* parent) : m_label->setWordWrap(true); m_label->setTextFormat(Qt::PlainText); + // Initialize zoom slider's explanatory label + m_zoomLabel = new QLabel(i18nc("Used as a noun, i.e. 'Here is the zoom level:'","Zoom:"), this); + // Initialize zoom widget m_zoomSlider = new QSlider(Qt::Horizontal, this); m_zoomSlider->setAccessibleName(i18n("Zoom")); @@ -99,10 +86,12 @@ DolphinStatusBar::DolphinStatusBar(QWidget* parent) : m_showProgressBarTimer->setSingleShot(true); connect(m_showProgressBarTimer, &QTimer::timeout, this, &DolphinStatusBar::updateProgressInfo); - m_resetToDefaultTextTimer = new QTimer(this); - m_resetToDefaultTextTimer->setInterval(ResetToDefaultTimeout); - m_resetToDefaultTextTimer->setSingleShot(true); - connect(m_resetToDefaultTextTimer, &QTimer::timeout, this, &DolphinStatusBar::slotResetToDefaultText); + // initialize text updater delay timer + m_delayUpdateTimer = new QTimer(this); + m_delayUpdateTimer->setInterval(UpdateDelay); + m_delayUpdateTimer->setSingleShot(true); + connect(m_delayUpdateTimer, &QTimer::timeout, + this, &DolphinStatusBar::updateLabelText); // Initialize top layout and size policies const int fontHeight = QFontMetrics(m_label->font()).height(); @@ -115,26 +104,37 @@ DolphinStatusBar::DolphinStatusBar(QWidget* parent) : m_label->setFixedHeight(contentHeight); m_label->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Fixed); - m_zoomSlider->setMaximumWidth(fontMetrics.averageCharWidth() * 25); + m_zoomSlider->setMaximumWidth(fontMetrics.averageCharWidth() * 15); - m_spaceInfo->setFixedHeight(zoomSliderHeight); + m_spaceInfo->setFixedHeight(contentHeight); m_spaceInfo->setMaximumWidth(fontMetrics.averageCharWidth() * 25); m_spaceInfo->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Fixed); m_progressBar->setFixedHeight(zoomSliderHeight); - m_progressBar->setMaximumWidth(fontMetrics.averageCharWidth() * 25); + m_progressBar->setMaximumWidth(fontMetrics.averageCharWidth() * 20); QHBoxLayout* topLayout = new QHBoxLayout(this); topLayout->setContentsMargins(2, 0, 2, 0); topLayout->setSpacing(4); topLayout->addWidget(m_label, 1); + topLayout->addWidget(m_zoomLabel); topLayout->addWidget(m_zoomSlider, 1); topLayout->addWidget(m_spaceInfo, 1); topLayout->addWidget(m_stopButton); topLayout->addWidget(m_progressTextLabel); topLayout->addWidget(m_progressBar); + setVisible(GeneralSettings::showStatusBar()); setExtensionsVisible(true); + setWhatsThis(xi18nc("@info:whatsthis Statusbar", "This is " + "the Statusbar. It contains three elements " + "by default (left to right):A text field" + " that displays the size of selected items. If only " + "one item is selected the name and type is shown as well." + "A zoom slider that allows you " + "to adjust the size of the icons in the view." + "Space information about the " + "current storage device.")); } DolphinStatusBar::~DolphinStatusBar() @@ -149,19 +149,9 @@ void DolphinStatusBar::setText(const QString& text) m_textTimestamp = QTime::currentTime(); - if (text.isEmpty()) { - // Assure that the previous set text won't get - // cleared immediatelly. - m_resetToDefaultTextTimer->start(); - } else { - m_text = text; - - if (m_resetToDefaultTextTimer->isActive()) { - m_resetToDefaultTextTimer->start(); - } - - updateLabelText(); - } + m_text = text; + // will update status bar text in 50ms + m_delayUpdateTimer->start(); } QString DolphinStatusBar::text() const @@ -209,12 +199,13 @@ int DolphinStatusBar::progress() const void DolphinStatusBar::resetToDefaultText() { + m_text.clear(); + QTime currentTime; - if (currentTime.msecsTo(m_textTimestamp) < ResetToDefaultTimeout) { - m_resetToDefaultTextTimer->start(); + if (currentTime.msecsTo(m_textTimestamp) < UpdateDelay) { + m_delayUpdateTimer->start(); } else { - m_resetToDefaultTextTimer->stop(); - slotResetToDefaultText(); + updateLabelText(); } } @@ -231,7 +222,9 @@ QString DolphinStatusBar::defaultText() const void DolphinStatusBar::setUrl(const QUrl& url) { - m_spaceInfo->setUrl(url); + if (GeneralSettings::showSpaceInfo()) { + m_spaceInfo->setUrl(url); + } } QUrl DolphinStatusBar::url() const @@ -253,12 +246,18 @@ int DolphinStatusBar::zoomLevel() const void DolphinStatusBar::readSettings() { + setVisible(GeneralSettings::showStatusBar()); setExtensionsVisible(true); } +void DolphinStatusBar::updateSpaceInfo() +{ + m_spaceInfo->update(); +} + void DolphinStatusBar::contextMenuEvent(QContextMenuEvent* event) { - Q_UNUSED(event); + Q_UNUSED(event) QMenu menu(this); @@ -275,6 +274,7 @@ void DolphinStatusBar::contextMenuEvent(QContextMenuEvent* event) const bool visible = showZoomSliderAction->isChecked(); GeneralSettings::setShowZoomSlider(visible); m_zoomSlider->setVisible(visible); + m_zoomLabel->setVisible(visible); } else if (action == showSpaceInfoAction) { const bool visible = showSpaceInfoAction->isChecked(); GeneralSettings::setShowSpaceInfo(visible); @@ -315,12 +315,6 @@ void DolphinStatusBar::updateLabelText() m_label->setText(text); } -void DolphinStatusBar::slotResetToDefaultText() -{ - m_text.clear(); - updateLabelText(); -} - void DolphinStatusBar::updateZoomSliderToolTip(int zoomLevel) { const int size = ZoomLevelInfo::iconSizeForZoomLevel(zoomLevel); @@ -335,7 +329,10 @@ void DolphinStatusBar::setExtensionsVisible(bool visible) showSpaceInfo = GeneralSettings::showSpaceInfo(); showZoomSlider = GeneralSettings::showZoomSlider(); } + + m_spaceInfo->setShown(showSpaceInfo); m_spaceInfo->setVisible(showSpaceInfo); m_zoomSlider->setVisible(showZoomSlider); + m_zoomLabel->setVisible(showZoomSlider); }