Commit df5364da authored by Jakob Petsovits's avatar Jakob Petsovits

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
parent cfb96103
......@@ -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");
......
......@@ -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",
......
......@@ -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;
......
[Desktop Entry]
Icon=graphics-viewer-document
Icon=okular
Name=Okular
Name[x-test]=xxOkularxx
X-KDE-ServiceTypes=KParts/ReadOnlyPart
......
......@@ -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;
......
[Desktop Entry]
Icon=graphics-viewer-document
Icon=okular
Name=Okular
Name[x-test]=xxOkularxx
X-KDE-ServiceTypes=KParts/ReadOnlyPart
......
......@@ -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;
......
[Desktop Entry]
Icon=graphics-viewer-document
Icon=okular
Name=Okular
Name[x-test]=xxOkularxx
X-KDE-ServiceTypes=KParts/ReadOnlyPart
......
......@@ -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;
......
[Desktop Entry]
Icon=graphics-viewer-document
Icon=okular
Name=Okular
Name[x-test]=xxOkularxx
X-KDE-ServiceTypes=KParts/ReadOnlyPart
......
......@@ -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;
......
[Desktop Entry]
Icon=graphics-viewer-document
Icon=okular
Name=Okular
Name[x-test]=xxOkularxx
X-KDE-ServiceTypes=KParts/ReadOnlyPart
......
......@@ -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;
......
[Desktop Entry]
Icon=graphics-viewer-document
Icon=okular
Name=Okular
Name[x-test]=xxOkularxx
X-KDE-ServiceTypes=KParts/ReadOnlyPart
......
......@@ -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;
......
[Desktop Entry]
Icon=graphics-viewer-document
Icon=okular
Name=Okular
Name[x-test]=xxOkularxx
X-KDE-ServiceTypes=KParts/ReadOnlyPart
......
......@@ -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;
......
[Desktop Entry]
Icon=graphics-viewer-document
Icon=okular
Name=Okular
Name[x-test]=xxOkularxx
X-KDE-ServiceTypes=KParts/ReadOnlyPart
......
......@@ -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;
......
[Desktop Entry]
Icon=graphics-viewer-document
Icon=okular
Name=Okular
Name[x-test]=xxOkularxx
X-KDE-ServiceTypes=KParts/ReadOnlyPart
......
......@@ -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;
......
[Desktop Entry]
Icon=graphics-viewer-document
Icon=okular
Name=Okular
Name[x-test]=xxOkularxx
X-KDE-ServiceTypes=KParts/ReadOnlyPart
......
......@@ -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;
......
[Desktop Entry]
Icon=graphics-viewer-document
Icon=okular
Name=Okular
Name[x-test]=xxOkularxx
X-KDE-ServiceTypes=KParts/ReadOnlyPart
......
......@@ -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;
......
[Desktop Entry]
Icon=graphics-viewer-document
Icon=okular
Name=Okular
Name[x-test]=xxOkularxx
X-KDE-ServiceTypes=KParts/ReadOnlyPart
......
......@@ -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;
......
[Desktop Entry]
Icon=graphics-viewer-document
Icon=okular
Name=Okular
Name[x-test]=xxOkularxx
X-KDE-ServiceTypes=KParts/ReadOnlyPart
......
[Desktop Entry]
Icon=graphics-viewer-document
Icon=okular
Name=Okular
Name[x-test]=xxOkularxx
X-KDE-ServiceTypes=KParts/ReadOnlyPart
......
......@@ -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
......
......@@ -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 );
......
......@@ -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" );
......
# an own directory for multi-size icons retrieved by KIconLoader
add_subdirectory(icons)
# install annotator xml tools description
install(FILES
tools.xml
......
kde4_install_icons( ${ICON_INSTALL_DIR} )
......@@ -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>
......
......@@ -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
......
......@@ -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 );
......
......@@ -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 );
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment