From 14af79932abd6a2940d980b742a8a6073bf172d6 Mon Sep 17 00:00:00 2001 From: Alessandro Portale Date: Sat, 2 Apr 2016 01:44:19 +0200 Subject: [PATCH] Core: Dedicated lock/unlock icons for toolbar and documents view This change enables us to have a variation of the lock icon for toolbars and for non-toolbars. This gives removes the need for an outlined locked icon which would work on dark and light backgrounds. Change-Id: I5b825b11e892928515112f6f49b1b0639862bc42 Reviewed-by: Alessandro Portale --- src/plugins/coreplugin/core.qrc | 2 -- src/plugins/coreplugin/coreicons.cpp | 9 +++--- src/plugins/coreplugin/coreicons.h | 3 +- .../editormanager/documentmodel.cpp | 27 +++++++----------- .../coreplugin/editormanager/documentmodel.h | 2 -- src/plugins/coreplugin/editortoolbar.cpp | 6 ++-- .../coreplugin/images/lockedbackground.png | Bin 151 -> 0 bytes .../coreplugin/images/lockedbackground@2x.png | Bin 164 -> 0 bytes src/tools/icons/qtcreatoricons.svg | 24 +--------------- 9 files changed, 22 insertions(+), 51 deletions(-) delete mode 100644 src/plugins/coreplugin/images/lockedbackground.png delete mode 100644 src/plugins/coreplugin/images/lockedbackground@2x.png diff --git a/src/plugins/coreplugin/core.qrc b/src/plugins/coreplugin/core.qrc index b5a3a862b38..291038d870f 100644 --- a/src/plugins/coreplugin/core.qrc +++ b/src/plugins/coreplugin/core.qrc @@ -24,8 +24,6 @@ images/linkicon@2x.png images/locked.png images/locked@2x.png - images/lockedbackground.png - images/lockedbackground@2x.png images/magnifier.png images/magnifier@2x.png images/minus.png diff --git a/src/plugins/coreplugin/coreicons.cpp b/src/plugins/coreplugin/coreicons.cpp index d0f88817fa3..827caa16a65 100644 --- a/src/plugins/coreplugin/coreicons.cpp +++ b/src/plugins/coreplugin/coreicons.cpp @@ -52,11 +52,12 @@ const Icon RESET( QLatin1String(":/core/images/reset.png")); const Icon DARK_CLOSE( QLatin1String(":/core/images/darkclose.png")); +const Icon LOCKED_TOOLBAR({ + {QLatin1String(":/core/images/locked.png"), Theme::IconsBaseColor}}); const Icon LOCKED({ - {QLatin1String(":/core/images/lockedbackground.png"), Theme::PanelStatusBarBackgroundColor}, - {QLatin1String(":/core/images/locked.png"), Theme::IconsBaseColor}}, Icon::Tint); -const Icon UNLOCKED({ - {QLatin1String(":/core/images/unlocked.png"), Theme::IconsDisabledColor}}, Icon::Tint); + {QLatin1String(":/core/images/locked.png"), Theme::PanelTextColorDark}}, Icon::Tint); +const Icon UNLOCKED_TOOLBAR({ + {QLatin1String(":/core/images/unlocked.png"), Theme::IconsBaseColor}}); const Icon FIND_CASE_INSENSITIVELY( QLatin1String(":/find/images/casesensitively.png")); const Icon FIND_WHOLE_WORD( diff --git a/src/plugins/coreplugin/coreicons.h b/src/plugins/coreplugin/coreicons.h index c0a3ee6fcf0..1aa28d0244f 100644 --- a/src/plugins/coreplugin/coreicons.h +++ b/src/plugins/coreplugin/coreicons.h @@ -44,8 +44,9 @@ CORE_EXPORT extern const Utils::Icon CUT; CORE_EXPORT extern const Utils::Icon DIR; CORE_EXPORT extern const Utils::Icon RESET; CORE_EXPORT extern const Utils::Icon DARK_CLOSE; +CORE_EXPORT extern const Utils::Icon LOCKED_TOOLBAR; CORE_EXPORT extern const Utils::Icon LOCKED; -CORE_EXPORT extern const Utils::Icon UNLOCKED; +CORE_EXPORT extern const Utils::Icon UNLOCKED_TOOLBAR; CORE_EXPORT extern const Utils::Icon FIND_CASE_INSENSITIVELY; CORE_EXPORT extern const Utils::Icon FIND_WHOLE_WORD; CORE_EXPORT extern const Utils::Icon FIND_REGEXP; diff --git a/src/plugins/coreplugin/editormanager/documentmodel.cpp b/src/plugins/coreplugin/editormanager/documentmodel.cpp index 03da7fadc51..efdcf8bace5 100644 --- a/src/plugins/coreplugin/editormanager/documentmodel.cpp +++ b/src/plugins/coreplugin/editormanager/documentmodel.cpp @@ -48,7 +48,6 @@ class DocumentModelPrivate : public QAbstractItemModel Q_OBJECT public: - DocumentModelPrivate(); ~DocumentModelPrivate(); int columnCount(const QModelIndex &parent = QModelIndex()) const; @@ -70,6 +69,8 @@ public: bool disambiguateDisplayNames(DocumentModel::Entry *entry); + static QIcon lockedIcon(); + private: friend class DocumentModel; void itemChanged(); @@ -101,20 +102,11 @@ private: } }; - const QIcon m_lockedIcon; - const QIcon m_unlockedIcon; - QList m_entries; QMap > m_editors; QHash m_entryByFixedPath; }; -DocumentModelPrivate::DocumentModelPrivate() : - m_lockedIcon(Icons::LOCKED.icon()), - m_unlockedIcon(Icons::UNLOCKED.icon()) -{ -} - DocumentModelPrivate::~DocumentModelPrivate() { qDeleteAll(m_entries); @@ -150,12 +142,7 @@ void DocumentModel::destroy() QIcon DocumentModel::lockedIcon() { - return d->m_lockedIcon; -} - -QIcon DocumentModel::unlockedIcon() -{ - return d->m_unlockedIcon; + return DocumentModelPrivate::lockedIcon(); } QAbstractItemModel *DocumentModel::model() @@ -340,6 +327,12 @@ bool DocumentModelPrivate::disambiguateDisplayNames(DocumentModel::Entry *entry) return true; } +QIcon DocumentModelPrivate::lockedIcon() +{ + const static QIcon icon = Icons::LOCKED.icon(); + return icon; +} + int DocumentModelPrivate::indexOfFilePath(const Utils::FileName &filePath) const { if (filePath.isEmpty()) @@ -535,7 +528,7 @@ QVariant DocumentModelPrivate::data(const QModelIndex &index, int role) const return name; } case Qt::DecorationRole: - return e->document->isFileReadOnly() ? m_lockedIcon : QIcon(); + return e->document->isFileReadOnly() ? lockedIcon() : QIcon(); case Qt::ToolTipRole: return e->fileName().isEmpty() ? e->displayName() : e->fileName().toUserOutput(); default: diff --git a/src/plugins/coreplugin/editormanager/documentmodel.h b/src/plugins/coreplugin/editormanager/documentmodel.h index 122e9330d31..c79a98b71f9 100644 --- a/src/plugins/coreplugin/editormanager/documentmodel.h +++ b/src/plugins/coreplugin/editormanager/documentmodel.h @@ -48,8 +48,6 @@ public: static void destroy(); static QIcon lockedIcon(); - static QIcon unlockedIcon(); - static QAbstractItemModel *model(); struct CORE_EXPORT Entry { diff --git a/src/plugins/coreplugin/editortoolbar.cpp b/src/plugins/coreplugin/editortoolbar.cpp index 26ad0b5d7c4..c472c8c29c4 100644 --- a/src/plugins/coreplugin/editortoolbar.cpp +++ b/src/plugins/coreplugin/editortoolbar.cpp @@ -413,11 +413,13 @@ void EditorToolBar::updateDocumentStatus(IDocument *document) d->m_lockButton->setEnabled(false); d->m_lockButton->setToolTip(QString()); } else if (document->isFileReadOnly()) { - d->m_lockButton->setIcon(DocumentModel::lockedIcon()); + const static QIcon locked = Icons::LOCKED_TOOLBAR.icon(); + d->m_lockButton->setIcon(locked); d->m_lockButton->setEnabled(true); d->m_lockButton->setToolTip(tr("Make Writable")); } else { - d->m_lockButton->setIcon(DocumentModel::unlockedIcon()); + const static QIcon unlocked = Icons::UNLOCKED_TOOLBAR.icon(); + d->m_lockButton->setIcon(unlocked); d->m_lockButton->setEnabled(false); d->m_lockButton->setToolTip(tr("File is writable")); } diff --git a/src/plugins/coreplugin/images/lockedbackground.png b/src/plugins/coreplugin/images/lockedbackground.png deleted file mode 100644 index 731a9403df0bcd6a37452d073f5a628e7d4bbcc3..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 151 zcmeAS@N?(olHy`uVBq!ia0y~yU=RRd7G?$phPQVgfdu3Nd_r6q7#J8C8Ch6Z`1ts& ztgLKoY&LG(xOMB+!-o(5|NnnwWzJy+1_l#P7sn8e=;RrktUSi)e*9)@S&W4wC5{~6 zVP|6#GjMKP+{k$*;lUgRrF6dp1|~l(qXi5M2a`1IenoKqVPIfj@O1TaS?83{1ON;- BDYgIr diff --git a/src/plugins/coreplugin/images/lockedbackground@2x.png b/src/plugins/coreplugin/images/lockedbackground@2x.png deleted file mode 100644 index f322a45a425b30165700950c1eb213ed3d1d821b..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 164 zcmeAS@N?(olHy`uVBq!ia0y~yU{C;I4h9AWhA=@@4F(2=Y)==*5R22vKl~XCCM7CI*xSSPh_)Vy)_6a)L3-G-tyQxY7QgyaoHz8EcNh~r_swt{Po zp~#2Eqs;Mpxmb)V3`HDF?Ee1$ui4V-%&65Z!pakIU`10P>l5t-3gyfUu4kpSbge`G PfUNg)^>bP0l+XkKH?A}8 diff --git a/src/tools/icons/qtcreatoricons.svg b/src/tools/icons/qtcreatoricons.svg index b55acf4ef92..e325bb9ab5a 100644 --- a/src/tools/icons/qtcreatoricons.svg +++ b/src/tools/icons/qtcreatoricons.svg @@ -1984,31 +1984,9 @@ d="m 301,559 0,7 8,0 0,-7 -8,0 z m 4.5,3.847 0,1.153 -1,0 0,-1.153 c -0.293,-0.175 -0.5,-0.48 -0.5,-0.847 0,-0.553 0.448,-1 1,-1 0.552,0 1,0.447 1,1 0,0.366 -0.207,0.672 -0.5,0.847 z" id="lockbody" /> - - - - - + transform="translate(-16,16)">