TDE
/
k3b
mirror of https://mirror.git.trinitydesktop.org/gitea/TDE/k3b
0
0
Fork 0
Code Issues Releases Wiki Activity

Rename most device icons to comply with XDG standards

Browse Source
pull/1/head
Timothy Pearson 9 years ago
parent 17800ee30d
commit 7cf23e1d75
13 changed files with 20 additions and 20 deletions
Show Stats Download Patch File Download Diff File

4
src/k3bappdevicemanager.cpp
Unescape View File

@ -44,9 +44,9 @@ K3bAppDeviceManager::K3bAppDeviceManager( TQObject* parent, const char* name )
TDEActionMenu* devicePopupMenu = new TDEActionMenu( m_actionCollection, "device_popup" ); 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_actionDiskInfo = new TDEAction( i18n("Media &Info"), "application-vnd.tde.info", 0, this, TQT_SLOT(diskInfo()),
m_actionCollection, "device_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_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_actionCollection, "device_mount");
m_actionEject = new TDEAction( i18n("&Eject"), "", 0, this, TQT_SLOT(ejectDisk()), m_actionEject = new TDEAction( i18n("&Eject"), "", 0, this, TQT_SLOT(ejectDisk()),
m_actionCollection, "device_eject"); m_actionCollection, "device_eject");

4
src/k3bemptydiscwaiter.cpp
Unescape View File

@ -208,10 +208,10 @@ int K3bEmptyDiscWaiter::waitForDisc( int mediaState, int mediaType, const TQStri
d->labelRequest->setText( message ); d->labelRequest->setText( message );
if( d->wantedMediaType & K3bDevice::MEDIA_WRITABLE_DVD ) 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 ) ); TDEIcon::NoGroup, TDEIcon::SizeMedium ) );
else else
d->pixLabel->setPixmap( TDEGlobal::instance()->iconLoader()->loadIcon( "cdwriter_unmount", d->pixLabel->setPixmap( TDEGlobal::instance()->iconLoader()->loadIcon( "media-optical-cdwriter",
TDEIcon::NoGroup, TDEIcon::SizeMedium ) ); TDEIcon::NoGroup, TDEIcon::SizeMedium ) );
adjustSize(); adjustSize();

2
src/k3bfiletreecombobox.cpp
Unescape View File

@ -116,7 +116,7 @@ void K3bFileTreeComboBox::setUrl( const KURL& url )
void K3bFileTreeComboBox::setDevice( K3bDevice::Device* dev ) 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() + ")" );
} }

6
src/k3bfiletreeview.cpp
Unescape View File

