Allow to set the 'AdditionalInformation' property from KFileItemDelegate for each...

- Icons view for images: set 'Size' as additional property
- Icons view for media: show 'MIME type' as additional property
- Default Icons view: don't show any addtional property for a clean layout.

TODO: KFileItemDelagate::AdditionalInformation intersects with KDirModel::Columns when used in combination with the details view. Assure that the user does not get confronted with such implementation details in the user interface.

svn path=/trunk/KDE/kdebase/apps/; revision=641525

diff --git a/src/dolphin_directoryviewpropertysettings.kcfg b/src/dolphin_directoryviewpropertysettings.kcfg
index e1ab73b64c0e86d98b72cefbd4bfc270146df886..bd8cf6c16d9fa18f4d326a6a4af76b5629b0a75e 100644 (file)
--- a/src/dolphin_directoryviewpropertysettings.kcfg
+++ b/src/dolphin_directoryviewpropertysettings.kcfg
@@ -3,6 +3,7 @@
       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
       xsi:schemaLocation="http://www.kde.org/standards/kcfg/1.0
       http://www.kde.org/standards/kcfg/1.0/kcfg.xsd" >
       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
       xsi:schemaLocation="http://www.kde.org/standards/kcfg/1.0
       http://www.kde.org/standards/kcfg/1.0/kcfg.xsd" >

+    <include>kfileitemdelegate.h</include>

 
 <kcfgfile arg="true" />
     <group name="Settings">
 
 <kcfgfile arg="true" />
     <group name="Settings">


@@ -43,6 +44,11 @@
             <max code="true">Qt::Descending</max>
         </entry>
 
             <max code="true">Qt::Descending</max>
         </entry>
 

+        <entry name="AdditionalInfo" type="Int">
+            <label>Additional information</label>
+            <default code="true">KFileItemDelegate::NoInformation</default>
+        </entry>
+

         <entry name="Timestamp" type="DateTime" >
             <label>Properties last changed</label>
             <whatsthis>The last time these properties were changed by the user.</whatsthis>
         <entry name="Timestamp" type="DateTime" >
             <label>Properties last changed</label>
             <whatsthis>The last time these properties were changed by the user.</whatsthis>

diff --git a/src/dolphin_iconsmodesettings.kcfg b/src/dolphin_iconsmodesettings.kcfg
index edd75d0a70aa4f8ece5ee11965d7a8b60acc1518..a9c43726f7902121a9e0af233c97aea15474d4b3 100644 (file)
--- a/src/dolphin_iconsmodesettings.kcfg
+++ b/src/dolphin_iconsmodesettings.kcfg
@@ -2,7 +2,6 @@
 <!DOCTYPE kcfg SYSTEM "http://www.kde.org/standards/kcfg/1.0/kcfg.dtd">
 <kcfg>
     <kcfgfile name="dolphinrc"/>
 <!DOCTYPE kcfg SYSTEM "http://www.kde.org/standards/kcfg/1.0/kcfg.dtd">
 <kcfg>
     <kcfgfile name="dolphinrc"/>

-    <include>kfileitemdelegate.h</include>

     <include>kglobalsettings.h</include>
     <include>kiconloader.h</include>
     <include>QListView</include>
     <include>kglobalsettings.h</include>
     <include>kiconloader.h</include>
     <include>QListView</include>


@@ -46,9 +45,5 @@
             <label>Preview size</label>
             <default code="true">K3Icon::SizeLarge</default>
         </entry>
             <label>Preview size</label>
             <default code="true">K3Icon::SizeLarge</default>
         </entry>

-        <entry name="AdditionalInfo" type="Int">
-            <label>Additional information</label>
-            <default code="true">KFileItemDelegate::FriendlyMimeType</default>
-        </entry>

     </group>
 </kcfg>
\ No newline at end of file
     </group>
 </kcfg>
\ No newline at end of file

diff --git a/src/dolphindetailsview.cpp b/src/dolphindetailsview.cpp
index c019f8eb05ff1fe18093ebcff1bd81576e522b6a..123cfe3b3aae70498cea5de687797d232c234f37 100644 (file)
--- a/src/dolphindetailsview.cpp
+++ b/src/dolphindetailsview.cpp
@@ -77,9 +77,6 @@ DolphinDetailsView::DolphinDetailsView(QWidget* parent, DolphinController* contr
     m_viewOptions = QTreeView::viewOptions();
     m_viewOptions.font = QFont(settings->fontFamily(), settings->fontSize());
     updateDecorationSize();
     m_viewOptions = QTreeView::viewOptions();
     m_viewOptions.font = QFont(settings->fontFamily(), settings->fontSize());
     updateDecorationSize();

-
-    KFileItemDelegate* delegate = new KFileItemDelegate(parent);
-    setItemDelegate(delegate);

 }
 
 DolphinDetailsView::~DolphinDetailsView()
 }
 
 DolphinDetailsView::~DolphinDetailsView()

