Branch: master

a77f89e1 2014-10-22 01:27:24 Timothy Pearson
Bring most mimetypes in line with XDG specifications.  The following are not fully verified in source as of this commit due to ubiquity: html, empty, info, make, man, misc, source, unknown
M src/documentwidget.cpp
M src/entrywidgetpublication.cpp
M src/settingssearchurl.cpp
diff --git a/src/documentwidget.cpp b/src/documentwidget.cpp
index 9a8ff7b..1c0a485 100644
--- a/src/documentwidget.cpp
+++ b/src/documentwidget.cpp
@@ -677,11 +677,11 @@
                 {
                     TQString prettyURL = ( *i ).prettyURL();
                     if ( prettyURL.endsWith( ".pdf", FALSE ) || prettyURL.find( "/pdf/" ) > 0 )
-                        popup->insertItem( SmallIcon( "pdf" ), prettyURL );
+                        popup->insertItem( SmallIcon( "application-pdf" ), prettyURL );
                     else if ( prettyURL.endsWith( ".ps", FALSE ) )
-                        popup->insertItem( SmallIcon( "postscript" ), prettyURL );
+                        popup->insertItem( SmallIcon( "application-postscript" ), prettyURL );
                     else if ( prettyURL.endsWith( ".html", FALSE ) || prettyURL.startsWith( "http://", FALSE ) )
-                        popup->insertItem( SmallIcon( "html" ), prettyURL );
+                        popup->insertItem( SmallIcon( "text-html" ), prettyURL );
                     else
                         popup->insertItem( prettyURL );
                     m_viewDocumentActionMenuURLs.append( prettyURL );
diff --git a/src/entrywidgetpublication.cpp b/src/entrywidgetpublication.cpp
index b961ff2..efeb8eb 100644
--- a/src/entrywidgetpublication.cpp
+++ b/src/entrywidgetpublication.cpp
@@ -428,7 +428,7 @@
         TQHBoxLayout *innerLayout = new TQHBoxLayout();
         gridLayout->addLayout( innerLayout, 3, 1 );
         m_pushButtonMonths = new TQPushButton( this, "m_pushButtonMonths" );
-        m_pushButtonMonths->setIconSet( TQIconSet( SmallIcon( "vcalendar" ) ) );
+        m_pushButtonMonths->setIconSet( TQIconSet( SmallIcon( "x-office-calendar" ) ) );
         m_pushButtonMonths->setSizePolicy( TQSizePolicy::Fixed, TQSizePolicy::Minimum );
         m_pushButtonMonths->setEnabled( !m_isReadOnly );
         innerLayout->addWidget( m_pushButtonMonths );
diff --git a/src/settingssearchurl.cpp b/src/settingssearchurl.cpp
index 53b91ad..07e87b4 100644
--- a/src/settingssearchurl.cpp
+++ b/src/settingssearchurl.cpp
@@ -70,7 +70,7 @@
         for ( TQValueList<Settings::SearchURL*>::ConstIterator it = settings->searchURLs.begin(); it != settings->searchURLs.end(); ++it )
         {
             TDEListViewItem *item = new TDEListViewItem( m_listviewSearchURLs, ( *it ) ->description, ( *it ) ->includeAuthor ? i18n( "Yes" ) : i18n( "No" ), ( *it ) ->url );
-            item->setPixmap( 0, SmallIcon( "html" ) );
+            item->setPixmap( 0, SmallIcon( "text-html" ) );
         }
     }
 
@@ -204,7 +204,7 @@
             if ( item == NULL )
             {
                 TDEListViewItem *item = new TDEListViewItem( m_listviewSearchURLs, descr->text(), cbIncludeAuthor->currentItem() == 0 ? i18n( "Yes" ) : i18n( "No" ), url->text() );
-                item->setPixmap( 0, SmallIcon( "html" ) );
+                item->setPixmap( 0, SmallIcon( "text-html" ) );
             }
             else
             {