Branch: master

f55ac6e4 2014-10-12 17:50:03 Timothy Pearson
Bring stop, lock, exit, and run icons into XDG compliance
M kipi-plugins/findimages/finddupplicatedialog.cpp
M kipi-plugins/gpssync/gpslistviewitem.cpp
M kipi-plugins/slideshow/toolbar.cpp
diff --git a/kipi-plugins/findimages/finddupplicatedialog.cpp b/kipi-plugins/findimages/finddupplicatedialog.cpp
index f297e66..b4ecdf8 100644
--- a/kipi-plugins/findimages/finddupplicatedialog.cpp
+++ b/kipi-plugins/findimages/finddupplicatedialog.cpp
@@ -138,7 +138,7 @@
 {
     TQString whatsThis;
     page_setupMethod = addPage( i18n("Method & Cache"), i18n("Find-Duplicates Method & Cache Configuration"),
-                                BarIcon("run", TDEIcon::SizeMedium ) );
+                                BarIcon("system-run", TDEIcon::SizeMedium ) );
 
     TQVBoxLayout *vlay = new TQVBoxLayout( page_setupMethod, 0, spacingHint() );
 
diff --git a/kipi-plugins/gpssync/gpslistviewitem.cpp b/kipi-plugins/gpssync/gpslistviewitem.cpp
index 5e0a8e2..551729e 100644
--- a/kipi-plugins/gpssync/gpslistviewitem.cpp
+++ b/kipi-plugins/gpssync/gpslistviewitem.cpp
@@ -170,7 +170,7 @@
 {
     if (isEnabled() && isDirty())
     {
-        setPixmap(1, SmallIcon("run"));
+        setPixmap(1, SmallIcon("system-run"));
         KExiv2Iface::KExiv2 exiv2Iface;
         bool ret = exiv2Iface.load(d->url.path());
 
diff --git a/kipi-plugins/slideshow/toolbar.cpp b/kipi-plugins/slideshow/toolbar.cpp
index df84523..87086d7 100644
--- a/kipi-plugins/slideshow/toolbar.cpp
+++ b/kipi-plugins/slideshow/toolbar.cpp
@@ -55,7 +55,7 @@
     m_playBtn->setIconSet(loader->loadIcon("player_pause", TDEIcon::NoGroup, 22));
     m_prevBtn->setIconSet(loader->loadIcon("back", TDEIcon::NoGroup, 22));
     m_nextBtn->setIconSet(loader->loadIcon("forward", TDEIcon::NoGroup, 22));
-    m_stopBtn->setIconSet(loader->loadIcon("stop", TDEIcon::NoGroup, 22));
+    m_stopBtn->setIconSet(loader->loadIcon("process-stop", TDEIcon::NoGroup, 22));
 
     lay->addWidget(m_playBtn);
     lay->addWidget(m_prevBtn);
83276d58 2014-10-12 17:55:57 Timothy Pearson
Merge branch 'master' of http://scm.trinitydesktop.org/scm/git/kipi-plugins
M cmake
diff --git a/cmake b/cmake
index 0d5ca8b..08c6f54 160000
--- a/cmake
+++ b/cmake
-Subproject commit 0d5ca8bebbb638b05f1d11537ce41fcf73d10ac9
+Subproject commit 08c6f54d6f80554caa671847417cf04326adb63c