]> cloud.milkyroute.net Git - dolphin.git/blobdiff - src/infosidebarpage.cpp
some cleanups for the sidebar pages (move protected members to private section etc.)
[dolphin.git] / src / infosidebarpage.cpp
index 9c400b19877ab4eed020dd10ef9d9e6b57eaad6e..530d1fb307c4210616466fc7d854b390d75861f5 100644 (file)
  *   51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA            *
  ***************************************************************************/
 
+#include <config-kmetadata.h>
+
 #include "infosidebarpage.h"
-#include <assert.h>
-
-#include <qlayout.h>
-#include <qpixmap.h>
-#include <qlabel.h>
-#include <qtimer.h>
-#include <qpushbutton.h>
-
-#include <q3popupmenu.h>
-#include <qpainter.h>
-#include <qfontmetrics.h>
-#include <Q3ValueList>
+
+#include <QLayout>
+#include <QPixmap>
+#include <QLabel>
+#include <QTimer>
+#include <QPushButton>
+#include <QMenu>
+#include <QPainter>
+#include <QFontMetrics>
 #include <QEvent>
 #include <QInputDialog>
+#include <QDir>
 
-#include <kbookmarkmanager.h>
+#include <kfileplacesmodel.h>
 #include <klocale.h>
 #include <kstandarddirs.h>
 #include <kio/previewjob.h>
 #include <kfilemetainfo.h>
 #include <kvbox.h>
 #include <kseparator.h>
+#include <kiconloader.h>
 
-#include "dolphinmainwindow.h"
-#include "dolphinapplication.h"
 #include "pixmapviewer.h"
 #include "dolphinsettings.h"
-#include "metadataloader.h"
+#include "metadatawidget.h"
 
-InfoSidebarPage::InfoSidebarPage(DolphinMainWindow* mainWindow, QWidget* parent) :
-    SidebarPage(mainWindow, parent),
-    m_multipleSelection(false),
+InfoSidebarPage::InfoSidebarPage(QWidget* parent) :
+    SidebarPage(parent),
+    m_multipleSelection(false), //TODO: check if I'm needed
     m_pendingPreview(false),
     m_timer(0),
     m_preview(0),
     m_name(0),
     m_infos(0),
-    m_metadata(DolphinApplication::app()->metadataLoader())
+    m_metadataWidget(0)
 {
     const int spacing = KDialog::spacingHint();
 
@@ -91,74 +90,54 @@ InfoSidebarPage::InfoSidebarPage(DolphinMainWindow* mainWindow, QWidget* parent)
 
     KSeparator* sep2 = new KSeparator(this);
 
-    // annotation
-    KSeparator* sep3 = 0;
-    if (m_metadata->storageUp()) {
-        m_annotationLabel = new QLabel(this);
-        m_annotationLabel->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Fixed);
-        m_annotationLabel->setTextFormat(Qt::RichText);
-        m_annotationLabel->setWordWrap(true);
-        m_annotationButton = new QPushButton("", this);
-        m_annotationButton->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Fixed);
-        connect(m_annotationButton, SIGNAL(released()), this, SLOT(changeAnnotation()));
-        sep3 = new KSeparator(this);
+    if (MetaDataWidget::metaDataAvailable()) {
+        m_metadataWidget = new MetaDataWidget(this);
     }
 
-    // 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_infos);
     layout->addWidget(sep2);
-    if (m_metadata->storageUp()) {
-        layout->addWidget(m_annotationLabel);
-        layout->addWidget(m_annotationButton);
-        layout->addWidget(sep3);
+    if (m_metadataWidget) {
+        layout->addWidget(m_metadataWidget);
+        layout->addWidget(new KSeparator(this));
     }
-    layout->addWidget(m_actionBox);
-    layout->addWidget(dummy);
+    // ensure that widgets in the information side bar are aligned towards the top
+    layout->addStretch(1);
     setLayout(layout);
-    connect(mainWindow, SIGNAL(selectionChanged()),
-            this, SLOT(showItemInfo()));
-
-    connectToActiveView();
 }
 
 InfoSidebarPage::~InfoSidebarPage()
 {
 }
 
-void InfoSidebarPage::activeViewChanged()
+void InfoSidebarPage::setUrl(const KUrl& url)
 {
-    connectToActiveView();
+    if (!m_shownUrl.equals(url, KUrl::CompareWithoutTrailingSlash)) {
+        cancelRequest();
+        m_shownUrl = url;
+        showItemInfo();
+    }
 }
 