@ -54,8 +54,8 @@ K3bDeviceBranch::K3bDeviceBranch( KFileTreeView* view, K3bDevice::Device* dev, K
KURL( "media:/" + dev->blockDeviceName() ), KURL( "media:/" + dev->blockDeviceName() ),
TQString("%1 - %2").arg(dev->vendor()).arg(dev->description()), TQString("%1 - %2").arg(dev->vendor()).arg(dev->description()),
( dev->burner() ( dev->burner()
? SmallIcon("cdwriter_unmount") ? SmallIcon("media-optical-cdwriter")
: SmallIcon("cdrom_unmount") ), : SmallIcon("media-optical-cdrom") ),
false, false,
item == 0 item == 0
? new K3bDeviceBranchViewItem( view, dev, this ) ? new K3bDeviceBranchViewItem( view, dev, this )
@ -451,7 +451,7 @@ void K3bFileTreeView::initActions()
// TDEAction* actionDiskInfo = new TDEAction( i18n("&Disk Info"), "application-vnd.tde.info", 0, this, TQT_SLOT(slotShowDiskInfo()), // TDEAction* actionDiskInfo = new TDEAction( i18n("&Disk Info"), "application-vnd.tde.info", 0, this, TQT_SLOT(slotShowDiskInfo()),
// m_actionCollection, "disk_info"); // 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"); // m_actionCollection, "disk_unmount");
// TDEAction* actionEject = new TDEAction( i18n("&Eject"), "", 0, this, TQT_SLOT(slotEjectDisk()), // TDEAction* actionEject = new TDEAction( i18n("&Eject"), "", 0, this, TQT_SLOT(slotEjectDisk()),
// m_actionCollection, "disk_eject"); // m_actionCollection, "disk_eject");

4
src/k3bsidepanel.cpp
Unescape View File

@ -37,7 +37,7 @@ K3bSidePanel::K3bSidePanel( K3bMainWindow* m, TQWidget* parent, const char* name
// CD projects // CD projects
TQFrame* cdProjectsFrame = createPanel(); 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_audio" ) );
addButton( cdProjectsFrame, m_mainWindow->action( "file_new_data" ) ); addButton( cdProjectsFrame, m_mainWindow->action( "file_new_data" ) );
addButton( cdProjectsFrame, m_mainWindow->action( "file_new_mixed" ) ); addButton( cdProjectsFrame, m_mainWindow->action( "file_new_mixed" ) );
@ -52,7 +52,7 @@ K3bSidePanel::K3bSidePanel( K3bMainWindow* m, TQWidget* parent, const char* name
// DVD projects // DVD projects
TQFrame* dvdProjectsFrame = createPanel(); 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_dvd" ) );
addButton( dvdProjectsFrame, m_mainWindow->action( "file_new_video_dvd" ) ); addButton( dvdProjectsFrame, m_mainWindow->action( "file_new_video_dvd" ) );
addButton( dvdProjectsFrame, m_mainWindow->action( "file_new_movix_dvd" ) ); addButton( dvdProjectsFrame, m_mainWindow->action( "file_new_movix_dvd" ) );

4
src/option/k3bdevicewidget.cpp
Unescape View File

@ -232,11 +232,11 @@ void K3bDeviceWidget::updateDeviceListViews()
// create the parent view items // create the parent view items
// ----------------------------------------- // -----------------------------------------
m_writerParentViewItem = new TQListViewItem( m_viewDevices, i18n("Writer Drives") ); 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 // spacer item
(void)new TQListViewItem( m_viewDevices ); (void)new TQListViewItem( m_viewDevices );
m_readerParentViewItem = new TQListViewItem( m_viewDevices, i18n("Readonly Drives") ); 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() ); TQFont fBold( m_viewDevices->font() );

2
src/option/k3boptiondialog.cpp
Unescape View File

@ -127,7 +127,7 @@ void K3bOptionDialog::slotDefault()
void K3bOptionDialog::setupBurningPage() void K3bOptionDialog::setupBurningPage()
{ {
TQFrame* frame = addPage( i18n("Advanced"), i18n("Advanced Settings"), 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 ); TQGridLayout* _frameLayout = new TQGridLayout( frame );
_frameLayout->setSpacing( 0 ); _frameLayout->setSpacing( 0 );

2
src/projects/k3bdataviewitem.cpp
Unescape View File

@ -266,7 +266,7 @@ K3bDataRootViewItem::K3bDataRootViewItem( K3bDataDoc* doc, TQListView* parent )
: K3bDataDirViewItem( doc->root(), parent ) : K3bDataDirViewItem( doc->root(), parent )
{ {
m_doc = doc; m_doc = doc;
setPixmap( 0, SmallIcon( "cdrom_unmount" ) ); setPixmap( 0, SmallIcon( "media-optical-cdrom" ) );
setValidator( 0, new K3bLatin1Validator() ); setValidator( 0, new K3bLatin1Validator() );
} }

4
src/projects/k3bfillstatusdisplay.cpp
Unescape View File

@ -341,7 +341,7 @@ K3bFillStatusDisplay::K3bFillStatusDisplay( K3bDoc* doc, TQWidget *parent, const
d->displayWidget = new K3bFillStatusDisplayWidget( doc, this ); d->displayWidget = new K3bFillStatusDisplayWidget( doc, this );
// d->buttonMenu = new TQToolButton( this ); // d->buttonMenu = new TQToolButton( this );
// d->buttonMenu->setIconSet( SmallIconSet("cdrom_unmount") ); // d->buttonMenu->setIconSet( SmallIconSet("media-optical-cdrom") );
// d->buttonMenu->setAutoRaise(true); // d->buttonMenu->setAutoRaise(true);
// TQToolTip::add( d->buttonMenu, i18n("Fill display properties") ); // TQToolTip::add( d->buttonMenu, i18n("Fill display properties") );
// connect( d->buttonMenu, TQT_SIGNAL(clicked()), TQT_TQOBJECT(this), TQT_SLOT(slotMenuButtonClicked()) ); // connect( d->buttonMenu, TQT_SIGNAL(clicked()), TQT_TQOBJECT(this), TQT_SLOT(slotMenuButtonClicked()) );
@ -402,7 +402,7 @@ void K3bFillStatusDisplay::setupPopupMenu()
d->actionCustomSize = new K3bRadioAction( i18n("Custom..."), 0, TQT_TQOBJECT(this), TQT_SLOT(slotCustomSize()), d->actionCustomSize = new K3bRadioAction( i18n("Custom..."), 0, TQT_TQOBJECT(this), TQT_SLOT(slotCustomSize()),
d->actionCollection, "fillstatus_custom_size" ); d->actionCollection, "fillstatus_custom_size" );
d->actionCustomSize->setAlwaysEmitActivated(true); 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()), TQT_TQOBJECT(this), TQT_SLOT(slotDetermineSize()),
d->actionCollection, "fillstatus_size_from_disk" ); d->actionCollection, "fillstatus_size_from_disk" );
d->actionDetermineSize->setAlwaysEmitActivated(true); d->actionDetermineSize->setAlwaysEmitActivated(true);

2
src/projects/k3bvcdtrackdialog.cpp
Unescape View File

@ -305,7 +305,7 @@ void K3bVcdTrackDialog::fillPbcGui()
m_comboAfterTimeout->insertItem( pmDisabled, txtDisabled ); m_comboAfterTimeout->insertItem( pmDisabled, txtDisabled );
// add VideoCD End // add VideoCD End
TQPixmap pmEnd = SmallIcon( "cdrom_unmount" ); TQPixmap pmEnd = SmallIcon( "media-optical-cdrom" );
TQString txtEnd = i18n( "VideoCD END" ); TQString txtEnd = i18n( "VideoCD END" );
m_pbc_previous->insertItem( pmEnd, txtEnd ); m_pbc_previous->insertItem( pmEnd, txtEnd );
m_pbc_next->insertItem( pmEnd, txtEnd ); m_pbc_next->insertItem( pmEnd, txtEnd );

2
tdeioslaves/videodvd/videodvd.cpp
Unescape View File

@ -302,7 +302,7 @@ void tdeio_videodvdProtocol::listVideoDVDs()
uds.append( a ); uds.append( a );
a.m_uds = TDEIO::UDS_ICON_NAME; a.m_uds = TDEIO::UDS_ICON_NAME;
a.m_str = "dvd_unmount"; a.m_str = "media-optical-dvd";
uds.append( a ); uds.append( a );
udsl.append( uds ); udsl.append( uds );

2
tdeioslaves/videodvd/videodvd.desktop
Unescape View File

@ -2,7 +2,7 @@
Encoding=UTF-8 Encoding=UTF-8
Type=Link Type=Link
URL=videodvd:/ URL=videodvd:/
Icon=dvd_unmount Icon=media-optical-dvd
Name=Video DVD Browser Name=Video DVD Browser
Name[af]=Video DVD Blaaier Name[af]=Video DVD Blaaier
Name[ar]= قارىء القرص المدمج المرئي الرقمي DVD Name[ar]= قارىء القرص المدمج المرئي الرقمي DVD

2
tdeioslaves/videodvd/videodvd.protocol
Unescape View File

@ -5,7 +5,7 @@ input=none
output=filesystem output=filesystem
reading=true reading=true
listing=Name,Type,Size,Date listing=Name,Type,Size,Date
Icon=dvd_unmount Icon=media-optical-dvd
Class=:local Class=:local
X-DocPath=tdeioslave/videodvd/index.html X-DocPath=tdeioslave/videodvd/index.html
Description=A tdeioslave that allows files to be copied from a Video DVD (including decryption) Description=A tdeioslave that allows files to be copied from a Video DVD (including decryption)

Write Preview
Loading…
Cancel
Save