diff --git a/src/dolphiniconsview.cpp b/src/dolphiniconsview.cpp
index 1871bb6d9e39b2b29ad20ae23f4288e0bff9f9ff..c771e0180123b6836fd37ae7d0d17cdc089356b3 100644 (file)
--- a/src/dolphiniconsview.cpp
+++ b/src/dolphiniconsview.cpp
@@ -69,12 +69,6 @@ DolphinIconsView::DolphinIconsView(QWidget* parent, DolphinController* controlle
         setFlow(QListView::TopToBottom);
         m_viewOptions.decorationPosition = QStyleOptionViewItem::Left;
     }
         setFlow(QListView::TopToBottom);
         m_viewOptions.decorationPosition = QStyleOptionViewItem::Left;
     }

-
-    KFileItemDelegate* delegate = new KFileItemDelegate(parent);
-    const KFileItemDelegate::AdditionalInformation info =
-        static_cast<KFileItemDelegate::AdditionalInformation>(settings->additionalInfo());
-    delegate->setAdditionalInformation(info);
-    setItemDelegate(delegate);

 }
 
 DolphinIconsView::~DolphinIconsView()
 }
 
 DolphinIconsView::~DolphinIconsView()

diff --git a/src/dolphinmainwindow.cpp b/src/dolphinmainwindow.cpp
index e0a0a5633ac67d546b8e9a328cc191b19c3c7b19..508f010ce890b2a1b65cb896ec7a4b6d2328785d 100644 (file)
--- a/src/dolphinmainwindow.cpp
+++ b/src/dolphinmainwindow.cpp
@@ -303,6 +303,31 @@ void DolphinMainWindow::slotSortOrderChanged(Qt::SortOrder order)
     descending->setChecked(sortDescending);\r
 }\r
 \r
     descending->setChecked(sortDescending);\r
 }\r
 \r

+void DolphinMainWindow::slotAdditionalInfoChanged(KFileItemDelegate::AdditionalInformation info)\r
+{\r
+    QAction* action = 0;\r
+    switch (info) {\r
+        case KFileItemDelegate::FriendlyMimeType:\r
+            action = actionCollection()->action("show_mime_info");\r
+            break;\r
+        case KFileItemDelegate::Size:\r
+            action = actionCollection()->action("show_size_info");\r
+            break;\r
+        case KFileItemDelegate::ModificationTime:\r
+            action = actionCollection()->action("show_date_info");\r
+            break;\r
+        case KFileItemDelegate::NoInformation:\r
+        default:\r
+            action = actionCollection()->action("clear_info");\r
+            break;\r
+    }\r
+\r
+    if (action != 0) {\r
+        KToggleAction* toggleAction = static_cast<KToggleAction*>(action);\r
+        toggleAction->setChecked(true);\r
+    }\r
+}\r
+\r

 void DolphinMainWindow::slotSelectionChanged()\r
 {\r
     updateEditActions();\r
 void DolphinMainWindow::slotSelectionChanged()\r
 {\r
     updateEditActions();\r


@@ -704,6 +729,29 @@ void DolphinMainWindow::toggleSortOrder()
     m_activeView->setSortOrder(order);\r
 }\r
 \r
     m_activeView->setSortOrder(order);\r
 }\r
 \r

