6f340e9462
git-svn-id: https://svn.disconnected-by-peer.at/svn/linamh/trunk/linamh@602 6952d904-891a-0410-993b-d76249ca496b
79 lines
2.7 KiB
Diff
79 lines
2.7 KiB
Diff
--- kipi-plugins-20080714/CMakeLists.txt~ 2008-07-14 20:50:06.000000000 +0400
|
|
+++ kipi-plugins-20080714/CMakeLists.txt 2008-07-14 20:50:17.000000000 +0400
|
|
@@ -23,7 +23,7 @@
|
|
SET(KIPIPLUGINS_VERSION_STRING "${KIPIPLUGINS_MAJOR_VERSION}.${KIPIPLUGINS_MINOR_VERSION}.${KIPIPLUGINS_PATCH_VERSION}${KIPIPLUGINS_SUFFIX_VERSION}")
|
|
|
|
# =======================================================
|
|
-
|
|
+FIND_PACKAGE(KDE4)
|
|
INCLUDE(FindPackageHandleStandardArgs)
|
|
|
|
# Depencies detection required by all plugins
|
|
--- kipi-plugins-20080714/sendimages/emailpage.h~ 2008-07-14 21:06:20.000000000 +0400
|
|
+++ kipi-plugins-20080714/sendimages/emailpage.h 2008-07-14 21:02:53.000000000 +0400
|
|
@@ -29,7 +29,7 @@
|
|
|
|
// Local includes.
|
|
|
|
-#include <emailsettingscontainer.h>
|
|
+#include "emailsettingscontainer.h"
|
|
|
|
namespace KIPISendimagesPlugin
|
|
{
|
|
--- kipi-plugins-20080714/gpssync/gpstracklistcontainer.h~ 2008-07-14 21:06:08.000000000 +0400
|
|
+++ kipi-plugins-20080714/gpssync/gpstracklistcontainer.h 2008-07-14 21:05:59.000000000 +0400
|
|
@@ -35,7 +35,7 @@
|
|
|
|
// Local includes.
|
|
|
|
-#include <gpsdatacontainer.h>
|
|
+#include "gpsdatacontainer.h"
|
|
|
|
namespace KIPIGPSSyncPlugin
|
|
{
|
|
--- kipi-plugins-20080714/htmlexport/galleryinfo.h~ 2008-07-14 21:07:50.000000000 +0400
|
|
+++ kipi-plugins-20080714/htmlexport/galleryinfo.h 2008-07-14 21:08:01.000000000 +0400
|
|
@@ -31,8 +31,8 @@
|
|
#include <libkipi/imagecollection.h>
|
|
|
|
// Local
|
|
-#include <theme.h>
|
|
-#include <htmlexportconfig.h>
|
|
+#include "theme.h"
|
|
+#include "htmlexportconfig.h"
|
|
|
|
namespace KIPIHTMLExport {
|
|
|
|
--- kipi-plugins-20080714/imageviewer/viewerwidget.h~ 2008-07-14 21:15:47.000000000 +0400
|
|
+++ kipi-plugins-20080714/imageviewer/viewerwidget.h 2008-07-14 21:17:55.000000000 +0400
|
|
@@ -133,8 +133,13 @@
|
|
virtual void mouseDoubleClickEvent(QMouseEvent * e );
|
|
bool isReallyFullScreen();
|
|
|
|
+private:
|
|
+ QPixmap cursor1;
|
|
+ QPixmap cursor2;
|
|
+
|
|
private slots:
|
|
void timeoutMouseMove();
|
|
+
|
|
};
|
|
} //namespace KIPIviewer
|
|
#endif // _VIEWERWIDGET_H_
|
|
--- kipi-plugins-20080714/imageviewer/viewerwidget.cpp~ 2008-07-14 21:11:05.000000000 +0400
|
|
+++ kipi-plugins-20080714/imageviewer/viewerwidget.cpp 2008-07-14 21:17:22.000000000 +0400
|
|
@@ -136,9 +136,11 @@
|
|
// load cursors for zooming and panning
|
|
QString file;
|
|
file = KStandardDirs::locate( "data", "kipiplugin_imageviewer/pics/zoom.png" );
|
|
- zoomCursor=QCursor(file);
|
|
+ cursor1.load(file);
|
|
+ zoomCursor=QCursor(cursor1);
|
|
file = KStandardDirs::locate( "data", "kipiplugin_imageviewer/pics/hand.png" );
|
|
- moveCursor=QCursor(file);
|
|
+ cursor2.load(file);
|
|
+ moveCursor=QCursor(cursor2);
|
|
|
|
// get path of nullImage in case QImage can't load the image
|
|
nullImage = KStandardDirs::locate( "data", "kipiplugin_imageviewer/pics/nullImage.png" );
|