Hello community,
here is the log from the commit of package kdegraphics4 for openSUSE:Factory
checked in at Mon Dec 13 17:51:20 CET 2010.
--------
--- KDE/kdegraphics4/kdegraphics4.changes 2010-11-19 17:18:36.000000000 +0100
+++ kdegraphics4/kdegraphics4.changes 2010-12-03 17:13:32.000000000 +0100
@@ -1,0 +2,9 @@
+Fri Dec 3 17:13:27 CET 2010 - dmueller@suse.de
+
+- update to 4.5.85
+ * KDE 4.6 Beta2
+ * Final Beta before RC, various fixes from Beta1
+ * no upstream changelog available.
+
+
+-------------------------------------------------------------------
calling whatdependson for head-i586
Old:
----
kdegraphics-4.5.80.tar.bz2
New:
----
kdegraphics-4.5.85.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ kdegraphics4.spec ++++++
--- /var/tmp/diff_new_pack.Mb62r8/_old 2010-12-13 17:50:42.000000000 +0100
+++ /var/tmp/diff_new_pack.Mb62r8/_new 2010-12-13 17:50:42.000000000 +0100
@@ -1,5 +1,5 @@
#
-# spec file for package kdegraphics4 (Version 4.5.80)
+# spec file for package kdegraphics4 (Version 4.5.85)
#
# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
@@ -38,7 +38,7 @@
Group: Productivity/Graphics/Other
Summary: Base package for kdegraphics apps
Url: http://www.kde.org
-Version: 4.5.80
+Version: 4.5.85
Release: 1
Source0: kdegraphics-%version.tar.bz2
Patch0: 4_6_BRANCH.diff
++++++ kdegraphics-4.5.80.tar.bz2 -> kdegraphics-4.5.85.tar.bz2 ++++++
Files old/kdegraphics-4.5.80/doc/gwenview/index.cache.bz2 and new/kdegraphics-4.5.85/doc/gwenview/index.cache.bz2 differ
Files old/kdegraphics-4.5.80/doc/kcontrol/kamera/index.cache.bz2 and new/kdegraphics-4.5.85/doc/kcontrol/kamera/index.cache.bz2 differ
Files old/kdegraphics-4.5.80/doc/kcontrol/kgamma/index.cache.bz2 and new/kdegraphics-4.5.85/doc/kcontrol/kgamma/index.cache.bz2 differ
Files old/kdegraphics-4.5.80/doc/kolourpaint/index.cache.bz2 and new/kdegraphics-4.5.85/doc/kolourpaint/index.cache.bz2 differ
Files old/kdegraphics-4.5.80/doc/kruler/index.cache.bz2 and new/kdegraphics-4.5.85/doc/kruler/index.cache.bz2 differ
Files old/kdegraphics-4.5.80/doc/ksnapshot/index.cache.bz2 and new/kdegraphics-4.5.85/doc/ksnapshot/index.cache.bz2 differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdegraphics-4.5.80/doc/ksnapshot/index.docbook new/kdegraphics-4.5.85/doc/ksnapshot/index.docbook
--- old/kdegraphics-4.5.80/doc/ksnapshot/index.docbook 2010-11-11 15:40:38.000000000 +0100
+++ new/kdegraphics-4.5.85/doc/ksnapshot/index.docbook 2010-11-25 18:40:28.000000000 +0100
@@ -140,7 +140,7 @@
</listitem>
<listitem><para>The mini command line &krunner; (invoked with
<keycombo action="simul">&Alt;<keycap>F2</keycap></keycombo>) may
-also be used to start &ksnapshot;</para></listitem>
+also be used to start &ksnapshot;.</para></listitem>
</itemizedlist>
<para>Once &ksnapshot; starts, you will see a window like the following:
Files old/kdegraphics-4.5.80/doc/okular/index.cache.bz2 and new/kdegraphics-4.5.85/doc/okular/index.cache.bz2 differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdegraphics-4.5.80/gwenview/app/documentinfoprovider.cpp new/kdegraphics-4.5.85/gwenview/app/documentinfoprovider.cpp
--- old/kdegraphics-4.5.80/gwenview/app/documentinfoprovider.cpp 2010-06-01 20:12:28.000000000 +0200
+++ new/kdegraphics-4.5.85/gwenview/app/documentinfoprovider.cpp 2010-11-25 18:40:28.000000000 +0100
@@ -39,7 +39,8 @@
DocumentInfoProvider::DocumentInfoProvider(SortedDirModel* model)
-: d(new DocumentInfoProviderPrivate) {
+: AbstractDocumentInfoProvider(model)
+, d(new DocumentInfoProviderPrivate) {
d->mDirModel = model;
connect(DocumentFactory::instance(), SIGNAL(documentBusyStateChanged(const KUrl&, bool)),
SLOT(emitBusyStateChanged(const KUrl&, bool)) );
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdegraphics-4.5.80/gwenview/app/kipiexportaction.cpp new/kdegraphics-4.5.85/gwenview/app/kipiexportaction.cpp
--- old/kdegraphics-4.5.80/gwenview/app/kipiexportaction.cpp 2010-11-19 11:50:59.000000000 +0100
+++ new/kdegraphics-4.5.85/gwenview/app/kipiexportaction.cpp 2010-11-25 18:40:28.000000000 +0100
@@ -39,29 +39,29 @@
struct KIPIExportActionPrivate {
KIPIExportAction* q;
KIPIInterface* mKIPIInterface;
- KMenu* mMenu;
QAction* mDefaultAction;
QList mExportActionList;
void updateMenu() {
- mMenu->clear();
+ KMenu* menu = static_cast(q->menu());
+ menu->clear();
if (mDefaultAction) {
- mMenu->addTitle(i18n("Last Used Plugin"));
- mMenu->addAction(mDefaultAction);
- mMenu->addTitle(i18n("Other Plugins"));
+ menu->addTitle(i18n("Last Used Plugin"));
+ menu->addAction(mDefaultAction);
+ menu->addTitle(i18n("Other Plugins"));
}
Q_FOREACH(QAction* action, mExportActionList) {
action->setIconVisibleInMenu(true);
if (action != mDefaultAction) {
- mMenu->addAction(action);
+ menu->addAction(action);
}
}
- if (mMenu->isEmpty()) {
- QAction* action = new QAction(mMenu);
+ if (menu->isEmpty()) {
+ QAction* action = new QAction(menu);
action->setText(i18n("No Plugin Found"));
action->setEnabled(false);
- mMenu->addAction(action);
+ menu->addAction(action);
}
}
};
@@ -76,18 +76,15 @@
, d(new KIPIExportActionPrivate) {
d->q = this;
d->mKIPIInterface = 0;
- d->mMenu = new KMenu;
d->mDefaultAction = 0;
setDelayed(false);
- setMenu(d->mMenu);
- connect(d->mMenu, SIGNAL(aboutToShow()), SLOT(init()));
- connect(d->mMenu, SIGNAL(triggered(QAction*)), SLOT(setDefaultAction(QAction*)));
+ connect(menu(), SIGNAL(aboutToShow()), SLOT(init()));
+ connect(menu(), SIGNAL(triggered(QAction*)), SLOT(setDefaultAction(QAction*)));
}
KIPIExportAction::~KIPIExportAction() {
- delete d->mMenu;
delete d;
}
@@ -98,7 +95,7 @@
void KIPIExportAction::init() {
- if (!d->mMenu->isEmpty()) {
+ if (!menu()->isEmpty()) {
return;
}
d->mKIPIInterface->loadPlugins();
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdegraphics-4.5.80/gwenview/app/sidebar.cpp new/kdegraphics-4.5.85/gwenview/app/sidebar.cpp
--- old/kdegraphics-4.5.80/gwenview/app/sidebar.cpp 2010-11-19 11:50:59.000000000 +0100
+++ new/kdegraphics-4.5.85/gwenview/app/sidebar.cpp 2010-11-25 18:40:28.000000000 +0100
@@ -179,6 +179,11 @@
}
+SideBarPage::~SideBarPage() {
+ delete d;
+}
+
+
const QString& SideBarPage::title() const {
return d->mTitle;
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdegraphics-4.5.80/gwenview/app/sidebar.h new/kdegraphics-4.5.85/gwenview/app/sidebar.h
--- old/kdegraphics-4.5.80/gwenview/app/sidebar.h 2009-08-05 11:55:59.000000000 +0200
+++ new/kdegraphics-4.5.85/gwenview/app/sidebar.h 2010-11-25 18:40:28.000000000 +0100
@@ -53,6 +53,7 @@
Q_OBJECT
public:
SideBarPage(const QString& title);
+ ~SideBarPage();
void addWidget(QWidget*);
void addStretch();
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdegraphics-4.5.80/gwenview/lib/thumbnailview/thumbnailbarview.cpp new/kdegraphics-4.5.85/gwenview/lib/thumbnailview/thumbnailbarview.cpp
--- old/kdegraphics-4.5.80/gwenview/lib/thumbnailview/thumbnailbarview.cpp 2010-09-27 21:49:55.000000000 +0200
+++ new/kdegraphics-4.5.85/gwenview/lib/thumbnailview/thumbnailbarview.cpp 2010-11-25 18:40:28.000000000 +0100
@@ -354,6 +354,7 @@
ThumbnailBarView::~ThumbnailBarView() {
delete d->mStyle;
+ delete d;
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdegraphics-4.5.80/kamera/kcontrol/kamera.desktop new/kdegraphics-4.5.85/kamera/kcontrol/kamera.desktop
--- old/kdegraphics-4.5.80/kamera/kcontrol/kamera.desktop 2010-11-05 11:46:18.000000000 +0100
+++ new/kdegraphics-4.5.85/kamera/kcontrol/kamera.desktop 2010-12-01 23:22:29.000000000 +0100
@@ -46,7 +46,7 @@
Comment[pa]=ਕੈਮਰਾ ਸੰਰਚਨਾ
Comment[pl]=Konfiguracja aparatu cyfrowego
Comment[pt]=Configuração do Kamera
-Comment[pt_BR]=Configurar o Kamera
+Comment[pt_BR]=Configura o Kamera
Comment[ro]=Configurează aparatul foto digital
Comment[ru]=Настройка камеры
Comment[se]=Heivet govvenapperáhta
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdegraphics-4.5.80/libs/libkdcraw/CMakeLists.txt new/kdegraphics-4.5.85/libs/libkdcraw/CMakeLists.txt
--- old/kdegraphics-4.5.80/libs/libkdcraw/CMakeLists.txt 2010-11-19 11:50:57.000000000 +0100
+++ new/kdegraphics-4.5.85/libs/libkdcraw/CMakeLists.txt 2010-11-25 18:40:27.000000000 +0100
@@ -101,15 +101,21 @@
ENDIF(WIN32 AND MSVC)
# OpenMP detection (requires CMake >= 2.6.3)
+# NOTE: OpenMP under MacOSX do not support multithreading.
-MACRO_OPTIONAL_FIND_PACKAGE(OpenMP)
+IF(NOT APPLE)
+ MACRO_OPTIONAL_FIND_PACKAGE(OpenMP)
-IF(OPENMP_FOUND)
- ADD_DEFINITIONS(${OpenMP_CXX_FLAGS})
- IF(CMAKE_COMPILER_IS_GNUCXX)
- SET(OPENMP_LDFLAGS "-lgomp")
- ENDIF(CMAKE_COMPILER_IS_GNUCXX)
-ENDIF(OPENMP_FOUND)
+ IF(OPENMP_FOUND)
+ ADD_DEFINITIONS(${OpenMP_CXX_FLAGS})
+ IF("${CMAKE_CXX_COMPILER_ID}" STREQUAL GNU )
+ SET(OPENMP_LDFLAGS "-lgomp")
+ ENDIF("${CMAKE_CXX_COMPILER_ID}" STREQUAL GNU )
+ IF("${CMAKE_C_COMPILER_ID}" STREQUAL SunPro )
+ SET(OPENMP_LDFLAGS "-xopenmp")
+ ENDIF("${CMAKE_C_COMPILER_ID}" STREQUAL SunPro )
+ ENDIF(OPENMP_FOUND)
+ENDIF(NOT APPLE)
# Flag to debug LibRaw
ADD_DEFINITIONS(-DDCRAW_VERBOSE)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdegraphics-4.5.80/libs/libkdcraw/test/CMakeLists.txt new/kdegraphics-4.5.85/libs/libkdcraw/test/CMakeLists.txt
--- old/kdegraphics-4.5.80/libs/libkdcraw/test/CMakeLists.txt 2010-07-16 21:04:05.000000000 +0200
+++ new/kdegraphics-4.5.85/libs/libkdcraw/test/CMakeLists.txt 2010-12-01 23:22:28.000000000 +0100
@@ -54,7 +54,7 @@
SET(raw2png_SRCS raw2png.cpp)
KDE4_ADD_EXECUTABLE(raw2png NOGUI ${raw2png_SRCS})
-TARGET_LINK_LIBRARIES(raw2png kdcraw ${QT_QTCORE_LIBRARY} ${QT_QTGUI_LIBRARY})
+TARGET_LINK_LIBRARIES(raw2png kdcraw ${QT_QTCORE_LIBRARY} ${QT_QTGUI_LIBRARY} ${OPENMP_LDFLAGS})
LIBKDCRAW_BUILD_TEST(simple_dcraw)
LIBKDCRAW_BUILD_TEST(mem_image)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdegraphics-4.5.80/libs/libkexiv2/libkexiv2/kexiv2xmp.cpp new/kdegraphics-4.5.85/libs/libkexiv2/libkexiv2/kexiv2xmp.cpp
--- old/kdegraphics-4.5.80/libs/libkexiv2/libkexiv2/kexiv2xmp.cpp 2010-10-05 13:38:36.000000000 +0200
+++ new/kdegraphics-4.5.85/libs/libkexiv2/libkexiv2/kexiv2xmp.cpp 2010-11-25 18:40:27.000000000 +0100
@@ -342,8 +342,7 @@
const std::string &txt(value.toUtf8().constData());
Exiv2::Value::AutoPtr xmpTxtVal = Exiv2::Value::create(Exiv2::xmpText);
xmpTxtVal->read(txt);
-
- d->xmpMetadata().add(Exiv2::XmpKey(xmpTagName), xmpTxtVal.get());
+ d->xmpMetadata()[xmpTagName].setValue(xmpTxtVal.get());
return true;
}
catch( Exiv2::Error& e )
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdegraphics-4.5.80/libs/libkipi/libkipi/Doxyfile new/kdegraphics-4.5.85/libs/libkipi/libkipi/Doxyfile
--- old/kdegraphics-4.5.80/libs/libkipi/libkipi/Doxyfile 2009-02-04 19:17:37.000000000 +0100
+++ new/kdegraphics-4.5.85/libs/libkipi/libkipi/Doxyfile 2010-11-25 18:40:28.000000000 +0100
@@ -365,7 +365,8 @@
# *.h++ *.idl *.odl *.cs *.php *.php3 *.inc
FILE_PATTERNS = *.cpp \
- *.h
+ *.h \
+ *.dox
# The RECURSIVE tag can be used to turn specify whether or not subdirectories
# should be searched for input files as well. Possible values are YES and NO.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdegraphics-4.5.80/libs/libkipi/libkipi/Mainpage.dox new/kdegraphics-4.5.85/libs/libkipi/libkipi/Mainpage.dox
--- old/kdegraphics-4.5.80/libs/libkipi/libkipi/Mainpage.dox 1970-01-01 01:00:00.000000000 +0100
+++ new/kdegraphics-4.5.85/libs/libkipi/libkipi/Mainpage.dox 2010-11-25 18:40:28.000000000 +0100
@@ -0,0 +1,100 @@
+/**
+ \mainpage libkipi reference page.
+
+ This page will tell you both how to develop a new
+ plugin for KIPI, and how to add KIPI support to a new
+ application (referred to as host application).
+
+ You can find more information about KIPI at this http://extragear.kde.org/apps/kipi">url</a>.
+
+ This documentation has been writen by Renchi Raju, Gilles Caulier,
+ Jesper K. Pedersen, and Aurelien Gateau.
+
+ <h1>Developing a new Plugin</h1>
+ The easiest way to start a new plugin, is to copy the hello world
+ plugin, which you may find in kdeextragear-libs-1/kipi-plugins. Please
+ also read http://developer.kde.org/documentation/tutorials/developing-a-plugin-structure/index.html">
+ this tutorial</a> which tells in general about developing a plugin
+ structure for an application, but it also gives some background
+ information on how plugins are loaded, and especially on the macros
+ involved. The tutorial has been written by one of the KIPI authors, so
+ it matches fairly good the model of KIPI (except the part on merging
+ GUI's from plugins).
+
+
+
+
+ <h2>General things to do to implement a plugin</h2>
+ Here is a list of things to do.
+ <ul>
+ <li> Create a class that inherits KIPI::Plugin. In the constructor you
+ must create instances of KAction for your application. The topmost
+ actions should be given to the Plugin super class using
+ KIPI::Plugin::addAction().
+ <li> As described in the tutorial <a href="http://developer.kde.org/documentation/tutorials/developing-a-plugin-structure/index.html#understanding_loading">here</a>, you must call the macro
+ <tt>K_EXPORT_COMPONENT_FACTORY</tt>.
+ <li> You also need to create a desktop file, as described <a href="http://developer.kde.org/documentation/tutorials/developing-a-plugin-structure/index.html#makefile_am_client">here</a>
+ </ul>
+
+
+
+
+
+ <h2>Retrieving information from the host application</h2>
+ The above was the required step to build the plugin. The following will
+ tell you about the functions with which you communicate with the host
+ application.
+
+ The origin of all your communication with the host application is
+ \ref KIPI::Interface. You obtain a pointer to this by casting the parent
+ pointer given to your plugin during construction.
+
+ Selection of images can be obtained using
+ KIPI::Interface::currentSelection(), KIPI::Interface::currentAlbum() and
+ KIPI::Interface::allAlbums(). These methods uses KIPI::ImageCollection
+ to wrap a selection of images.
+
+ Finally to obtain information about individual images, call
+ KIPI::Interface::info(), which returns a KIPI::ImageInfo, with the
+ information.
+
+ When developing plugins, you should pay special attention to the fact the different
+ host applications may have different feature sets they
+ support. Information about what the host application support can be
+ obtained from KIPI::Interface::hasFeature().
+
+
+
+
+ <h2>Utilities for Plugins</h2>
+ KIPI has a number of utilities useful when developing plugins:
+ <ul>
+ <li> use KIPI::ImageCollectionDialog to ask the user for an image.
+ <li> use KIPI::UploadWidget when the user should specify a directory to
+ write images into.
+ <li> KIPI::ThumbnailJob helps you load thumb nails of images.
+ </ul>
+
+
+
+
+ <h1>Adding KIPI support to a new host application.</h1>
+ To add KIPI support to your application you must inherit
+ KIPI::Interface, and give an instance of this class to
+ KIPI::PluginLoader. See \ref KIPI::PluginLoader for details on loading plugins.
+
+ To be able to create an instance of your subclass of KIPI::Interface,
+ you must of course implement all the pure virtual method of the super
+ class, among others this requires you to create and return instances of
+ KIPI::ImageCollection and KIPI::ImageInfo. The only way you can do so
+ are by giving the classes a pointer to a subclass of
+ KIPI::ImageCollectionShared and KIPI::ImageInfoShared. These sub classes
+ are also your responsibility to implement.
+
+ The reason why things are that complicated, are to solve the problem of
+ ownership of pointers to the classes in question. The
+ KIPI::ImageCollectionShared pointer you give to KIPI::ImageCollection
+ constructor will be the owned by the ImageCollection instance.
+*/
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdegraphics-4.5.80/libs/libkipi/libkipi/mainpage.cpp new/kdegraphics-4.5.85/libs/libkipi/libkipi/mainpage.cpp
--- old/kdegraphics-4.5.80/libs/libkipi/libkipi/mainpage.cpp 2009-01-16 16:04:47.000000000 +0100
+++ new/kdegraphics-4.5.85/libs/libkipi/libkipi/mainpage.cpp 1970-01-01 01:00:00.000000000 +0100
@@ -1,100 +0,0 @@
-/**
- \mainpage libkipi reference page.
-
- This page will tell you both how to develop a new
- plugin for KIPI, and how to add KIPI support to a new
- application (referred to as host application).
-
- You can find more information about KIPI at this http://extragear.kde.org/apps/kipi">url</a>.
-
- This documentation has been writen by Renchi Raju, Gilles Caulier,
- Jesper K. Pedersen, and Aurelien Gateau.
-
- <h1>Developing a new Plugin</h1>
- The easiest way to start a new plugin, is to copy the hello world
- plugin, which you may find in kdeextragear-libs-1/kipi-plugins. Please
- also read http://developer.kde.org/documentation/tutorials/developing-a-plugin-structure/index.html">
- this tutorial</a> which tells in general about developing a plugin
- structure for an application, but it also gives some background
- information on how plugins are loaded, and especially on the macros
- involved. The tutorial has been written by one of the KIPI authors, so
- it matches fairly good the model of KIPI (except the part on merging
- GUI's from plugins).
-
-
-
-
- <h2>General things to do to implement a plugin</h2>
- Here is a list of things to do.
- <ul>
- <li> Create a class that inherits KIPI::Plugin. In the constructor you
- must create instances of KAction for your application. The topmost
- actions should be given to the Plugin super class using
- KIPI::Plugin::addAction().
- <li> As described in the tutorial <a href="http://developer.kde.org/documentation/tutorials/developing-a-plugin-structure/index.html#understanding_loading">here</a>, you must call the macro
- <tt>K_EXPORT_COMPONENT_FACTORY</tt>.
- <li> You also need to create a desktop file, as described <a href="http://developer.kde.org/documentation/tutorials/developing-a-plugin-structure/index.html#makefile_am_client">here</a>
- </ul>
-
-
-
-
-
- <h2>Retrieving information from the host application</h2>
- The above was the required step to build the plugin. The following will
- tell you about the functions with which you communicate with the host
- application.
-
- The origin of all your communication with the host application is
- \ref KIPI::Interface. You obtain a pointer to this by casting the parent
- pointer given to your plugin during construction.
-
- Selection of images can be obtained using
- KIPI::Interface::currentSelection(), KIPI::Interface::currentAlbum() and
- KIPI::Interface::allAlbums(). These methods uses KIPI::ImageCollection
- to wrap a selection of images.
-
- Finally to obtain information about individual images, call
- KIPI::Interface::info(), which returns a KIPI::ImageInfo, with the
- information.
-
- When developing plugins, you should pay special attention to the fact the different
- host applications may have different feature sets they
- support. Information about what the host application support can be
- obtained from KIPI::Interface::hasFeature().
-
-
-
-
- <h2>Utilities for Plugins</h2>
- KIPI has a number of utilities useful when developing plugins:
- <ul>
- <li> use KIPI::ImageCollectionDialog to ask the user for an image.
- <li> use KIPI::UploadWidget when the user should specify a directory to
- write images into.
- <li> KIPI::ThumbnailJob helps you load thumb nails of images.
- </ul>
-
-
-
-
- <h1>Adding KIPI support to a new host application.</h1>
- To add KIPI support to your application you must inherit
- KIPI::Interface, and give an instance of this class to
- KIPI::PluginLoader. See \ref KIPI::PluginLoader for details on loading plugins.
-
- To be able to create an instance of your subclass of KIPI::Interface,
- you must of course implement all the pure virtual method of the super
- class, among others this requires you to create and return instances of
- KIPI::ImageCollection and KIPI::ImageInfo. The only way you can do so
- are by giving the classes a pointer to a subclass of
- KIPI::ImageCollectionShared and KIPI::ImageInfoShared. These sub classes
- are also your responsibility to implement.
-
- The reason why things are that complicated, are to solve the problem of
- ownership of pointers to the classes in question. The
- KIPI::ImageCollectionShared pointer you give to KIPI::ImageCollection
- constructor will be the owned by the ImageCollection instance.
-*/
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdegraphics-4.5.80/libs/libksane/libksane/Mainpage.dox new/kdegraphics-4.5.85/libs/libksane/libksane/Mainpage.dox
--- old/kdegraphics-4.5.80/libs/libksane/libksane/Mainpage.dox 1970-01-01 01:00:00.000000000 +0100
+++ new/kdegraphics-4.5.85/libs/libksane/libksane/Mainpage.dox 2010-11-25 18:40:28.000000000 +0100
@@ -0,0 +1,15 @@
+/** @mainpage libKSane
+
+@brief A library for dealing with scanners
+
+LibKSane is a KDE interface for SANE library to control flat scanners.
+
+This library provides a widget to control a scanner, KSaneWidget. Internally,
+it will use the <a href="http://www.sane-project.org/">SANE</a> library (or
+directly use TWAIN on Windows if SANE is not available).
+
+@see KSaneWidget
+
+*/
+
+// vim:ft=doxygen
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdegraphics-4.5.80/libs/libksane/libksane/options/ksane_opt_checkbox.cpp new/kdegraphics-4.5.85/libs/libksane/libksane/options/ksane_opt_checkbox.cpp
--- old/kdegraphics-4.5.80/libs/libksane/libksane/options/ksane_opt_checkbox.cpp 2009-02-12 11:22:51.000000000 +0100
+++ new/kdegraphics-4.5.85/libs/libksane/libksane/options/ksane_opt_checkbox.cpp 2010-12-01 23:22:28.000000000 +0100
@@ -128,8 +128,8 @@
bool KSaneOptCheckBox::setValue(const QString &val)
{
if (state() == STATE_HIDDEN) return false;
- if ((val.compare("true", Qt::CaseInsensitive)) ||
- (val.compare("1")))
+ if ((val.compare("true", Qt::CaseInsensitive) == 0) ||
+ (val.compare("1") == 0))
{
checkboxChanged(true);
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdegraphics-4.5.80/okular/ui/annotwindow.cpp new/kdegraphics-4.5.85/okular/ui/annotwindow.cpp
--- old/kdegraphics-4.5.80/okular/ui/annotwindow.cpp 2009-03-10 13:24:04.000000000 +0100
+++ new/kdegraphics-4.5.85/okular/ui/annotwindow.cpp 2010-12-03 16:00:06.000000000 +0100
@@ -166,6 +166,7 @@
textEdit = new KTextEdit( this );
textEdit->setAcceptRichText( false );
textEdit->setPlainText( GuiUtils::contents( m_annot ) );
+ textEdit->installEventFilter( this );
connect(textEdit,SIGNAL(textChanged()),
this,SLOT(slotsaveWindowText()));
@@ -212,6 +213,20 @@
textEdit->setFocus();
}
+bool AnnotWindow::eventFilter(QObject *, QEvent *e)
+{
+ if ( e->type () == QEvent::ShortcutOverride )
+ {
+ QKeyEvent * keyEvent = static_cast< QKeyEvent * >( e );
+ if ( keyEvent->key() == Qt::Key_Escape )
+ {
+ close();
+ return true;
+ }
+ }
+ return false;
+}
+
void AnnotWindow::slotOptionBtn()
{
//TODO: call context menu in pageview
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdegraphics-4.5.80/okular/ui/annotwindow.h new/kdegraphics-4.5.85/okular/ui/annotwindow.h
--- old/kdegraphics-4.5.80/okular/ui/annotwindow.h 2009-03-10 13:24:04.000000000 +0100
+++ new/kdegraphics-4.5.85/okular/ui/annotwindow.h 2010-12-03 16:00:06.000000000 +0100
@@ -38,6 +38,7 @@
protected:
virtual void showEvent( QShowEvent * event );
+ virtual bool eventFilter( QObject * obj, QEvent * event );
private slots:
void slotOptionBtn();
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdegraphics-4.5.80/okular/ui/pageview.cpp new/kdegraphics-4.5.85/okular/ui/pageview.cpp
--- old/kdegraphics-4.5.80/okular/ui/pageview.cpp 2010-10-19 15:05:57.000000000 +0200
+++ new/kdegraphics-4.5.85/okular/ui/pageview.cpp 2010-11-25 18:40:28.000000000 +0100
@@ -43,6 +43,7 @@
#include
#include
#include
+#include
#include
#include
#include
@@ -2922,6 +2923,7 @@
void PageView::addWebShortcutsMenu( KMenu * menu, const QString & text )
{
+#if KDE_IS_VERSION(4,5,70)
if ( text.isEmpty() )
{
return;
@@ -2972,6 +2974,7 @@
menu->addMenu(webShortcutsMenu);
}
}
+#endif
}
//BEGIN private SLOTS
@@ -3384,6 +3387,7 @@
void PageView::slotHandleWebShortcutAction()
{
+#if KDE_IS_VERSION(4,5,70)
KAction *action = qobject_cast( sender() );
if (action)
@@ -3395,6 +3399,7 @@
KToolInvocation::invokeBrowser( filterData.uri().url() );
}
}
+#endif
}
void PageView::slotConfigureWebShortcuts()
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdegraphics-4.5.80/thumbnailers/mobi/mobithumbnail.desktop new/kdegraphics-4.5.85/thumbnailers/mobi/mobithumbnail.desktop
--- old/kdegraphics-4.5.80/thumbnailers/mobi/mobithumbnail.desktop 2010-11-19 11:51:00.000000000 +0100
+++ new/kdegraphics-4.5.85/thumbnailers/mobi/mobithumbnail.desktop 2010-12-01 23:22:28.000000000 +0100
@@ -9,7 +9,9 @@
Name[es]=Archivos Mobipocket
Name[et]=Mobipocketi failid
Name[hr]=Mobipocket datoteke
+Name[km]=ឯកសារ Mobipocket
Name[ko]=Mobipocket 파일
+Name[nb]=Mobipocket-filer
Name[nds]=Mobipocket-Dateien
Name[nl]=Mobipocket-bestanden
Name[pa]=ਮੋਬੀਪਾਕਟ ਫਾਇਲਾਂ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdegraphics-4.5.80/thumbnailers/raw/rawthumbnail.desktop new/kdegraphics-4.5.85/thumbnailers/raw/rawthumbnail.desktop
--- old/kdegraphics-4.5.80/thumbnailers/raw/rawthumbnail.desktop 2010-11-19 11:51:00.000000000 +0100
+++ new/kdegraphics-4.5.85/thumbnailers/raw/rawthumbnail.desktop 2010-12-01 23:22:29.000000000 +0100
@@ -8,7 +8,9 @@
Name[en_GB]=RAW Photo Camera Files
Name[es]=Archivos RAW de cámara fotográfica
Name[et]=Kaamera toorfailid
+Name[km]=ឯកសាររូបថតរបស់ម៉ាស៊ីនថតដើម
Name[ko]=RAW 사진 카메라 파일
+Name[nb]=RAW foto kamerafiler
Name[nds]=RAW-Fotokamera-Dateien
Name[nl]=Bestanden met RAW-camera-afbeelding
Name[pa]=RAW ਫੋਟੋ ਕੈਮਰਾ ਫਾਇਲਾਂ
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org