[prev in list] [next in list] [prev in thread] [next in thread]
List: kde-commits
Subject: [digikam/gsoc18-twitter-onedrive] core: Adding export menu buttons
From: Tarek Talaat <null () kde ! org>
Date: 2018-07-14 19:13:43
Message-ID: E1fePzD-0008Vy-6v () code ! kde ! org
[Download RAW message or body]
Git commit 46fc80605dbbf888289311078c7723235b9155fb by Tarek Talaat.
Committed on 13/07/2018 at 13:23.
Pushed by tarektalaat into branch 'gsoc18-twitter-onedrive'.
Adding export menu buttons
M +2 -2 core/app/main/digikamapp_export.cpp
M +1 -1 core/app/main/digikamapp_p.h
M +1 -0 core/app/main/digikamui5.rc
M +2 -2 core/showfoto/main/showfoto.cpp
M +11 -0 core/utilities/assistants/webservices/CMakeLists.txt
M +1 -0 core/utilities/assistants/webservices/dropbox/dbtalker.cpp
M +3 -3 core/utilities/imageeditor/main/imagewindow.cpp
M +1 -1 core/utilities/imageeditor/main/imagewindow_p.h
M +1 -0 core/utilities/lighttable/lighttablewindowui5.rc
https://commits.kde.org/digikam/46fc80605dbbf888289311078c7723235b9155fb
diff --git a/core/app/main/digikamapp_export.cpp b/core/app/main/digikamapp_export.cpp
index ad9261fd04..5396f5e0df 100644
--- a/core/app/main/digikamapp_export.cpp
+++ b/core/app/main/digikamapp_export.cpp
@@ -114,12 +114,12 @@ void DigikamApp::slotExportTool()
w->exec();
delete w;
}
- /*else if (tool == m_exportTwitterAction)
+ else if (tool == m_exportTwitterAction)
{
QPointer<ODWindow> w = new TwWindow(new DBInfoIface(this, QList<QUrl>(), \
ApplicationSettings::ImportExport), this); w->exec();
delete w;
- }*/
+ }
else if (tool == m_exportFacebookAction)
{
QPointer<FbWindow> w = new FbWindow(new DBInfoIface(this, QList<QUrl>(), \
ApplicationSettings::ImportExport), this);
diff --git a/core/app/main/digikamapp_p.h b/core/app/main/digikamapp_p.h
index 388c65b88d..edba9f3bb1 100644
--- a/core/app/main/digikamapp_p.h
+++ b/core/app/main/digikamapp_p.h
@@ -132,7 +132,7 @@
#include "dmediaserverdlg.h"
#include "dbwindow.h"
#include "odwindow.h"
-//#include "twitterwindow.h"
+#include "twitterwindow.h"
#include "fbwindow.h"
#include "flickrwindow.h"
#include "gswindow.h"
diff --git a/core/app/main/digikamui5.rc b/core/app/main/digikamui5.rc
index cceb022608..40ffca0d7f 100644
--- a/core/app/main/digikamui5.rc
+++ b/core/app/main/digikamui5.rc
@@ -158,6 +158,7 @@
<Action name="export_onedrive" />
<Action name="export_rajce" />
<Action name="export_smugmug" />
+ <Action name="export_twitter" />
<Action name="export_yandexfotki" />
<Action name="export_mediawiki" />
<Action name="export_vkontakte" />
diff --git a/core/showfoto/main/showfoto.cpp b/core/showfoto/main/showfoto.cpp
index c15b233c73..3cf995ddf5 100644
--- a/core/showfoto/main/showfoto.cpp
+++ b/core/showfoto/main/showfoto.cpp
@@ -1503,12 +1503,12 @@ void ShowFoto::slotExportTool()
w->exec();
delete w;
}
- /*else if (tool == m_exportTwitterAction)
+ else if (tool == m_exportTwitterAction)
{
QPointer<ODWindow> w = new TwWindow(new DMetaInfoIface(this, d->thumbBar->urls()), this);
w->exec();
delete w;
- }*/
+ }
else if (tool == m_exportFacebookAction)
{
QPointer<FbWindow> w = new FbWindow(new DMetaInfoIface(this, d->thumbBar->urls()), this);
diff --git a/core/utilities/assistants/webservices/CMakeLists.txt \
b/core/utilities/assistants/webservices/CMakeLists.txt index 60c0092b80..f6c4bdd60a 100644
--- a/core/utilities/assistants/webservices/CMakeLists.txt
+++ b/core/utilities/assistants/webservices/CMakeLists.txt
@@ -127,6 +127,16 @@ set(libwsonedrive_SRCS ${CMAKE_CURRENT_SOURCE_DIR}/onedrive/odnewalbumdlg.cpp
${CMAKE_CURRENT_SOURCE_DIR}/onedrive/odwidget.cpp
${CMAKE_CURRENT_SOURCE_DIR}/onedrive/odwindow.cpp
)
+
+# Twitter tool --------------------------------------------------------------
+
+set(libwstwitter_SRCS ${CMAKE_CURRENT_SOURCE_DIR}/twitter/twitternewalbumdlg.cpp
+ ${CMAKE_CURRENT_SOURCE_DIR}/twitter/twittermpform.cpp
+ ${CMAKE_CURRENT_SOURCE_DIR}/twitter/twittertalker.cpp
+ ${CMAKE_CURRENT_SOURCE_DIR}/twitter/twitterwidget.cpp
+ ${CMAKE_CURRENT_SOURCE_DIR}/twitter/twitterwindow.cpp
+)
+
# SmugMug tool -------------------------------------------------------------
set(libwssmugmug_SRCS ${CMAKE_CURRENT_SOURCE_DIR}/smugmug/smugnewalbumdlg.cpp
@@ -245,6 +255,7 @@ add_library(webservices_src OBJECT ${libwebservices_SRCS}
${libwsimgur_SRCS}
${libwsdropbox_SRCS}
${libwsonedrive_SRCS}
+ ${libwstwitter_SRCS}
${libwssmugmug_SRCS}
${libwsimageshack_SRCS}
${libwsfacebook_SRCS}
diff --git a/core/utilities/assistants/webservices/dropbox/dbtalker.cpp \
b/core/utilities/assistants/webservices/dropbox/dbtalker.cpp index e1bee7ad3d..795937505b 100644
--- a/core/utilities/assistants/webservices/dropbox/dbtalker.cpp
+++ b/core/utilities/assistants/webservices/dropbox/dbtalker.cpp
@@ -297,6 +297,7 @@ bool DBTalker::addPhoto(const QString& imgPath, const QString& uploadFolder, boo
}
QString uploadPath = uploadFolder + QUrl(QUrl::fromLocalFile(imgPath)).fileName();
+
QUrl url(QLatin1String("https://content.dropboxapi.com/2/files/upload"));
qCDebug(DIGIKAM_WEBSERVICES_LOG) << "upload path " << uploadPath;
diff --git a/core/utilities/imageeditor/main/imagewindow.cpp \
b/core/utilities/imageeditor/main/imagewindow.cpp index 96850430a3..84115cf36a 100644
--- a/core/utilities/imageeditor/main/imagewindow.cpp
+++ b/core/utilities/imageeditor/main/imagewindow.cpp
@@ -1896,13 +1896,13 @@ void ImageWindow::slotExportTool()
w->exec();
delete w;
}
- /*else if (tool == m_exportTwitterAction)
+ else if (tool == m_exportTwitterAction)
{
- QPointer<ODWindow> w = new TwWindow(new DBInfoIface(this, d->thumbBar->allUrls(),
+ QPointer<TwWindow> w = new TwWindow(new DBInfoIface(this, d->thumbBar->allUrls(),
ApplicationSettings::ImportExport), this);
w->exec();
delete w;
- }*/
+ }
else if (tool == m_exportFacebookAction)
{
QPointer<FbWindow> w = new FbWindow(new DBInfoIface(this, d->thumbBar->allUrls(),
diff --git a/core/utilities/imageeditor/main/imagewindow_p.h \
b/core/utilities/imageeditor/main/imagewindow_p.h index 4addeaf05f..24844714ef 100644
--- a/core/utilities/imageeditor/main/imagewindow_p.h
+++ b/core/utilities/imageeditor/main/imagewindow_p.h
@@ -102,7 +102,7 @@
#include "facetagseditor.h"
#include "dbwindow.h"
#include "odwindow.h"
-//#include "twitterwindow.h"
+#include "twitterwindow.h"
#include "fbwindow.h"
#include "flickrwindow.h"
#include "gswindow.h"
diff --git a/core/utilities/lighttable/lighttablewindowui5.rc \
b/core/utilities/lighttable/lighttablewindowui5.rc index 47da0ede75..f021203b19 100644
--- a/core/utilities/lighttable/lighttablewindowui5.rc
+++ b/core/utilities/lighttable/lighttablewindowui5.rc
@@ -80,6 +80,7 @@
<Action name="export_onedrive" />
<Action name="export_rajce" />
<Action name="export_smugmug" />
+ <Action name="export_twitter" />
<Action name="export_yandexfotki" />
<Action name="export_mediawiki" />
<Action name="export_vkontakte" />
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic