Copy Okular's app icon from Oxygen core as "okular",

in the hicolor namespace. Before, the non-specified "graphics-viewer-document" icon was used, which caused icon loaders from other toolkits not to find this icon as they don't consider Oxygen by default. Also update all the references that made use of the "graphics-viewer-document" icon in the code and the many .desktop files. svn path=/trunk/KDE/kdegraphics/okular/; revision=819965

Copy Okular's app icon from Oxygen core as "okular",
in the hicolor namespace. Before, the non-specified "graphics-viewer-document" icon was used, which caused icon loaders from other toolkits not to find this icon as they don't consider Oxygen by default. Also update all the references that made use of the "graphics-viewer-document" icon in the code and the many .desktop files. svn path=/trunk/KDE/kdegraphics/okular/; revision=819965
df5364da · Jakob Petsovits · cfb96103 · df5364da · df5364da · df5364da
Commit df5364da authored Jun 12, 2008 by Jakob Petsovits
47 changed files
--- a/aboutdata.h
+++ b/aboutdata.h
@@ -31,7 +31,6 @@ inline KAboutData okularAboutData( const char* name, const char* iname )
        KLocalizedString(),
        "http://okular.kde.org"
    );
-    about.setProgramIconName( "graphics-viewer-document" );

    about.addAuthor(ki18n("Pino Toscano"), ki18n("Current maintainer"), "pino@kde.org");
    about.addAuthor(ki18n("Tobias Koenig"), ki18n("Lots of framework work, ODT and FictionBook backends"), "tokoe@kde.org");

