Hello community, here is the log from the commit of package dolphin-plugins for openSUSE:Factory checked in at 2016-08-31 00:06:19 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/dolphin-plugins (Old) and /work/SRC/openSUSE:Factory/.dolphin-plugins.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "dolphin-plugins" Changes: -------- --- /work/SRC/openSUSE:Factory/dolphin-plugins/dolphin-plugins.changes 2016-07-24 19:44:19.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.dolphin-plugins.new/dolphin-plugins.changes 2016-08-31 00:06:21.000000000 +0200 @@ -1,0 +2,16 @@ +Fri Aug 12 10:02:39 UTC 2016 - tittiatc...@gmail.com + +- Update to KDE Applications 16.08.0 + * KDE Applications 16.08.0 + * https://www.kde.org/announcements/announce-applications-16.08.0.php + + +------------------------------------------------------------------- +Mon Aug 8 14:33:33 UTC 2016 - tittiatc...@gmail.com + +- Update to KDE Applications 16.07.90 + * KDE Applications 16.07.90 (16.08-RC) + * https://www.kde.org/announcements/announce-applications-16.07.90.php + + +------------------------------------------------------------------- Old: ---- dolphin-plugins-16.04.3.tar.xz New: ---- dolphin-plugins-16.08.0.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ dolphin-plugins.spec ++++++ --- /var/tmp/diff_new_pack.buTszZ/_old 2016-08-31 00:06:22.000000000 +0200 +++ /var/tmp/diff_new_pack.buTszZ/_new 2016-08-31 00:06:22.000000000 +0200 @@ -17,7 +17,7 @@ Name: dolphin-plugins -Version: 16.04.3 +Version: 16.08.0 Release: 0 Summary: Version control plugins for Dolphin License: GPL-2.0+ ++++++ dolphin-plugins-16.04.3.tar.xz -> dolphin-plugins-16.08.0.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/dolphin-plugins-16.04.3/bazaar/fileviewbazaarplugin.desktop new/dolphin-plugins-16.08.0/bazaar/fileviewbazaarplugin.desktop --- old/dolphin-plugins-16.04.3/bazaar/fileviewbazaarplugin.desktop 2015-12-29 11:14:52.000000000 +0100 +++ new/dolphin-plugins-16.08.0/bazaar/fileviewbazaarplugin.desktop 2016-07-10 11:32:21.000000000 +0200 @@ -17,6 +17,7 @@ Name[fr]=Bazaar Name[gl]=Bazaar Name[hu]=Bazaar +Name[is]=Bazaar Name[it]=Bazaar Name[kk]=Bazaar Name[ko]=Bazaar diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/dolphin-plugins-16.04.3/dropbox/fileviewdropboxplugin.desktop new/dolphin-plugins-16.08.0/dropbox/fileviewdropboxplugin.desktop --- old/dolphin-plugins-16.04.3/dropbox/fileviewdropboxplugin.desktop 2015-12-29 11:14:52.000000000 +0100 +++ new/dolphin-plugins-16.08.0/dropbox/fileviewdropboxplugin.desktop 2016-07-10 11:32:21.000000000 +0200 @@ -16,6 +16,7 @@ Name[fr]=DropBox Name[gl]=Dropbox Name[hu]=Dropbox +Name[is]=Dropbox Name[it]=Dropbox Name[ko]=Dropbox Name[lt]=Dropbox @@ -36,6 +37,7 @@ Name[tr]=Dropbox Name[uk]=Dropbox Name[x-test]=xxDropboxxx +Name[zh_CN]=Dropbox Name[zh_TW]=Dropbox X-KDE-ServiceTypes=FileViewVersionControlPlugin MimeType=text/plain; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/dolphin-plugins-16.04.3/git/fileviewgitplugin.cpp new/dolphin-plugins-16.08.0/git/fileviewgitplugin.cpp --- old/dolphin-plugins-16.04.3/git/fileviewgitplugin.cpp 2015-12-29 11:14:52.000000000 +0100 +++ new/dolphin-plugins-16.08.0/git/fileviewgitplugin.cpp 2016-07-10 11:32:21.000000000 +0200 @@ -29,6 +29,8 @@ #include <KLocalizedString> #include <KUrl> +#include <KRun> +#include <KShell> #include <KPluginFactory> #include <QTemporaryFile> @@ -53,12 +55,24 @@ { Q_UNUSED(args); + m_revertAction = new QAction(this); + m_revertAction->setIcon(QIcon::fromTheme("document-revert")); + m_revertAction->setText(xi18nd("@action:inmenu", "<application>Git</application> Revert")); + connect(m_revertAction, SIGNAL(triggered()), + this, SLOT(revertFiles())); + m_addAction = new QAction(this); m_addAction->setIcon(QIcon::fromTheme("list-add")); m_addAction->setText(xi18nd("@action:inmenu", "<application>Git</application> Add")); connect(m_addAction, SIGNAL(triggered()), this, SLOT(addFiles())); + m_showLocalChangesAction = new QAction(this); + m_showLocalChangesAction->setIcon(QIcon::fromTheme("view-split-left-right")); + m_showLocalChangesAction->setText(xi18nd("@item:inmenu", "Show Local <application>Git</application> Changes")); + connect(m_showLocalChangesAction, SIGNAL(triggered()), + this, SLOT(showLocalChanges())); + m_removeAction = new QAction(this); m_removeAction->setIcon(QIcon::fromTheme("list-remove")); m_removeAction->setText(xi18nd("@action:inmenu", "<application>Git</application> Remove")); @@ -281,6 +295,7 @@ //see which actions should be enabled int versionedCount = 0; int addableCount = 0; + int revertCount = 0; foreach(const KFileItem& item, items){ const ItemVersion state = itemVersion(item); if (state != UnversionedVersion && state != RemovedVersion && @@ -291,19 +306,26 @@ state == IgnoredVersion) { ++addableCount; } + if (state == LocallyModifiedVersion || state == LocallyModifiedUnstagedVersion || + state == ConflictingVersion) { + ++revertCount; + } } m_addAction->setEnabled(addableCount == items.count()); + m_revertAction->setEnabled(revertCount == items.count()); m_removeAction->setEnabled(versionedCount == items.count()); } else{ m_addAction->setEnabled(false); + m_revertAction->setEnabled(false); m_removeAction->setEnabled(false); } QList<QAction*> actions; actions.append(m_addAction); actions.append(m_removeAction); + actions.append(m_revertAction); return actions; } @@ -317,19 +339,27 @@ actions.append(m_checkoutAction); bool canCommit = false; + bool showChanges = false; QHash<QString, ItemVersion>::const_iterator it = m_versionInfoHash.constBegin(); while (it != m_versionInfoHash.constEnd()) { const ItemVersion state = it.value(); if (state == LocallyModifiedVersion || state == AddedVersion || state == RemovedVersion) { canCommit = true; } + if (state == LocallyModifiedUnstagedVersion || state == LocallyModifiedVersion) { + showChanges = true; + } if (state == ConflictingVersion) { canCommit = false; + showChanges = true; break; } ++it; } + m_showLocalChangesAction->setEnabled(!m_pendingOperation && showChanges); + actions.append(m_showLocalChangesAction); + m_commitAction->setEnabled(!m_pendingOperation && canCommit); actions.append(m_commitAction); @@ -360,7 +390,21 @@ xi18nd("@info:status", "Removing files from <application>Git</application> repository..."), xi18nd("@info:status", "Removing files from <application>Git</application> repository failed."), xi18nd("@info:status", "Removed files from <application>Git</application> repository.")); +} + +void FileViewGitPlugin::revertFiles() +{ + execGitCommand(QLatin1String("checkout -- "), QStringList(), + xi18nd("@info:status", "Reverting files from <application>Git</application> repository..."), + xi18nd("@info:status", "Reverting files from <application>Git</application> repository failed."), + xi18nd("@info:status", "Reverted files from <application>Git</application> repository.")); +} + +void FileViewGitPlugin::showLocalChanges() +{ + Q_ASSERT(!m_contextDir.isEmpty()); + KRun::runCommand(QLatin1String("git difftool --dir-diff ."), nullptr, m_contextDir); } void FileViewGitPlugin::checkout() diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/dolphin-plugins-16.04.3/git/fileviewgitplugin.desktop new/dolphin-plugins-16.08.0/git/fileviewgitplugin.desktop --- old/dolphin-plugins-16.04.3/git/fileviewgitplugin.desktop 2015-12-29 11:14:52.000000000 +0100 +++ new/dolphin-plugins-16.08.0/git/fileviewgitplugin.desktop 2016-07-10 11:32:21.000000000 +0200 @@ -19,6 +19,7 @@ Name[ga]=Git Name[gl]=Git Name[hu]=Git +Name[is]=Git Name[it]=Git Name[kk]=Git Name[km]=Git diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/dolphin-plugins-16.04.3/git/fileviewgitplugin.h new/dolphin-plugins-16.08.0/git/fileviewgitplugin.h --- old/dolphin-plugins-16.04.3/git/fileviewgitplugin.h 2015-12-29 11:14:52.000000000 +0100 +++ new/dolphin-plugins-16.08.0/git/fileviewgitplugin.h 2016-07-10 11:32:21.000000000 +0200 @@ -48,6 +48,8 @@ private slots: void addFiles(); + void revertFiles(); + void showLocalChanges(); void removeFiles(); void checkout(); void commit(); @@ -102,6 +104,8 @@ */ QHash<QString, ItemVersion> m_versionInfoHash; QAction* m_addAction; + QAction* m_revertAction; + QAction* m_showLocalChangesAction; QAction* m_removeAction; QAction* m_checkoutAction; QAction* m_commitAction; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/dolphin-plugins-16.04.3/hg/fileviewhgplugin.desktop new/dolphin-plugins-16.08.0/hg/fileviewhgplugin.desktop --- old/dolphin-plugins-16.04.3/hg/fileviewhgplugin.desktop 2015-12-29 11:14:52.000000000 +0100 +++ new/dolphin-plugins-16.08.0/hg/fileviewhgplugin.desktop 2016-07-10 11:32:21.000000000 +0200 @@ -17,6 +17,7 @@ Name[fr]=Mercurial Name[gl]=Mercurial Name[hu]=Mercurial +Name[is]=Mercurial Name[it]=Mercurial Name[kk]=Mercurial Name[ko]=Mercurial diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/dolphin-plugins-16.04.3/svn/fileviewsvnplugin.desktop new/dolphin-plugins-16.08.0/svn/fileviewsvnplugin.desktop --- old/dolphin-plugins-16.04.3/svn/fileviewsvnplugin.desktop 2015-12-29 11:14:52.000000000 +0100 +++ new/dolphin-plugins-16.08.0/svn/fileviewsvnplugin.desktop 2016-07-10 11:32:21.000000000 +0200 @@ -20,6 +20,7 @@ Name[ga]=Subversion Name[gl]=Subversion Name[hu]=Subversion +Name[is]=Subversion Name[it]=Subversion Name[kk]=Subversion Name[km]=កំណែរង
