diff --git a/kaffeine/src/input/audiobrowser/playlist.cpp b/kaffeine/src/input/audiobrowser/playlist.cpp index c3e42db..561e1f2 100644 --- a/kaffeine/src/input/audiobrowser/playlist.cpp +++ b/kaffeine/src/input/audiobrowser/playlist.cpp @@ -506,10 +506,10 @@ void PlayList::setupActions() m_showPlayer = new TDEToggleAction(i18n("Don't switch to player window"), 0 , 0, this, TQT_SLOT(slotShowPlayer()), actionCollection(),"playlist_showplayer"); m_showPlayer->setStatusText(i18n("Don't switch automatically to player window")); new TDEAction(i18n("&Clear Current Playlist"), "eraser", 0, this, TQT_SLOT(slotClearList()), actionCollection(), "playlist_clear"); - new TDEAction(i18n("Ne&w Playlist"), "filenew", 0, this, TQT_SLOT(slotNewList()), actionCollection(), "playlist_new"); + new TDEAction(i18n("Ne&w Playlist"), "document-new", 0, this, TQT_SLOT(slotNewList()), actionCollection(), "playlist_new"); new TDEAction(i18n("&Import Playlist..."), "project_open", 0, this, TQT_SLOT(slotPlaylistLoad()), actionCollection(), "playlist_load"); - new TDEAction(i18n("&Save Current Playlist As..."), "filesaveas", 0, this, TQT_SLOT(slotPlaylistSaveAs()), actionCollection(), "playlist_save_as"); - new TDEAction(i18n("Re&move Current Playlist"), "fileclose", 0, this, TQT_SLOT(slotPlaylistRemove()), actionCollection(), "playlist_remove"); + new TDEAction(i18n("&Save Current Playlist As..."), "document-save-as", 0, this, TQT_SLOT(slotPlaylistSaveAs()), actionCollection(), "playlist_save_as"); + new TDEAction(i18n("Re&move Current Playlist"), "window-close", 0, this, TQT_SLOT(slotPlaylistRemove()), actionCollection(), "playlist_remove"); } void PlayList::slotClearList() diff --git a/kaffeine/src/input/audiobrowser/urllistview.cpp b/kaffeine/src/input/audiobrowser/urllistview.cpp index 73dda50..3f28e5e 100644 --- a/kaffeine/src/input/audiobrowser/urllistview.cpp +++ b/kaffeine/src/input/audiobrowser/urllistview.cpp @@ -45,9 +45,9 @@ UrlListView::UrlListView(TQWidget *parent, const char *name ) : TDEListView(pare m_contextMenu->insertItem(i18n("Play Next/Add to Queue"), this, TQT_SLOT(slotPlayNext())); m_contextMenu->insertSeparator(); - m_contextMenu->insertItem(TDEGlobal::iconLoader()->loadIconSet("editcut", TDEIcon::Small), i18n("C&ut"), this, TQT_SIGNAL(signalCut()), CTRL+Key_X); - m_contextMenu->insertItem(TDEGlobal::iconLoader()->loadIconSet("editcopy", TDEIcon::Small), i18n("&Copy"), this, TQT_SIGNAL(signalCopy()), CTRL+Key_C); - m_contextMenu->insertItem(TDEGlobal::iconLoader()->loadIconSet("editpaste", TDEIcon::Small), i18n("&Paste"), this, TQT_SIGNAL(signalPaste()), CTRL+Key_V); + m_contextMenu->insertItem(TDEGlobal::iconLoader()->loadIconSet("edit-cut", TDEIcon::Small), i18n("C&ut"), this, TQT_SIGNAL(signalCut()), CTRL+Key_X); + m_contextMenu->insertItem(TDEGlobal::iconLoader()->loadIconSet("edit-copy", TDEIcon::Small), i18n("&Copy"), this, TQT_SIGNAL(signalCopy()), CTRL+Key_C); + m_contextMenu->insertItem(TDEGlobal::iconLoader()->loadIconSet("edit-paste", TDEIcon::Small), i18n("&Paste"), this, TQT_SIGNAL(signalPaste()), CTRL+Key_V); m_contextMenu->insertItem(i18n("Select &All"), this, TQT_SIGNAL(signalSelectAll()), CTRL+Key_A); m_contextMenu->insertItem(i18n("Create Playlist From Selected"), this, TQT_SIGNAL(signalPlaylistFromSelected())); m_contextMenu->insertSeparator(); diff --git a/kaffeine/src/input/disc/paranoia.cpp b/kaffeine/src/input/disc/paranoia.cpp index 1e3722f..bd75770 100644 --- a/kaffeine/src/input/disc/paranoia.cpp +++ b/kaffeine/src/input/disc/paranoia.cpp @@ -57,7 +57,7 @@ KiloConfig::KiloConfig( TQWidget *parent, TDEConfig *confile, const TQStringList TDEIconLoader *icon = new TDEIconLoader(); okBtn->setGuiItem( KGuiItem(i18n("OK"), icon->loadIconSet("ok", TDEIcon::Small) ) ); cancelBtn->setGuiItem( KGuiItem(i18n("Cancel"), icon->loadIconSet("cancel", TDEIcon::Small) ) ); - baseDirBtn->setIconSet( icon->loadIconSet("fileopen", TDEIcon::Small) ); + baseDirBtn->setIconSet( icon->loadIconSet("document-open", TDEIcon::Small) ); delete icon; connect( baseDirBtn, TQT_SIGNAL( clicked() ), this, TQT_SLOT( setBaseDir() ) ); Conf = confile; diff --git a/kaffeine/src/input/dvb/dvbconfig.cpp b/kaffeine/src/input/dvb/dvbconfig.cpp index 9e15e36..4d188b1 100644 --- a/kaffeine/src/input/dvb/dvbconfig.cpp +++ b/kaffeine/src/input/dvb/dvbconfig.cpp @@ -838,7 +838,7 @@ DvbConfigDialog::DvbConfigDialog( DvbPanel *pan, DVBconfig *dc, TQWidget *parent recordDirLe->setReadOnly( true ); grid->addWidget( recordDirLe, 0, 1 ); recordDirBtn = new TQToolButton( gb ); - recordDirBtn->setIconSet( icon->loadIconSet("fileopen", TDEIcon::Small) ); + recordDirBtn->setIconSet( icon->loadIconSet("document-open", TDEIcon::Small) ); grid->addWidget( recordDirBtn, 0, 2 ); lab = new TQLabel( i18n("Time shifting directory:"), gb ); @@ -847,7 +847,7 @@ DvbConfigDialog::DvbConfigDialog( DvbPanel *pan, DVBconfig *dc, TQWidget *parent shiftDirLe->setReadOnly( true ); grid->addWidget( shiftDirLe, 1, 1 ); shiftDirBtn = new TQToolButton( gb ); - shiftDirBtn->setIconSet( icon->loadIconSet("fileopen", TDEIcon::Small) ); + shiftDirBtn->setIconSet( icon->loadIconSet("document-open", TDEIcon::Small) ); grid->addWidget( shiftDirBtn, 1, 2 ); lab = new TQLabel( i18n("Begin margin:"), gb ); @@ -968,7 +968,7 @@ DvbConfigDialog::DvbConfigDialog( DvbPanel *pan, DVBconfig *dc, TQWidget *parent lab = new TQLabel( i18n("Dump epg's events to \n~/kaffeine_dvb_events.tx:"), gb ); grid->addWidget( lab, 4, 0 ); dumpBtn = new KPushButton( gb ); - dumpBtn->setGuiItem( KGuiItem(i18n("Dump"), icon->loadIconSet("filesave", TDEIcon::Small) ) ); + dumpBtn->setGuiItem( KGuiItem(i18n("Dump"), icon->loadIconSet("document-save", TDEIcon::Small) ) ); grid->addWidget( dumpBtn, 4, 1 ); vb->addWidget( gb ); diff --git a/kaffeine/src/input/dvb/dvbpanel.cpp b/kaffeine/src/input/dvb/dvbpanel.cpp index 1674a9f..5c8cdd7 100644 --- a/kaffeine/src/input/dvb/dvbpanel.cpp +++ b/kaffeine/src/input/dvb/dvbpanel.cpp @@ -239,7 +239,7 @@ DvbPanel::DvbPanel( TQWidget *parent, TQObject *objParent, const char *name ) : raPix = icon->loadIcon( "kdvbra", TDEIcon::Small ); racPix = icon->loadIcon( "kdvbrac", TDEIcon::Small ); TQIconSet iconset; - iconset.setPixmap( icon->loadIcon( "filesave", TDEIcon::Small ), TQIconSet::Small ); + iconset.setPixmap( icon->loadIcon( "document-save", TDEIcon::Small ), TQIconSet::Small ); iconset.setPixmap( icon->loadIcon( "player_record", TDEIcon::Small), TQIconSet::Small, TQIconSet::Normal, TQIconSet::On ); recordBtn->setIconSet( iconset ); broadcastBtn->setIconSet( icon->loadIconSet("network_local", TDEIcon::Small) ); @@ -440,7 +440,7 @@ void DvbPanel::setupActions() new TDEAction(i18n("OSD Zap"), "ok", CTRL+SHIFT+Key_E, this, TQT_SLOT(dvbOSDZap()), actionCollection(), "dvb_browse_zap"); new TDEAction(i18n("OSD Next Event"), "go-down", CTRL+SHIFT+Key_S, this, TQT_SLOT(dvbOSDAdvance()), actionCollection(), "dvb_browse_advance"); new TDEAction(i18n("OSD Previous Event"), "go-up", CTRL+SHIFT+Key_A, this, TQT_SLOT(dvbOSDRetreat()), actionCollection(), "dvb_browse_retreat"); - new TDEAction(i18n("Instant Record"), "filesave", 0, this, TQT_SLOT(setRecord()), actionCollection(), "dvb_instant_record"); + new TDEAction(i18n("Instant Record"), "document-save", 0, this, TQT_SLOT(setRecord()), actionCollection(), "dvb_instant_record"); new TDEAction(i18n("Recall"), "reload", CTRL+SHIFT+Key_Z, this, TQT_SLOT(recallZap()), actionCollection(), "dvb_recall"); new TDEAction(i18n("Show OSD"), "info", Key_O, this, TQT_SLOT(dvbOSD()), actionCollection(), "dvb_show_osd"); new TDEAction(i18n("EPG..."), "view_text", Key_G, this, TQT_SLOT(showEvents()), actionCollection(), "dvb_show_epg"); diff --git a/kaffeine/src/input/dvb/krecord.cpp b/kaffeine/src/input/dvb/krecord.cpp index ca9fa92..82df57d 100644 --- a/kaffeine/src/input/dvb/krecord.cpp +++ b/kaffeine/src/input/dvb/krecord.cpp @@ -86,10 +86,10 @@ KRecord::KRecord( TQStringList chanList, TQPtrList *t, TQWidget *paren vb2->addLayout( hb1 ); TDEIconLoader *icon = new TDEIconLoader(); - newBtn->setGuiItem( KGuiItem(i18n("New"), icon->loadIconSet("filenew", TDEIcon::Small) ) ); + newBtn->setGuiItem( KGuiItem(i18n("New"), icon->loadIconSet("document-new", TDEIcon::Small) ) ); editBtn->setGuiItem( KGuiItem(i18n("Edit"), icon->loadIconSet("edit", TDEIcon::Small) ) ); //editBtn->setEnabled( false ); - deleteBtn->setGuiItem( KGuiItem(i18n("Stop/Delete"), icon->loadIconSet("editcut", TDEIcon::Small) ) ); + deleteBtn->setGuiItem( KGuiItem(i18n("Stop/Delete"), icon->loadIconSet("edit-cut", TDEIcon::Small) ) ); okBtn->setGuiItem( KGuiItem(i18n("Close"), icon->loadIconSet("system-log-out", TDEIcon::Small) ) ); isRecording = icon->loadIcon("player_record", TDEIcon::Small); @@ -229,7 +229,7 @@ void KRecord::deleteTimer() while ( it!=0 ) { if ( it->isSelected() ) { if ( timers->at(i)->mode ) - ret = KMessageBox::questionYesNoCancel( this, i18n("This timer is repeated. Do you want to skip the current job or delete the timer?"), i18n("Warning"), KGuiItem(i18n("Skip Current"), icon->loadIconSet("next", TDEIcon::Small) ), KGuiItem(i18n("Delete"), icon->loadIconSet("editcut", TDEIcon::Small) ) ); + ret = KMessageBox::questionYesNoCancel( this, i18n("This timer is repeated. Do you want to skip the current job or delete the timer?"), i18n("Warning"), KGuiItem(i18n("Skip Current"), icon->loadIconSet("next", TDEIcon::Small) ), KGuiItem(i18n("Delete"), icon->loadIconSet("edit-cut", TDEIcon::Small) ) ); else ret = KMessageBox::questionYesNo( this, i18n("Delete the selected timer?") ); if ( ret==KMessageBox::Yes ) { diff --git a/kaffeine/src/player-parts/xine-part/xine_part.cpp b/kaffeine/src/player-parts/xine-part/xine_part.cpp index 0f27025..8185c89 100644 --- a/kaffeine/src/player-parts/xine-part/xine_part.cpp +++ b/kaffeine/src/player-parts/xine-part/xine_part.cpp @@ -1276,7 +1276,7 @@ void XinePart::slotFinalize() actionCollection()->action("file_save_screenshot")->plug(m_embeddedContext); actionCollection()->action("file_save_stream")->plug(m_embeddedContext); m_embeddedContext->insertSeparator(); - action = new TDEAction(i18n("Copy URL to Clipboard"), "editcopy", 0, TQT_TQOBJECT(this), TQT_SLOT(slotCopyToClipboard()), actionCollection(), "copy_to_clipboard"); + action = new TDEAction(i18n("Copy URL to Clipboard"), "edit-copy", 0, TQT_TQOBJECT(this), TQT_SLOT(slotCopyToClipboard()), actionCollection(), "copy_to_clipboard"); action->plug(m_embeddedContext); action = new TDEAction(i18n("Play in Kaffeine Externally"), "gear", 0, TQT_TQOBJECT(this), TQT_SLOT(slotLaunchExternally()), actionCollection(), "play_externally"); action->plug(m_embeddedContext); diff --git a/kaffeine/src/pref.cpp b/kaffeine/src/pref.cpp index ba03eaf..e60a853 100644 --- a/kaffeine/src/pref.cpp +++ b/kaffeine/src/pref.cpp @@ -115,7 +115,7 @@ KaffeinePreferences::KaffeinePreferences() : KDialogBase(IconList,i18n("Kaffeine m_shiftDirLe->setReadOnly( true ); grid->addWidget( m_shiftDirLe, 3, 1 ); m_shiftDirBtn = new TQToolButton( gb ); - m_shiftDirBtn->setIconSet( icon->loadIconSet("fileopen", TDEIcon::Small) ); + m_shiftDirBtn->setIconSet( icon->loadIconSet("document-open", TDEIcon::Small) ); grid->addWidget( m_shiftDirBtn, 3, 2 ); connect( m_shiftDirBtn, TQT_SIGNAL(clicked()), this, TQT_SLOT(setShiftDir()) );