1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
|
diff --git a/doc/TODO b/doc/TODO
index 2440062..e8ff7a3 100644
--- a/doc/TODO
+++ b/doc/TODO
@@ -78,16 +78,10 @@ menu-mainwindow.docbook * * Gi
tool-acquireimages.docbook
tool-advrename.docbook Need to be created
tool-calendar.docbook Need to be created
-tool-dropbox.docbook Need to be created
tool-expoblending.docbook Need to be created
-tool-facebook.docbook Need to be created
tool-findduplicates.docbook Need to be created
tool-flashexport.docbook Need to be created
-tool-flickrexport.docbook
tool-geolocationeditor.docbook Need to be created
-tool-googleexport.docbook Need to be created
-tool-imageshack.docbook Need to be created
-tool-imgur.docbook Need to be created
tool-kmlexport.docbook Need to be created
tool-maintenance.docbook Need to be created
tool-mediawiki.docbook Need to be created
@@ -96,12 +90,8 @@ tool-panorama.docbook
tool-piwigoexport.docbook Need to be created
tool-presentation.docbook
tool-printwizard.docbook
-tool-rajce.docbook Need to be created
tool-remotestorage.docbook Need to be created
tool-sendimages.docbook
-tool-smug.docbook Need to be created
-tool-vkontakte.docbook Need to be created
-tool-yandexfotki.docbook Need to be created
using-bqm.docbook
using-camera.docbook DONE DONE Gilles
using-camera-intro.docbook
diff --git a/doc/digikam/index.docbook b/doc/digikam/index.docbook
index 8e28728..cc9819e 100644
--- a/doc/digikam/index.docbook
+++ b/doc/digikam/index.docbook
@@ -169,21 +169,11 @@
<!-- plugins -->
<!ENTITY doc-tool-printwizard SYSTEM "tool-printwizard.docbook">
<!ENTITY doc-tool-sendimages SYSTEM "tool-sendimages.docbook">
- <!ENTITY doc-tool-flickrexport SYSTEM "tool-flickrexport.docbook">
<!ENTITY doc-tool-piwigoexport SYSTEM "tool-piwigoexport.docbook">
<!ENTITY doc-tool-kmlexport SYSTEM "tool-kmlexport.docbook">
- <!ENTITY doc-tool-googleexport SYSTEM "tool-googleexport.docbook">
<!ENTITY doc-tool-flashexport SYSTEM "tool-flashexport.docbook">
- <!ENTITY doc-tool-dropbox SYSTEM "tool-dropbox.docbook">
- <!ENTITY doc-tool-facebook SYSTEM "tool-facebook.docbook">
- <!ENTITY doc-tool-imageshack SYSTEM "tool-imageshack.docbook">
- <!ENTITY doc-tool-imgur SYSTEM "tool-imgur.docbook">
<!ENTITY doc-tool-mediawiki SYSTEM "tool-mediawiki.docbook">
- <!ENTITY doc-tool-rajce SYSTEM "tool-rajce.docbook">
<!ENTITY doc-tool-remotestorage SYSTEM "tool-remotestorage.docbook">
- <!ENTITY doc-tool-smug SYSTEM "tool-smug.docbook">
- <!ENTITY doc-tool-vkontakte SYSTEM "tool-vkontakte.docbook">
- <!ENTITY doc-tool-yandexfotki SYSTEM "tool-yandexfotki.docbook">
<!-- Menus Chapter -->
@@ -292,21 +282,11 @@
<!-- plugins -->
&doc-tool-printwizard;
&doc-tool-sendimages;
- &doc-tool-flickrexport;
&doc-tool-piwigoexport;
&doc-tool-kmlexport;
- &doc-tool-googleexport;
&doc-tool-flashexport;
- &doc-tool-dropbox;
- &doc-tool-facebook;
- &doc-tool-imageshack;
- &doc-tool-imgur;
&doc-tool-mediawiki;
- &doc-tool-rajce;
&doc-tool-remotestorage;
- &doc-tool-smug;
- &doc-tool-vkontakte;
- &doc-tool-yandexfotki;
<!-- ******** MENUS ******************************************************** -->
diff --git a/doc/digikam/menu-mainwindow.docbook b/doc/digikam/menu-mainwindow.docbook
index cb0c5da..dcca755 100644
--- a/doc/digikam/menu-mainwindow.docbook
+++ b/doc/digikam/menu-mainwindow.docbook
@@ -660,22 +660,6 @@
<varlistentry>
<term><menuchoice>
- <guimenu>Export</guimenu><guimenuitem>KML Export...</guimenuitem>
- </menuchoice></term>
- <listitem>
- <para><action>
- Tool to export the images series into a KML structure. KML files can then be opened and displayed with GoogleEarth.
- </action></para>
- <para>
- See the dedicated
- <link linkend="tool-flickrexport">KML Export Tool</link>
- for more information.
- </para>
- </listitem>
- </varlistentry>
-
- <varlistentry>
- <term><menuchoice>
<guimenu>Tools</guimenu><guimenuitem>Export to Piwigo</guimenuitem>
</menuchoice></term>
<listitem>
@@ -690,21 +674,6 @@
</listitem>
</varlistentry>
- <varlistentry>
- <term><menuchoice>
- <guimenu>Export</guimenu><guimenuitem>Export to Flickr...</guimenuitem>
- </menuchoice></term>
- <listitem>
- <para><action>
- Tool to upload or update images to <ulink url="http://www.flickr.com/">Flickr</ulink> server.
- </action></para>
- <para>
- See the dedicated
- <link linkend="tool-flickrexport">Flickr Export Tool</link>
- for more information.
- </para>
- </listitem>
- </varlistentry>
<!-- not ported to Qt5
<varlistentry>
<term><menuchoice>
@@ -722,37 +691,6 @@
</listitem>
</varlistentry>
-->
- <varlistentry>
- <term><menuchoice>
- <guimenu>Export</guimenu><guimenuitem>Export to Google Photos...</guimenuitem>
- </menuchoice></term>
- <listitem>
- <para><action>
- Tool upload or update images to <ulink url="https://photos.google.com/">Google Photos galleries</ulink>.
- </action></para>
- <para>
- See the dedicated
- <link linkend="tool-googleexport">Google Services Tool</link>
- for more information.
- </para>
- </listitem>
- </varlistentry>
-
- <varlistentry>
- <term><menuchoice>
- <guimenu>Export</guimenu><guimenuitem>Export to Google Drive...</guimenuitem>
- </menuchoice></term>
- <listitem>
- <para><action>
- Tool upload images to <ulink url="https://www.google.com/drive/">Google Drive</ulink>.
- </action></para>
- <para>
- See the dedicated
- <link linkend="tool-googleexport">Google Services Tool</link>
- for more information.
- </para>
- </listitem>
- </varlistentry>
<!-- not ported to Qt5
<varlistentry>
<term><menuchoice>
diff --git a/extra/kipi-plugins/CMakeLists.txt b/extra/kipi-plugins/CMakeLists.txt
index f20e7f3..1937582 100644
--- a/extra/kipi-plugins/CMakeLists.txt
+++ b/extra/kipi-plugins/CMakeLists.txt
@@ -108,7 +108,6 @@ find_package(KF5 ${KF5_MIN_VERSION}
find_package(KF5 ${KF5_MIN_VERSION}
OPTIONAL_COMPONENTS
- IconThemes # for GoogleServices (KIO/PixmapLoader)
Archive # for FlashExport
KIO # Some kipi-plugins depends of KIO indeep..
)
@@ -135,7 +134,6 @@ if(KF5Kipi_FOUND)
# -- Optional dependencies detection required by some plugins -------------------------------------
DETECT_LIBMEDIAWIKI(5.0.0) # For Mediawiki.
- DETECT_LIBKVKONTAKTE(4.70.0) # For VKontakte.
# ==================================================================================================
# Log messages
@@ -156,7 +154,6 @@ if(KF5Kipi_FOUND)
PRINT_OPTIONAL_LIBRARY_STATUS("libkio" "https://projects.kde.org/projects/frameworks/kio" "(version >= ${KF5_MIN_VERSION})" "Kipi-plugins will be compiled without libkio support." KF5KIO_FOUND)
PRINT_OPTIONAL_LIBRARY_STATUS("libkarchive" "https://projects.kde.org/projects/frameworks/karchive" "(version >= ${KF5_MIN_VERSION})" "Kipi-plugins will be compiled without libkarchive support." KF5Archive_FOUND)
PRINT_OPTIONAL_LIBRARY_STATUS("libmediawiki" "https://projects.kde.org/projects/extragear/libs/libmediawiki" "(version >= ${KF5_MIN_VERSION})" "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)
# Optional plugins results ----------------------------------------------------------------------------
@@ -172,7 +169,6 @@ if(KF5Kipi_FOUND)
set(KIPIPLUGINS_CAN_BE_COMPILED false)
endif()
- PRINT_COMPONENT_COMPILE_STATUS("VKontakte" KF5Vkontakte_FOUND)
PRINT_COMPONENT_COMPILE_STATUS("Mediawiki" KF5MediaWiki_FOUND)
PRINT_COMPONENT_COMPILE_STATUS("FlashExport" KF5Archive_FOUND)
@@ -229,25 +225,12 @@ if(KF5Kipi_FOUND)
add_subdirectory(printimages)
add_subdirectory(kmlexport)
add_subdirectory(sendimages)
- add_subdirectory(flickr)
- add_subdirectory(dropbox)
- add_subdirectory(facebook)
- add_subdirectory(imgur)
add_subdirectory(piwigo)
- add_subdirectory(rajce)
- add_subdirectory(smug)
- add_subdirectory(imageshack)
- add_subdirectory(yandexfotki)
- add_subdirectory(googleservices)
if(KF5Archive_FOUND)
add_subdirectory(flashexport)
endif()
- if(KF5Vkontakte_FOUND)
- add_subdirectory(vkontakte)
- endif()
-
if(KF5MediaWiki_FOUND)
add_subdirectory(mediawiki)
endif()
diff --git a/project/release/fetch_l10n_doc.rb b/project/release/fetch_l10n_doc.rb
index 1f5854a..74f59cb 100755
--- a/project/release/fetch_l10n_doc.rb
+++ b/project/release/fetch_l10n_doc.rb
@@ -143,16 +143,10 @@ i18nlangs.each_line do |lang|
'tool-acquireimages',
'tool-advrename',
'tool-calendar',
- 'tool-dropbox',
'tool-expoblending',
- 'tool-facebook',
'tool-findduplicates',
'tool-flashexport',
- 'tool-flickrexport',
'tool-geolocationeditor',
- 'tool-googleexport',
- 'tool-imageshack',
- 'tool-imgur',
'tool-kmlexport',
'tool-maintenance',
'tool-mediawiki',
@@ -161,12 +155,8 @@ i18nlangs.each_line do |lang|
'tool-piwigoexport',
'tool-presentation',
'tool-printwizard',
- 'tool-rajce',
'tool-remotestorage',
'tool-sendimages',
- 'tool-smug',
- 'tool-vkontakte',
- 'tool-yandexfotki',
'using-bqm',
'using-camera',
'using-camera-basis',
|