Icon naming spec compliance (code changes - KDE/):

[dolphin.git] / src / dolphinmainwindow.cpp

diff --git a/src/dolphinmainwindow.cpp b/src/dolphinmainwindow.cpp
index 5a7f3279769da8feeb9012a9bead305bec4a4622..13406a6b5224d5b7f08d9a4eb2eca3a82882ff59 100644 (file)
--- a/src/dolphinmainwindow.cpp
+++ b/src/dolphinmainwindow.cpp
@@ -41,6 +41,7 @@
 #include "kfileplacesview.h"
 
 #include "dolphin_generalsettings.h"
 #include "kfileplacesview.h"
 
 #include "dolphin_generalsettings.h"

+#include "dolphin_iconsmodesettings.h"

 
 #include <kaction.h>
 #include <kactioncollection.h>
 
 #include <kaction.h>
 #include <kactioncollection.h>


@@ -344,8 +345,10 @@ void DolphinMainWindow::slotAdditionalInfoChanged(KFileItemDelegate::Information
 
     const DolphinView* view = m_activeViewContainer->view();
 
 
     const DolphinView* view = m_activeViewContainer->view();
 

-    // currently the column view does not support additional information
-    const bool enable = (view->mode() != DolphinView::ColumnView);
+    const IconsModeSettings* settings = DolphinSettings::instance().iconsModeSettings();
+    const bool enable = (view->mode() == DolphinView::DetailsView) ||
+                         ((view->mode() == DolphinView::IconsView) && settings->showAdditionalInfo());
+

     showSizeInfo->setEnabled(enable);
     showDateInfo->setEnabled(enable);
     showPermissionsInfo->setEnabled(enable);
     showSizeInfo->setEnabled(enable);
     showDateInfo->setEnabled(enable);
     showPermissionsInfo->setEnabled(enable);


@@ -522,8 +525,11 @@ void DolphinMainWindow::properties()
 {
     const KFileItemList list = m_activeViewContainer->view()->selectedItems();
 
 {
     const KFileItemList list = m_activeViewContainer->view()->selectedItems();
 

-    KPropertiesDialog dialog(list, this);
-    dialog.exec();
+    KPropertiesDialog *dialog = new KPropertiesDialog(list, this);
+    dialog->setAttribute(Qt::WA_DeleteOnClose);
+    dialog->show();
+    dialog->raise();
+    dialog->activateWindow();

 }
 
 void DolphinMainWindow::quit()
 }
 
 void DolphinMainWindow::quit()


@@ -1129,24 +1135,27 @@ void DolphinMainWindow::setupActions()
     sortByType->setText(i18nc("@action:inmenu Sort By", "Type"));
     connect(sortByType, SIGNAL(triggered()), this, SLOT(sortByType()));
 
     sortByType->setText(i18nc("@action:inmenu Sort By", "Type"));
     connect(sortByType, SIGNAL(triggered()), this, SLOT(sortByType()));
 

-    KToggleAction* sortByRating = actionCollection()->add<KToggleAction>("sort_by_rating");
-    sortByRating->setText(i18nc("@action:inmenu Sort By", "Rating"));
-
-    KToggleAction* sortByTags = actionCollection()->add<KToggleAction>("sort_by_tags");
-    sortByTags->setText(i18nc("@action:inmenu Sort By", "Tags"));
-
+    // TODO: Hided "sort by rating" and "sort by tags" as without caching the performance
+    // is too slow currently (Nepomuk will support caching in future releases).
+    //
+    // KToggleAction* sortByRating = actionCollection()->add<KToggleAction>("sort_by_rating");
+    // sortByRating->setText(i18nc("@action:inmenu Sort By", "Rating"));
+    //
+    // KToggleAction* sortByTags = actionCollection()->add<KToggleAction>("sort_by_tags");
+    // sortByTags->setText(i18nc("@action:inmenu Sort By", "Tags"));
+    //

 #ifdef HAVE_NEPOMUK
 #ifdef HAVE_NEPOMUK

-    if (MetaDataWidget::metaDataAvailable()) {
-        connect(sortByRating, SIGNAL(triggered()), this, SLOT(sortByRating()));
-        connect(sortByTags, SIGNAL(triggered()), this, SLOT(sortByTags()));
-    }
-    else {
-        sortByRating->setEnabled(false);
-        sortByTags->setEnabled(false);
-    }
+    // if (MetaDataWidget::metaDataAvailable()) {
+    //     connect(sortByRating, SIGNAL(triggered()), this, SLOT(sortByRating()));
+    //     connect(sortByTags, SIGNAL(triggered()), this, SLOT(sortByTags()));
+    // }
+    // else {
+    //     sortByRating->setEnabled(false);
+    //     sortByTags->setEnabled(false);
+    // }

 #else
 #else

-    sortByRating->setEnabled(false);
-    sortByTags->setEnabled(false);
+    // sortByRating->setEnabled(false);
+    // sortByTags->setEnabled(false);

 #endif
 
     QActionGroup* sortGroup = new QActionGroup(this);
 #endif
 
     QActionGroup* sortGroup = new QActionGroup(this);


@@ -1157,8 +1166,11 @@ void DolphinMainWindow::setupActions()
     sortGroup->addAction(sortByOwner);
     sortGroup->addAction(sortByGroup);
     sortGroup->addAction(sortByType);
     sortGroup->addAction(sortByOwner);
     sortGroup->addAction(sortByGroup);
     sortGroup->addAction(sortByType);

-    sortGroup->addAction(sortByRating);
-    sortGroup->addAction(sortByTags);
+
+    // TODO: Hided "sort by rating" and "sort by tags" as without caching the performance
+    // is too slow currently (Nepomuk will support caching in future releases).
+    //sortGroup->addAction(sortByRating);
+    //sortGroup->addAction(sortByTags);

 
     KToggleAction* sortDescending = actionCollection()->add<KToggleAction>("descending");
     sortDescending->setText(i18nc("@action:inmenu Sort", "Descending"));
 
     KToggleAction* sortDescending = actionCollection()->add<KToggleAction>("descending");
     sortDescending->setText(i18nc("@action:inmenu Sort", "Descending"));