Added Rafael López's item categorizer into Dolphin (it's currently deactivated in...

[dolphin.git] / src / infosidebarpage.cpp

diff --git a/src/infosidebarpage.cpp b/src/infosidebarpage.cpp
index 2336e1dd420ae5eb144b83faf09d968c431e652f..42352429b5729ebaa6309375b8f0b2a304b1ceb6 100644 (file)
--- a/src/infosidebarpage.cpp
+++ b/src/infosidebarpage.cpp
@@ -17,27 +17,23 @@
  *   51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA            *
  ***************************************************************************/
 
  *   51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA            *
  ***************************************************************************/
 

+#include <config-kmetadata.h>
+

 #include "infosidebarpage.h"
 #include "infosidebarpage.h"

-#include <assert.h>
-
-#include <qlayout.h>
-#include <qpixmap.h>
-#include <qlabel.h>
-#include <qtimer.h>
-#include <qpushbutton.h>
-
-#include <q3vgroupbox.h>
-#include <q3popupmenu.h>
-#include <qpainter.h>
-#include <qfontmetrics.h>
-#include <q3grid.h>
-#include <q3hgroupbox.h>
-//Added by qt3to4:
-#include <Q3ValueList>
+
+#include <QLayout>
+#include <QPixmap>
+#include <QLabel>
+#include <QTimer>
+#include <QPushButton>
+#include <QMenu>
+#include <QPainter>
+#include <QFontMetrics>

 #include <QEvent>
 #include <QEvent>

-#include <Q3VBoxLayout>
+#include <QInputDialog>
+#include <QDir>

 
 

-#include <kbookmarkmanager.h>
+#include <kfileplacesmodel.h>

 #include <klocale.h>
 #include <kstandarddirs.h>
 #include <kio/previewjob.h>
 #include <klocale.h>
 #include <kstandarddirs.h>
 #include <kio/previewjob.h>


@@ -46,21 +42,26 @@
 #include <kglobalsettings.h>
 #include <kfilemetainfo.h>
 #include <kvbox.h>
 #include <kglobalsettings.h>
 #include <kfilemetainfo.h>
 #include <kvbox.h>

+#include <kseparator.h>
+#include <kiconloader.h>
+
+#ifdef HAVE_KMETADATA
+#include <kratingwidget.h>
+#endif

 
 

-#include "dolphinmainwindow.h"

 #include "pixmapviewer.h"
 #include "dolphinsettings.h"
 #include "pixmapviewer.h"
 #include "dolphinsettings.h"

-
-InfoSidebarPage::InfoSidebarPage(DolphinMainWindow* mainWindow, QWidget* parent) :
-    SidebarPage(mainWindow, 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)
+#include "metadatawidget.h"
+
+InfoSidebarPage::InfoSidebarPage(QWidget* parent) :
+        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();
 
 {
     const int spacing = KDialog::spacingHint();
 


@@ -68,7 +69,7 @@ InfoSidebarPage::InfoSidebarPage(DolphinMainWindow* mainWindow, QWidget* parent)
     connect(m_timer, SIGNAL(timeout()),
             this, SLOT(slotTimeout()));
 
     connect(m_timer, SIGNAL(timeout()),
             this, SLOT(slotTimeout()));
 

-    Q3VBoxLayout* layout = new Q3VBoxLayout(this);
+    QVBoxLayout* layout = new QVBoxLayout;

     layout->setSpacing(spacing);
 
     // preview
     layout->setSpacing(spacing);
 
     // preview


@@ -84,46 +85,58 @@ InfoSidebarPage::InfoSidebarPage(DolphinMainWindow* mainWindow, QWidget* parent)
     m_name->setMinimumHeight(fontMetrics.height() * 3);
     m_name->setSizePolicy(QSizePolicy::MinimumExpanding, QSizePolicy::Maximum);
 
     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
 
     // 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);

 
 

-    QWidget* sep2 = new Q3HGroupBox(this);  // TODO: check whether default widget exist for this?
-    sep2->setFixedHeight(1);
+    KSeparator* sep2 = new KSeparator(this);
+
+    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);
 
 
     // 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->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);
     layout->addWidget(sep2);

