[prev in list] [next in list] [prev in thread] [next in thread]
List: kde-commits
Subject: [kipi-plugins/frameworks] /: Initial port of SmugMug tool to KF5.
From: Gilles Caulier <caulier.gilles () gmail ! com>
Date: 2015-07-01 9:36:33
Message-ID: E1ZAERV-0001U1-Ku () scm ! kde ! org
[Download RAW message or body]
Git commit 50b719972f90ef57eefba24483d578fce325cb39 by Gilles Caulier.
Committed on 01/07/2015 at 09:35.
Pushed by cgilles into branch 'frameworks'.
Initial port of SmugMug 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 +1 -4 CMakeLists.txt
M +1 -1 mediawiki/plugin_wikimedia.cpp
R +7 -5 smug/CMakeLists.txt [from: PORT.KF5/FACTORIZE/smug/CMakeLists.txt - 089% similarity]
R +0 -0 smug/Messages.sh [from: PORT.KF5/FACTORIZE/smug/Messages.sh - 100% similarity]
R +0 -0 smug/TODO [from: PORT.KF5/FACTORIZE/smug/TODO - 100% similarity]
R +1 -1 smug/icons/CMakeLists.txt [from: PORT.KF5/FACTORIZE/smug/icons/CMakeLists.txt - 076% \
similarity] R +- -- smug/icons/hi16-apps-kipi-smugmug.png [from: \
PORT.KF5/FACTORIZE/smug/icons/hi16-apps-kipi-smugmug.png - 100% similarity] R +- -- \
smug/icons/hi22-apps-kipi-smugmug.png [from: PORT.KF5/FACTORIZE/smug/icons/hi22-apps-kipi-smugmug.png - \
100% similarity] R +- -- smug/icons/hi32-apps-kipi-smugmug.png [from: \
PORT.KF5/FACTORIZE/smug/icons/hi32-apps-kipi-smugmug.png - 100% similarity] R +- -- \
smug/icons/hi48-apps-kipi-smugmug.png [from: PORT.KF5/FACTORIZE/smug/icons/hi48-apps-kipi-smugmug.png - \
100% similarity] R +- -- smug/icons/hisc-apps-kipi-smugmug.svgz [from: \
PORT.KF5/FACTORIZE/smug/icons/hisc-apps-kipi-smugmug.svgz - 100% similarity] R +0 -0 \
smug/kipiplugin_smug.desktop.cmake.in [from: PORT.KF5/FACTORIZE/smug/kipiplugin_smug.desktop.cmake.in - \
100% similarity] R +0 -0 smug/kipiplugin_smugui.rc [from: \
PORT.KF5/FACTORIZE/smug/kipiplugin_smugui.rc - 100% similarity] R +1 -1 smug/mpform.cpp [from: \
PORT.KF5/FACTORIZE/smug/mpform.cpp - 098% similarity] R +0 -0 smug/mpform.h [from: \
PORT.KF5/FACTORIZE/smug/mpform.h - 100% similarity] R +16 -14 smug/plugin_smug.cpp [from: \
PORT.KF5/FACTORIZE/smug/plugin_smug.cpp - 089% similarity] R +0 -0 smug/plugin_smug.h [from: \
PORT.KF5/FACTORIZE/smug/plugin_smug.h - 100% similarity] R +19 -18 smug/smugalbum.cpp [from: \
PORT.KF5/FACTORIZE/smug/smugalbum.cpp - 085% similarity] R +0 -0 smug/smugalbum.h [from: \
PORT.KF5/FACTORIZE/smug/smugalbum.h - 100% similarity] R +0 -0 smug/smugitem.h [from: \
PORT.KF5/FACTORIZE/smug/smugitem.h - 100% similarity] R +6 -5 smug/smugtalker.cpp [from: \
PORT.KF5/FACTORIZE/smug/smugtalker.cpp - 099% similarity] R +0 -0 smug/smugtalker.h [from: \
PORT.KF5/FACTORIZE/smug/smugtalker.h - 100% similarity] R +7 -6 smug/smugwidget.cpp [from: \
PORT.KF5/FACTORIZE/smug/smugwidget.cpp - 098% similarity] R +0 -0 smug/smugwidget.h [from: \
PORT.KF5/FACTORIZE/smug/smugwidget.h - 100% similarity] R +24 -20 smug/smugwindow.cpp [from: \
PORT.KF5/FACTORIZE/smug/smugwindow.cpp - 096% similarity] R +1 -1 smug/smugwindow.h [from: \
PORT.KF5/FACTORIZE/smug/smugwindow.h - 099% similarity]
http://commits.kde.org/kipi-plugins/50b719972f90ef57eefba24483d578fce325cb39
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 80ae732..a73a424 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -387,11 +387,9 @@ if(KF5Kipi_FOUND)
# Plugins to re-factoring.
add_subdirectory(flickrexport)
-# add_subdirectory(galleryexport)
# add_subdirectory(piwigoexport)
# add_subdirectory(kioexportimport)
-# add_subdirectory(picasawebexport)
-# add_subdirectory(smug)
+ add_subdirectory(smug)
# add_subdirectory(rajceexport)
add_subdirectory(imageshack)
#
@@ -404,7 +402,6 @@ if(KF5Kipi_FOUND)
# add_subdirectory(debianscreenshots)
# add_subdirectory(facebook)
# add_subdirectory(imgurexport)
-# add_subdirectory(googledrive)
# add_subdirectory(dropbox)
# endif()
diff --git a/mediawiki/plugin_wikimedia.cpp b/mediawiki/plugin_wikimedia.cpp
index 12ea97c..1c0673d 100644
--- a/mediawiki/plugin_wikimedia.cpp
+++ b/mediawiki/plugin_wikimedia.cpp
@@ -81,7 +81,7 @@ Plugin_WikiMedia::Plugin_WikiMedia(QObject* const parent, const QVariantList& /*
: Plugin(parent, "MediaWiki export"),
d(new Private)
{
- //kDebug(AREA_CODE_LOADING) << "Plugin_MediaWiki plugin loaded";
+ qCDebug(KIPIPLUGINS_LOG) << "Plugin_MediaWiki plugin loaded";
setUiBaseName("kipiplugin_wikimediaui.rc");
setupXML();
diff --git a/PORT.KF5/FACTORIZE/smug/CMakeLists.txt b/smug/CMakeLists.txt
similarity index 89%
rename from PORT.KF5/FACTORIZE/smug/CMakeLists.txt
rename to smug/CMakeLists.txt
index c706391..4d8951d 100644
--- a/PORT.KF5/FACTORIZE/smug/CMakeLists.txt
+++ b/smug/CMakeLists.txt
@@ -1,18 +1,20 @@
#
-# 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)
+add_definitions(-DTRANSLATION_DOMAIN=\"kipiplugin_smug\")
+
set(kipiplugin_smug_PART_SRCS
plugin_smug.cpp
- smugwindow.cpp
- smugwidget.cpp
- smugalbum.cpp
- smugtalker.cpp
mpform.cpp
+ smugtalker.cpp
+ smugalbum.cpp
+ smugwidget.cpp
+ smugwindow.cpp
)
add_library(kipiplugin_smug MODULE ${kipiplugin_smug_PART_SRCS})
diff --git a/PORT.KF5/FACTORIZE/smug/Messages.sh b/smug/Messages.sh
similarity index 100%
rename from PORT.KF5/FACTORIZE/smug/Messages.sh
rename to smug/Messages.sh
diff --git a/PORT.KF5/FACTORIZE/smug/TODO b/smug/TODO
similarity index 100%
rename from PORT.KF5/FACTORIZE/smug/TODO
rename to smug/TODO
diff --git a/PORT.KF5/FACTORIZE/smug/icons/CMakeLists.txt b/smug/icons/CMakeLists.txt
similarity index 76%
rename from PORT.KF5/FACTORIZE/smug/icons/CMakeLists.txt
rename to smug/icons/CMakeLists.txt
index 108aadf..0d23d8a 100644
--- a/PORT.KF5/FACTORIZE/smug/icons/CMakeLists.txt
+++ b/smug/icons/CMakeLists.txt
@@ -1,5 +1,5 @@
#
-# 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.
diff --git a/PORT.KF5/FACTORIZE/smug/icons/hi16-apps-kipi-smugmug.png \
b/smug/icons/hi16-apps-kipi-smugmug.png similarity index 100%
rename from PORT.KF5/FACTORIZE/smug/icons/hi16-apps-kipi-smugmug.png
rename to smug/icons/hi16-apps-kipi-smugmug.png
diff --git a/PORT.KF5/FACTORIZE/smug/icons/hi22-apps-kipi-smugmug.png \
b/smug/icons/hi22-apps-kipi-smugmug.png similarity index 100%
rename from PORT.KF5/FACTORIZE/smug/icons/hi22-apps-kipi-smugmug.png
rename to smug/icons/hi22-apps-kipi-smugmug.png
diff --git a/PORT.KF5/FACTORIZE/smug/icons/hi32-apps-kipi-smugmug.png \
b/smug/icons/hi32-apps-kipi-smugmug.png similarity index 100%
rename from PORT.KF5/FACTORIZE/smug/icons/hi32-apps-kipi-smugmug.png
rename to smug/icons/hi32-apps-kipi-smugmug.png
diff --git a/PORT.KF5/FACTORIZE/smug/icons/hi48-apps-kipi-smugmug.png \
b/smug/icons/hi48-apps-kipi-smugmug.png similarity index 100%
rename from PORT.KF5/FACTORIZE/smug/icons/hi48-apps-kipi-smugmug.png
rename to smug/icons/hi48-apps-kipi-smugmug.png
diff --git a/PORT.KF5/FACTORIZE/smug/icons/hisc-apps-kipi-smugmug.svgz \
b/smug/icons/hisc-apps-kipi-smugmug.svgz similarity index 100%
rename from PORT.KF5/FACTORIZE/smug/icons/hisc-apps-kipi-smugmug.svgz
rename to smug/icons/hisc-apps-kipi-smugmug.svgz
diff --git a/PORT.KF5/FACTORIZE/smug/kipiplugin_smug.desktop.cmake.in \
b/smug/kipiplugin_smug.desktop.cmake.in similarity index 100%
rename from PORT.KF5/FACTORIZE/smug/kipiplugin_smug.desktop.cmake.in
rename to smug/kipiplugin_smug.desktop.cmake.in
diff --git a/PORT.KF5/FACTORIZE/smug/kipiplugin_smugui.rc b/smug/kipiplugin_smugui.rc
similarity index 100%
rename from PORT.KF5/FACTORIZE/smug/kipiplugin_smugui.rc
rename to smug/kipiplugin_smugui.rc
diff --git a/PORT.KF5/FACTORIZE/smug/mpform.cpp b/smug/mpform.cpp
similarity index 98%
rename from PORT.KF5/FACTORIZE/smug/mpform.cpp
rename to smug/mpform.cpp
index 355031f..fa45371 100644
--- a/PORT.KF5/FACTORIZE/smug/mpform.cpp
+++ b/smug/mpform.cpp
@@ -101,7 +101,7 @@ bool MPForm::addPair(const QString& name, const QString& value, const QString& c
bool MPForm::addFile(const QString& name, const QString& path)
{
- KMimeType::Ptr ptr = KMimeType::findByUrl(path);
+ KMimeType::Ptr ptr = KMimeType::findByUrl(QUrl::fromLocalFile(path));
QString mime = ptr->name();
if (mime.isEmpty())
{
diff --git a/PORT.KF5/FACTORIZE/smug/mpform.h b/smug/mpform.h
similarity index 100%
rename from PORT.KF5/FACTORIZE/smug/mpform.h
rename to smug/mpform.h
diff --git a/PORT.KF5/FACTORIZE/smug/plugin_smug.cpp b/smug/plugin_smug.cpp
similarity index 89%
rename from PORT.KF5/FACTORIZE/smug/plugin_smug.cpp
rename to smug/plugin_smug.cpp
index ec70a9d..611cad5 100644
--- a/PORT.KF5/FACTORIZE/smug/plugin_smug.cpp
+++ b/smug/plugin_smug.cpp
@@ -8,7 +8,7 @@
* SmugMug web service
*
* Copyright (C) 2005-2008 by Vardhman Jain <vardhman at gmail dot com>
- * Copyright (C) 2008-2011 by Gilles Caulier <caulier dot gilles at gmail dot com>
+ * Copyright (C) 2008-2015 by Gilles Caulier <caulier dot gilles at gmail dot com>
* Copyright (C) 2008-2009 by Luka Renko <lure at kubuntu dot org>
*
* This program is free software; you can redistribute it
@@ -23,13 +23,13 @@
*
* ============================================================ */
+#include "plugin_smug.h"
+
// To disable warnings under MSVC2008 about POSIX methods().
#ifdef _MSC_VER
#pragma warning(disable : 4996)
#endif
-#include "plugin_smug.moc"
-
// C ANSI includes
extern "C"
@@ -37,12 +37,14 @@ extern "C"
#include <unistd.h>
}
-// KDE includes
+// Qt includes
-#include "kipiplugins_debug.h"
-#include <kconfig.h>
#include <QApplication>
#include <QAction>
+
+// KDE includes
+
+#include <kconfig.h>
#include <kactioncollection.h>
#include <kgenericfactory.h>
#include <klibloader.h>
@@ -51,22 +53,22 @@ extern "C"
// Libkipi includes
-#include <interface.h>
+#include <KIPI/Interface>
// Local includes
+#include "kipiplugins_debug.h"
#include "smugwindow.h"
namespace KIPISmugPlugin
{
K_PLUGIN_FACTORY( SmugFactory, registerPlugin<Plugin_Smug>(); )
-K_EXPORT_PLUGIN ( SmugFactory("kipiplugin_smug") )
Plugin_Smug::Plugin_Smug(QObject* const parent, const QVariantList& /*args*/)
- : Plugin(SmugFactory::componentData(), parent, "Smug")
+ : Plugin(parent, "Smug")
{
- kDebug(AREA_CODE_LOADING) << "Plugin_Smug plugin loaded";
+ qCDebug(KIPIPLUGINS_LOG) << "Plugin_Smug plugin loaded";
m_dlgImport = 0;
m_dlgExport = 0;
@@ -85,8 +87,6 @@ void Plugin_Smug::setup(QWidget* const widget)
{
Plugin::setup(widget);
- KIconLoader::global()->addAppDir("kipiplugin_smug");
-
setupActions();
if (!interface())
@@ -106,7 +106,7 @@ void Plugin_Smug::setupActions()
m_actionExport = new QAction(this);
m_actionExport->setText(i18n("Export to &SmugMug..."));
m_actionExport->setIcon(QIcon::fromTheme("kipi-smugmug"));
- m_actionExport->setShortcut(KShortcut(Qt::ALT+Qt::SHIFT+Qt::Key_S));
+ m_actionExport->setShortcut(QKeySequence(Qt::ALT+Qt::SHIFT+Qt::Key_S));
m_actionExport->setEnabled(false);
connect(m_actionExport, SIGNAL(triggered(bool)),
@@ -117,7 +117,7 @@ void Plugin_Smug::setupActions()
m_actionImport = new QAction(this);
m_actionImport->setText(i18n("Import from &SmugMug..."));
m_actionImport->setIcon(QIcon::fromTheme("kipi-smugmug"));
- m_actionImport->setShortcut(KShortcut(Qt::ALT+Qt::SHIFT+Qt::CTRL+Qt::Key_S));
+ m_actionImport->setShortcut(QKeySequence(Qt::ALT+Qt::SHIFT+Qt::CTRL+Qt::Key_S));
m_actionImport->setEnabled(false);
connect(m_actionImport, SIGNAL(triggered(bool)),
@@ -169,3 +169,5 @@ void Plugin_Smug::slotImport()
}
} // namespace KIPISmugPlugin
+
+#include "plugin_smug.moc"
diff --git a/PORT.KF5/FACTORIZE/smug/plugin_smug.h b/smug/plugin_smug.h
similarity index 100%
rename from PORT.KF5/FACTORIZE/smug/plugin_smug.h
rename to smug/plugin_smug.h
diff --git a/PORT.KF5/FACTORIZE/smug/smugalbum.cpp b/smug/smugalbum.cpp
similarity index 85%
rename from PORT.KF5/FACTORIZE/smug/smugalbum.cpp
rename to smug/smugalbum.cpp
index 7a35aa1..c01f2f6 100644
--- a/PORT.KF5/FACTORIZE/smug/smugalbum.cpp
+++ b/smug/smugalbum.cpp
@@ -21,7 +21,7 @@
*
* ============================================================ */
-#include "smugalbum.moc"
+#include "smugalbum.h"
// Qt includes
@@ -30,24 +30,25 @@
#include <QHBoxLayout>
#include <QGroupBox>
#include <QRadioButton>
+#include <QComboBox>
+#include <QApplication>
// KDE includes
#include <klocalizedstring.h>
#include <kdialog.h>
-#include <QComboBox>
#include <klineedit.h>
#include <ktextedit.h>
// local includes
-#include <smugitem.h>
+#include "smugitem.h"
namespace KIPISmugPlugin
{
SmugNewAlbum::SmugNewAlbum(QWidget* parent)
- : KDialog(parent)
+ : KDialog(parent)
{
QString header(i18n("SmugMug New Album"));
setWindowTitle(header);
@@ -55,13 +56,13 @@ SmugNewAlbum::SmugNewAlbum(QWidget* parent)
setDefaultButton(Cancel);
setModal(false);
- QWidget *mainWidget = new QWidget(this);
+ QWidget* const mainWidget = new QWidget(this);
setMainWidget(mainWidget);
mainWidget->setMinimumSize(400, 400);
// ------------------------------------------------------------------------
- QGroupBox* albumBox = new QGroupBox(i18n("Album"), mainWidget);
+ QGroupBox* const albumBox = new QGroupBox(i18n("Album"), mainWidget);
albumBox->setWhatsThis(
i18n("These are basic settings for the new SmugMug album."));
@@ -88,7 +89,7 @@ SmugNewAlbum::SmugNewAlbum(QWidget* parent)
m_templateCoB->setWhatsThis(
i18n("Album template for the new album (optional)."));
- QFormLayout* albumBoxLayout = new QFormLayout;
+ QFormLayout* const albumBoxLayout = new QFormLayout;
albumBoxLayout->addRow(i18nc("new smug album dialog", "Title:"), m_titleEdt);
albumBoxLayout->addRow(i18nc("new smug album dialog", "Category:"), m_categCoB);
albumBoxLayout->addRow(i18nc("new smug album dialog", "Subcategory:"), m_subCategCoB);
@@ -113,7 +114,7 @@ SmugNewAlbum::SmugNewAlbum(QWidget* parent)
m_unlistedRBtn->setWhatsThis(
i18n("Unlisted album is only accessible via URL."));
- QHBoxLayout* radioLayout = new QHBoxLayout;
+ QHBoxLayout* const radioLayout = new QHBoxLayout;
radioLayout->addWidget(m_publicRBtn);
radioLayout->addWidget(m_unlistedRBtn);
@@ -125,7 +126,7 @@ SmugNewAlbum::SmugNewAlbum(QWidget* parent)
m_hintEdt->setWhatsThis(
i18n("Password hint to present to users in the password prompt (optional)."));
- QFormLayout* privBoxLayout = new QFormLayout;
+ QFormLayout* const privBoxLayout = new QFormLayout;
privBoxLayout->addRow(i18n("Privacy:"), radioLayout);
privBoxLayout->addRow(i18n("Password:"), m_passwdEdt);
privBoxLayout->addRow(i18n("Password Hint:"), m_hintEdt);
@@ -134,7 +135,7 @@ SmugNewAlbum::SmugNewAlbum(QWidget* parent)
m_privBox->setLayout(privBoxLayout);
// ------------------------------------------------------------------------
- QVBoxLayout* mainLayout = new QVBoxLayout(mainWidget);
+ QVBoxLayout* const mainLayout = new QVBoxLayout(mainWidget);
mainLayout->addWidget(albumBox);
mainLayout->addWidget(m_privBox);
mainLayout->setSpacing(QApplication::style()->pixelMetric(QStyle::PM_DefaultLayoutSpacing));
@@ -150,22 +151,22 @@ SmugNewAlbum::~SmugNewAlbum()
void SmugNewAlbum::getAlbumProperties(SmugAlbum &album)
{
- album.title = m_titleEdt->text();
+ album.title = m_titleEdt->text();
- album.category = m_categCoB->currentText();
- album.categoryID = m_categCoB->itemData(m_categCoB->currentIndex()).toLongLong();
+ album.category = m_categCoB->currentText();
+ album.categoryID = m_categCoB->itemData(m_categCoB->currentIndex()).toLongLong();
album.subCategory = m_subCategCoB->currentText();
album.subCategoryID = m_subCategCoB->itemData(m_subCategCoB->currentIndex()).toLongLong();
album.description = m_descEdt->toPlainText();
- album.tmpl = m_templateCoB->currentText();
- album.tmplID = m_templateCoB->itemData(m_templateCoB->currentIndex()).toLongLong();
+ album.tmpl = m_templateCoB->currentText();
+ album.tmplID = m_templateCoB->itemData(m_templateCoB->currentIndex()).toLongLong();
- album.isPublic = m_publicRBtn->isChecked();
- album.password = m_passwdEdt->text();
- album.passwordHint = m_hintEdt->text();
+ album.isPublic = m_publicRBtn->isChecked();
+ album.password = m_passwdEdt->text();
+ album.passwordHint = m_hintEdt->text();
}
} // namespace KIPISmugPlugin
diff --git a/PORT.KF5/FACTORIZE/smug/smugalbum.h b/smug/smugalbum.h
similarity index 100%
rename from PORT.KF5/FACTORIZE/smug/smugalbum.h
rename to smug/smugalbum.h
diff --git a/PORT.KF5/FACTORIZE/smug/smugitem.h b/smug/smugitem.h
similarity index 100%
rename from PORT.KF5/FACTORIZE/smug/smugitem.h
rename to smug/smugitem.h
diff --git a/PORT.KF5/FACTORIZE/smug/smugtalker.cpp b/smug/smugtalker.cpp
similarity index 99%
rename from PORT.KF5/FACTORIZE/smug/smugtalker.cpp
rename to smug/smugtalker.cpp
index d3837e3..5c0bae6 100644
--- a/PORT.KF5/FACTORIZE/smug/smugtalker.cpp
+++ b/smug/smugtalker.cpp
@@ -21,7 +21,7 @@
*
* ============================================================ */
-#include "smugtalker.moc"
+#include "smugtalker.h"
// Qt includes
@@ -34,13 +34,14 @@
// KDE includes
-#include <kcodecs.h>
-#include "kipiplugins_debug.h"
+#include <kmd5.h>
+#include <kjobwidgets.h>
#include <kio/job.h>
#include <kio/jobuidelegate.h>
// Local includes
+#include "kipiplugins_debug.h"
#include "kpversion.h"
#include "mpform.h"
#include "smugitem.h"
@@ -459,7 +460,7 @@ void SmugTalker::getPhoto(const QString& imgPath)
emit signalBusy(true);
- KIO::TransferJob* const job = KIO::get(imgPath, KIO::Reload, KIO::HideProgressInfo);
+ KIO::TransferJob* const job = KIO::get(QUrl::fromLocalFile(imgPath), KIO::Reload, \
KIO::HideProgressInfo); job->addMetaData("UserAgent", m_userAgent);
connect(job, SIGNAL(data(KIO::Job*,QByteArray)),
@@ -537,7 +538,7 @@ void SmugTalker::slotResult(KJob* kjob)
else
{
emit signalBusy(false);
- job->ui()->setWindow(m_parent);
+ KJobWidgets::setWindow(job, m_parent);
job->ui()->showErrorMessage();
}
diff --git a/PORT.KF5/FACTORIZE/smug/smugtalker.h b/smug/smugtalker.h
similarity index 100%
rename from PORT.KF5/FACTORIZE/smug/smugtalker.h
rename to smug/smugtalker.h
diff --git a/PORT.KF5/FACTORIZE/smug/smugwidget.cpp b/smug/smugwidget.cpp
similarity index 98%
rename from PORT.KF5/FACTORIZE/smug/smugwidget.cpp
rename to smug/smugwidget.cpp
index 5d3c866..38fa93b 100644
--- a/PORT.KF5/FACTORIZE/smug/smugwidget.cpp
+++ b/smug/smugwidget.cpp
@@ -21,7 +21,7 @@
*
* ============================================================ */
-#include "smugwidget.moc"
+#include "smugwidget.h"
// Qt includes
@@ -33,20 +33,21 @@
#include <QGridLayout>
#include <QHBoxLayout>
#include <QVBoxLayout>
+#include <QComboBox>
+#include <QApplication>
// KDE includes
#include <klocalizedstring.h>
#include <kdialog.h>
#include <klineedit.h>
-#include <QComboBox>
#include <kpushbutton.h>
// Libkipi includes
-#include <interface.h>
-#include <uploadwidget.h>
-#include <imagecollection.h>
+#include <KIPI/Interface>
+#include <KIPI/UploadWidget>
+#include <KIPI/ImageCollection>
// Local includes
@@ -295,7 +296,7 @@ QString SmugWidget::getAlbumPassword() const
QString SmugWidget::getDestinationPath() const
{
- return m_uploadWidget->selectedImageCollection().uploadPath().path();
+ return m_uploadWidget->selectedImageCollection().uploadUrl().toLocalFile();
}
void SmugWidget::setNickName(const QString& nick)
diff --git a/PORT.KF5/FACTORIZE/smug/smugwidget.h b/smug/smugwidget.h
similarity index 100%
rename from PORT.KF5/FACTORIZE/smug/smugwidget.h
rename to smug/smugwidget.h
diff --git a/PORT.KF5/FACTORIZE/smug/smugwindow.cpp b/smug/smugwindow.cpp
similarity index 96%
rename from PORT.KF5/FACTORIZE/smug/smugwindow.cpp
rename to smug/smugwindow.cpp
index 0537dd1..cd81855 100644
--- a/PORT.KF5/FACTORIZE/smug/smugwindow.cpp
+++ b/smug/smugwindow.cpp
@@ -23,7 +23,7 @@
*
* ============================================================ */
-#include "smugwindow.moc"
+#include "smugwindow.h"
// Qt includes
@@ -32,15 +32,14 @@
#include <QCheckBox>
#include <QGroupBox>
#include <QCloseEvent>
+#include <QMenu>
+#include <QComboBox>
// KDE includes
-#include "kipiplugins_debug.h"
#include <kconfig.h>
#include <klocalizedstring.h>
-#include <QMenu>
#include <khelpmenu.h>
-#include <QComboBox>
#include <klineedit.h>
#include <kmessagebox.h>
#include <kpushbutton.h>
@@ -50,16 +49,17 @@
// LibKDcraw includes
-#include <version.h>
-#include <kdcraw.h>
+#include <libkdcraw_version.h>
+#include <KDCRAW/KDcraw>
// Libkipi includes
-#include <interface.h>
-#include <uploadwidget.h>
+#include <KIPI/Interface>
+#include <KIPI/UploadWidget>
// Local includes
+#include "kipiplugins_debug.h"
#include "kpimageslist.h"
#include "kpmetadata.h"
#include "kpaboutdata.h"
@@ -125,15 +125,16 @@ SmugWindow::SmugWindow(const QString& tmpFolder, bool import, QWidget* const /*p
// ------------------------------------------------------------------------
- KPAboutData* about = new KPAboutData(ki18n("Smug Import/Export"), 0,
- KAboutData::License_GPL,
- ki18n("A Kipi plugin to import/export image collections "
- "from/to the SmugMug web service."),
- ki18n("(c) 2005-2008, Vardhman Jain\n"
- "(c) 2008-2012, Gilles Caulier\n"
- "(c) 2008-2009, Luka Renko"));
+ KPAboutData* const about = new KPAboutData(ki18n("Smug Import/Export"), 0,
+ KAboutLicense::GPL,
+ ki18n("A Kipi plugin to import/export image collections "
+ "from/to the SmugMug web service."),
+ ki18n("(c) 2005-2008, Vardhman Jain\n"
+ "(c) 2008-2012, Gilles Caulier\n"
+ "(c) 2008-2009, Luka Renko"));
- about->addAuthor(ki18n("Luka Renko"), ki18n("Author and maintainer"),
+ about->addAuthor(ki18n("Luka Renko").toString(),
+ ki18n("Author and maintainer").toString(),
"lure at kubuntu dot org");
about->setHandbookEntry("smug");
@@ -444,9 +445,10 @@ void SmugWindow::slotListPhotosDone(int errCode, const QString &errMsg,
}
m_transferQueue.clear();
+
for (int i = 0; i < photosList.size(); ++i)
{
- m_transferQueue.push_back(photosList.at(i).originalURL);
+ m_transferQueue.push_back(QUrl::fromLocalFile(photosList.at(i).originalURL));
}
if (m_transferQueue.isEmpty())
@@ -755,7 +757,7 @@ void SmugWindow::uploadNextPhoto()
m_widget->m_imgList->processing(m_transferQueue.first());
- QString imgPath = m_transferQueue.first().path();
+ QUrl imgPath = m_transferQueue.first();
KPImageInfo info(imgPath);
m_widget->progressBar()->setMaximum(m_imagesTotal);
@@ -765,19 +767,21 @@ void SmugWindow::uploadNextPhoto()
// check if we have to RAW file -> use preview image then
bool isRAW = KPMetadata::isRawFile(imgPath);
+
if (isRAW || m_widget->m_resizeChB->isChecked())
{
- if (!prepareImageForUpload(imgPath, isRAW))
+ if (!prepareImageForUpload(imgPath.toLocalFile(), isRAW))
{
slotAddPhotoDone(666, i18n("Cannot open file"));
return;
}
+
res = m_talker->addPhoto(m_tmpPath, m_currentAlbumID, m_currentAlbumKey, info.description());
}
else
{
m_tmpPath.clear();
- res = m_talker->addPhoto(imgPath, m_currentAlbumID, m_currentAlbumKey, info.description());
+ res = m_talker->addPhoto(imgPath.toLocalFile(), m_currentAlbumID, m_currentAlbumKey, \
info.description()); }
if (!res)
diff --git a/PORT.KF5/FACTORIZE/smug/smugwindow.h b/smug/smugwindow.h
similarity index 99%
rename from PORT.KF5/FACTORIZE/smug/smugwindow.h
rename to smug/smugwindow.h
index 093815d..05421b3 100644
--- a/PORT.KF5/FACTORIZE/smug/smugwindow.h
+++ b/smug/smugwindow.h
@@ -130,7 +130,7 @@ private:
KPasswordDialog* m_loginDlg;
- QUrl::List m_transferQueue;
+ QList<QUrl> m_transferQueue;
SmugTalker* m_talker;
SmugWidget* m_widget;
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic