X-Git-Url: https://cloud.milkyroute.net/gitweb/dolphin.git/blobdiff_plain/6072005ddce81b456fdcf2e77d5156a1d86f3686..659eafd7962f617448470228eaca4e147ad1b889:/src/statusbar/dolphinstatusbar.cpp diff --git a/src/statusbar/dolphinstatusbar.cpp b/src/statusbar/dolphinstatusbar.cpp index ecdb8f0fa..9451566fd 100644 --- a/src/statusbar/dolphinstatusbar.cpp +++ b/src/statusbar/dolphinstatusbar.cpp @@ -19,35 +19,43 @@ #include #include #include +#include #include #include -#include +#include #include #include -namespace { - const int UpdateDelay = 50; +namespace +{ +const int UpdateDelay = 50; } -DolphinStatusBar::DolphinStatusBar(QWidget* parent) : - QWidget(parent), - m_text(), - m_defaultText(), - m_label(nullptr), - m_spaceInfo(nullptr), - m_zoomSlider(nullptr), - m_progressBar(nullptr), - m_stopButton(nullptr), - m_progress(100), - m_showProgressBarTimer(nullptr), - m_delayUpdateTimer(nullptr), - m_textTimestamp() +DolphinStatusBar::DolphinStatusBar(QWidget *parent) + : 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_delayUpdateTimer(nullptr) + , m_textTimestamp() { + setContentsMargins(4, 0, 4, 0); + // Initialize text label m_label = new KSqueezedTextLabel(m_text, this); 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")); @@ -86,8 +94,7 @@ DolphinStatusBar::DolphinStatusBar(QWidget* parent) : m_delayUpdateTimer = new QTimer(this); m_delayUpdateTimer->setInterval(UpdateDelay); m_delayUpdateTimer->setSingleShot(true); - connect(m_delayUpdateTimer, &QTimer::timeout, - this, &DolphinStatusBar::updateLabelText); + connect(m_delayUpdateTimer, &QTimer::timeout, this, &DolphinStatusBar::updateLabelText); // Initialize top layout and size policies const int fontHeight = QFontMetrics(m_label->font()).height(); @@ -100,42 +107,45 @@ 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(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); + 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.")); + 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() { } -void DolphinStatusBar::setText(const QString& text) +void DolphinStatusBar::setText(const QString &text) { if (m_text == text) { return; @@ -153,7 +163,7 @@ QString DolphinStatusBar::text() const return m_text; } -void DolphinStatusBar::setProgressText(const QString& text) +void DolphinStatusBar::setProgressText(const QString &text) { m_progressTextLabel->setText(text); } @@ -203,7 +213,7 @@ void DolphinStatusBar::resetToDefaultText() } } -void DolphinStatusBar::setDefaultText(const QString& text) +void DolphinStatusBar::setDefaultText(const QString &text) { m_defaultText = text; updateLabelText(); @@ -214,7 +224,7 @@ QString DolphinStatusBar::defaultText() const return m_defaultText; } -void DolphinStatusBar::setUrl(const QUrl& url) +void DolphinStatusBar::setUrl(const QUrl &url) { if (GeneralSettings::showSpaceInfo()) { m_spaceInfo->setUrl(url); @@ -240,6 +250,7 @@ int DolphinStatusBar::zoomLevel() const void DolphinStatusBar::readSettings() { + setVisible(GeneralSettings::showStatusBar()); setExtensionsVisible(true); } @@ -248,25 +259,26 @@ void DolphinStatusBar::updateSpaceInfo() m_spaceInfo->update(); } -void DolphinStatusBar::contextMenuEvent(QContextMenuEvent* event) +void DolphinStatusBar::contextMenuEvent(QContextMenuEvent *event) { Q_UNUSED(event) QMenu menu(this); - QAction* showZoomSliderAction = menu.addAction(i18nc("@action:inmenu", "Show Zoom Slider")); + QAction *showZoomSliderAction = menu.addAction(i18nc("@action:inmenu", "Show Zoom Slider")); showZoomSliderAction->setCheckable(true); showZoomSliderAction->setChecked(GeneralSettings::showZoomSlider()); - QAction* showSpaceInfoAction = menu.addAction(i18nc("@action:inmenu", "Show Space Information")); + QAction *showSpaceInfoAction = menu.addAction(i18nc("@action:inmenu", "Show Space Information")); showSpaceInfoAction->setCheckable(true); showSpaceInfoAction->setChecked(GeneralSettings::showSpaceInfo()); - const QAction* action = menu.exec(QCursor::pos()); + const QAction *action = menu.exec(event->reason() == QContextMenuEvent::Reason::Mouse ? QCursor::pos() : mapToGlobal(QPoint(width() / 2, height() / 2))); if (action == showZoomSliderAction) { 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); @@ -321,8 +333,19 @@ 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); +} + +void DolphinStatusBar::paintEvent(QPaintEvent *paintEvent) +{ + QPainter p(this); + QStyleOption opt; + opt.initFrom(this); + style()->drawPrimitive(QStyle::PE_PanelStatusBar, &opt, &p, this); } +#include "moc_dolphinstatusbar.cpp"