+    if (m_metadataWidget) {
+        layout->addWidget(m_metadataWidget);
+        layout->addWidget(new KSeparator(this));
+    }

     layout->addWidget(m_actionBox);
     layout->addWidget(m_actionBox);

-    layout->addWidget(dummy);
-
-    connect(mainWindow, 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()
 }
 
 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();
+    cancelRequest();
+    m_currentSelection = selection;
+    m_multipleSelection = (m_currentSelection.size() > 1);
+    showItemInfo();

 }
 
 void InfoSidebarPage::requestDelayedItemInfo(const KUrl& url)
 }
 
 void InfoSidebarPage::requestDelayedItemInfo(const KUrl& url)


@@ -137,41 +150,28 @@ void InfoSidebarPage::requestDelayedItemInfo(const KUrl& url)
     }
 }
 
     }
 }
 

-void InfoSidebarPage::requestItemInfo(const KUrl& url)
-{
-    cancelRequest();
-
-    if (!url.isEmpty() && !m_multipleSelection) {
-        m_shownUrl = url;
-        showItemInfo();
-    }
-}
-

 void InfoSidebarPage::showItemInfo()
 {
     cancelRequest();
 
 void InfoSidebarPage::showItemInfo()
 {
     cancelRequest();
 

-    m_multipleSelection = false;
-
-    // show the preview...
-    DolphinView* view = mainWindow()->activeView();
-    const KFileItemList selectedItems = view->selectedItems();
-    if (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);
     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;
         // 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());
 
         m_pendingPreview = true;
         m_preview->setPixmap(QPixmap());


@@ -191,7 +191,7 @@ void InfoSidebarPage::showItemInfo()
                 this, SLOT(slotPreviewFailed(const KFileItem*)));
 
         QString text("<b>");
                 this, SLOT(slotPreviewFailed(const KFileItem*)));
 
         QString text("<b>");

-        text.append(m_shownUrl.fileName());
+        text.append(file.fileName());

         text.append("</b>");
         m_name->setText(text);
     }
         text.append("</b>");
         m_name->setText(text);
     }


@@ -209,14 +209,15 @@ void InfoSidebarPage::slotTimeout()
 void InfoSidebarPage::slotPreviewFailed(const KFileItem* item)
 {
     m_pendingPreview = false;
 void InfoSidebarPage::slotPreviewFailed(const KFileItem* item)
 {
     m_pendingPreview = false;

-    if (!applyBookmark()) {
+    if (!applyBookmark(item->url())) {

         m_preview->setPixmap(item->pixmap(K3Icon::SizeEnormous));
     }
 }
 
         m_preview->setPixmap(item->pixmap(K3Icon::SizeEnormous));
     }
 }
 

-void InfoSidebarPage::gotPreview(const KFileItem* /* item */,
+void InfoSidebarPage::gotPreview(const KFileItem* item,

                                  const QPixmap& pixmap)
 {
                                  const QPixmap& pixmap)
 {

+    Q_UNUSED(item);

     if (m_pendingPreview) {
         m_preview->setPixmap(pixmap);
         m_pendingPreview = false;
     if (m_pendingPreview) {
         m_preview->setPixmap(pixmap);
         m_pendingPreview = false;


@@ -225,49 +226,32 @@ void InfoSidebarPage::gotPreview(const KFileItem* /* item */,
 
 void InfoSidebarPage::startService(int index)
 {
 
 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]);
+    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();
+    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&)));
-
-    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("<b>");
             QString text("<b>");

-            text.append(bookmark.text());
+            text.append(placesModel->text(index));

             text.append("</b>");
             m_name->setText(text);
 
             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;
         }
             return true;
         }

-        bookmark = root.next(bookmark);

     }
 
     return false;
     }
 
     return false;