+void DolphinMainWindow::clearInfo()\r
+{\r
+    m_activeView->setAdditionalInfo(KFileItemDelegate::NoInformation);\r
+}\r
+\r
+void DolphinMainWindow::showMimeInfo()\r
+{\r
+    clearStatusBar();\r
+    m_activeView->setAdditionalInfo(KFileItemDelegate::FriendlyMimeType);\r
+}\r
+\r
+void DolphinMainWindow::showSizeInfo()\r
+{\r
+    clearStatusBar();\r
+    m_activeView->setAdditionalInfo(KFileItemDelegate::Size);\r
+}\r
+\r
+void DolphinMainWindow::showDateInfo()\r
+{\r
+    clearStatusBar();\r
+    m_activeView->setAdditionalInfo(KFileItemDelegate::ModificationTime);\r
+}\r
+\r

 void DolphinMainWindow::toggleSplitView()\r
 {\r
     if (m_view[SecondaryIdx] == 0) {\r
 void DolphinMainWindow::toggleSplitView()\r
 {\r
     if (m_view[SecondaryIdx] == 0) {\r


@@ -1127,6 +1175,28 @@ void DolphinMainWindow::setupActions()
     sortDescending->setText(i18n("Descending"));\r
     connect(sortDescending, SIGNAL(triggered()), this, SLOT(toggleSortOrder()));\r
 \r
     sortDescending->setText(i18n("Descending"));\r
     connect(sortDescending, SIGNAL(triggered()), this, SLOT(toggleSortOrder()));\r
 \r

+    KToggleAction* clearInfo = actionCollection()->add<KToggleAction>("clear_info");\r
+    clearInfo->setText(i18n("No Information"));\r
+    connect(clearInfo, SIGNAL(triggered()), this, SLOT(clearInfo()));\r
+\r
+    KToggleAction* showMimeInfo = actionCollection()->add<KToggleAction>("show_mime_info");\r
+    showMimeInfo->setText(i18n("MIME Type"));\r
+    connect(showMimeInfo, SIGNAL(triggered()), this, SLOT(showMimeInfo()));\r
+\r
+    KToggleAction* showSizeInfo = actionCollection()->add<KToggleAction>("show_size_info");\r
+    showSizeInfo->setText(i18n("Size"));\r
+    connect(showSizeInfo, SIGNAL(triggered()), this, SLOT(showSizeInfo()));\r
+\r
+    KToggleAction* showDateInfo = actionCollection()->add<KToggleAction>("show_date_info");\r
+    showDateInfo->setText(i18n("Date"));\r
+    connect(showDateInfo, SIGNAL(triggered()), this, SLOT(showDateInfo()));\r
+\r
+    QActionGroup* infoGroup = new QActionGroup(this);\r
+    infoGroup->addAction(clearInfo);\r
+    infoGroup->addAction(showMimeInfo);\r
+    infoGroup->addAction(showSizeInfo);\r
+    infoGroup->addAction(showDateInfo);\r
+\r

     KToggleAction* showPreview = actionCollection()->add<KToggleAction>("show_preview");\r
     showPreview->setText(i18n("Preview"));\r
     showPreview->setIcon(KIcon("thumbnail-show"));\r
     KToggleAction* showPreview = actionCollection()->add<KToggleAction>("show_preview");\r
     showPreview->setText(i18n("Preview"));\r
     showPreview->setIcon(KIcon("thumbnail-show"));\r


@@ -1331,6 +1401,7 @@ void DolphinMainWindow::updateViewActions()
 \r
     slotSortingChanged(m_activeView->sorting());\r
     slotSortOrderChanged(m_activeView->sortOrder());\r
 \r
     slotSortingChanged(m_activeView->sorting());\r
     slotSortOrderChanged(m_activeView->sortOrder());\r

+    slotAdditionalInfoChanged(m_activeView->additionalInfo());\r

 \r
     KToggleAction* showFilterBarAction =\r
         static_cast<KToggleAction*>(actionCollection()->action("show_filter_bar"));\r
 \r
     KToggleAction* showFilterBarAction =\r
         static_cast<KToggleAction*>(actionCollection()->action("show_filter_bar"));\r


@@ -1395,6 +1466,8 @@ void DolphinMainWindow::connectViewSignals(int viewIndex)
             this, SLOT(slotSortingChanged(DolphinView::Sorting)));\r
     connect(view, SIGNAL(sortOrderChanged(Qt::SortOrder)),\r
             this, SLOT(slotSortOrderChanged(Qt::SortOrder)));\r
             this, SLOT(slotSortingChanged(DolphinView::Sorting)));\r
     connect(view, SIGNAL(sortOrderChanged(Qt::SortOrder)),\r
             this, SLOT(slotSortOrderChanged(Qt::SortOrder)));\r

+    connect(view, SIGNAL(additionalInfoChanged(KFileItemDelegate::AdditionalInformation)),\r
+            this, SLOT(slotAdditionalInfoChanged(KFileItemDelegate::AdditionalInformation)));\r

     connect(view, SIGNAL(selectionChanged()),\r
             this, SLOT(slotSelectionChanged()));\r
     connect(view, SIGNAL(showFilterBarChanged(bool)),\r
     connect(view, SIGNAL(selectionChanged()),\r
             this, SLOT(slotSelectionChanged()));\r
     connect(view, SIGNAL(showFilterBarChanged(bool)),\r

diff --git a/src/dolphinmainwindow.h b/src/dolphinmainwindow.h
index 137fdfc9ef76db25df9d5732cf5fae98a909ce7e..ff9fbf6a96cb1f6c6ffa13c0fe2622ef8ca36b61 100644 (file)
--- a/src/dolphinmainwindow.h
+++ b/src/dolphinmainwindow.h
@@ -241,6 +241,21 @@ private slots:
     /** Switches between an ascending and descending sorting order. */
     void toggleSortOrder();
 
     /** Switches between an ascending and descending sorting order. */
     void toggleSortOrder();
 

+    /**
+     * Clears any additional information for an item except for the
+     * name and the icon.
+     */
+    void clearInfo();
+
+    /** Shows the MIME type as additional information for the item. */
+    void showMimeInfo();
+
+    /** Shows the size as additional information for the item. */
+    void showSizeInfo();
+
+    /** Shows the date as additional information for the item. */
+    void showDateInfo();
+

     /**
      * Switches between one and two views:
      * If one view is visible, it will get split into two views.
     /**
      * Switches between one and two views:
      * If one view is visible, it will get split into two views.


@@ -331,6 +346,9 @@ private slots:
     /** Updates the state of the 'Sort Ascending/Descending' action. */
     void slotSortOrderChanged(Qt::SortOrder order);
 
     /** Updates the state of the 'Sort Ascending/Descending' action. */
     void slotSortOrderChanged(Qt::SortOrder order);
 

+    /** Updates the state of the 'Additional Information' actions. */
+    void slotAdditionalInfoChanged(KFileItemDelegate::AdditionalInformation info);
+

     /** Updates the state of the 'Edit' menu actions. */
     void slotSelectionChanged();
 
     /** Updates the state of the 'Edit' menu actions. */
     void slotSelectionChanged();
 

diff --git a/src/dolphinui.rc b/src/dolphinui.rc
index 5f822bf6488a39a996174f7b615dbd26f819ef25..06f94826cf04233fa19e44abe36cfab3f422ef2a 100644 (file)
--- a/src/dolphinui.rc
+++ b/src/dolphinui.rc
@@ -32,6 +32,13 @@
     <Separator/>
     <Action name="descending" />
    </Menu>
     <Separator/>
     <Action name="descending" />
    </Menu>

+   <Menu name="additional_info">
+    <text>Additional Information</text>
+    <Action name="clear_info" />
+    <Action name="show_mime_info" />
+    <Action name="show_size_info" />
+    <Action name="show_date_info" />
+   </Menu>

    <Action name="show_preview" />
    <Action name="show_hidden_files" />
    <Separator/>
    <Action name="show_preview" />
    <Action name="show_hidden_files" />
    <Separator/>

diff --git a/src/dolphinview.cpp b/src/dolphinview.cpp
index 3a6a2e7576e4cba23b2ea47a474385a7f719c17d..60e929eba21ff4a9994016c7dfcadb73712cd02c 100644 (file)
--- a/src/dolphinview.cpp
+++ b/src/dolphinview.cpp
@@ -71,6 +71,7 @@ DolphinView::DolphinView(DolphinMainWindow* mainWindow,
     m_controller(0),
     m_iconsView(0),
     m_detailsView(0),
     m_controller(0),
     m_iconsView(0),
     m_detailsView(0),

+    m_fileItemDelegate(0),

     m_filterBar(0),
     m_statusBar(0),
     m_dirModel(0),
     m_filterBar(0),
     m_statusBar(0),
     m_dirModel(0),


@@ -425,6 +426,22 @@ Qt::SortOrder DolphinView::sortOrder() const
     return m_proxyModel->sortOrder();
 }
 
     return m_proxyModel->sortOrder();
 }
 

+void DolphinView::setAdditionalInfo(KFileItemDelegate::AdditionalInformation info)
+{
+    ViewProperties props(m_urlNavigator->url());
+    props.setAdditionalInfo(info);
+
+    m_fileItemDelegate->setAdditionalInformation(info);
+
+    emit additionalInfoChanged(info);
+    reload();
+}
+
+KFileItemDelegate::AdditionalInformation DolphinView::additionalInfo() const
+{
+    return m_fileItemDelegate->additionalInformation();
+}
+

 void DolphinView::goBack()
 {
     m_urlNavigator->goBack();
 void DolphinView::goBack()
 {
     m_urlNavigator->goBack();


@@ -613,6 +630,13 @@ void DolphinView::loadDirectory(const KUrl& url)
         emit sortOrderChanged(sortOrder);
     }
 
         emit sortOrderChanged(sortOrder);
     }
 

+    KFileItemDelegate::AdditionalInformation info = props.additionalInfo();
+    if (info != m_fileItemDelegate->additionalInformation()) {
+        m_fileItemDelegate->setAdditionalInformation(info);
+
+        emit additionalInfoChanged(info);
+    }
+

     const bool showPreview = props.showPreview();
     if (showPreview != m_controller->showPreview()) {
         m_controller->setShowPreview(showPreview);
     const bool showPreview = props.showPreview();
     if (showPreview != m_controller->showPreview()) {
         m_controller->setShowPreview(showPreview);


@@ -1045,6 +1069,7 @@ void DolphinView::createView()
         view->deleteLater();
         m_iconsView = 0;
         m_detailsView = 0;
         view->deleteLater();
         m_iconsView = 0;
         m_detailsView = 0;

+        m_fileItemDelegate = 0;

     }
 
     assert(m_iconsView == 0);
     }
 
     assert(m_iconsView == 0);


@@ -1063,6 +1088,10 @@ void DolphinView::createView()
             break;
     }
 
             break;
     }
 

+
+    m_fileItemDelegate = new KFileItemDelegate(view);
+    view->setItemDelegate(m_fileItemDelegate);
+

     view->setModel(m_proxyModel);
     view->setSelectionMode(QAbstractItemView::ExtendedSelection);
 
     view->setModel(m_proxyModel);
     view->setSelectionMode(QAbstractItemView::ExtendedSelection);
 

diff --git a/src/dolphinview.h b/src/dolphinview.h
index 8ca4a1ac3f69debf96116118e0cb7a26c23f9656..8a7637656684e6f7099586f135ebe74f27295d28 100644 (file)
--- a/src/dolphinview.h
+++ b/src/dolphinview.h
@@ -24,6 +24,7 @@
 
 #include <kparts/part.h>
 #include <kfileitem.h>
 
 #include <kparts/part.h>
 #include <kfileitem.h>

+#include <kfileitemdelegate.h>

 #include <kfileiconview.h>
 #include <kio/job.h>
 
 #include <kfileiconview.h>
 #include <kio/job.h>
 


@@ -38,6 +39,7 @@
 
 class DolphinController;
 class FilterBar;
 
 class DolphinController;
 class FilterBar;

+class KFileItemDelegate;

 class KUrl;
 class KDirModel;
 class UrlNavigator;
 class KUrl;
 class KDirModel;
 class UrlNavigator;


@@ -301,6 +303,12 @@ public:
     /** Returns the current used sort order (Qt::Ascending or Qt::Descending). */
     Qt::SortOrder sortOrder() const;
 
     /** Returns the current used sort order (Qt::Ascending or Qt::Descending). */
     Qt::SortOrder sortOrder() const;
 

+    /** Sets the additional information which should be shown for the items. */
+    void setAdditionalInfo(KFileItemDelegate::AdditionalInformation info);
+
+    /** Returns the additional information which should be shown for the items. */
+    KFileItemDelegate::AdditionalInformation additionalInfo() const;
+

     /** Refreshs the view settings by reading out the stored settings. */
     void refreshSettings();
 
     /** Refreshs the view settings by reading out the stored settings. */
     void refreshSettings();
 


@@ -371,6 +379,9 @@ signals:
     /** Is emitted if the sort order (ascending or descending) has been changed. */
     void sortOrderChanged(Qt::SortOrder order);
 
     /** Is emitted if the sort order (ascending or descending) has been changed. */
     void sortOrderChanged(Qt::SortOrder order);
 

+    /** Is emitted if the addtional information for an item has been changed. */
+    void additionalInfoChanged(KFileItemDelegate::AdditionalInformation info);
+

     /**
      * Is emitted if information of an item is requested to be shown e. g. in the sidebar.
      * It the URL is empty, no item information request is pending.
     /**
      * Is emitted if information of an item is requested to be shown e. g. in the sidebar.
      * It the URL is empty, no item information request is pending.


@@ -546,6 +557,7 @@ private:
     DolphinController* m_controller;
     DolphinIconsView* m_iconsView;
     DolphinDetailsView* m_detailsView;
     DolphinController* m_controller;
     DolphinIconsView* m_iconsView;
     DolphinDetailsView* m_detailsView;

+    KFileItemDelegate* m_fileItemDelegate;

 
     FilterBar* m_filterBar;
     DolphinStatusBar* m_statusBar;
 
     FilterBar* m_filterBar;
     DolphinStatusBar* m_statusBar;

diff --git a/src/iconsviewsettingspage.cpp b/src/iconsviewsettingspage.cpp
index 3f0ffb23fc60e7b588523816a711859c68ea4fe5..8c02ba0b5bf7744e133c81463589acdcba07f799 100644 (file)
--- a/src/iconsviewsettingspage.cpp
+++ b/src/iconsviewsettingspage.cpp
@@ -55,7 +55,6 @@ IconsViewSettingsPage::IconsViewSettingsPage(DolphinMainWindow* mainWindow,
     m_fontFamilyBox(0),
     m_fontSizeBox(0),
     m_textlinesCountBox(0),
     m_fontFamilyBox(0),
     m_fontSizeBox(0),
     m_textlinesCountBox(0),

-    m_additionalInfo(0),

     m_arrangementBox(0),
     m_gridSpacingBox(0)
 {
     m_arrangementBox(0),
     m_gridSpacingBox(0)
 {


@@ -101,15 +100,6 @@ IconsViewSettingsPage::IconsViewSettingsPage(DolphinMainWindow* mainWindow,
     m_textWidthBox->addItem(i18n("Medium"));
     m_textWidthBox->addItem(i18n("Large"));
 
     m_textWidthBox->addItem(i18n("Medium"));
     m_textWidthBox->addItem(i18n("Large"));
 

-    new QLabel(i18n("Additional information:"), textGroup);
-    m_additionalInfo = new QComboBox(textGroup);
-    m_additionalInfo->addItem(i18n("No Information"), KFileItemDelegate::NoInformation);
-    m_additionalInfo->addItem(i18n("MIME Type"), KFileItemDelegate::FriendlyMimeType);
-    m_additionalInfo->addItem(i18n("Size"), KFileItemDelegate::Size);
-    m_additionalInfo->addItem(i18n("Date"), KFileItemDelegate::ModificationTime);
-    const int index = m_additionalInfo->findData(settings->additionalInfo());
-    m_additionalInfo->setCurrentIndex(index);
-

     Q3GroupBox* gridGroup = new Q3GroupBox(2, Qt::Horizontal, i18n("Grid"), this);
     gridGroup->setSizePolicy(sizePolicy);
     gridGroup->setMargin(margin);
     Q3GroupBox* gridGroup = new Q3GroupBox(2, Qt::Horizontal, i18n("Grid"), this);
     gridGroup->setSizePolicy(sizePolicy);
     gridGroup->setMargin(margin);


@@ -176,8 +166,6 @@ void IconsViewSettingsPage::applySettings()
     settings->setFontFamily(m_fontFamilyBox->currentFont().family());
     settings->setFontSize(fontSize);
     settings->setNumberOfTextlines(m_textlinesCountBox->value());
     settings->setFontFamily(m_fontFamilyBox->currentFont().family());
     settings->setFontSize(fontSize);
     settings->setNumberOfTextlines(m_textlinesCountBox->value());

-    const int index = m_additionalInfo->currentIndex();
-    settings->setAdditionalInfo(m_additionalInfo->itemData(index).toInt());

 
     settings->setGridSpacing(GRID_SPACING_BASE +
                              m_gridSpacingBox->currentIndex() * GRID_SPACING_INC);
 
     settings->setGridSpacing(GRID_SPACING_BASE +
                              m_gridSpacingBox->currentIndex() * GRID_SPACING_INC);

diff --git a/src/iconsviewsettingspage.h b/src/iconsviewsettingspage.h
index c9f5b8a746b8cae90dcc60ee969cc2fcfa656c9a..6752257189c82fa7f118f13eb0ab4c901311d06d 100644 (file)
--- a/src/iconsviewsettingspage.h
+++ b/src/iconsviewsettingspage.h
@@ -82,7 +82,6 @@ private:
     QFontComboBox* m_fontFamilyBox;
     QSpinBox* m_fontSizeBox;
     QSpinBox* m_textlinesCountBox;
     QFontComboBox* m_fontFamilyBox;
     QSpinBox* m_fontSizeBox;
     QSpinBox* m_textlinesCountBox;

-    QComboBox* m_additionalInfo;

 
     QComboBox* m_arrangementBox;
     QComboBox* m_gridSpacingBox;
 
     QComboBox* m_arrangementBox;
     QComboBox* m_gridSpacingBox;

diff --git a/src/viewproperties.cpp b/src/viewproperties.cpp
index cf675f30a0276315f69e8f0ef24eacb304077cf9..d3fe7224627abaeb6f2fb9a3476c014bd2d4e1a8 100644 (file)
--- a/src/viewproperties.cpp
+++ b/src/viewproperties.cpp
@@ -163,6 +163,20 @@ Qt::SortOrder ViewProperties::sortOrder() const
     return static_cast<Qt::SortOrder>(m_node->sortOrder());
 }
 
     return static_cast<Qt::SortOrder>(m_node->sortOrder());
 }
 

+void ViewProperties::setAdditionalInfo(KFileItemDelegate::AdditionalInformation info)
+{
+    if (m_node->additionalInfo() != info) {
+        m_node->setAdditionalInfo(info);
+        updateTimeStamp();
+    }
+}
+
+KFileItemDelegate::AdditionalInformation ViewProperties::additionalInfo() const
+{
+    return static_cast<KFileItemDelegate::AdditionalInformation>(m_node->additionalInfo());
+}
+
+

 void ViewProperties::setDirProperties(const ViewProperties& props)
 {
     setViewMode(props.viewMode());
 void ViewProperties::setDirProperties(const ViewProperties& props)
 {
     setViewMode(props.viewMode());


@@ -170,6 +184,7 @@ void ViewProperties::setDirProperties(const ViewProperties& props)
     setShowHiddenFiles(props.showHiddenFiles());
     setSorting(props.sorting());
     setSortOrder(props.sortOrder());
     setShowHiddenFiles(props.showHiddenFiles());
     setSorting(props.sorting());
     setSortOrder(props.sortOrder());

+    setAdditionalInfo(props.additionalInfo());

 }
 
 void ViewProperties::setAutoSaveEnabled(bool autoSave)
 }
 
 void ViewProperties::setAutoSaveEnabled(bool autoSave)

diff --git a/src/viewproperties.h b/src/viewproperties.h
index 6683a6d0c56badd5fd5b7ae912cf8ba01d6d859a..0eb575407eda090153e4bb2c8263ed1f18740dd2 100644 (file)
--- a/src/viewproperties.h
+++ b/src/viewproperties.h
@@ -22,6 +22,7 @@
 #define VIEWPROPERTIES_H
 
 #include <dolphinview.h>
 #define VIEWPROPERTIES_H
 
 #include <dolphinview.h>

+#include <kfileitemdelegate.h>

 #include <kurl.h>
 #include <qdatetime.h>
 
 #include <kurl.h>
 #include <qdatetime.h>
 


@@ -71,6 +72,9 @@ public:
     void setSortOrder(Qt::SortOrder sortOrder);
     Qt::SortOrder sortOrder() const;
 
     void setSortOrder(Qt::SortOrder sortOrder);
     Qt::SortOrder sortOrder() const;
 

+    void setAdditionalInfo(KFileItemDelegate::AdditionalInformation info);
+    KFileItemDelegate::AdditionalInformation additionalInfo() const;
+

     /**
      * Sets the directory properties view mode, show preview,
      * show hidden files, sorting and sort order like
     /**
      * Sets the directory properties view mode, show preview,
      * show hidden files, sorting and sort order like

diff --git a/src/viewpropertiesdialog.cpp b/src/viewpropertiesdialog.cpp
index 81a1f7413312f03f25c1ec267678b9c40f89df3b..76a45061e543d3526c2e791adad57456c0c17407 100644 (file)
--- a/src/viewpropertiesdialog.cpp
+++ b/src/viewpropertiesdialog.cpp
@@ -53,6 +53,7 @@ ViewPropertiesDialog::ViewPropertiesDialog(DolphinView* dolphinView) :
     m_viewMode(0),
     m_sorting(0),
     m_sortOrder(0),
     m_viewMode(0),
     m_sorting(0),
     m_sortOrder(0),

+    m_additionalInfo(0),

     m_showPreview(0),
     m_showHiddenFiles(0),
     m_applyToCurrentFolder(0),
     m_showPreview(0),
     m_showHiddenFiles(0),
     m_applyToCurrentFolder(0),


@@ -102,6 +103,15 @@ ViewPropertiesDialog::ViewPropertiesDialog(DolphinView* dolphinView) :
     const int sortOrderIdx = (m_viewProps->sortOrder() == Qt::Ascending) ? 0 : 1;
     m_sortOrder->setCurrentIndex(sortOrderIdx);
 
     const int sortOrderIdx = (m_viewProps->sortOrder() == Qt::Ascending) ? 0 : 1;
     m_sortOrder->setCurrentIndex(sortOrderIdx);
 

+    QLabel* additionalInfoLabel = new QLabel(i18n("Additional information:"), propsBox);
+    m_additionalInfo = new QComboBox(propsBox);
+    m_additionalInfo->addItem(i18n("No Information"), KFileItemDelegate::NoInformation);
+    m_additionalInfo->addItem(i18n("MIME Type"), KFileItemDelegate::FriendlyMimeType);
+    m_additionalInfo->addItem(i18n("Size"), KFileItemDelegate::Size);
+    m_additionalInfo->addItem(i18n("Date"), KFileItemDelegate::ModificationTime);
+    const int addInfoIndex = m_additionalInfo->findData(m_viewProps->additionalInfo());
+    m_additionalInfo->setCurrentIndex(addInfoIndex);
+

     m_showPreview = new QCheckBox(i18n("Show preview"), propsBox);
     m_showPreview->setChecked(m_viewProps->showPreview());
 
     m_showPreview = new QCheckBox(i18n("Show preview"), propsBox);
     m_showPreview->setChecked(m_viewProps->showPreview());
 


@@ -116,8 +126,10 @@ ViewPropertiesDialog::ViewPropertiesDialog(DolphinView* dolphinView) :
     propsBoxLayout->addWidget(m_sorting, 1, 1);
     propsBoxLayout->addWidget(sortOrderLabel, 2, 0);
     propsBoxLayout->addWidget(m_sortOrder, 2, 1);
     propsBoxLayout->addWidget(m_sorting, 1, 1);
     propsBoxLayout->addWidget(sortOrderLabel, 2, 0);
     propsBoxLayout->addWidget(m_sortOrder, 2, 1);

-    propsBoxLayout->addWidget(m_showPreview, 3, 0);
-    propsBoxLayout->addWidget(m_showHiddenFiles, 4, 0);
+    propsBoxLayout->addWidget(additionalInfoLabel, 3, 0);
+    propsBoxLayout->addWidget(m_additionalInfo, 3, 1);
+    propsBoxLayout->addWidget(m_showPreview, 4, 0);
+    propsBoxLayout->addWidget(m_showHiddenFiles, 5, 0);

 
     topLayout->addWidget(propsBox);
 
 
     topLayout->addWidget(propsBox);
 


@@ -127,6 +139,8 @@ ViewPropertiesDialog::ViewPropertiesDialog(DolphinView* dolphinView) :
             this, SLOT(slotSortingChanged(int)));
     connect(m_sortOrder, SIGNAL(activated(int)),
             this, SLOT(slotSortOrderChanged(int)));
             this, SLOT(slotSortingChanged(int)));
     connect(m_sortOrder, SIGNAL(activated(int)),
             this, SLOT(slotSortOrderChanged(int)));

+    connect(m_additionalInfo, SIGNAL(activated(int)),
+            this, SLOT(slotAdditionalInfoChanged(int)));

     connect(m_showPreview, SIGNAL(clicked()),
             this, SLOT(slotShowPreviewChanged()));
     connect(m_showHiddenFiles, SIGNAL(clicked()),
     connect(m_showPreview, SIGNAL(clicked()),
             this, SLOT(slotShowPreviewChanged()));
     connect(m_showHiddenFiles, SIGNAL(clicked()),


@@ -214,6 +228,19 @@ void ViewPropertiesDialog::slotSortOrderChanged(int index)
     m_isDirty = true;
 }
 
     m_isDirty = true;
 }
 

+void ViewPropertiesDialog::slotAdditionalInfoChanged(int index)
+{
+    KFileItemDelegate::AdditionalInformation info = KFileItemDelegate::NoInformation;
+    switch (index) {
+        case 1:  info = KFileItemDelegate::FriendlyMimeType; break;
+        case 2:  info = KFileItemDelegate::Size; break;
+        case 3:  info = KFileItemDelegate::ModificationTime; break;
+        default: break;
+    }
+    m_viewProps->setAdditionalInfo(info);
+    m_isDirty = true;
+}
+

 void ViewPropertiesDialog::slotShowPreviewChanged()
 {
     const bool show = m_showPreview->isChecked();
 void ViewPropertiesDialog::slotShowPreviewChanged()
 {
     const bool show = m_showPreview->isChecked();

diff --git a/src/viewpropertiesdialog.h b/src/viewpropertiesdialog.h
index 9c5dd4cc70e5f45b7ae934e03081d8b4dadf50fd..2454137bbeae346fa1fac221fe86eee5bb2c7fc6 100644 (file)
--- a/src/viewpropertiesdialog.h
+++ b/src/viewpropertiesdialog.h
@@ -50,6 +50,7 @@ private slots:
     void slotViewModeChanged(int index);
     void slotSortingChanged(int index);
     void slotSortOrderChanged(int index);
     void slotViewModeChanged(int index);
     void slotSortingChanged(int index);
     void slotSortOrderChanged(int index);

+    void slotAdditionalInfoChanged(int index);

     void slotShowPreviewChanged();
     void slotShowHiddenFilesChanged();
     void markAsDirty();
     void slotShowPreviewChanged();
     void slotShowHiddenFilesChanged();
     void markAsDirty();


@@ -62,6 +63,7 @@ private:
     QComboBox* m_viewMode;
     QComboBox* m_sorting;
     QComboBox* m_sortOrder;
     QComboBox* m_viewMode;
     QComboBox* m_sorting;
     QComboBox* m_sortOrder;

+    QComboBox* m_additionalInfo;

     QCheckBox* m_showPreview;
     QCheckBox* m_showHiddenFiles;
     QRadioButton* m_applyToCurrentFolder;
     QCheckBox* m_showPreview;
     QCheckBox* m_showHiddenFiles;
     QRadioButton* m_applyToCurrentFolder;