Katana_mirror/kde-playground
1
0
Fork 0
mirror of https://bitbucket.org/smil3y/kde-playground.git synced 2025-02-23 18:32:51 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

karchivemanager: deal with TODOs and FIXME

Browse source
This commit is contained in:
Ivailo Monev 2021-04-01 16:49:24 +03:00
parent af7d8e085b
commit 0cc0f26993
2 changed files with 8 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
karchivemanager/karchivemanager.cpp
View file

@ -26,6 +26,7 @@
#include <QDBusMetaType> #include <QDBusMetaType>
#include <KDebug> #include <KDebug>
#include <KMimeType> #include <KMimeType>
#include <KIconLoader>
#include "karchivemanager.hpp" #include "karchivemanager.hpp"
@ -169,7 +170,7 @@ QIcon KArchiveInfo::fancyIcon() const {
case KArchiveType::File: { case KArchiveType::File: {
const KMimeType::Ptr mime = KMimeType::mimeType(mimetype); const KMimeType::Ptr mime = KMimeType::mimeType(mimetype);
if (mime) { if (mime) {
return QIcon::fromTheme(mime->iconName()); return QIcon(KIconLoader::global()->loadMimeTypeIcon(mime->iconName(), KIconLoader::Small));
} }
return QIcon::fromTheme("unknown"); return QIcon::fromTheme("unknown");
} }
@ -431,7 +432,7 @@ bool KArchiveManagerPrivate::copyData(struct archive* aread, QByteArray &awrite)
return false; return false;
} }
awrite += buffer; awrite.append(buffer, readsize);
readsize = archive_read_data(aread, buffer, sizeof(buffer)); readsize = archive_read_data(aread, buffer, sizeof(buffer));
} }
@ -444,8 +445,7 @@ QByteArray KArchiveManagerPrivate::getMime(struct archive* aread) {
copyData(aread, buffer); copyData(aread, buffer);
const KMimeType::Ptr mime = KMimeType::findByContent(buffer); const KMimeType::Ptr mime = KMimeType::findByContent(buffer);
if (mime) { if (mime) {
// FIXME: first parent mime? return mime->name().toUtf8();
mime->defaultMimeType();
} }
return QByteArray("application/octet-stream"); return QByteArray("application/octet-stream");
} }
@ -1192,7 +1192,7 @@ void KArchiveModelPrivate::appendDirectory(const QString &path) {
QList<QStandardItem*> diritems; QList<QStandardItem*> diritems;
QStandardItem* diritem = new QStandardItem(dir); QStandardItem* diritem = new QStandardItem(dir);
// TODO: diritem->setIcon(info.fancyIcon()); diritem->setIcon(info.fancyIcon());
diritem->setWhatsThis("Directory"); diritem->setWhatsThis("Directory");
diritem->setStatusTip(dirsofar); diritem->setStatusTip(dirsofar);
diritems << diritem; diritems << diritem;
@ -1217,7 +1217,7 @@ void KArchiveModelPrivate::appendSpecial(const KArchiveInfo &info) {
QList<QStandardItem*> specialitems; QList<QStandardItem*> specialitems;
QStandardItem* specialitem = new QStandardItem(infoname); QStandardItem* specialitem = new QStandardItem(infoname);
// TODO: specialitem->setIcon(info.fancyIcon()); specialitem->setIcon(info.fancyIcon());
specialitem->setStatusTip(info.pathname); specialitem->setStatusTip(info.pathname);
specialitems << specialitem; specialitems << specialitem;
specialitems << makeRow(info.fancyType()); specialitems << makeRow(info.fancyType());

2
karchivemanager/main.cpp
View file

@ -25,6 +25,8 @@
int main(int argc, char** argv) int main(int argc, char** argv)
{ {
QApplication::setAttribute(Qt::AA_X11InitThreads, true);
KAboutData aboutData("karchivemanager", 0, ki18n("Archive Manager"), KAboutData aboutData("karchivemanager", 0, ki18n("Archive Manager"),
"1.0.0", ki18n("Simple archive manager for KDE."), "1.0.0", ki18n("Simple archive manager for KDE."),
KAboutData::License_GPL_V2, KAboutData::License_GPL_V2,