If an information entry will be added to KFileItemDelegate (like done recently), adjusting the corresponding code in Dolphin is a real pain, as the new information will be shown in Dolphin the following way:

 - As additional columns in the details view
 - As additional lines in the icons view
 - As menu entries in the "Sort By" and "Additional Information" groups
 - As popup menu entries in the details view header popup
 - As checkable entries in the View Properties dialog

To prevent similar painful transitions in future, the class AdditionalInfoManager has been introduced. All parts in Dolphin that access/show/store additional information, use the AdditionalInfoManager now. If a new information entry will be added in KFileItemDelegate in future, only a small adjustment in AdditionalInfoManager will be required.

Still open currently:
- AdditionalInfoDialog does not use AdditionalInfoManager yet
- DolphinView::Sorting should be replaced by KFileItemDelegate::Information, so that the sorting can also be done in a generic way.
- The data for KFileItemDelegate::PathOrUrl is not determined

The open issues will get fixed during the next days.

Kudos to the brave warriors Sebastian and Frank, that tried to add a new information ;-)

CCMAIL: [email protected]
CCMAIL: [email protected]

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

1 files changed, 4 insertions, 3 deletions

diff --git a/src/dolphinmodel.h b/src/dolphinmodel.h
index 5c43028c8..6f1b00c75 100644
--- a/src/dolphinmodel.h
+++ b/src/dolphinmodel.h
@@ -35,15 +35,16 @@ class LIBDOLPHINPRIVATE_EXPORT DolphinModel : public KDirModel
 public:
     enum AdditionalColumns {
         Version = KDirModel::ColumnCount,
-        LinkDestination,
-        ExtraColumnCount
+        LinkDest,
+        LocalPathOrUrl,
+        ExtraColumnCount // Mandatory last entry
     };
 
     DolphinModel(QObject* parent = 0);
     virtual ~DolphinModel();
 
     virtual bool setData(const QModelIndex& index, const QVariant& value, int role = Qt::EditRole);
-    virtual QVariant data(const QModelIndex& index, int role = Qt::DisplayRole) const;    
+    virtual QVariant data(const QModelIndex& index, int role = Qt::DisplayRole) const;
     virtual QVariant headerData(int section, Qt::Orientation orientation, int role = Qt::DisplayRole) const;
     virtual int columnCount(const QModelIndex& parent = QModelIndex()) const;