Merge branch '2.0'

2016-01-29 17:22:37 +01:00
parent ecfbf72a57 eb56bd8973
commit 71d4cb781d
30 changed files with 569 additions and 40 deletions
--- a/src/gui/entry/EntryModel.cpp
+++ b/src/gui/entry/EntryModel.cpp
@@ -145,7 +145,7 @@ QVariant EntryModel::data(const QModelIndex& index, int role) const
        switch (index.column()) {
        case ParentGroup:
            if (entry->group()) {
-                return entry->group()->iconPixmap();
+                return entry->group()->iconScaledPixmap();
            }
            break;
        case Title:
@@ -153,7 +153,7 @@ QVariant EntryModel::data(const QModelIndex& index, int role) const
                return databaseIcons()->iconPixmap(DatabaseIcons::ExpiredIconIndex);
            }
            else {
-                return entry->iconPixmap();
+                return entry->iconScaledPixmap();
            }
        }
    }