Branch: master

992d2333 2019-06-26 06:58:40 Michele Calgaro
Adjusted to new normalized device icon names in tdelibs.

Signed-off-by: Michele Calgaro <michele.calgaro@...>
M kipi-plugins/cdarchiving/cdarchivingdialog.cpp
M kipi-plugins/ipodexport/plugin_ipodexport.cpp
M kipi-plugins/kameraklient/kameraklient.cpp

kipi-plugins/cdarchiving/cdarchivingdialog.cpp

diff --git a/kipi-plugins/cdarchiving/cdarchivingdialog.cpp b/kipi-plugins/cdarchiving/cdarchivingdialog.cpp
index 39b025a..73a0362 100644
--- a/kipi-plugins/cdarchiving/cdarchivingdialog.cpp
+++ b/kipi-plugins/cdarchiving/cdarchivingdialog.cpp
@@ -500,7 +500,7 @@
 {
     page_burning = addPage( i18n("Media Burning"),
                             i18n("CD/DVD Burning Setup"),
-                            BarIcon("media-optical-cdwriter", TDEIcon::SizeMedium ) );
+                            BarIcon("cd-rw-unmounted", TDEIcon::SizeMedium ) );
 
     TQVBoxLayout *vlay = new TQVBoxLayout( page_burning, 0, spacingHint() );
 

kipi-plugins/ipodexport/plugin_ipodexport.cpp

diff --git a/kipi-plugins/ipodexport/plugin_ipodexport.cpp b/kipi-plugins/ipodexport/plugin_ipodexport.cpp
index 0ff9f9d..d61a424 100644
--- a/kipi-plugins/ipodexport/plugin_ipodexport.cpp
+++ b/kipi-plugins/ipodexport/plugin_ipodexport.cpp
@@ -49,7 +49,7 @@
     KIPI::Plugin::setup( widget );
 
     // this is our action shown in the menubar/toolbar of the mainwindow
-    m_actionImageUpload = new TDEAction( i18n( "Export to iPod..." ), "multimedia-player", 0, this,
+    m_actionImageUpload = new TDEAction( i18n( "Export to iPod..." ), "multimedia-player-unmounted", 0, this,
                                       TQT_SLOT( slotImageUpload() ), actionCollection(), "connectipod");
 
     addAction( m_actionImageUpload );

kipi-plugins/kameraklient/kameraklient.cpp

diff --git a/kipi-plugins/kameraklient/kameraklient.cpp b/kipi-plugins/kameraklient/kameraklient.cpp
index 92e4d3c..966194a 100644
--- a/kipi-plugins/kameraklient/kameraklient.cpp
+++ b/kipi-plugins/kameraklient/kameraklient.cpp
@@ -50,7 +50,7 @@
 void Plugin_KameraKlient::setup(TQWidget* widget) {
 	KIPI::Plugin::setup(widget);
 	mKameraKlientAction = new TDEAction(i18n("Digital Camera"),
-							"camera_unmount",
+							"camera-unmounted",
 							TDEShortcut(),
 							this,
 							TQT_SLOT(slotActivate()),