--- a/conf/preferencesdialog.cpp
+++ b/conf/preferencesdialog.cpp
@@ -32,7 +32,7 @@ PreferencesDialog::PreferencesDialog( QWidget * parent, KConfigSkeleton * skelet
    m_debug = new DlgDebug( this );
 #endif

-    addPage( m_general, i18n("General"), "graphics-viewer-document", i18n("General Options") );
+    addPage( m_general, i18n("General"), "okular", i18n("General Options") );
    addPage( m_accessibility, i18n("Accessibility"), "preferences-desktop-accessibility", i18n("Accessibility Reading Aids") );
    addPage( m_performance, i18n("Performance"), "preferences-system-performance", i18n("Performance Tuning") );
    addPage( m_presentation, i18n("Presentation"), "view-presentation",

--- a/generators/chm/okularApplication_chm.desktop
+++ b/generators/chm/okularApplication_chm.desktop
@@ -47,7 +47,7 @@ GenericName[x-test]=xxDocument Viewerxx
 GenericName[zh_CN]=文档查看器
 GenericName[zh_TW]=文件檢視器
 Exec=okular %U %i -caption "%c"
-Icon=graphics-viewer-document
+Icon=okular
 Type=Application
 InitialPreference=3
 Categories=Qt;KDE;Graphics;Viewer;

--- a/generators/chm/okularChm.desktop
+++ b/generators/chm/okularChm.desktop
 [Desktop Entry]
-Icon=graphics-viewer-document
+Icon=okular
 Name=Okular
 Name[x-test]=xxOkularxx
 X-KDE-ServiceTypes=KParts/ReadOnlyPart

--- a/generators/comicbook/okularApplication_comicbook.desktop
+++ b/generators/comicbook/okularApplication_comicbook.desktop
@@ -47,7 +47,7 @@ GenericName[x-test]=xxDocument Viewerxx
 GenericName[zh_CN]=文档查看器
 GenericName[zh_TW]=文件檢視器
 Exec=okular %U %i -caption "%c"
-Icon=graphics-viewer-document
+Icon=okular
 Type=Application
 InitialPreference=7
 Categories=Qt;KDE;Graphics;Viewer;

--- a/generators/comicbook/okularComicbook.desktop
+++ b/generators/comicbook/okularComicbook.desktop
 [Desktop Entry]
-Icon=graphics-viewer-document
+Icon=okular
 Name=Okular
 Name[x-test]=xxOkularxx
 X-KDE-ServiceTypes=KParts/ReadOnlyPart

--- a/generators/djvu/okularApplication_djvu.desktop
+++ b/generators/djvu/okularApplication_djvu.desktop
@@ -47,7 +47,7 @@ GenericName[x-test]=xxDocument Viewerxx
 GenericName[zh_CN]=文档查看器
 GenericName[zh_TW]=文件檢視器
 Exec=okular %U %i -caption "%c"
-Icon=graphics-viewer-document
+Icon=okular
 Type=Application
 InitialPreference=7
 Categories=Qt;KDE;Graphics;Viewer;

--- a/generators/djvu/okularDjvu.desktop
+++ b/generators/djvu/okularDjvu.desktop
 [Desktop Entry]
-Icon=graphics-viewer-document
+Icon=okular
 Name=Okular
 Name[x-test]=xxOkularxx
 X-KDE-ServiceTypes=KParts/ReadOnlyPart

--- a/generators/dvi/okularApplication_dvi.desktop
+++ b/generators/dvi/okularApplication_dvi.desktop
@@ -47,7 +47,7 @@ GenericName[x-test]=xxDocument Viewerxx
 GenericName[zh_CN]=文档查看器
 GenericName[zh_TW]=文件檢視器
 Exec=okular %U %i -caption "%c"
-Icon=graphics-viewer-document
+Icon=okular
 Type=Application
 InitialPreference=7
 Categories=Qt;KDE;Graphics;Viewer;

--- a/generators/dvi/okularDvi.desktop
+++ b/generators/dvi/okularDvi.desktop
 [Desktop Entry]
-Icon=graphics-viewer-document
+Icon=okular
 Name=Okular
 Name[x-test]=xxOkularxx
 X-KDE-ServiceTypes=KParts/ReadOnlyPart

--- a/generators/epub/okularApplication_epub.desktop
+++ b/generators/epub/okularApplication_epub.desktop
@@ -47,7 +47,7 @@ GenericName[x-test]=xxDocument Viewerxx
 GenericName[zh_CN]=文档查看器
 GenericName[zh_TW]=文件檢視器
 Exec=okular %U %i -caption "%c"
-Icon=graphics-viewer-document
+Icon=okular
 Type=Application
 InitialPreference=1
 Categories=Qt;KDE;Graphics;Viewer;

--- a/generators/epub/okularEPub.desktop
+++ b/generators/epub/okularEPub.desktop
 [Desktop Entry]
-Icon=graphics-viewer-document
+Icon=okular
 Name=Okular
 Name[x-test]=xxOkularxx
 X-KDE-ServiceTypes=KParts/ReadOnlyPart

--- a/generators/fictionbook/okularApplication_fb.desktop
+++ b/generators/fictionbook/okularApplication_fb.desktop
@@ -47,7 +47,7 @@ GenericName[x-test]=xxDocument Viewerxx
 GenericName[zh_CN]=文档查看器
 GenericName[zh_TW]=文件檢視器
 Exec=okular %U %i -caption "%c"
-Icon=graphics-viewer-document
+Icon=okular
 Type=Application
 InitialPreference=7
 Categories=Qt;KDE;Graphics;Viewer;

--- a/generators/fictionbook/okularFb.desktop
+++ b/generators/fictionbook/okularFb.desktop
 [Desktop Entry]
-Icon=graphics-viewer-document
+Icon=okular
 Name=Okular
 Name[x-test]=xxOkularxx
 X-KDE-ServiceTypes=KParts/ReadOnlyPart

--- a/generators/kimgio/okularApplication_kimgio.desktop
+++ b/generators/kimgio/okularApplication_kimgio.desktop
@@ -47,7 +47,7 @@ GenericName[x-test]=xxDocument Viewerxx
 GenericName[zh_CN]=文档查看器
 GenericName[zh_TW]=文件檢視器
 Exec=okular %U %i -caption "%c"
-Icon=graphics-viewer-document
+Icon=okular
 Type=Application
 InitialPreference=1
 Categories=Qt;KDE;Graphics;Viewer;

--- a/generators/kimgio/okularKimgio.desktop
+++ b/generators/kimgio/okularKimgio.desktop
 [Desktop Entry]
-Icon=graphics-viewer-document
+Icon=okular
 Name=Okular
 Name[x-test]=xxOkularxx
 X-KDE-ServiceTypes=KParts/ReadOnlyPart

--- a/generators/ooo/okularApplication_ooo.desktop
+++ b/generators/ooo/okularApplication_ooo.desktop
@@ -47,7 +47,7 @@ GenericName[x-test]=xxDocument Viewerxx
 GenericName[zh_CN]=文档查看器
 GenericName[zh_TW]=文件檢視器
 Exec=okular %U %i -caption "%c"
-Icon=graphics-viewer-document
+Icon=okular
 Type=Application
 InitialPreference=2
 Categories=Qt;KDE;Graphics;Viewer;

--- a/generators/ooo/okularOoo.desktop
+++ b/generators/ooo/okularOoo.desktop
 [Desktop Entry]
-Icon=graphics-viewer-document
+Icon=okular
 Name=Okular
 Name[x-test]=xxOkularxx
 X-KDE-ServiceTypes=KParts/ReadOnlyPart

--- a/generators/plucker/okularApplication_plucker.desktop
+++ b/generators/plucker/okularApplication_plucker.desktop
@@ -47,7 +47,7 @@ GenericName[x-test]=xxDocument Viewerxx
 GenericName[zh_CN]=文档查看器
 GenericName[zh_TW]=文件檢視器
 Exec=okular %U %i -caption "%c"
-Icon=graphics-viewer-document
+Icon=okular
 Type=Application
 InitialPreference=7
 Categories=Qt;KDE;Graphics;Viewer;

--- a/generators/plucker/okularPlucker.desktop
+++ b/generators/plucker/okularPlucker.desktop
 [Desktop Entry]
-Icon=graphics-viewer-document
+Icon=okular
 Name=Okular
 Name[x-test]=xxOkularxx
 X-KDE-ServiceTypes=KParts/ReadOnlyPart

--- a/generators/poppler/okularApplication_pdf.desktop
+++ b/generators/poppler/okularApplication_pdf.desktop
@@ -47,7 +47,7 @@ GenericName[x-test]=xxDocument Viewerxx
 GenericName[zh_CN]=文档查看器
 GenericName[zh_TW]=文件檢視器
 Exec=okular %U %i -caption "%c"
-Icon=graphics-viewer-document
+Icon=okular
 Type=Application
 InitialPreference=8
 Categories=Qt;KDE;Graphics;Viewer;

--- a/generators/poppler/okularPoppler.desktop
+++ b/generators/poppler/okularPoppler.desktop
 [Desktop Entry]
-Icon=graphics-viewer-document
+Icon=okular
 Name=Okular
 Name[x-test]=xxOkularxx
 X-KDE-ServiceTypes=KParts/ReadOnlyPart

--- a/generators/spectre/okularApplication_ghostview.desktop
+++ b/generators/spectre/okularApplication_ghostview.desktop
@@ -47,7 +47,7 @@ GenericName[x-test]=xxDocument Viewerxx
 GenericName[zh_CN]=文档查看器
 GenericName[zh_TW]=文件檢視器
 Exec=okular %U %i -caption "%c"
-Icon=graphics-viewer-document
+Icon=okular
 Type=Application
 InitialPreference=7
 Categories=Qt;KDE;Graphics;Viewer;

--- a/generators/spectre/okularGhostview.desktop
+++ b/generators/spectre/okularGhostview.desktop
 [Desktop Entry]
-Icon=graphics-viewer-document
+Icon=okular
 Name=Okular
 Name[x-test]=xxOkularxx
 X-KDE-ServiceTypes=KParts/ReadOnlyPart

--- a/generators/tiff/okularApplication_tiff.desktop
+++ b/generators/tiff/okularApplication_tiff.desktop
@@ -47,7 +47,7 @@ GenericName[x-test]=xxDocument Viewerxx
 GenericName[zh_CN]=文档查看器
 GenericName[zh_TW]=文件檢視器
 Exec=okular %U %i -caption "%c"
-Icon=graphics-viewer-document
+Icon=okular
 Type=Application
 InitialPreference=1
 Categories=Qt;KDE;Graphics;Viewer;

--- a/generators/tiff/okularTiff.desktop
+++ b/generators/tiff/okularTiff.desktop
 [Desktop Entry]
-Icon=graphics-viewer-document
+Icon=okular
 Name=Okular
 Name[x-test]=xxOkularxx
 X-KDE-ServiceTypes=KParts/ReadOnlyPart

--- a/generators/xps/okularApplication_xps.desktop
+++ b/generators/xps/okularApplication_xps.desktop
@@ -47,7 +47,7 @@ GenericName[x-test]=xxDocument Viewerxx
 GenericName[zh_CN]=文档查看器
 GenericName[zh_TW]=文件檢視器
 Exec=okular %U %i -caption "%c"
-Icon=graphics-viewer-document
+Icon=okular
 Type=Application
 InitialPreference=7
 Categories=Qt;KDE;Graphics;Viewer;

--- a/generators/xps/okularXps.desktop
+++ b/generators/xps/okularXps.desktop
 [Desktop Entry]
-Icon=graphics-viewer-document
+Icon=okular
 Name=Okular
 Name[x-test]=xxOkularxx
 X-KDE-ServiceTypes=KParts/ReadOnlyPart

--- a/okular_part.desktop
+++ b/okular_part.desktop
 [Desktop Entry]
-Icon=graphics-viewer-document
+Icon=okular
 Name=Okular
 Name[x-test]=xxOkularxx
 X-KDE-ServiceTypes=KParts/ReadOnlyPart

--- a/shell/okular.desktop
+++ b/shell/okular.desktop
@@ -46,7 +46,7 @@ GenericName[x-test]=xxDocument Viewerxx
 GenericName[zh_CN]=文档查看器
 GenericName[zh_TW]=文件檢視器
 Exec=okular %U %i -caption "%c"
-Icon=graphics-viewer-document
+Icon=okular
 Type=Application
 X-DocPath=okular/index.html
 InitialPreference=7

--- a/ui/annotationmodel.cpp
+++ b/ui/annotationmodel.cpp
@@ -308,7 +308,7 @@ QVariant AnnotationModel::data( const QModelIndex &index, int role ) const
            return GuiUtils::captionForAnnotation( item->annotation );
            break;
        case Qt::DecorationRole:
-            return KIcon( "graphics-viewer-document" );
+            return KIcon( "okular" );
            break;
        case Qt::ToolTipRole:
            return GuiUtils::prettyToolTip( item->annotation );

--- a/ui/annotationwidgets.cpp
+++ b/ui/annotationwidgets.cpp
@@ -266,7 +266,7 @@ QWidget * StampAnnotationWidget::createStyleWidget()
    m_pixmapSelector->setEditable( true );

    // FIXME!!! use the standard names instead (when we'll have the artwork)
-    m_pixmapSelector->addItem( i18n( "Okular" ), "graphics-viewer-document" );
+    m_pixmapSelector->addItem( i18n( "Okular" ), "okular" );
    m_pixmapSelector->addItem( i18n( "Bookmark" ), "bookmarks" );
    m_pixmapSelector->addItem( i18n( "KDE" ), "kde" );
    m_pixmapSelector->addItem( i18n( "Information" ), "help-about" );

--- a/ui/data/CMakeLists.txt
+++ b/ui/data/CMakeLists.txt
+# an own directory for multi-size icons retrieved by KIconLoader
+add_subdirectory(icons)
+
 # install annotator xml tools description
 install(FILES
   tools.xml

--- a/ui/data/icons/CMakeLists.txt
+++ b/ui/data/icons/CMakeLists.txt
+kde4_install_icons( ${ICON_INSTALL_DIR} )
--- a/ui/data/icons/hi128-apps-okular.png
+++ b/ui/data/icons/hi128-apps-okular.png
--- a/ui/data/icons/hi16-apps-okular.png
+++ b/ui/data/icons/hi16-apps-okular.png
--- a/ui/data/icons/hi22-apps-okular.png
+++ b/ui/data/icons/hi22-apps-okular.png
--- a/ui/data/icons/hi32-apps-okular.png
+++ b/ui/data/icons/hi32-apps-okular.png
--- a/ui/data/icons/hi48-apps-okular.png
+++ b/ui/data/icons/hi48-apps-okular.png
--- a/ui/data/icons/hi64-apps-okular.png
+++ b/ui/data/icons/hi64-apps-okular.png
--- a/ui/data/icons/hisc-apps-okular.svgz
+++ b/ui/data/icons/hisc-apps-okular.svgz
--- a/ui/data/icons/small/hi16-apps-okular.svgz
+++ b/ui/data/icons/small/hi16-apps-okular.svgz
--- a/ui/data/icons/small/hi22-apps-okular.svgz
+++ b/ui/data/icons/small/hi22-apps-okular.svgz
--- a/ui/data/tools.xml
+++ b/ui/data/tools.xml
@@ -61,8 +61,8 @@ Engine/Annotation Types [specific attributes]:
    </tool>
    <tool id="8" name="Stamp" pixmap="tool-stamp">
        <tooltip>Put a stamp symbol</tooltip>
-        <engine type="PickPoint" hoverIcon="graphics-viewer-document" center="true" size="64">
-            <annotation type="Stamp" icon="graphics-viewer-document"/>
+        <engine type="PickPoint" hoverIcon="okular" center="true" size="64">
+            <annotation type="Stamp" icon="okular"/>
        </engine>
        <shortcut>8</shortcut>
  </tool>

--- a/ui/pagepainter.cpp
+++ b/ui/pagepainter.cpp
@@ -31,7 +31,7 @@
 #include "guiutils.h"
 #include "settings.h"

-K_GLOBAL_STATIC_WITH_ARGS( QPixmap, busyPixmap, ( KIconLoader::global()->loadIcon("graphics-viewer-document", KIconLoader::NoGroup, 32, KIconLoader::DefaultState, QStringList(), 0, true) ) )
+K_GLOBAL_STATIC_WITH_ARGS( QPixmap, busyPixmap, ( KIconLoader::global()->loadIcon("okular", KIconLoader::NoGroup, 32, KIconLoader::DefaultState, QStringList(), 0, true) ) )

 #define TEXTANNOTATION_ICONSIZE 24


--- a/ui/presentationwidget.cpp
+++ b/ui/presentationwidget.cpp
@@ -744,7 +744,7 @@ void PresentationWidget::generateIntroPage( QPainter & p )
    }

    // draw okular logo in the four corners
-    QPixmap logo = DesktopIcon( "graphics-viewer-document", 64 );
+    QPixmap logo = DesktopIcon( "okular", 64 );
    if ( !logo.isNull() )
    {
        p.drawPixmap( 5, 5, logo );

--- a/ui/searchwidget.cpp
+++ b/ui/searchwidget.cpp
@@ -69,7 +69,7 @@ SearchWidget::SearchWidget( QWidget * parent, Okular::Document * document )
    QToolButton *optionsMenuAction =  new QToolButton( this );
    mainlay->addWidget( optionsMenuAction );
    optionsMenuAction->setAutoRaise( true );
-    optionsMenuAction->setIcon( KIcon( "graphics-viewer-document" ) );
+    optionsMenuAction->setIcon( KIcon( "view-filter" ) );
    optionsMenuAction->setToolTip( i18n( "Filter Options" ) );
    optionsMenuAction->setPopupMode( QToolButton::InstantPopup );
    optionsMenuAction->setMenu( m_menu );