Bring filenew, fileopen, fileprint, filequickprint, filesave, filesaveas, fileclose, editclear, editcopy, editcut, editdelete, editpaste, folder_new, and gohome icons into XDG compliance

pull/1/head
Timothy Pearson 11 years ago
parent d2e50abf12
commit ba417264f4

@ -232,7 +232,7 @@ void K3bMainWindow::initActions()
setStandardToolBarMenuEnabled(true); setStandardToolBarMenuEnabled(true);
KStdAction::showMenubar( TQT_TQOBJECT(this), TQT_SLOT(slotShowMenuBar()), actionCollection() ); KStdAction::showMenubar( TQT_TQOBJECT(this), TQT_SLOT(slotShowMenuBar()), actionCollection() );
actionFileNewMenu = new TDEActionMenu( i18n("&New Project"), "filenew", actionCollection(), "file_new" ); actionFileNewMenu = new TDEActionMenu( i18n("&New Project"), "document-new", actionCollection(), "file_new" );
actionFileNewAudio = new TDEAction(i18n("New &Audio CD Project"), "audiocd", 0, TQT_TQOBJECT(this), TQT_SLOT(slotNewAudioDoc()), actionFileNewAudio = new TDEAction(i18n("New &Audio CD Project"), "audiocd", 0, TQT_TQOBJECT(this), TQT_SLOT(slotNewAudioDoc()),
actionCollection(), "file_new_audio"); actionCollection(), "file_new_audio");
actionFileNewData = new TDEAction(i18n("New Data &CD Project"), "datacd", 0, TQT_TQOBJECT(this), TQT_SLOT(slotNewDataDoc()), actionFileNewData = new TDEAction(i18n("New Data &CD Project"), "datacd", 0, TQT_TQOBJECT(this), TQT_SLOT(slotNewDataDoc()),
@ -271,7 +271,7 @@ void K3bMainWindow::initActions()
actionProjectAddFiles = new TDEAction( i18n("&Add Files..."), "filenew", 0, TQT_TQOBJECT(this), TQT_SLOT(slotProjectAddFiles()), actionProjectAddFiles = new TDEAction( i18n("&Add Files..."), "document-new", 0, TQT_TQOBJECT(this), TQT_SLOT(slotProjectAddFiles()),
actionCollection(), "project_add_files"); actionCollection(), "project_add_files");
TDEAction* actionClearProject = new TDEAction( i18n("&Clear Project"), TQApplication::reverseLayout() ? "clear_left" : "locationbar_erase", 0, TDEAction* actionClearProject = new TDEAction( i18n("&Clear Project"), TQApplication::reverseLayout() ? "clear_left" : "locationbar_erase", 0,

@ -222,10 +222,10 @@ K3bAudioPlayer::K3bAudioPlayer( TQWidget* parent, const char* name )
// actions // actions
// ------------------------------------------------------------------------ // ------------------------------------------------------------------------
m_actionRemove = new TDEAction( i18n( "Remove" ), "editdelete", m_actionRemove = new TDEAction( i18n( "Remove" ), "edit-delete",
Key_Delete, this, TQT_SLOT(slotRemoveSelected()), Key_Delete, this, TQT_SLOT(slotRemoveSelected()),
this, "audioplayer_remove" ); this, "audioplayer_remove" );
m_actionClear = new TDEAction( i18n( "Clear List" ), "editclear", m_actionClear = new TDEAction( i18n( "Clear List" ), "edit-clear",
0, this, TQT_SLOT(clear()), 0, this, TQT_SLOT(clear()),
this, "audioplayer_clear" ); this, "audioplayer_clear" );

@ -39,7 +39,7 @@ K3bDebuggingOutputDialog::K3bDebuggingOutputDialog( TQWidget* parent )
: KDialogBase( parent, "debugViewDialog", true, i18n("Debugging Output"), Close|User1|User2, Close, : KDialogBase( parent, "debugViewDialog", true, i18n("Debugging Output"), Close|User1|User2, Close,
false, false,
KStdGuiItem::saveAs(), KStdGuiItem::saveAs(),
KGuiItem( i18n("Copy"), "editcopy" ) ) KGuiItem( i18n("Copy"), "edit-copy" ) )
{ {
setButtonTip( User1, i18n("Save to file") ); setButtonTip( User1, i18n("Save to file") );
setButtonTip( User2, i18n("Copy to clipboard") ); setButtonTip( User2, i18n("Copy to clipboard") );

@ -94,7 +94,7 @@ K3bInteractionDialog::K3bInteractionDialog( TQWidget* parent,
layout2->addWidget( m_buttonLoadSettings ); layout2->addWidget( m_buttonLoadSettings );
m_buttonSaveSettings = new TQToolButton( /*i18n("Save User Defaults"), */this, "m_buttonSaveSettings" ); m_buttonSaveSettings = new TQToolButton( /*i18n("Save User Defaults"), */this, "m_buttonSaveSettings" );
((TQToolButton*)m_buttonSaveSettings)->setIconSet( SmallIconSet( "filesave" ) ); ((TQToolButton*)m_buttonSaveSettings)->setIconSet( SmallIconSet( "document-save" ) );
layout2->addWidget( m_buttonSaveSettings ); layout2->addWidget( m_buttonSaveSettings );
mainGrid->addLayout( layout2, 2, 0 ); mainGrid->addLayout( layout2, 2, 0 );

@ -143,7 +143,7 @@ void K3bProjectTabWidget::slotDocChanged( K3bDoc* doc )
{ {
// we need to cache the icon changes since the changed() signal will be emitted very often // we need to cache the icon changes since the changed() signal will be emitted very often
if( !m_projectDataMap[doc].modified ) { if( !m_projectDataMap[doc].modified ) {
setTabIconSet( doc->view(), SmallIconSet( "filesave" ) ); setTabIconSet( doc->view(), SmallIconSet( "document-save" ) );
m_projectDataMap[doc].modified = true; m_projectDataMap[doc].modified = true;
// we need this one for the session management // we need this one for the session management

@ -58,14 +58,14 @@ K3bAudioCdTextWidget::K3bAudioCdTextWidget( TQWidget* parent, const char* name )
{ {
m_allFieldsDlg = new AllFieldsDialog( this ); m_allFieldsDlg = new AllFieldsDialog( this );
m_buttonCopyTitle->setPixmap( SmallIcon( "editcopy" ) ); m_buttonCopyTitle->setPixmap( SmallIcon( "edit-copy" ) );
m_buttonCopyPerformer->setPixmap( SmallIcon( "editcopy" ) ); m_buttonCopyPerformer->setPixmap( SmallIcon( "edit-copy" ) );
m_allFieldsDlg->w->m_buttonCopyTitle->setPixmap( SmallIcon( "editcopy" ) ); m_allFieldsDlg->w->m_buttonCopyTitle->setPixmap( SmallIcon( "edit-copy" ) );
m_allFieldsDlg->w->m_buttonCopyPerformer->setPixmap( SmallIcon( "editcopy" ) ); m_allFieldsDlg->w->m_buttonCopyPerformer->setPixmap( SmallIcon( "edit-copy" ) );
m_allFieldsDlg->w->m_buttonCopySongwriter->setPixmap( SmallIcon( "editcopy" ) ); m_allFieldsDlg->w->m_buttonCopySongwriter->setPixmap( SmallIcon( "edit-copy" ) );
m_allFieldsDlg->w->m_buttonCopyComposer->setPixmap( SmallIcon( "editcopy" ) ); m_allFieldsDlg->w->m_buttonCopyComposer->setPixmap( SmallIcon( "edit-copy" ) );
m_allFieldsDlg->w->m_buttonCopyArranger->setPixmap( SmallIcon( "editcopy" ) ); m_allFieldsDlg->w->m_buttonCopyArranger->setPixmap( SmallIcon( "edit-copy" ) );
TQValidator* cdTextVal = new K3bCdTextValidator( TQT_TQOBJECT(this) ); TQValidator* cdTextVal = new K3bCdTextValidator( TQT_TQOBJECT(this) );
m_editTitle->setValidator( cdTextVal ); m_editTitle->setValidator( cdTextVal );

@ -157,7 +157,7 @@ void K3bAudioTrackView::setupActions()
m_actionProperties = new TDEAction( i18n("Properties"), "misc", m_actionProperties = new TDEAction( i18n("Properties"), "misc",
TDEShortcut(), TQT_TQOBJECT(this), TQT_SLOT(slotProperties()), TDEShortcut(), TQT_TQOBJECT(this), TQT_SLOT(slotProperties()),
actionCollection(), "track_properties" ); actionCollection(), "track_properties" );
m_actionRemove = new TDEAction( i18n( "Remove" ), "editdelete", m_actionRemove = new TDEAction( i18n( "Remove" ), "edit-delete",
Key_Delete, TQT_TQOBJECT(this), TQT_SLOT(slotRemove()), Key_Delete, TQT_TQOBJECT(this), TQT_SLOT(slotRemove()),
actionCollection(), "track_remove" ); actionCollection(), "track_remove" );

@ -282,9 +282,9 @@ void K3bDataDirTreeView::setupActions()
m_actionProperties = new TDEAction( i18n("Properties"), "misc", 0, TQT_TQOBJECT(this), TQT_SLOT(slotProperties()), m_actionProperties = new TDEAction( i18n("Properties"), "misc", 0, TQT_TQOBJECT(this), TQT_SLOT(slotProperties()),
actionCollection(), "properties" ); actionCollection(), "properties" );
m_actionNewDir = new TDEAction( i18n("New Directory..."), "folder_new", CTRL+Key_N, TQT_TQOBJECT(this), TQT_SLOT(slotNewDir()), m_actionNewDir = new TDEAction( i18n("New Directory..."), "folder-new", CTRL+Key_N, TQT_TQOBJECT(this), TQT_SLOT(slotNewDir()),
actionCollection(), "new_dir" ); actionCollection(), "new_dir" );
m_actionRemove = new TDEAction( i18n("Remove"), "editdelete", Key_Delete, TQT_TQOBJECT(this), TQT_SLOT(slotRemoveItem()), m_actionRemove = new TDEAction( i18n("Remove"), "edit-delete", Key_Delete, TQT_TQOBJECT(this), TQT_SLOT(slotRemoveItem()),
actionCollection(), "remove" ); actionCollection(), "remove" );
TDEShortcut renameShortCut( Key_F2 ); TDEShortcut renameShortCut( Key_F2 );
renameShortCut.append( TDEShortcut(CTRL+Key_R) ); // backwards compatibility renameShortCut.append( TDEShortcut(CTRL+Key_R) ); // backwards compatibility

@ -321,9 +321,9 @@ void K3bDataFileView::setupActions()
m_actionProperties = new TDEAction( i18n("Properties"), "misc", 0, TQT_TQOBJECT(this), TQT_SLOT(slotProperties()), m_actionProperties = new TDEAction( i18n("Properties"), "misc", 0, TQT_TQOBJECT(this), TQT_SLOT(slotProperties()),
actionCollection(), "properties" ); actionCollection(), "properties" );
m_actionNewDir = new TDEAction( i18n("New Directory..."), "folder_new", CTRL+Key_N, TQT_TQOBJECT(this), TQT_SLOT(slotNewDir()), m_actionNewDir = new TDEAction( i18n("New Directory..."), "folder-new", CTRL+Key_N, TQT_TQOBJECT(this), TQT_SLOT(slotNewDir()),
actionCollection(), "new_dir" ); actionCollection(), "new_dir" );
m_actionRemove = new TDEAction( i18n("Remove"), "editdelete", Key_Delete, TQT_TQOBJECT(this), TQT_SLOT(slotRemoveItem()), m_actionRemove = new TDEAction( i18n("Remove"), "edit-delete", Key_Delete, TQT_TQOBJECT(this), TQT_SLOT(slotRemoveItem()),
actionCollection(), "remove" ); actionCollection(), "remove" );
TDEShortcut renameShortCut( Key_F2 ); TDEShortcut renameShortCut( Key_F2 );
renameShortCut.append( TDEShortcut(CTRL+Key_R) ); // backwards compatibility renameShortCut.append( TDEShortcut(CTRL+Key_R) ); // backwards compatibility
@ -331,7 +331,7 @@ void K3bDataFileView::setupActions()
actionCollection(), "rename" ); actionCollection(), "rename" );
m_actionParentDir = new TDEAction( i18n("Parent Directory"), "go-up", 0, TQT_TQOBJECT(this), TQT_SLOT(slotParentDir()), m_actionParentDir = new TDEAction( i18n("Parent Directory"), "go-up", 0, TQT_TQOBJECT(this), TQT_SLOT(slotParentDir()),
actionCollection(), "parent_dir" ); actionCollection(), "parent_dir" );
m_actionOpen = new TDEAction( i18n("Open"), "fileopen", 0, TQT_TQOBJECT(this), TQT_SLOT(slotOpen()), m_actionOpen = new TDEAction( i18n("Open"), "document-open", 0, TQT_TQOBJECT(this), TQT_SLOT(slotOpen()),
actionCollection(), "open" ); actionCollection(), "open" );
m_popupMenu = new TDEActionMenu( m_actionCollection, "contextMenu" ); m_popupMenu = new TDEActionMenu( m_actionCollection, "contextMenu" );

@ -53,10 +53,10 @@ K3bMovixView::K3bMovixView( K3bMovixDoc* doc, TQWidget* parent, const char* name
m_actionProperties = new TDEAction( i18n("Properties"), "misc", m_actionProperties = new TDEAction( i18n("Properties"), "misc",
0, TQT_TQOBJECT(this), TQT_SLOT(showPropertiesDialog()), 0, TQT_TQOBJECT(this), TQT_SLOT(showPropertiesDialog()),
actionCollection(), "movix_show_props" ); actionCollection(), "movix_show_props" );
m_actionRemove = new TDEAction( i18n( "Remove" ), "editdelete", m_actionRemove = new TDEAction( i18n( "Remove" ), "edit-delete",
Key_Delete, TQT_TQOBJECT(this), TQT_SLOT(slotRemoveItems()), Key_Delete, TQT_TQOBJECT(this), TQT_SLOT(slotRemoveItems()),
actionCollection(), "movix_remove_item" ); actionCollection(), "movix_remove_item" );
m_actionRemoveSubTitle = new TDEAction( i18n( "Remove Subtitle File" ), "editdelete", m_actionRemoveSubTitle = new TDEAction( i18n( "Remove Subtitle File" ), "edit-delete",
0, TQT_TQOBJECT(this), TQT_SLOT(slotRemoveSubTitleItems()), 0, TQT_TQOBJECT(this), TQT_SLOT(slotRemoveSubTitleItems()),
actionCollection(), "movix_remove_subtitle_item" ); actionCollection(), "movix_remove_subtitle_item" );
m_actionAddSubTitle = new TDEAction( i18n("Add Subtitle File..."), "", m_actionAddSubTitle = new TDEAction( i18n("Add Subtitle File..."), "",

@ -95,7 +95,7 @@ void K3bVcdListView::setupActions()
{ {
m_actionCollection = new TDEActionCollection( this ); m_actionCollection = new TDEActionCollection( this );
m_actionProperties = new TDEAction( i18n( "Properties" ), "misc", 0, TQT_TQOBJECT(this), TQT_SLOT( showPropertiesDialog() ), actionCollection() ); m_actionProperties = new TDEAction( i18n( "Properties" ), "misc", 0, TQT_TQOBJECT(this), TQT_SLOT( showPropertiesDialog() ), actionCollection() );
m_actionRemove = new TDEAction( i18n( "Remove" ), "editdelete", Key_Delete, TQT_TQOBJECT(this), TQT_SLOT( slotRemoveTracks() ), actionCollection() ); m_actionRemove = new TDEAction( i18n( "Remove" ), "edit-delete", Key_Delete, TQT_TQOBJECT(this), TQT_SLOT( slotRemoveTracks() ), actionCollection() );
// disabled by default // disabled by default
m_actionRemove->setEnabled( false ); m_actionRemove->setEnabled( false );

@ -251,7 +251,7 @@ void K3bAudioCdView::initActions()
TDEAction* actionQueryCddb = new TDEAction( i18n("Query cddb"), "reload", 0, TQT_TQOBJECT(this), TDEAction* actionQueryCddb = new TDEAction( i18n("Query cddb"), "reload", 0, TQT_TQOBJECT(this),
TQT_SLOT(queryCddb()), actionCollection(), "query_cddb" ); TQT_SLOT(queryCddb()), actionCollection(), "query_cddb" );
TDEAction* actionSaveCddbLocally = new TDEAction( i18n("Save Cddb Entry Locally"), "filesave", 0, TQT_TQOBJECT(this), TDEAction* actionSaveCddbLocally = new TDEAction( i18n("Save Cddb Entry Locally"), "document-save", 0, TQT_TQOBJECT(this),
TQT_SLOT(slotSaveCddbLocally()), actionCollection(), "save_cddb_local" ); TQT_SLOT(slotSaveCddbLocally()), actionCollection(), "save_cddb_local" );
// TODO: set the actions tooltips and whatsthis infos // TODO: set the actions tooltips and whatsthis infos

Loading…
Cancel
Save