[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    [digikam/development/3.0.0] utilities/cameragui: Fixed header text of the import tool categories
From:       Islam Wazery <wazery () ubuntu ! com>
Date:       2012-08-01 3:23:05
Message-ID: 20120801032305.F19D0A6094 () git ! kde ! org
[Download RAW message or body]

Git commit 46225823f90461e755f994dc3f41432e8340b435 by Islam Wazery.
Committed on 01/08/2012 at 05:21.
Pushed by wazery into branch 'development/3.0.0'.

Fixed header text of the import tool categories

M  +0    -1    utilities/cameragui/controller/cameracontroller.cpp
M  +16   -1    utilities/cameragui/items/importcategorydrawer.cpp
M  +4    -0    utilities/cameragui/items/importcategorydrawer.h
M  +1    -1    utilities/cameragui/models/importfiltermodel.cpp
M  +0    -1    utilities/cameragui/models/importimagemodel.cpp
M  +1    -1    utilities/cameragui/models/importthumbnailmodel.cpp
M  +1    -1    utilities/cameragui/views/importcategorizedview.cpp
M  +1    -1    utilities/cameragui/views/importiconview.cpp
M  +2    -2    utilities/cameragui/views/importsettings.cpp

http://commits.kde.org/digikam/46225823f90461e755f994dc3f41432e8340b435

diff --git a/utilities/cameragui/controller/cameracontroller.cpp \
b/utilities/cameragui/controller/cameracontroller.cpp index 76cc7e0..3d0dd4b 100644
--- a/utilities/cameragui/controller/cameracontroller.cpp
+++ b/utilities/cameragui/controller/cameracontroller.cpp
@@ -513,7 +513,6 @@ void CameraController::executeCommand(CameraCommand* const cmd)
             {
                 numberOfItems++;
                 info.id += numberOfItems;
-                qDebug() << QString::number(info.id); //TODO: Remove this line.
             }
 
             if (!itemsList.isEmpty())
diff --git a/utilities/cameragui/items/importcategorydrawer.cpp \
b/utilities/cameragui/items/importcategorydrawer.cpp index 47e6f8d..8b819fd 100644
--- a/utilities/cameragui/items/importcategorydrawer.cpp
+++ b/utilities/cameragui/items/importcategorydrawer.cpp
@@ -32,6 +32,7 @@
 // KDE includes
 
 #include <KApplication>
+#include <KLocale>
 
 // Local includes
 
@@ -180,7 +181,21 @@ void ImportCategoryDrawer::drawCategory(const QModelIndex& \
index, int /*sortRole  
 void ImportCategoryDrawer::viewHeaderText(const QModelIndex& index, QString* header, \
QString* subLine) const  {
-    //TODO: Implement viewing containing folder name.
+    ImportImageModel* sourceModel = \
index.data(ImportImageModel::ImportImageModelPointerRole).value<ImportImageModel*>(); \
+ +    if (!sourceModel)
+    {
+        return;
+    }
+
+    CamItemInfo info = sourceModel->retrieveCamItemInfo(index);
+
+    int count = d->view->categoryRange(index).height();
+
+    QStringList splitted = info.url().prettyUrl().split("/");
+    *header   = splitted.at(splitted.findIndex(splitted.last()) - 1);
+
+    *subLine  = i18n("%1 Items", count);
 }
 
 void ImportCategoryDrawer::updateRectsAndPixmaps(int width)
diff --git a/utilities/cameragui/items/importcategorydrawer.h \
b/utilities/cameragui/items/importcategorydrawer.h index b62c210..a5566f1 100644
--- a/utilities/cameragui/items/importcategorydrawer.h
+++ b/utilities/cameragui/items/importcategorydrawer.h
@@ -33,6 +33,10 @@
 #include <kdeversion.h>
 #include <kcategorydrawer.h>
 
+// Local includes
+
+#include "importcategorizedview.h"
+
 namespace Digikam
 {
 
diff --git a/utilities/cameragui/models/importfiltermodel.cpp \
b/utilities/cameragui/models/importfiltermodel.cpp index 00da30c..3b5cac8 100644
--- a/utilities/cameragui/models/importfiltermodel.cpp
+++ b/utilities/cameragui/models/importfiltermodel.cpp
@@ -461,7 +461,7 @@ QString ImportFilterModel::categoryIdentifier(const CamItemInfo& \
info) const  case CamItemSortSettings::NoCategories:
             return QString();
         case CamItemSortSettings::OneCategory:
-            return QString();
+            return info.folder;
         case CamItemSortSettings::CategoryByFormat:
             return info.mime;
         default:
diff --git a/utilities/cameragui/models/importimagemodel.cpp \
b/utilities/cameragui/models/importimagemodel.cpp index 1f66590..6eb6999 100644
--- a/utilities/cameragui/models/importimagemodel.cpp
+++ b/utilities/cameragui/models/importimagemodel.cpp
@@ -638,7 +638,6 @@ void ImportImageModel::publiciseInfos(const QList<CamItemInfo>& \
infos)  for (int i = firstNewIndex; i <= lastNewIndex; ++i)
     {
         const CamItemInfo& info = d->infos.at(i);
-        qDebug() << info.name; //TODO: Remove this line.
         qlonglong id            = info.id;
         d->idHash.insertMulti(id, i);
 
diff --git a/utilities/cameragui/models/importthumbnailmodel.cpp \
b/utilities/cameragui/models/importthumbnailmodel.cpp index 486b062..d307375 100644
--- a/utilities/cameragui/models/importthumbnailmodel.cpp
+++ b/utilities/cameragui/models/importthumbnailmodel.cpp
@@ -116,7 +116,7 @@ void ImportThumbnailModel::prepareThumbnails(const \
QList<QModelIndex>& indexesTo  {
         infos << camItemInfoRef(index);
     }
-    qDebug() << "IMPORT THUMB MODEL: " << QString::number(thumbSize.size());
+    //qDebug() << "IMPORT THUMB MODEL: " << QString::number(thumbSize.size());
     d->controller->getThumbsInfo(infos, thumbSize);
 }
 
diff --git a/utilities/cameragui/views/importcategorizedview.cpp \
b/utilities/cameragui/views/importcategorizedview.cpp index 6d73b44..c438b70 100644
--- a/utilities/cameragui/views/importcategorizedview.cpp
+++ b/utilities/cameragui/views/importcategorizedview.cpp
@@ -125,7 +125,7 @@ void \
ImportCategorizedView::installDefaultModels(CameraController* controller)  \
filterModel->setSourceImportModel(model);  
     filterModel->setSortRole(CamItemSortSettings::SortByFileName);
-    filterModel->setCategorizationMode(CamItemSortSettings::CategoryByFormat);
+    filterModel->setCategorizationMode(CamItemSortSettings::OneCategory);
     filterModel->sort(0); // an initial sorting is necessary
 
     setModels(model, filterModel);
diff --git a/utilities/cameragui/views/importiconview.cpp \
b/utilities/cameragui/views/importiconview.cpp index 0c9575c..7f8427d 100644
--- a/utilities/cameragui/views/importiconview.cpp
+++ b/utilities/cameragui/views/importiconview.cpp
@@ -64,7 +64,7 @@ void ImportIconView::init(CameraController* controller)
 
     ImportSettings* settings = ImportSettings::instance();
 
-    importFilterModel()->setCategorizationMode(CamItemSortSettings::CategoryByFormat);
 +    importFilterModel()->setCategorizationMode(CamItemSortSettings::OneCategory);
 
     setThumbnailSize((ThumbnailSize::Size)settings->getDefaultIconSize());
 
diff --git a/utilities/cameragui/views/importsettings.cpp \
b/utilities/cameragui/views/importsettings.cpp index 0b43bee..d864697 100644
--- a/utilities/cameragui/views/importsettings.cpp
+++ b/utilities/cameragui/views/importsettings.cpp
@@ -233,7 +233,7 @@ void ImportSettings::init()
 {
     d->imageSortOrder               = CamItemSortSettings::SortByFileName;
     d->imageSorting                 = CamItemSortSettings::AscendingOrder;
-    d->imageGroupMode               = CamItemSortSettings::CategoryByFormat;
+    d->imageGroupMode               = CamItemSortSettings::OneCategory;
     d->itemLeftClickAction          = ImportSettings::ShowPreview;
 
     d->thumbnailSize                = ThumbnailSize::Medium;
@@ -278,7 +278,7 @@ void ImportSettings::readSettings()
 
     d->imageSortOrder               = group.readEntry(d->configImageSortOrderEntry, \
                (int)CamItemSortSettings::SortByFileName);
     d->imageSorting                 = group.readEntry(d->configImageSortingEntry,   \
                (int)CamItemSortSettings::AscendingOrder);
-    d->imageGroupMode               = group.readEntry(d->configImageGroupModeEntry, \
(int)CamItemSortSettings::CategoryByFormat); +    d->imageGroupMode               = \
group.readEntry(d->configImageGroupModeEntry, (int)CamItemSortSettings::OneCategory); \
                
     d->itemLeftClickAction          = \
ImportSettings::ItemLeftClickAction(group.readEntry( \
                d->configItemLeftClickActionEntry,
                                                                          \
(int)ImportSettings::ShowPreview));


[prev in list] [next in list] [prev in thread] [next in thread]