[prev in list] [next in list] [prev in thread] [next in thread]
List: kde-commits
Subject: [digikam/development/6.0.0] /: *plugin* => *tool*
From: Gilles Caulier <null () kde ! org>
Date: 2018-01-31 21:41:34
Message-ID: E1eh08M-0005t9-0N () code ! kde ! org
[Download RAW message or body]
Git commit 73ede322f11cdf77bcbd4669af6a601eea4bd01d by Gilles Caulier.
Committed on 31/01/2018 at 21:41.
Pushed by cgilles into branch 'development/6.0.0'.
*plugin* => *tool*
M +4 -11 app/main/digikamapp.cpp
M +0 -1 app/main/digikamapp.h
M +6 -6 app/utils/contextmenuhelper.cpp
M +1 -1 app/views/trashview.cpp
M +3 -3 data/htmlgallery/themes/THEME_HOWTO
M +1 -1 libs/dimg/filters/fx/embossfilter.cpp
M +1 -1 libs/dimg/filters/icc/icctransformfilter.cpp
M +6 -6 libs/dimg/filters/lens/TODO
M +1 -1 libs/dimg/filters/sharp/matrix.h
M +1 -1 libs/dimg/filters/sharp/refocusfilter.cpp
M +3 -3 libs/dimg/filters/sharp/sharpsettings.cpp
M +1 -1 libs/dimg/imagehistory/filteraction.h
M +1 -1 project/scripts/updatenews.pl
M +3 -3 utilities/assistants/common/dimageslist.cpp
M +1 -1 utilities/assistants/expoblending/TODO
M +1 -1 utilities/assistants/expoblending/blendingdlg/enfusesettings.cpp
M +1 -1 utilities/assistants/expoblending/blendingdlg/enfusesettings.h
M +1 -1 utilities/assistants/expoblending/manager/expoblendingactions.h
M +1 -1 utilities/assistants/expoblending/manager/expoblendingmanager.cpp
M +1 -1 utilities/assistants/expoblending/manager/expoblendingmanager.h
M +1 -1 utilities/assistants/expoblending/manager/expoblendingthread.cpp
M +1 -1 utilities/assistants/expoblending/manager/expoblendingthread.h
M +1 -1 utilities/assistants/expoblending/wizard/expoblendingintropage.cpp
M +1 -1 utilities/assistants/expoblending/wizard/expoblendingintropage.h
M +1 -1 utilities/assistants/expoblending/wizard/expoblendingitemspage.cpp
M +1 -1 utilities/assistants/expoblending/wizard/expoblendingitemspage.h
M +1 -1 utilities/assistants/expoblending/wizard/expoblendinglastpage.cpp
M +1 -1 utilities/assistants/expoblending/wizard/expoblendinglastpage.h
M +1 -1 utilities/assistants/expoblending/wizard/expoblendingpreprocesspage.cpp
M +1 -1 utilities/assistants/expoblending/wizard/expoblendingpreprocesspage.h
M +1 -1 utilities/assistants/expoblending/wizard/expoblendingwizard.cpp
M +1 -1 utilities/assistants/expoblending/wizard/expoblendingwizard.h
M +2 -2 utilities/assistants/panorama/README
M +1 -2 utilities/assistants/panorama/manager/panoactions.h
M +1 -2 utilities/assistants/panorama/manager/panoactionthread.cpp
M +1 -2 utilities/assistants/panorama/manager/panoactionthread.h
M +1 -2 utilities/assistants/panorama/manager/panomanager.cpp
M +1 -2 utilities/assistants/panorama/manager/panomanager.h
M +1 -1 utilities/assistants/panorama/ptoparser/ptofile.cpp
M +1 -1 utilities/assistants/panorama/ptoparser/ptofile.h
M +1 -1 utilities/assistants/panorama/ptotype/ptotype.cpp
M +1 -1 utilities/assistants/panorama/ptotype/ptotype.h
M +1 -1 utilities/assistants/panorama/tasks/autocroptask.cpp
M +1 -1 utilities/assistants/panorama/tasks/autocroptask.h
M +1 -1 utilities/assistants/panorama/tasks/commandtask.cpp
M +1 -1 utilities/assistants/panorama/tasks/commandtask.h
M +1 -1 utilities/assistants/panorama/tasks/compilemksteptask.cpp
M +1 -1 utilities/assistants/panorama/tasks/compilemksteptask.h
M +1 -1 utilities/assistants/panorama/tasks/compilemktask.cpp
M +1 -1 utilities/assistants/panorama/tasks/compilemktask.h
M +1 -1 utilities/assistants/panorama/tasks/copyfilestask.cpp
M +1 -1 utilities/assistants/panorama/tasks/copyfilestask.h
M +1 -1 utilities/assistants/panorama/tasks/cpcleantask.cpp
M +1 -1 utilities/assistants/panorama/tasks/cpcleantask.h
M +1 -1 utilities/assistants/panorama/tasks/cpfindtask.cpp
M +1 -1 utilities/assistants/panorama/tasks/cpfindtask.h
M +1 -1 utilities/assistants/panorama/tasks/createfinalptotask.cpp
M +1 -1 utilities/assistants/panorama/tasks/createfinalptotask.h
M +1 -1 utilities/assistants/panorama/tasks/createmktask.cpp
M +1 -1 utilities/assistants/panorama/tasks/createmktask.h
M +1 -1 utilities/assistants/panorama/tasks/createpreviewtask.cpp
M +1 -1 utilities/assistants/panorama/tasks/createpreviewtask.h
M +1 -1 utilities/assistants/panorama/tasks/createptotask.cpp
M +1 -1 utilities/assistants/panorama/tasks/createptotask.h
M +1 -1 utilities/assistants/panorama/tasks/optimisationtask.cpp
M +1 -1 utilities/assistants/panorama/tasks/optimisationtask.h
M +1 -1 utilities/assistants/panorama/tasks/panotask.cpp
M +1 -1 utilities/assistants/panorama/tasks/panotask.h
M +1 -1 utilities/assistants/panorama/tasks/panotasks.h
M +1 -1 utilities/assistants/panorama/tasks/preprocesstask.cpp
M +1 -1 utilities/assistants/panorama/tasks/preprocesstask.h
M +2 -2 utilities/assistants/panorama/wizard/panointropage.cpp
M +2 -2 utilities/assistants/panorama/wizard/panointropage.h
M +2 -2 utilities/assistants/panorama/wizard/panoitemspage.cpp
M +2 -2 utilities/assistants/panorama/wizard/panoitemspage.h
M +2 -2 utilities/assistants/panorama/wizard/panolastpage.cpp
M +2 -2 utilities/assistants/panorama/wizard/panolastpage.h
M +1 -1 utilities/assistants/panorama/wizard/panooptimizepage.cpp
M +1 -1 utilities/assistants/panorama/wizard/panooptimizepage.h
M +2 -2 utilities/assistants/panorama/wizard/panopreprocesspage.cpp
M +2 -2 utilities/assistants/panorama/wizard/panopreprocesspage.h
M +1 -1 utilities/assistants/panorama/wizard/panopreviewpage.cpp
M +1 -1 utilities/assistants/panorama/wizard/panopreviewpage.h
M +2 -2 utilities/assistants/panorama/wizard/panowizard.cpp
M +2 -2 utilities/assistants/panorama/wizard/panowizard.h
M +8 -8 utilities/assistants/webservices/base/newalbumdialog.cpp
M +1 -1 utilities/assistants/webservices/base/newalbumdialog.h
M +2 -2 utilities/assistants/webservices/dropbox/dbnewalbumdlg.cpp
M +1 -1 utilities/assistants/webservices/dropbox/dbnewalbumdlg.h
M +2 -2 utilities/assistants/webservices/dropbox/dbwidget.cpp
M +1 -1 utilities/assistants/webservices/dropbox/dbwidget.h
M +2 -2 utilities/assistants/webservices/facebook/fbnewalbumdlg.cpp
M +1 -1 utilities/assistants/webservices/facebook/fbnewalbumdlg.h
M +2 -2 utilities/assistants/webservices/facebook/fbwidget.cpp
M +1 -1 utilities/assistants/webservices/facebook/fbwidget.h
M +2 -2 utilities/assistants/webservices/flickr/flickrnewalbumdlg.cpp
M +1 -1 utilities/assistants/webservices/flickr/flickrnewalbumdlg.h
M +1 -1 utilities/assistants/webservices/google/gsitem.h
M +2 -2 utilities/assistants/webservices/google/gsnewalbumdlg.cpp
M +1 -1 utilities/assistants/webservices/google/gsnewalbumdlg.h
M +1 -1 utilities/assistants/webservices/google/gssession.h
M +8 -8 utilities/assistants/webservices/google/gswidget.cpp
M +3 -3 utilities/assistants/webservices/google/gswidget.h
M +71 -71 utilities/assistants/webservices/google/gswindow.cpp
M +2 -2 utilities/assistants/webservices/google/gswindow.h
M +2 -2 utilities/assistants/webservices/imageshack/imageshacknewalbumdlg.cpp
M +1 -1 utilities/assistants/webservices/imageshack/imageshacknewalbumdlg.h
M +2 -2 utilities/assistants/webservices/imageshack/imageshackwidget.cpp
M +1 -1 utilities/assistants/webservices/imageshack/imageshackwidget.h
M +2 -2 utilities/assistants/webservices/yandexfotki/yfwidget.cpp
M +1 -1 utilities/assistants/webservices/yandexfotki/yfwidget.h
M +1 -1 utilities/imageeditor/core/editorcore.cpp
M +1 -1 utilities/imageeditor/editor/imageiface.cpp
M +1 -1 utilities/imageeditor/editor/imageiface.h
M +1 -1 utilities/imageeditor/widgets/imageguidewidget.cpp
M +2 -2 utilities/imageeditor/widgets/imageregionwidget.cpp
M +1 -2 utilities/presentation/dialogs/presentationdlg.h
https://commits.kde.org/digikam/73ede322f11cdf77bcbd4669af6a601eea4bd01d
diff --git a/app/main/digikamapp.cpp b/app/main/digikamapp.cpp
index fce0866f6b..48aa576a6d 100644
--- a/app/main/digikamapp.cpp
+++ b/app/main/digikamapp.cpp
@@ -291,9 +291,10 @@ DigikamApp::DigikamApp()
}
AlbumManager::instance()->startScan();
-
- // Load Plugins.
- loadPlugins();
+
+ // Setting the initial menu options after all tools have been loaded
+ QList<Album*> albumList = AlbumManager::instance()->currentAlbums();
+ d->view->slotAlbumSelected(albumList);
// preload additional windows
preloadWindows();
@@ -2584,14 +2585,6 @@ void DigikamApp::slotDBStat()
showDigikamDatabaseStat();
}
-void DigikamApp::loadPlugins()
-{
- // Setting the initial menu options after all plugins have been loaded
- QList<Album*> albumList = AlbumManager::instance()->currentAlbums();
-
- d->view->slotAlbumSelected(albumList);
-}
-
void DigikamApp::populateThemes()
{
if (d->splashScreen)
diff --git a/app/main/digikamapp.h b/app/main/digikamapp.h
index 8da595f741..0106ec34a8 100644
--- a/app/main/digikamapp.h
+++ b/app/main/digikamapp.h
@@ -127,7 +127,6 @@ private:
void setupExifOrientationActions();
void setupImageTransformActions();
void setupSelectToolsAction();
- void loadPlugins();
void loadCameras();
void populateThemes();
void preloadWindows();
diff --git a/app/utils/contextmenuhelper.cpp b/app/utils/contextmenuhelper.cpp
index 4f8be06ad2..5fcdef96a1 100644
--- a/app/utils/contextmenuhelper.cpp
+++ b/app/utils/contextmenuhelper.cpp
@@ -594,9 +594,9 @@ void ContextMenuHelper::addImportMenu()
}
else
{
- QAction* const noPlugins = new QAction(i18n("No import tool available"), \
this);
- noPlugins->setEnabled(false);
- menuImport->addAction(noPlugins);
+ QAction* const notools = new QAction(i18n("No import tool available"), \
this); + notools->setEnabled(false);
+ menuImport->addAction(notools);
}
d->parent->addMenu(menuImport);
@@ -618,9 +618,9 @@ void ContextMenuHelper::addExportMenu()
}
else
{
- QAction* const noPlugins = new QAction(i18n("No export tool available"), \
this);
- noPlugins->setEnabled(false);
- menuExport->addAction(noPlugins);
+ QAction* const notools = new QAction(i18n("No export tool available"), \
this); + notools->setEnabled(false);
+ menuExport->addAction(notools);
}
d->parent->addMenu(menuExport);
diff --git a/app/views/trashview.cpp b/app/views/trashview.cpp
index 240c5d147e..7e896399b8 100644
--- a/app/views/trashview.cpp
+++ b/app/views/trashview.cpp
@@ -90,7 +90,7 @@ TrashView::TrashView(QWidget* const parent)
d->mainLayout = new QVBoxLayout(this);
d->btnsLayout = new QHBoxLayout();
- // View and plugins
+ // View and tools
d->tableView = new QTableView(this);
d->model = new DTrashItemModel(this);
d->thumbDelegate = new ThumbnailAligningDelegate(this);
diff --git a/data/htmlgallery/themes/THEME_HOWTO \
b/data/htmlgallery/themes/THEME_HOWTO index 1382489fef..43b340600f 100644
--- a/data/htmlgallery/themes/THEME_HOWTO
+++ b/data/htmlgallery/themes/THEME_HOWTO
@@ -27,7 +27,7 @@ When the tool is run it does the following:
## Presentation of the desktop file
The desktop file describes the theme. The information it contains is used in the
-theme selection page of the plugin.
+theme selection page of the tool.
It's a .ini-style file and looks like this:
@@ -44,7 +44,7 @@ It's a .ini-style file and looks like this:
Url=preview.png
We use a desktop file format so that entries can be translated. If you look at
-the desktop file for one of the themes shipped with the plugin, you will find
+the desktop file for one of the themes shipped with the tool, you will find
something like this:
[Desktop Entry]
@@ -206,7 +206,7 @@ If you need other i18n parameters, let us know.
## Images, CSS files and others
You are free to use images, CSS files or other files in your theme: just put
-them in the theme folder and the plugin will copy them in the output folder.
+them in the theme folder and the tool will copy them in the output folder.
## Original images
diff --git a/libs/dimg/filters/fx/embossfilter.cpp \
b/libs/dimg/filters/fx/embossfilter.cpp index 53d527c1a7..43f2355f93 100644
--- a/libs/dimg/filters/fx/embossfilter.cpp
+++ b/libs/dimg/filters/fx/embossfilter.cpp
@@ -189,4 +189,4 @@ void EmbossFilter::readParameters(const Digikam::FilterAction& \
action) m_depth = action.parameter(QLatin1String("depth")).toInt();
}
-} // namespace DigikamEmbossImagesPlugin
+} // namespace Digikam
diff --git a/libs/dimg/filters/icc/icctransformfilter.cpp \
b/libs/dimg/filters/icc/icctransformfilter.cpp index 95828949cd..84332773c3 100644
--- a/libs/dimg/filters/icc/icctransformfilter.cpp
+++ b/libs/dimg/filters/icc/icctransformfilter.cpp
@@ -119,4 +119,4 @@ QString IccTransformFilter::readParametersError(const \
FilterAction& actionThatFa return QString();
}
-} // namespace DigikamImagesPluginCore
+} // namespace Digikam
diff --git a/libs/dimg/filters/lens/TODO b/libs/dimg/filters/lens/TODO
index f8473d55f2..e9b60d7984 100644
--- a/libs/dimg/filters/lens/TODO
+++ b/libs/dimg/filters/lens/TODO
@@ -1,22 +1,22 @@
TODO for Lensfun tool.
-This is a digikam image plugin for using the lensfun library.
+This is a digikam image tool for using the lensfun library.
See http://lensfun.berlios.de for details.
-This plugin is intended to be used for automatic correction
+This tool is intended to be used for automatic correction
of "errors" of your used lens. However, this can only work
when your lens is known and the variances are covered in the
database.
Until now, it seems there is only data for geometry and
-distortion correction in the lensfun database. This plugin
+distortion correction in the lensfun database. This tool
does already contain code to do the color and CA corrections,
but this could not have been tested yet.
I will get in contact with the lensfun people to see how
to follow up on this (or if I am just to stupid to see it ;)
-In short, this plugin is maybe almost complete, but this
-could not have been verified yet. So this plugin is not really
+In short, this tool is maybe almost complete, but this
+could not have been verified yet. So this tool is not really
usefull for now and should get disabled before release, if
there is no matured database or we have added a tool to
create new database entries.
@@ -29,4 +29,4 @@ http://en.opensuse.org/Users:adrianSuSE
TODO for vignetting tool.
- add support for adding vignette by changing the gamma
-- add support for different shapes ? (rectancle, ellipse, etc)
\ No newline at end of file
+- add support for different shapes ? (rectancle, ellipse, etc)
diff --git a/libs/dimg/filters/sharp/matrix.h b/libs/dimg/filters/sharp/matrix.h
index 853eb8ccac..b49a52cb68 100644
--- a/libs/dimg/filters/sharp/matrix.h
+++ b/libs/dimg/filters/sharp/matrix.h
@@ -149,6 +149,6 @@ private:
static double circle_intensity(const int x, const int y, const double radius);
};
-} // namespace DigikamImagesPluginCore
+} // namespace Digikam
#endif /* MATRIX_H_INCLUDED */
diff --git a/libs/dimg/filters/sharp/refocusfilter.cpp \
b/libs/dimg/filters/sharp/refocusfilter.cpp index 49dfe14e9b..8bb2a20b1a 100644
--- a/libs/dimg/filters/sharp/refocusfilter.cpp
+++ b/libs/dimg/filters/sharp/refocusfilter.cpp
@@ -370,4 +370,4 @@ int RefocusFilter::maxMatrixSize()
return MAX_MATRIX_SIZE;
}
-} // namespace DigikamImagesPluginCore
+} // namespace Digikam
diff --git a/libs/dimg/filters/sharp/sharpsettings.cpp \
b/libs/dimg/filters/sharp/sharpsettings.cpp index 45a337f0ca..dc127f88cf 100644
--- a/libs/dimg/filters/sharp/sharpsettings.cpp
+++ b/libs/dimg/filters/sharp/sharpsettings.cpp
@@ -240,7 +240,7 @@ SharpSettings::SharpSettings(QWidget* const parent)
d->radius->setRange(0.0, 5.0, 0.01);
d->radius->setDefaultValue(1.0);
d->radius->setWhatsThis(i18n("This is the radius of the circular convolution. It \
is the most important "
- "parameter for using this plugin. For most images \
the default value of 1.0 " + "parameter for using \
this tool. For most images the default value of 1.0 "
"should give good results. Select a higher value \
when your image is very blurred."));
QLabel* const label6 = new QLabel(i18n("Correlation:"), refocusSettings);
@@ -251,7 +251,7 @@ SharpSettings::SharpSettings(QWidget* const parent)
d->correlation->setWhatsThis(i18n("Increasing the correlation may help to reduce \
artifacts. The correlation can "
"range from 0-1. Useful values are 0.5 and \
values close to 1, e.g. 0.95 and 0.99. "
"Using a high value for the correlation will \
reduce the sharpening effect of the "
- "plugin."));
+ "tool."));
QLabel* const label7 = new QLabel(i18n("Noise filter:"), refocusSettings);
d->noise = new DDoubleNumInput(refocusSettings);
@@ -262,7 +262,7 @@ SharpSettings::SharpSettings(QWidget* const parent)
"can range from 0-1 but values higher than 0.1 are \
rarely helpful. When the noise filter "
"value is too low, e.g. 0.0 the image quality will \
be very poor. A useful value is 0.01. "
"Using a high value for the noise filter will reduce \
the sharpening "
- "effect of the plugin."));
+ "effect of the tool."));
QLabel* const label8 = new QLabel(i18n("Gaussian sharpness:"), refocusSettings);
d->gauss = new DDoubleNumInput(refocusSettings);
diff --git a/libs/dimg/imagehistory/filteraction.h \
b/libs/dimg/imagehistory/filteraction.h index 8cb4b874a5..f7b47b25ac 100644
--- a/libs/dimg/imagehistory/filteraction.h
+++ b/libs/dimg/imagehistory/filteraction.h
@@ -94,7 +94,7 @@ public:
/**
* Returns the version (>= 1) of the filter used to produce this action.
- * When a filter / plugin is found by the identifier, it can decide
+ * When a filter / tool is found by the identifier, it can decide
* by the version if it supports this action and which parameters it expects.
*/
int version() const;
diff --git a/project/scripts/updatenews.pl b/project/scripts/updatenews.pl
index d0d40908ef..880641622c 100644
--- a/project/scripts/updatenews.pl
+++ b/project/scripts/updatenews.pl
@@ -6,7 +6,7 @@ my $NEWS_FILE = "NEWS";
my $version = "4.0.0";
my $header = 'BUGFIXES FROM KDE BUGZILLA';
-my $url = "https://bugs.kde.org/buglist.cgi?f1=cf_versionfixedin&order=Last%20Changed \
&o1=equals&query_format=advanced&bug_status=RESOLVED&bug_status=CLOSED&v1=$version&pro \
duct=digikam&product=digikamimageplugins&product=showfoto&columnlist=short_desc&ctype=csv";
+my $url = "https://bugs.kde.org/buglist.cgi?f1=cf_versionfixedin&order=Last%20Change \
d&o1=equals&query_format=advanced&bug_status=RESOLVED&bug_status=CLOSED&v1=$version&product=digikam&columnlist=short_desc&ctype=csv";
my $ua = LWP::UserAgent->new;
print "Fetching closed bugs for digiKam version ${version} ..\n";
diff --git a/utilities/assistants/common/dimageslist.cpp \
b/utilities/assistants/common/dimageslist.cpp index 5680367736..12398371ff 100644
--- a/utilities/assistants/common/dimageslist.cpp
+++ b/utilities/assistants/common/dimageslist.cpp
@@ -1015,15 +1015,15 @@ void DImagesList::slotLoadItems()
if (!urls.isEmpty())
{
- //allow plugins to append a new file
+ //allow tools to append a new file
slotAddImages(urls);
- // read plugin Image custom attributes and children element
+ // read tool Image custom attributes and children element
emit signalXMLLoadImageElement(xmlReader);
}
}
else if (xmlReader.isStartElement() && xmlReader.name() != \
QString::fromLatin1("Images")) {
- // unmanaged start element (it should be plugins one)
+ // unmanaged start element (it should be tools one)
emit signalXMLCustomElements(xmlReader);
}
else if (xmlReader.isEndElement() && xmlReader.name() == \
QString::fromLatin1("Images"))
diff --git a/utilities/assistants/expoblending/TODO \
b/utilities/assistants/expoblending/TODO index 1e41f8eda0..26e5841e9b 100644
--- a/utilities/assistants/expoblending/TODO
+++ b/utilities/assistants/expoblending/TODO
@@ -1,3 +1,3 @@
* Fix thumbnails
o and EV computation (most likely not triggered because of the missing thumbnail)
- * Change the default name to match the panorama plugin/Hugin convention, appending \
"-enfuse" at the end \ No newline at end of file
+ * Change the default name to match the panorama tool/Hugin convention, appending \
"-enfuse" at the end
diff --git a/utilities/assistants/expoblending/blendingdlg/enfusesettings.cpp \
b/utilities/assistants/expoblending/blendingdlg/enfusesettings.cpp index \
70928c9105..d774f2c304 100644
--- a/utilities/assistants/expoblending/blendingdlg/enfusesettings.cpp
+++ b/utilities/assistants/expoblending/blendingdlg/enfusesettings.cpp
@@ -4,7 +4,7 @@
* http://www.digikam.org
*
* Date : 2009-11-13
- * Description : a plugin to blend bracketed images.
+ * Description : a tool to blend bracketed images.
*
* Copyright (C) 2009-2018 by Gilles Caulier <caulier dot gilles at gmail dot com>
* Copyright (C) 2015 by Benjamin Girault, <benjamin dot girault at gmail dot \
com>
diff --git a/utilities/assistants/expoblending/blendingdlg/enfusesettings.h \
b/utilities/assistants/expoblending/blendingdlg/enfusesettings.h index \
1c67857e05..ab3f8f2395 100644
--- a/utilities/assistants/expoblending/blendingdlg/enfusesettings.h
+++ b/utilities/assistants/expoblending/blendingdlg/enfusesettings.h
@@ -4,7 +4,7 @@
* http://www.digikam.org
*
* Date : 2009-11-13
- * Description : a plugin to blend bracketed images.
+ * Description : a tool to blend bracketed images.
*
* Copyright (C) 2009-2018 by Gilles Caulier <caulier dot gilles at gmail dot com>
* Copyright (C) 2015 by Benjamin Girault, <benjamin dot girault at gmail dot \
com>
diff --git a/utilities/assistants/expoblending/manager/expoblendingactions.h \
b/utilities/assistants/expoblending/manager/expoblendingactions.h index \
dbb5d2e562..442938b3c1 100644
--- a/utilities/assistants/expoblending/manager/expoblendingactions.h
+++ b/utilities/assistants/expoblending/manager/expoblendingactions.h
@@ -4,7 +4,7 @@
* http://www.digikam.org
*
* Date : 2009-11-13
- * Description : a plugin to blend bracketed images.
+ * Description : a tool to blend bracketed images.
*
* Copyright (C) 2009-2018 by Gilles Caulier <caulier dot gilles at gmail dot com>
* Copyright (C) 2015 by Benjamin Girault, <benjamin dot girault at gmail dot \
com>
diff --git a/utilities/assistants/expoblending/manager/expoblendingmanager.cpp \
b/utilities/assistants/expoblending/manager/expoblendingmanager.cpp index \
1423ee30d9..350144eab0 100644
--- a/utilities/assistants/expoblending/manager/expoblendingmanager.cpp
+++ b/utilities/assistants/expoblending/manager/expoblendingmanager.cpp
@@ -4,7 +4,7 @@
* http://www.digikam.org
*
* Date : 2009-11-13
- * Description : a plugin to blend bracketed images.
+ * Description : a tool to blend bracketed images.
*
* Copyright (C) 2009-2018 by Gilles Caulier <caulier dot gilles at gmail dot com>
* Copyright (C) 2012-2015 by Benjamin Girault <benjamin dot girault at gmail dot \
com>
diff --git a/utilities/assistants/expoblending/manager/expoblendingmanager.h \
b/utilities/assistants/expoblending/manager/expoblendingmanager.h index \
5b549d9ee2..1fc3fbaded 100644
--- a/utilities/assistants/expoblending/manager/expoblendingmanager.h
+++ b/utilities/assistants/expoblending/manager/expoblendingmanager.h
@@ -4,7 +4,7 @@
* http://www.digikam.org
*
* Date : 2009-11-13
- * Description : a plugin to blend bracketed images.
+ * Description : a tool to blend bracketed images.
*
* Copyright (C) 2009-2018 by Gilles Caulier <caulier dot gilles at gmail dot com>
* Copyright (C) 2012-2015 by Benjamin Girault <benjamin dot girault at gmail dot \
com>
diff --git a/utilities/assistants/expoblending/manager/expoblendingthread.cpp \
b/utilities/assistants/expoblending/manager/expoblendingthread.cpp index \
0aa8c88ea8..ea1f725ab7 100644
--- a/utilities/assistants/expoblending/manager/expoblendingthread.cpp
+++ b/utilities/assistants/expoblending/manager/expoblendingthread.cpp
@@ -4,7 +4,7 @@
* http://www.digikam.org
*
* Date : 2009-11-13
- * Description : a plugin to blend bracketed images.
+ * Description : a tool to blend bracketed images.
*
* Copyright (C) 2009-2018 by Gilles Caulier <caulier dot gilles at gmail dot com>
* Copyright (C) 2009-2011 by Johannes Wienke <languitar at semipol dot de>
diff --git a/utilities/assistants/expoblending/manager/expoblendingthread.h \
b/utilities/assistants/expoblending/manager/expoblendingthread.h index \
c81a4bfaa4..ee342d7695 100644
--- a/utilities/assistants/expoblending/manager/expoblendingthread.h
+++ b/utilities/assistants/expoblending/manager/expoblendingthread.h
@@ -4,7 +4,7 @@
* http://www.digikam.org
*
* Date : 2009-11-13
- * Description : a plugin to blend bracketed images.
+ * Description : a tool to blend bracketed images.
*
* Copyright (C) 2009-2018 by Gilles Caulier <caulier dot gilles at gmail dot com>
* Copyright (C) 2009-2011 by Johannes Wienke <languitar at semipol dot de>
diff --git a/utilities/assistants/expoblending/wizard/expoblendingintropage.cpp \
b/utilities/assistants/expoblending/wizard/expoblendingintropage.cpp index \
0dc42c7e99..b97844d22e 100644
--- a/utilities/assistants/expoblending/wizard/expoblendingintropage.cpp
+++ b/utilities/assistants/expoblending/wizard/expoblendingintropage.cpp
@@ -4,7 +4,7 @@
* http://www.digikam.org
*
* Date : 2009-11-13
- * Description : a plugin to blend bracketed images.
+ * Description : a tool to blend bracketed images.
*
* Copyright (C) 2009-2018 by Gilles Caulier <caulier dot gilles at gmail dot com>
* Copyright (C) 2012-2015 by Benjamin Girault <benjamin dot girault at gmail dot \
com>
diff --git a/utilities/assistants/expoblending/wizard/expoblendingintropage.h \
b/utilities/assistants/expoblending/wizard/expoblendingintropage.h index \
dd68c90326..e04fb8e869 100644
--- a/utilities/assistants/expoblending/wizard/expoblendingintropage.h
+++ b/utilities/assistants/expoblending/wizard/expoblendingintropage.h
@@ -4,7 +4,7 @@
* http://www.digikam.org
*
* Date : 2009-11-13
- * Description : a plugin to blend bracketed images.
+ * Description : a tool to blend bracketed images.
*
* Copyright (C) 2009-2018 by Gilles Caulier <caulier dot gilles at gmail dot com>
*
diff --git a/utilities/assistants/expoblending/wizard/expoblendingitemspage.cpp \
b/utilities/assistants/expoblending/wizard/expoblendingitemspage.cpp index \
669a56b838..1ec97a3fc2 100644
--- a/utilities/assistants/expoblending/wizard/expoblendingitemspage.cpp
+++ b/utilities/assistants/expoblending/wizard/expoblendingitemspage.cpp
@@ -4,7 +4,7 @@
* http://www.digikam.org
*
* Date : 2009-11-13
- * Description : a plugin to blend bracketed images.
+ * Description : a tool to blend bracketed images.
*
* Copyright (C) 2009-2018 by Gilles Caulier <caulier dot gilles at gmail dot com>
* Copyright (C) 2015 by Benjamin Girault, <benjamin dot girault at gmail dot \
com>
diff --git a/utilities/assistants/expoblending/wizard/expoblendingitemspage.h \
b/utilities/assistants/expoblending/wizard/expoblendingitemspage.h index \
d11d27fe5b..306ad6547a 100644
--- a/utilities/assistants/expoblending/wizard/expoblendingitemspage.h
+++ b/utilities/assistants/expoblending/wizard/expoblendingitemspage.h
@@ -4,7 +4,7 @@
* http://www.digikam.org
*
* Date : 2009-11-13
- * Description : a plugin to blend bracketed images.
+ * Description : a tool to blend bracketed images.
*
* Copyright (C) 2009-2018 by Gilles Caulier <caulier dot gilles at gmail dot com>
* Copyright (C) 2015 by Benjamin Girault, <benjamin dot girault at gmail dot \
com>
diff --git a/utilities/assistants/expoblending/wizard/expoblendinglastpage.cpp \
b/utilities/assistants/expoblending/wizard/expoblendinglastpage.cpp index \
9af12935a0..892c950ebd 100644
--- a/utilities/assistants/expoblending/wizard/expoblendinglastpage.cpp
+++ b/utilities/assistants/expoblending/wizard/expoblendinglastpage.cpp
@@ -4,7 +4,7 @@
* http://www.digikam.org
*
* Date : 2009-11-13
- * Description : a plugin to blend bracketed images.
+ * Description : a tool to blend bracketed images.
*
* Copyright (C) 2009-2018 by Gilles Caulier <caulier dot gilles at gmail dot com>
* Copyright (C) 2012 by Benjamin Girault <benjamin dot girault at gmail dot \
com>
diff --git a/utilities/assistants/expoblending/wizard/expoblendinglastpage.h \
b/utilities/assistants/expoblending/wizard/expoblendinglastpage.h index \
3ce1e94d1e..1846c3a979 100644
--- a/utilities/assistants/expoblending/wizard/expoblendinglastpage.h
+++ b/utilities/assistants/expoblending/wizard/expoblendinglastpage.h
@@ -4,7 +4,7 @@
* http://www.digikam.org
*
* Date : 2009-11-13
- * Description : a plugin to blend bracketed images.
+ * Description : a tool to blend bracketed images.
*
* Copyright (C) 2009-2018 by Gilles Caulier <caulier dot gilles at gmail dot com>
*
diff --git a/utilities/assistants/expoblending/wizard/expoblendingpreprocesspage.cpp \
b/utilities/assistants/expoblending/wizard/expoblendingpreprocesspage.cpp index \
d777c51093..b27f41120f 100644
--- a/utilities/assistants/expoblending/wizard/expoblendingpreprocesspage.cpp
+++ b/utilities/assistants/expoblending/wizard/expoblendingpreprocesspage.cpp
@@ -4,7 +4,7 @@
* http://www.digikam.org
*
* Date : 2009-11-13
- * Description : a plugin to blend bracketed images.
+ * Description : a tool to blend bracketed images.
*
* Copyright (C) 2009-2018 by Gilles Caulier <caulier dot gilles at gmail dot com>
* Copyright (C) 2015 by Benjamin Girault, <benjamin dot girault at gmail dot \
com>
diff --git a/utilities/assistants/expoblending/wizard/expoblendingpreprocesspage.h \
b/utilities/assistants/expoblending/wizard/expoblendingpreprocesspage.h index \
9a8d251209..f0a43a2809 100644
--- a/utilities/assistants/expoblending/wizard/expoblendingpreprocesspage.h
+++ b/utilities/assistants/expoblending/wizard/expoblendingpreprocesspage.h
@@ -4,7 +4,7 @@
* http://www.digikam.org
*
* Date : 2009-11-13
- * Description : a plugin to blend bracketed images.
+ * Description : a tool to blend bracketed images.
*
* Copyright (C) 2009-2018 by Gilles Caulier <caulier dot gilles at gmail dot com>
* Copyright (C) 2015 by Benjamin Girault, <benjamin dot girault at gmail dot \
com>
diff --git a/utilities/assistants/expoblending/wizard/expoblendingwizard.cpp \
b/utilities/assistants/expoblending/wizard/expoblendingwizard.cpp index \
4f67f14488..5880e37fba 100644
--- a/utilities/assistants/expoblending/wizard/expoblendingwizard.cpp
+++ b/utilities/assistants/expoblending/wizard/expoblendingwizard.cpp
@@ -4,7 +4,7 @@
* http://www.digikam.org
*
* Date : 2009-11-13
- * Description : a plugin to blend bracketed images.
+ * Description : a tool to blend bracketed images.
*
* Copyright (C) 2009-2018 by Gilles Caulier <caulier dot gilles at gmail dot com>
* Copyright (C) 2012-2015 by Benjamin Girault <benjamin dot girault at gmail dot \
com>
diff --git a/utilities/assistants/expoblending/wizard/expoblendingwizard.h \
b/utilities/assistants/expoblending/wizard/expoblendingwizard.h index \
db1eb2368d..a5d04eab53 100644
--- a/utilities/assistants/expoblending/wizard/expoblendingwizard.h
+++ b/utilities/assistants/expoblending/wizard/expoblendingwizard.h
@@ -4,7 +4,7 @@
* http://www.digikam.org
*
* Date : 2009-11-13
- * Description : a plugin to blend bracketed images.
+ * Description : a tool to blend bracketed images.
*
* Copyright (C) 2009-2018 by Gilles Caulier <caulier dot gilles at gmail dot com>
* Copyright (C) 2012-2015 by Benjamin Girault <benjamin dot girault at gmail dot \
com>
diff --git a/utilities/assistants/panorama/README \
b/utilities/assistants/panorama/README index 53331dfd28..83edf593fd 100644
--- a/utilities/assistants/panorama/README
+++ b/utilities/assistants/panorama/README
@@ -7,7 +7,7 @@ NOTE: this tool was originally developped during the GoSC2011.
-- Data Input --
-This plugin takes several images taken from the same point of view, either RAW \
images, TIFF images or JPEG images. +This tool takes several images taken from the \
same point of view, either RAW images, TIFF images or JPEG images.
Throughout the process, project files (i.e. dot pto files) are analyzed and modified \
with GNU Flex and GNU Bison.
@@ -31,4 +31,4 @@ All images are supposed to be taken from the same point of view, \
and with the sa
* Celeste Filter (cpfind): detects clouds and dismiss control points associated to \
those
--- Final Rendering --
\ No newline at end of file
+-- Final Rendering --
diff --git a/utilities/assistants/panorama/manager/panoactions.h \
b/utilities/assistants/panorama/manager/panoactions.h index e0433dc618..8d9f8e224f \
100644
--- a/utilities/assistants/panorama/manager/panoactions.h
+++ b/utilities/assistants/panorama/manager/panoactions.h
@@ -4,8 +4,7 @@
* http://www.digikam.org
*
* Date : 2011-05-23
- * Description : a plugin to create panorama by fusion of several images.
- * Acknowledge : based on the expoblending plugin
+ * Description : a tool to create panorama by fusion of several images.
*
* Copyright (C) 2011-2016 by Benjamin Girault <benjamin dot girault at gmail dot \
com>
* Copyright (C) 2009-2018 by Gilles Caulier <caulier dot gilles at gmail dot com>
diff --git a/utilities/assistants/panorama/manager/panoactionthread.cpp \
b/utilities/assistants/panorama/manager/panoactionthread.cpp index \
ff7a959b44..67333e3e72 100644
--- a/utilities/assistants/panorama/manager/panoactionthread.cpp
+++ b/utilities/assistants/panorama/manager/panoactionthread.cpp
@@ -4,8 +4,7 @@
* http://www.digikam.org
*
* Date : 2011-05-23
- * Description : a plugin to create panorama by fusion of several images.
- * Acknowledge : based on the expoblending plugin
+ * Description : a tool to create panorama by fusion of several images.
*
* Copyright (C) 2011-2016 by Benjamin Girault <benjamin dot girault at gmail dot \
com>
* Copyright (C) 2009-2018 by Gilles Caulier <caulier dot gilles at gmail dot com>
diff --git a/utilities/assistants/panorama/manager/panoactionthread.h \
b/utilities/assistants/panorama/manager/panoactionthread.h index \
2c63da45bb..6ee312f7cd 100644
--- a/utilities/assistants/panorama/manager/panoactionthread.h
+++ b/utilities/assistants/panorama/manager/panoactionthread.h
@@ -4,8 +4,7 @@
* http://www.digikam.org
*
* Date : 2011-05-23
- * Description : a plugin to create panorama by fusion of several images.
- * Acknowledge : based on the expoblending plugin
+ * Description : a tool to create panorama by fusion of several images.
*
* Copyright (C) 2011-2016 by Benjamin Girault <benjamin dot girault at gmail dot \
com>
* Copyright (C) 2009-2018 by Gilles Caulier <caulier dot gilles at gmail dot com>
diff --git a/utilities/assistants/panorama/manager/panomanager.cpp \
b/utilities/assistants/panorama/manager/panomanager.cpp index bb60a8d422..e29d056d14 \
100644
--- a/utilities/assistants/panorama/manager/panomanager.cpp
+++ b/utilities/assistants/panorama/manager/panomanager.cpp
@@ -4,8 +4,7 @@
* http://www.digikam.org
*
* Date : 2011-05-23
- * Description : a plugin to create panorama by fusion of several images.
- * Acknowledge : based on the expoblending plugin
+ * Description : a tool to create panorama by fusion of several images.
*
* Copyright (C) 2011-2016 by Benjamin Girault <benjamin dot girault at gmail dot \
com>
* Copyright (C) 2009-2018 by Gilles Caulier <caulier dot gilles at gmail dot com>
diff --git a/utilities/assistants/panorama/manager/panomanager.h \
b/utilities/assistants/panorama/manager/panomanager.h index def4e06687..8369c8b312 \
100644
--- a/utilities/assistants/panorama/manager/panomanager.h
+++ b/utilities/assistants/panorama/manager/panomanager.h
@@ -4,8 +4,7 @@
* http://www.digikam.org
*
* Date : 2011-05-23
- * Description : a plugin to create panorama by fusion of several images.
- * Acknowledge : based on the expoblending plugin
+ * Description : a tool to create panorama by fusion of several images.
*
* Copyright (C) 2011-2016 by Benjamin Girault <benjamin dot girault at gmail dot \
com>
* Copyright (C) 2009-2018 by Gilles Caulier <caulier dot gilles at gmail dot com>
diff --git a/utilities/assistants/panorama/ptoparser/ptofile.cpp \
b/utilities/assistants/panorama/ptoparser/ptofile.cpp index bc074e315c..24e526893f \
100644
--- a/utilities/assistants/panorama/ptoparser/ptofile.cpp
+++ b/utilities/assistants/panorama/ptoparser/ptofile.cpp
@@ -4,7 +4,7 @@
* http://www.digikam.org
*
* Date : 2012-02-04
- * Description : a plugin to create panorama by fusion of several images.
+ * Description : a tool to create panorama by fusion of several images.
* This parser is based on pto file format described here:
* http://hugin.sourceforge.net/docs/nona/nona.txt, and
* on pto files produced by Hugin's tools.
diff --git a/utilities/assistants/panorama/ptoparser/ptofile.h \
b/utilities/assistants/panorama/ptoparser/ptofile.h index 6e22ab546a..2528e7712e \
100644
--- a/utilities/assistants/panorama/ptoparser/ptofile.h
+++ b/utilities/assistants/panorama/ptoparser/ptofile.h
@@ -4,7 +4,7 @@
* http://www.digikam.org
*
* Date : 2012-02-04
- * Description : a plugin to create panorama by fusion of several images.
+ * Description : a tool to create panorama by fusion of several images.
* This parser is based on pto file format described here:
* http://hugin.sourceforge.net/docs/nona/nona.txt, and
* on pto files produced by Hugin's tools.
diff --git a/utilities/assistants/panorama/ptotype/ptotype.cpp \
b/utilities/assistants/panorama/ptotype/ptotype.cpp index 620dff39bc..4e937df329 \
100644
--- a/utilities/assistants/panorama/ptotype/ptotype.cpp
+++ b/utilities/assistants/panorama/ptotype/ptotype.cpp
@@ -4,7 +4,7 @@
* http://www.digikam.org
*
* Date : 2012-02-04
- * Description : a plugin to create panorama by fusion of several images.
+ * Description : a tool to create panorama by fusion of several images.
* This type is based on pto file format described here:
* http://hugin.sourceforge.net/docs/nona/nona.txt, and
* on pto files produced by Hugin's tools.
diff --git a/utilities/assistants/panorama/ptotype/ptotype.h \
b/utilities/assistants/panorama/ptotype/ptotype.h index 08cc3d0106..1f4ba65858 100644
--- a/utilities/assistants/panorama/ptotype/ptotype.h
+++ b/utilities/assistants/panorama/ptotype/ptotype.h
@@ -4,7 +4,7 @@
* http://www.digikam.org
*
* Date : 2012-02-04
- * Description : a plugin to create panorama by fusion of several images.
+ * Description : a tool to create panorama by fusion of several images.
* This type is based on pto file format described here:
* http://hugin.sourceforge.net/docs/nona/nona.txt, and
* on pto files produced by Hugin's tools.
diff --git a/utilities/assistants/panorama/tasks/autocroptask.cpp \
b/utilities/assistants/panorama/tasks/autocroptask.cpp index 5ff56f8735..cc1289f990 \
100644
--- a/utilities/assistants/panorama/tasks/autocroptask.cpp
+++ b/utilities/assistants/panorama/tasks/autocroptask.cpp
@@ -4,7 +4,7 @@
* http://www.digikam.org
*
* Date : 2012-03-15
- * Description : a plugin to create panorama by fusion of several images.
+ * Description : a tool to create panorama by fusion of several images.
*
* Copyright (C) 2012-2016 by Benjamin Girault <benjamin dot girault at gmail dot \
com>
*
diff --git a/utilities/assistants/panorama/tasks/autocroptask.h \
b/utilities/assistants/panorama/tasks/autocroptask.h index 0d9fcf4f64..e534b5e4fe \
100644
--- a/utilities/assistants/panorama/tasks/autocroptask.h
+++ b/utilities/assistants/panorama/tasks/autocroptask.h
@@ -4,7 +4,7 @@
* http://www.digikam.org
*
* Date : 2012-03-15
- * Description : a plugin to create panorama by fusion of several images.
+ * Description : a tool to create panorama by fusion of several images.
*
* Copyright (C) 2012-2015 by Benjamin Girault <benjamin dot girault at gmail dot \
com>
*
diff --git a/utilities/assistants/panorama/tasks/commandtask.cpp \
b/utilities/assistants/panorama/tasks/commandtask.cpp index f3121da86e..95291fcf4b \
100644
--- a/utilities/assistants/panorama/tasks/commandtask.cpp
+++ b/utilities/assistants/panorama/tasks/commandtask.cpp
@@ -4,7 +4,7 @@
* http://www.digikam.org
*
* Date : 2015-06-07
- * Description : a plugin to create panorama by fusion of several images.
+ * Description : a tool to create panorama by fusion of several images.
*
* Copyright (C) 2015-2016 by Benjamin Girault <benjamin dot girault at gmail dot \
com>
*
diff --git a/utilities/assistants/panorama/tasks/commandtask.h \
b/utilities/assistants/panorama/tasks/commandtask.h index 528825dcee..c4f911f54d \
100644
--- a/utilities/assistants/panorama/tasks/commandtask.h
+++ b/utilities/assistants/panorama/tasks/commandtask.h
@@ -4,7 +4,7 @@
* http://www.digikam.org
*
* Date : 2015-06-07
- * Description : a plugin to create panorama by fusion of several images.
+ * Description : a tool to create panorama by fusion of several images.
*
* Copyright (C) 2015-2016 by Benjamin Girault <benjamin dot girault at gmail dot \
com>
*
diff --git a/utilities/assistants/panorama/tasks/compilemksteptask.cpp \
b/utilities/assistants/panorama/tasks/compilemksteptask.cpp index \
b272e871e3..ae287dac14 100644
--- a/utilities/assistants/panorama/tasks/compilemksteptask.cpp
+++ b/utilities/assistants/panorama/tasks/compilemksteptask.cpp
@@ -4,7 +4,7 @@
* http://www.digikam.org
*
* Date : 2012-03-15
- * Description : a plugin to create panorama by fusion of several images.
+ * Description : a tool to create panorama by fusion of several images.
*
* Copyright (C) 2012-2016 by Benjamin Girault <benjamin dot girault at gmail dot \
com>
*
diff --git a/utilities/assistants/panorama/tasks/compilemksteptask.h \
b/utilities/assistants/panorama/tasks/compilemksteptask.h index \
e0961c4923..b957b9dfec 100644
--- a/utilities/assistants/panorama/tasks/compilemksteptask.h
+++ b/utilities/assistants/panorama/tasks/compilemksteptask.h
@@ -4,7 +4,7 @@
* http://www.digikam.org
*
* Date : 2012-03-15
- * Description : a plugin to create panorama by fusion of several images.
+ * Description : a tool to create panorama by fusion of several images.
*
* Copyright (C) 2012-2015 by Benjamin Girault <benjamin dot girault at gmail dot \
com>
*
diff --git a/utilities/assistants/panorama/tasks/compilemktask.cpp \
b/utilities/assistants/panorama/tasks/compilemktask.cpp index bcb762c7a4..9f92290bd4 \
100644
--- a/utilities/assistants/panorama/tasks/compilemktask.cpp
+++ b/utilities/assistants/panorama/tasks/compilemktask.cpp
@@ -4,7 +4,7 @@
* http://www.digikam.org
*
* Date : 2012-03-15
- * Description : a plugin to create panorama by fusion of several images.
+ * Description : a tool to create panorama by fusion of several images.
*
* Copyright (C) 2012-2016 by Benjamin Girault <benjamin dot girault at gmail dot \
com>
*
diff --git a/utilities/assistants/panorama/tasks/compilemktask.h \
b/utilities/assistants/panorama/tasks/compilemktask.h index 4a9b0dabd8..4cee714a00 \
100644
--- a/utilities/assistants/panorama/tasks/compilemktask.h
+++ b/utilities/assistants/panorama/tasks/compilemktask.h
@@ -4,7 +4,7 @@
* http://www.digikam.org
*
* Date : 2012-03-15
- * Description : a plugin to create panorama by fusion of several images.
+ * Description : a tool to create panorama by fusion of several images.
*
* Copyright (C) 2012-2015 by Benjamin Girault <benjamin dot girault at gmail dot \
com>
*
diff --git a/utilities/assistants/panorama/tasks/copyfilestask.cpp \
b/utilities/assistants/panorama/tasks/copyfilestask.cpp index 83243d12cf..557c156797 \
100644
--- a/utilities/assistants/panorama/tasks/copyfilestask.cpp
+++ b/utilities/assistants/panorama/tasks/copyfilestask.cpp
@@ -4,7 +4,7 @@
* http://www.digikam.org
*
* Date : 2012-03-15
- * Description : a plugin to create panorama by fusion of several images.
+ * Description : a tool to create panorama by fusion of several images.
*
* Copyright (C) 2012-2016 by Benjamin Girault <benjamin dot girault at gmail dot \
com>
*
diff --git a/utilities/assistants/panorama/tasks/copyfilestask.h \
b/utilities/assistants/panorama/tasks/copyfilestask.h index 2e33e117c4..4c8b59f9c4 \
100644
--- a/utilities/assistants/panorama/tasks/copyfilestask.h
+++ b/utilities/assistants/panorama/tasks/copyfilestask.h
@@ -4,7 +4,7 @@
* http://www.digikam.org
*
* Date : 2012-03-15
- * Description : a plugin to create panorama by fusion of several images.
+ * Description : a tool to create panorama by fusion of several images.
*
* Copyright (C) 2012-2015 by Benjamin Girault <benjamin dot girault at gmail dot \
com>
*
diff --git a/utilities/assistants/panorama/tasks/cpcleantask.cpp \
b/utilities/assistants/panorama/tasks/cpcleantask.cpp index 70c0a55c9d..be4c7e5781 \
100644
--- a/utilities/assistants/panorama/tasks/cpcleantask.cpp
+++ b/utilities/assistants/panorama/tasks/cpcleantask.cpp
@@ -4,7 +4,7 @@
* http://www.digikam.org
*
* Date : 2012-03-15
- * Description : a plugin to create panorama by fusion of several images.
+ * Description : a tool to create panorama by fusion of several images.
*
* Copyright (C) 2012-2016 by Benjamin Girault <benjamin dot girault at gmail dot \
com>
*
diff --git a/utilities/assistants/panorama/tasks/cpcleantask.h \
b/utilities/assistants/panorama/tasks/cpcleantask.h index e766ec755e..12ac808c94 \
100644
--- a/utilities/assistants/panorama/tasks/cpcleantask.h
+++ b/utilities/assistants/panorama/tasks/cpcleantask.h
@@ -4,7 +4,7 @@
* http://www.digikam.org
*
* Date : 2012-03-15
- * Description : a plugin to create panorama by fusion of several images.
+ * Description : a tool to create panorama by fusion of several images.
*
* Copyright (C) 2012-2015 by Benjamin Girault <benjamin dot girault at gmail dot \
com>
*
diff --git a/utilities/assistants/panorama/tasks/cpfindtask.cpp \
b/utilities/assistants/panorama/tasks/cpfindtask.cpp index fabbb0ed78..9cf06ec6ce \
100644
--- a/utilities/assistants/panorama/tasks/cpfindtask.cpp
+++ b/utilities/assistants/panorama/tasks/cpfindtask.cpp
@@ -4,7 +4,7 @@
* http://www.digikam.org
*
* Date : 2012-03-15
- * Description : a plugin to create panorama by fusion of several images.
+ * Description : a tool to create panorama by fusion of several images.
*
* Copyright (C) 2012-2016 by Benjamin Girault <benjamin dot girault at gmail dot \
com>
*
diff --git a/utilities/assistants/panorama/tasks/cpfindtask.h \
b/utilities/assistants/panorama/tasks/cpfindtask.h index 6f920f2df0..f847891a63 \
100644
--- a/utilities/assistants/panorama/tasks/cpfindtask.h
+++ b/utilities/assistants/panorama/tasks/cpfindtask.h
@@ -4,7 +4,7 @@
* http://www.digikam.org
*
* Date : 2012-03-15
- * Description : a plugin to create panorama by fusion of several images.
+ * Description : a tool to create panorama by fusion of several images.
*
* Copyright (C) 2012-2015 by Benjamin Girault <benjamin dot girault at gmail dot \
com>
*
diff --git a/utilities/assistants/panorama/tasks/createfinalptotask.cpp \
b/utilities/assistants/panorama/tasks/createfinalptotask.cpp index \
9a805a2e68..a1ab51462d 100644
--- a/utilities/assistants/panorama/tasks/createfinalptotask.cpp
+++ b/utilities/assistants/panorama/tasks/createfinalptotask.cpp
@@ -4,7 +4,7 @@
* http://www.digikam.org
*
* Date : 2012-12-05
- * Description : a plugin to create panorama by fusion of several images.
+ * Description : a tool to create panorama by fusion of several images.
*
* Copyright (C) 2012-2016 by Benjamin Girault <benjamin dot girault at gmail dot \
com>
*
diff --git a/utilities/assistants/panorama/tasks/createfinalptotask.h \
b/utilities/assistants/panorama/tasks/createfinalptotask.h index \
dc17e00c94..79a7cf93a6 100644
--- a/utilities/assistants/panorama/tasks/createfinalptotask.h
+++ b/utilities/assistants/panorama/tasks/createfinalptotask.h
@@ -4,7 +4,7 @@
* http://www.digikam.org
*
* Date : 2012-12-05
- * Description : a plugin to create panorama by fusion of several images.
+ * Description : a tool to create panorama by fusion of several images.
*
* Copyright (C) 2012-2015 by Benjamin Girault <benjamin dot girault at gmail dot \
com>
*
diff --git a/utilities/assistants/panorama/tasks/createmktask.cpp \
b/utilities/assistants/panorama/tasks/createmktask.cpp index 92f6e83751..e9f1c81576 \
100644
--- a/utilities/assistants/panorama/tasks/createmktask.cpp
+++ b/utilities/assistants/panorama/tasks/createmktask.cpp
@@ -4,7 +4,7 @@
* http://www.digikam.org
*
* Date : 2012-03-15
- * Description : a plugin to create panorama by fusion of several images.
+ * Description : a tool to create panorama by fusion of several images.
*
* Copyright (C) 2012-2016 by Benjamin Girault <benjamin dot girault at gmail dot \
com>
*
diff --git a/utilities/assistants/panorama/tasks/createmktask.h \
b/utilities/assistants/panorama/tasks/createmktask.h index 07a6a54ebf..ba5772719c \
100644
--- a/utilities/assistants/panorama/tasks/createmktask.h
+++ b/utilities/assistants/panorama/tasks/createmktask.h
@@ -4,7 +4,7 @@
* http://www.digikam.org
*
* Date : 2012-03-15
- * Description : a plugin to create panorama by fusion of several images.
+ * Description : a tool to create panorama by fusion of several images.
*
* Copyright (C) 2012-2015 by Benjamin Girault <benjamin dot girault at gmail dot \
com>
*
diff --git a/utilities/assistants/panorama/tasks/createpreviewtask.cpp \
b/utilities/assistants/panorama/tasks/createpreviewtask.cpp index \
f759a46ab2..631ea9cafd 100644
--- a/utilities/assistants/panorama/tasks/createpreviewtask.cpp
+++ b/utilities/assistants/panorama/tasks/createpreviewtask.cpp
@@ -4,7 +4,7 @@
* http://www.digikam.org
*
* Date : 2012-03-15
- * Description : a plugin to create panorama by fusion of several images.
+ * Description : a tool to create panorama by fusion of several images.
*
* Copyright (C) 2012-2016 by Benjamin Girault <benjamin dot girault at gmail dot \
com>
*
diff --git a/utilities/assistants/panorama/tasks/createpreviewtask.h \
b/utilities/assistants/panorama/tasks/createpreviewtask.h index \
bbcfeee00e..064904516f 100644
--- a/utilities/assistants/panorama/tasks/createpreviewtask.h
+++ b/utilities/assistants/panorama/tasks/createpreviewtask.h
@@ -4,7 +4,7 @@
* http://www.digikam.org
*
* Date : 2012-03-15
- * Description : a plugin to create panorama by fusion of several images.
+ * Description : a tool to create panorama by fusion of several images.
*
* Copyright (C) 2012-2015 by Benjamin Girault <benjamin dot girault at gmail dot \
com>
*
diff --git a/utilities/assistants/panorama/tasks/createptotask.cpp \
b/utilities/assistants/panorama/tasks/createptotask.cpp index bf45e941e4..0ccc1919fe \
100644
--- a/utilities/assistants/panorama/tasks/createptotask.cpp
+++ b/utilities/assistants/panorama/tasks/createptotask.cpp
@@ -4,7 +4,7 @@
* http://www.digikam.org
*
* Date : 2012-03-15
- * Description : a plugin to create panorama by fusion of several images.
+ * Description : a tool to create panorama by fusion of several images.
*
* Copyright (C) 2012-2016 by Benjamin Girault <benjamin dot girault at gmail dot \
com>
*
diff --git a/utilities/assistants/panorama/tasks/createptotask.h \
b/utilities/assistants/panorama/tasks/createptotask.h index f362f3ea47..0027dd68f1 \
100644
--- a/utilities/assistants/panorama/tasks/createptotask.h
+++ b/utilities/assistants/panorama/tasks/createptotask.h
@@ -4,7 +4,7 @@
* http://www.digikam.org
*
* Date : 2012-03-15
- * Description : a plugin to create panorama by fusion of several images.
+ * Description : a tool to create panorama by fusion of several images.
*
* Copyright (C) 2012-2015 by Benjamin Girault <benjamin dot girault at gmail dot \
com>
*
diff --git a/utilities/assistants/panorama/tasks/optimisationtask.cpp \
b/utilities/assistants/panorama/tasks/optimisationtask.cpp index \
ce7e437f0c..e8fd708c98 100644
--- a/utilities/assistants/panorama/tasks/optimisationtask.cpp
+++ b/utilities/assistants/panorama/tasks/optimisationtask.cpp
@@ -4,7 +4,7 @@
* http://www.digikam.org
*
* Date : 2012-03-15
- * Description : a plugin to create panorama by fusion of several images.
+ * Description : a tool to create panorama by fusion of several images.
*
* Copyright (C) 2012-2016 by Benjamin Girault <benjamin dot girault at gmail dot \
com>
*
diff --git a/utilities/assistants/panorama/tasks/optimisationtask.h \
b/utilities/assistants/panorama/tasks/optimisationtask.h index ce77f71735..d44b07bb50 \
100644
--- a/utilities/assistants/panorama/tasks/optimisationtask.h
+++ b/utilities/assistants/panorama/tasks/optimisationtask.h
@@ -4,7 +4,7 @@
* http://www.digikam.org
*
* Date : 2012-03-15
- * Description : a plugin to create panorama by fusion of several images.
+ * Description : a tool to create panorama by fusion of several images.
*
* Copyright (C) 2012-2015 by Benjamin Girault <benjamin dot girault at gmail dot \
com>
*
diff --git a/utilities/assistants/panorama/tasks/panotask.cpp \
b/utilities/assistants/panorama/tasks/panotask.cpp index 5420a911aa..07e70e8e6d \
100644
--- a/utilities/assistants/panorama/tasks/panotask.cpp
+++ b/utilities/assistants/panorama/tasks/panotask.cpp
@@ -4,7 +4,7 @@
* http://www.digikam.org
*
* Date : 2012-03-15
- * Description : a plugin to create panorama by fusion of several images.
+ * Description : a tool to create panorama by fusion of several images.
*
* Copyright (C) 2012-2016 by Benjamin Girault <benjamin dot girault at gmail dot \
com>
*
diff --git a/utilities/assistants/panorama/tasks/panotask.h \
b/utilities/assistants/panorama/tasks/panotask.h index b943c913e4..ba1c7f632c 100644
--- a/utilities/assistants/panorama/tasks/panotask.h
+++ b/utilities/assistants/panorama/tasks/panotask.h
@@ -4,7 +4,7 @@
* http://www.digikam.org
*
* Date : 2012-03-15
- * Description : a plugin to create panorama by fusion of several images.
+ * Description : a tool to create panorama by fusion of several images.
*
* Copyright (C) 2012-2015 by Benjamin Girault <benjamin dot girault at gmail dot \
com>
*
diff --git a/utilities/assistants/panorama/tasks/panotasks.h \
b/utilities/assistants/panorama/tasks/panotasks.h index 79bdafbe83..57714f4f57 100644
--- a/utilities/assistants/panorama/tasks/panotasks.h
+++ b/utilities/assistants/panorama/tasks/panotasks.h
@@ -4,7 +4,7 @@
* http://www.digikam.org
*
* Date : 2012-03-15
- * Description : a plugin to create panorama by fusion of several images.
+ * Description : a tool to create panorama by fusion of several images.
*
* Copyright (C) 2012-2016 by Benjamin Girault <benjamin dot girault at gmail dot \
com>
*
diff --git a/utilities/assistants/panorama/tasks/preprocesstask.cpp \
b/utilities/assistants/panorama/tasks/preprocesstask.cpp index 4135bbca59..657104f5b5 \
100644
--- a/utilities/assistants/panorama/tasks/preprocesstask.cpp
+++ b/utilities/assistants/panorama/tasks/preprocesstask.cpp
@@ -4,7 +4,7 @@
* http://www.digikam.org
*
* Date : 2012-03-15
- * Description : a plugin to create panorama by fusion of several images.
+ * Description : a tool to create panorama by fusion of several images.
*
* Copyright (C) 2012-2016 by Benjamin Girault <benjamin dot girault at gmail dot \
com>
*
diff --git a/utilities/assistants/panorama/tasks/preprocesstask.h \
b/utilities/assistants/panorama/tasks/preprocesstask.h index 88335fe980..9768d619c3 \
100644
--- a/utilities/assistants/panorama/tasks/preprocesstask.h
+++ b/utilities/assistants/panorama/tasks/preprocesstask.h
@@ -4,7 +4,7 @@
* http://www.digikam.org
*
* Date : 2012-03-15
- * Description : a plugin to create panorama by fusion of several images.
+ * Description : a tool to create panorama by fusion of several images.
*
* Copyright (C) 2012-2015 by Benjamin Girault <benjamin dot girault at gmail dot \
com>
*
diff --git a/utilities/assistants/panorama/wizard/panointropage.cpp \
b/utilities/assistants/panorama/wizard/panointropage.cpp index 31d3805eec..d6b7c2af1b \
100644
--- a/utilities/assistants/panorama/wizard/panointropage.cpp
+++ b/utilities/assistants/panorama/wizard/panointropage.cpp
@@ -4,8 +4,8 @@
* http://www.digikam.org
*
* Date : 2011-05-23
- * Description : a plugin to create panorama by fusion of several images.
- * Acknowledge : based on the expoblending plugin
+ * Description : a tool to create panorama by fusion of several images.
+ * Acknowledge : based on the expoblending tool
*
* Copyright (C) 2011-2016 by Benjamin Girault <benjamin dot girault at gmail dot \
com>
* Copyright (C) 2009-2018 by Gilles Caulier <caulier dot gilles at gmail dot com>
diff --git a/utilities/assistants/panorama/wizard/panointropage.h \
b/utilities/assistants/panorama/wizard/panointropage.h index b5ba5c889d..67706a467c \
100644
--- a/utilities/assistants/panorama/wizard/panointropage.h
+++ b/utilities/assistants/panorama/wizard/panointropage.h
@@ -4,8 +4,8 @@
* http://www.digikam.org
*
* Date : 2011-05-23
- * Description : a plugin to create panorama by fusion of several images.
- * Acknowledge : based on the expoblending plugin
+ * Description : a tool to create panorama by fusion of several images.
+ * Acknowledge : based on the expoblending tool
*
* Copyright (C) 2011-2016 by Benjamin Girault <benjamin dot girault at gmail dot \
com>
* Copyright (C) 2009-2018 by Gilles Caulier <caulier dot gilles at gmail dot com>
diff --git a/utilities/assistants/panorama/wizard/panoitemspage.cpp \
b/utilities/assistants/panorama/wizard/panoitemspage.cpp index 19e997350d..bdbb700f0e \
100644
--- a/utilities/assistants/panorama/wizard/panoitemspage.cpp
+++ b/utilities/assistants/panorama/wizard/panoitemspage.cpp
@@ -4,8 +4,8 @@
* http://www.digikam.org
*
* Date : 2011-05-23
- * Description : a plugin to create panorama by fusion of several images.
- * Acknowledge : based on the expoblending plugin
+ * Description : a tool to create panorama by fusion of several images.
+ * Acknowledge : based on the expoblending tool
*
* Copyright (C) 2011-2016 by Benjamin Girault <benjamin dot girault at gmail dot \
com>
* Copyright (C) 2009-2018 by Gilles Caulier <caulier dot gilles at gmail dot com>
diff --git a/utilities/assistants/panorama/wizard/panoitemspage.h \
b/utilities/assistants/panorama/wizard/panoitemspage.h index afe3e50312..c2bfa812ec \
100644
--- a/utilities/assistants/panorama/wizard/panoitemspage.h
+++ b/utilities/assistants/panorama/wizard/panoitemspage.h
@@ -4,8 +4,8 @@
* http://www.digikam.org
*
* Date : 2011-05-23
- * Description : a plugin to create panorama by fusion of several images.
- * Acknowledge : based on the expoblending plugin
+ * Description : a tool to create panorama by fusion of several images.
+ * Acknowledge : based on the expoblending tool
*
* Copyright (C) 2011-2016 by Benjamin Girault <benjamin dot girault at gmail dot \
com>
* Copyright (C) 2009-2018 by Gilles Caulier <caulier dot gilles at gmail dot com>
diff --git a/utilities/assistants/panorama/wizard/panolastpage.cpp \
b/utilities/assistants/panorama/wizard/panolastpage.cpp index 04dc7a431d..ab59c1f878 \
100644
--- a/utilities/assistants/panorama/wizard/panolastpage.cpp
+++ b/utilities/assistants/panorama/wizard/panolastpage.cpp
@@ -4,8 +4,8 @@
* http://www.digikam.org
*
* Date : 2011-05-23
- * Description : a plugin to create panorama by fusion of several images.
- * Acknowledge : based on the expoblending plugin
+ * Description : a tool to create panorama by fusion of several images.
+ * Acknowledge : based on the expoblending tool
*
* Copyright (C) 2011-2016 by Benjamin Girault <benjamin dot girault at gmail dot \
com>
* Copyright (C) 2009-2018 by Gilles Caulier <caulier dot gilles at gmail dot com>
diff --git a/utilities/assistants/panorama/wizard/panolastpage.h \
b/utilities/assistants/panorama/wizard/panolastpage.h index 4ddaf9f1d7..a063181fb6 \
100644
--- a/utilities/assistants/panorama/wizard/panolastpage.h
+++ b/utilities/assistants/panorama/wizard/panolastpage.h
@@ -4,8 +4,8 @@
* http://www.digikam.org
*
* Date : 2011-05-23
- * Description : a plugin to create panorama by fusion of several images.
- * Acknowledge : based on the expoblending plugin
+ * Description : a tool to create panorama by fusion of several images.
+ * Acknowledge : based on the expoblending tool
*
* Copyright (C) 2011-2016 by Benjamin Girault <benjamin dot girault at gmail dot \
com>
* Copyright (C) 2009-2018 by Gilles Caulier <caulier dot gilles at gmail dot com>
diff --git a/utilities/assistants/panorama/wizard/panooptimizepage.cpp \
b/utilities/assistants/panorama/wizard/panooptimizepage.cpp index \
4dca4ba381..d9861814c1 100644
--- a/utilities/assistants/panorama/wizard/panooptimizepage.cpp
+++ b/utilities/assistants/panorama/wizard/panooptimizepage.cpp
@@ -4,7 +4,7 @@
* http://www.digikam.org
*
* Date : 2011-05-23
- * Description : a plugin to create panorama by fusion of several images.
+ * Description : a tool to create panorama by fusion of several images.
*
* Copyright (C) 2011-2016 by Benjamin Girault <benjamin dot girault at gmail dot \
com>
*
diff --git a/utilities/assistants/panorama/wizard/panooptimizepage.h \
b/utilities/assistants/panorama/wizard/panooptimizepage.h index \
29f2049f3b..9b9deae0c3 100644
--- a/utilities/assistants/panorama/wizard/panooptimizepage.h
+++ b/utilities/assistants/panorama/wizard/panooptimizepage.h
@@ -4,7 +4,7 @@
* http://www.digikam.org
*
* Date : 2011-05-23
- * Description : a plugin to create panorama by fusion of several images.
+ * Description : a tool to create panorama by fusion of several images.
*
* Copyright (C) 2011-2016 by Benjamin Girault <benjamin dot girault at gmail dot \
com>
*
diff --git a/utilities/assistants/panorama/wizard/panopreprocesspage.cpp \
b/utilities/assistants/panorama/wizard/panopreprocesspage.cpp index \
823814bf4c..2d11734ab8 100644
--- a/utilities/assistants/panorama/wizard/panopreprocesspage.cpp
+++ b/utilities/assistants/panorama/wizard/panopreprocesspage.cpp
@@ -4,8 +4,8 @@
* http://www.digikam.org
*
* Date : 2011-05-23
- * Description : a plugin to create panorama by fusion of several images.
- * Acknowledge : based on the expoblending plugin
+ * Description : a tool to create panorama by fusion of several images.
+ * Acknowledge : based on the expoblending tool
*
* Copyright (C) 2011-2016 by Benjamin Girault <benjamin dot girault at gmail dot \
com>
* Copyright (C) 2009-2018 by Gilles Caulier <caulier dot gilles at gmail dot com>
diff --git a/utilities/assistants/panorama/wizard/panopreprocesspage.h \
b/utilities/assistants/panorama/wizard/panopreprocesspage.h index \
6e20ea4bfe..5540be3f95 100644
--- a/utilities/assistants/panorama/wizard/panopreprocesspage.h
+++ b/utilities/assistants/panorama/wizard/panopreprocesspage.h
@@ -4,8 +4,8 @@
* http://www.digikam.org
*
* Date : 2011-05-23
- * Description : a plugin to create panorama by fusion of several images.
- * Acknowledge : based on the expoblending plugin
+ * Description : a tool to create panorama by fusion of several images.
+ * Acknowledge : based on the expoblending tool
*
* Copyright (C) 2011-2016 by Benjamin Girault <benjamin dot girault at gmail dot \
com>
* Copyright (C) 2009-2018 by Gilles Caulier <caulier dot gilles at gmail dot com>
diff --git a/utilities/assistants/panorama/wizard/panopreviewpage.cpp \
b/utilities/assistants/panorama/wizard/panopreviewpage.cpp index \
fae0653bd7..d88a53548e 100644
--- a/utilities/assistants/panorama/wizard/panopreviewpage.cpp
+++ b/utilities/assistants/panorama/wizard/panopreviewpage.cpp
@@ -4,7 +4,7 @@
* http://www.digikam.org
*
* Date : 2011-05-23
- * Description : a plugin to create panorama by fusion of several images.
+ * Description : a tool to create panorama by fusion of several images.
*
* Copyright (C) 2011-2016 by Benjamin Girault <benjamin dot girault at gmail dot \
com>
* Copyright (C) 2011-2018 by Gilles Caulier <caulier dot gilles at gmail dot com>
diff --git a/utilities/assistants/panorama/wizard/panopreviewpage.h \
b/utilities/assistants/panorama/wizard/panopreviewpage.h index 8609f2df8e..c97be96068 \
100644
--- a/utilities/assistants/panorama/wizard/panopreviewpage.h
+++ b/utilities/assistants/panorama/wizard/panopreviewpage.h
@@ -4,7 +4,7 @@
* http://www.digikam.org
*
* Date : 2011-05-23
- * Description : a plugin to create panorama by fusion of several images.
+ * Description : a tool to create panorama by fusion of several images.
*
* Copyright (C) 2011-2016 by Benjamin Girault <benjamin dot girault at gmail dot \
com>
*
diff --git a/utilities/assistants/panorama/wizard/panowizard.cpp \
b/utilities/assistants/panorama/wizard/panowizard.cpp index 7a43036872..429b2f0f1e \
100644
--- a/utilities/assistants/panorama/wizard/panowizard.cpp
+++ b/utilities/assistants/panorama/wizard/panowizard.cpp
@@ -4,8 +4,8 @@
* http://www.digikam.org
*
* Date : 2011-05-23
- * Description : a plugin to create panorama by fusion of several images.
- * Acknowledge : based on the expoblending plugin
+ * Description : a tool to create panorama by fusion of several images.
+ * Acknowledge : based on the expoblending tool
*
* Copyright (C) 2011-2016 by Benjamin Girault <benjamin dot girault at gmail dot \
com>
* Copyright (C) 2009-2018 by Gilles Caulier <caulier dot gilles at gmail dot com>
diff --git a/utilities/assistants/panorama/wizard/panowizard.h \
b/utilities/assistants/panorama/wizard/panowizard.h index 2fe51662e4..671bfd57d0 \
100644
--- a/utilities/assistants/panorama/wizard/panowizard.h
+++ b/utilities/assistants/panorama/wizard/panowizard.h
@@ -4,8 +4,8 @@
* http://www.digikam.org
*
* Date : 2011-05-23
- * Description : a plugin to create panorama by fusion of several images.
- * Acknowledge : based on the expoblending plugin
+ * Description : a tool to create panorama by fusion of several images.
+ * Acknowledge : based on the expoblending tool
*
* Copyright (C) 2011-2016 by Benjamin Girault <benjamin dot girault at gmail dot \
com>
* Copyright (C) 2009-2018 by Gilles Caulier <caulier dot gilles at gmail dot com>
diff --git a/utilities/assistants/webservices/base/newalbumdialog.cpp \
b/utilities/assistants/webservices/base/newalbumdialog.cpp index \
c98ef745f3..53ecf53ec9 100644
--- a/utilities/assistants/webservices/base/newalbumdialog.cpp
+++ b/utilities/assistants/webservices/base/newalbumdialog.cpp
@@ -44,7 +44,7 @@ class NewAlbumDialog::Private
{
public:
- Private(QWidget* const widget, const QString& pluginName)
+ Private(QWidget* const widget, const QString& toolName)
{
m_titleEdt = new QLineEdit;
m_descEdt = new QTextEdit;
@@ -64,7 +64,7 @@ public:
buttonBox = new QDialogButtonBox();
- m_pluginName = pluginName;
+ m_toolName = toolName;
}
QLineEdit* m_titleEdt;
@@ -77,7 +77,7 @@ public:
QLabel* descLabel;
QLabel* locLabel;
- QString m_pluginName;
+ QString m_toolName;
QDialogButtonBox* buttonBox;
QGridLayout* albumBoxLayout;
@@ -87,13 +87,13 @@ public:
QWidget* mainWidget;
};
-NewAlbumDialog::NewAlbumDialog(QWidget* const parent, const QString& pluginName)
+NewAlbumDialog::NewAlbumDialog(QWidget* const parent, const QString& toolName)
: QDialog(parent),
- d(new Private(this, pluginName))
+ d(new Private(this, toolName))
{
- d->m_pluginName = pluginName;
+ d->m_toolName = toolName;
d->mainWidget->setMinimumSize(500, 500);
- setWindowTitle(QString(d->m_pluginName + QString::fromLatin1(" New Album")));
+ setWindowTitle(QString(d->m_toolName + QString::fromLatin1(" New Album")));
setModal(false);
const int spacing = \
QApplication::style()->pixelMetric(QStyle::PM_DefaultLayoutSpacing); @@ -113,7 +113,7 \
@@ NewAlbumDialog::NewAlbumDialog(QWidget* const parent, const QString& pluginName) \
this, SLOT(reject()));
d->albumBox->setLayout(d->albumBoxLayout);
- d->albumBox->setWhatsThis(i18n("These are basic settings for the new %1 \
album.",d->m_pluginName)); + d->albumBox->setWhatsThis(i18n("These are basic \
settings for the new %1 album.",d->m_toolName));
d->m_titleEdt->setToolTip(i18n("Title of the album that will be created \
(required)."));
diff --git a/utilities/assistants/webservices/base/newalbumdialog.h \
b/utilities/assistants/webservices/base/newalbumdialog.h index c2fba754cd..968b52a381 \
100644
--- a/utilities/assistants/webservices/base/newalbumdialog.h
+++ b/utilities/assistants/webservices/base/newalbumdialog.h
@@ -52,7 +52,7 @@ class DIGIKAM_EXPORT NewAlbumDialog : public QDialog
public:
- explicit NewAlbumDialog(QWidget* const parent, const QString& pluginName);
+ explicit NewAlbumDialog(QWidget* const parent, const QString& toolName);
~NewAlbumDialog();
void hideDateTime();
diff --git a/utilities/assistants/webservices/dropbox/dbnewalbumdlg.cpp \
b/utilities/assistants/webservices/dropbox/dbnewalbumdlg.cpp index \
f3f43e32fc..6133a04a27 100644
--- a/utilities/assistants/webservices/dropbox/dbnewalbumdlg.cpp
+++ b/utilities/assistants/webservices/dropbox/dbnewalbumdlg.cpp
@@ -30,8 +30,8 @@
namespace Digikam
{
-DBNewAlbumDlg::DBNewAlbumDlg(QWidget* const parent, const QString& pluginName)
- : NewAlbumDialog(parent, pluginName)
+DBNewAlbumDlg::DBNewAlbumDlg(QWidget* const parent, const QString& toolName)
+ : NewAlbumDialog(parent, toolName)
{
hideDateTime();
hideDesc();
diff --git a/utilities/assistants/webservices/dropbox/dbnewalbumdlg.h \
b/utilities/assistants/webservices/dropbox/dbnewalbumdlg.h index \
fac022bc4e..3262fe10a1 100644
--- a/utilities/assistants/webservices/dropbox/dbnewalbumdlg.h
+++ b/utilities/assistants/webservices/dropbox/dbnewalbumdlg.h
@@ -38,7 +38,7 @@ class DBNewAlbumDlg : public NewAlbumDialog
public:
- explicit DBNewAlbumDlg(QWidget* const parent, const QString& pluginName);
+ explicit DBNewAlbumDlg(QWidget* const parent, const QString& toolName);
~DBNewAlbumDlg();
void getFolderTitle(DBFolder& folder);
diff --git a/utilities/assistants/webservices/dropbox/dbwidget.cpp \
b/utilities/assistants/webservices/dropbox/dbwidget.cpp index d304cb4523..7dba1c2c84 \
100644
--- a/utilities/assistants/webservices/dropbox/dbwidget.cpp
+++ b/utilities/assistants/webservices/dropbox/dbwidget.cpp
@@ -36,8 +36,8 @@ namespace Digikam
DBWidget::DBWidget(QWidget* const parent,
DInfoInterface* const iface,
- const QString& pluginName)
- : SettingsWidget(parent, iface, pluginName)
+ const QString& toolName)
+ : SettingsWidget(parent, iface, toolName)
{
getUploadBox()->hide();
getSizeBox()->hide();
diff --git a/utilities/assistants/webservices/dropbox/dbwidget.h \
b/utilities/assistants/webservices/dropbox/dbwidget.h index 1b34271946..7d0e8aa268 \
100644
--- a/utilities/assistants/webservices/dropbox/dbwidget.h
+++ b/utilities/assistants/webservices/dropbox/dbwidget.h
@@ -50,7 +50,7 @@ public:
explicit DBWidget(QWidget* const parent,
DInfoInterface* const iface,
- const QString& pluginName);
+ const QString& toolName);
~DBWidget();
void updateLabels(const QString& name = QString(), const QString& url = \
QString()) Q_DECL_OVERRIDE;
diff --git a/utilities/assistants/webservices/facebook/fbnewalbumdlg.cpp \
b/utilities/assistants/webservices/facebook/fbnewalbumdlg.cpp index \
ab001932d9..3f120b98bc 100644
--- a/utilities/assistants/webservices/facebook/fbnewalbumdlg.cpp
+++ b/utilities/assistants/webservices/facebook/fbnewalbumdlg.cpp
@@ -42,8 +42,8 @@
namespace Digikam
{
-FbNewAlbumDlg::FbNewAlbumDlg(QWidget* const parent, const QString& pluginName)
- : NewAlbumDialog(parent, pluginName)
+FbNewAlbumDlg::FbNewAlbumDlg(QWidget* const parent, const QString& toolName)
+ : NewAlbumDialog(parent, toolName)
{
hideDateTime();
diff --git a/utilities/assistants/webservices/facebook/fbnewalbumdlg.h \
b/utilities/assistants/webservices/facebook/fbnewalbumdlg.h index \
70475283d4..afe031a49a 100644
--- a/utilities/assistants/webservices/facebook/fbnewalbumdlg.h
+++ b/utilities/assistants/webservices/facebook/fbnewalbumdlg.h
@@ -44,7 +44,7 @@ class FbNewAlbumDlg : public NewAlbumDialog
public:
- explicit FbNewAlbumDlg(QWidget* const parent, const QString& pluginName);
+ explicit FbNewAlbumDlg(QWidget* const parent, const QString& toolName);
~FbNewAlbumDlg();
void getAlbumProperties(FbAlbum& album);
diff --git a/utilities/assistants/webservices/facebook/fbwidget.cpp \
b/utilities/assistants/webservices/facebook/fbwidget.cpp index 0fa41cc74a..3bdfb0e2d9 \
100644
--- a/utilities/assistants/webservices/facebook/fbwidget.cpp
+++ b/utilities/assistants/webservices/facebook/fbwidget.cpp
@@ -47,8 +47,8 @@ namespace Digikam
FbWidget::FbWidget(QWidget* const parent,
DInfoInterface* const iface,
- const QString& pluginName)
- : SettingsWidget(parent, iface, pluginName)
+ const QString& toolName)
+ : SettingsWidget(parent, iface, toolName)
{
m_iface = iface;
diff --git a/utilities/assistants/webservices/facebook/fbwidget.h \
b/utilities/assistants/webservices/facebook/fbwidget.h index 58d226a7eb..93af637ac0 \
100644
--- a/utilities/assistants/webservices/facebook/fbwidget.h
+++ b/utilities/assistants/webservices/facebook/fbwidget.h
@@ -43,7 +43,7 @@ public:
explicit FbWidget(QWidget* const parent,
DInfoInterface* const iface,
- const QString& pluginName);
+ const QString& toolName);
~FbWidget();
void updateLabels(const QString& name = QString(),
diff --git a/utilities/assistants/webservices/flickr/flickrnewalbumdlg.cpp \
b/utilities/assistants/webservices/flickr/flickrnewalbumdlg.cpp index \
18875bc43a..c418e1b235 100644
--- a/utilities/assistants/webservices/flickr/flickrnewalbumdlg.cpp
+++ b/utilities/assistants/webservices/flickr/flickrnewalbumdlg.cpp
@@ -37,8 +37,8 @@
namespace Digikam
{
-FlickrNewAlbumDlg::FlickrNewAlbumDlg(QWidget* const parent, const QString& \
pluginName)
- : NewAlbumDialog(parent, pluginName)
+FlickrNewAlbumDlg::FlickrNewAlbumDlg(QWidget* const parent, const QString& toolName)
+ : NewAlbumDialog(parent, toolName)
{
hideDateTime();
hideLocation();
diff --git a/utilities/assistants/webservices/flickr/flickrnewalbumdlg.h \
b/utilities/assistants/webservices/flickr/flickrnewalbumdlg.h index \
01324c3c9d..9f3a15710e 100644
--- a/utilities/assistants/webservices/flickr/flickrnewalbumdlg.h
+++ b/utilities/assistants/webservices/flickr/flickrnewalbumdlg.h
@@ -39,7 +39,7 @@ class FlickrNewAlbumDlg : public NewAlbumDialog
public:
- explicit FlickrNewAlbumDlg(QWidget* const parent, const QString& pluginName);
+ explicit FlickrNewAlbumDlg(QWidget* const parent, const QString& toolName);
~FlickrNewAlbumDlg();
void getFolderProperties(FPhotoSet& folder);
diff --git a/utilities/assistants/webservices/google/gsitem.h \
b/utilities/assistants/webservices/google/gsitem.h index d7c9759b0e..b2e972c0ca \
100644
--- a/utilities/assistants/webservices/google/gsitem.h
+++ b/utilities/assistants/webservices/google/gsitem.h
@@ -31,7 +31,7 @@
namespace Digikam
{
-enum PluginName
+enum GoogleService
{
GDrive = 1,
GPhotoExport,
diff --git a/utilities/assistants/webservices/google/gsnewalbumdlg.cpp \
b/utilities/assistants/webservices/google/gsnewalbumdlg.cpp index \
76f690e6a4..05e03e7871 100644
--- a/utilities/assistants/webservices/google/gsnewalbumdlg.cpp
+++ b/utilities/assistants/webservices/google/gsnewalbumdlg.cpp
@@ -47,8 +47,8 @@ namespace Digikam
GSNewAlbumDlg::GSNewAlbumDlg(QWidget* const parent,
const QString& serviceName,
- const QString& pluginName)
- : NewAlbumDialog(parent, pluginName)
+ const QString& toolName)
+ : NewAlbumDialog(parent, toolName)
{
m_serviceName = serviceName;
const int spacing = \
QApplication::style()->pixelMetric(QStyle::PM_DefaultLayoutSpacing);
diff --git a/utilities/assistants/webservices/google/gsnewalbumdlg.h \
b/utilities/assistants/webservices/google/gsnewalbumdlg.h index \
f4dfd8aad4..ffc837c751 100644
--- a/utilities/assistants/webservices/google/gsnewalbumdlg.h
+++ b/utilities/assistants/webservices/google/gsnewalbumdlg.h
@@ -50,7 +50,7 @@ public:
explicit GSNewAlbumDlg(QWidget* const parent,
const QString& serviceName,
- const QString& pluginName);
+ const QString& toolName);
~GSNewAlbumDlg();
void getAlbumProperties(GSFolder& album);
diff --git a/utilities/assistants/webservices/google/gssession.h \
b/utilities/assistants/webservices/google/gssession.h index 4fc5bd9dcb..6ba2d02355 \
100644
--- a/utilities/assistants/webservices/google/gssession.h
+++ b/utilities/assistants/webservices/google/gssession.h
@@ -42,7 +42,7 @@ class GSSession : public QObject
public:
- GSSession(QWidget* const parent, const QString& scope);
+ explicit GSSession(QWidget* const parent, const QString& scope);
~GSSession();
Q_SIGNALS:
diff --git a/utilities/assistants/webservices/google/gswidget.cpp \
b/utilities/assistants/webservices/google/gswidget.cpp index 5c616c7220..4e25c35301 \
100644
--- a/utilities/assistants/webservices/google/gswidget.cpp
+++ b/utilities/assistants/webservices/google/gswidget.cpp
@@ -46,16 +46,16 @@ namespace Digikam
GSWidget::GSWidget(QWidget* const parent,
DInfoInterface* const iface,
- const PluginName& pluginName,
+ const GoogleService& service,
const QString& serviceName)
: SettingsWidget(parent, iface, serviceName)
{
- m_pluginName = pluginName;
+ m_service = service;
QGroupBox* m_LeafBox = new QGroupBox(QString::fromLatin1(""), \
getSettingsBox()); QGridLayout* leafLayout = new QGridLayout(m_LeafBox);
m_tagsBGrp = new QButtonGroup(m_LeafBox);
- if (m_pluginName == PluginName::GPhotoExport)
+ if (m_service == GoogleService::GPhotoExport)
{
QSpacerItem* const spacer = new QSpacerItem(1, 10, QSizePolicy::Expanding, \
QSizePolicy::Minimum);
QLabel* const tagsLbl = new QLabel(i18n("Tag path behavior :"), \
m_LeafBox); @@ -80,15 +80,15 @@ GSWidget::GSWidget(QWidget* const parent,
addWidgetToSettingsBox(m_LeafBox);
}
- switch(m_pluginName)
+ switch(m_service)
{
- case PluginName::GPhotoImport:
+ case GoogleService::GPhotoImport:
getNewAlbmBtn()->hide();
getOptionsBox()->hide();
imagesList()->hide();
m_LeafBox->hide();
break;
- case PluginName::GDrive:
+ case GoogleService::GDrive:
getUploadBox()->hide();
getSizeBox()->hide();
m_LeafBox->hide();
@@ -108,9 +108,9 @@ GSWidget::~GSWidget()
void GSWidget::updateLabels(const QString& name, const QString& url)
{
- switch(m_pluginName)
+ switch(m_service)
{
- case PluginName::GDrive:
+ case GoogleService::GDrive:
{
QString web(QString::fromLatin1("https://drive.google.com"));
getHeaderLbl()->setText(QString::fromLatin1(
diff --git a/utilities/assistants/webservices/google/gswidget.h \
b/utilities/assistants/webservices/google/gswidget.h index 11ddef89c9..e4cfbea1c6 \
100644
--- a/utilities/assistants/webservices/google/gswidget.h
+++ b/utilities/assistants/webservices/google/gswidget.h
@@ -40,7 +40,7 @@ class QButtonGroup;
class QComboBox;
class QPushButton;
-enum class PluginName;
+enum class GoogleService;
namespace Digikam
{
@@ -60,7 +60,7 @@ public:
explicit GSWidget(QWidget* const parent,
DInfoInterface* const iface,
- const PluginName& pluginName,
+ const GoogleService& service,
const QString& serviceName);
~GSWidget();
@@ -69,7 +69,7 @@ public:
private:
- PluginName m_pluginName;
+ GoogleService m_service;
QButtonGroup* m_tagsBGrp;
friend class GSWindow;
diff --git a/utilities/assistants/webservices/google/gswindow.cpp \
b/utilities/assistants/webservices/google/gswindow.cpp index b21fb9b588..b374d532af \
100644
--- a/utilities/assistants/webservices/google/gswindow.cpp
+++ b/utilities/assistants/webservices/google/gswindow.cpp
@@ -78,32 +78,32 @@ GSWindow::GSWindow(DInfoInterface* const iface,
if (QString::compare(m_serviceName, QString::fromLatin1("googledriveexport"), \
Qt::CaseInsensitive) == 0) {
- m_name = PluginName::GDrive;
- m_pluginName = QString::fromLatin1("Google Drive");
+ m_service = GoogleService::GDrive;
+ m_toolName = QString::fromLatin1("Google Drive");
}
else if (QString::compare(m_serviceName, \
QString::fromLatin1("googlephotoexport"), Qt::CaseInsensitive) == 0) {
- m_name = PluginName::GPhotoExport;
- m_pluginName = QString::fromLatin1("Google Photos/PicasaWeb");
+ m_service = GoogleService::GPhotoExport;
+ m_toolName = QString::fromLatin1("Google Photos/PicasaWeb");
}
else
{
- m_name = PluginName::GPhotoImport;
- m_pluginName = QString::fromLatin1("Google Photos/PicasaWeb");
+ m_service = GoogleService::GPhotoImport;
+ m_toolName = QString::fromLatin1("Google Photos/PicasaWeb");
}
m_tmp = ExportUtils::makeTemporaryDir("google").absolutePath() + \
QLatin1Char('/');; m_imagesCount = 0;
m_imagesTotal = 0;
m_renamingOpt = 0;
- m_widget = new GSWidget(this, m_iface, m_name, m_pluginName);
+ m_widget = new GSWidget(this, m_iface, m_service, m_toolName);
setMainWidget(m_widget);
setModal(false);
- switch (m_name)
+ switch (m_service)
{
- case PluginName::GDrive:
+ case GoogleService::GDrive:
setWindowIcon(QIcon::fromTheme(QString::fromLatin1("googledrive")));
setWindowTitle(i18n("Export to Google Drive"));
@@ -113,7 +113,7 @@ GSWindow::GSWindow(DInfoInterface* const iface,
m_widget->setMinimumSize(700,500);
- m_albumDlg = new GSNewAlbumDlg(this, m_serviceName, m_pluginName);
+ m_albumDlg = new GSNewAlbumDlg(this, m_serviceName, m_toolName);
m_talker = new GDTalker(this);
connect(m_talker,SIGNAL(signalBusy(bool)),
@@ -157,12 +157,12 @@ GSWindow::GSWindow(DInfoInterface* const iface,
break;
- case PluginName::GPhotoImport:
- case PluginName::GPhotoExport:
+ case GoogleService::GPhotoImport:
+ case GoogleService::GPhotoExport:
setWindowIcon(QIcon::fromTheme(QString::fromLatin1("googlephoto")));
- if (m_name == PluginName::GPhotoExport)
+ if (m_service == GoogleService::GPhotoExport)
{
setWindowTitle(i18n("Export to Google Photos/PicasaWeb Service"));
@@ -181,7 +181,7 @@ GSWindow::GSWindow(DInfoInterface* const iface,
m_widget->setMinimumSize(300, 400);
}
- m_gphoto_albumdlg = new GSNewAlbumDlg(this, m_serviceName, \
m_pluginName); + m_gphoto_albumdlg = new GSNewAlbumDlg(this, \
m_serviceName, m_toolName); m_gphoto_talker = new GPTalker(this);
connect(m_gphoto_talker, SIGNAL(signalBusy(bool)),
@@ -267,9 +267,9 @@ void GSWindow::readSettings()
KConfig config;
KConfigGroup grp;
- switch (m_name)
+ switch (m_service)
{
- case PluginName::GDrive:
+ case GoogleService::GDrive:
grp = config.group("Google Drive Settings");
break;
default:
@@ -296,20 +296,20 @@ void GSWindow::readSettings()
m_widget->getDimensionSpB()->setValue(grp.readEntry("Maximum Width", 1600));
m_widget->getImgQualitySpB()->setValue(grp.readEntry("Image Quality", 90));
- if (m_name == PluginName::GPhotoExport)
+ if (m_service == GoogleService::GPhotoExport)
m_widget->m_tagsBGrp->button(grp.readEntry("Tag Paths", \
0))->setChecked(true);
KConfigGroup dialogGroup;
- switch (m_name)
+ switch (m_service)
{
- case PluginName::GDrive:
+ case GoogleService::GDrive:
dialogGroup = config.group("Google Drive Export Dialog");
break;
- case PluginName::GPhotoExport:
+ case GoogleService::GPhotoExport:
dialogGroup = config.group("Google Photo Export Dialog");
break;
- case PluginName::GPhotoImport:
+ case GoogleService::GPhotoImport:
dialogGroup = config.group("Google Photo Import Dialog");
break;
}
@@ -324,9 +324,9 @@ void GSWindow::writeSettings()
KConfig config;
KConfigGroup grp;
- switch(m_name)
+ switch(m_service)
{
- case PluginName::GDrive:
+ case GoogleService::GDrive:
grp = config.group("Google Drive Settings");
break;
default:
@@ -340,20 +340,20 @@ void GSWindow::writeSettings()
grp.writeEntry("Maximum Width", m_widget->getDimensionSpB()->value());
grp.writeEntry("Image Quality", m_widget->getImgQualitySpB()->value());
- if (m_name == PluginName::GPhotoExport)
+ if (m_service == GoogleService::GPhotoExport)
grp.writeEntry("Tag Paths", m_widget->m_tagsBGrp->checkedId());
KConfigGroup dialogGroup;
- switch (m_name)
+ switch (m_service)
{
- case PluginName::GDrive:
+ case GoogleService::GDrive:
dialogGroup = config.group("Google Drive Export Dialog");
break;
- case PluginName::GPhotoExport:
+ case GoogleService::GPhotoExport:
dialogGroup = config.group("Google Photo Export Dialog");
break;
- case PluginName::GPhotoImport:
+ case GoogleService::GPhotoImport:
dialogGroup = config.group("Google Photo Import Dialog");
break;
}
@@ -493,9 +493,9 @@ void GSWindow::slotListPhotosDoneForUpload(int errCode,
void GSWindow::slotListAlbumsDone(int code,const QString& errMsg ,const QList \
<GSFolder>& list) {
- switch (m_name)
+ switch (m_service)
{
- case PluginName::GDrive:
+ case GoogleService::GDrive:
if (code == 0)
{
@@ -577,9 +577,9 @@ void GSWindow::googlePhotoTransferHandler()
{
qCDebug(DIGIKAM_GENERAL_LOG) << "Google Photo Transfer invoked";
- switch (m_name)
+ switch (m_service)
{
- case PluginName::GPhotoImport:
+ case GoogleService::GPhotoImport:
// list photos of the album, then start download
connect(m_gphoto_talker, SIGNAL(signalListPhotosDone(int, QString, \
QList<GSPhoto>)),
this, SLOT(slotListPhotosDoneForDownload(int, QString, \
QList<GSPhoto>))); @@ -613,10 +613,10 @@ void GSWindow::slotStartTransfer()
{
m_widget->imagesList()->clearProcessedStatus();
- switch (m_name)
+ switch (m_service)
{
- case PluginName::GDrive:
- case PluginName::GPhotoExport:
+ case GoogleService::GDrive:
+ case GoogleService::GPhotoExport:
if (m_widget->imagesList()->imageUrls().isEmpty())
{
QMessageBox::critical(this, i18nc("@title:window", "Error"),
@@ -624,13 +624,13 @@ void GSWindow::slotStartTransfer()
return;
}
break;
- case PluginName::GPhotoImport:
+ case GoogleService::GPhotoImport:
break;
}
- switch (m_name)
+ switch (m_service)
{
- case PluginName::GDrive:
+ case GoogleService::GDrive:
if (!(m_talker->authenticated()))
{
QMessageBox warn(QMessageBox::Warning,
@@ -687,9 +687,9 @@ void GSWindow::slotStartTransfer()
GSPhoto temp;
qCDebug(DIGIKAM_GENERAL_LOG) << "in start transfer info " <<info.title() << \
info.comment();
- switch (m_name)
+ switch (m_service)
{
- case PluginName::GDrive:
+ case GoogleService::GDrive:
temp.title = info.title();
break;
default:
@@ -736,9 +736,9 @@ void GSWindow::uploadNextPhoto()
bool res = true;
m_widget->imagesList()->processing(pathComments.first);
- switch (m_name)
+ switch (m_service)
{
- case PluginName::GDrive:
+ case GoogleService::GDrive:
{
res = m_talker->addPhoto(pathComments.first.toLocalFile(),
info,
@@ -749,7 +749,7 @@ void GSWindow::uploadNextPhoto()
break;
}
- case PluginName::GPhotoExport:
+ case GoogleService::GPhotoExport:
{
bool bCancel = false;
bool bAdd = true;
@@ -883,7 +883,7 @@ void GSWindow::uploadNextPhoto()
break;
}
- case PluginName::GPhotoImport:
+ case GoogleService::GPhotoImport:
break;
}
@@ -1044,7 +1044,7 @@ void GSWindow::slotAddPhotoDone(int err, const QString& msg, \
const QString& phot
QMessageBox warn(QMessageBox::Warning,
i18n("Warning"),
- i18n("Failed to upload photo to %1.\n%2\nDo you want to \
continue?", m_pluginName,msg), + i18n("Failed to upload photo \
to %1.\n%2\nDo you want to continue?", m_toolName,msg), QMessageBox::Yes | \
QMessageBox::No);
(warn.button(QMessageBox::Yes))->setText(i18n("Continue"));
@@ -1096,9 +1096,9 @@ void GSWindow::slotImageListChanged()
void GSWindow::slotNewAlbumRequest()
{
- switch (m_name)
+ switch (m_service)
{
- case PluginName::GDrive:
+ case GoogleService::GDrive:
if (m_albumDlg->exec() == QDialog::Accepted)
{
GSFolder newFolder;
@@ -1121,13 +1121,13 @@ void GSWindow::slotNewAlbumRequest()
void GSWindow::slotReloadAlbumsRequest()
{
- switch (m_name)
+ switch (m_service)
{
- case PluginName::GDrive:
+ case GoogleService::GDrive:
m_talker->listFolders();
break;
- case PluginName::GPhotoImport:
- case PluginName::GPhotoExport:
+ case GoogleService::GPhotoImport:
+ case GoogleService::GPhotoExport:
m_gphoto_talker->listAlbums();
break;
}
@@ -1144,13 +1144,13 @@ void GSWindow::slotAccessTokenFailed(int errCode,const \
QString& errMsg)
void GSWindow::slotAccessTokenObtained()
{
- switch (m_name)
+ switch (m_service)
{
- case PluginName::GDrive:
+ case GoogleService::GDrive:
m_talker->listFolders();
break;
- case PluginName::GPhotoImport:
- case PluginName::GPhotoExport:
+ case GoogleService::GPhotoImport:
+ case GoogleService::GPhotoExport:
m_gphoto_talker->listAlbums();
break;
}
@@ -1158,14 +1158,14 @@ void GSWindow::slotAccessTokenObtained()
void GSWindow::slotRefreshTokenObtained(const QString& msg)
{
- switch (m_name)
+ switch (m_service)
{
- case PluginName::GDrive:
+ case GoogleService::GDrive:
m_refresh_token = msg;
m_talker->listFolders();
break;
- case PluginName::GPhotoImport:
- case PluginName::GPhotoExport:
+ case GoogleService::GPhotoImport:
+ case GoogleService::GPhotoExport:
m_refresh_token = msg;
m_gphoto_talker->listAlbums();
break;
@@ -1174,17 +1174,17 @@ void GSWindow::slotRefreshTokenObtained(const QString& msg)
void GSWindow::slotCreateFolderDone(int code, const QString& msg, const QString& \
albumId) {
- switch (m_name)
+ switch (m_service)
{
- case PluginName::GDrive:
+ case GoogleService::GDrive:
if (code == 0)
QMessageBox::critical(this, i18nc("@title:window", "Error"),
i18n("Google Drive call failed:\n%1", msg));
else
m_talker->listFolders();
break;
- case PluginName::GPhotoImport:
- case PluginName::GPhotoExport:
+ case GoogleService::GPhotoImport:
+ case GoogleService::GPhotoExport:
if (code == 0)
QMessageBox::critical(this, i18nc("@title:window", "Error"),
i18n("Google Photos/PicasaWeb call \
failed:\n%1", msg)); @@ -1202,13 +1202,13 @@ void GSWindow::slotTransferCancel()
m_transferQueue.clear();
m_widget->progressBar()->hide();
- switch (m_name)
+ switch (m_service)
{
- case PluginName::GDrive:
+ case GoogleService::GDrive:
m_talker->cancel();
break;
- case PluginName::GPhotoImport:
- case PluginName::GPhotoExport:
+ case GoogleService::GPhotoImport:
+ case GoogleService::GPhotoExport:
m_gphoto_talker->cancel();
break;
}
@@ -1232,13 +1232,13 @@ void GSWindow::slotUserChangeRequest()
{
m_refresh_token = QString::fromLatin1("");
- switch (m_name)
+ switch (m_service)
{
- case PluginName::GDrive:
+ case GoogleService::GDrive:
m_talker->doOAuth();
break;
- case PluginName::GPhotoImport:
- case PluginName::GPhotoExport:
+ case GoogleService::GPhotoImport:
+ case GoogleService::GPhotoExport:
m_gphoto_talker->doOAuth();
break;
}
diff --git a/utilities/assistants/webservices/google/gswindow.h \
b/utilities/assistants/webservices/google/gswindow.h index 323f88a596..ffdabd78af \
100644
--- a/utilities/assistants/webservices/google/gswindow.h
+++ b/utilities/assistants/webservices/google/gswindow.h
@@ -108,8 +108,8 @@ private:
int m_renamingOpt;
QString m_serviceName;
- QString m_pluginName;
- PluginName m_name;
+ QString m_toolName;
+ GoogleService m_service;
QString m_tmp;
QString m_refresh_token;
diff --git a/utilities/assistants/webservices/imageshack/imageshacknewalbumdlg.cpp \
b/utilities/assistants/webservices/imageshack/imageshacknewalbumdlg.cpp index \
80ef9227a4..450e4c8a37 100644
--- a/utilities/assistants/webservices/imageshack/imageshacknewalbumdlg.cpp
+++ b/utilities/assistants/webservices/imageshack/imageshacknewalbumdlg.cpp
@@ -37,8 +37,8 @@
namespace Digikam
{
-ImageShackNewAlbumDlg::ImageShackNewAlbumDlg(QWidget* const parent, const QString& \
pluginName)
- : NewAlbumDialog(parent, pluginName)
+ImageShackNewAlbumDlg::ImageShackNewAlbumDlg(QWidget* const parent, const QString& \
toolName) + : NewAlbumDialog(parent, toolName)
{
hideDateTime();
hideDesc();
diff --git a/utilities/assistants/webservices/imageshack/imageshacknewalbumdlg.h \
b/utilities/assistants/webservices/imageshack/imageshacknewalbumdlg.h index \
7866b46c7d..ae27c31901 100644
--- a/utilities/assistants/webservices/imageshack/imageshacknewalbumdlg.h
+++ b/utilities/assistants/webservices/imageshack/imageshacknewalbumdlg.h
@@ -46,7 +46,7 @@ class ImageShackNewAlbumDlg : public NewAlbumDialog
public:
- explicit ImageShackNewAlbumDlg(QWidget* const parent, const QString& \
pluginName); + explicit ImageShackNewAlbumDlg(QWidget* const parent, const \
QString& toolName); ~ImageShackNewAlbumDlg();
QString getAlbumTitle();
diff --git a/utilities/assistants/webservices/imageshack/imageshackwidget.cpp \
b/utilities/assistants/webservices/imageshack/imageshackwidget.cpp index \
a2d7779037..d6f4b13a74 100644
--- a/utilities/assistants/webservices/imageshack/imageshackwidget.cpp
+++ b/utilities/assistants/webservices/imageshack/imageshackwidget.cpp
@@ -56,8 +56,8 @@ namespace Digikam
ImageShackWidget::ImageShackWidget(QWidget* const parent,
ImageShackSession* const session,
DInfoInterface* const iface,
- const QString& pluginName)
- : SettingsWidget(parent, iface, pluginName),
+ const QString& toolName)
+ : SettingsWidget(parent, iface, toolName),
m_session(session)
{
m_iface = iface;
diff --git a/utilities/assistants/webservices/imageshack/imageshackwidget.h \
b/utilities/assistants/webservices/imageshack/imageshackwidget.h index \
fe9a1040c6..a278681385 100644
--- a/utilities/assistants/webservices/imageshack/imageshackwidget.h
+++ b/utilities/assistants/webservices/imageshack/imageshackwidget.h
@@ -56,7 +56,7 @@ public:
explicit ImageShackWidget(QWidget* const parent,
ImageShackSession* const session,
DInfoInterface* const iface,
- const QString& pluginName);
+ const QString& toolName);
~ImageShackWidget();
Q_SIGNALS:
diff --git a/utilities/assistants/webservices/yandexfotki/yfwidget.cpp \
b/utilities/assistants/webservices/yandexfotki/yfwidget.cpp index \
6cfcced2cc..724bd7a239 100644
--- a/utilities/assistants/webservices/yandexfotki/yfwidget.cpp
+++ b/utilities/assistants/webservices/yandexfotki/yfwidget.cpp
@@ -50,8 +50,8 @@
namespace Digikam
{
-YFWidget::YFWidget(QWidget* const parent, DInfoInterface* const iface, const \
QString& pluginName)
- : SettingsWidget(parent, iface, pluginName)
+YFWidget::YFWidget(QWidget* const parent, DInfoInterface* const iface, const \
QString& toolName) + : SettingsWidget(parent, iface, toolName)
{
QGroupBox* const optionsBox = getOptionsBox();
QGridLayout* const optionsBoxLayout = getOptionsBoxLayout();
diff --git a/utilities/assistants/webservices/yandexfotki/yfwidget.h \
b/utilities/assistants/webservices/yandexfotki/yfwidget.h index \
39be9d85ae..637c109cc8 100644
--- a/utilities/assistants/webservices/yandexfotki/yfwidget.h
+++ b/utilities/assistants/webservices/yandexfotki/yfwidget.h
@@ -47,7 +47,7 @@ public:
public:
- explicit YFWidget(QWidget* const parent, DInfoInterface* const iface, const \
QString& pluginName); + explicit YFWidget(QWidget* const parent, DInfoInterface* \
const iface, const QString& toolName); ~YFWidget();
void updateLabels(const QString& name = QString(), const QString& url = \
QString()) Q_DECL_OVERRIDE;
diff --git a/utilities/imageeditor/core/editorcore.cpp \
b/utilities/imageeditor/core/editorcore.cpp index 80b4fa8e3f..d047130a3a 100644
--- a/utilities/imageeditor/core/editorcore.cpp
+++ b/utilities/imageeditor/core/editorcore.cpp
@@ -523,7 +523,7 @@ void EditorCore::setModified()
void EditorCore::readMetadataFromFile(const QString& file)
{
DMetadata meta(file);
- // This can overwrite metadata changes introduced by imageplugins.
+ // This can overwrite metadata changes introduced by tools.
// Currently, this is ProfileConversion and lensfun.
// ProfileConversion's changes is redone when saving by DImgLoader.
// Lensfun is not critical.
diff --git a/utilities/imageeditor/editor/imageiface.cpp \
b/utilities/imageeditor/editor/imageiface.cpp index 96ce73179d..5e7f4e96b1 100644
--- a/utilities/imageeditor/editor/imageiface.cpp
+++ b/utilities/imageeditor/editor/imageiface.cpp
@@ -4,7 +4,7 @@
* http://www.digikam.org
*
* Date : 2004-02-14
- * Description : image data interface for image plugins
+ * Description : image data interface for image tools
*
* Copyright (C) 2004-2005 by Renchi Raju <renchi dot raju at gmail dot com>
* Copyright (C) 2004-2018 by Gilles Caulier <caulier dot gilles at gmail dot com>
diff --git a/utilities/imageeditor/editor/imageiface.h \
b/utilities/imageeditor/editor/imageiface.h index b4ed04c3e8..e50611fe36 100644
--- a/utilities/imageeditor/editor/imageiface.h
+++ b/utilities/imageeditor/editor/imageiface.h
@@ -4,7 +4,7 @@
* http://www.digikam.org
*
* Date : 2004-02-14
- * Description : image data interface for image plugins
+ * Description : image data interface for image tools
*
* Copyright (C) 2004-2005 by Renchi Raju <renchi dot raju at gmail dot com>
* Copyright (C) 2004-2018 by Gilles Caulier <caulier dot gilles at gmail dot com>
diff --git a/utilities/imageeditor/widgets/imageguidewidget.cpp \
b/utilities/imageeditor/widgets/imageguidewidget.cpp index ace47a2647..23d8e27ba0 \
100644
--- a/utilities/imageeditor/widgets/imageguidewidget.cpp
+++ b/utilities/imageeditor/widgets/imageguidewidget.cpp
@@ -409,7 +409,7 @@ void ImageGuideWidget::updatePixmap()
}
}
- // draw additional points added by the image plugin
+ // draw additional points added by the image tool
if (d->selectedPoints.count() > 0)
{
QPainter::RenderHints hints = p.renderHints();
diff --git a/utilities/imageeditor/widgets/imageregionwidget.cpp \
b/utilities/imageeditor/widgets/imageregionwidget.cpp index dc4fba6e4c..f828be58f6 \
100644
--- a/utilities/imageeditor/widgets/imageregionwidget.cpp
+++ b/utilities/imageeditor/widgets/imageregionwidget.cpp
@@ -166,10 +166,10 @@ void ImageRegionWidget::setPreviewImage(const DImg& img)
QRect r = d_ptr->item->getImageRegion();
image.resize(r.width(), r.height());
- // Because image plugins are tool which only work on image data, the DImg \
container + // Because tool which only work on image data, the DImg container
// do not contain metadata from original image. About Color Managed View, we \
need to // restore the embedded ICC color profile.
- // However, some plugins may set a profile on the preview image, which we accept \
of course. + // However, some tools may set a profile on the preview image, which \
we accept of course. if (image.getIccProfile().isNull())
{
image.setIccProfile(d_ptr->item->image().getIccProfile());
diff --git a/utilities/presentation/dialogs/presentationdlg.h \
b/utilities/presentation/dialogs/presentationdlg.h index 295194756b..cf26c9352f \
100644
--- a/utilities/presentation/dialogs/presentationdlg.h
+++ b/utilities/presentation/dialogs/presentationdlg.h
@@ -40,12 +40,11 @@ class PresentationDlg : public QDialog
public:
- PresentationDlg(QWidget* const parent, PresentationContainer* const sharedData);
+ explicit PresentationDlg(QWidget* const parent, PresentationContainer* const \
sharedData); ~PresentationDlg();
Q_SIGNALS:
- // Signal needed by plugin_slideshow class
void buttonStartClicked();
private:
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic