Move icon handling from Resources to gui/Icons (#5506)

This commit is contained in:
louib 2020-10-05 20:41:00 -04:00 committed by GitHub
parent ba8611cf4c
commit af4ecb4aa1
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
39 changed files with 411 additions and 325 deletions

View file

@ -24,9 +24,9 @@
#include <QDir>
#include "core/Config.h"
#include "core/Resources.h"
#include "entry/EntryAttachmentsModel.h"
#include "gui/Clipboard.h"
#include "gui/Icons.h"
#if defined(WITH_XC_KEESHARE)
#include "keeshare/KeeShare.h"
#endif
@ -48,11 +48,11 @@ EntryPreviewWidget::EntryPreviewWidget(QWidget* parent)
m_ui->setupUi(this);
// Entry
m_ui->entryTotpButton->setIcon(resources()->icon("chronometer"));
m_ui->entryCloseButton->setIcon(resources()->icon("dialog-close"));
m_ui->togglePasswordButton->setIcon(resources()->onOffIcon("password-show"));
m_ui->toggleEntryNotesButton->setIcon(resources()->onOffIcon("password-show"));
m_ui->toggleGroupNotesButton->setIcon(resources()->onOffIcon("password-show"));
m_ui->entryTotpButton->setIcon(icons()->icon("chronometer"));
m_ui->entryCloseButton->setIcon(icons()->icon("dialog-close"));
m_ui->togglePasswordButton->setIcon(icons()->onOffIcon("password-show"));
m_ui->toggleEntryNotesButton->setIcon(icons()->onOffIcon("password-show"));
m_ui->toggleGroupNotesButton->setIcon(icons()->onOffIcon("password-show"));
m_ui->entryAttachmentsWidget->setReadOnly(true);
m_ui->entryAttachmentsWidget->setButtonsVisible(false);
@ -83,7 +83,7 @@ EntryPreviewWidget::EntryPreviewWidget(QWidget* parent)
});
// Group
m_ui->groupCloseButton->setIcon(resources()->icon("dialog-close"));
m_ui->groupCloseButton->setIcon(icons()->icon("dialog-close"));
connect(m_ui->groupCloseButton, SIGNAL(clicked()), SLOT(hide()));
connect(m_ui->groupTabWidget, SIGNAL(tabBarClicked(int)), SLOT(updateTabIndexes()), Qt::QueuedConnection);