Dolphin is now a KUniqueApplication. A lot of thanks go to Oscar Blumberg, who submit...

[dolphin.git] / src / infosidebarpage.cpp

diff --git a/src/infosidebarpage.cpp b/src/infosidebarpage.cpp
index 3a8099d6e1ddae863240485c356f7cecb7f3146f..f895a71d66e4ca645578280e001b26f711c20ce7 100644 (file)
--- a/src/infosidebarpage.cpp
+++ b/src/infosidebarpage.cpp
@@ -178,7 +178,13 @@ void InfoSidebarPage::showItemInfo()
 
         KIO::PreviewJob* job = KIO::filePreview(list,
                                                 m_preview->width(),
 
         KIO::PreviewJob* job = KIO::filePreview(list,
                                                 m_preview->width(),

-                                                K3Icon::SizeEnormous);
+                                                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*)),
         connect(job, SIGNAL(gotPreview(const KFileItem*, const QPixmap&)),
                 this, SLOT(gotPreview(const KFileItem*, const QPixmap&)));
         connect(job, SIGNAL(failed(const KFileItem*)),


@@ -236,7 +242,7 @@ void InfoSidebarPage::connectToActiveView()
     DolphinView* view = mainWindow()->activeView();
     connect(view, SIGNAL(requestItemInfo(const KUrl&)),
             this, SLOT(requestDelayedItemInfo(const KUrl&)));
     DolphinView* view = mainWindow()->activeView();
     connect(view, SIGNAL(requestItemInfo(const KUrl&)),
             this, SLOT(requestDelayedItemInfo(const KUrl&)));

-    connect(view, SIGNAL(signalUrlChanged(const KUrl&)),
+    connect(view, SIGNAL(urlChanged(const KUrl&)),

             this, SLOT(requestItemInfo(const KUrl&)));
 
     m_shownUrl = view->url();
             this, SLOT(requestItemInfo(const KUrl&)));
 
     m_shownUrl = view->url();


@@ -401,7 +407,8 @@ void InfoSidebarPage::addInfoLine(const QString& labelText, const QString& infoT
 
         QLabel* info = new QLabel(infoText, m_infoGrid);
         info->setTextFormat(Qt::RichText);
 
         QLabel* info = new QLabel(infoText, m_infoGrid);
         info->setTextFormat(Qt::RichText);

-        info->setAlignment(Qt::AlignTop | Qt::TextWordWrap);
+        info->setAlignment(Qt::AlignTop);
+        info->setWordWrap(true);

         info->show();
         m_infoWidgets.append(info);
 
         info->show();
         m_infoWidgets.append(info);
 


@@ -442,13 +449,13 @@ 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 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();
             if ((cfg.hasKey("Actions") || cfg.hasKey("X-KDE-GetActionMenu")) && cfg.hasKey("ServiceTypes")) {
 
         for (QStringList::ConstIterator entryIt = entries.begin(); entryIt != entries.end(); ++entryIt) {
             KSimpleConfig cfg(*dirIt + *entryIt, true);
             cfg.setDesktopGroup();
             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
                 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


@@ -493,7 +500,7 @@ void InfoSidebarPage::insertActions()
 
                             QPushButton* button = new QPushButton(submenuName, m_actionBox);
                             button->setFlat(true);
 
                             QPushButton* button = new QPushButton(submenuName, m_actionBox);
                             button->setFlat(true);

-                            button->setPopup(popup);
+                            button->setMenu(popup);

                             button->show();
                             m_actionWidgets.append(button);
                         }
                             button->show();
                             m_actionWidgets.append(button);
                         }


@@ -506,7 +513,7 @@ void InfoSidebarPage::insertActions()
                         for (serviceIt = userServices.begin(); serviceIt != userServices.end(); ++serviceIt) {
                             KDEDesktopMimeType::Service service = (*serviceIt);
                             if (popup == 0) {
                         for (serviceIt = userServices.begin(); serviceIt != userServices.end(); ++serviceIt) {
                             KDEDesktopMimeType::Service service = (*serviceIt);
                             if (popup == 0) {

-                                ServiceButton* button = new ServiceButton(SmallIcon(service.m_strIcon),
+                                ServiceButton* button = new ServiceButton(KIcon(service.m_strIcon),

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


@@ -516,7 +523,7 @@ void InfoSidebarPage::insertActions()
                                 button->show();
                             }
                             else {
                                 button->show();
                             }
                             else {

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

                             }
 
                             m_actionsVector.append(service);
                             }
 
                             m_actionsVector.append(service);


@@ -574,9 +581,9 @@ void ServiceButton::paintEvent(QPaintEvent* event)
     // draw icon
     int x = spacing;
     const int y = (buttonHeight - K3Icon::SizeSmall) / 2;
     // 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;
 
     }
     x += K3Icon::SizeSmall + spacing;