X-Git-Url: https://cloud.milkyroute.net/gitweb/dolphin.git/blobdiff_plain/7fbae445277374fb2bacfcd7c04e8d7fbb2c3f05..61a4e8691d600a1d105142ce44570c4107600a04:/src/infosidebarpage.cpp diff --git a/src/infosidebarpage.cpp b/src/infosidebarpage.cpp index bf3d5f4fc..77df565f0 100644 --- a/src/infosidebarpage.cpp +++ b/src/infosidebarpage.cpp @@ -14,30 +14,26 @@ * 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., * - * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA * ***************************************************************************/ +#include + #include "infosidebarpage.h" -#include - -#include -#include -#include -#include -#include - -#include -#include -#include -#include -#include -#include -//Added by qt3to4: -#include + +#include +#include +#include +#include +#include +#include +#include +#include #include -#include +#include +#include -#include +#include #include #include #include @@ -46,21 +42,22 @@ #include #include #include +#include +#include -#include "dolphin.h" #include "pixmapviewer.h" #include "dolphinsettings.h" +#include "metadatawidget.h" InfoSidebarPage::InfoSidebarPage(QWidget* parent) : - SidebarPage(parent), - m_multipleSelection(false), - m_pendingPreview(false), - m_timer(0), - m_preview(0), - m_name(0), - m_currInfoLineIdx(0), - m_infoGrid(0), - m_actionBox(0) + SidebarPage(parent), + m_multipleSelection(false), //TODO:check if I'm needed + m_pendingPreview(false), + m_timer(0), + m_currentSelection(KFileItemList()), + m_preview(0), + m_name(0), + m_infos(0) { const int spacing = KDialog::spacingHint(); @@ -68,7 +65,7 @@ InfoSidebarPage::InfoSidebarPage(QWidget* parent) : connect(m_timer, SIGNAL(timeout()), this, SLOT(slotTimeout())); - Q3VBoxLayout* layout = new Q3VBoxLayout(this); + QVBoxLayout* layout = new QVBoxLayout; layout->setSpacing(spacing); // preview @@ -84,46 +81,64 @@ InfoSidebarPage::InfoSidebarPage(QWidget* parent) : m_name->setMinimumHeight(fontMetrics.height() * 3); m_name->setSizePolicy(QSizePolicy::MinimumExpanding, QSizePolicy::Maximum); - QWidget* sep1 = new Q3HGroupBox(this); // TODO: check whether default widget exist for this? - sep1->setFixedHeight(1); + KSeparator* sep1 = new KSeparator(this); // general information - m_infoGrid = new Q3Grid(2, this); - m_infoGrid->setSizePolicy(QSizePolicy::Preferred, QSizePolicy::Fixed); + m_infos = new QLabel(this); + m_infos->setSizePolicy(QSizePolicy::Minimum, QSizePolicy::Fixed); + m_infos->setTextFormat(Qt::RichText); + + KSeparator* sep2 = new KSeparator(this); - QWidget* sep2 = new Q3HGroupBox(this); // TODO: check whether default widget exist for this? - sep2->setFixedHeight(1); + if (MetaDataWidget::metaDataAvailable()) + m_metadataWidget = new MetaDataWidget(this); + else + m_metadataWidget = 0; // actions m_actionBox = new KVBox(this); m_actionBox->setSizePolicy(QSizePolicy::Preferred, QSizePolicy::Fixed); - // Add a dummy widget with no restriction regarding a vertical resizing. - // This assures that information is always top aligned. - QWidget* dummy = new QWidget(this); - layout->addItem(new QSpacerItem(spacing, spacing, QSizePolicy::Preferred, QSizePolicy::Fixed)); layout->addWidget(m_preview); layout->addWidget(m_name); layout->addWidget(sep1); - layout->addWidget(m_infoGrid); + layout->addWidget(m_infos); layout->addWidget(sep2); + if (m_metadataWidget) { + layout->addWidget(m_metadataWidget); + layout->addWidget(new KSeparator(this)); + } layout->addWidget(m_actionBox); - layout->addWidget(dummy); - - connect(&Dolphin::mainWin(), SIGNAL(selectionChanged()), - this, SLOT(showItemInfo())); - - connectToActiveView(); + // ensure that widgets in the information side bar are aligned towards the top + layout->addStretch(1); + setLayout(layout); } InfoSidebarPage::~InfoSidebarPage() +{} + +void InfoSidebarPage::setUrl(const KUrl& url) { + if (!m_shownUrl.equals(url, KUrl::CompareWithoutTrailingSlash)) { + cancelRequest(); + m_shownUrl = url; + showItemInfo(); + } } -void InfoSidebarPage::activeViewChanged() +void InfoSidebarPage::setSelection(const KFileItemList& selection) { - connectToActiveView(); + // TODO: deactivated the following code, as it has side effects. To + // reproduce start Dolphin and open a folder -> the URL navigator gets + // reset. First guess: it seems that a setUrl signal is emitted + // by the following code + + Q_UNUSED(selection); + /*cancelRequest(); + m_currentSelection = selection; + m_multipleSelection = (m_currentSelection.size() > 1); + showItemInfo();*/ } void InfoSidebarPage::requestDelayedItemInfo(const KUrl& url) @@ -132,17 +147,8 @@ void InfoSidebarPage::requestDelayedItemInfo(const KUrl& url) if (!url.isEmpty() && !m_multipleSelection) { m_urlCandidate = url; - m_timer->start(300, true); - } -} - -void InfoSidebarPage::requestItemInfo(const KUrl& url) -{ - cancelRequest(); - - if (!url.isEmpty() && !m_multipleSelection) { - m_shownUrl = url; - showItemInfo(); + m_timer->setSingleShot(true); + m_timer->start(300); } } @@ -150,41 +156,44 @@ void InfoSidebarPage::showItemInfo() { cancelRequest(); - m_multipleSelection = false; - - // show the preview... - DolphinView* view = Dolphin::mainWin().activeView(); - const KFileItemList* selectedItems = view->selectedItems(); - if ((selectedItems != 0) && selectedItems->count() > 1) { - m_multipleSelection = true; + KFileItemList selectedItems = m_currentSelection; + KUrl file; + if (selectedItems.count() == 0) { + file = m_shownUrl; + } else { + file = selectedItems[0]->url(); } - if (m_multipleSelection) { KIconLoader iconLoader; QPixmap icon = iconLoader.loadIcon("exec", K3Icon::NoGroup, K3Icon::SizeEnormous); m_preview->setPixmap(icon); - m_name->setText(i18n("%1 items selected",selectedItems->count())); - } - else if (!applyBookmark()) { + m_name->setText(i18n("%1 items selected", selectedItems.count())); + } else if (!applyBookmark(file)) { // try to get a preview pixmap from the item... KUrl::List list; - list.append(m_shownUrl); + list.append(file); m_pendingPreview = true; m_preview->setPixmap(QPixmap()); KIO::PreviewJob* job = KIO::filePreview(list, m_preview->width(), - K3Icon::SizeEnormous); - connect(job, SIGNAL(gotPreview(const KFileItem*, const QPixmap&)), - this, SLOT(gotPreview(const KFileItem*, const QPixmap&))); - connect(job, SIGNAL(failed(const KFileItem*)), - this, SLOT(slotPreviewFailed(const KFileItem*))); + K3Icon::SizeEnormous, + 0, + 0, + true, + false); + job->setIgnoreMaximumSize(true); + + connect(job, SIGNAL(gotPreview(const KFileItem&, const QPixmap&)), + this, SLOT(gotPreview(const KFileItem&, const QPixmap&))); + connect(job, SIGNAL(failed(const KFileItem&)), + this, SLOT(slotPreviewFailed(const KFileItem&))); QString text(""); - text.append(m_shownUrl.fileName()); + text.append(file.fileName()); text.append(""); m_name->setText(text); } @@ -199,17 +208,18 @@ void InfoSidebarPage::slotTimeout() showItemInfo(); } -void InfoSidebarPage::slotPreviewFailed(const KFileItem* item) +void InfoSidebarPage::slotPreviewFailed(const KFileItem& item) { m_pendingPreview = false; - if (!applyBookmark()) { - m_preview->setPixmap(item->pixmap(K3Icon::SizeEnormous)); + if (!applyBookmark(item.url())) { + m_preview->setPixmap(item.pixmap(K3Icon::SizeEnormous)); } } -void InfoSidebarPage::gotPreview(const KFileItem* /* item */, +void InfoSidebarPage::gotPreview(const KFileItem& item, const QPixmap& pixmap) { + Q_UNUSED(item); if (m_pendingPreview) { m_preview->setPixmap(pixmap); m_pendingPreview = false; @@ -218,49 +228,32 @@ void InfoSidebarPage::gotPreview(const KFileItem* /* item */, void InfoSidebarPage::startService(int index) { - DolphinView* view = Dolphin::mainWin().activeView(); - if (view->hasSelection()) { - KUrl::List selectedUrls = view->selectedUrls(); - KDEDesktopMimeType::executeService(selectedUrls, m_actionsVector[index]); - } - else { - KDEDesktopMimeType::executeService(m_shownUrl, m_actionsVector[index]); + if (m_currentSelection.count() > 0) { + // TODO: Use "at()" as soon as executeService is fixed to take a const param (BIC) + KDesktopFileActions::executeService(m_currentSelection.urlList(), m_actionsVector[index]); + } else { + // TODO: likewise + KDesktopFileActions::executeService(m_shownUrl, m_actionsVector[index]); } } -void InfoSidebarPage::connectToActiveView() +bool InfoSidebarPage::applyBookmark(const KUrl& url) { - cancelRequest(); - - DolphinView* view = Dolphin::mainWin().activeView(); - connect(view, SIGNAL(signalRequestItemInfo(const KUrl&)), - this, SLOT(requestDelayedItemInfo(const KUrl&))); - connect(view, SIGNAL(signalUrlChanged(const KUrl&)), - this, SLOT(requestItemInfo(const KUrl&))); + KFilePlacesModel *placesModel = DolphinSettings::instance().placesModel(); + int count = placesModel->rowCount(); - m_shownUrl = view->url(); - showItemInfo(); -} + for (int i = 0; i < count; ++i) { + QModelIndex index = placesModel->index(i, 0); -bool InfoSidebarPage::applyBookmark() -{ - KBookmarkGroup root = DolphinSettings::instance().bookmarkManager()->root(); - KBookmark bookmark = root.first(); - while (!bookmark.isNull()) { - if (m_shownUrl.equals(bookmark.url(), KUrl::CompareWithoutTrailingSlash)) { + if (url.equals(placesModel->url(index), KUrl::CompareWithoutTrailingSlash)) { QString text(""); - text.append(bookmark.text()); + text.append(placesModel->text(index)); text.append(""); m_name->setText(text); - KIconLoader iconLoader; - QPixmap icon = iconLoader.loadIcon(bookmark.icon(), - K3Icon::NoGroup, - K3Icon::SizeEnormous); - m_preview->setPixmap(icon); + m_preview->setPixmap(placesModel->icon(index).pixmap(128, 128)); return true; } - bookmark = root.next(bookmark); } return false; @@ -274,88 +267,75 @@ void InfoSidebarPage::cancelRequest() void InfoSidebarPage::createMetaInfo() { - // To prevent a flickering it's important to reuse available - // labels instead of deleting them and recreate them afterwards. - // The methods beginInfoLines(), addInfoLine() and endInfoLines() - // take care of this. beginInfoLines(); - DolphinView* view = Dolphin::mainWin().activeView(); - if (!view->hasSelection()) { + if (m_currentSelection.size() == 0) { KFileItem fileItem(S_IFDIR, KFileItem::Unknown, m_shownUrl); fileItem.refresh(); if (fileItem.isDir()) { addInfoLine(i18n("Type:"), i18n("Directory")); } - else { - addInfoLine(i18n("Type:"), fileItem.mimeComment()); - - QString sizeText(KIO::convertSize(fileItem.size())); - addInfoLine(i18n("Size:"), sizeText); - addInfoLine(i18n("Modified:"), fileItem.timeString()); - - const KFileMetaInfo& metaInfo = fileItem.metaInfo(); - if (metaInfo.isValid()) { - QStringList keys = metaInfo.supportedKeys(); - for (QStringList::Iterator it = keys.begin(); it != keys.end(); ++it) { - if (showMetaInfo(*it)) { - KFileMetaInfoItem metaInfoItem = metaInfo.item(*it); - addInfoLine(*it, metaInfoItem.string()); - } + if (MetaDataWidget::metaDataAvailable()) + m_metadataWidget->setFile(fileItem.url()); + } else if (m_currentSelection.count() == 1) { + KFileItem* fileItem = m_currentSelection.at(0); + addInfoLine(i18n("Type:"), fileItem->mimeComment()); + + QString sizeText(KIO::convertSize(fileItem->size())); + addInfoLine(i18n("Size:"), sizeText); + addInfoLine(i18n("Modified:"), fileItem->timeString()); + + const KFileMetaInfo& metaInfo = fileItem->metaInfo(); + if (metaInfo.isValid()) { + QStringList keys = metaInfo.supportedKeys(); + for (QStringList::Iterator it = keys.begin(); it != keys.end(); ++it) { + if (showMetaInfo(*it)) { + KFileMetaInfoItem metaInfoItem = metaInfo.item(*it); + addInfoLine(*it, metaInfoItem.value().toString()); } } } + if (MetaDataWidget::metaDataAvailable()) + m_metadataWidget->setFile(fileItem->url()); + } else { + if (MetaDataWidget::metaDataAvailable()) + m_metadataWidget->setFiles(m_currentSelection.urlList()); + unsigned long int totSize = 0; + foreach(KFileItem* item, m_currentSelection) { + totSize += item->size(); //FIXME what to do with directories ? (same with the one-item-selected-code), item->size() does not return the size of the content : not very instinctive for users + } + addInfoLine(i18n("Total size:"), KIO::convertSize(totSize)); } endInfoLines(); } void InfoSidebarPage::beginInfoLines() { - m_currInfoLineIdx = 0; + m_infoLines = QString(""); } void InfoSidebarPage::endInfoLines() { - if (m_currInfoLineIdx <= 0) { - return; - } - - // remove labels which have not been used - if (m_currInfoLineIdx < static_cast(m_infoWidgets.count())) { - Q3PtrListIterator deleteIter(m_infoWidgets); - deleteIter += m_currInfoLineIdx; - - QWidget* widget = 0; - int removeCount = 0; - while ((widget = deleteIter.current()) != 0) { - widget->close(); - widget->deleteLater(); - ++deleteIter; - ++removeCount; - } - for (int i = 0; i < removeCount; ++i) { - m_infoWidgets.removeLast(); - } - } + m_infos->setText(m_infoLines); } bool InfoSidebarPage::showMetaInfo(const QString& key) const { // sorted list of keys, where it's data should be shown static const char* keys[] = { - "Album", - "Artist", - "Author", - "Bitrate", - "Date", - "Dimensions", - "Genre", - "Length", - "Lines", - "Pages", - "Title", - "Words" - }; + "Album", + "Artist", + "Author", + "Bitrate", + "Date", + "Dimensions", + "Genre", + "Length", + "Lines", + "Pages", + "Title", + "Words" + }; // do a binary search for the key... int top = 0; @@ -365,11 +345,9 @@ bool InfoSidebarPage::showMetaInfo(const QString& key) const const int result = key.compare(keys[middle]); if (result < 0) { bottom = middle - 1; - } - else if (result > 0) { + } else if (result > 0) { top = middle + 1; - } - else { + } else { return true; } } @@ -379,48 +357,21 @@ bool InfoSidebarPage::showMetaInfo(const QString& key) const void InfoSidebarPage::addInfoLine(const QString& labelText, const QString& infoText) { - QString labelStr(""); - labelStr.append(labelText); - labelStr.append(" "); - - const int count = m_infoWidgets.count(); - if (m_currInfoLineIdx < count - 1) { - // reuse available labels - m_infoWidgets.at(m_currInfoLineIdx++)->setText(labelStr); - m_infoWidgets.at(m_currInfoLineIdx++)->setText(infoText); - } - else { - // no labels are available anymore, hence create 2 new ones - QLabel* label = new QLabel(labelStr, m_infoGrid); - label->setTextFormat(Qt::RichText); - label->setAlignment(Qt::AlignRight | - Qt::AlignTop); - label->show(); - m_infoWidgets.append(label); - - QLabel* info = new QLabel(infoText, m_infoGrid); - info->setTextFormat(Qt::RichText); - info->setAlignment(Qt::AlignTop | Qt::TextWordWrap); - info->show(); - m_infoWidgets.append(info); - - m_currInfoLineIdx += 2; - } + if (!m_infoLines.isEmpty()) + m_infoLines += "
"; + m_infoLines += QString("%1 %2").arg(labelText).arg(infoText); } void InfoSidebarPage::insertActions() { - // delete all existing action widgets - // TODO: just use children() from QObject... - Q3PtrListIterator deleteIter(m_actionWidgets); + QListIterator deleteIter(m_actionBox->findChildren()); QWidget* widget = 0; - while ((widget = deleteIter.current()) != 0) { + while (deleteIter.hasNext()) { + widget = deleteIter.next(); widget->close(); widget->deleteLater(); - ++deleteIter; } - m_actionWidgets.clear(); m_actionsVector.clear(); int actionsIndex = 0; @@ -429,12 +380,10 @@ void InfoSidebarPage::insertActions() // of KFileItems. If no selection is given, a temporary KFileItem // by the given Url 'url' is created and added to the list. KFileItem fileItem(S_IFDIR, KFileItem::Unknown, m_shownUrl); - KFileItemList localList; - const KFileItemList* itemList = Dolphin::mainWin().activeView()->selectedItems(); - if ((itemList == 0) || itemList->isEmpty()) { + KFileItemList itemList = m_currentSelection; + if (itemList.isEmpty()) { fileItem.refresh(); - localList.append(&fileItem); - itemList = &localList; + itemList.append(&fileItem); } // 'itemList' contains now all KFileItems, where an item information should be shown. @@ -443,13 +392,12 @@ void InfoSidebarPage::insertActions() QStringList dirs = KGlobal::dirs()->findDirs("data", "dolphin/servicemenus/"); for (QStringList::ConstIterator dirIt = dirs.begin(); dirIt != dirs.end(); ++dirIt) { QDir dir(*dirIt); - QStringList entries = dir.entryList("*.desktop", QDir::Files); + QStringList entries = dir.entryList(QStringList("*.desktop"), QDir::Files); for (QStringList::ConstIterator entryIt = entries.begin(); entryIt != entries.end(); ++entryIt) { - KSimpleConfig cfg(*dirIt + *entryIt, true); - cfg.setDesktopGroup(); + KConfigGroup cfg(KSharedConfig::openConfig(*dirIt + *entryIt, KConfig::OnlyLocal), "Desktop Entry"); if ((cfg.hasKey("Actions") || cfg.hasKey("X-KDE-GetActionMenu")) && cfg.hasKey("ServiceTypes")) { - const QStringList types = cfg.readListEntry("ServiceTypes"); + const QStringList types = cfg.readEntry("ServiceTypes", QStringList(), ','); for (QStringList::ConstIterator it = types.begin(); it != types.end(); ++it) { // check whether the mime type is equal or whether the // mimegroup (e. g. image/*) is supported @@ -458,7 +406,7 @@ void InfoSidebarPage::insertActions() if ((*it) == "all/allfiles") { // The service type is valid for all files, but not for directories. // Check whether the selected items only consist of files... - QListIterator mimeIt(*itemList); + QListIterator mimeIt(itemList); insert = true; while (insert && mimeIt.hasNext()) { KFileItem* item = mimeIt.next(); @@ -470,54 +418,51 @@ void InfoSidebarPage::insertActions() // Check whether the MIME types of all selected files match // to the mimetype of the service action. As soon as one MIME // type does not match, no service menu is shown at all. - QListIterator mimeIt(*itemList); + QListIterator mimeIt(itemList); insert = true; while (insert && mimeIt.hasNext()) { KFileItem* item = mimeIt.next(); const QString mimeType(item->mimetype()); - const QString mimeGroup(mimeType.left(mimeType.find('/'))); + const QString mimeGroup(mimeType.left(mimeType.indexOf('/'))); insert = (*it == mimeType) || ((*it).right(1) == "*") && - ((*it).left((*it).find('/')) == mimeGroup); + ((*it).left((*it).indexOf('/')) == mimeGroup); } } if (insert) { - const QString submenuName = cfg.readEntry( "X-KDE-Submenu" ); - Q3PopupMenu* popup = 0; + const QString submenuName = cfg.readEntry("X-KDE-Submenu"); + QMenu* popup = 0; if (!submenuName.isEmpty()) { // create a sub menu containing all actions - popup = new Q3PopupMenu(); + popup = new QMenu(); connect(popup, SIGNAL(activated(int)), this, SLOT(startService(int))); QPushButton* button = new QPushButton(submenuName, m_actionBox); button->setFlat(true); - button->setPopup(popup); + button->setMenu(popup); button->show(); - m_actionWidgets.append(button); } - Q3ValueList userServices = - KDEDesktopMimeType::userDefinedServices(*dirIt + *entryIt, true); + QList userServices = + KDesktopFileActions::userDefinedServices(*dirIt + *entryIt, true); // iterate through all actions and add them to a widget - Q3ValueList::Iterator serviceIt; + QList::Iterator serviceIt; for (serviceIt = userServices.begin(); serviceIt != userServices.end(); ++serviceIt) { - KDEDesktopMimeType::Service service = (*serviceIt); + KDesktopFileActions::Service service = (*serviceIt); if (popup == 0) { - ServiceButton* button = new ServiceButton(SmallIcon(service.m_strIcon), - service.m_strName, - m_actionBox, - actionsIndex); + ServiceButton* button = new ServiceButton(KIcon(service.m_strIcon), + service.m_strName, + m_actionBox, + actionsIndex); connect(button, SIGNAL(requestServiceStart(int)), this, SLOT(startService(int))); - m_actionWidgets.append(button); button->show(); - } - else { - popup->insertItem(SmallIcon(service.m_strIcon), service.m_strName, actionsIndex); + } else { + popup->insertItem(KIcon(service.m_strIcon), service.m_strName, actionsIndex); } m_actionsVector.append(service); @@ -530,26 +475,29 @@ void InfoSidebarPage::insertActions() } } + + ServiceButton::ServiceButton(const QIcon& icon, const QString& text, QWidget* parent, int index) : - QPushButton(icon, text, parent), - m_hover(false), - m_index(index) + QPushButton(icon, text, parent), + m_hover(false), + m_index(index) { - setEraseColor(colorGroup().background()); + setEraseColor(palette().brush(QPalette::Background).color()); setFocusPolicy(Qt::NoFocus); connect(this, SIGNAL(released()), this, SLOT(slotReleased())); } ServiceButton::~ServiceButton() -{ -} +{} -void ServiceButton::drawButton(QPainter* painter) +void ServiceButton::paintEvent(QPaintEvent* event) { + Q_UNUSED(event); + QPainter painter(this); const int buttonWidth = width(); const int buttonHeight = height(); @@ -558,36 +506,35 @@ void ServiceButton::drawButton(QPainter* painter) if (m_hover) { backgroundColor = KGlobalSettings::highlightColor(); foregroundColor = KGlobalSettings::highlightedTextColor(); - } - else { - backgroundColor = colorGroup().background(); + } else { + backgroundColor = palette().brush(QPalette::Background).color(); foregroundColor = KGlobalSettings::buttonTextColor(); } // draw button background - painter->setPen(Qt::NoPen); - painter->setBrush(backgroundColor); - painter->drawRect(0, 0, buttonWidth, buttonHeight); + painter.setPen(Qt::NoPen); + painter.setBrush(backgroundColor); + painter.drawRect(0, 0, buttonWidth, buttonHeight); const int spacing = KDialog::spacingHint(); // draw icon int x = spacing; const int y = (buttonHeight - K3Icon::SizeSmall) / 2; - const QIcon* set = iconSet(); - if (set != 0) { - painter->drawPixmap(x, y, set->pixmap(QIcon::Small, QIcon::Normal)); + const QIcon &set = icon(); + if (!set.isNull()) { + painter.drawPixmap(x, y, set.pixmap(QIcon::Small, QIcon::Normal)); } x += K3Icon::SizeSmall + spacing; // draw text - painter->setPen(foregroundColor); + painter.setPen(foregroundColor); const int textWidth = buttonWidth - x; QFontMetrics fontMetrics(font()); const bool clipped = fontMetrics.width(text()) >= textWidth; //const int align = clipped ? Qt::AlignVCenter : Qt::AlignCenter; - painter->drawText(QRect(x, 0, textWidth, buttonHeight), Qt::AlignVCenter, text()); + painter.drawText(QRect(x, 0, textWidth, buttonHeight), Qt::AlignVCenter, text()); if (clipped) { // Blend the right area of the text with the background, as the @@ -601,9 +548,9 @@ void ServiceButton::drawButton(QPainter* painter) const int greenInc = (foregroundColor.green() - backgroundColor.green()) / blendSteps; const int blueInc = (foregroundColor.blue() - backgroundColor.blue()) / blendSteps; for (int i = 0; i < blendSteps; ++i) { - painter->setClipRect(QRect(x + textWidth - i, 0, 1, buttonHeight)); - painter->setPen(blendColor); - painter->drawText(QRect(x, 0, textWidth, buttonHeight), Qt::AlignVCenter, text()); + painter.setClipRect(QRect(x + textWidth - i, 0, 1, buttonHeight)); + painter.setPen(blendColor); + painter.drawText(QRect(x, 0, textWidth, buttonHeight), Qt::AlignVCenter, text()); blendColor.setRgb(blendColor.red() + redInc, blendColor.green() + greenInc,