[prev in list] [next in list] [prev in thread] [next in thread]
List: kde-commits
Subject: [kipi-plugins/frameworks] /: initial port of MediaWiki tool to KF5.
From: Gilles Caulier <caulier.gilles () gmail ! com>
Date: 2015-06-30 12:59:40
Message-ID: E1Z9v8W-0008Po-1H () scm ! kde ! org
[Download RAW message or body]
Git commit 78aaf0ea4f4af3942dfc19014ac13d62ff8f4c05 by Gilles Caulier.
Committed on 30/06/2015 at 12:57.
Pushed by cgilles into branch 'frameworks'.
initial port of MediaWiki tool to KF5.
Compile and link as well.
TODO:
- KDE4Support still in use and must be ported to pure KF5
- Factoring must be done with new libkipiplugins API
CCMAIL: shouryasgupta@gmail.com
CCMAIL: aspotashev@gmail.com
M +8 -8 CMakeLists.txt
M +40 -0 cmake/modules/MacroLocalLibs.cmake
R +4 -6 mediawiki/CMakeLists.txt [from: \
PORT.KF5/FACTORIZE/mediawiki/CMakeLists.txt - 084% similarity] R +0 -0 \
mediawiki/Messages.sh [from: PORT.KF5/FACTORIZE/mediawiki/Messages.sh - 100% \
similarity] R +0 -0 mediawiki/TODO [from: PORT.KF5/FACTORIZE/mediawiki/TODO - \
100% similarity] R +0 -0 mediawiki/icons/CMakeLists.txt [from: \
PORT.KF5/FACTORIZE/mediawiki/icons/CMakeLists.txt - 100% similarity] R +- -- \
mediawiki/icons/hi16-apps-kipi-wikimedia.png [from: \
PORT.KF5/FACTORIZE/mediawiki/icons/hi16-apps-kipi-wikimedia.png - 100% similarity] R \
+- -- mediawiki/icons/hi22-apps-kipi-wikimedia.png [from: \
PORT.KF5/FACTORIZE/mediawiki/icons/hi22-apps-kipi-wikimedia.png - 100% similarity] R \
+- -- mediawiki/icons/hi32-apps-kipi-wikimedia.png [from: \
PORT.KF5/FACTORIZE/mediawiki/icons/hi32-apps-kipi-wikimedia.png - 100% similarity] R \
+- -- mediawiki/icons/hi48-apps-kipi-wikimedia.png [from: \
PORT.KF5/FACTORIZE/mediawiki/icons/hi48-apps-kipi-wikimedia.png - 100% similarity] R \
+- -- mediawiki/icons/hisc-apps-kipi-wikimedia.svgz [from: \
PORT.KF5/FACTORIZE/mediawiki/icons/hisc-apps-kipi-wikimedia.svgz - 100% similarity] R \
+0 -0 mediawiki/kipiplugin_wikimedia.desktop.cmake.in [from: \
PORT.KF5/FACTORIZE/mediawiki/kipiplugin_wikimedia.desktop.cmake.in - 100% similarity] \
R +0 -0 mediawiki/kipiplugin_wikimediaui.rc [from: \
PORT.KF5/FACTORIZE/mediawiki/kipiplugin_wikimediaui.rc - 100% similarity] R +14 \
-12 mediawiki/plugin_wikimedia.cpp [from: \
PORT.KF5/FACTORIZE/mediawiki/plugin_wikimedia.cpp - 091% similarity] R +3 -3 \
mediawiki/plugin_wikimedia.h [from: PORT.KF5/FACTORIZE/mediawiki/plugin_wikimedia.h - \
094% similarity] R +13 -9 mediawiki/wikimediajob.cpp [from: \
PORT.KF5/FACTORIZE/mediawiki/wikimediajob.cpp - 095% similarity] R +0 -0 \
mediawiki/wikimediajob.h [from: PORT.KF5/FACTORIZE/mediawiki/wikimediajob.h - 100% \
similarity] R +25 -23 mediawiki/wmwidget.cpp [from: \
PORT.KF5/FACTORIZE/mediawiki/wmwidget.cpp - 098% similarity] R +3 -3 \
mediawiki/wmwidget.h [from: PORT.KF5/FACTORIZE/mediawiki/wmwidget.h - 097% \
similarity] R +25 -19 mediawiki/wmwindow.cpp [from: \
PORT.KF5/FACTORIZE/mediawiki/wmwindow.cpp - 092% similarity] R +0 -0 \
mediawiki/wmwindow.h [from: PORT.KF5/FACTORIZE/mediawiki/wmwindow.h - 100% \
similarity] R +0 -0 mediawiki/wmwindow.ui [from: \
PORT.KF5/FACTORIZE/mediawiki/wmwindow.ui - 100% similarity] M +2 -3 \
timeadjust/plugin_timeadjust.cpp
http://commits.kde.org/kipi-plugins/78aaf0ea4f4af3942dfc19014ac13d62ff8f4c05
diff --git a/CMakeLists.txt b/CMakeLists.txt
index fa6eb65..6115e8e 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -132,8 +132,8 @@ if(KF5Kipi_FOUND)
# MACRO_OPTIONAL_FIND_PACKAGE(KSane) # For \
AcquireImages. # MACRO_OPTIONAL_FIND_PACKAGE(QJSON) \
# For Debian Screenshots Facebook, GoogleDrive, Dropbox and Imgur. # \
MACRO_OPTIONAL_FIND_PACKAGE(KGeoMap) # For \
GPSSync.
-# MACRO_OPTIONAL_FIND_PACKAGE(Mediawiki) # For \
Mediawiki.
- DETECT_LIBKVKONTAKTE(4.70.0) # For \
VKontakte. + DETECT_LIBMEDIAWIKI(5.5.0) \
# For Mediawiki. + DETECT_LIBKVKONTAKTE(4.70.0) \
# For VKontakte. # MACRO_OPTIONAL_FIND_PACKAGE(Hupnp) \
# For DlnaExport. # MACRO_OPTIONAL_FIND_PACKAGE(QtSoap) \
# For DlnaExport. # MACRO_OPTIONAL_FIND_PACKAGE(ImageMagick COMPONENTS \
MagickCore display) # For VideoSlideshow. @@ -182,7 +182,7 @@ if(KF5Kipi_FOUND)
# PRINT_OPTIONAL_LIBRARY_STATUS("libkdepimlibs" "http://pim.kde.org" \
"(version >= 4.3.0)" "Kipi-plugins will be compiled without \
libkdepimlibs support." KDEPIMLIBS_FOUND) # \
PRINT_OPTIONAL_LIBRARY_STATUS("libqca" "http://delta.affinix.com/qca" \
"(version >= 2.0.0" "Kipi-plugins will be compiled without libqca \
support." QCA2_FOUND) # PRINT_OPTIONAL_LIBRARY_STATUS("libkgeomap" \
"https://projects.kde.org/projects/extragear/libs/libkgeomap" "(version >= \
${KGEOMAP_MIN_VERSION})" "Kipi-plugins will be compiled without libkgeomap support." \
KGEOMAP_FOUND)
-# PRINT_OPTIONAL_LIBRARY_STATUS("libmediawiki" \
"https://projects.kde.org/projects/extragear/libs/libmediawiki" "(version >= \
1.0.0)" "Kipi-plugins will be compiled without libmediawiki \
support." MEDIAWIKI_FOUND) + PRINT_OPTIONAL_LIBRARY_STATUS("libmediawiki" \
"https://projects.kde.org/projects/extragear/libs/libmediawiki" "(version >= \
5.5.0)" "Kipi-plugins will be compiled without libmediawiki \
support." KF5MediaWiki_FOUND) PRINT_OPTIONAL_LIBRARY_STATUS("libkvkontakte" \
"https://projects.kde.org/projects/extragear/libs/libkvkontakte" "(version >= \
4.70.0)" "Kipi-plugins will be compiled without libkvkontakte \
support." KF5Vkontakte_FOUND) # PRINT_OPTIONAL_LIBRARY_STATUS("libimagemagick" \
"http://www.imagemagick.org" "(version >= \
5.5.4)" "Kipi-plugins will be compiled without libimagemagick \
support." ImageMagick_FOUND) # PRINT_OPTIONAL_LIBRARY_STATUS("libqtgstreamer" \
"http://gstreamer.freedesktop.org/modules/qt-gstreamer.html" "(version >= \
0.9.0)" "Kipi-plugins will be compiled without libqtgstreamer \
support." QTGSTREAMER_FOUND) @@ -192,7 +192,7 @@ if(KF5Kipi_FOUND)
# PRINT_OPTIONAL_LIBRARY_STATUS("libksane" \
"https://projects.kde.org/projects/kde/kdegraphics/libs/libksane" "(version >= \
0.3.0)" "Kipi-plugins will be compiled without libksane support." \
KSANE_FOUND) # PRINT_OPTIONAL_LIBRARY_STATUS("libhupnp" \
"http://www.herqq.org" "(version >= \
2.0.0)" "Internal version used instead" \
HUPNP_FOUND AND HUPNPAV_FOUND) # PRINT_OPTIONAL_LIBRARY_STATUS("libqtsoap" \
"https://github.com/commontk/QtSOAP" "(version >= \
2.7.0)" "Kipi-plugins will be compiled without libqtsoap support." \
QTSOAP_FOUND)
-#
+#
# PRINT_OPTIONAL_LIBRARY_STATUS("native threads support" "" "" "Kipi-plugins \
will be compiled without native threads support." CMAKE_USE_PTHREADS_INIT OR \
CMAKE_USE_WIN32_THREADS_INIT)
PRINT_OPTIONAL_LIBRARY_STATUS("native Opengl support" "" "" "Kipi-plugins will \
be compiled without native OpenGL support." OPENGL_FOUND AND \
OPENGL_GLU_FOUND)
PRINT_OPTIONAL_QTMODULE_STATUS("Qt5 OpenGL" Qt5OpenGL_FOUND)
@@ -265,7 +265,7 @@ if(KF5Kipi_FOUND)
# PRINT_COMPONENT_COMPILE_STATUS("IpodExport" IPOD_FOUND AND GLIB2_FOUND \
AND GOBJECT_FOUND AND GDK_FOUND) # PRINT_COMPONENT_COMPILE_STATUS("Calendar" \
KDEPIMLIBS_FOUND) # PRINT_COMPONENT_COMPILE_STATUS("GPSSync" \
KGEOMAP_FOUND)
-# PRINT_COMPONENT_COMPILE_STATUS("Mediawiki" MEDIAWIKI_FOUND)
+ PRINT_COMPONENT_COMPILE_STATUS("Mediawiki" KF5MediaWiki_FOUND)
PRINT_COMPONENT_COMPILE_STATUS("Panorama" FLEX_FOUND AND BISON_FOUND)
# PRINT_COMPONENT_COMPILE_STATUS("VideoSlideshow" ImageMagick_FOUND AND \
QTGSTREAMER_FOUND) # PRINT_COMPONENT_COMPILE_STATUS("Wallpaper" \
BUILD_WALLPAPER) @@ -428,9 +428,9 @@ if(KF5Kipi_FOUND)
add_subdirectory(vkontakte)
endif()
-# if(MEDIAWIKI_FOUND)
-# add_subdirectory(mediawiki)
-# endif()
+ if(KF5MediaWiki_FOUND)
+ add_subdirectory(mediawiki)
+ endif()
# Plugins in pending state
# # Currently the cmake module distributed w/ cmake uses a different \
variable
diff --git a/cmake/modules/MacroLocalLibs.cmake b/cmake/modules/MacroLocalLibs.cmake
index 93b2bfa..a3e6b67 100644
--- a/cmake/modules/MacroLocalLibs.cmake
+++ b/cmake/modules/MacroLocalLibs.cmake
@@ -258,3 +258,43 @@ macro(DETECT_LIBKVKONTAKTE MIN_VERSION)
message(STATUS "libkvkontakte includes : ${LIBKVKONTAKTE_INCLUDES}")
endmacro()
+
+###########################################################################################################################################"
+
+macro(DETECT_LIBMEDIAWIKI MIN_VERSION)
+
+ if (NOT DIGIKAMSC_COMPILE_LIBMEDIAWIKI)
+
+ message(STATUS "libmediawiki : search system based library")
+ find_package(KF5MediaWiki ${MIN_VERSION})
+
+ if(KF5MediaWiki_FOUND)
+ set(LIBMEDIAWIKI_LIBRARIES KF5::MediaWiki)
+ get_target_property(LIBMEDIAWIKI_INCLUDES KF5::MediaWiki \
INTERFACE_INCLUDE_DIRECTORIES) + set(KF5MediaWiki_FOUND TRUE)
+ else()
+ set(KF5MediaWiki_FOUND FALSE)
+ endif()
+
+ else()
+
+ message(STATUS "libmediawiki : use local library from \
${CMAKE_SOURCE_DIR}/extra/libmediawiki/") + find_file(KF5MediaWiki_FOUND \
CMakeLists.txt PATHS ${CMAKE_SOURCE_DIR}/extra/libmediawiki/) +
+ if(NOT KF5MediaWiki_FOUND)
+ message(ERROR "libmediawiki : local library not found")
+ set(KF5MediaWiki_FOUND FALSE)
+ else()
+ set(KF5MediaWiki_FOUND TRUE)
+ endif()
+
+ set(LIBMEDIAWIKI_INCLUDES ${CMAKE_SOURCE_DIR}/extra/libmediawiki/ \
${CMAKE_BINARY_DIR}/extra/libmediawiki) + set(LIBMEDIAWIKI_LIBRARIES \
KF5MediaWiki) +
+ endif()
+
+ message(STATUS "libmediawiki found : ${KF5MediaWiki_FOUND}")
+ message(STATUS "libmediawiki library : ${LIBMEDIAWIKI_LIBRARIES}")
+ message(STATUS "libmediawiki includes : ${LIBMEDIAWIKI_INCLUDES}")
+
+endmacro()
diff --git a/PORT.KF5/FACTORIZE/mediawiki/CMakeLists.txt b/mediawiki/CMakeLists.txt
similarity index 84%
rename from PORT.KF5/FACTORIZE/mediawiki/CMakeLists.txt
rename to mediawiki/CMakeLists.txt
index 456e374..dcca340 100644
--- a/PORT.KF5/FACTORIZE/mediawiki/CMakeLists.txt
+++ b/mediawiki/CMakeLists.txt
@@ -1,29 +1,27 @@
#
-# Copyright (c) 2010-2014, Gilles Caulier, <caulier dot gilles at gmail dot com>
+# Copyright (c) 2010-2015, Gilles Caulier, <caulier dot gilles at gmail dot com>
#
# Redistribution and use is allowed according to the terms of the BSD license.
# For details see the accompanying COPYING-CMAKE-SCRIPTS file.
subdirs(icons)
-include_directories(${MEDIAWIKI_INCLUDE_DIR})
+include_directories(${LIBMEDIAWIKI_INCLUDES})
ki18n_wrap_ui(ui_src wmwindow.ui)
set(kipiplugin_wikimedia_PART_SRCS
plugin_wikimedia.cpp
- wmwindow.cpp
wmwidget.cpp
wikimediajob.cpp
- wmwidget.cpp
+ wmwindow.cpp
)
add_library(kipiplugin_wikimedia MODULE ${kipiplugin_wikimedia_PART_SRCS} ${ui_src})
target_link_libraries(kipiplugin_wikimedia
KF5kipiplugins
- mediawiki
- ${MEDIAWIKI_LIBRARIES}
+ ${LIBMEDIAWIKI_LIBRARIES}
KF5::Kipi
KF5::KExiv2
KF5::KDcraw
diff --git a/PORT.KF5/FACTORIZE/mediawiki/Messages.sh b/mediawiki/Messages.sh
similarity index 100%
rename from PORT.KF5/FACTORIZE/mediawiki/Messages.sh
rename to mediawiki/Messages.sh
diff --git a/PORT.KF5/FACTORIZE/mediawiki/TODO b/mediawiki/TODO
similarity index 100%
rename from PORT.KF5/FACTORIZE/mediawiki/TODO
rename to mediawiki/TODO
diff --git a/PORT.KF5/FACTORIZE/mediawiki/icons/CMakeLists.txt \
b/mediawiki/icons/CMakeLists.txt similarity index 100%
rename from PORT.KF5/FACTORIZE/mediawiki/icons/CMakeLists.txt
rename to mediawiki/icons/CMakeLists.txt
diff --git a/PORT.KF5/FACTORIZE/mediawiki/icons/hi16-apps-kipi-wikimedia.png \
b/mediawiki/icons/hi16-apps-kipi-wikimedia.png similarity index 100%
rename from PORT.KF5/FACTORIZE/mediawiki/icons/hi16-apps-kipi-wikimedia.png
rename to mediawiki/icons/hi16-apps-kipi-wikimedia.png
diff --git a/PORT.KF5/FACTORIZE/mediawiki/icons/hi22-apps-kipi-wikimedia.png \
b/mediawiki/icons/hi22-apps-kipi-wikimedia.png similarity index 100%
rename from PORT.KF5/FACTORIZE/mediawiki/icons/hi22-apps-kipi-wikimedia.png
rename to mediawiki/icons/hi22-apps-kipi-wikimedia.png
diff --git a/PORT.KF5/FACTORIZE/mediawiki/icons/hi32-apps-kipi-wikimedia.png \
b/mediawiki/icons/hi32-apps-kipi-wikimedia.png similarity index 100%
rename from PORT.KF5/FACTORIZE/mediawiki/icons/hi32-apps-kipi-wikimedia.png
rename to mediawiki/icons/hi32-apps-kipi-wikimedia.png
diff --git a/PORT.KF5/FACTORIZE/mediawiki/icons/hi48-apps-kipi-wikimedia.png \
b/mediawiki/icons/hi48-apps-kipi-wikimedia.png similarity index 100%
rename from PORT.KF5/FACTORIZE/mediawiki/icons/hi48-apps-kipi-wikimedia.png
rename to mediawiki/icons/hi48-apps-kipi-wikimedia.png
diff --git a/PORT.KF5/FACTORIZE/mediawiki/icons/hisc-apps-kipi-wikimedia.svgz \
b/mediawiki/icons/hisc-apps-kipi-wikimedia.svgz similarity index 100%
rename from PORT.KF5/FACTORIZE/mediawiki/icons/hisc-apps-kipi-wikimedia.svgz
rename to mediawiki/icons/hisc-apps-kipi-wikimedia.svgz
diff --git a/PORT.KF5/FACTORIZE/mediawiki/kipiplugin_wikimedia.desktop.cmake.in \
b/mediawiki/kipiplugin_wikimedia.desktop.cmake.in similarity index 100%
rename from PORT.KF5/FACTORIZE/mediawiki/kipiplugin_wikimedia.desktop.cmake.in
rename to mediawiki/kipiplugin_wikimedia.desktop.cmake.in
diff --git a/PORT.KF5/FACTORIZE/mediawiki/kipiplugin_wikimediaui.rc \
b/mediawiki/kipiplugin_wikimediaui.rc similarity index 100%
rename from PORT.KF5/FACTORIZE/mediawiki/kipiplugin_wikimediaui.rc
rename to mediawiki/kipiplugin_wikimediaui.rc
diff --git a/PORT.KF5/FACTORIZE/mediawiki/plugin_wikimedia.cpp \
b/mediawiki/plugin_wikimedia.cpp similarity index 91%
rename from PORT.KF5/FACTORIZE/mediawiki/plugin_wikimedia.cpp
rename to mediawiki/plugin_wikimedia.cpp
index 8a857f4..12ea97c 100644
--- a/PORT.KF5/FACTORIZE/mediawiki/plugin_wikimedia.cpp
+++ b/mediawiki/plugin_wikimedia.cpp
@@ -21,13 +21,13 @@
*
* ============================================================ */
+#include "plugin_wikimedia.h"
+
// To disable warnings under MSVC2008 about getpid().
#ifdef _MSC_VER
#pragma warning(disable : 4996)
#endif
-#include "plugin_wikimedia.moc"
-
// C ANSI includes
extern "C"
@@ -35,31 +35,33 @@ extern "C"
#include <unistd.h>
}
+// Qt includes
+
+#include <QAction>
+
// KDE includes
-#include "kipiplugins_debug.h"
#include <KConfig>
#include <KApplication>
-#include <QAction>
#include <KActionCollection>
#include <KGenericFactory>
#include <KLibLoader>
-#include <KStandardDirs>
+#include <kstandarddirs.h>
#include <kwindowsystem.h>
// Libkipi includes
-#include <interface.h>
+#include <KIPI/Interface>
// Local includes
+#include "kipiplugins_debug.h"
#include "wmwindow.h"
namespace KIPIWikiMediaPlugin
{
K_PLUGIN_FACTORY( WikiMediaFactory, registerPlugin<Plugin_WikiMedia>(); )
-K_EXPORT_PLUGIN ( WikiMediaFactory("kipiplugin_wikimedia") )
class Plugin_WikiMedia::Private
{
@@ -76,10 +78,10 @@ public:
};
Plugin_WikiMedia::Plugin_WikiMedia(QObject* const parent, const QVariantList& \
/*args*/)
- : Plugin(WikiMediaFactory::componentData(), parent, "MediaWiki export"),
+ : Plugin(parent, "MediaWiki export"),
d(new Private)
{
- kDebug(AREA_CODE_LOADING) << "Plugin_MediaWiki plugin loaded";
+ //kDebug(AREA_CODE_LOADING) << "Plugin_MediaWiki plugin loaded";
setUiBaseName("kipiplugin_wikimediaui.rc");
setupXML();
@@ -93,10 +95,8 @@ Plugin_WikiMedia::~Plugin_WikiMedia()
void Plugin_WikiMedia::setup(QWidget* const widget)
{
d->dlgExport = 0;
- Plugin::setup(widget);
-
- KIconLoader::global()->addAppDir("kipiplugin_wikimedia");
+ Plugin::setup(widget);
setupActions();
if (!interface())
@@ -143,3 +143,5 @@ void Plugin_WikiMedia::slotExport()
}
} // namespace KIPIWikiMediaPlugin
+
+#include "plugin_wikimedia.moc"
diff --git a/PORT.KF5/FACTORIZE/mediawiki/plugin_wikimedia.h \
b/mediawiki/plugin_wikimedia.h similarity index 94%
rename from PORT.KF5/FACTORIZE/mediawiki/plugin_wikimedia.h
rename to mediawiki/plugin_wikimedia.h
index dbc6f4b..dd9219c 100644
--- a/PORT.KF5/FACTORIZE/mediawiki/plugin_wikimedia.h
+++ b/mediawiki/plugin_wikimedia.h
@@ -30,12 +30,12 @@
// KIPI includes
-#include <plugin.h>
+#include <KIPI/Plugin>
// MediaWiki includes
-#include <libmediawiki/login.h>
-#include <libmediawiki/mediawiki.h>
+#include <MediaWiki/Login>
+#include <MediaWiki/MediaWiki>
class QAction;
diff --git a/PORT.KF5/FACTORIZE/mediawiki/wikimediajob.cpp \
b/mediawiki/wikimediajob.cpp similarity index 95%
rename from PORT.KF5/FACTORIZE/mediawiki/wikimediajob.cpp
rename to mediawiki/wikimediajob.cpp
index 97c9640..b9f0c61 100644
--- a/PORT.KF5/FACTORIZE/mediawiki/wikimediajob.cpp
+++ b/mediawiki/wikimediajob.cpp
@@ -24,10 +24,11 @@
*
* ============================================================ */
-#include "wikimediajob.moc"
+#include "wikimediajob.h"
// Qt includes
+#include <QApplication>
#include <QMessageBox>
#include <QFile>
#include <QTimer>
@@ -35,18 +36,20 @@
// KDE includes
-#include <kmessagebox.h>
#include <klocalizedstring.h>
-#include "kipiplugins_debug.h"
// MediaWiki includes
-#include <libmediawiki/upload.h>
-#include <libmediawiki/mediawiki.h>
+#include <MediaWiki/Upload>
+#include <MediaWiki/MediaWiki>
// KIPI includes
-#include <interface.h>
+#include <KIPI/Interface>
+
+// Local includes
+
+#include "kipiplugins_debug.h"
namespace KIPIWikiMediaPlugin
{
@@ -61,7 +64,7 @@ public:
mediawiki = 0;
}
- QUrl::List urls;
+ QList<QUrl> urls;
Interface* interface;
MediaWiki* mediawiki;
QString error;
@@ -70,7 +73,8 @@ public:
};
WikiMediaJob::WikiMediaJob(Interface* const interface, MediaWiki* const mediawiki, \
QObject* const parent)
- : KJob(parent), d(new Private)
+ : KJob(parent),
+ d(new Private)
{
d->interface = interface;
d->mediawiki = mediawiki;
@@ -174,7 +178,7 @@ void WikiMediaJob::uploadHandle(KJob* j)
if(d->error.size() > 0)
{
- KMessageBox::error(0,d->error);
+ QMessageBox::critical(QApplication::activeWindow(), i18n("Error"), \
d->error); }
else
{
diff --git a/PORT.KF5/FACTORIZE/mediawiki/wikimediajob.h b/mediawiki/wikimediajob.h
similarity index 100%
rename from PORT.KF5/FACTORIZE/mediawiki/wikimediajob.h
rename to mediawiki/wikimediajob.h
diff --git a/PORT.KF5/FACTORIZE/mediawiki/wmwidget.cpp b/mediawiki/wmwidget.cpp
similarity index 98%
rename from PORT.KF5/FACTORIZE/mediawiki/wmwidget.cpp
rename to mediawiki/wmwidget.cpp
index 48686e1..36d24e0 100644
--- a/PORT.KF5/FACTORIZE/mediawiki/wmwidget.cpp
+++ b/mediawiki/wmwidget.cpp
@@ -25,7 +25,7 @@
*
* ============================================================ */
-#include "wmwidget.moc"
+#include "wmwidget.h"
// Qt includes
@@ -43,12 +43,12 @@
#include <QSpinBox>
#include <QTabWidget>
#include <QVBoxLayout>
+#include <QComboBox>
+#include <QApplication>
// KDE includes
-#include <QComboBox>
#include <kconfiggroup.h>
-#include "kipiplugins_debug.h"
#include <kdialog.h>
#include <klineedit.h>
#include <klocalizedstring.h>
@@ -56,23 +56,25 @@
#include <kpushbutton.h>
#include <ktextedit.h>
#include <kvbox.h>
+#include <kiconloader.h>
// Libkipi includes
-#include <uploadwidget.h>
-#include <interface.h>
+#include <KIPI/UploadWidget>
+#include <KIPI/Interface>
// libKdcraw includes
-#include <rexpanderbox.h>
-#include <version.h>
-#include <squeezedcombobox.h>
+#include <KDCRAW/RExpanderBox>
+#include <KDCRAW/SqueezedComboBox>
+#include <libkdcraw_version.h>
// Local includes
#include "kpimageinfo.h"
#include "kpimageslist.h"
#include "kpprogresswidget.h"
+#include "kipiplugins_debug.h"
using namespace KIPI;
using namespace KDcrawIface;
@@ -596,8 +598,8 @@ WmWidget::WmWidget(QWidget* const parent)
connect(d->imgList, SIGNAL(signalItemClicked(QTreeWidgetItem*)),
this, SLOT(slotLoadImagesDesc(QTreeWidgetItem*)));
- connect(d->imgList, SIGNAL(signalRemovedItems(QUrl::List)),
- this, SLOT(slotRemoveImagesDesc(QUrl::List)));
+ connect(d->imgList, SIGNAL(signalRemovedItems(QList<QUrl>)),
+ this, SLOT(slotRemoveImagesDesc(QList<QUrl>)));
}
WmWidget::~WmWidget()
@@ -771,7 +773,7 @@ void WmWidget::slotAddWikiClicked()
void WmWidget::loadImageInfoFirstLoad()
{
- QUrl::List urls = d->imgList->imageUrls(false);
+ QList<QUrl> urls = d->imgList->imageUrls(false);
d->imagesDescInfo.clear();
@@ -781,9 +783,9 @@ void WmWidget::loadImageInfoFirstLoad()
}
}
-void WmWidget::loadImageInfo(const KUrl& url)
+void WmWidget::loadImageInfo(const QUrl& url)
{
- KPImageInfo info(url.path());
+ KPImageInfo info(url);
QStringList keywar = info.keywords();
QString date = info.date().toString(Qt::ISODate).replace("T", " ", \
Qt::CaseSensitive); QString title = info.name();
@@ -860,9 +862,9 @@ void WmWidget::slotLoadImagesDesc(QTreeWidgetItem* item)
}
}
-void WmWidget::slotRemoveImagesDesc(const QUrl::List urls)
+void WmWidget::slotRemoveImagesDesc(const QList<QUrl> urls)
{
- for (QUrl::List::const_iterator it = urls.begin(); it != urls.end(); ++it)
+ for (QList<QUrl>::const_iterator it = urls.begin(); it != urls.end(); ++it)
{
QString path = (*it).path();
d->imagesDescInfo.remove(path);
@@ -877,7 +879,7 @@ void WmWidget::slotRestoreExtension()
QString imageTitle;
QString originalExtension;
QString currentExtension;
- QUrl::List urls;
+ QList<QUrl> urls;
QMap<QString, QString> imageMetaData;
QList<QTreeWidgetItem*> selectedItems = d->imgList->listView()->selectedItems();
@@ -916,7 +918,7 @@ void WmWidget::slotApplyTitle()
QString givenTitle = title();
QString imageTitle;
QString number;
- QUrl::List urls;
+ QList<QUrl> urls;
QMap<QString, QString> imageMetaData;
QList<QTreeWidgetItem*> selectedItems = d->imgList->listView()->selectedItems();
QStringList parts;
@@ -958,7 +960,7 @@ void WmWidget::slotApplyTitle()
void WmWidget::slotApplyDate()
{
- QUrl::List urls;
+ QList<QUrl> urls;
QList<QTreeWidgetItem*> selectedItems = d->imgList->listView()->selectedItems();
for (int i = 0; i < selectedItems.size(); ++i)
@@ -978,7 +980,7 @@ void WmWidget::slotApplyDate()
void WmWidget::slotApplyCategories()
{
- QUrl::List urls;
+ QList<QUrl> urls;
QList<QTreeWidgetItem*> selectedItems = d->imgList->listView()->selectedItems();
for (int i = 0; i < selectedItems.size(); ++i)
@@ -998,7 +1000,7 @@ void WmWidget::slotApplyCategories()
void WmWidget::slotApplyDescription()
{
- QUrl::List urls;
+ QList<QUrl> urls;
QList<QTreeWidgetItem*> selectedItems = d->imgList->listView()->selectedItems();
for (int i = 0; i < selectedItems.size(); ++i)
@@ -1019,7 +1021,7 @@ void WmWidget::slotApplyDescription()
void WmWidget::slotApplyLatitude()
{
- QUrl::List urls;
+ QList<QUrl> urls;
QList<QTreeWidgetItem*> selectedItems = d->imgList->listView()->selectedItems();
for (int i = 0; i < selectedItems.size(); ++i)
@@ -1039,7 +1041,7 @@ void WmWidget::slotApplyLatitude()
void WmWidget::slotApplyLongitude()
{
- QUrl::List urls;
+ QList<QUrl> urls;
QList<QTreeWidgetItem*> selectedItems = d->imgList->listView()->selectedItems();
for (int i = 0; i < selectedItems.size(); ++i)
@@ -1059,7 +1061,7 @@ void WmWidget::slotApplyLongitude()
QMap <QString,QMap <QString,QString> > WmWidget::allImagesDesc()
{
- QUrl::List urls = d->imgList->imageUrls(false);
+ QList<QUrl> urls = d->imgList->imageUrls(false);
for (int i = 0; i < urls.size(); ++i)
{
diff --git a/PORT.KF5/FACTORIZE/mediawiki/wmwidget.h b/mediawiki/wmwidget.h
similarity index 97%
rename from PORT.KF5/FACTORIZE/mediawiki/wmwidget.h
rename to mediawiki/wmwidget.h
index b05e8e8..7718b30 100644
--- a/PORT.KF5/FACTORIZE/mediawiki/wmwidget.h
+++ b/mediawiki/wmwidget.h
@@ -31,11 +31,11 @@
#include <QWidget>
#include <QStringList>
#include <QTreeWidgetItem>
+#include <QUrl>
//KDE includes
#include <kconfig.h>
-#include <QUrl>
namespace KIPIPlugins
{
@@ -96,7 +96,7 @@ public:
void readSettings(KConfigGroup& group);
void saveSettings(KConfigGroup& group);
void loadImageInfoFirstLoad();
- void loadImageInfo(const KUrl& url);
+ void loadImageInfo(const QUrl& url);
void clearEditFields();
Q_SIGNALS:
@@ -113,7 +113,7 @@ private Q_SLOTS:
void slotNewWikiClicked();
void slotAddWikiClicked();
void slotLoadImagesDesc(QTreeWidgetItem* item);
- void slotRemoveImagesDesc(const QUrl::List urls);
+ void slotRemoveImagesDesc(const QList<QUrl> urls);
void slotRestoreExtension();
void slotApplyTitle();
void slotApplyDate();
diff --git a/PORT.KF5/FACTORIZE/mediawiki/wmwindow.cpp b/mediawiki/wmwindow.cpp
similarity index 92%
rename from PORT.KF5/FACTORIZE/mediawiki/wmwindow.cpp
rename to mediawiki/wmwindow.cpp
index 927983c..f8437fb 100644
--- a/PORT.KF5/FACTORIZE/mediawiki/wmwindow.cpp
+++ b/mediawiki/wmwindow.cpp
@@ -23,7 +23,7 @@
*
* ============================================================ */
-#include "wmwindow.moc"
+#include "wmwindow.h"
// Qt includes
@@ -31,33 +31,33 @@
#include <QCloseEvent>
#include <QFileInfo>
#include <QFile>
+#include <QMenu>
+#include <QUrl>
+#include <QComboBox>
// KDE includes
-#include "kipiplugins_debug.h"
#include <kconfig.h>
#include <klocalizedstring.h>
-#include <QMenu>
-#include <QUrl>
#include <klineedit.h>
-#include <QComboBox>
#include <kpushbutton.h>
#include <kmessagebox.h>
#include <KWindowConfig>
// MediaWiki includes
-#include <libmediawiki/login.h>
-#include <libmediawiki/mediawiki.h>
-#include <libmediawiki/version.h>
+#include <MediaWiki/Login>
+#include <MediaWiki/MediaWiki>
+#include <mediawiki_version.h>
// KIPI includes
-#include <interface.h>
-#include <imagecollection.h>
+#include <KIPI/Interface>
+#include <KIPI/ImageCollection>
// Local includes
+#include "kipiplugins_debug.h"
#include "kpaboutdata.h"
#include "kpimageinfo.h"
#include "kpimageslist.h"
@@ -96,7 +96,8 @@ public:
};
WMWindow::WMWindow(const QString& tmpFolder, QWidget* const /*parent*/)
- : KP4ToolDialog(0), d(new Private)
+ : KP4ToolDialog(0),
+ d(new Private)
{
d->tmpPath.clear();
d->tmpDir = tmpFolder;
@@ -117,23 +118,28 @@ WMWindow::WMWindow(const QString& tmpFolder, QWidget* const \
/*parent*/) d->widget->setMinimumSize(700, 500);
d->widget->installEventFilter(this);
- KPAboutData* const about = new KPAboutData(ki18n("MediaWiki export"), 0,
- KAboutData::License_GPL,
+ KPAboutData* const about = new KPAboutData(ki18n("MediaWiki export"),
+ 0,
+ KAboutLicense::GPL,
ki18n("A Kipi plugin to export image \
collection "
"to a MediaWiki \
installation.\n"
- "Using libmediawiki version \
%1").subs(QString(mediawiki_version)), + \
"Using libmediawiki version \
%1").subs(QLatin1String(MEDIAWIKI_VERSION_STRING)),
ki18n("(c) 2011, Alexandre Mendes"));
- about->addAuthor(ki18n("Alexandre Mendes"), ki18n("Author"),
+ about->addAuthor(ki18n("Alexandre Mendes").toString(),
+ ki18n("Author").toString(),
"alex dot mendes1988 at gmail dot com");
- about->addAuthor(ki18n("Guillaume Hormiere"), ki18n("Developer"),
+ about->addAuthor(ki18n("Guillaume Hormiere").toString(),
+ ki18n("Developer").toString(),
"hormiere dot guillaume at gmail dot com");
- about->addAuthor(ki18n("Gilles Caulier"), ki18n("Developer"),
+ about->addAuthor(ki18n("Gilles Caulier").toString(),
+ ki18n("Developer").toString(),
"caulier dot gilles at gmail dot com");
- about->addAuthor(ki18n("Peter Potrowl"), ki18n("Developer"),
+ about->addAuthor(ki18n("Peter Potrowl").toString(),
+ ki18n("Developer").toString(),
"peter dot potrowl at gmail dot com");
about->setHandbookEntry("wikimedia");
@@ -283,7 +289,7 @@ bool WMWindow::prepareImageForUpload(const QString& imgPath)
void WMWindow::slotStartTransfer()
{
saveSettings();
- QUrl::List urls = d->widget->imagesList()->imageUrls(false);
+ QList<QUrl> urls = d->widget->imagesList()->imageUrls(false);
QMap <QString, QMap <QString, QString> > imagesDesc = \
d->widget->allImagesDesc();
for (int i = 0; i < urls.size(); ++i)
diff --git a/PORT.KF5/FACTORIZE/mediawiki/wmwindow.h b/mediawiki/wmwindow.h
similarity index 100%
rename from PORT.KF5/FACTORIZE/mediawiki/wmwindow.h
rename to mediawiki/wmwindow.h
diff --git a/PORT.KF5/FACTORIZE/mediawiki/wmwindow.ui b/mediawiki/wmwindow.ui
similarity index 100%
rename from PORT.KF5/FACTORIZE/mediawiki/wmwindow.ui
rename to mediawiki/wmwindow.ui
diff --git a/timeadjust/plugin_timeadjust.cpp b/timeadjust/plugin_timeadjust.cpp
index 1cfcfa7..f5c964e 100644
--- a/timeadjust/plugin_timeadjust.cpp
+++ b/timeadjust/plugin_timeadjust.cpp
@@ -34,7 +34,6 @@
#include <kconfig.h>
#include <kpluginfactory.h>
#include <kwindowsystem.h>
-#include <kiconloader.h>
#include <klocalizedstring.h>
// Libkipi includes
@@ -62,12 +61,12 @@ public:
dialog = 0;
}
- QAction * actionTimeAjust;
+ QAction * actionTimeAjust;
TimeAdjustDialog* dialog;
};
Plugin_TimeAdjust::Plugin_TimeAdjust(QObject* const parent, const QVariantList&)
- : Plugin(/*TimeAdjustFactory::componentData(),*/ parent, "TimeAdjust"),
+ : Plugin(parent, "TimeAdjust"),
d(new Private)
{
//kDebug(AREA_CODE_LOADING) << "Plugin_TimeAdjust plugin loaded";
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic