From 0050cb07409d775efe14e728c1cef4a2c33aa1db Mon Sep 17 00:00:00 2001 From: Tannin Date: Mon, 21 Jul 2014 19:14:24 +0200 Subject: - download-list will no longer show a file as having incomplete data if there is no file version - added a new mod column with icons displaying the content of the mod - MO now differentiates between mods using an internal name that disambiguates between foreign and regular mods --- src/resources/contents/breastplate.png | Bin 0 -> 10578 bytes src/resources/contents/checkbox-tree.png | Bin 0 -> 1144 bytes src/resources/contents/conversation.png | Bin 0 -> 7980 bytes src/resources/contents/double-quaver.png | Bin 0 -> 5877 bytes src/resources/contents/empty-chessboard.png | Bin 0 -> 959 bytes src/resources/contents/hand-of-god.png | Bin 0 -> 7105 bytes src/resources/contents/jigsaw-piece.png | Bin 0 -> 5971 bytes src/resources/contents/lyre.png | Bin 0 -> 9368 bytes src/resources/contents/tinker.png | Bin 0 -> 6475 bytes src/resources/contents/usable.png | Bin 0 -> 9919 bytes 10 files changed, 0 insertions(+), 0 deletions(-) create mode 100644 src/resources/contents/breastplate.png create mode 100644 src/resources/contents/checkbox-tree.png create mode 100644 src/resources/contents/conversation.png create mode 100644 src/resources/contents/double-quaver.png create mode 100644 src/resources/contents/empty-chessboard.png create mode 100644 src/resources/contents/hand-of-god.png create mode 100644 src/resources/contents/jigsaw-piece.png create mode 100644 src/resources/contents/lyre.png create mode 100644 src/resources/contents/tinker.png create mode 100644 src/resources/contents/usable.png (limited to 'src/resources') diff --git a/src/resources/contents/breastplate.png b/src/resources/contents/breastplate.png new file mode 100644 index 00000000..e42d0888 Binary files /dev/null and b/src/resources/contents/breastplate.png differ diff --git a/src/resources/contents/checkbox-tree.png b/src/resources/contents/checkbox-tree.png new file mode 100644 index 00000000..ba6da286 Binary files /dev/null and b/src/resources/contents/checkbox-tree.png differ diff --git a/src/resources/contents/conversation.png b/src/resources/contents/conversation.png new file mode 100644 index 00000000..73e5980e Binary files /dev/null and b/src/resources/contents/conversation.png differ diff --git a/src/resources/contents/double-quaver.png b/src/resources/contents/double-quaver.png new file mode 100644 index 00000000..a7e06c72 Binary files /dev/null and b/src/resources/contents/double-quaver.png differ diff --git a/src/resources/contents/empty-chessboard.png b/src/resources/contents/empty-chessboard.png new file mode 100644 index 00000000..1ccbbd12 Binary files /dev/null and b/src/resources/contents/empty-chessboard.png differ diff --git a/src/resources/contents/hand-of-god.png b/src/resources/contents/hand-of-god.png new file mode 100644 index 00000000..9d55580e Binary files /dev/null and b/src/resources/contents/hand-of-god.png differ diff --git a/src/resources/contents/jigsaw-piece.png b/src/resources/contents/jigsaw-piece.png new file mode 100644 index 00000000..0f276ea0 Binary files /dev/null and b/src/resources/contents/jigsaw-piece.png differ diff --git a/src/resources/contents/lyre.png b/src/resources/contents/lyre.png new file mode 100644 index 00000000..1ee4765f Binary files /dev/null and b/src/resources/contents/lyre.png differ diff --git a/src/resources/contents/tinker.png b/src/resources/contents/tinker.png new file mode 100644 index 00000000..8ac7bfdd Binary files /dev/null and b/src/resources/contents/tinker.png differ diff --git a/src/resources/contents/usable.png b/src/resources/contents/usable.png new file mode 100644 index 00000000..dbbf6619 Binary files /dev/null and b/src/resources/contents/usable.png differ -- cgit v1.3.1 From cbe84327c685626cf816f956b5857557a5f3090e Mon Sep 17 00:00:00 2001 From: Tannin Date: Wed, 25 Feb 2015 17:57:38 +0100 Subject: - added content icon for BSAs - improved display of content icons (better scaling and some borders) - bugfix: contains changes missing from changeset bc6b6430017b --- src/modinfo.cpp | 2 +- src/modinfo.h | 4 ++++ src/modlist.cpp | 29 +++++++++++++++------------- src/modlist.h | 2 +- src/resources.qrc | 4 ++++ src/resources/contents/breastplate.png | Bin 10578 -> 1419 bytes src/resources/contents/checkbox-tree.png | Bin 1144 -> 658 bytes src/resources/contents/conversation.png | Bin 7980 -> 1506 bytes src/resources/contents/double-quaver.png | Bin 5877 -> 1009 bytes src/resources/contents/empty-chessboard.png | Bin 959 -> 706 bytes src/resources/contents/hand-of-god.png | Bin 7105 -> 1101 bytes src/resources/contents/jigsaw-piece.png | Bin 5971 -> 952 bytes src/resources/contents/locked-chest.png | Bin 0 -> 1440 bytes src/resources/contents/lyre.png | Bin 9368 -> 1388 bytes src/resources/contents/tinker.png | Bin 6475 -> 1038 bytes src/resources/contents/usable.png | Bin 9919 -> 1345 bytes 16 files changed, 26 insertions(+), 15 deletions(-) create mode 100644 src/resources/contents/locked-chest.png (limited to 'src/resources') diff --git a/src/modinfo.cpp b/src/modinfo.cpp index cf8fa5c5..c7d1101d 100644 --- a/src/modinfo.cpp +++ b/src/modinfo.cpp @@ -90,6 +90,7 @@ QString ModInfo::getContentTypeName(int contentType) case CONTENT_PLUGIN: return tr("Plugins"); case CONTENT_TEXTURE: return tr("Textures"); case CONTENT_MESH: return tr("Meshes"); + case CONTENT_BSA: return tr("BSA"); case CONTENT_INTERFACE: return tr("UI Changes"); case CONTENT_MUSIC: return tr("Music"); case CONTENT_SOUND: return tr("Sound Effects"); @@ -151,7 +152,6 @@ bool ModInfo::removeMod(unsigned int index) if (index >= s_Collection.size()) { throw MyException(tr("invalid index %1").arg(index)); } - // update the indices first ModInfo::Ptr modInfo = s_Collection[index]; s_ModsByName.erase(s_ModsByName.find(modInfo->name())); diff --git a/src/modinfo.h b/src/modinfo.h index 9a4c7c94..33e6ec96 100644 --- a/src/modinfo.h +++ b/src/modinfo.h @@ -72,6 +72,7 @@ public: CONTENT_PLUGIN, CONTENT_TEXTURE, CONTENT_MESH, + CONTENT_BSA, CONTENT_INTERFACE, CONTENT_MUSIC, CONTENT_SOUND, @@ -966,6 +967,9 @@ private: NexusBridge m_NexusBridge; + mutable std::vector m_CachedContent; + mutable QTime m_LastContentCheck; + }; diff --git a/src/modlist.cpp b/src/modlist.cpp index 23b74300..06123359 100644 --- a/src/modlist.cpp +++ b/src/modlist.cpp @@ -164,12 +164,14 @@ QVariantList ModList::contentsToIcons(const std::vector &cont QString ModList::contentsToToolTip(const std::vector &contents) const { - QString result(""); + QString result("
"); std::set contentsSet(contents.begin(), contents.end()); for (auto iter = m_ContentIcons.begin(); iter != m_ContentIcons.end(); ++iter) { if (contentsSet.find(iter->first) != contentsSet.end()) { - result.append(QString("").arg(std::get<1>(iter->second)).arg(std::get<2>(iter->second))); + result.append(QString("" + "") + .arg(std::get<0>(iter->second)).arg(std::get<1>(iter->second))); } } result.append("
%2
%2
"); @@ -968,17 +970,18 @@ QString ModList::getColumnToolTip(int column) case COL_MODID: return tr("Id of the mod as used on Nexus."); case COL_FLAGS: return tr("Emblemes to highlight things that might require attention."); case COL_CONTENT: return tr("Depicts the content of the mod:
" - "Game plugins (esp/esm)
" - "interface
" - "Meshes
" - "Textures
" - "Sounds
" - "Music
" - "Strings
" - "Scripts (Papyrus)
" - "Script Extender plugins
" - "SkyProc Patcher
" - ); + "" + "" + "" + "" + "" + "" + "" + "" + "" + "" + "" + "
Game plugins (esp/esm)
Interface
Meshes
Textures
Sounds
Music
Strings
Scripts (Papyrus)
Script Extender plugins
SkyProc Patcher
"); case COL_INSTALLTIME: return tr("Time this mod was installed"); default: return tr("unknown"); } diff --git a/src/modlist.h b/src/modlist.h index 8475d97a..ecd30875 100644 --- a/src/modlist.h +++ b/src/modlist.h @@ -301,7 +301,7 @@ private: SignalModStateChanged m_ModStateChanged; SignalModMoved m_ModMoved; - std::map > m_ContentIcons; + std::map > m_ContentIcons; }; diff --git a/src/resources.qrc b/src/resources.qrc index 20b0e3fe..85cd6ec7 100644 --- a/src/resources.qrc +++ b/src/resources.qrc @@ -77,5 +77,9 @@ resources/contents/tinker.png resources/contents/breastplate.png resources/contents/conversation.png + resources/contents/locked-chest.png + + + qt.conf diff --git a/src/resources/contents/breastplate.png b/src/resources/contents/breastplate.png index e42d0888..d3d39407 100644 Binary files a/src/resources/contents/breastplate.png and b/src/resources/contents/breastplate.png differ diff --git a/src/resources/contents/checkbox-tree.png b/src/resources/contents/checkbox-tree.png index ba6da286..a44dd5fd 100644 Binary files a/src/resources/contents/checkbox-tree.png and b/src/resources/contents/checkbox-tree.png differ diff --git a/src/resources/contents/conversation.png b/src/resources/contents/conversation.png index 73e5980e..11030fff 100644 Binary files a/src/resources/contents/conversation.png and b/src/resources/contents/conversation.png differ diff --git a/src/resources/contents/double-quaver.png b/src/resources/contents/double-quaver.png index a7e06c72..7102f472 100644 Binary files a/src/resources/contents/double-quaver.png and b/src/resources/contents/double-quaver.png differ diff --git a/src/resources/contents/empty-chessboard.png b/src/resources/contents/empty-chessboard.png index 1ccbbd12..b5983010 100644 Binary files a/src/resources/contents/empty-chessboard.png and b/src/resources/contents/empty-chessboard.png differ diff --git a/src/resources/contents/hand-of-god.png b/src/resources/contents/hand-of-god.png index 9d55580e..e3a05335 100644 Binary files a/src/resources/contents/hand-of-god.png and b/src/resources/contents/hand-of-god.png differ diff --git a/src/resources/contents/jigsaw-piece.png b/src/resources/contents/jigsaw-piece.png index 0f276ea0..0b26d56b 100644 Binary files a/src/resources/contents/jigsaw-piece.png and b/src/resources/contents/jigsaw-piece.png differ diff --git a/src/resources/contents/locked-chest.png b/src/resources/contents/locked-chest.png new file mode 100644 index 00000000..d70d448e Binary files /dev/null and b/src/resources/contents/locked-chest.png differ diff --git a/src/resources/contents/lyre.png b/src/resources/contents/lyre.png index 1ee4765f..041dbb01 100644 Binary files a/src/resources/contents/lyre.png and b/src/resources/contents/lyre.png differ diff --git a/src/resources/contents/tinker.png b/src/resources/contents/tinker.png index 8ac7bfdd..9709cee8 100644 Binary files a/src/resources/contents/tinker.png and b/src/resources/contents/tinker.png differ diff --git a/src/resources/contents/usable.png b/src/resources/contents/usable.png index dbbf6619..2bc93a7d 100644 Binary files a/src/resources/contents/usable.png and b/src/resources/contents/usable.png differ -- cgit v1.3.1