diff --git a/shell/progresswidget/statusbarprogresswidget.cpp b/shell/progresswidget/statusbarprogresswidget.cpp index da18aad1e..357c07297 100644 --- a/shell/progresswidget/statusbarprogresswidget.cpp +++ b/shell/progresswidget/statusbarprogresswidget.cpp @@ -1,288 +1,350 @@ /* statusbarprogresswidget.cpp (C) 2004 Till Adam Don Sanders David Faure Copyright 2004 David Faure Includes StatusbarProgressWidget which is based on KIOLittleProgressDlg by Matt Koss KMail is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License, version 2 or above, as published by the Free Software Foundation. KMail 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 In addition, as a special exception, the copyright holders give permission to link the code of this program with any edition of the Qt library by Trolltech AS, Norway (or with modified versions of Qt that use the same license as Qt), and distribute linked combinations including the two. You must obey the GNU General Public License in all respects for all of the code used other than Qt. If you modify this file, you may extend this exception to your version of the file, but you are not obligated to do so. If you do not wish to do so, delete this exception statement from your version. */ #include "statusbarprogresswidget.h" #include "progressdialog.h" #include "progressmanager.h" #ifdef Q_OS_OSX #include "../macdockprogressview.h" #endif #include #include #include #include #include #include #include #include #include #include #include +#include +#include using namespace KDevelop; //----------------------------------------------------------------------------- StatusbarProgressWidget::StatusbarProgressWidget( ProgressDialog* progressDialog, QWidget* parent, bool button ) : QFrame( parent ), mCurrentItem( nullptr ), mProgressDialog( progressDialog ), mDelayTimer( nullptr ), mCleanTimer( nullptr ) { m_bShowButton = button; int w = fontMetrics().width( QStringLiteral(" 999.9 kB/s 00:00:01 ") ) + 8; box = new QHBoxLayout( this ); box->setMargin(0); box->setSpacing(0); + stack = new QStackedWidget( this ); m_pButton = new QToolButton( this ); - m_pButton->setAttribute(Qt::WA_MacMiniSize); - m_pButton->setSizePolicy( QSizePolicy( QSizePolicy::Minimum, - QSizePolicy::Minimum ) ); + m_pButton->setSizePolicy( QSizePolicy( QSizePolicy::Fixed, + QSizePolicy::Fixed ) ); QIcon smallIcon = QIcon::fromTheme( QStringLiteral("go-up") ); - m_pButton->setIcon( smallIcon ); - box->addWidget( m_pButton ); - stack = new QStackedWidget( this ); - int maximumHeight = fontMetrics().height(); - stack->setMaximumHeight( maximumHeight ); - box->addWidget( stack ); - - m_pButton->setToolTip( i18n("Open detailed progress dialog") ); + if ( smallIcon.isNull() ) { + // this can happen everywhere but in particular with a standard build on OS X. + // QToolButtons won't be visible without an icon, so fall back to showing a Qt::UpArrow. + m_pButton->setArrowType( Qt::UpArrow ); + } else { + m_pButton->setIcon( smallIcon ); + } m_pButton->setAutoRaise(true); + QSize iconSize = m_pButton->iconSize(); m_pProgressBar = new QProgressBar( this ); + m_pProgressBar->setSizePolicy( QSizePolicy( QSizePolicy::Fixed, + QSizePolicy::Fixed ) ); m_pProgressBar->installEventFilter( this ); m_pProgressBar->setMinimumWidth( w ); - stack->insertWidget( 1,m_pProgressBar ); - - m_pLabel = new QLabel( QString(), this ); - m_pLabel->setAlignment( Qt::AlignHCenter | Qt::AlignVCenter ); - m_pLabel->installEventFilter( this ); - m_pLabel->setMinimumWidth( w ); - stack->insertWidget( 2, m_pLabel ); - -#ifndef Q_OS_MAC - // Currently on OSX this causes the button to be cut-off - // It isn't necessary because on OSX the button's minimumSizeHint is small enough - m_pButton->setMaximumHeight( maximumHeight ); -#endif + m_pProgressBar->setAttribute( Qt::WA_LayoutUsesWidgetRect, true ); + + // Determine maximumHeight from the progressbar's height and scale the icon. + // This operation is style specific and cannot infer the style in use + // from Q_OS_??? because users can have started us using the -style option + // (or even be using an unexpected QPA). + // In most cases, maximumHeight should be set to fontMetrics().height() + 2 + // (Breeze, Oxygen, Fusion, Windows, QtCurve etc.); this corresponds to the actual + // progressbar height plus a 1 pixel margin above and below. + int maximumHeight = m_pProgressBar->fontMetrics().height() + 2; + const bool isMacWidgetStyle = QApplication::style()->objectName() == QLatin1String( "macintosh" ); + + if ( isMacWidgetStyle && !smallIcon.isNull() ) { + // QProgressBar height is fixed with the macintosh native widget style + // and alignment with m_pButton is tricky. Sizing the icon to maximumHeight + // gives a button that is slightly too high and not perfectly + // aligned. Annoyingly that doesn't improve by calling setMaximumHeight() + // which even causes the button to change shape. So we use a "flat" button, + // an invisible outline which is more in line with platform practices anyway. + maximumHeight = m_pProgressBar->sizeHint().height(); + iconSize.scale( maximumHeight, maximumHeight, Qt::KeepAspectRatio ); + } else { + // The icon is scaled to maximumHeight but with 1 pixel margins on each side + // because it will be in a visible button. + iconSize.scale( maximumHeight - 2, maximumHeight - 2, Qt::KeepAspectRatio ); + // additional adjustments: + m_pButton->setAttribute( Qt::WA_LayoutUsesWidgetRect, true ); + } + stack->setMaximumHeight( maximumHeight ); + m_pButton->setIconSize( iconSize ); + box->addWidget( m_pButton ); + + m_pButton->setToolTip( i18n("Open detailed progress dialog") ); + + box->addWidget( stack ); + + stack->insertWidget( 1, m_pProgressBar ); + + if (m_bShowButton) { + // create an empty, inactive QToolButton that's as high as m_pButton but only 1 pixel wide + // this will act as a placeholder when the widget is invisible. + m_pPlaceHolder.button = new QToolButton(this); + m_pPlaceHolder.button->setSizePolicy( QSizePolicy( QSizePolicy::Fixed, + QSizePolicy::Fixed ) ); + m_pPlaceHolder.button->setMinimumHeight(m_pButton->minimumSizeHint().height()); + m_pPlaceHolder.button->setMaximumWidth(1); + m_pPlaceHolder.button->setAutoRaise(true); + m_pPlaceHolder.button->setAttribute( Qt::WA_LayoutUsesWidgetRect, true ); + m_pPlaceHolder.button->setEnabled(false); + m_pPlaceHolder.button->installEventFilter( this ); + // the placeholder button should not go into the stack to avoid misalignment + box->addWidget( m_pPlaceHolder.button ); + m_pPlaceHolder.button->hide(); + } else { + // when the widget doesn't show m_pButton we can use a QLabel as the placeholder. + m_pPlaceHolder.label = new QLabel( QString(), this ); + m_pPlaceHolder.label->setSizePolicy( QSizePolicy( QSizePolicy::Fixed, + QSizePolicy::Fixed ) ); + m_pPlaceHolder.label->setAlignment( Qt::AlignHCenter ); + m_pPlaceHolder.label->installEventFilter( this ); + m_pPlaceHolder.label->setMinimumWidth( w ); + m_pPlaceHolder.label->setMaximumHeight( maximumHeight ); + stack->insertWidget( 2, m_pPlaceHolder.label ); + } + setMinimumWidth( minimumSizeHint().width() ); mode = None; setMode(); connect( m_pButton, &QPushButton::clicked, progressDialog, &ProgressDialog::slotToggleVisibility ); connect ( ProgressManager::instance(), &ProgressManager::progressItemAdded, this, &StatusbarProgressWidget::slotProgressItemAdded ); connect ( ProgressManager::instance(), &ProgressManager::progressItemCompleted, this, &StatusbarProgressWidget::slotProgressItemCompleted ); connect ( ProgressManager::instance(), &ProgressManager::progressItemUsesBusyIndicator, this, &StatusbarProgressWidget::updateBusyMode ); connect ( progressDialog, &ProgressDialog::visibilityChanged, this, &StatusbarProgressWidget::slotProgressDialogVisible ); mDelayTimer = new QTimer( this ); mDelayTimer->setSingleShot( true ); connect ( mDelayTimer, &QTimer::timeout, this, &StatusbarProgressWidget::slotShowItemDelayed ); mCleanTimer = new QTimer( this ); mCleanTimer->setSingleShot( true ); connect ( mCleanTimer, &QTimer::timeout, this, &StatusbarProgressWidget::slotClean ); } // There are three cases: no progressitem, one progressitem (connect to it directly), // or many progressitems (display busy indicator). Let's call them 0,1,N. // In slot..Added we can only end up in 1 or N. // In slot..Removed we can end up in 0, 1, or we can stay in N if we were already. void StatusbarProgressWidget::updateBusyMode() { connectSingleItem(); // if going to 1 item if (!mDelayTimer->isActive()) mDelayTimer->start( 1000 ); } void StatusbarProgressWidget::slotProgressItemAdded( ProgressItem *item ) { if ( item->parent() ) return; // we are only interested in top level items updateBusyMode(); } void StatusbarProgressWidget::slotProgressItemCompleted( ProgressItem *item ) { if ( item->parent() ) { item->deleteLater(); item = nullptr; return; // we are only interested in top level items } item->deleteLater(); item = nullptr; connectSingleItem(); // if going back to 1 item if ( ProgressManager::instance()->isEmpty() ) { // No item // Done. In 5s the progress-widget will close, then we can clean up the statusbar mCleanTimer->start( 5000 ); } else if ( mCurrentItem ) { // Exactly one item activateSingleItemMode(); } } void StatusbarProgressWidget::connectSingleItem() { if ( mCurrentItem ) { disconnect ( mCurrentItem, &ProgressItem::progressItemProgress, this, &StatusbarProgressWidget::slotProgressItemProgress ); mCurrentItem = nullptr; } mCurrentItem = ProgressManager::instance()->singleItem(); if ( mCurrentItem ) { connect ( mCurrentItem, &ProgressItem::progressItemProgress, this, &StatusbarProgressWidget::slotProgressItemProgress ); } } void StatusbarProgressWidget::activateSingleItemMode() { m_pProgressBar->setMaximum( 100 ); m_pProgressBar->setValue( mCurrentItem->progress() ); m_pProgressBar->setTextVisible( true ); #ifdef Q_OS_OSX MacDockProgressView::setRange( 0, 100 ); MacDockProgressView::setProgress( mCurrentItem->progress() ); #endif } void StatusbarProgressWidget::slotShowItemDelayed() { bool noItems = ProgressManager::instance()->isEmpty(); if ( mCurrentItem ) { activateSingleItemMode(); } else if ( !noItems ) { // N items m_pProgressBar->setMaximum( 0 ); m_pProgressBar->setTextVisible( false ); #ifdef Q_OS_OSX MacDockProgressView::setRange( 0, 0 ); MacDockProgressView::setProgress( 0 ); #endif } if ( !noItems && mode == None ) { mode = Progress; setMode(); } } void StatusbarProgressWidget::slotProgressItemProgress( ProgressItem *item, unsigned int value ) { Q_ASSERT( item == mCurrentItem); // the only one we should be connected to Q_UNUSED( item ); m_pProgressBar->setValue( value ); #ifdef Q_OS_OSX MacDockProgressView::setProgress( value ); #endif } void StatusbarProgressWidget::setMode() { switch ( mode ) { case None: + m_pButton->hide(); if ( m_bShowButton ) { - m_pButton->hide(); + // show the empty button in order to make the status bar look better + m_pPlaceHolder.button->show(); + } else { + // show the empty label in order to make the status bar look better + stack->setCurrentWidget( m_pPlaceHolder.label ); } - // show the empty label in order to make the status bar look better + m_pProgressBar->hide(); stack->show(); - stack->setCurrentWidget( m_pLabel ); #ifdef Q_OS_OSX MacDockProgressView::setProgressVisible( false ); #endif break; case Progress: stack->show(); + m_pProgressBar->show(); stack->setCurrentWidget( m_pProgressBar ); if ( m_bShowButton ) { m_pButton->show(); + m_pPlaceHolder.button->hide(); } #ifdef Q_OS_OSX MacDockProgressView::setProgressVisible( true ); #endif break; } } void StatusbarProgressWidget::slotClean() { // check if a new item showed up since we started the timer. If not, clear if ( ProgressManager::instance()->isEmpty() ) { m_pProgressBar->setValue( 0 ); - //m_pLabel->clear(); + //m_pPlaceHolder.label->clear(); mode = None; setMode(); } } bool StatusbarProgressWidget::eventFilter( QObject *, QEvent *ev ) { if ( ev->type() == QEvent::MouseButtonPress ) { QMouseEvent *e = (QMouseEvent*)ev; if ( e->button() == Qt::LeftButton && mode != None ) { // toggle view on left mouse button // Consensus seems to be that we should show/hide the fancy dialog when the user // clicks anywhere in the small one. mProgressDialog->slotToggleVisibility(); return true; } } return false; } void StatusbarProgressWidget::slotProgressDialogVisible( bool b ) { // Update the hide/show button when the detailed one is shown/hidden if ( b ) { m_pButton->setIcon( QIcon::fromTheme( QStringLiteral("go-down") ) ); m_pButton->setToolTip( i18n("Hide detailed progress window") ); setMode(); } else { m_pButton->setIcon( QIcon::fromTheme( QStringLiteral("go-up") ) ); m_pButton->setToolTip( i18n("Show detailed progress window") ); } } diff --git a/shell/progresswidget/statusbarprogresswidget.h b/shell/progresswidget/statusbarprogresswidget.h index e6e8ed81a..aff6b5e5f 100644 --- a/shell/progresswidget/statusbarprogresswidget.h +++ b/shell/progresswidget/statusbarprogresswidget.h @@ -1,93 +1,96 @@ #ifndef KDEVPLATFORM_STATUSBARPROGRESSWIDGET_H #define KDEVPLATFORM_STATUSBARPROGRESSWIDGET_H /*************************************************************************** * (C) 2004 Till Adam * * Don Sanders * * David Faure * * Copyright 2004 David Faure * * * * This program is free software; you can redistribute it and/or modify * * it under the terms of the GNU Library 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 Library 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. * ***************************************************************************/ /** * A specialized progress widget class, heavily based on * kio_littleprogress_dlg (it looks similar) */ #include class QBoxLayout; class QEvent; class QProgressBar; class QToolButton; class QStackedWidget; class QBoxLayout; class QLabel; class QTimer; namespace KDevelop { class ProgressItem; class ProgressDialog; class StatusbarProgressWidget : public QFrame { Q_OBJECT public: StatusbarProgressWidget( ProgressDialog* progressDialog, QWidget* parent, bool button = true ); public Q_SLOTS: void slotClean(); void slotProgressItemAdded( KDevelop::ProgressItem *i ); void slotProgressItemCompleted( KDevelop::ProgressItem *i ); void slotProgressItemProgress( KDevelop::ProgressItem *i, unsigned int value ); protected Q_SLOTS: void slotProgressDialogVisible( bool ); void slotShowItemDelayed(); void updateBusyMode(); protected: void setMode(); void connectSingleItem(); void activateSingleItemMode(); bool eventFilter( QObject *, QEvent * ) override; private: QProgressBar* m_pProgressBar; - QLabel* m_pLabel; + union { + QLabel* label; + QToolButton* button; + } m_pPlaceHolder; QToolButton* m_pButton; enum Mode { None, /*Label,*/ Progress }; uint mode; bool m_bShowButton; QBoxLayout *box; QStackedWidget *stack; ProgressItem *mCurrentItem; ProgressDialog* mProgressDialog; QTimer *mDelayTimer; QTimer *mCleanTimer; }; } // namespace #endif