50e3d450 | 2014-10-13 15:43:57 | Timothy Pearson |
Bring filenew, fileopen, fileprint, filequickprint, filesave, filesaveas, fileclose, editclear, editcopy, editcut, editdelete, editpaste, folder_new, and gohome icons into XDG compliance |
||
M kfax/kfax.cpp M kooka/imageselectline.cpp M kooka/kooka.cpp M kooka/kookapref.cpp M kooka/scanpackager.cpp M kpdf/part.cpp M kpdf/ui/pageview.cpp M kpovmodeler/pmbumpmapedit.cpp M kpovmodeler/pmheightfieldedit.cpp M kpovmodeler/pmimagemapedit.cpp M kpovmodeler/pmlibrarybrowser.cpp M kpovmodeler/pmmaterialmapedit.cpp M kpovmodeler/pmpatternedit.cpp M kpovmodeler/pmpovraysettings.cpp M kpovmodeler/pmtextedit.cpp M kview/kview.cpp |
||
diff --git a/kfax/kfax.cpp b/kfax/kfax.cpp index 1d4b4b4..819c81a 100644 --- a/kfax/kfax.cpp +++ b/kfax/kfax.cpp @@ -244,7 +244,7 @@ actionCollection() ); actPrint = KStdAction::print( TQT_TQOBJECT(this), TQT_SLOT( print() ), actionCollection() ); KStdAction::quit( TQT_TQOBJECT(this), TQT_SLOT( close() ), actionCollection() ); - actAdd = new TDEAction( i18n( "A&dd..." ), "filenew", TDEShortcut(), TQT_TQOBJECT(this), + actAdd = new TDEAction( i18n( "A&dd..." ), "document-new", TDEShortcut(), TQT_TQOBJECT(this), TQT_SLOT( faxAdd() ), actionCollection(), "file_add_fax" ); actRecent->setMaxItems( 5 ); diff --git a/kooka/imageselectline.cpp b/kooka/imageselectline.cpp index 71135dc..4b83c5b 100644 --- a/kooka/imageselectline.cpp +++ b/kooka/imageselectline.cpp @@ -54,7 +54,7 @@ (void) new TQLabel( text, this ); m_urlCombo = new KURLComboBox( KURLComboBox::Files, this ); m_buttFileSelect = new TQPushButton( this ); - m_buttFileSelect->setPixmap( SmallIcon( "fileopen" ) ); + m_buttFileSelect->setPixmap( SmallIcon( "document-open" ) ); m_urlCombo->setMaxItems(5); diff --git a/kooka/kooka.cpp b/kooka/kooka.cpp index 06e68f5..58c368a 100644 --- a/kooka/kooka.cpp +++ b/kooka/kooka.cpp @@ -200,7 +200,7 @@ TQT_TQOBJECT(this), TQT_SLOT( slMirrorBoth() ), actionCollection(), "mirrorBoth" ); - (void) new TDEAction(i18n("Open Image in &Graphic Application..."), "fileopen", CTRL+Key_G, + (void) new TDEAction(i18n("Open Image in &Graphic Application..."), "document-open", CTRL+Key_G, TQT_TQOBJECT(m_view), TQT_SLOT( slOpenCurrInGraphApp() ), actionCollection(), "openInGraphApp" ); @@ -220,12 +220,12 @@ m_view->connectViewerAction( act ); /* Gallery actions */ - act = new TDEAction(i18n("&Create Folder..."), "folder_new", 0, + act = new TDEAction(i18n("&Create Folder..."), "folder-new", 0, TQT_TQOBJECT(m_view->gallery()),TQT_SLOT( slotCreateFolder() ), actionCollection(), "foldernew" ); m_view->connectGalleryAction( act ); - act = new TDEAction(i18n("&Save Image..."), "filesave", 0, + act = new TDEAction(i18n("&Save Image..."), "document-save", 0, TQT_TQOBJECT(m_view->gallery()),TQT_SLOT( slotExportFile() ), actionCollection(), "saveImage" ); m_view->connectGalleryAction( act ); @@ -240,7 +240,7 @@ actionCollection(), "deleteImage" ); m_view->connectGalleryAction( act ); - act = new TDEAction(i18n("&Unload Image"), "fileclose", 0, + act = new TDEAction(i18n("&Unload Image"), "window-close", 0, TQT_TQOBJECT(m_view->gallery()),TQT_SLOT( slotUnloadItems() ), actionCollection(), "unloadImage" ); m_view->connectGalleryAction( act ); @@ -265,7 +265,7 @@ actionCollection(), "enable_msgs"); - m_saveOCRTextAction = new TDEAction( i18n("Save OCR Res&ult Text"), "filesaveas", CTRL+Key_U, + m_saveOCRTextAction = new TDEAction( i18n("Save OCR Res&ult Text"), "document-save-as", CTRL+Key_U, m_view, TQT_SLOT(slSaveOCRResult()), actionCollection(), "saveOCRResult"); } diff --git a/kooka/kookapref.cpp b/kooka/kookapref.cpp index d170840..729f242 100644 --- a/kooka/kookapref.cpp +++ b/kooka/kookapref.cpp @@ -351,7 +351,7 @@ { konf->setGroup( OP_FILE_GROUP ); TQFrame *page = addPage( i18n("Image Saving"), i18n("Configure Image Save Assistant" ), - BarIcon("filesave", TDEIcon::SizeMedium ) ); + BarIcon("document-save", TDEIcon::SizeMedium ) ); TQVBoxLayout *top = new TQVBoxLayout( page, 0, spacingHint() ); /* Skip the format asking if a format entry exists */ diff --git a/kooka/scanpackager.cpp b/kooka/scanpackager.cpp index 9f4ccd8..daa2cd3 100644 --- a/kooka/scanpackager.cpp +++ b/kooka/scanpackager.cpp @@ -599,7 +599,7 @@ } prevItem = subImgItem; - subImgItem->setPixmap( 0, loader->loadIcon( "editcopy", TDEIcon::Small )); + subImgItem->setPixmap( 0, loader->loadIcon( "edit-copy", TDEIcon::Small )); subImgItem->setText( 0, i18n("Sub-image %1").arg( i ) ); KookaImage *subImgImg = new KookaImage( i, img ); subImgImg->setFileItem( newKfi ); diff --git a/kpdf/part.cpp b/kpdf/part.cpp index 284fd1a..8d325fc 100644 --- a/kpdf/part.cpp +++ b/kpdf/part.cpp @@ -954,7 +954,7 @@ //Albert says: I have not ported this as i don't see it does anything if ( d->mouseOnRect ) // and rect->objectType() == ObjectRect::Image ... { - m_popup->insertItem( SmallIcon("filesave"), i18n("Save Image..."), 4 ); + m_popup->insertItem( SmallIcon("document-save"), i18n("Save Image..."), 4 ); m_popup->setItemEnabled( 4, false ); }*/ diff --git a/kpdf/ui/pageview.cpp b/kpdf/ui/pageview.cpp index 76a8577..c008fe2 100644 --- a/kpdf/ui/pageview.cpp +++ b/kpdf/ui/pageview.cpp @@ -1125,7 +1125,7 @@ if ( !selectedText.isEmpty() ) { menu.insertTitle( i18n( "Text (1 character)", "Text (%n characters)", selectedText.length() ) ); - menu.insertItem( SmallIcon("editcopy"), i18n( "Copy to Clipboard" ), 1 ); + menu.insertItem( SmallIcon("edit-copy"), i18n( "Copy to Clipboard" ), 1 ); if ( !d->document->isAllowed( KPDFDocument::AllowCopy ) ) menu.setItemEnabled( 1, false ); if ( KpdfSettings::useKTTSD() ) @@ -1133,7 +1133,7 @@ } menu.insertTitle( i18n( "Image (%1 by %2 pixels)" ).arg( selectionRect.width() ).arg( selectionRect.height() ) ); menu.insertItem( SmallIcon("image"), i18n( "Copy to Clipboard" ), 3 ); - menu.insertItem( SmallIcon("filesave"), i18n( "Save to File..." ), 4 ); + menu.insertItem( SmallIcon("document-save"), i18n( "Save to File..." ), 4 ); int choice = menu.exec( e->globalPos() ); // IMAGE operation choosen if ( choice > 2 ) diff --git a/kpovmodeler/pmbumpmapedit.cpp b/kpovmodeler/pmbumpmapedit.cpp index 10cb65f..6b0b81d 100644 --- a/kpovmodeler/pmbumpmapedit.cpp +++ b/kpovmodeler/pmbumpmapedit.cpp @@ -70,7 +70,7 @@ lbl = new TQLabel( i18n( "File name:" ), this ); m_pImageFileNameEdit = new TQLineEdit( this ); m_pImageFileNameBrowse = new TQPushButton( this ); - m_pImageFileNameBrowse->setPixmap( SmallIcon( "fileopen" ) ); + m_pImageFileNameBrowse->setPixmap( SmallIcon( "document-open" ) ); hl->addWidget( lbl ); hl->addWidget( m_pImageFileNameEdit ); hl->addWidget( m_pImageFileNameBrowse ); diff --git a/kpovmodeler/pmheightfieldedit.cpp b/kpovmodeler/pmheightfieldedit.cpp index 337ec6f..e51f488 100644 --- a/kpovmodeler/pmheightfieldedit.cpp +++ b/kpovmodeler/pmheightfieldedit.cpp @@ -59,7 +59,7 @@ m_pFileName = new TQLineEdit( this ); hl->addWidget( m_pFileName ); m_pChooseFileName = new TQPushButton( this ); - m_pChooseFileName->setPixmap( SmallIcon( "fileopen" ) ); + m_pChooseFileName->setPixmap( SmallIcon( "document-open" ) ); hl->addWidget( m_pChooseFileName ); hl = new TQHBoxLayout( topLayout( ) ); diff --git a/kpovmodeler/pmimagemapedit.cpp b/kpovmodeler/pmimagemapedit.cpp index 9ba8627..5301009 100644 --- a/kpovmodeler/pmimagemapedit.cpp +++ b/kpovmodeler/pmimagemapedit.cpp @@ -70,7 +70,7 @@ lbl = new TQLabel( i18n( "File name:" ), this ); m_pImageFileNameEdit = new TQLineEdit( this ); m_pImageFileNameBrowse = new TQPushButton( this ); - m_pImageFileNameBrowse->setPixmap( SmallIcon( "fileopen" ) ); + m_pImageFileNameBrowse->setPixmap( SmallIcon( "document-open" ) ); hl->addWidget( lbl ); hl->addWidget( m_pImageFileNameEdit ); hl->addWidget( m_pImageFileNameBrowse ); diff --git a/kpovmodeler/pmlibrarybrowser.cpp b/kpovmodeler/pmlibrarybrowser.cpp index 6f853f6..4df00a8 100644 --- a/kpovmodeler/pmlibrarybrowser.cpp +++ b/kpovmodeler/pmlibrarybrowser.cpp @@ -73,11 +73,11 @@ m_pUpButton = new TQPushButton( this ); m_pUpButton->setPixmap( SmallIcon( "go-up" ) ); m_pNewSubLibraryButton = new TQPushButton( this ); - m_pNewSubLibraryButton->setPixmap( SmallIcon( "folder_new" ) ); + m_pNewSubLibraryButton->setPixmap( SmallIcon( "folder-new" ) ); m_pNewObjectButton = new TQPushButton( this ); - m_pNewObjectButton->setPixmap( SmallIcon( "filenew" ) ); + m_pNewObjectButton->setPixmap( SmallIcon( "document-new" ) ); m_pDeleteObjectButton = new TQPushButton( this ); - m_pDeleteObjectButton->setPixmap( SmallIcon( "editdelete" ) ); + m_pDeleteObjectButton->setPixmap( SmallIcon( "edit-delete" ) ); TQLabel* lbl = new TQLabel( i18n( "Library: " ), this ); m_pLibraryComboBox = new TQComboBox( this ); m_pLibraryComboBox->insertStringList( PMLibraryManager::theManager( )->availableLibraries( ) ); diff --git a/kpovmodeler/pmmaterialmapedit.cpp b/kpovmodeler/pmmaterialmapedit.cpp index 0c3423a..672ae9d 100644 --- a/kpovmodeler/pmmaterialmapedit.cpp +++ b/kpovmodeler/pmmaterialmapedit.cpp @@ -70,7 +70,7 @@ lbl = new TQLabel( i18n( "File name:" ), this ); m_pImageFileNameEdit = new TQLineEdit( this ); m_pImageFileNameBrowse = new TQPushButton( this ); - m_pImageFileNameBrowse->setPixmap( SmallIcon( "fileopen" ) ); + m_pImageFileNameBrowse->setPixmap( SmallIcon( "document-open" ) ); hl->addWidget( lbl ); hl->addWidget( m_pImageFileNameEdit ); hl->addWidget( m_pImageFileNameBrowse ); diff --git a/kpovmodeler/pmpatternedit.cpp b/kpovmodeler/pmpatternedit.cpp index 5581a00..8281bd5 100644 --- a/kpovmodeler/pmpatternedit.cpp +++ b/kpovmodeler/pmpatternedit.cpp @@ -123,7 +123,7 @@ m_pDensityFile = new TQLineEdit( m_pDensityWidget ); hl->addWidget( m_pDensityFile, 1 ); m_pDensityFileBrowse = new TQPushButton( m_pDensityWidget ); - m_pDensityFileBrowse->setPixmap( SmallIcon( "fileopen" ) ); + m_pDensityFileBrowse->setPixmap( SmallIcon( "document-open" ) ); hl->addWidget( m_pDensityFileBrowse ); hl = new TQHBoxLayout( vl ); hl->addWidget( new TQLabel( i18n( "Interpolation:" ), m_pDensityWidget ) ); diff --git a/kpovmodeler/pmpovraysettings.cpp b/kpovmodeler/pmpovraysettings.cpp index 1709499..f3955b7 100644 --- a/kpovmodeler/pmpovraysettings.cpp +++ b/kpovmodeler/pmpovraysettings.cpp @@ -55,7 +55,7 @@ m_pPovrayCommand = new TQLineEdit( gb ); hlayout->addWidget( m_pPovrayCommand ); m_pBrowsePovrayCommand = new TQPushButton( gb ); - m_pBrowsePovrayCommand->setPixmap( SmallIcon( "fileopen" ) ); + m_pBrowsePovrayCommand->setPixmap( SmallIcon( "document-open" ) ); connect( m_pBrowsePovrayCommand, TQT_SIGNAL( clicked( ) ), TQT_SLOT( slotBrowsePovrayCommand( ) ) ); hlayout->addWidget( m_pBrowsePovrayCommand ); @@ -69,7 +69,7 @@ m_pDocumentationPath = new TQLineEdit( gb ); hlayout->addWidget( m_pDocumentationPath ); m_pBrowseDocumentationPath = new TQPushButton( gb ); - m_pBrowseDocumentationPath->setPixmap( SmallIcon( "fileopen" ) ); + m_pBrowseDocumentationPath->setPixmap( SmallIcon( "document-open" ) ); connect( m_pBrowseDocumentationPath, TQT_SIGNAL( clicked( ) ), TQT_SLOT( slotBrowsePovrayDocumentation( ) ) ); hlayout->addWidget( m_pBrowseDocumentationPath ); diff --git a/kpovmodeler/pmtextedit.cpp b/kpovmodeler/pmtextedit.cpp index e26d35e..7bf7a3a 100644 --- a/kpovmodeler/pmtextedit.cpp +++ b/kpovmodeler/pmtextedit.cpp @@ -44,7 +44,7 @@ m_pFont = new TQLineEdit( this ); hl->addWidget( m_pFont ); m_pChooseFont = new TQPushButton( this ); - m_pChooseFont->setPixmap( SmallIcon( "fileopen" ) ); + m_pChooseFont->setPixmap( SmallIcon( "document-open" ) ); hl->addWidget( m_pChooseFont ); ** Diff limit reached (max: 250 lines) ** |