Commit 4549db02 authored by Eric Armbruster's avatar Eric Armbruster
Browse files

Use vcs icons where possible

parent 11c7e249
Pipeline #203576 failed with stage
in 33 seconds
......@@ -46,19 +46,18 @@ FileViewBazaarPlugin::FileViewBazaarPlugin(QObject* parent, const QList<QVariant
Q_UNUSED(args);
m_updateAction = new QAction(this);
m_updateAction->setIcon(QIcon::fromTheme("go-down"));
m_updateAction->setText(i18nc("@item:inmenu", "Bazaar Update"));
connect(m_updateAction, &QAction::triggered,
this, &FileViewBazaarPlugin::updateFiles);
m_pullAction = new QAction(this);
m_pullAction->setIcon(QIcon::fromTheme("go-bottom"));
m_pullAction->setIcon(QIcon::fromTheme("vcs-pull"));
m_pullAction->setText(i18nc("@item:inmenu", "Bazaar Pull"));
connect(m_pullAction, &QAction::triggered,
this, &FileViewBazaarPlugin::pullFiles);
m_pushAction = new QAction(this);
m_pushAction->setIcon(QIcon::fromTheme("go-top"));
m_pushAction->setIcon(QIcon::fromTheme("vcs-push"));
m_pushAction->setText(i18nc("@item:inmenu", "Bazaar Push"));
connect(m_pushAction, &QAction::triggered,
this, &FileViewBazaarPlugin::pushFiles);
......@@ -70,7 +69,7 @@ FileViewBazaarPlugin::FileViewBazaarPlugin(QObject* parent, const QList<QVariant
this, &FileViewBazaarPlugin::showLocalChanges);
m_commitAction = new QAction(this);
m_commitAction->setIcon(QIcon::fromTheme("svn-commit"));
m_commitAction->setIcon(QIcon::fromTheme("vcs-commit"));
m_commitAction->setText(i18nc("@item:inmenu", "Bazaar Commit..."));
connect(m_commitAction, &QAction::triggered,
this, &FileViewBazaarPlugin::commitFiles);
......@@ -467,7 +466,7 @@ void FileViewBazaarPlugin::execBazaarCommand(const QString& command,
Q_EMIT infoMessage("Please Install QBzr");
return;
}
m_command = command;
m_arguments = arguments;
m_errorMsg = errorMsg;
......
......@@ -57,7 +57,7 @@ FileViewGitPlugin::FileViewGitPlugin(QObject* parent, const QList<QVariant>& arg
this, &FileViewGitPlugin::addFiles);
m_showLocalChangesAction = new QAction(this);
m_showLocalChangesAction->setIcon(QIcon::fromTheme("view-split-left-right"));
m_showLocalChangesAction->setIcon(QIcon::fromTheme("vcs-diff"));
m_showLocalChangesAction->setText(xi18nd("@item:inmenu", "Show Local <application>Git</application> Changes"));
connect(m_showLocalChangesAction, &QAction::triggered,
this, &FileViewGitPlugin::showLocalChanges);
......@@ -69,13 +69,13 @@ FileViewGitPlugin::FileViewGitPlugin(QObject* parent, const QList<QVariant>& arg
this, &FileViewGitPlugin::removeFiles);
m_checkoutAction = new QAction(this);
// m_checkoutAction->setIcon(QIcon::fromTheme("svn_switch")); does not exist in normal kde SC
m_checkoutAction->setIcon(QIcon::fromTheme("vcs-branch"));
m_checkoutAction->setText(xi18nd("@action:inmenu", "<application>Git</application> Checkout..."));
connect(m_checkoutAction, &QAction::triggered,
this, &FileViewGitPlugin::checkout);
m_commitAction = new QAction(this);
m_commitAction->setIcon(QIcon::fromTheme("svn-commit"));
m_commitAction->setIcon(QIcon::fromTheme("vcs-commit"));
m_commitAction->setText(xi18nd("@action:inmenu", "<application>Git</application> Commit..."));
connect(m_commitAction, &QAction::triggered,
this, &FileViewGitPlugin::commit);
......@@ -86,16 +86,17 @@ FileViewGitPlugin::FileViewGitPlugin(QObject* parent, const QList<QVariant>& arg
connect(m_tagAction, &QAction::triggered,
this, &FileViewGitPlugin::createTag);
m_pushAction = new QAction(this);
// m_pushAction->setIcon(QIcon::fromTheme("svn-commit"));
m_pushAction->setIcon(QIcon::fromTheme("vcs-push"));
m_pushAction->setText(xi18nd("@action:inmenu", "<application>Git</application> Push..."));
connect(m_pushAction, &QAction::triggered,
this, &FileViewGitPlugin::push);
m_pullAction = new QAction(this);
m_pullAction->setIcon(QIcon::fromTheme("vcs-pull"));
m_pullAction->setText(xi18nd("@action:inmenu", "<application>Git</application> Pull..."));
connect(m_pullAction, &QAction::triggered,
this, &FileViewGitPlugin::pull);
m_mergeAction = new QAction(this);
m_mergeAction->setIcon(QIcon::fromTheme("merge"));
m_mergeAction->setIcon(QIcon::fromTheme("vcs-merge"));
m_mergeAction->setText(xi18nd("@action:inmenu", "<application>Git</application> Merge..."));
connect(m_mergeAction, &QAction::triggered, this, &FileViewGitPlugin::merge);
......
......@@ -110,7 +110,7 @@ FileViewHgPlugin::FileViewHgPlugin(QObject *parent, const QList<QVariant> &args)
this, &FileViewHgPlugin::renameFile);
m_commitAction = new QAction(this);
m_commitAction->setIcon(QIcon::fromTheme("svn-commit"));
m_commitAction->setIcon(QIcon::fromTheme("vcs-commit"));
m_commitAction->setText(xi18nc("@action:inmenu",
"<application>Hg</application> Commit"));
connect(m_commitAction, &QAction::triggered,
......@@ -124,7 +124,7 @@ FileViewHgPlugin::FileViewHgPlugin(QObject *parent, const QList<QVariant> &args)
this, &FileViewHgPlugin::tag);
m_branchAction = new QAction(this);
m_branchAction->setIcon(QIcon::fromTheme("svn-branch"));
m_branchAction->setIcon(QIcon::fromTheme("vcs-branch"));
m_branchAction->setText(xi18nc("@action:inmenu",
"<application>Hg</application> Branch"));
connect(m_branchAction, &QAction::triggered,
......@@ -145,7 +145,7 @@ FileViewHgPlugin::FileViewHgPlugin(QObject *parent, const QList<QVariant> &args)
this, &FileViewHgPlugin::create);
m_updateAction = new QAction(this);
m_updateAction->setIcon(QIcon::fromTheme("svn-update"));
m_updateAction->setIcon(QIcon::fromTheme("vcs-pull"));
m_updateAction->setText(xi18nc("@action:inmenu",
"<application>Hg</application> Update"));
connect(m_updateAction, &QAction::triggered,
......@@ -166,28 +166,28 @@ FileViewHgPlugin::FileViewHgPlugin(QObject *parent, const QList<QVariant> &args)
this, &FileViewHgPlugin::repo_config);
m_pushAction = new QAction(this);
m_pushAction->setIcon(QIcon::fromTheme("git-push"));
m_pushAction->setIcon(QIcon::fromTheme("vcs-push"));
m_pushAction->setText(xi18nc("@action:inmenu",
"<application>Hg</application> Push"));
connect(m_pushAction, &QAction::triggered,
this, &FileViewHgPlugin::push);
m_pullAction = new QAction(this);
m_pullAction->setIcon(QIcon::fromTheme("git-pull"));
m_pullAction->setIcon(QIcon::fromTheme("vcs-pull"));
m_pullAction->setText(xi18nc("@action:inmenu",
"<application>Hg</application> Pull"));
connect(m_pullAction, &QAction::triggered,
this, &FileViewHgPlugin::pull);
m_revertAction = new QAction(this);
m_revertAction->setIcon(QIcon::fromTheme("hg-revert"));
m_revertAction->setIcon(QIcon::fromTheme("document-revert"));
m_revertAction->setText(xi18nc("@action:inmenu",
"<application>Hg</application> Revert"));
connect(m_revertAction, &QAction::triggered,
this, &FileViewHgPlugin::revert);
m_revertAllAction = new QAction(this);
m_revertAllAction->setIcon(QIcon::fromTheme("hg-revert"));
m_revertAllAction->setIcon(QIcon::fromTheme("document-revert"));
m_revertAllAction->setText(xi18nc("@action:inmenu",
"<application>Hg</application> Revert All"));
connect(m_revertAllAction, &QAction::triggered,
......@@ -201,7 +201,7 @@ FileViewHgPlugin::FileViewHgPlugin(QObject *parent, const QList<QVariant> &args)
this, &FileViewHgPlugin::rollback);
m_mergeAction = new QAction(this);
m_mergeAction->setIcon(QIcon::fromTheme("hg-merge"));
m_mergeAction->setIcon(QIcon::fromTheme("vcs-merge"));
m_mergeAction->setText(xi18nc("@action:inmenu",
"<application>Hg</application> Merge"));
connect(m_mergeAction, &QAction::triggered,
......@@ -250,7 +250,7 @@ FileViewHgPlugin::FileViewHgPlugin(QObject *parent, const QList<QVariant> &args)
this, &FileViewHgPlugin::backout);
m_diffAction = new QAction(this);
m_diffAction->setIcon(QIcon::fromTheme("hg-diff"));
m_diffAction->setIcon(QIcon::fromTheme("vcs-diff"));
m_diffAction->setText(xi18nc("@action:inmenu",
"<application>Hg</application> Diff"));
connect(m_diffAction, &QAction::triggered,
......
......@@ -76,7 +76,7 @@ void HgSyncBaseDialog::setupUI()
m_pathSelector = new HgPathSelector;
// changes button
//FIXME not very good idea. Bad HACK
//FIXME not very good idea. Bad HACK
if (m_dialogType == PullDialog) {
m_changesButton = new QPushButton(i18nc("@label:button",
"Show Incoming Changes"));
......@@ -120,7 +120,7 @@ void HgSyncBaseDialog::setupUI()
okButton()->setText(xi18nc("@action:button",
m_dialogType == PullDialog ? "Pull" : "Push"));
okButton()->setIcon(QIcon::fromTheme(
m_dialogType == PullDialog ? "git-pull" : "git-push"));
m_dialogType == PullDialog ? "vcs-pull" : "vcs-push"));
m_optionsButton = new QPushButton(buttonBox());
m_optionsButton->setIcon(QIcon::fromTheme("help-about"));
switchOptionsButton(true);
......
......@@ -79,7 +79,7 @@ FileViewSvnPlugin::FileViewSvnPlugin(QObject* parent, const QList<QVariant>& arg
this, &FileViewSvnPlugin::showLocalChanges);
m_commitAction = new QAction(this);
m_commitAction->setIcon(QIcon::fromTheme("svn-commit"));
m_commitAction->setIcon(QIcon::fromTheme("vcs-commit"));
m_commitAction->setText(i18nc("@item:inmenu", "SVN Commit..."));
connect(m_commitAction, &QAction::triggered,
this, &FileViewSvnPlugin::commitDialog);
......
Supports Markdown
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