Commit 56425ba1 authored by Waqar Ahmed's avatar Waqar Ahmed
Browse files

Move icons to /icons

parent d830fd16
...@@ -44,7 +44,7 @@ QVariant BranchesDialogModel::data(const QModelIndex &idx, int role) const ...@@ -44,7 +44,7 @@ QVariant BranchesDialogModel::data(const QModelIndex &idx, int role) const
} else if (role == Role::OriginalSorting) { } else if (role == Role::OriginalSorting) {
return branch.dateSort; return branch.dateSort;
} else if (role == Qt::DecorationRole) { } else if (role == Qt::DecorationRole) {
static const auto branchIcon = QIcon(QStringLiteral(":/kxmlgui5/kateproject/sc-apps-git.svg")); static const auto branchIcon = QIcon(QStringLiteral(":/icons/icons/sc-apps-git.svg"));
return branchIcon; return branchIcon;
} else if (role == Role::CheckoutName) { } else if (role == Role::CheckoutName) {
return branch.refType == GitUtils::RefType::Remote ? branch.name.mid(branch.remote.size() + 1) : branch.name; return branch.refType == GitUtils::RefType::Remote ? branch.name.mid(branch.remote.size() + 1) : branch.name;
......
...@@ -91,7 +91,7 @@ QVariant GitStatusModel::data(const QModelIndex &index, int role) const ...@@ -91,7 +91,7 @@ QVariant GitStatusModel::data(const QModelIndex &index, int role) const
bold.setBold(true); bold.setBold(true);
return bold; return bold;
} else if (role == Qt::DecorationRole) { } else if (role == Qt::DecorationRole) {
static const auto branchIcon = QIcon(QStringLiteral(":/kxmlgui5/kateproject/sc-apps-git.svg")); static const auto branchIcon = QIcon(QStringLiteral(":/icons/icons/sc-apps-git.svg"));
return branchIcon; return branchIcon;
} else if (role == Role::TreeItemType) { } else if (role == Role::TreeItemType) {
return NodeStage + row; return NodeStage + row;
......
...@@ -61,8 +61,8 @@ KateProjectView::KateProjectView(KateProjectPluginView *pluginView, KateProject ...@@ -61,8 +61,8 @@ KateProjectView::KateProjectView(KateProjectPluginView *pluginView, KateProject
}); });
m_branchBtn->setText(GitUtils::getCurrentBranchName(m_project->baseDir())); m_branchBtn->setText(GitUtils::getCurrentBranchName(m_project->baseDir()));
m_branchBtn->setIcon(QIcon(QStringLiteral(":/kxmlgui5/kateproject/sc-apps-git.svg"))); m_branchBtn->setIcon(QIcon(QStringLiteral(":/icons/icons/sc-apps-git.svg")));
m_gitBtn->setIcon(QIcon(QStringLiteral(":/kxmlgui5/kateproject/sc-apps-git.svg"))); m_gitBtn->setIcon(QIcon(QStringLiteral(":/icons/icons/sc-apps-git.svg")));
// let tree get focus for keyboard selection of file to open // let tree get focus for keyboard selection of file to open
setFocusProxy(m_treeView); setFocusProxy(m_treeView);
......
<RCC> <RCC>
<qresource prefix="/kxmlgui5/kateproject"> <qresource prefix="/kxmlgui5/kateproject">
<file>ui.rc</file> <file>ui.rc</file>
<file>sc-apps-git.svg</file> </qresource>
<file>git-commit-dark.svg</file> <qresource prefix="/icons">
<file>icons/git-commit-dark.svg</file>
<file>icons/sc-apps-git.svg</file>
</qresource> </qresource>
</RCC> </RCC>
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment