X-Git-Url: https://cloud.milkyroute.net/gitweb/dolphin.git/blobdiff_plain/136e2ae3d75677ec008e7b5973b8e73bc38e9530..39f89141b06c:/src/statusbar/dolphinstatusbar.cpp diff --git a/src/statusbar/dolphinstatusbar.cpp b/src/statusbar/dolphinstatusbar.cpp index c36651e0b..687c00935 100644 --- a/src/statusbar/dolphinstatusbar.cpp +++ b/src/statusbar/dolphinstatusbar.cpp @@ -19,27 +19,31 @@ ***************************************************************************/ #include "dolphinstatusbar.h" -#include "settings/dolphinsettings.h" -#include "dolphinview.h" + #include "dolphin_generalsettings.h" -#include "statusbarmessagelabel.h" + +#include +#include +#include +#include +#include + +#include "settings/dolphinsettings.h" #include "statusbarspaceinfo.h" -#include "zoomlevelinfo.h" #include +#include #include #include #include #include #include -#include -#include -#include -#include +#include +#include DolphinStatusBar::DolphinStatusBar(QWidget* parent, DolphinView* view) : - KHBox(parent), + QWidget(parent), m_view(view), m_messageLabel(0), m_spaceInfo(0), @@ -51,17 +55,13 @@ DolphinStatusBar::DolphinStatusBar(QWidget* parent, DolphinView* view) : m_progress(100), m_messageTimeStamp() { - 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 message label + m_messageLabel = new KonqStatusBarMessageLabel(this); - // initialize zoom slider + // Initialize zoom slider m_zoomWidget = new QWidget(this); m_zoomOut = new QToolButton(m_zoomWidget); @@ -81,6 +81,7 @@ DolphinStatusBar::DolphinStatusBar(QWidget* parent, DolphinView* view) : 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); @@ -94,26 +95,39 @@ DolphinStatusBar::DolphinStatusBar(QWidget* parent, DolphinView* view) : connect(m_zoomOut, SIGNAL(clicked()), this, SLOT(zoomOut())); connect(m_zoomIn, SIGNAL(clicked()), this, SLOT(zoomIn())); - // initialize space information + // Initialize space information m_spaceInfo = new StatusBarSpaceInfo(this); m_spaceInfo->setUrl(m_view->url()); - // initialize progress information + // Initialize progress information m_progressText = new QLabel(this); m_progressText->hide(); m_progressBar = new QProgressBar(this); m_progressBar->hide(); - // initialize sizes + // 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); m_messageLabel->setMinimumTextHeight(contentHeight); - m_spaceInfo->setFixedHeight(contentHeight - 5); - m_progressBar->setFixedSize(200, contentHeight); - m_zoomWidget->setFixedSize(150, contentHeight); + + m_spaceInfo->setMaximumSize(200, contentHeight - 5); + m_spaceInfo->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Fixed); + + m_progressBar->setMaximumSize(200, contentHeight); + m_zoomWidget->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_spaceInfo); + topLayout->addWidget(m_progressText); + topLayout->addWidget(m_progressBar); setExtensionsVisible(true); } @@ -140,7 +154,8 @@ void DolphinStatusBar::setMessage(const QString& msg, timeout = 0; } - if ((message == m_messageLabel->text()) && (type == m_messageLabel->type())) { + KonqStatusBarMessageLabel::Type konqType = static_cast(type); + if ((message == m_messageLabel->text()) && (konqType == m_messageLabel->type())) { // the message is already shown return; } @@ -156,22 +171,15 @@ void DolphinStatusBar::setMessage(const QString& msg, return; } - m_messageLabel->setMessage(message, type); + m_messageLabel->setMessage(message, konqType); if (type != Default) { m_messageTimeStamp = currentTime; } - - const int widthGap = m_messageLabel->widthGap(); - if (widthGap > 0) { - m_progressBar->hide(); - m_progressText->hide(); - } - assureVisibleText(); } DolphinStatusBar::Type DolphinStatusBar::type() const { - return m_messageLabel->type(); + return static_cast(m_messageLabel->type()); } QString DolphinStatusBar::message() const @@ -184,6 +192,11 @@ void DolphinStatusBar::setProgressText(const QString& text) m_progressText->setText(text); } +int DolphinStatusBar::progress() const +{ + return m_progress; +} + QString DolphinStatusBar::progressText() const { return m_progressText->text(); @@ -191,6 +204,9 @@ QString DolphinStatusBar::progressText() const void DolphinStatusBar::setProgress(int percent) { + // Show a busy indicator if a value < 0 is provided: + m_progressBar->setMaximum((percent < 0) ? 0 : 100); + if (percent < 0) { percent = 0; } else if (percent > 100) { @@ -198,18 +214,18 @@ void DolphinStatusBar::setProgress(int percent) } m_progress = percent; - if (m_messageLabel->type() == Error) { - // don't update any widget or status bar text if an + if (m_messageLabel->type() == KonqStatusBarMessageLabel::Error) { + // Don't update any widget or status bar text if an // error message is shown return; } m_progressBar->setValue(m_progress); if (!m_progressBar->isVisible() || (percent == 100)) { - QTimer::singleShot(300, this, SLOT(updateProgressInfo())); + updateProgressInfo(); } - const QString& defaultText = m_messageLabel->defaultText(); + const QString defaultText = m_messageLabel->defaultText(); const QString msg(m_messageLabel->text()); if ((percent == 0) && !msg.isEmpty()) { setMessage(QString(), Default); @@ -228,7 +244,7 @@ void DolphinStatusBar::setDefaultText(const QString& text) m_messageLabel->setDefaultText(text); } -const QString& DolphinStatusBar::defaultText() const +QString DolphinStatusBar::defaultText() const { return m_messageLabel->defaultText(); } @@ -236,44 +252,56 @@ const QString& DolphinStatusBar::defaultText() const void DolphinStatusBar::refresh() { setExtensionsVisible(true); - assureVisibleText(); } -void DolphinStatusBar::resizeEvent(QResizeEvent* event) +void DolphinStatusBar::contextMenuEvent(QContextMenuEvent* event) { - // It is important to hide the widgets before invoking - // QWidget::resizeEvent(), otherwise it is possible that - // the dock widgets are shrinked when having a small - // statusbar width (bug #202147). - m_zoomWidget->hide(); - m_spaceInfo->hide(); - - QWidget::resizeEvent(event); - QMetaObject::invokeMethod(this, "assureVisibleText", Qt::QueuedConnection); -} + Q_UNUSED(event); + + KMenu menu(this); + + QAction* copyAction = 0; + switch (type()) { + case Default: + case OperationCompleted: + case Information: + copyAction = menu.addAction(i18nc("@action:inmenu", "Copy Information Message")); + break; + case Error: + copyAction = menu.addAction(i18nc("@action:inmenu", "Copy Error Message")); + break; + default: break; + } -void DolphinStatusBar::updateProgressInfo() -{ - const bool isErrorShown = (m_messageLabel->type() == Error); - if (m_progress < 100) { - // 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 extensions - m_progressText->hide(); - m_progressBar->hide(); - assureVisibleText(); + GeneralSettings* settings = DolphinSettings::instance().generalSettings(); + + QAction* showZoomSliderAction = menu.addAction(i18nc("@action:inmenu", "Show Zoom Slider")); + showZoomSliderAction->setCheckable(true); + showZoomSliderAction->setChecked(settings->showZoomSlider()); + + QAction* showSpaceInfoAction = menu.addAction(i18nc("@action:inmenu", "Show Space Information")); + showSpaceInfoAction->setCheckable(true); + showSpaceInfoAction->setChecked(settings->showSpaceInfo()); + + const QAction* action = menu.exec(QCursor::pos()); + if (action == copyAction) { + QMimeData* mimeData = new QMimeData(); + mimeData->setText(message()); + QApplication::clipboard()->setMimeData(mimeData); + } else if (action == showZoomSliderAction) { + const bool visible = showZoomSliderAction->isChecked(); + settings->setShowZoomSlider(visible); + m_zoomWidget->setVisible(visible); + } else if (action == showSpaceInfoAction) { + const bool visible = showSpaceInfoAction->isChecked(); + settings->setShowSpaceInfo(visible); + m_spaceInfo->setVisible(visible); } } void DolphinStatusBar::updateSpaceInfoContent(const KUrl& url) { m_spaceInfo->setUrl(url); - assureVisibleText(); } void DolphinStatusBar::setZoomLevel(int zoomLevel) @@ -284,22 +312,6 @@ void DolphinStatusBar::setZoomLevel(int zoomLevel) updateZoomSliderToolTip(zoomLevel); } -void DolphinStatusBar::assureVisibleText() -{ - const int widthGap = m_messageLabel->widthGap(); - 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. - setExtensionsVisible(widthGap <= 0); - } 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; - setExtensionsVisible(widthGap + widgetsWidth <= 0); - } -} - void DolphinStatusBar::zoomOut() { const int value = m_zoomSlider->value(); @@ -322,18 +334,35 @@ void DolphinStatusBar::showZoomSliderToolTip(int zoomLevel) QApplication::sendEvent(m_zoomSlider, &toolTipEvent); } +void DolphinStatusBar::updateProgressInfo() +{ + const bool isErrorShown = (m_messageLabel->type() == KonqStatusBarMessageLabel::Error); + if (m_progress < 100) { + // 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 extensions + m_progressText->hide(); + m_progressBar->hide(); + setExtensionsVisible(true); + } +} + void DolphinStatusBar::setExtensionsVisible(bool visible) { - bool spaceInfoVisible = visible; - bool zoomSliderVisible = visible; + bool showSpaceInfo = visible; + bool showZoomWidget = visible; if (visible) { const GeneralSettings* settings = DolphinSettings::instance().generalSettings(); - spaceInfoVisible = settings->showSpaceInfo(); - zoomSliderVisible = settings->showZoomSlider(); + showSpaceInfo = settings->showSpaceInfo(); + showZoomWidget = settings->showZoomSlider(); } - - m_spaceInfo->setVisible(spaceInfoVisible); - m_zoomWidget->setVisible(zoomSliderVisible); + m_spaceInfo->setVisible(showSpaceInfo); + m_zoomWidget->setVisible(showZoomWidget); } void DolphinStatusBar::updateZoomSliderToolTip(int zoomLevel)