Git-Mirrors/keepassxc
1
0
Fork 0
mirror of https://github.com/keepassxreboot/keepassxc.git synced 2025-11-24 08:43:29 -05: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

10
src/core/Group.cpp
View file

@ -21,6 +21,8 @@
#include "Group.h"
#include "Database.h"
#include "DatabaseIcons.h"
#include "Metadata.h"
Group::Group()
{
@ -48,13 +50,13 @@ QString Group::notes() const
return m_notes;
}
QImage Group::icon() const
QIcon Group::icon() const
{
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);
}
}