@@ -281,88 +265,75 @@ void InfoSidebarPage::cancelRequest()
 
 void InfoSidebarPage::createMetaInfo()
 {
 
 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();
     beginInfoLines();

-    DolphinView* view = mainWindow()->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"));
         }
         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()
 {
     }
     endInfoLines();
 }
 
 void InfoSidebarPage::beginInfoLines()
 {

-    m_currInfoLineIdx = 0;
+    m_infoLines = QString("");

 }
 
 void InfoSidebarPage::endInfoLines()
 {
 }
 
 void InfoSidebarPage::endInfoLines()
 {

-    if (m_currInfoLineIdx <= 0) {
-        return;
-    }
-
-    // remove labels which have not been used
-    if (m_currInfoLineIdx < static_cast<int>(m_infoWidgets.count())) {
-        Q3PtrListIterator<QLabel> 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[] = {
 }
 
 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;
 
     // do a binary search for the key...
     int top = 0;


@@ -372,11 +343,9 @@ bool InfoSidebarPage::showMetaInfo(const QString& key) const
         const int result = key.compare(keys[middle]);
         if (result < 0) {
             bottom = middle - 1;
         const int result = key.compare(keys[middle]);
         if (result < 0) {
             bottom = middle - 1;

-        }
-        else if (result > 0) {
+        } else if (result > 0) {

             top = middle + 1;
             top = middle + 1;

-        }
-        else {
+        } else {

             return true;
         }
     }
             return true;
         }
     }


@@ -386,49 +355,21 @@ bool InfoSidebarPage::showMetaInfo(const QString& key) const
 
 void InfoSidebarPage::addInfoLine(const QString& labelText, const QString& infoText)
 {
 
 void InfoSidebarPage::addInfoLine(const QString& labelText, const QString& infoText)
 {

-    QString labelStr("<b>");
-    labelStr.append(labelText);
-    labelStr.append("</b>&nbsp;");
-
-    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);
-        info->setWordWrap(true);
-        info->show();
-        m_infoWidgets.append(info);
-
-        m_currInfoLineIdx += 2;
-    }
+    if (!m_infoLines.isEmpty())
+        m_infoLines += "<br/>";
+    m_infoLines += QString("<b>%1</b> %2").arg(labelText).arg(infoText);

 }
 
 void InfoSidebarPage::insertActions()
 {
 }
 
 void InfoSidebarPage::insertActions()
 {

-    // delete all existing action widgets
-    // TODO: just use children() from QObject...
-    Q3PtrListIterator<QWidget> deleteIter(m_actionWidgets);
+    QListIterator<QPushButton*> deleteIter(m_actionBox->findChildren<QPushButton*>());

     QWidget* widget = 0;
     QWidget* widget = 0;

-    while ((widget = deleteIter.current()) != 0) {
+    while (deleteIter.hasNext()) {
+        widget = deleteIter.next();

         widget->close();
         widget->deleteLater();
         widget->close();
         widget->deleteLater();

-        ++deleteIter;

     }
 
     }
 

-    m_actionWidgets.clear();

     m_actionsVector.clear();
 
     int actionsIndex = 0;
     m_actionsVector.clear();
 
     int actionsIndex = 0;


@@ -437,7 +378,7 @@ 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);
     // 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();
+    KFileItemList itemList = m_currentSelection;

     if (itemList.isEmpty()) {
         fileItem.refresh();
         itemList.append(&fileItem);
     if (itemList.isEmpty()) {
         fileItem.refresh();
         itemList.append(&fileItem);


@@ -452,7 +393,7 @@ void InfoSidebarPage::insertActions()
         QStringList entries = dir.entryList(QStringList("*.desktop"), QDir::Files);
 
         for (QStringList::ConstIterator entryIt = entries.begin(); entryIt != entries.end(); ++entryIt) {
         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" );
+            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) {
             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) {


@@ -489,11 +430,11 @@ void InfoSidebarPage::insertActions()
                     }
 
                     if (insert) {
                     }
 
                     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
                         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)));
 
                             connect(popup, SIGNAL(activated(int)),
                                     this, SLOT(startService(int)));
 


