[prev in list] [next in list] [prev in thread] [next in thread]
List: kde-commits
Subject: [digikam/frameworks] utilities/importui/views: port++
From: Gilles Caulier <caulier.gilles () gmail ! com>
Date: 2015-03-04 7:32:10
Message-ID: E1YT3ms-0001Vj-5b () scm ! kde ! org
[Download RAW message or body]
Git commit b6a76fc6c6e9fa082ad17cddc1f0d8959e0e03ff by Gilles Caulier.
Committed on 04/03/2015 at 07:29.
Pushed by cgilles into branch 'frameworks'.
port++
M +14 -14 utilities/importui/views/cameranamehelper.cpp
M +33 -26 utilities/importui/views/importiconview.cpp
M +25 -20 utilities/importui/views/importpreviewview.cpp
M +23 -22 utilities/importui/views/importstackedview.cpp
http://commits.kde.org/digikam/b6a76fc6c6e9fa082ad17cddc1f0d8959e0e03ff
diff --git a/utilities/importui/views/cameranamehelper.cpp \
b/utilities/importui/views/cameranamehelper.cpp index f9bc5c1..e8cf4fd 100644
--- a/utilities/importui/views/cameranamehelper.cpp
+++ b/utilities/importui/views/cameranamehelper.cpp
@@ -34,11 +34,11 @@
namespace
{
-static const QString STR_AUTO_DETECTED("auto-detected");
+static const QString STR_AUTO_DETECTED(QLatin1String("auto-detected"));
-static QRegExp REGEXP_CAMERA_NAME("^(.*)\\s*\\((.*)\\)\\s*$", Qt::CaseInsensitive);
-static QRegExp REGEXP_MODES("^(ptp|normal|mtp)(\\s+mode)?$", Qt::CaseInsensitive);
-static QRegExp REGEXP_AUTODETECTED(QString("(%1|, %1)").arg(STR_AUTO_DETECTED));
+static QRegExp REGEXP_CAMERA_NAME(QLatin1String("^(.*)\\s*\\((.*)\\)\\s*$"), \
Qt::CaseInsensitive); +static QRegExp \
REGEXP_MODES(QLatin1String("^(ptp|normal|mtp)(\\s+mode)?$"), Qt::CaseInsensitive); \
+static QRegExp REGEXP_AUTODETECTED(QString::fromUtf8("(%1|, \
%1)").arg(STR_AUTO_DETECTED)); }
namespace Digikam
@@ -55,21 +55,21 @@ QString CameraNameHelper::createCameraName(const QString& vendor, \
const QString& QString tmp;
QString _vendor = vendor.simplified();
QString _product = product.simplified();
- QString _mode = mode.simplified().remove(QChar('(')).remove(QChar(')'));
+ QString _mode = \
mode.simplified().remove(QLatin1Char('(')).remove(QLatin1Char(')'));
- tmp = QString("%1 %2").arg(_vendor).arg(_product);
+ tmp = QString::fromUtf8("%1 %2").arg(_vendor).arg(_product);
if (!mode.isEmpty() && mode != STR_AUTO_DETECTED)
{
- tmp.append(" (");
+ tmp.append(QLatin1String(" ("));
tmp.append(_mode);
tmp.append(autoDetected
- ? QString(", %1)").arg(STR_AUTO_DETECTED)
- : QString(')'));
+ ? QString::fromUtf8(", %1)").arg(STR_AUTO_DETECTED)
+ : QLatin1String(")"));
}
else if (autoDetected)
{
- tmp.append(QString(" (%1)").arg(STR_AUTO_DETECTED));
+ tmp.append(QString::fromUtf8(" (%1)").arg(STR_AUTO_DETECTED));
}
return tmp.simplified();
@@ -127,7 +127,7 @@ QString CameraNameHelper::extractCameraNameToken(const QString& \
cameraName, Toke {
mode = REGEXP_MODES.exactMatch(clearedTmpMode)
? clearedTmpMode
- : "";
+ : QLatin1String("");
}
if (tokenID == VendorAndProduct)
@@ -143,7 +143,7 @@ QString CameraNameHelper::extractCameraNameToken(const QString& \
cameraName, Toke }
return (tokenID == VendorAndProduct)
? cameraName.simplified()
- : "";
+ : QLatin1String("");
}
bool CameraNameHelper::sameDevices(const QString& deviceA, const QString& deviceB)
@@ -174,9 +174,9 @@ bool CameraNameHelper::sameDevices(const QString& deviceA, const \
QString& device QString modeA = extractCameraNameToken(deviceA, Mode);
QString modeB = extractCameraNameToken(deviceB, Mode);
bool isModeAValid = REGEXP_MODES.exactMatch(modeA);
- modeA = isModeAValid ? REGEXP_MODES.cap(1).simplified().toLower() \
: ""; + modeA = isModeAValid ? \
REGEXP_MODES.cap(1).simplified().toLower() : QLatin1String(""); bool isModeBValid \
= REGEXP_MODES.exactMatch(modeB);
- modeB = isModeBValid ? REGEXP_MODES.cap(1).simplified().toLower() \
: ""; + modeB = isModeBValid ? \
REGEXP_MODES.cap(1).simplified().toLower() : QLatin1String("");
if ((isModeAValid != isModeBValid) || (modeA != modeB))
{
diff --git a/utilities/importui/views/importiconview.cpp \
b/utilities/importui/views/importiconview.cpp index fdc0605..6489547 100644
--- a/utilities/importui/views/importiconview.cpp
+++ b/utilities/importui/views/importiconview.cpp
@@ -53,7 +53,8 @@ namespace Digikam
{
ImportIconView::ImportIconView(QWidget* const parent)
- : ImportCategorizedView(parent), d(new Private(this))
+ : ImportCategorizedView(parent),
+ d(new Private(this))
{
}
@@ -139,7 +140,7 @@ int ImportIconView::fitToWidthIcons()
CamItemInfo ImportIconView::camItemInfo(const QString& folder, const QString& file)
{
- QUrl url = QUrl::fromLocalFile(folder + "/");
+ QUrl url = QUrl::fromLocalFile(folder + QLatin1String("/"));
url = url.adjusted(QUrl::RemoveFilename);
url.setPath(url.path() + file);
QModelIndex indexForCamItemInfo = \
importFilterModel()->indexForPath(url.toLocalFile()); @@ -154,7 +155,7 @@ CamItemInfo \
ImportIconView::camItemInfo(const QString& folder, const QString& fi
CamItemInfo& ImportIconView::camItemInfoRef(const QString& folder, const QString& \
file) {
- QUrl url = QUrl::fromLocalFile(folder + "/");
+ QUrl url = QUrl::fromLocalFile(folder + QLatin1String("/"));
url = url.adjusted(QUrl::RemoveFilename);
url.setPath(url.path() + file);
QModelIndex indexForCamItemInfo = \
importFilterModel()->indexForPath(url.toLocalFile()); @@ -200,10 +201,12 @@ void \
ImportIconView::deleteSelected(bool /*permanently*/) CamItemInfoList camItemInfoList \
= selectedCamItemInfos();
//FIXME: This way of deletion may not working with camera items.
- //if (d->utilities->deleteImages(camItemInfoList, permanently))
- //{
- // awayFromSelection();
- //}
+/*
+ if (d->utilities->deleteImages(camItemInfoList, permanently))
+ {
+ awayFromSelection();
+ }
+*/
}
void ImportIconView::deleteSelectedDirectly(bool /*permanently*/)
@@ -217,29 +220,33 @@ void ImportIconView::deleteSelectedDirectly(bool \
/*permanently*/) void ImportIconView::createGroupFromSelection()
{
//TODO: Impelemnt grouping in import tool.
- //QList<CamItemInfo> selectedInfos = selectedCamItemInfosCurrentFirst();
- //CamItemInfo groupLeader = selectedInfos.takeFirst();
- //FileActionMngr::instance()->addToGroup(groupLeader, selectedInfos);
+/*
+ QList<CamItemInfo> selectedInfos = selectedCamItemInfosCurrentFirst();
+ CamItemInfo groupLeader = selectedInfos.takeFirst();
+ FileActionMngr::instance()->addToGroup(groupLeader, selectedInfos);
+*/
}
void ImportIconView::createGroupByTimeFromSelection()
{
//TODO: Impelemnt grouping in import tool.
- //QList<CamItemInfo> selectedInfos = selectedCamItemInfosCurrentFirst();
+/*
+ QList<CamItemInfo> selectedInfos = selectedCamItemInfosCurrentFirst();
- //while (selectedInfos.size() > 0)
- //{
- //QList<CamItemInfo> group;
- //CamItemInfo groupLeader = selectedInfos.takeFirst();
- //QDateTime dateTime = groupLeader.dateTime();
+ while (selectedInfos.size() > 0)
+ {
+ QList<CamItemInfo> group;
+ CamItemInfo groupLeader = selectedInfos.takeFirst();
+ QDateTime dateTime = groupLeader.dateTime();
- //while (selectedInfos.size() > 0 && \
abs(dateTime.secsTo(selectedInfos.first().dateTime())) < 2)
- //{
- // group.push_back(selectedInfos.takeFirst());
- //}
+ while (selectedInfos.size() > 0 && \
abs(dateTime.secsTo(selectedInfos.first().dateTime())) < 2) + {
+ group.push_back(selectedInfos.takeFirst());
+ }
- //FileActionMngr::instance()->addToGroup(groupLeader, group);
- //}
+ FileActionMngr::instance()->addToGroup(groupLeader, group);
+ }
+*/
}
void ImportIconView::ungroupSelected()
@@ -256,7 +263,7 @@ void ImportIconView::removeSelectedFromGroup()
void ImportIconView::slotRotateLeft(const QList<QModelIndex>& /*indexes*/)
{
- /*
+/*
QList<ImageInfo> imageInfos;
foreach(const QModelIndex& index, indexes)
@@ -266,12 +273,12 @@ void ImportIconView::slotRotateLeft(const QList<QModelIndex>& \
/*indexes*/) }
FileActionMngr::instance()->transform(imageInfos, \
KExiv2Iface::RotationMatrix::Rotate270);
- */
+*/
}
void ImportIconView::slotRotateRight(const QList<QModelIndex>& /*indexes*/)
{
- /*
+/*
QList<ImageInfo> imageInfos;
foreach(const QModelIndex& index, indexes)
@@ -281,7 +288,7 @@ void ImportIconView::slotRotateRight(const QList<QModelIndex>& \
/*indexes*/) }
FileActionMngr::instance()->transform(imageInfos, \
KExiv2Iface::RotationMatrix::Rotate90);
- */
+*/
}
void ImportIconView::activated(const CamItemInfo& info, Qt::KeyboardModifiers)
diff --git a/utilities/importui/views/importpreviewview.cpp \
b/utilities/importui/views/importpreviewview.cpp index e6e5ea6..db8bd38 100644
--- a/utilities/importui/views/importpreviewview.cpp
+++ b/utilities/importui/views/importpreviewview.cpp
@@ -59,10 +59,12 @@ public:
setAcceptHoverEvents(true);
}
- //void setFaceGroup(FaceGroup* group)
- //{
- // m_group = group;
- //}
+/*
+ void setFaceGroup(FaceGroup* group)
+ {
+ m_group = group;
+ }
+*/
void contextMenuEvent(QGraphicsSceneContextMenuEvent* event)
{
@@ -292,12 +294,12 @@ void ImportPreviewView::setCamItemInfo(const CamItemInfo& info, \
const CamItemInf
QStringList previewPaths;
- if (identifyCategoryforMime(next.mime) == "image")
+ if (identifyCategoryforMime(next.mime) == QLatin1String("image"))
{
previewPaths << next.url().toLocalFile();
}
- if (identifyCategoryforMime(previous.mime) == "image")
+ if (identifyCategoryforMime(previous.mime) == QLatin1String("image"))
{
previewPaths << previous.url().toLocalFile();
}
@@ -307,7 +309,7 @@ void ImportPreviewView::setCamItemInfo(const CamItemInfo& info, \
const CamItemInf
QString ImportPreviewView::identifyCategoryforMime(QString mime)
{
- return mime.split('/').at(0);
+ return mime.split(QLatin1Char('/')).at(0);
}
CamItemInfo ImportPreviewView::getCamItemInfo() const
@@ -441,15 +443,17 @@ void ImportPreviewView::showContextMenu(const CamItemInfo& \
info, QGraphicsSceneC cmhelper.exec(event->screenPos());
}
-//void ImportPreviewView::slotAssignTag(int tagID)
-//{
-// FileActionMngr::instance()->assignTag(d->item->camItemInfo(), tagID);
-//}
+/*
+void ImportPreviewView::slotAssignTag(int tagID)
+{
+ FileActionMngr::instance()->assignTag(d->item->camItemInfo(), tagID);
+}
-//void ImportPreviewView::slotRemoveTag(int tagID)
-//{
-// FileActionMngr::instance()->removeTag(d->item->camItemInfo(), tagID);
-//}
+void ImportPreviewView::slotRemoveTag(int tagID)
+{
+ FileActionMngr::instance()->removeTag(d->item->camItemInfo(), tagID);
+}
+*/
void ImportPreviewView::slotThemeChanged()
{
@@ -461,7 +465,8 @@ void ImportPreviewView::slotThemeChanged()
void ImportPreviewView::slotSetupChanged()
{
PreviewSettings settings;
- settings.quality = ImportSettings::instance()->getPreviewLoadFullImageSize() ? \
PreviewSettings::HighQualityPreview : PreviewSettings::FastPreview; + \
settings.quality = ImportSettings::instance()->getPreviewLoadFullImageSize() ? \
PreviewSettings::HighQualityPreview + \
: PreviewSettings::FastPreview; previewItem()->setPreviewSettings(settings);
d->toolBar->setVisible(ImportSettings::instance()->getPreviewShowIcons());
@@ -472,20 +477,20 @@ void ImportPreviewView::slotSetupChanged()
void ImportPreviewView::slotRotateLeft()
{
- /*
+/*
ImageInfo info(d->item->camItemInfo().url().toLocalFile());
FileActionMngr::instance()->transform(QList<ImageInfo>() << info, \
KExiv2Iface::RotationMatrix::Rotate270);
- */
+*/
}
void ImportPreviewView::slotRotateRight()
{
- /*
+/*
ImageInfo info(d->item->camItemInfo().url().toLocalFile());
FileActionMngr::instance()->transform(QList<ImageInfo>() << info, \
KExiv2Iface::RotationMatrix::Rotate90);
- */
+*/
}
void ImportPreviewView::slotDeleteItem()
diff --git a/utilities/importui/views/importstackedview.cpp \
b/utilities/importui/views/importstackedview.cpp index 65e60de..127428d 100644
--- a/utilities/importui/views/importstackedview.cpp
+++ b/utilities/importui/views/importstackedview.cpp
@@ -79,26 +79,9 @@ public:
#endif // HAVE_KGEOMAP
};
-void ImportStackedView::setModels(ImportImageModel* model, ImportFilterModel* \
filterModel)
-{
- d->importIconView->setModels(model, filterModel);
- d->thumbBar->setModelsFiltered(model, filterModel);
-
- // TODO this is currently here because the code structure, waiting for \
restructuring..
- d->importIconView->init();
-
-#ifdef HAVE_KGEOMAP
- // TODO refactor MapWidgetView not to require the models on startup?
- d->mapWidgetView = new MapWidgetView(d->importIconView->getSelectionModel(),
- d->importIconView->importFilterModel(), \
this,
- MapWidgetView::ApplicationImportUI);
- d->mapWidgetView->setObjectName("import_mapwidgetview");
- insertWidget(MapWidgetMode, d->mapWidgetView);
-#endif // HAVE_KGEOMAP
-}
-
ImportStackedView::ImportStackedView(QWidget* const parent)
- : QStackedWidget(parent), d(new Private)
+ : QStackedWidget(parent),
+ d(new Private)
{
d->importIconView = new ImportIconView(this);
d->importPreviewView = new ImportPreviewView(this);
@@ -107,7 +90,7 @@ ImportStackedView::ImportStackedView(QWidget* const parent)
d->thumbBar->installOverlays();
d->thumbBarDock->setWidget(d->thumbBar);
- d->thumbBarDock->setObjectName("import_thumbbar");
+ d->thumbBarDock->setObjectName(QLatin1String("import_thumbbar"));
#ifdef HAVE_VIDEOPLAYER
d->mediaPlayerView = new MediaPlayerView(this);
@@ -207,6 +190,24 @@ ImportStackedView::~ImportStackedView()
delete d;
}
+void ImportStackedView::setModels(ImportImageModel* model, ImportFilterModel* \
filterModel) +{
+ d->importIconView->setModels(model, filterModel);
+ d->thumbBar->setModelsFiltered(model, filterModel);
+
+ // TODO this is currently here because the code structure, waiting for \
restructuring.. + d->importIconView->init();
+
+#ifdef HAVE_KGEOMAP
+ // TODO refactor MapWidgetView not to require the models on startup?
+ d->mapWidgetView = new MapWidgetView(d->importIconView->getSelectionModel(),
+ d->importIconView->importFilterModel(), \
this, + \
MapWidgetView::ApplicationImportUI); + \
d->mapWidgetView->setObjectName(QLatin1String("import_mapwidgetview")); + \
insertWidget(MapWidgetMode, d->mapWidgetView); +#endif // HAVE_KGEOMAP
+}
+
void ImportStackedView::readSettings()
{
ImportSettings* const settings = ImportSettings::instance();
@@ -294,7 +295,7 @@ void ImportStackedView::setPreviewItem(const CamItemInfo& info, \
const CamItemInf }
else
{
- if (identifyCategoryforMime(info.mime) == "audio" || \
identifyCategoryforMime(info.mime) == "video") + if \
(identifyCategoryforMime(info.mime) == QLatin1String("audio") || \
identifyCategoryforMime(info.mime) == QLatin1String("video")) {
// Stop image viewer
if (viewMode() == PreviewImageMode)
@@ -331,7 +332,7 @@ void ImportStackedView::setPreviewItem(const CamItemInfo& info, \
const CamItemInf
QString ImportStackedView::identifyCategoryforMime(const QString& mime) const
{
- return mime.split('/').at(0);
+ return mime.split(QLatin1Char('/')).at(0);
}
ImportStackedView::StackedViewMode ImportStackedView::viewMode() const
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic