[prev in list] [next in list] [prev in thread] [next in thread]
List: kde-commits
Subject: extragear/graphics/digikam
From: Gilles Caulier <caulier.gilles () gmail ! com>
Date: 2008-05-30 11:17:35
Message-ID: 1212146255.085509.16641.nullmailer () svn ! kde ! org
[Download RAW message or body]
SVN commit 814462 by cgilles:
digiKam from trunk : introduce new Map Search tool based on Marble Widget. It's not \
yet suitable. Marcel, i need a new Search Virtual Album type to identify searches \
performed over a map. Also, how to query new digiKam search engine using GPS location \
informations ?
CCMAIL: marcel.wiesweg@gmx.de
M +6 -0 CMakeLists.txt
M +2 -0 digikam/CMakeLists.txt
M +17 -0 digikam/digikamview.cpp
M +10 -2 project/project.kdevelop
M +1 -4 utilities/CMakeLists.txt
A utilities/gpssearch (directory)
AM utilities/gpssearch/gpssearchfolderview.cpp [License: GPL (v2+)]
AM utilities/gpssearch/gpssearchfolderview.h [License: GPL (v2+)]
AM utilities/gpssearch/gpssearchview.cpp [License: GPL (v2+)]
AM utilities/gpssearch/gpssearchview.h [License: GPL (v2+)]
AM utilities/gpssearch/gpssearchwidget.cpp [License: GPL (v2+)]
AM utilities/gpssearch/gpssearchwidget.h [License: GPL (v2+)]
M +5 -3 utilities/kipiiface/kipiimagecollectionselector.cpp
--- trunk/extragear/graphics/digikam/CMakeLists.txt #814461:814462
@@ -655,6 +655,12 @@
${CMAKE_CURRENT_SOURCE_DIR}/utilities/fuzzysearch/sketchwidget.cpp
)
+SET(libgpssearch_SRCS
+ ${CMAKE_CURRENT_SOURCE_DIR}/utilities/gpssearch/gpssearchfolderview.cpp
+ ${CMAKE_CURRENT_SOURCE_DIR}/utilities/gpssearch/gpssearchview.cpp
+ ${CMAKE_CURRENT_SOURCE_DIR}/utilities/gpssearch/gpssearchwidget.cpp
+ )
+
ADD_SUBDIRECTORY( data )
ADD_SUBDIRECTORY( libs )
ADD_SUBDIRECTORY( utilities )
--- trunk/extragear/graphics/digikam/digikam/CMakeLists.txt #814461:814462
@@ -49,6 +49,7 @@
../utilities/lighttable
../utilities/searchwindow
../utilities/fuzzysearch
+ ../utilities/gpssearch
../digikam
../
# config-digikam.h
@@ -157,6 +158,7 @@
${libkipiiface_SRCS}
${libsearchwindow_SRCS}
${libfuzzysearch_SRCS}
+ ${libgpssearch_SRCS}
album.cpp
albumiconview.cpp
--- trunk/extragear/graphics/digikam/digikam/digikamview.cpp #814461:814462
@@ -80,6 +80,8 @@
#include "tagfolderview.h"
#include "fuzzysearchview.h"
#include "fuzzysearchfolderview.h"
+#include "gpssearchview.h"
+#include "gpssearchfolderview.h"
#include "searchfolderview.h"
#include "searchtabheader.h"
#include "statusprogressbar.h"
@@ -127,6 +129,7 @@
selectionTimer = 0;
thumbSizeTimer = 0;
fuzzySearchView = 0;
+ gpsSearchView = 0;
needDispatchSelection = false;
cancelSlideShow = false;
thumbSize = ThumbnailSize::Medium;
@@ -171,6 +174,7 @@
SearchTabHeader *searchTabHeader;
TagFilterView *tagFilterView;
FuzzySearchView *fuzzySearchView;
+ GPSSearchView *gpsSearchView;
};
DigikamView::DigikamView(QWidget *parent)
@@ -227,6 +231,7 @@
d->dateFolderView = new DateFolderView(this);
d->timeLineView = new TimeLineView(this);
d->fuzzySearchView = new FuzzySearchView(this);
+ d->gpsSearchView = new GPSSearchView(this);
d->leftSideBar->appendTab(d->folderBox, SmallIcon("folder-image"), \
i18n("Albums"));
d->leftSideBar->appendTab(d->dateFolderView, SmallIcon("view-calendar-list"), \
i18n("Calendar")); @@ -234,6 +239,7 @@
d->leftSideBar->appendTab(d->timeLineView, SmallIcon("clock"), \
i18n("Timeline"));
d->leftSideBar->appendTab(d->searchBox, SmallIcon("edit-find"), \
i18n("Searches"));
d->leftSideBar->appendTab(d->fuzzySearchView, SmallIcon("tools-wizard"), \
i18n("Fuzzy Searches")); + d->leftSideBar->appendTab(d->gpsSearchView, \
SmallIcon("applications-internet"), i18n("Map Searches"));
// To the right.
@@ -680,6 +686,8 @@
\
d->timeLineView->searchBar()->completionObject()->addItem(salbum->title()); else if \
(salbum->isHaarSearch())
\
d->fuzzySearchView->searchBar()->completionObject()->addItem(salbum->title()); + \
else // map search + \
d->gpsSearchView->searchBar()->completionObject()->addItem(salbum->title());
break;
}
@@ -733,6 +741,8 @@
\
d->timeLineView->searchBar()->completionObject()->removeItem(salbum->title()); else \
if (salbum->isHaarSearch())
\
d->fuzzySearchView->searchBar()->completionObject()->removeItem(salbum->title()); + \
else // map search + \
d->gpsSearchView->searchBar()->completionObject()->removeItem(salbum->title());
break;
}
@@ -789,6 +799,11 @@
\
d->fuzzySearchView->searchBar()->completionObject()->addItem(salbum->title());
\
d->fuzzySearchView->folderView()->slotTextSearchFilterChanged(d->fuzzySearchView->searchBar()->text());
}
+ else // map search
+ {
+ \
d->gpsSearchView->searchBar()->completionObject()->addItem(salbum->title()); + \
d->gpsSearchView->folderView()->slotTextSearchFilterChanged(d->gpsSearchView->searchBar()->text());
+ }
break;
}
@@ -814,6 +829,7 @@
d->searchSearchBar->completionObject()->clear();
d->timeLineView->searchBar()->completionObject()->clear();
d->fuzzySearchView->searchBar()->completionObject()->clear();
+ d->gpsSearchView->searchBar()->completionObject()->clear();
}
void DigikamView::slotAlbumHistoryBack(int steps)
@@ -1492,6 +1508,7 @@
d->searchFolderView->setActive(w == d->searchBox);
d->timeLineView->setActive(w == d->timeLineView);
d->fuzzySearchView->setActive(w == d->fuzzySearchView);
+ d->gpsSearchView->setActive(w == d->gpsSearchView);
}
void DigikamView::slotAssignRating(int rating)
--- trunk/extragear/graphics/digikam/project/project.kdevelop #814461:814462
@@ -642,6 +642,14 @@
<projectname>project</projectname>
<projectname>project</projectname>
<projectname>project</projectname>
+ <projectname>project</projectname>
+ <projectname>project</projectname>
+ <projectname>project</projectname>
+ <projectname>project</projectname>
+ <projectname>project</projectname>
+ <projectname>project</projectname>
+ <projectname>project</projectname>
+ <projectname>project</projectname>
</general>
<kdevfileview>
<groups>
@@ -740,7 +748,7 @@
<run>
<directoryradio>build</directoryradio>
<customdirectory>/</customdirectory>
- <mainprogram>/home/gilles/Documents/devel/SVN/trunk/graphics/digikam/digikam/digikam</mainprogram>
+ <mainprogram>/home/gilles/Documents/Devel/SVN/trunk/graphics/digikam/digikam/digikam</mainprogram>
<programargs/>
<terminal>false</terminal>
<autocompile>false</autocompile>
@@ -756,7 +764,7 @@
<envvar value="/opt/kde4/lib/kde4/plugins" name="QT_PLUGIN_PATH" />
</envvars>
<globaldebugarguments/>
- <globalcwd/>
+ <globalcwd>/home/gilles/Documents/Devel/SVN/trunk/graphics/digikam/project/../..</globalcwd>
<useglobalprogram>true</useglobalprogram>
<autoinstall>false</autoinstall>
<autokdesu>false</autokdesu>
--- trunk/extragear/graphics/digikam/utilities/CMakeLists.txt #814461:814462
@@ -1,8 +1,4 @@
-include_directories(../digikam
- ../libs/dimg
- )
-
add_subdirectory(scripts)
add_subdirectory(setup)
add_subdirectory(imageeditor)
@@ -13,3 +9,4 @@
add_subdirectory(cameragui)
add_subdirectory(fuzzysearch)
add_subdirectory(searchwindow)
+add_subdirectory(gpssearch)
** trunk/extragear/graphics/digikam/utilities/gpssearch/gpssearchfolderview.cpp \
#property svn:eol-style + native
** trunk/extragear/graphics/digikam/utilities/gpssearch/gpssearchfolderview.h \
#property svn:eol-style + native
** trunk/extragear/graphics/digikam/utilities/gpssearch/gpssearchview.cpp #property \
svn:eol-style + native
** trunk/extragear/graphics/digikam/utilities/gpssearch/gpssearchview.h #property \
svn:eol-style + native
** trunk/extragear/graphics/digikam/utilities/gpssearch/gpssearchwidget.cpp #property \
svn:eol-style + native
** trunk/extragear/graphics/digikam/utilities/gpssearch/gpssearchwidget.h #property \
svn:eol-style + native
--- trunk/extragear/graphics/digikam/utilities/kipiiface/kipiimagecollectionselector.cpp \
#814461:814462 @@ -47,6 +47,7 @@
#include "searchfolderview.h"
#include "timelinefolderview.h"
#include "fuzzysearchfolderview.h"
+#include "gpssearchfolderview.h"
#include "kipiinterface.h"
#include "kipiimagecollection.h"
#include "kipiimagecollectionselector.h"
@@ -215,10 +216,11 @@
SAlbum* salbum = dynamic_cast<SAlbum*>(album);
if (salbum &&
- (salbum->title() == SearchFolderView::currentSearchViewSearchName() \
||
- salbum->title() == TimeLineFolderView::currentTimeLineSearchName() \
|| + (salbum->title() == \
SearchFolderView::currentSearchViewSearchName() || + \
salbum->title() == TimeLineFolderView::currentTimeLineSearchName() \
||
salbum->title() == \
FuzzySearchFolderView::currentFuzzySketchSearchName() ||
- salbum->title() == \
FuzzySearchFolderView::currentFuzzyImageSearchName())) + \
salbum->title() == FuzzySearchFolderView::currentFuzzyImageSearchName() || + \
salbum->title() == GPSSearchFolderView::currentGPSSearchName())) continue;
item = new TreeAlbumCheckListItem(pitem, album);
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic