[k3b][master] a91bd116

src/k3bappdevicemanager.cpp

diff --git a/src/k3bappdevicemanager.cpp b/src/k3bappdevicemanager.cpp

index 4b06f8c..9e6c54d 100644

--- a/src/k3bappdevicemanager.cpp

+++ b/src/k3bappdevicemanager.cpp

@@ -44,7 +44,7 @@

   TDEActionMenu* devicePopupMenu = new TDEActionMenu( m_actionCollection, "device_popup" );

   m_actionDiskInfo = new TDEAction( i18n("Media &Info"), "application-vnd.tde.info", 0, this, TQT_SLOT(diskInfo()),

 				  m_actionCollection, "device_diskinfo");

-  m_actionUnmount = new TDEAction( i18n("&Unmount"), "media-optical-cdrom", 0, this, TQT_SLOT(unmountDisk()),

+  m_actionUnmount = new TDEAction( i18n("&Unmount"), "media-optical-cdrom-unmounted", 0, this, TQT_SLOT(unmountDisk()),

 				 m_actionCollection, "device_unmount");

   m_actionMount = new TDEAction( i18n("&Mount"), "media-optical-cdrom-mounted", 0, this, TQT_SLOT(mountDisk()),

 			       m_actionCollection, "device_mount");

src/k3bemptydiscwaiter.cpp

diff --git a/src/k3bemptydiscwaiter.cpp b/src/k3bemptydiscwaiter.cpp

index 0f115d2..df35a07 100644

--- a/src/k3bemptydiscwaiter.cpp

+++ b/src/k3bemptydiscwaiter.cpp

@@ -208,10 +208,10 @@

     d->labelRequest->setText( message );

   if( d->wantedMediaType & K3bDevice::MEDIA_WRITABLE_DVD )

-    d->pixLabel->setPixmap( TDEGlobal::instance()->iconLoader()->loadIcon( "media-optical-dvd",

+    d->pixLabel->setPixmap( TDEGlobal::instance()->iconLoader()->loadIcon( "media-optical-dvd-unmounted",

 									 TDEIcon::NoGroup, TDEIcon::SizeMedium ) );

   else

-    d->pixLabel->setPixmap( TDEGlobal::instance()->iconLoader()->loadIcon( "media-optical-cdwriter",

+    d->pixLabel->setPixmap( TDEGlobal::instance()->iconLoader()->loadIcon( "cd-rw-unmounted",

 									 TDEIcon::NoGroup, TDEIcon::SizeMedium ) );

   adjustSize();

src/k3bfiletreecombobox.cpp

diff --git a/src/k3bfiletreecombobox.cpp b/src/k3bfiletreecombobox.cpp

index 383b1a5..4075df7 100644

--- a/src/k3bfiletreecombobox.cpp

+++ b/src/k3bfiletreecombobox.cpp

@@ -116,7 +116,7 @@

 void K3bFileTreeComboBox::setDevice( K3bDevice::Device* dev )

-  setEditText( SmallIcon("media-optical-cdrom"), dev->vendor() + " " + dev->description() + " (" + dev->blockDeviceName() + ")" );

+  setEditText( SmallIcon("media-optical-cdrom-unmounted"), dev->vendor() + " " + dev->description() + " (" + dev->blockDeviceName() + ")" );

src/k3bfiletreeview.cpp

diff --git a/src/k3bfiletreeview.cpp b/src/k3bfiletreeview.cpp

index e9fe2a0..740d750 100644

--- a/src/k3bfiletreeview.cpp

+++ b/src/k3bfiletreeview.cpp

@@ -54,8 +54,8 @@

 		     KURL( "media:/" + dev->blockDeviceName() ),

 		     TQString("%1 - %2").arg(dev->vendor()).arg(dev->description()),

 		     ( dev->burner()

-		       ? SmallIcon("media-optical-cdwriter")

-		       : SmallIcon("media-optical-cdrom") ),

+		       ? SmallIcon("cd-rw-unmounted")

+		       : SmallIcon("media-optical-cdrom-unmounted") ),

 		     false,

 		     item == 0

 		     ? new K3bDeviceBranchViewItem( view, dev, this )

@@ -451,7 +451,7 @@

 //   TDEAction* actionDiskInfo = new TDEAction( i18n("&Disk Info"), "application-vnd.tde.info", 0, this, TQT_SLOT(slotShowDiskInfo()),

 // 					 m_actionCollection, "disk_info");

-//   TDEAction* actionUnmount = new TDEAction( i18n("&Unmount"), "media-optical-cdrom", 0, this, TQT_SLOT(slotUnmountDisk()),

+//   TDEAction* actionUnmount = new TDEAction( i18n("&Unmount"), "media-optical-cdrom-unmounted", 0, this, TQT_SLOT(slotUnmountDisk()),

 // 					m_actionCollection, "disk_unmount");

 //   TDEAction* actionEject = new TDEAction( i18n("&Eject"), "", 0, this, TQT_SLOT(slotEjectDisk()),

 // 					m_actionCollection, "disk_eject");

src/k3bsidepanel.cpp

diff --git a/src/k3bsidepanel.cpp b/src/k3bsidepanel.cpp

index 546b4dc..68629f5 100644

--- a/src/k3bsidepanel.cpp

+++ b/src/k3bsidepanel.cpp

@@ -37,7 +37,7 @@

   // CD projects

   TQFrame* cdProjectsFrame = createPanel();

-  addItem( cdProjectsFrame, SmallIconSet( "media-optical-cdrom" ), i18n("CD Tasks") );

+  addItem( cdProjectsFrame, SmallIconSet( "media-optical-cdrom-unmounted" ), i18n("CD Tasks") );

   addButton( cdProjectsFrame, m_mainWindow->action( "file_new_audio" ) );

   addButton( cdProjectsFrame, m_mainWindow->action( "file_new_data" ) );

   addButton( cdProjectsFrame, m_mainWindow->action( "file_new_mixed" ) );

@@ -52,7 +52,7 @@

   // DVD projects

   TQFrame* dvdProjectsFrame = createPanel();

-  addItem( dvdProjectsFrame, SmallIconSet( "media-optical-dvd" ), i18n("DVD Tasks") );

+  addItem( dvdProjectsFrame, SmallIconSet( "media-optical-dvd-unmounted" ), i18n("DVD Tasks") );

   addButton( dvdProjectsFrame, m_mainWindow->action( "file_new_dvd" ) );

   addButton( dvdProjectsFrame, m_mainWindow->action( "file_new_video_dvd" ) );

   addButton( dvdProjectsFrame, m_mainWindow->action( "file_new_movix_dvd" ) );

src/konqi/k3b_cd_copy.desktop

diff --git a/src/konqi/k3b_cd_copy.desktop b/src/konqi/k3b_cd_copy.desktop

index 954e398..5f098a6 100644

--- a/src/konqi/k3b_cd_copy.desktop

+++ b/src/konqi/k3b_cd_copy.desktop

@@ -1,5 +1,5 @@

 [Desktop Entry]

-X-TDE-ServiceTypes=media/cdrom_unmounted,media/cdwriter_unmounted,media/audiocd

+X-TDE-ServiceTypes=media/cdrom_unmounted,media/cd-rw_unmounted,media/audiocd

 Actions=K3bCDCopy;

 X-TDE-Priority=TopLevel

src/option/k3bdevicewidget.cpp

diff --git a/src/option/k3bdevicewidget.cpp b/src/option/k3bdevicewidget.cpp

index dcc2486..3a93196 100644

--- a/src/option/k3bdevicewidget.cpp

+++ b/src/option/k3bdevicewidget.cpp

@@ -232,11 +232,11 @@

   // create the parent view items

   // -----------------------------------------

   m_writerParentViewItem = new TQListViewItem( m_viewDevices, i18n("Writer Drives") );

-  m_writerParentViewItem->setPixmap( 0, SmallIcon( "media-optical-cdwriter" ) );

+  m_writerParentViewItem->setPixmap( 0, SmallIcon( "cd-rw-unmounted" ) );

   // spacer item

   (void)new TQListViewItem( m_viewDevices );

   m_readerParentViewItem = new TQListViewItem( m_viewDevices, i18n("Readonly Drives") );

-  m_readerParentViewItem->setPixmap( 0, SmallIcon( "media-optical-cdrom" ) );

+  m_readerParentViewItem->setPixmap( 0, SmallIcon( "media-optical-cdrom-unmounted" ) );

   // -----------------------------------------

   TQFont fBold( m_viewDevices->font() );

src/option/k3boptiondialog.cpp

diff --git a/src/option/k3boptiondialog.cpp b/src/option/k3boptiondialog.cpp

index 9e4fb01..50a43d6 100644

--- a/src/option/k3boptiondialog.cpp

+++ b/src/option/k3boptiondialog.cpp

@@ -127,7 +127,7 @@

 void K3bOptionDialog::setupBurningPage()

   TQFrame* frame = addPage( i18n("Advanced"), i18n("Advanced Settings"),

-			   TDEGlobal::instance()->iconLoader()->loadIcon( "media-optical-cdwriter", TDEIcon::NoGroup, TDEIcon::SizeMedium ) );

+			   TDEGlobal::instance()->iconLoader()->loadIcon( "cd-rw-unmounted", TDEIcon::NoGroup, TDEIcon::SizeMedium ) );

   TQGridLayout* _frameLayout = new TQGridLayout( frame );

   _frameLayout->setSpacing( 0 );

src/projects/k3bdataviewitem.cpp

diff --git a/src/projects/k3bdataviewitem.cpp b/src/projects/k3bdataviewitem.cpp

index 1e2a78d..9288cb3 100644

--- a/src/projects/k3bdataviewitem.cpp

+++ b/src/projects/k3bdataviewitem.cpp

@@ -266,7 +266,7 @@

   : K3bDataDirViewItem( doc->root(), parent )

   m_doc = doc;

-  setPixmap( 0, SmallIcon( "media-optical-cdrom" ) );

+  setPixmap( 0, SmallIcon( "media-optical-cdrom-unmounted" ) );

   setValidator( 0, new K3bLatin1Validator() );

src/projects/k3bfillstatusdisplay.cpp

diff --git a/src/projects/k3bfillstatusdisplay.cpp b/src/projects/k3bfillstatusdisplay.cpp

index 235edb5..3f3f9b8 100644

--- a/src/projects/k3bfillstatusdisplay.cpp

+++ b/src/projects/k3bfillstatusdisplay.cpp

@@ -341,7 +341,7 @@

   d->displayWidget = new K3bFillStatusDisplayWidget( doc, this );

 //   d->buttonMenu = new TQToolButton( this );

-//   d->buttonMenu->setIconSet( SmallIconSet("media-optical-cdrom") );

+//   d->buttonMenu->setIconSet( SmallIconSet("media-optical-cdrom-unmounted") );

 //   d->buttonMenu->setAutoRaise(true);

 //   TQToolTip::add( d->buttonMenu, i18n("Fill display properties") );

 //   connect( d->buttonMenu, TQT_SIGNAL(clicked()), TQT_TQOBJECT(this), TQT_SLOT(slotMenuButtonClicked()) );

@@ -402,7 +402,7 @@

   d->actionCustomSize = new K3bRadioAction( i18n("Custom..."), 0, TQT_TQOBJECT(this), TQT_SLOT(slotCustomSize()),

 					    d->actionCollection, "fillstatus_custom_size" );

   d->actionCustomSize->setAlwaysEmitActivated(true);

-  d->actionDetermineSize = new K3bRadioAction( i18n("From Medium..."), "media-optical-cdrom", 0,

+  d->actionDetermineSize = new K3bRadioAction( i18n("From Medium..."), "media-optical-cdrom-unmounted", 0,

 					       TQT_TQOBJECT(this), TQT_SLOT(slotDetermineSize()),

 					       d->actionCollection, "fillstatus_size_from_disk" );

   d->actionDetermineSize->setAlwaysEmitActivated(true);

src/projects/k3bvcdtrackdialog.cpp

diff --git a/src/projects/k3bvcdtrackdialog.cpp b/src/projects/k3bvcdtrackdialog.cpp

index 6e7ef05..ef200e9 100644

--- a/src/projects/k3bvcdtrackdialog.cpp

+++ b/src/projects/k3bvcdtrackdialog.cpp

@@ -305,7 +305,7 @@

     m_comboAfterTimeout->insertItem( pmDisabled, txtDisabled );

     // add VideoCD End

-    TQPixmap pmEnd = SmallIcon( "media-optical-cdrom" );

+    TQPixmap pmEnd = SmallIcon( "media-optical-cdrom-unmounted" );

     TQString txtEnd = i18n( "VideoCD END" );

     m_pbc_previous->insertItem( pmEnd, txtEnd );

     m_pbc_next->insertItem( pmEnd, txtEnd );

tdeioslaves/videodvd/videodvd.cpp

diff --git a/tdeioslaves/videodvd/videodvd.cpp b/tdeioslaves/videodvd/videodvd.cpp

index 881f09c..297ea61 100644

--- a/tdeioslaves/videodvd/videodvd.cpp

+++ b/tdeioslaves/videodvd/videodvd.cpp

@@ -302,7 +302,7 @@

 	uds.append( a );

 	a.m_uds = TDEIO::UDS_ICON_NAME;

-	a.m_str = "media-optical-dvd";

+	a.m_str = "media-optical-dvd-unmounted";

 	uds.append( a );

 	udsl.append( uds );

tdeioslaves/videodvd/videodvd.desktop

diff --git a/tdeioslaves/videodvd/videodvd.desktop b/tdeioslaves/videodvd/videodvd.desktop

index 82195cd..5dbcd0d 100644

--- a/tdeioslaves/videodvd/videodvd.desktop

+++ b/tdeioslaves/videodvd/videodvd.desktop

@@ -2,7 +2,7 @@

 Encoding=UTF-8

 Type=Link

 URL=videodvd:/

-Icon=media-optical-dvd

+Icon=media-optical-dvd-unmounted

 Name=Video DVD Browser

 Name[af]=Video DVD Blaaier

 Name[ar]= قارىء القرص المدمج المرئي الرقمي DVD

tdeioslaves/videodvd/videodvd.protocol

diff --git a/tdeioslaves/videodvd/videodvd.protocol b/tdeioslaves/videodvd/videodvd.protocol

index fdb4db8..fca44b6 100644

--- a/tdeioslaves/videodvd/videodvd.protocol

+++ b/tdeioslaves/videodvd/videodvd.protocol

@@ -5,7 +5,7 @@

 output=filesystem

 reading=true

 listing=Name,Type,Size,Date

-Icon=media-optical-dvd

+Icon=media-optical-dvd-unmounted

 Class=:local

 X-DocPath=tdeioslave/videodvd/index.html

 Description=A tdeioslave that allows files to be copied from a Video DVD (including decryption)

a91bd116	2019-06-26 15:24:17	Michele Calgaro
Adjusted to new normalized device icon names in tdelibs. Signed-off-by: Michele Calgaro <michele.calgaro@...>
M src/k3bappdevicemanager.cpp M src/k3bemptydiscwaiter.cpp M src/k3bfiletreecombobox.cpp M src/k3bfiletreeview.cpp M src/k3bsidepanel.cpp M src/konqi/k3b_cd_copy.desktop M src/option/k3bdevicewidget.cpp M src/option/k3boptiondialog.cpp M src/projects/k3bdataviewitem.cpp M src/projects/k3bfillstatusdisplay.cpp M src/projects/k3bvcdtrackdialog.cpp M tdeioslaves/videodvd/videodvd.cpp M tdeioslaves/videodvd/videodvd.desktop M tdeioslaves/videodvd/videodvd.protocol
src/k3bappdevicemanager.cpp diff --git a/src/k3bappdevicemanager.cpp b/src/k3bappdevicemanager.cpp index 4b06f8c..9e6c54d 100644 --- a/src/k3bappdevicemanager.cpp +++ b/src/k3bappdevicemanager.cpp @@ -44,7 +44,7 @@ TDEActionMenu* devicePopupMenu = new TDEActionMenu( m_actionCollection, "device_popup" ); m_actionDiskInfo = new TDEAction( i18n("Media &Info"), "application-vnd.tde.info", 0, this, TQT_SLOT(diskInfo()), m_actionCollection, "device_diskinfo"); - m_actionUnmount = new TDEAction( i18n("&Unmount"), "media-optical-cdrom", 0, this, TQT_SLOT(unmountDisk()), + m_actionUnmount = new TDEAction( i18n("&Unmount"), "media-optical-cdrom-unmounted", 0, this, TQT_SLOT(unmountDisk()), m_actionCollection, "device_unmount"); m_actionMount = new TDEAction( i18n("&Mount"), "media-optical-cdrom-mounted", 0, this, TQT_SLOT(mountDisk()), m_actionCollection, "device_mount"); src/k3bemptydiscwaiter.cpp diff --git a/src/k3bemptydiscwaiter.cpp b/src/k3bemptydiscwaiter.cpp index 0f115d2..df35a07 100644 --- a/src/k3bemptydiscwaiter.cpp +++ b/src/k3bemptydiscwaiter.cpp @@ -208,10 +208,10 @@ d->labelRequest->setText( message ); if( d->wantedMediaType & K3bDevice::MEDIA_WRITABLE_DVD ) - d->pixLabel->setPixmap( TDEGlobal::instance()->iconLoader()->loadIcon( "media-optical-dvd", + d->pixLabel->setPixmap( TDEGlobal::instance()->iconLoader()->loadIcon( "media-optical-dvd-unmounted", TDEIcon::NoGroup, TDEIcon::SizeMedium ) ); else - d->pixLabel->setPixmap( TDEGlobal::instance()->iconLoader()->loadIcon( "media-optical-cdwriter", + d->pixLabel->setPixmap( TDEGlobal::instance()->iconLoader()->loadIcon( "cd-rw-unmounted", TDEIcon::NoGroup, TDEIcon::SizeMedium ) ); adjustSize(); src/k3bfiletreecombobox.cpp diff --git a/src/k3bfiletreecombobox.cpp b/src/k3bfiletreecombobox.cpp index 383b1a5..4075df7 100644 --- a/src/k3bfiletreecombobox.cpp +++ b/src/k3bfiletreecombobox.cpp @@ -116,7 +116,7 @@ void K3bFileTreeComboBox::setDevice( K3bDevice::Device* dev ) { - setEditText( SmallIcon("media-optical-cdrom"), dev->vendor() + " " + dev->description() + " (" + dev->blockDeviceName() + ")" ); + setEditText( SmallIcon("media-optical-cdrom-unmounted"), dev->vendor() + " " + dev->description() + " (" + dev->blockDeviceName() + ")" ); } src/k3bfiletreeview.cpp diff --git a/src/k3bfiletreeview.cpp b/src/k3bfiletreeview.cpp index e9fe2a0..740d750 100644 --- a/src/k3bfiletreeview.cpp +++ b/src/k3bfiletreeview.cpp @@ -54,8 +54,8 @@ KURL( "media:/" + dev->blockDeviceName() ), TQString("%1 - %2").arg(dev->vendor()).arg(dev->description()), ( dev->burner() - ? SmallIcon("media-optical-cdwriter") - : SmallIcon("media-optical-cdrom") ), + ? SmallIcon("cd-rw-unmounted") + : SmallIcon("media-optical-cdrom-unmounted") ), false, item == 0 ? new K3bDeviceBranchViewItem( view, dev, this ) @@ -451,7 +451,7 @@ // TDEAction* actionDiskInfo = new TDEAction( i18n("&Disk Info"), "application-vnd.tde.info", 0, this, TQT_SLOT(slotShowDiskInfo()), // m_actionCollection, "disk_info"); -// TDEAction* actionUnmount = new TDEAction( i18n("&Unmount"), "media-optical-cdrom", 0, this, TQT_SLOT(slotUnmountDisk()), +// TDEAction* actionUnmount = new TDEAction( i18n("&Unmount"), "media-optical-cdrom-unmounted", 0, this, TQT_SLOT(slotUnmountDisk()), // m_actionCollection, "disk_unmount"); // TDEAction* actionEject = new TDEAction( i18n("&Eject"), "", 0, this, TQT_SLOT(slotEjectDisk()), // m_actionCollection, "disk_eject"); src/k3bsidepanel.cpp diff --git a/src/k3bsidepanel.cpp b/src/k3bsidepanel.cpp index 546b4dc..68629f5 100644 --- a/src/k3bsidepanel.cpp +++ b/src/k3bsidepanel.cpp @@ -37,7 +37,7 @@ // CD projects TQFrame* cdProjectsFrame = createPanel(); - addItem( cdProjectsFrame, SmallIconSet( "media-optical-cdrom" ), i18n("CD Tasks") ); + addItem( cdProjectsFrame, SmallIconSet( "media-optical-cdrom-unmounted" ), i18n("CD Tasks") ); addButton( cdProjectsFrame, m_mainWindow->action( "file_new_audio" ) ); addButton( cdProjectsFrame, m_mainWindow->action( "file_new_data" ) ); addButton( cdProjectsFrame, m_mainWindow->action( "file_new_mixed" ) ); @@ -52,7 +52,7 @@ // DVD projects TQFrame* dvdProjectsFrame = createPanel(); - addItem( dvdProjectsFrame, SmallIconSet( "media-optical-dvd" ), i18n("DVD Tasks") ); + addItem( dvdProjectsFrame, SmallIconSet( "media-optical-dvd-unmounted" ), i18n("DVD Tasks") ); addButton( dvdProjectsFrame, m_mainWindow->action( "file_new_dvd" ) ); addButton( dvdProjectsFrame, m_mainWindow->action( "file_new_video_dvd" ) ); addButton( dvdProjectsFrame, m_mainWindow->action( "file_new_movix_dvd" ) ); src/konqi/k3b_cd_copy.desktop diff --git a/src/konqi/k3b_cd_copy.desktop b/src/konqi/k3b_cd_copy.desktop index 954e398..5f098a6 100644 --- a/src/konqi/k3b_cd_copy.desktop +++ b/src/konqi/k3b_cd_copy.desktop @@ -1,5 +1,5 @@ [Desktop Entry] -X-TDE-ServiceTypes=media/cdrom_unmounted,media/cdwriter_unmounted,media/audiocd +X-TDE-ServiceTypes=media/cdrom_unmounted,media/cd-rw_unmounted,media/audiocd Actions=K3bCDCopy; X-TDE-Priority=TopLevel src/option/k3bdevicewidget.cpp diff --git a/src/option/k3bdevicewidget.cpp b/src/option/k3bdevicewidget.cpp index dcc2486..3a93196 100644 --- a/src/option/k3bdevicewidget.cpp +++ b/src/option/k3bdevicewidget.cpp @@ -232,11 +232,11 @@ // create the parent view items // ----------------------------------------- m_writerParentViewItem = new TQListViewItem( m_viewDevices, i18n("Writer Drives") ); - m_writerParentViewItem->setPixmap( 0, SmallIcon( "media-optical-cdwriter" ) ); + m_writerParentViewItem->setPixmap( 0, SmallIcon( "cd-rw-unmounted" ) ); // spacer item (void)new TQListViewItem( m_viewDevices ); m_readerParentViewItem = new TQListViewItem( m_viewDevices, i18n("Readonly Drives") ); - m_readerParentViewItem->setPixmap( 0, SmallIcon( "media-optical-cdrom" ) ); + m_readerParentViewItem->setPixmap( 0, SmallIcon( "media-optical-cdrom-unmounted" ) ); // ----------------------------------------- TQFont fBold( m_viewDevices->font() ); src/option/k3boptiondialog.cpp diff --git a/src/option/k3boptiondialog.cpp b/src/option/k3boptiondialog.cpp index 9e4fb01..50a43d6 100644 --- a/src/option/k3boptiondialog.cpp +++ b/src/option/k3boptiondialog.cpp @@ -127,7 +127,7 @@ void K3bOptionDialog::setupBurningPage() { TQFrame* frame = addPage( i18n("Advanced"), i18n("Advanced Settings"), - TDEGlobal::instance()->iconLoader()->loadIcon( "media-optical-cdwriter", TDEIcon::NoGroup, TDEIcon::SizeMedium ) ); + TDEGlobal::instance()->iconLoader()->loadIcon( "cd-rw-unmounted", TDEIcon::NoGroup, TDEIcon::SizeMedium ) ); TQGridLayout* _frameLayout = new TQGridLayout( frame ); _frameLayout->setSpacing( 0 ); src/projects/k3bdataviewitem.cpp diff --git a/src/projects/k3bdataviewitem.cpp b/src/projects/k3bdataviewitem.cpp index 1e2a78d..9288cb3 100644 --- a/src/projects/k3bdataviewitem.cpp +++ b/src/projects/k3bdataviewitem.cpp @@ -266,7 +266,7 @@ : K3bDataDirViewItem( doc->root(), parent ) { m_doc = doc; - setPixmap( 0, SmallIcon( "media-optical-cdrom" ) ); + setPixmap( 0, SmallIcon( "media-optical-cdrom-unmounted" ) ); setValidator( 0, new K3bLatin1Validator() ); } src/projects/k3bfillstatusdisplay.cpp diff --git a/src/projects/k3bfillstatusdisplay.cpp b/src/projects/k3bfillstatusdisplay.cpp index 235edb5..3f3f9b8 100644 --- a/src/projects/k3bfillstatusdisplay.cpp +++ b/src/projects/k3bfillstatusdisplay.cpp @@ -341,7 +341,7 @@ d->displayWidget = new K3bFillStatusDisplayWidget( doc, this ); // d->buttonMenu = new TQToolButton( this ); -// d->buttonMenu->setIconSet( SmallIconSet("media-optical-cdrom") ); +// d->buttonMenu->setIconSet( SmallIconSet("media-optical-cdrom-unmounted") ); // d->buttonMenu->setAutoRaise(true); // TQToolTip::add( d->buttonMenu, i18n("Fill display properties") ); // connect( d->buttonMenu, TQT_SIGNAL(clicked()), TQT_TQOBJECT(this), TQT_SLOT(slotMenuButtonClicked()) ); @@ -402,7 +402,7 @@ d->actionCustomSize = new K3bRadioAction( i18n("Custom..."), 0, TQT_TQOBJECT(this), TQT_SLOT(slotCustomSize()), d->actionCollection, "fillstatus_custom_size" ); d->actionCustomSize->setAlwaysEmitActivated(true); - d->actionDetermineSize = new K3bRadioAction( i18n("From Medium..."), "media-optical-cdrom", 0, + d->actionDetermineSize = new K3bRadioAction( i18n("From Medium..."), "media-optical-cdrom-unmounted", 0, TQT_TQOBJECT(this), TQT_SLOT(slotDetermineSize()), d->actionCollection, "fillstatus_size_from_disk" ); d->actionDetermineSize->setAlwaysEmitActivated(true); src/projects/k3bvcdtrackdialog.cpp diff --git a/src/projects/k3bvcdtrackdialog.cpp b/src/projects/k3bvcdtrackdialog.cpp index 6e7ef05..ef200e9 100644 --- a/src/projects/k3bvcdtrackdialog.cpp +++ b/src/projects/k3bvcdtrackdialog.cpp @@ -305,7 +305,7 @@ m_comboAfterTimeout->insertItem( pmDisabled, txtDisabled ); // add VideoCD End - TQPixmap pmEnd = SmallIcon( "media-optical-cdrom" ); + TQPixmap pmEnd = SmallIcon( "media-optical-cdrom-unmounted" ); TQString txtEnd = i18n( "VideoCD END" ); m_pbc_previous->insertItem( pmEnd, txtEnd ); m_pbc_next->insertItem( pmEnd, txtEnd ); tdeioslaves/videodvd/videodvd.cpp diff --git a/tdeioslaves/videodvd/videodvd.cpp b/tdeioslaves/videodvd/videodvd.cpp index 881f09c..297ea61 100644 --- a/tdeioslaves/videodvd/videodvd.cpp +++ b/tdeioslaves/videodvd/videodvd.cpp @@ -302,7 +302,7 @@ uds.append( a ); a.m_uds = TDEIO::UDS_ICON_NAME; - a.m_str = "media-optical-dvd"; + a.m_str = "media-optical-dvd-unmounted"; uds.append( a ); udsl.append( uds ); tdeioslaves/videodvd/videodvd.desktop diff --git a/tdeioslaves/videodvd/videodvd.desktop b/tdeioslaves/videodvd/videodvd.desktop index 82195cd..5dbcd0d 100644 --- a/tdeioslaves/videodvd/videodvd.desktop +++ b/tdeioslaves/videodvd/videodvd.desktop @@ -2,7 +2,7 @@ Encoding=UTF-8 Type=Link URL=videodvd:/ -Icon=media-optical-dvd +Icon=media-optical-dvd-unmounted Name=Video DVD Browser Name[af]=Video DVD Blaaier Name[ar]= قارىء القرص المدمج المرئي الرقمي DVD tdeioslaves/videodvd/videodvd.protocol diff --git a/tdeioslaves/videodvd/videodvd.protocol b/tdeioslaves/videodvd/videodvd.protocol index fdb4db8..fca44b6 100644 --- a/tdeioslaves/videodvd/videodvd.protocol +++ b/tdeioslaves/videodvd/videodvd.protocol @@ -5,7 +5,7 @@ output=filesystem reading=true listing=Name,Type,Size,Date -Icon=media-optical-dvd +Icon=media-optical-dvd-unmounted Class=:local X-DocPath=tdeioslave/videodvd/index.html Description=A tdeioslave that allows files to be copied from a Video DVD (including decryption)

Branch: master

src/k3bappdevicemanager.cpp

src/k3bemptydiscwaiter.cpp

src/k3bfiletreecombobox.cpp

src/k3bfiletreeview.cpp

src/k3bsidepanel.cpp

src/konqi/k3b_cd_copy.desktop

src/option/k3bdevicewidget.cpp

src/option/k3boptiondialog.cpp

src/projects/k3bdataviewitem.cpp

src/projects/k3bfillstatusdisplay.cpp

src/projects/k3bvcdtrackdialog.cpp

tdeioslaves/videodvd/videodvd.cpp

tdeioslaves/videodvd/videodvd.desktop

tdeioslaves/videodvd/videodvd.protocol