X-Git-Url: https://cloud.milkyroute.net/gitweb/dolphin.git/blobdiff_plain/1da13e6e47d62f562e77ab2862ee1a2890f879bf..7c539fd12f5decbfafbea5fa4c317e7c4d753691:/src/dolphinmodel.cpp diff --git a/src/dolphinmodel.cpp b/src/dolphinmodel.cpp index 1022aeeb6..f37452c80 100644 --- a/src/dolphinmodel.cpp +++ b/src/dolphinmodel.cpp @@ -48,7 +48,7 @@ #include #include -static const char* others = I18N_NOOP2("@title:group Name", "Others"); +const char* DolphinModel::m_others = I18N_NOOP2("@title:group Name", "Others"); DolphinModel::DolphinModel(QObject* parent) : KDirModel(parent) @@ -142,15 +142,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 +156,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,14 +170,14 @@ 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); + retString = validCategory ? *currA : i18nc("@title:group Name", m_others); } else { retString = *currA; } @@ -190,7 +187,7 @@ QVariant DolphinModel::displayRoleData(const QModelIndex& index) const } case KDirModel::Size: { - const int fileSize = !item.isNull() ? item.size() : -1; + const KIO::filesize_t fileSize = !item.isNull() ? item.size() : ~0U; if (!item.isNull() && item.isDir()) { retString = i18nc("@title:group Size", "Folders"); } else if (fileSize < 5242880) { @@ -210,15 +207,27 @@ QVariant DolphinModel::displayRoleData(const QModelIndex& index) const const QDate currentDate = KDateTime::currentLocalDateTime().date(); const QDate modifiedDate = modifiedTime.date(); - if ((currentDate.year() == modifiedDate.year()) && (currentDate.month() == modifiedDate.month())) { - const int currentWeek = currentDate.weekNumber(); - const int modifiedWeek = modifiedDate.weekNumber(); + const int daysDistance = modifiedDate.daysTo(currentDate); + + 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()) { switch (currentWeek - modifiedWeek) { case 0: - switch (modifiedDate.daysTo(currentDate)) { + switch (daysDistance) { case 0: retString = i18nc("@title:group Date", "Today"); break; case 1: retString = i18nc("@title:group Date", "Yesterday"); break; - default: retString = modifiedTime.toString(i18nc("Prints out the week day name: %A", "%A")); + default: retString = modifiedTime.toString(i18nc("@title:group The week day name: %A", "%A")); } break; case 1: @@ -231,13 +240,31 @@ 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 { - retString = modifiedTime.toString(i18nc("Prints out the month and year: %B is full month name in current locale, and %Y is full year number", "%B, %Y")); + const QDate lastMonthDate = currentDate.addMonths(-1); + if (lastMonthDate.year() == modifiedDate.year() && lastMonthDate.month() == modifiedDate.month()) { + if (daysDistance == 1) { + 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) { + retString = modifiedTime.toString(i18nc("@title:group Date: %B is full month name in current locale, and %Y is full year number", "Last Week (%B, %Y)")); + } else if (daysDistance <= 7 * 3) { + retString = modifiedTime.toString(i18nc("@title:group Date: %B is full month name in current locale, and %Y is full year number", "Two Weeks Ago (%B, %Y)")); + } else if (daysDistance <= 7 * 4) { + retString = modifiedTime.toString(i18nc("@title:group Date: %B is full month name in current locale, and %Y is full year number", "Three Weeks Ago (%B, %Y)")); + } else { + retString = modifiedTime.toString(i18nc("@title:group Date: %B is full month name in current locale, and %Y is full year number", "Earlier on %B, %Y")); + } + } else { + retString = modifiedTime.toString(i18nc("@title:group The month and year: %B is full month name in current locale, and %Y is full year number", "%B, %Y")); + } } break; } @@ -251,43 +278,43 @@ QVariant DolphinModel::displayRoleData(const QModelIndex& index) const // set user string if (info.permission(QFile::ReadUser)) { - user = i18n("Read, "); + user = i18nc("@item:intext Access permission, concatenated", "Read, "); } if (info.permission(QFile::WriteUser)) { - user += i18n("Write, "); + user += i18nc("@item:intext Access permission, concatenated", "Write, "); } if (info.permission(QFile::ExeUser)) { - user += i18n("Execute, "); + user += i18nc("@item:intext Access permission, concatenated", "Execute, "); } - user = user.isEmpty() ? i18n("Forbidden") : user.mid(0, user.count() - 2); + user = user.isEmpty() ? i18nc("@item:intext Access permission, concatenated", "Forbidden") : user.mid(0, user.count() - 2); // set group string if (info.permission(QFile::ReadGroup)) { - group = i18n("Read, "); + group = i18nc("@item:intext Access permission, concatenated", "Read, "); } if (info.permission(QFile::WriteGroup)) { - group += i18n("Write, "); + group += i18nc("@item:intext Access permission, concatenated", "Write, "); } if (info.permission(QFile::ExeGroup)) { - group += i18n("Execute, "); + group += i18nc("@item:intext Access permission, concatenated", "Execute, "); } - group = group.isEmpty() ? i18n("Forbidden") : group.mid(0, group.count() - 2); + group = group.isEmpty() ? i18nc("@item:intext Access permission, concatenated", "Forbidden") : group.mid(0, group.count() - 2); // set permission string if (info.permission(QFile::ReadOther)) { - others = i18n("Read, "); + others = i18nc("@item:intext Access permission, concatenated", "Read, "); } if (info.permission(QFile::WriteOther)) { - others += i18n("Write, "); + others += i18nc("@item:intext Access permission, concatenated", "Write, "); } if (info.permission(QFile::ExeOther)) { - others += i18n("Execute, "); + others += i18nc("@item:intext Access permission, concatenated", "Execute, "); } - others = others.isEmpty() ? i18n("Forbidden") : others.mid(0, others.count() - 2); + others = others.isEmpty() ? i18nc("@item:intext Access permission, concatenated", "Forbidden") : others.mid(0, others.count() - 2); - retString = i18nc("This shows files and folders permissions: user, group and others", "(User: %1) (Group: %2) (Others: %3)", user, group, others); + 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(); @@ -306,7 +333,7 @@ QVariant DolphinModel::displayRoleData(const QModelIndex& index) const const quint32 rating = ratingForIndex(index); retString = QString::number(rating); break; - } + } case DolphinModel::Tags: { retString = tagsForIndex(index); @@ -335,15 +362,15 @@ QVariant DolphinModel::sortRoleData(const QModelIndex& index) const switch (index.column()) { case KDirModel::Name: { retVariant = data(index, KCategorizedSortFilterProxyModel::CategoryDisplayRole); - - if (retVariant == i18nc("@title:group Name", others)) { + if (retVariant == i18nc("@title:group Name", m_others)) { + // assure that the "Others" group is always the last categorization retVariant = QString(QChar(QChar::ReplacementCharacter)); } break; } case KDirModel::Size: { - const int fileSize = !item.isNull() ? item.size() : -1; + const KIO::filesize_t fileSize = !item.isNull() ? item.size() : ~0U; if (item.isDir()) { retVariant = 0; } else if (fileSize < 5242880) { @@ -363,19 +390,7 @@ QVariant DolphinModel::sortRoleData(const QModelIndex& index) const const QDate currentDate = KDateTime::currentLocalDateTime().date(); const QDate modifiedDate = modifiedTime.date(); - int weekOfMonth = 0; - int dayOfWeek = 0; - if ((currentDate.year() == modifiedDate.year()) && (currentDate.month() == modifiedDate.month())) { - weekOfMonth = 4 - currentDate.weekNumber() + modifiedDate.weekNumber(); - Q_ASSERT(weekOfMonth >= 0); - Q_ASSERT(weekOfMonth <= 4); - if (weekOfMonth == 0) { - dayOfWeek = modifiedDate.dayOfWeek(); - } - } - - retVariant = modifiedDate.year() * 10000 + modifiedDate.month() * 100 + - weekOfMonth * 10 + dayOfWeek; + retVariant = -modifiedDate.daysTo(currentDate); break; } @@ -395,10 +410,11 @@ 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()) { + retVariant.clear(); // when sorting we want folders to be placed first + } else { retVariant = item.mimeComment(); + } break; #ifdef HAVE_NEPOMUK