diff --git a/kate/part/katedocument.cpp b/kate/part/katedocument.cpp index f81b8eb0d..1404838c4 100644 --- a/kate/part/katedocument.cpp +++ b/kate/part/katedocument.cpp @@ -528,7 +528,7 @@ TQPixmap KateDocument::configPagePixmap (uint number, int size) const return BarIcon("document-save", size); case 6: - return BarIcon("source", size); + return BarIcon("text-x-src", size); case 7: return BarIcon("edit", size); diff --git a/pics/crystalsvg/cr128-mime-.png b/pics/crystalsvg/cr128-mime-application-x-netscape.png similarity index 100% rename from pics/crystalsvg/cr128-mime-.png rename to pics/crystalsvg/cr128-mime-application-x-netscape.png diff --git a/pics/crystalsvg/cr16-mime-.png b/pics/crystalsvg/cr16-mime-application-x-netscape.png similarity index 100% rename from pics/crystalsvg/cr16-mime-.png rename to pics/crystalsvg/cr16-mime-application-x-netscape.png diff --git a/pics/crystalsvg/cr22-mime-.png b/pics/crystalsvg/cr22-mime-application-x-netscape.png similarity index 100% rename from pics/crystalsvg/cr22-mime-.png rename to pics/crystalsvg/cr22-mime-application-x-netscape.png diff --git a/pics/crystalsvg/cr32-mime-.png b/pics/crystalsvg/cr32-mime-application-x-netscape.png similarity index 100% rename from pics/crystalsvg/cr32-mime-.png rename to pics/crystalsvg/cr32-mime-application-x-netscape.png diff --git a/pics/crystalsvg/cr48-mime-.png b/pics/crystalsvg/cr48-mime-application-x-netscape.png similarity index 100% rename from pics/crystalsvg/cr48-mime-.png rename to pics/crystalsvg/cr48-mime-application-x-netscape.png diff --git a/pics/crystalsvg/cr64-mime-.png b/pics/crystalsvg/cr64-mime-application-x-netscape.png similarity index 100% rename from pics/crystalsvg/cr64-mime-.png rename to pics/crystalsvg/cr64-mime-application-x-netscape.png diff --git a/tdeio/bookmarks/kbookmarkmenu.cc b/tdeio/bookmarks/kbookmarkmenu.cc index cbeadc413..6e3450677 100644 --- a/tdeio/bookmarks/kbookmarkmenu.cc +++ b/tdeio/bookmarks/kbookmarkmenu.cc @@ -1057,7 +1057,7 @@ void KBookmarkMenuNSImporter::newBookmark( const TQString & text, const TQCStrin { TQString _text = KStringHandler::csqueeze(text); _text.replace( '&', "&&" ); - TDEAction * action = new KBookmarkAction(_text, "html", 0, 0, "", m_actionCollection, 0); + TDEAction * action = new KBookmarkAction(_text, "text-html", 0, 0, "", m_actionCollection, 0); connect(action, TQT_SIGNAL( activated ( TDEAction::ActivationReason, TQt::ButtonState )), m_menu, TQT_SLOT( slotBookmarkSelected( TDEAction::ActivationReason, TQt::ButtonState ) )); action->setProperty( "url", url ); diff --git a/tdemdi/tdemdi/dockcontainer.cpp b/tdemdi/tdemdi/dockcontainer.cpp index 7df8dbf6b..be7c00929 100644 --- a/tdemdi/tdemdi/dockcontainer.cpp +++ b/tdemdi/tdemdi/dockcontainer.cpp @@ -203,7 +203,7 @@ void DockContainer::insertWidget (KDockWidget *dwdg, TQPixmap pixmap, const TQSt connect(btn,TQT_SIGNAL(clicked()),this,TQT_SLOT(changeOverlapMode())); } - m_tb->appendTab(pixmap.isNull()?SmallIcon("application-vnd.tde.misc"):pixmap,tab,w->tabPageLabel()); + m_tb->appendTab(pixmap.isNull()?SmallIcon("misc"):pixmap,tab,w->tabPageLabel()); m_tb->tab(tab)->installEventFilter( this ); kdDebug(760)<<"NAMENAMENAMENAME:===========================:"<tabPageLabel()<id(widget); if (id==-1) return; KMultiTabBarTab *tab=m_tb->tab(id); - tab->setIcon(pixmap.isNull()?SmallIcon("application-vnd.tde.misc"):pixmap); + tab->setIcon(pixmap.isNull()?SmallIcon("misc"):pixmap); } void DockContainer::save(TDEConfig* cfg,const TQString& group_or_prefix) diff --git a/tdemdi/tdemdi/mainwindow.cpp b/tdemdi/tdemdi/mainwindow.cpp index 42db02036..3b10a1b98 100644 --- a/tdemdi/tdemdi/mainwindow.cpp +++ b/tdemdi/tdemdi/mainwindow.cpp @@ -144,10 +144,10 @@ void MainWindow::setupMainDock () void MainWindow::setupToolViews () { - m_leftContainer = createDockWidget("KMdiDock::leftDock",SmallIcon("application-vnd.tde.misc"),0L,"Left Dock"); - m_rightContainer = createDockWidget("KMdiDock::rightDock",SmallIcon("application-vnd.tde.misc"),0L,"Right Dock"); - m_topContainer = createDockWidget("KMdiDock::topDock",SmallIcon("application-vnd.tde.misc"),0L,"Top Dock"); - m_bottomContainer = createDockWidget("KMdiDock::bottomDock",SmallIcon("application-vnd.tde.misc"),0L,"Bottom Dock"); + m_leftContainer = createDockWidget("KMdiDock::leftDock",SmallIcon("misc"),0L,"Left Dock"); + m_rightContainer = createDockWidget("KMdiDock::rightDock",SmallIcon("misc"),0L,"Right Dock"); + m_topContainer = createDockWidget("KMdiDock::topDock",SmallIcon("misc"),0L,"Top Dock"); + m_bottomContainer = createDockWidget("KMdiDock::bottomDock",SmallIcon("misc"),0L,"Bottom Dock"); KDockWidget *mainDock=getMainDockWidget(); KDockWidget *w=mainDock; diff --git a/tdemdi/tdemdidockcontainer.cpp b/tdemdi/tdemdidockcontainer.cpp index 36c99d3af..d6771b597 100644 --- a/tdemdi/tdemdidockcontainer.cpp +++ b/tdemdi/tdemdidockcontainer.cpp @@ -226,7 +226,7 @@ void KMdiDockContainer::insertWidget ( KDockWidget *dwdg, TQPixmap pixmap, const connect( btn, TQT_SIGNAL( clicked() ), this, TQT_SLOT( changeOverlapMode() ) ); } - m_tb->appendTab( pixmap.isNull() ? SmallIcon( "application-vnd.tde.misc" ) : pixmap, tab, w->tabPageLabel() ); + m_tb->appendTab( pixmap.isNull() ? SmallIcon( "misc" ) : pixmap, tab, w->tabPageLabel() ); m_tb->tab( tab )->installEventFilter( this ); kdDebug( 760 ) << k_funcinfo << "Added tab with label " << w->tabPageLabel() << " to the tabbar" << endl; @@ -509,7 +509,7 @@ void KMdiDockContainer::setPixmap( KDockWidget* widget , const TQPixmap& pixmap if ( id == -1 ) return ; KMultiTabBarTab *tab = m_tb->tab( id ); - tab->setIcon( pixmap.isNull() ? SmallIcon( "application-vnd.tde.misc" ) : pixmap ); + tab->setIcon( pixmap.isNull() ? SmallIcon( "misc" ) : pixmap ); } void KMdiDockContainer::save( TQDomElement& dockEl ) diff --git a/tdemdi/tdemdimainfrm.cpp b/tdemdi/tdemdimainfrm.cpp index cc3972e71..19059e12e 100644 --- a/tdemdi/tdemdimainfrm.cpp +++ b/tdemdi/tdemdimainfrm.cpp @@ -1923,10 +1923,10 @@ void KMdiMainFrm::findToolViewsDockedToMain( TQPtrList* list, KDock void KMdiMainFrm::setupToolViewsForIDEALMode() { - m_leftContainer = createDockWidget( "KMdiDock::leftDock", SmallIcon( "application-vnd.tde.misc" ), 0L, "Left Dock" ); - m_rightContainer = createDockWidget( "KMdiDock::rightDock", SmallIcon( "application-vnd.tde.misc" ), 0L, "Right Dock" ); - m_topContainer = createDockWidget( "KMdiDock::topDock", SmallIcon( "application-vnd.tde.misc" ), 0L, "Top Dock" ); - m_bottomContainer = createDockWidget( "KMdiDock::bottomDock", SmallIcon( "application-vnd.tde.misc" ), 0L, "Bottom Dock" ); + m_leftContainer = createDockWidget( "KMdiDock::leftDock", SmallIcon( "misc" ), 0L, "Left Dock" ); + m_rightContainer = createDockWidget( "KMdiDock::rightDock", SmallIcon( "misc" ), 0L, "Right Dock" ); + m_topContainer = createDockWidget( "KMdiDock::topDock", SmallIcon( "misc" ), 0L, "Top Dock" ); + m_bottomContainer = createDockWidget( "KMdiDock::bottomDock", SmallIcon( "misc" ), 0L, "Bottom Dock" ); KDockWidget *mainDock = getMainDockWidget(); KDockWidget *w = mainDock;