mirrors/keepassxc
1
0
Fork 0
mirror of https://github.com/keepassxreboot/keepassxc.git synced 2025-04-05 13:37:43 +03:00
Code Issues Projects Releases Packages Wiki Activity

Add built-in icons.

Browse source
This commit is contained in:
Felix Geyer 2010-09-19 21:22:24 +02:00
parent b639c43b24
commit 567dd92d4c
88 changed files with 243 additions and 51 deletions
Download patch file Download diff file Expand all files Collapse all files

12
src/core/Entry.cpp
View file

@ -18,7 +18,9 @@
#include "Entry.h"
#include "Database.h"
#include "DatabaseIcons.h"
#include "Group.h"
#include "Metadata.h"
Entry::Entry()
{
@ -37,15 +39,13 @@ Uuid Entry::uuid() const
return m_uuid;
}
QImage Entry::icon() const
QIcon Entry::icon() const
{
Q_ASSERT(m_iconNumber != 0 || !m_customIcon.isNull());
if (m_iconNumber == 0) {
return m_db->customIcon(m_customIcon);
if (m_customIcon.isNull()) {
return DatabaseIcons::icon(m_iconNumber);
}
else {
return Database::icon(m_iconNumber);
return m_db->metadata()->customIcon(m_customIcon);
}
}