@@ -501,27 +442,24 @@ void InfoSidebarPage::insertActions()
                             button->setFlat(true);
                             button->setMenu(popup);
                             button->show();
                             button->setFlat(true);
                             button->setMenu(popup);
                             button->show();

-                            m_actionWidgets.append(button);

                         }
 
                         }
 

-                        Q3ValueList<KDEDesktopMimeType::Service> userServices =
-                            KDEDesktopMimeType::userDefinedServices(*dirIt + *entryIt, true);
+                        QList<KDesktopFileActions::Service> userServices =
+                            KDesktopFileActions::userDefinedServices(*dirIt + *entryIt, true);

 
                         // iterate through all actions and add them to a widget
 
                         // iterate through all actions and add them to a widget

-                        Q3ValueList<KDEDesktopMimeType::Service>::Iterator serviceIt;
+                        QList<KDesktopFileActions::Service>::Iterator serviceIt;

                         for (serviceIt = userServices.begin(); serviceIt != userServices.end(); ++serviceIt) {
                         for (serviceIt = userServices.begin(); serviceIt != userServices.end(); ++serviceIt) {

-                            KDEDesktopMimeType::Service service = (*serviceIt);
+                            KDesktopFileActions::Service service = (*serviceIt);

                             if (popup == 0) {
                                 ServiceButton* button = new ServiceButton(KIcon(service.m_strIcon),
                             if (popup == 0) {
                                 ServiceButton* button = new ServiceButton(KIcon(service.m_strIcon),

-                                                                          service.m_strName,
-                                                                          m_actionBox,
-                                                                          actionsIndex);
+                                                        service.m_strName,
+                                                        m_actionBox,
+                                                        actionsIndex);

                                 connect(button, SIGNAL(requestServiceStart(int)),
                                         this, SLOT(startService(int)));
                                 connect(button, SIGNAL(requestServiceStart(int)),
                                         this, SLOT(startService(int)));

-                                m_actionWidgets.append(button);

                                 button->show();
                                 button->show();

-                            }
-                            else {
+                            } else {

                                 popup->insertItem(KIcon(service.m_strIcon), service.m_strName, actionsIndex);
                             }
 
                                 popup->insertItem(KIcon(service.m_strIcon), service.m_strName, actionsIndex);
                             }
 


@@ -535,13 +473,15 @@ void InfoSidebarPage::insertActions()
     }
 }
 
     }
 }
 

+
+

 ServiceButton::ServiceButton(const QIcon& icon,
                              const QString& text,
                              QWidget* parent,
                              int index) :
 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(palette().brush(QPalette::Background).color());
     setFocusPolicy(Qt::NoFocus);
 {
     setEraseColor(palette().brush(QPalette::Background).color());
     setFocusPolicy(Qt::NoFocus);


@@ -550,11 +490,11 @@ ServiceButton::ServiceButton(const QIcon& icon,
 }
 
 ServiceButton::~ServiceButton()
 }
 
 ServiceButton::~ServiceButton()

-{
-}
+{}

 
 void ServiceButton::paintEvent(QPaintEvent* event)
 {
 
 void ServiceButton::paintEvent(QPaintEvent* event)
 {

+    Q_UNUSED(event);

     QPainter painter(this);
     const int buttonWidth  = width();
     const int buttonHeight = height();
     QPainter painter(this);
     const int buttonWidth  = width();
     const int buttonHeight = height();


@@ -564,8 +504,7 @@ void ServiceButton::paintEvent(QPaintEvent* event)
     if (m_hover) {
         backgroundColor = KGlobalSettings::highlightColor();
         foregroundColor = KGlobalSettings::highlightedTextColor();
     if (m_hover) {
         backgroundColor = KGlobalSettings::highlightColor();
         foregroundColor = KGlobalSettings::highlightedTextColor();

-    }
-    else {
+    } else {

         backgroundColor = palette().brush(QPalette::Background).color();
         foregroundColor = KGlobalSettings::buttonTextColor();
     }
         backgroundColor = palette().brush(QPalette::Background).color();
         foregroundColor = KGlobalSettings::buttonTextColor();
     }