-void InfoSidebarPage::requestDelayedItemInfo(const KUrl& url)
+void InfoSidebarPage::setSelection(const KFileItemList& selection)
 {
     cancelRequest();
-
-    if (!url.isEmpty() && !m_multipleSelection) {
-        m_urlCandidate = url;
-        m_timer->setSingleShot(true);
-        m_timer->start(300);
-    }
+    SidebarPage::setSelection(selection);
+    m_multipleSelection = (selection.size() > 1);
+    showItemInfo();
 }
 
-void InfoSidebarPage::requestItemInfo(const KUrl& url)
+void InfoSidebarPage::requestDelayedItemInfo(const KUrl& url)
 {
     cancelRequest();
 
     if (!url.isEmpty() && !m_multipleSelection) {
-        m_shownUrl = url;
-        showItemInfo();
+        m_urlCandidate = url;
+        m_timer->setSingleShot(true);
+        m_timer->start(300);
     }
 }
 
@@ -166,15 +145,10 @@ void InfoSidebarPage::showItemInfo()
 {
     cancelRequest();
 
-    m_multipleSelection = false;
+    const KFileItemList& selectedItems = selection();
 
-    // show the preview...
-    DolphinView* view = mainWindow()->activeView();
-    const KFileItemList selectedItems = view->selectedItems();
     KUrl file;
-    if (selectedItems.count() > 1) {
-        m_multipleSelection = true;
-    } else if(selectedItems.count() == 0) {
+    if (selectedItems.count() == 0) {
         file = m_shownUrl;
     } else {
         file = selectedItems[0]->url();
@@ -185,9 +159,8 @@ void InfoSidebarPage::showItemInfo()
                                            K3Icon::NoGroup,
                                            K3Icon::SizeEnormous);
         m_preview->setPixmap(icon);
-        m_name->setText(i18n("%1 items selected",selectedItems.count()));
-    }
-    else if (!applyBookmark(file)) {
+        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(file);
@@ -204,10 +177,10 @@ void InfoSidebarPage::showItemInfo()
                                                 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*)));
+        connect(job, SIGNAL(gotPreview(const KFileItem&, const QPixmap&)),
+                this, SLOT(showPreview(const KFileItem&, const QPixmap&)));
+        connect(job, SIGNAL(failed(const KFileItem&)),
+                this, SLOT(showIcon(const KFileItem&)));
 
         QString text("<b>");
         text.append(file.fileName());
@@ -216,7 +189,6 @@ void InfoSidebarPage::showItemInfo()
     }
 
     createMetaInfo();
-    insertActions();
 }
 
 void InfoSidebarPage::slotTimeout()
@@ -225,68 +197,41 @@ void InfoSidebarPage::slotTimeout()
     showItemInfo();
 }
 
-void InfoSidebarPage::slotPreviewFailed(const KFileItem* item)
+void InfoSidebarPage::showIcon(const KFileItem& item)
 {
     m_pendingPreview = false;
-    if (!applyBookmark(item->url())) {
-        m_preview->setPixmap(item->pixmap(K3Icon::SizeEnormous));
+    if (!applyBookmark(item.url())) {
+        m_preview->setPixmap(item.pixmap(K3Icon::SizeEnormous));
     }
 }
 
-void InfoSidebarPage::gotPreview(const KFileItem* /* item */,
-                                 const QPixmap& pixmap)
+void InfoSidebarPage::showPreview(const KFileItem& item,
+                                  const QPixmap& pixmap)
 {
+    Q_UNUSED(item);
     if (m_pendingPreview) {
         m_preview->setPixmap(pixmap);
         m_pendingPreview = false;
     }
 }
 
-void InfoSidebarPage::startService(int index)
-{
-    DolphinView* view = mainWindow()->activeView();
-    if (view->hasSelection()) {
-        KUrl::List selectedUrls = view->selectedUrls();
-        KDEDesktopMimeType::executeService(selectedUrls, m_actionsVector[index]);
-    }
-    else {
-        KDEDesktopMimeType::executeService(m_shownUrl, m_actionsVector[index]);
-    }
-}
-
-void InfoSidebarPage::connectToActiveView()
+bool InfoSidebarPage::applyBookmark(const KUrl& url)
 {
-    cancelRequest();
+    KFilePlacesModel* placesModel = DolphinSettings::instance().placesModel();
+    int count = placesModel->rowCount();
 
-    DolphinView* view = mainWindow()->activeView();
-    connect(view, SIGNAL(requestItemInfo(const KUrl&)),
-            this, SLOT(requestDelayedItemInfo(const KUrl&)));
-    connect(view, SIGNAL(urlChanged(const KUrl&)),
-            this, SLOT(requestItemInfo(const KUrl&)));
+    for (int i = 0; i < count; ++i) {
+        QModelIndex index = placesModel->index(i, 0);
 
-    m_shownUrl = view->url();
-    showItemInfo();
-}
-
-bool InfoSidebarPage::applyBookmark(const KUrl& url)
-{
-    KBookmarkGroup root = DolphinSettings::instance().bookmarkManager()->root();
-    KBookmark bookmark = root.first();
-    while (!bookmark.isNull()) {
-        if (url.equals(bookmark.url(), KUrl::CompareWithoutTrailingSlash)) {
+        if (url.equals(placesModel->url(index), KUrl::CompareWithoutTrailingSlash)) {
             QString text("<b>");
-            text.append(bookmark.text());
+            text.append(placesModel->text(index));
             text.append("</b>");
             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;
@@ -301,18 +246,19 @@ void InfoSidebarPage::cancelRequest()
 void InfoSidebarPage::createMetaInfo()
 {
     beginInfoLines();
-    DolphinView* view = mainWindow()->activeView();
-    if (!view->hasSelection()) {
+    const KFileItemList& selectedItems = selection();
+    if (selectedItems.size() == 0) {
         KFileItem fileItem(S_IFDIR, KFileItem::Unknown, m_shownUrl);
         fileItem.refresh();
 
         if (fileItem.isDir()) {
             addInfoLine(i18n("Type:"), i18n("Directory"));
         }
-        showAnnotation(m_shownUrl);
-    }
-    else if (view->selectedItems().count() == 1) {
-        KFileItem* fileItem = view->selectedItems()[0];
+        if (MetaDataWidget::metaDataAvailable()) {
+            m_metadataWidget->setFile(fileItem.url());
+        }
+    } else if (selectedItems.count() == 1) {
+        KFileItem* fileItem = selectedItems.at(0);
         addInfoLine(i18n("Type:"), fileItem->mimeComment());
 
         QString sizeText(KIO::convertSize(fileItem->size()));
@@ -325,16 +271,20 @@ void InfoSidebarPage::createMetaInfo()
             for (QStringList::Iterator it = keys.begin(); it != keys.end(); ++it) {
                 if (showMetaInfo(*it)) {
                     KFileMetaInfoItem metaInfoItem = metaInfo.item(*it);
-                    addInfoLine(*it, metaInfoItem.string());
+                    addInfoLine(*it, metaInfoItem.value().toString());
                 }
             }
         }
-        showAnnotation(fileItem->url());
-    }
-    else {
-        showAnnotations(view->selectedItems().urlList());
+        if (MetaDataWidget::metaDataAvailable()) {
+            m_metadataWidget->setFile(fileItem->url());
+        }
+    } else {
+        if (MetaDataWidget::metaDataAvailable()) {
+            m_metadataWidget->setFiles(selectedItems.urlList());
+        }
+
         unsigned long int totSize = 0;
-        foreach(KFileItem* item, view->selectedItems()) {
+        foreach(KFileItem* item, selectedItems) {
             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));
@@ -344,7 +294,7 @@ void InfoSidebarPage::createMetaInfo()
 
 void InfoSidebarPage::beginInfoLines()
 {
-    m_infoLines = QString("");
+    m_infoLines = QString();
 }
 
 void InfoSidebarPage::endInfoLines()
@@ -356,19 +306,19 @@ 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;
@@ -378,11 +328,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;
         }
     }
@@ -392,296 +340,10 @@ bool InfoSidebarPage::showMetaInfo(const QString& key) const
 
 void InfoSidebarPage::addInfoLine(const QString& labelText, const QString& infoText)
 {
-    if (!m_infoLines.isEmpty())
+    if (!m_infoLines.isEmpty()) {
         m_infoLines += "<br/>";
-    m_infoLines += QString("<b>%1</b> %2").arg(labelText).arg(infoText);
-}
-
-void InfoSidebarPage::insertActions()
-{
-    // delete all existing action widgets
-    // TODO: just use children() from QObject...
-    Q3PtrListIterator<QWidget> deleteIter(m_actionWidgets);
-    QWidget* widget = 0;
-    while ((widget = deleteIter.current()) != 0) {
-        widget->close();
-        widget->deleteLater();
-        ++deleteIter;
-    }
-
-    m_actionWidgets.clear();
-    m_actionsVector.clear();
-
-    int actionsIndex = 0;
-
-    // The algorithm for searching the available actions works on a list
-    // 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 itemList = mainWindow()->activeView()->selectedItems();
-    if (itemList.isEmpty()) {
-        fileItem.refresh();
-        itemList.append(&fileItem);
     }
-
-    // 'itemList' contains now all KFileItems, where an item information should be shown.
-    // TODO: the following algorithm is quite equal to DolphinContextMenu::insertActionItems().
-    // It's open yet whether they should be merged or whether they have to work slightly different.
-    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(QStringList("*.desktop"), QDir::Files);
-
-        for (QStringList::ConstIterator entryIt = entries.begin(); entryIt != entries.end(); ++entryIt) {
-            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.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
-
-                    bool insert = false;
-                    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<KFileItem*> mimeIt(itemList);
-                        insert = true;
-                        while (insert && mimeIt.hasNext()) {
-                            KFileItem* item = mimeIt.next();
-                            insert = !item->isDir();
-                        }
-                    }
-
-                    if (!insert) {
-                        // 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<KFileItem*> mimeIt(itemList);
-                        insert = true;
-                        while (insert && mimeIt.hasNext()) {
-                            KFileItem* item = mimeIt.next();
-                            const QString mimeType(item->mimetype());
-                            const QString mimeGroup(mimeType.left(mimeType.indexOf('/')));
-
-                            insert  = (*it == mimeType) ||
-                                      ((*it).right(1) == "*") &&
-                                      ((*it).left((*it).indexOf('/')) == mimeGroup);
-                        }
-                    }
-
-                    if (insert) {
-                        const QString submenuName = cfg.readEntry( "X-KDE-Submenu" );
-                        Q3PopupMenu* popup = 0;
-                        if (!submenuName.isEmpty()) {
-                            // create a sub menu containing all actions
-                            popup = new Q3PopupMenu();
-                            connect(popup, SIGNAL(activated(int)),
-                                    this, SLOT(startService(int)));
-
-                            QPushButton* button = new QPushButton(submenuName, m_actionBox);
-                            button->setFlat(true);
-                            button->setMenu(popup);
-                            button->show();
-                            m_actionWidgets.append(button);
-                        }
-
-                        Q3ValueList<KDEDesktopMimeType::Service> userServices =
-                            KDEDesktopMimeType::userDefinedServices(*dirIt + *entryIt, true);
-
-                        // iterate through all actions and add them to a widget
-                        Q3ValueList<KDEDesktopMimeType::Service>::Iterator serviceIt;
-                        for (serviceIt = userServices.begin(); serviceIt != userServices.end(); ++serviceIt) {
-                            KDEDesktopMimeType::Service service = (*serviceIt);
-                            if (popup == 0) {
-                                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(KIcon(service.m_strIcon), service.m_strName, actionsIndex);
-                            }
-
-                            m_actionsVector.append(service);
-                            ++actionsIndex;
-                        }
-                    }
-                }
-            }
-        }
-    }
-}
-
-void InfoSidebarPage::showAnnotation(const KUrl& file)
-{
-    if(m_metadata->storageUp()) {
-        QString text = m_metadata->getAnnotation(file);
-        if (!text.isEmpty()) {
-            m_annotationLabel->show();
-            m_annotationLabel->setText(QString("<b>%1</b> :<br/>%2").arg(i18n("Annotation")).arg(text));
-            m_annotationButton->setText(i18n("Change annotation"));
-        } else {
-            m_annotationLabel->hide();
-            m_annotationButton->setText(i18n("Annotate file"));
-        }
-    }
-}
-
-void InfoSidebarPage::showAnnotations(const KUrl::List& files)
-{
-    static unsigned int maxShownAnnot = 3; //The maximum number of show annotations when selecting multiple files
-    if (m_metadata->storageUp()) {
-        bool hasAnnotation = false;
-        unsigned int annotateNum = 0;
-        QString firsts = QString("<b>%1 :</b><br/>").arg(i18n("Annotations"));
-        foreach (KUrl file, files) {
-            QString annotation = m_metadata->getAnnotation(file);
-            if (!annotation.isEmpty()) {
-                hasAnnotation = true;
-                if(annotateNum < maxShownAnnot) {
-                    firsts += m_annotationLabel->fontMetrics().elidedText(QString("<b>%1</b> : %2<br/>").arg(file.fileName()).arg(annotation), Qt::ElideRight, width());//FIXME not really the good method, does not handle resizing ...
-                    annotateNum++;
-                }
-            }
-        }
-        if (hasAnnotation) {
-            m_annotationLabel->show();
-            m_annotationLabel->setText(firsts);
-        } else m_annotationLabel->hide();
-        m_annotationButton->setText(hasAnnotation ? i18n("Change annotations") : i18n("Annotate files"));
-    }
-}
-
-void InfoSidebarPage::changeAnnotation()
-{
-    bool ok = false;
-    KUrl::List files(mainWindow()->activeView()->selectedItems().urlList());
-    QString name, old;
-    if (files.isEmpty()) {
-        files << m_shownUrl;
-    }
-    else if (files.count() == 1) {
-        name = files[0].url();
-        old = m_metadata->getAnnotation(files[0]);
-    }
-    else {
-        name = QString("%1 files").arg(files.count());
-        old = QString();
-    }
-    QString text = QInputDialog::getText(this, "Annotate", QString("Set annotation for %1").arg(name), QLineEdit::Normal, old, &ok);//FIXME temporary, must move to a real dialog
-    if(ok) {
-        foreach(KUrl file, files) {
-            m_metadata->setAnnotation(file, text);
-        }
-        showAnnotation(files[0]);
-    }
-}
-
-ServiceButton::ServiceButton(const QIcon& icon,
-                             const QString& text,
-                             QWidget* parent,
-                             int index) :
-    QPushButton(icon, text, parent),
-    m_hover(false),
-    m_index(index)
-{
-    setEraseColor(palette().brush(QPalette::Background).color());
-    setFocusPolicy(Qt::NoFocus);
-    connect(this, SIGNAL(released()),
-            this, SLOT(slotReleased()));
-}
-
-ServiceButton::~ServiceButton()
-{
-}
-
-void ServiceButton::paintEvent(QPaintEvent* event)
-{
-    Q_UNUSED(event);
-    QPainter painter(this);
-    const int buttonWidth  = width();
-    const int buttonHeight = height();
-
-    QColor backgroundColor;
-    QColor foregroundColor;
-    if (m_hover) {
-        backgroundColor = KGlobalSettings::highlightColor();
-        foregroundColor = KGlobalSettings::highlightedTextColor();
-    }
-    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);
-
-    const int spacing = KDialog::spacingHint();
-
-    // draw icon
-    int x = spacing;
-    const int y = (buttonHeight - K3Icon::SizeSmall) / 2;
-    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);
-
-    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());
-
-    if (clipped) {
-        // Blend the right area of the text with the background, as the
-        // text is clipped.
-        // TODO #1: use alpha blending in Qt4 instead of drawing the text that often
-        // TODO #2: same code as in UrlNavigatorButton::drawButton() -> provide helper class?
-        const int blendSteps = 16;
-
-        QColor blendColor(backgroundColor);
-        const int redInc   = (foregroundColor.red()   - backgroundColor.red())   / blendSteps;
-        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());
-
-            blendColor.setRgb(blendColor.red()   + redInc,
-                              blendColor.green() + greenInc,
-                              blendColor.blue()  + blueInc);
-        }
-    }
-}
-
-void ServiceButton::enterEvent(QEvent* event)
-{
-    QPushButton::enterEvent(event);
-    m_hover = true;
-    update();
-}
-
-void ServiceButton::leaveEvent(QEvent* event)
-{
-    QPushButton::leaveEvent(event);
-    m_hover = false;
-    update();
-}
-
-void ServiceButton::slotReleased()
-{
-    emit requestServiceStart(m_index);
+    m_infoLines += QString("<b>%1</b> %2").arg(labelText).arg(infoText);
 }
 
 #include "infosidebarpage.moc"