X-Git-Url: https://cloud.milkyroute.net/gitweb/dolphin.git/blobdiff_plain/f2d61b242d0b48eccea14c16cd970e04a32d06d5..29bff3b1f007a0df1715a51505a1119f95313cab:/src/dolphinmodel.cpp diff --git a/src/dolphinmodel.cpp b/src/dolphinmodel.cpp index 9b77781b8..746752b67 100644 --- a/src/dolphinmodel.cpp +++ b/src/dolphinmodel.cpp @@ -24,14 +24,6 @@ #include "kcategorizedview.h" -#include -#ifdef HAVE_NEPOMUK -#include -#include -#include -#include -#endif - #include #include #include @@ -45,13 +37,16 @@ #include #include #include +#include #include #include -static const char* others = I18N_NOOP2("@title:group Name", "Others"); +const char* const DolphinModel::m_others = I18N_NOOP2("@title:group Name", "Others"); -DolphinModel::DolphinModel(QObject* parent) - : KDirModel(parent) +DolphinModel::DolphinModel(QObject* parent) : + KDirModel(parent), + m_hasVersionData(false), + m_revisionHash() { } @@ -59,72 +54,110 @@ DolphinModel::~DolphinModel() { } +bool DolphinModel::setData(const QModelIndex& index, const QVariant& value, int role) +{ + if ((index.column() == DolphinModel::Version) && (role == Qt::DecorationRole)) { + // TODO: remove data again when items are deleted... + + const QPersistentModelIndex key = index; + const KVersionControlPlugin::VersionState state = static_cast(value.toInt()); + if (m_revisionHash.value(key, KVersionControlPlugin::UnversionedVersion) != state) { + if (!m_hasVersionData) { + connect(this, SIGNAL(rowsRemoved (const QModelIndex&, int, int)), + this, SLOT(slotRowsRemoved(const QModelIndex&, int, int))); + m_hasVersionData = true; + } + + m_revisionHash.insert(key, state); + emit dataChanged(index, index); + return true; + } + } + + return KDirModel::setData(index, value, role); +} + QVariant DolphinModel::data(const QModelIndex& index, int role) const { switch (role) { case KCategorizedSortFilterProxyModel::CategoryDisplayRole: return displayRoleData(index); + case KCategorizedSortFilterProxyModel::CategorySortRole: return sortRoleData(index); + + case Qt::DecorationRole: + if (index.column() == DolphinModel::Version) { + return m_revisionHash.value(index, KVersionControlPlugin::UnversionedVersion); + } + break; + + case Qt::DisplayRole: + if (index.column() == DolphinModel::Version) { + switch (m_revisionHash.value(index, KVersionControlPlugin::UnversionedVersion)) { + case KVersionControlPlugin::NormalVersion: + return i18nc("@item::intable", "Normal"); + case KVersionControlPlugin::UpdateRequiredVersion: + return i18nc("@item::intable", "Update required"); + case KVersionControlPlugin::LocallyModifiedVersion: + return i18nc("@item::intable", "Locally modified"); + case KVersionControlPlugin::AddedVersion: + return i18nc("@item::intable", "Added"); + case KVersionControlPlugin::RemovedVersion: + return i18nc("@item::intable", "Removed"); + case KVersionControlPlugin::ConflictingVersion: + return i18nc("@item::intable", "Conflicting"); + case KVersionControlPlugin::UnversionedVersion: + default: + return i18nc("@item::intable", "Unversioned"); + } + } + break; + default: - return KDirModel::data(index, role); + break; } + + return KDirModel::data(index, role); } -int DolphinModel::columnCount(const QModelIndex &parent) const +QVariant DolphinModel::headerData(int section, Qt::Orientation orientation, int role) const { - return KDirModel::columnCount(parent) + (ExtraColumnCount - ColumnCount); + if ((orientation == Qt::Horizontal) && (role == Qt::DisplayRole)) { + if (section < KDirModel::ColumnCount) { + return KDirModel::headerData(section, orientation, role); + } + + Q_ASSERT(section == DolphinModel::Version); + return i18nc("@title::column", "Version"); + } + return QVariant(); } -quint32 DolphinModel::ratingForIndex(const QModelIndex& index) +int DolphinModel::columnCount(const QModelIndex& parent) const { -#ifdef HAVE_NEPOMUK - quint32 rating = 0; - - const DolphinModel* dolphinModel = static_cast(index.model()); - KFileItem item = dolphinModel->itemForIndex(index); - if (!item.isNull()) { - const Nepomuk::Resource resource(item.url().url(), Soprano::Vocabulary::Xesam::File()); - rating = resource.rating(); - } - return rating; -#else - Q_UNUSED(index); - return 0; -#endif + return KDirModel::columnCount(parent) + (ExtraColumnCount - ColumnCount); } -QString DolphinModel::tagsForIndex(const QModelIndex& index) +void DolphinModel::clearVersionData() { -#ifdef HAVE_NEPOMUK - QString tagsString; - - const DolphinModel* dolphinModel = static_cast(index.model()); - KFileItem item = dolphinModel->itemForIndex(index); - if (!item.isNull()) { - const Nepomuk::Resource resource(item.url().url(), Soprano::Vocabulary::Xesam::File()); - const QList tags = resource.tags(); - QStringList stringList; - foreach (const Nepomuk::Tag& tag, tags) { - stringList.append(tag.label()); - } - stringList.sort(); + m_revisionHash.clear(); + m_hasVersionData = false; +} - foreach (const QString& str, stringList) { - tagsString += str; - tagsString += ", "; - } +bool DolphinModel::hasVersionData() const +{ + return m_hasVersionData; +} - if (!tagsString.isEmpty()) { - tagsString.resize(tagsString.size() - 2); +void DolphinModel::slotRowsRemoved(const QModelIndex& parent, int start, int end) +{ + if (m_hasVersionData) { + const int column = parent.column(); + for (int row = start; row <= end; ++row) { + m_revisionHash.remove(parent.child(row, column)); } } - - return tagsString; -#else - Q_UNUSED(index); - return QString(); -#endif } QVariant DolphinModel::displayRoleData(const QModelIndex& index) const @@ -142,15 +175,12 @@ QVariant DolphinModel::displayRoleData(const QModelIndex& index) const case KDirModel::Name: { // KDirModel checks columns to know to which role are // we talking about - QModelIndex theIndex = index.model()->index(index.row(), - KDirModel::Name, - index.parent()); - - if (!theIndex.isValid()) { + const QModelIndex nameIndex = index.model()->index(index.row(), KDirModel::Name, index.parent()); + if (!nameIndex.isValid()) { return retString; } - QVariant data = theIndex.model()->data(theIndex, Qt::DisplayRole); - QString name = data.toString(); + const QVariant data = nameIndex.model()->data(nameIndex, Qt::DisplayRole); + const QString name = data.toString(); if (!name.isEmpty()) { if (!item.isHidden() && name.at(0).isLetter()) retString = name.at(0).toUpper(); @@ -159,7 +189,7 @@ QVariant DolphinModel::displayRoleData(const QModelIndex& index) const if (name.size() > 1 && name.at(1).isLetter()) { retString = name.at(1).toUpper(); } else { - retString = i18nc("@title:group Name", others); + retString = i18nc("@title:group Name", m_others); } } else { retString = name.at(0).toUpper(); @@ -173,17 +203,13 @@ QVariant DolphinModel::displayRoleData(const QModelIndex& index) const if (currA->isLetter()) { validCategory = true; } else if (currA->isDigit()) { - return i18nc("@title:group Name", others); + return i18nc("@title:group Name", m_others); } else { ++currA; } } - if (!validCategory) { - retString = validCategory ? *currA : i18nc("@title:group Name", others); - } else { - retString = *currA; - } + retString = validCategory ? *currA : i18nc("@title:group Name", m_others); } } break; @@ -211,11 +237,25 @@ QVariant DolphinModel::displayRoleData(const QModelIndex& index) const const QDate modifiedDate = modifiedTime.date(); const int daysDistance = modifiedDate.daysTo(currentDate); - const int currentWeek = currentDate.weekNumber(); - const int modifiedWeek = modifiedDate.weekNumber(); - if (currentDate.year() == modifiedDate.year() && - currentDate.month() == modifiedDate.month()) { + int yearForCurrentWeek = 0; + int currentWeek = currentDate.weekNumber(&yearForCurrentWeek); + if (yearForCurrentWeek == currentDate.year() + 1) { + currentWeek = 53; + } + + int yearForModifiedWeek = 0; + int modifiedWeek = modifiedDate.weekNumber(&yearForModifiedWeek); + if (yearForModifiedWeek == modifiedDate.year() + 1) { + modifiedWeek = 53; + } + + if (currentDate.year() == modifiedDate.year() && currentDate.month() == modifiedDate.month()) { + if (modifiedWeek > currentWeek) { + // use case: modified date = 2010-01-01, current date = 2010-01-22 + // modified week = 53, current week = 3 + modifiedWeek = 0; + } switch (currentWeek - modifiedWeek) { case 0: switch (daysDistance) { @@ -234,15 +274,17 @@ QVariant DolphinModel::displayRoleData(const QModelIndex& index) const retString = i18nc("@title:group Date", "Three Weeks Ago"); break; case 4: + case 5: retString = i18nc("@title:group Date", "Earlier this Month"); break; default: Q_ASSERT(false); } } else { - if (daysDistance <= (currentDate.day() + modifiedDate.daysInMonth())) { + const QDate lastMonthDate = currentDate.addMonths(-1); + if (lastMonthDate.year() == modifiedDate.year() && lastMonthDate.month() == modifiedDate.month()) { if (daysDistance == 1) { - retString = i18nc("@title:group Date: %B is full month name in current locale, and %Y is full year number", "Yesterday (%B, %Y)"); + retString = modifiedTime.toString(i18nc("@title:group Date: %B is full month name in current locale, and %Y is full year number", "Yesterday (%B, %Y)")); } else if (daysDistance <= 7) { retString = modifiedTime.toString(i18nc("@title:group The week day name: %A, %B is full month name in current locale, and %Y is full year number", "%A (%B, %Y)")); } else if (daysDistance <= 7 * 2) { @@ -306,7 +348,7 @@ QVariant DolphinModel::displayRoleData(const QModelIndex& index) const retString = i18nc("@title:group Files and folders by permissions", "(User: %1) (Group: %2) (Others: %3)", user, group, others); break; - } + } case KDirModel::Owner: retString = item.user(); @@ -320,21 +362,9 @@ QVariant DolphinModel::displayRoleData(const QModelIndex& index) const retString = item.mimeComment(); break; -#ifdef HAVE_NEPOMUK - case DolphinModel::Rating: { - const quint32 rating = ratingForIndex(index); - retString = QString::number(rating); + case DolphinModel::Version: + retString = "test"; break; - } - - case DolphinModel::Tags: { - retString = tagsForIndex(index); - if (retString.isEmpty()) { - retString = i18nc("@title:group Tags", "Not yet tagged"); - } - break; - } -#endif } return retString; @@ -354,6 +384,10 @@ QVariant DolphinModel::sortRoleData(const QModelIndex& index) const switch (index.column()) { case KDirModel::Name: { retVariant = data(index, KCategorizedSortFilterProxyModel::CategoryDisplayRole); + if (retVariant == i18nc("@title:group Name", m_others)) { + // assure that the "Others" group is always the last categorization + retVariant = QString('Z').append(QChar::ReplacementCharacter); + } break; } @@ -398,24 +432,14 @@ QVariant DolphinModel::sortRoleData(const QModelIndex& index) const break; case KDirModel::Type: - if (item.isDir()) - retVariant = QString(); // when sorting we want folders to be placed first - else + if (item.isDir()) { + // when sorting we want folders to be placed first + retVariant = QString(); // krazy:exclude=nullstrassign + } else { retVariant = item.mimeComment(); + } break; -#ifdef HAVE_NEPOMUK - case DolphinModel::Rating: { - retVariant = ratingForIndex(index); - break; - } - - case DolphinModel::Tags: { - retVariant = tagsForIndex(index).count(); - break; - } -#endif - default: break; }