use the same about data for both the part and the shell, so:

- the part uses the same app share for its specific stuff
- no manual need to load another catalog ("okular") in the part

svn path=/trunk/KDE/kdegraphics/okular/; revision=720296
remotes/origin/KDE/4.0
Pino Toscano 19 years ago
parent 02d6dab204
commit 175cc2bce6
  1. 2
      CMakeLists.txt
  2. 2
      aboutdata.h
  3. 5
      part.cpp

@ -158,7 +158,7 @@ install(TARGETS okularpart DESTINATION ${PLUGIN_INSTALL_DIR})
########### install files ############### ########### install files ###############
install( FILES okular_part.desktop DESTINATION ${SERVICES_INSTALL_DIR} ) install( FILES okular_part.desktop DESTINATION ${SERVICES_INSTALL_DIR} )
install( FILES part.rc DESTINATION ${DATA_INSTALL_DIR}/okularpart ) install( FILES part.rc DESTINATION ${DATA_INSTALL_DIR}/okular )
kde4_install_icons( ${ICON_INSTALL_DIR} ) kde4_install_icons( ${ICON_INSTALL_DIR} )

@ -16,7 +16,7 @@ inline KAboutData okularAboutData( const char* name, const char* iname )
{ {
KAboutData about( KAboutData about(
name, //"okular", name, //"okular",
0, // catalog name also "okular" "okular",
ki18n(iname), //I18N_NOOP("okular"), ki18n(iname), //I18N_NOOP("okular"),
"0.5.91", "0.5.91",
ki18n("okular, a universal document viewer"), ki18n("okular, a universal document viewer"),

@ -77,7 +77,7 @@
#include "core/page.h" #include "core/page.h"
K_PLUGIN_FACTORY( okularPartFactory, registerPlugin< Part >(); ) K_PLUGIN_FACTORY( okularPartFactory, registerPlugin< Part >(); )
K_EXPORT_PLUGIN( okularPartFactory( "okularpart" ) ) K_EXPORT_PLUGIN( okularPartFactory( okularAboutData( "okular", I18N_NOOP( "okular" ) ) ) )
static QAction* actionForExportFormat( const Okular::ExportFormat& format, QObject *parent = 0 ) static QAction* actionForExportFormat( const Okular::ExportFormat& format, QObject *parent = 0 )
{ {
@ -137,9 +137,6 @@ m_cliPresentation(false), m_generatorGuiClient(0)
connect(this, SIGNAL(completed()), this, SLOT(setWindowTitleFromDocument())); connect(this, SIGNAL(completed()), this, SLOT(setWindowTitleFromDocument()));
connect(this, SIGNAL(canceled(const QString &)), this, SLOT(loadCancelled(const QString &))); connect(this, SIGNAL(canceled(const QString &)), this, SLOT(loadCancelled(const QString &)));
// load catalog for translation
KGlobal::locale()->insertCatalog("okular");
// create browser extension (for printing when embedded into browser) // create browser extension (for printing when embedded into browser)
m_bExtension = new BrowserExtension(this); m_bExtension = new BrowserExtension(this);

Loading…
Cancel
Save