| db7f8030 | 2014-10-22 11:55:15 | Timothy Pearson |
Repair mimetype icon usage, part 1. The following are not fully verified in source as of this commit due to ubiquity: info, unknown |
||
|
A pics/crystalsvg/cr128-mime-application-x-netscape.png A pics/crystalsvg/cr16-mime-application-x-netscape.png A pics/crystalsvg/cr22-mime-application-x-netscape.png A pics/crystalsvg/cr32-mime-application-x-netscape.png A pics/crystalsvg/cr48-mime-application-x-netscape.png A pics/crystalsvg/cr64-mime-application-x-netscape.png M kate/part/katedocument.cpp M tdeio/bookmarks/kbookmarkmenu.cc M tdemdi/tdemdi/dockcontainer.cpp M tdemdi/tdemdi/mainwindow.cpp M tdemdi/tdemdidockcontainer.cpp M tdemdi/tdemdimainfrm.cpp R pics/crystalsvg/cr128-mime-.png R pics/crystalsvg/cr16-mime-.png R pics/crystalsvg/cr22-mime-.png R pics/crystalsvg/cr32-mime-.png R pics/crystalsvg/cr48-mime-.png R pics/crystalsvg/cr64-mime-.png |
||
diff --git a/kate/part/katedocument.cpp b/kate/part/katedocument.cpp
index f81b8eb..1404838 100644
--- a/kate/part/katedocument.cpp
+++ b/kate/part/katedocument.cpp
@@ -528,7 +528,7 @@
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-.png
deleted file mode 100644
index fbc99e1..0000000
--- a/pics/crystalsvg/cr128-mime-.png
+++ /dev/null
Binary files differ
diff --git a/pics/crystalsvg/cr128-mime-application-x-netscape.png b/pics/crystalsvg/cr128-mime-application-x-netscape.png
new file mode 100644
index 0000000..fbc99e1
--- /dev/null
+++ b/pics/crystalsvg/cr128-mime-application-x-netscape.png
Binary files differ
diff --git a/pics/crystalsvg/cr16-mime-.png b/pics/crystalsvg/cr16-mime-.png
deleted file mode 100644
index 384290b..0000000
--- a/pics/crystalsvg/cr16-mime-.png
+++ /dev/null
Binary files differ
diff --git a/pics/crystalsvg/cr16-mime-application-x-netscape.png b/pics/crystalsvg/cr16-mime-application-x-netscape.png
new file mode 100644
index 0000000..384290b
--- /dev/null
+++ b/pics/crystalsvg/cr16-mime-application-x-netscape.png
Binary files differ
diff --git a/pics/crystalsvg/cr22-mime-.png b/pics/crystalsvg/cr22-mime-.png
deleted file mode 100644
index a35f48c..0000000
--- a/pics/crystalsvg/cr22-mime-.png
+++ /dev/null
Binary files differ
diff --git a/pics/crystalsvg/cr22-mime-application-x-netscape.png b/pics/crystalsvg/cr22-mime-application-x-netscape.png
new file mode 100644
index 0000000..a35f48c
--- /dev/null
+++ b/pics/crystalsvg/cr22-mime-application-x-netscape.png
Binary files differ
diff --git a/pics/crystalsvg/cr32-mime-.png b/pics/crystalsvg/cr32-mime-.png
deleted file mode 100644
index b43ea49..0000000
--- a/pics/crystalsvg/cr32-mime-.png
+++ /dev/null
Binary files differ
diff --git a/pics/crystalsvg/cr32-mime-application-x-netscape.png b/pics/crystalsvg/cr32-mime-application-x-netscape.png
new file mode 100644
index 0000000..b43ea49
--- /dev/null
+++ b/pics/crystalsvg/cr32-mime-application-x-netscape.png
Binary files differ
diff --git a/pics/crystalsvg/cr48-mime-.png b/pics/crystalsvg/cr48-mime-.png
deleted file mode 100644
index 82ab186..0000000
--- a/pics/crystalsvg/cr48-mime-.png
+++ /dev/null
Binary files differ
diff --git a/pics/crystalsvg/cr48-mime-application-x-netscape.png b/pics/crystalsvg/cr48-mime-application-x-netscape.png
new file mode 100644
index 0000000..82ab186
--- /dev/null
+++ b/pics/crystalsvg/cr48-mime-application-x-netscape.png
Binary files differ
diff --git a/pics/crystalsvg/cr64-mime-.png b/pics/crystalsvg/cr64-mime-.png
deleted file mode 100644
index ff29e35..0000000
--- a/pics/crystalsvg/cr64-mime-.png
+++ /dev/null
Binary files differ
diff --git a/pics/crystalsvg/cr64-mime-application-x-netscape.png b/pics/crystalsvg/cr64-mime-application-x-netscape.png
new file mode 100644
index 0000000..ff29e35
--- /dev/null
+++ b/pics/crystalsvg/cr64-mime-application-x-netscape.png
Binary files differ
diff --git a/tdeio/bookmarks/kbookmarkmenu.cc b/tdeio/bookmarks/kbookmarkmenu.cc
index cbeadc4..6e34506 100644
--- a/tdeio/bookmarks/kbookmarkmenu.cc
+++ b/tdeio/bookmarks/kbookmarkmenu.cc
@@ -1057,7 +1057,7 @@
{
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 7df8dbf..be7c009 100644
--- a/tdemdi/tdemdi/dockcontainer.cpp
+++ b/tdemdi/tdemdi/dockcontainer.cpp
@@ -203,7 +203,7 @@
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:===========================:"<<w->tabPageLabel()<<endl;
@@ -457,7 +457,7 @@
int id=m_ws->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 42db020..3b10a1b 100644
--- a/tdemdi/tdemdi/mainwindow.cpp
+++ b/tdemdi/tdemdi/mainwindow.cpp
@@ -144,10 +144,10 @@
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 36c99d3..d6771b5 100644
--- a/tdemdi/tdemdidockcontainer.cpp
+++ b/tdemdi/tdemdidockcontainer.cpp
@@ -226,7 +226,7 @@
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 @@
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 cc3972e..19059e1 100644
--- a/tdemdi/tdemdimainfrm.cpp
+++ b/tdemdi/tdemdimainfrm.cpp
@@ -1923,10 +1923,10 @@
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;
|
||