diff options
Diffstat (limited to 'src/gui/group/EditGroupWidget.cpp')
| -rw-r--r-- | src/gui/group/EditGroupWidget.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/gui/group/EditGroupWidget.cpp b/src/gui/group/EditGroupWidget.cpp index 30d8fb913..b77e49864 100644 --- a/src/gui/group/EditGroupWidget.cpp +++ b/src/gui/group/EditGroupWidget.cpp @@ -20,8 +20,8 @@ #include "ui_EditGroupWidgetMain.h" #include "core/Config.h" -#include "core/FilePath.h" #include "core/Metadata.h" +#include "core/Resources.h" #include "gui/EditWidgetIcons.h" #include "gui/EditWidgetProperties.h" #include "gui/MessageBox.h" @@ -69,12 +69,12 @@ EditGroupWidget::EditGroupWidget(QWidget* parent) { m_mainUi->setupUi(m_editGroupWidgetMain); - addPage(tr("Group"), FilePath::instance()->icon("actions", "document-edit"), m_editGroupWidgetMain); - addPage(tr("Icon"), FilePath::instance()->icon("apps", "preferences-desktop-icons"), m_editGroupWidgetIcons); + addPage(tr("Group"), Resources::instance()->icon("document-edit"), m_editGroupWidgetMain); + addPage(tr("Icon"), Resources::instance()->icon("preferences-desktop-icons"), m_editGroupWidgetIcons); #if defined(WITH_XC_KEESHARE) addEditPage(new EditGroupPageKeeShare(this)); #endif - addPage(tr("Properties"), FilePath::instance()->icon("actions", "document-properties"), m_editWidgetProperties); + addPage(tr("Properties"), Resources::instance()->icon("document-properties"), m_editWidgetProperties); connect(m_mainUi->expireCheck, SIGNAL(toggled(bool)), m_mainUi->expireDatePicker, SLOT(setEnabled(bool))); connect(m_mainUi->autoTypeSequenceCustomRadio, @@ -153,7 +153,7 @@ void EditGroupWidget::loadGroup(Group* group, bool create, const QSharedPointer< } m_mainUi->autoTypeSequenceCustomEdit->setText(group->effectiveAutoTypeSequence()); - if (config()->get("GUI/MonospaceNotes", false).toBool()) { + if (config()->get(Config::GUI_MonospaceNotes).toBool()) { m_mainUi->editNotes->setFont(Font::fixedFont()); } else { m_mainUi->editNotes->setFont(Font::defaultFont()); @@ -236,7 +236,7 @@ void EditGroupWidget::apply() void EditGroupWidget::cancel() { - if (!m_group->iconUuid().isNull() && !m_db->metadata()->containsCustomIcon(m_group->iconUuid())) { + if (!m_group->iconUuid().isNull() && !m_db->metadata()->hasCustomIcon(m_group->iconUuid())) { m_group->setIcon(Entry::DefaultIconNumber); } |