| 32d31ee6 | 2015-03-04 16:34:36 | Timothy Pearson |
Rename most device icons to comply with XDG standards (cherry picked from commit 7cf23e1d750fa225835e83ad2d45ecb00eff9f37) |
||
|
M src/k3bappdevicemanager.cpp M src/k3bemptydiscwaiter.cpp M src/k3bfiletreecombobox.cpp M src/k3bfiletreeview.cpp M src/k3bsidepanel.cpp 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 |
||
diff --git a/src/k3bappdevicemanager.cpp b/src/k3bappdevicemanager.cpp
index 6043be1..4b06f8c 100644
--- a/src/k3bappdevicemanager.cpp
+++ b/src/k3bappdevicemanager.cpp
@@ -44,9 +44,9 @@
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"), "cdrom_unmount", 0, this, TQT_SLOT(unmountDisk()),
+ m_actionUnmount = new TDEAction( i18n("&Unmount"), "media-optical-cdrom", 0, this, TQT_SLOT(unmountDisk()),
m_actionCollection, "device_unmount");
- m_actionMount = new TDEAction( i18n("&Mount"), "cdrom_mount", 0, this, TQT_SLOT(mountDisk()),
+ m_actionMount = new TDEAction( i18n("&Mount"), "media-optical-cdrom-mounted", 0, this, TQT_SLOT(mountDisk()),
m_actionCollection, "device_mount");
m_actionEject = new TDEAction( i18n("&Eject"), "", 0, this, TQT_SLOT(ejectDisk()),
m_actionCollection, "device_eject");
diff --git a/src/k3bemptydiscwaiter.cpp b/src/k3bemptydiscwaiter.cpp
index 288e854..0f115d2 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( "dvd_unmount",
+ d->pixLabel->setPixmap( TDEGlobal::instance()->iconLoader()->loadIcon( "media-optical-dvd",
TDEIcon::NoGroup, TDEIcon::SizeMedium ) );
else
- d->pixLabel->setPixmap( TDEGlobal::instance()->iconLoader()->loadIcon( "cdwriter_unmount",
+ d->pixLabel->setPixmap( TDEGlobal::instance()->iconLoader()->loadIcon( "media-optical-cdwriter",
TDEIcon::NoGroup, TDEIcon::SizeMedium ) );
adjustSize();
diff --git a/src/k3bfiletreecombobox.cpp b/src/k3bfiletreecombobox.cpp
index eb66226..383b1a5 100644
--- a/src/k3bfiletreecombobox.cpp
+++ b/src/k3bfiletreecombobox.cpp
@@ -116,7 +116,7 @@
void K3bFileTreeComboBox::setDevice( K3bDevice::Device* dev )
{
- setEditText( SmallIcon("cdrom_unmount"), dev->vendor() + " " + dev->description() + " (" + dev->blockDeviceName() + ")" );
+ setEditText( SmallIcon("media-optical-cdrom"), dev->vendor() + " " + dev->description() + " (" + dev->blockDeviceName() + ")" );
}
diff --git a/src/k3bfiletreeview.cpp b/src/k3bfiletreeview.cpp
index 37daa7c..e9fe2a0 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("cdwriter_unmount")
- : SmallIcon("cdrom_unmount") ),
+ ? SmallIcon("media-optical-cdwriter")
+ : SmallIcon("media-optical-cdrom") ),
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"), "cdrom_unmount", 0, this, TQT_SLOT(slotUnmountDisk()),
+// TDEAction* actionUnmount = new TDEAction( i18n("&Unmount"), "media-optical-cdrom", 0, this, TQT_SLOT(slotUnmountDisk()),
// m_actionCollection, "disk_unmount");
// TDEAction* actionEject = new TDEAction( i18n("&Eject"), "", 0, this, TQT_SLOT(slotEjectDisk()),
// m_actionCollection, "disk_eject");
diff --git a/src/k3bsidepanel.cpp b/src/k3bsidepanel.cpp
index c785410..546b4dc 100644
--- a/src/k3bsidepanel.cpp
+++ b/src/k3bsidepanel.cpp
@@ -37,7 +37,7 @@
// CD projects
TQFrame* cdProjectsFrame = createPanel();
- addItem( cdProjectsFrame, SmallIconSet( "cdrom_unmount" ), i18n("CD Tasks") );
+ addItem( cdProjectsFrame, SmallIconSet( "media-optical-cdrom" ), 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( "dvd_unmount" ), i18n("DVD Tasks") );
+ addItem( dvdProjectsFrame, SmallIconSet( "media-optical-dvd" ), 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" ) );
diff --git a/src/option/k3bdevicewidget.cpp b/src/option/k3bdevicewidget.cpp
index d4d3cd7..dcc2486 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( "cdwriter_unmount" ) );
+ m_writerParentViewItem->setPixmap( 0, SmallIcon( "media-optical-cdwriter" ) );
// spacer item
(void)new TQListViewItem( m_viewDevices );
m_readerParentViewItem = new TQListViewItem( m_viewDevices, i18n("Readonly Drives") );
- m_readerParentViewItem->setPixmap( 0, SmallIcon( "cdrom_unmount" ) );
+ m_readerParentViewItem->setPixmap( 0, SmallIcon( "media-optical-cdrom" ) );
// -----------------------------------------
TQFont fBold( m_viewDevices->font() );
diff --git a/src/option/k3boptiondialog.cpp b/src/option/k3boptiondialog.cpp
index 7c09288..9e4fb01 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( "cdwriter_unmount", TDEIcon::NoGroup, TDEIcon::SizeMedium ) );
+ TDEGlobal::instance()->iconLoader()->loadIcon( "media-optical-cdwriter", TDEIcon::NoGroup, TDEIcon::SizeMedium ) );
TQGridLayout* _frameLayout = new TQGridLayout( frame );
_frameLayout->setSpacing( 0 );
diff --git a/src/projects/k3bdataviewitem.cpp b/src/projects/k3bdataviewitem.cpp
index fb42b67..1e2a78d 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( "cdrom_unmount" ) );
+ setPixmap( 0, SmallIcon( "media-optical-cdrom" ) );
setValidator( 0, new K3bLatin1Validator() );
}
diff --git a/src/projects/k3bfillstatusdisplay.cpp b/src/projects/k3bfillstatusdisplay.cpp
index fca7f89..235edb5 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("cdrom_unmount") );
+// d->buttonMenu->setIconSet( SmallIconSet("media-optical-cdrom") );
// 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..."), "cdrom_unmount", 0,
+ d->actionDetermineSize = new K3bRadioAction( i18n("From Medium..."), "media-optical-cdrom", 0,
TQT_TQOBJECT(this), TQT_SLOT(slotDetermineSize()),
d->actionCollection, "fillstatus_size_from_disk" );
d->actionDetermineSize->setAlwaysEmitActivated(true);
diff --git a/src/projects/k3bvcdtrackdialog.cpp b/src/projects/k3bvcdtrackdialog.cpp
index 5a04840..6e7ef05 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( "cdrom_unmount" );
+ TQPixmap pmEnd = SmallIcon( "media-optical-cdrom" );
TQString txtEnd = i18n( "VideoCD END" );
m_pbc_previous->insertItem( pmEnd, txtEnd );
m_pbc_next->insertItem( pmEnd, txtEnd );
diff --git a/tdeioslaves/videodvd/videodvd.cpp b/tdeioslaves/videodvd/videodvd.cpp
index 7ddaa28..881f09c 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 = "dvd_unmount";
+ a.m_str = "media-optical-dvd";
uds.append( a );
udsl.append( uds );
diff --git a/tdeioslaves/videodvd/videodvd.desktop b/tdeioslaves/videodvd/videodvd.desktop
index 1454f40..82195cd 100644
--- a/tdeioslaves/videodvd/videodvd.desktop
+++ b/tdeioslaves/videodvd/videodvd.desktop
@@ -2,7 +2,7 @@
Encoding=UTF-8
Type=Link
URL=videodvd:/
-Icon=dvd_unmount
+Icon=media-optical-dvd
Name=Video DVD Browser
Name[af]=Video DVD Blaaier
Name[ar]= ���������� ���������� ������������ ������������ ������������ DVD
diff --git a/tdeioslaves/videodvd/videodvd.protocol b/tdeioslaves/videodvd/videodvd.protocol
index 68d6546..fdb4db8 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=dvd_unmount
+Icon=media-optical-dvd
Class=:local
X-DocPath=tdeioslave/videodvd/index.html
Description=A tdeioslave that allows files to be copied from a Video DVD (including decryption)
|
||