Log of /branches/kphotoalbum

add geoposition browsing

create branch for geolocation browser feature

Time to move the devel branch to trunk to prepare for the next release

remove unnecessary QButtonGroup in ListSelect

change Q3ButtonGroup to QButtonGroup in ListSelect

Redirecting with no index.html in URL added and cleaned up
some comments in the theme darkJS

update changelog for r1016430 per blackie's request

Fix segfaults when dragging images before the first one and after the last one

BUG: 204443

minor fix: prevent crashing when deleting last image in AnnotationDialog

fixed bug #171520: preview images when annotating multiple mages at once

Improved zooming in rotated images (by Hassan Ibraheem)

Adjust the order of save actions to match the order of declarations

Save the Viewer settings as well

moves the "Show Category Editor" menu item into the "Make 
Category Image" popup menu.

Thanks to Thomas Pircher <tehpeh@gmx.net>

minor simplification in Annotation Dialog

hmmm error handling could be improved a lot here. This is the first step

fixed a broken signal/slot connection and fixed a broken tooltip

Only create the database type once, otherwise Qt makes noice like this:
QSqlDatabasePrivate::removeDatabase: connection 'exif' is still in use, all queries will cease to work

The use case which shows this is:
* do an exif search
* choose maintainance->recreate exif database.

 Show the file list directly in the Read Exif Info
dialog. Previously it was a secondary dialog, with a
do-not-show-again checkbox and a cancel button (none of those two
made any sense there)

merged trunk to this branch

properly set mouse interaction mode after a right click

Possible compilation fix for Martin Jost

adding a missing include

first steps towards separating an ImagePreviewWidget from the AnnotationDialog

Add a keybinding for delete in the viewer that will take the
image of the display list. This is useful when comparing a number
of images and want to take the worst one away every time to find
the best one. Thanks to Wes Hardaker <wes@hardakers.net> for a
patch implementing this.

Now it is possible to chose the thumbnail storage format from
the settings dialog (ppm files which we used by default are pretty
large, so on limited disk space you may wish to choose jpg instead
to trade some speed for disk space. (thanks to Franck Sicard
<franck.sicard@3demi.net> for a patch for this)

To move items around in the thumbnail viewer, you now first have
to select them, then move them. This makes it so much easier to
select items, as you do not have to find an empty space to start.

Once more updated the look of the icons in the thumbnail
viewer. This time I copied the look and fell from Gwenview, which
I hope everyone will like.

Missed to emit selectionChanged one place, which made it impossible to annotate a single image.

Finally done with the refactoring of the thumbnail viewer. This final step was to document the module.

clean up includes

clean up includes

clean out a lot of friends (better be carefull when I'm programming and when I'm on face book :-)

Clean up selection API.

fixing broken patch from Martin. Thx for your help in resolving this issue

API clean up, no reason to prevent a repaint, this is on the road to a cleaner API for the selection methods.

Fixed a pretty bad performance when selecting files in the thumbnail
viewer. The reason was that for each new file MainWindow::Window would
update the actions that made sense based on the amount of items
selected. To do so, it asked for all the selected files, which required
that we iterated though the list of all files (as the selected files in the
thumbnail viewer is a set not a list, and selectedFiles() API returned a
list....
Now we tell how many files are selected in the selectionChanged signal, and
everything is fine.

Fix URL interaction with other KDE applications

This should fix the issue of bug 197663 that spaces in URLs are
encoded incorrectly as %20 when files are dragged from KPhotoAlbum to
other KDE application. Also the "Copy to clipboard" action is fixed.

Thanks to Martin Jaburek for the patch.

From: Martin Jaburek <longmatys@gmail.com>

CCBUG: 197663

oops forgot to save file before commit

clean up of methods in ThumbnailModel

updated copyright headers

major cleanup of the thumbnail viewer sources

cleanup naming.

update the header to reflect that we do use the argument

Fix issues reported by ModelTest

Thumbnail view icons are now square again, and background color
is customizable. The default has changed slightly, so the
background color is dark gray, and spacing are 4 pixels. This
gives IMHO the best 3D effect.

Make the resizing slower. (Now you need to move three pixels to resize by one)

- Use qDebug() instead of std::cout
- If one branch in the if/else statement is {}, make all of them so

Make sure the rating widget is not only visible, but with a usable size as well

Fixed missing include

merged trunk to this branch

more include cleanup

more include cleanup

more include cleanup

more include cleanup

Fixed bug #199629 - new images don't trigger dirty state, thanks
to mat.fuessel@gmx.net

Fixed bug #150971 - disable too low zoom levels, thanks to alexjironkin@gmail.com

* Now it is possible to add a category image from a context menu,
which makes that process much faster (this fixes bug
#195023). Thanks to Thomas Pircher for the work on that.

ChangeLog for my changes on Mallorca

* Resizing the category overview page now is done without the
  actual thumbnails, that makes it much faster and much more smooth
* Removed a lot of includes that was either no longer needed, or
  which at least could be replaced with a forward declaration.
* Improved focus handling in the annotation dialog
* Made the icons in the thumbnail viewer nicer (round and with a
  3D effect)

add support for searching by rating

Automatic redirection to smallest image sizes for theme dark JavaScript. Now
the theme in question views smallest images on page and biggest images when the
thumbnail or full sized image is clicked.

Added theme "Dark JavaScript" - if JavaScript is supported images are shown
using it on main page - this is the default theme

Support for storing most of the settings (all relevant) of HTMLGallery.
Support for default theme (Default=true in kphotoalbum.theme file)

bugfix: taking video files into account in HTML generation in JavaScript part
(show thumbnail instead of video file).
Having full size image in the JS array instead of pagename for same sized
imagepage.

Added support for rating multiple images at once in the annotation dialog

virtual beers on me for forgetting to check these files in

made it easier to find untagged images

fixed a broken signal/slot connection for the welcome dialog, which made it impossible to browse for new images. Thanks to  
Martin Jost for reporting this.

yet another attempt at fixing bug 167045. Thanks to Alex and Hassan for working on this.

clean up of code in the HTML generater by theBro.

final minor changes plus documentation

a bit more cleanup

refactored the settings dialog into a number of classes, one for each page. This will hopefully make the code much more readable

oops fixed a crash

added some documentation on Image Dates

* Added new theme for HTML pages which includes improved support
using java script. (Thanks to Miika Turkia for a patch for this)
* Added support for a copyright tag on the HTML generated pages
(Thanks to Miika Turkia for a patch for this)

fixed bug #171517: Repopulate categories lists whenever an image is loaded. Thanks to Hassan Ibraheem for patch.

added documentation, and split the CategoryMatcher classes into several files

Optimized the user of browsing for categories with
subcategories. E.g. Selecting all images from Denmark. On my database this
has become 50 times faster. The speed up depends on the number of sub
categories the category browsed to has, and also if the query contains any
"No other" part.

merged trunk to this branch

replaced lenth with count. Length wasn't introduced before Qt 4.5

various cleanups:
* added documentation
* renamed ImageSearchInfo::*option* to categoryText. Option was what I called it in the very early days of KPA.
* fixed some space my wide-edit.el tool had introduced.
* renamed a few group to category (group was something I called it when I stopped calling it option :-)
* reworked some Q3Support stuff to pure Qt4.

fixed issue #196095 - Add icon for hide non selected. Thanks to
Hassan Ibraheem for patch.

added documentation

ensure busy cursor is not show while browsing to search and exif info

Don't let the views get focus due to scrolling

updated documentation

improved the algoritm for calculating the amount of icons to show in each row. Also back out the code to give smoother resizing, as it instead gave flicker on initial show of the window

Fixed changelog file to mention the new overview screen

Merged trunk onto the branch.

future devel work will not happen on thaat branch. This is to allow dot
releases happening from trunk, which translators are working against.

renamed Catgory::ListView to Category::TreeView, to avoid confusing, as a ListView in Qt4 is a one dimentional thing, while it was a tree in Qt3.

center the icons on the overview page

Removed some dead code

updated the doxygen file to make it easier to read the output

fixed bug #195277 breadcrumbview should not expand

fixed bug #195331 - update the status bar immediately when going back to the browser from the thumbnail view

also drop a breadcrumb for viewing images. That way the last visible category one will be a link when viewing images. rhkfin, glad now? :-)

Don't show the breadcrumb as a link

Finally got the location of the thumbnail and the label in the iconview.

Moved CatrgoryImage from Settings::SettingsData to DB::Category

updated copyright date

added copyright

Misc. minor bugfixes and improvements

more documentation

Corrected the use of the index in the BrowserWidget (It was 1 based or somethign :-)
Also implemented the usage for the forward button to jumped over pages.
Added more documentation

Fixed bug, where I would return that the flat model had children even when it didn't. This made the app crash when I was using the search bar.

fixed a crash + added more documentation

added namespace to new classes, plus added documentation for the module

Rewrote the CategoryPage to use a real model rather than a QStandardItemModel. The QStandardItemModel was simply too slow when resizing the view.

further improvment on the resizing

converted Q3ValueList to QList

first step to implementing a resizable browser

first step to implementing a resizable browser

improved searchbar interaction further

renamed classes to better match their purpose

Minor changes

started documentation for the main modules

Experimental new way of handling the search field in the browser. 
Arrow keys are now sent to the browser, while the line edit is given keyboard focos whenever it is enabled.

I like it a lot!

listening to activated() signal to know when the user has pressed the return key, doesn't work, as depending on the style that may also be emitted when the user signle or double clicks on an item.

So now we use an eventFilter instead to be notified about return press.

OK bad idea. Revert this change: No more confusion betwen selection and current item - no need to distinguish as we only do have one item and exactly one all the time.

No more confusion betwen selection and current item - no need to distinguish as we only do have one item and exactly one all the time.

Get sorting work for the overview screen.

reworking the usage of the two views in the browser, so all operations doesn't need to be set all the time.

"fix" for jan's broken fix :-)

Fix QMainWindow's warning about an unamed QToolBar

Don't allow drag&drop in the category view

Without this patch, it was possible to drag people in the "People" category, but
this drag&drop would just shuffle the display around. It's better to disable
this altogether rather than provide a confusing functionality (all changes were
immediately forgotten anyway).

fixed the two FIXME's in the EXIV ifdefed code.

Make the QStandardItem not editable by default

The old code did not allow any editing either. Strictly speaking, however, this
change is not necessary as we react on a single click anyway, so the hadnler of
the edit action won't get triggered. Better safe than sorry, though.

Don't require double click for navigating the new reworked browser

Show a tooltip with the tag name. Current state didn't show any visible text
when there was no image defined for the particular category/tag.

Temporary fix for building stuff at all. Jesper, please fix it properly later.

Fix a typo in the type name

Fix cmake's warning about including each file twice

the status bar now show matches

emit the signal viewChanged in go(), this will ensure that the sarchbar get cleared when pressing e.g the back button

experimental back feature

hmm this change was about... something with pressing return in the line edit when no item had keyboard focus

improved column adjustment - I dont like that it scrinks, but this is as good as it gets

improved the algoritm on which branch are open when

refactored into function adjustTreeViewColumnSize

Asking the treeview to auto resize is a huge bottleneck.

improved limiting, so all children of a category is shown if the category matches

This is an internal token, and should not be translated. Besides the i18n call took up 15% of the time of categorizing the images :-)

removed files not used anymore

the breadcrumbs are not clickable

readded breadcrumb support

removed some dead code

fix memleak plus avoid painting invalid pixels in the datebar

sorting in the tree view works

the browser now show image/video count, and it filters correctly in treeviews

tmp checkin

tmp checkin

tmp checkin

tmp checkin

tmp checkin

tmp checkin

tmp checkin

tmp checkin

tmp checkin

tmp checkin

tmp checkin

tmp checking

An attempt at reworking the browser to model/view. Hopefully this should
cleanup and simplify a lot of code

Keep ChangeLog style consistent.

Merge change 657736 from trunk (Add out-of-date warning to kpaxml2mysql.py)

Ported fix for image size in info box from trunk.

3.0.x again

Version 3.0.2

Merge change 653805 from trunk (Ignore TAGS file)

Merge change 653804 from trunk (Remove executable bit from movie.avi)

Merge change 653096 from trunk. (Don't test cycles at start-up)

Change 3.0.1 to 3.0.x

Merge change 652896 from trunk. (Update ChangeLog)

Merge changes 652754:652890 from trunk. (Avoid marking member map closure dirty in MemberMap::addMemberToGroup(..))

Merge change 652749 from trunk. (Remove Set::insert(const Set&) method)

Merge change 652737 from trunk. (DB::MemberMap::hasPath(..): Try to avoid member map closure recalculating)

Version 3.0.1

Merge change 650755 from trunk. (Deny cycles in member maps)

Merge change 650750 from trunk. (ChangeLog style change)

Merge change 650383 from trunk. (Raw file double rotation fix)

Update ChangeLog.

Port changes to member group configuration dialog from trunk (648338).

Port changes to selection code from trunk (648965).

Move KPhotoAlbum devel branch back to trunk.

Move KPhotoAlbum trunk to branches/kphotoalbum/3.0.x
to make room for moving devel branch back to trunk.

Merge desktop file changes from trunk (637100:642746).

Few improvements to member group configuration dialog:

Bugfix: When changing category from the dropdown list, selectMembers()
added items from a different category to _members listbox. Fix this by
not removing unwanted items from _members, but set them unselectable.

Connect slotGroupSelected() to currentChanged() instead of clicked().

Disable _members when there is no group selected.

Use slotCategoryChanged() to regenerate _groups and _members in
slotAddGroup(), slotRenameGroup() and slotDelGroup().

Optimize subsequent calls to SQLTagCategory::name() by caching the
value read from the database. Name of the category will not probably
change and even if it does new instance of that class is created
anyway by SQLCategoryCollection when asked for categories.

Code for debugging query times (ifdeffed out).
Uses otherwise unused save function to print the times... Will be removed later.

Remove unused include.

Add new methods to QueryResult class:
asUIntegerList()
asStringUIntegerMap()
asVariantList()

Split sources list into multiple lines to make it easier to read and change.

Change constructor of SQLMemberMap to take QueryHelper& instead of
QueryHelper* like rest of the SQLDB constructors.

Change constructors of SQLCategoryCollection, SQLImageInfoCollection
and SQLMD5Map to take QueryHelper& instead of Connection&, so there is
only one QueryHelper instance.

NewImageFinder::calculateMD5sums(): Fixing too early return. (wasCanceled was not set)

My last changes to selection code made it impossible to drag items. This is a fix to it.

Bugfix: Selecting a single file by mouse press didn't add that file to
_selectedFiles in ThumbnailView.

Also change behaviour of thumbnail view when multiple images are
selected and user presses one of the selected ones:
 - used to toggle the one that is selected
 - now deselects the selection and leaves the one selected

Bugfix: Selection was ignored in the first press of Plugins menu item, if plugin loading was delayed.

removed debug line

It is now possible to search for images with changed MD5 sum -
very useful for searching for corrupted image files.

Remove kexi update branch.

Update bundled KexiDB to 1.6.1.

(merging changes 626601:626625 from update-to-kexi-1.6.1 branch)

Ignore Makefile.in from svn.

Update kexi to compile and add kphotoalbum prefix to installed libraries and desktop files.

Copy stuff from Kexi (from KOffice 1.6.1).

Start updating bundled KexiDB by removing the old one.

Create a branch for updating bundled KexiDB to more recent version.

This shouldn't be too hard to do, but may require some commits that
will break compiling temporaryly, so creating a branch.

Limit extra space in thumbnail viewer when showing categories (thx to Christoph Moseler).

fixed typos

Ensure people need to do something active to disable kipi and exiv2

Oops checked the wrong thing

Create a devel branch from trunk rev 617977.

Remove unused (and old) development branches.

Port changes from trunk

Change KexiDB back to dynamic linking and prefix those libs and modules with kphotoalbum to avoid conflicts.

Remove KexiDB check from configure

Remove error if KexiDB is not installed

Rename some installed desktop files to avoid conflicts with real Kexi

Comment out ksqlite2 and ksqlite sources

First try to adapt bundled Kexi to work within KPhotoAlbum

Change external KexiDB linking to bundled

Add variables

Copy stuff from Kexi (from KOffice 1.5.2)

Create branch for testing KexiDB bundling

Clean up SQLDB stuff in MainWindow::Window::load().

Ported changes 567119:568543 from trunk

Implement SQLDB::Database::sortAndMergeBackIn().

Move documentation comment from header file to cpp file.

Reimplementing ImageDB::findFirstItemInRange() in SQLDB::Database.

Make it possible to optimize date searches with DateBar by
reimplementing new method ImageDB::findFirstItemInRange().

These too were left there by accident when resolving conflict.

Remove call to addItem(folderName), which was left there by accident when resolving conflict.

Oops. Move saveChangesIfNotDelayed() call out of for-loop.

ImageInfo: add new method delaySavingChanges() and make ImageInfo::saveChanges() protected.

Now changes are saved by default, but saving multiple changes at once
could be done with delaySavingChanges().

Delete old tags when updating media item. (Otherwise they won't go away at all)

Ported changes 566245:567119 from trunk

First try to implement SQLDB::Database::reorder()

Return 0 in SQLImageInfoCollection::getImageInfoOf() if filename is not in db.

Add reference counting to Cursor class.

Set place when adding new images to database.

Don't include unused header.

Ported changes 563137:566245 from trunk

Return media items ordered by place.

Only add items to Folder category (in ImageInfo::setFileName()), if it is in category collection.

Remove category items too when removing category.

Change SQLFolderCategory to inherit from SQLSpecialCategory.

Prevent renaming special category.

When creating the db, create Folder and Tokens categories too.

Throw NotFoundError when queried item not found in QueryHelper::categoryForId() and QueryHelper::idForCategory().

New class SQLSpecialCategory for Tokens.

Use CategoryCollection methods for Database::renameCategory() and Database::renameItem().

Fix SQLCategory::renameItem() to specify the categoryId too in the query. And clean-up.

Make SQLCategory constructor protected to allow only SQLCategoryCollection to create categories.

Move SQLImageInfo directory to new class SQLImageInfoCollection.

Call saveChanges() after reading EXIF info from file in ImageInfo::readExif().

Delete newBackend after convert is done.

Delete old category entry when inserting new.

Add license.

Support loading and saving drawings to SQL database.

Change schema: Remove id from drawing table.
Change mysqldb.py to match new schema.

Make it possible to use Viewer::Draw objects without QDomElements.

- Add Viewer::Draw::setCoordinates() method.
- Add getStartPoint() and getEndPoint() methods.

Mark ImageInfo dirty when changing md5sum or type and do not mark dirty if empty drawlist is overwritten by another empty list.

Remove SQLFolderCategory::readItems(), _items and _isSpecial.

Handle NULL width and height. New method QueryHelper::imageInfoToBindings().

Change fieldTypeFor signature to use const QVariant&.

Clean-up QueryHelper::idListForTag().

Ported changes 560100:563137 from trunk

Implement ordering of the tags and SQLCategory::renameItem().

Move category renaming code from SQLCategoryCollection to SQLCategory.

Replace qstring == "" with qstring.isEmpty().

Delete also rows from media_tag table when removing media item from media table.

New method QueryHelper::getMediaIdTagPairs().

Remove QueryHelper::Result::cursor() method and uses of it in SQLDB::Database::classify().

Change some functions to not use QueryHelper::Result::cursor anymore and other clean-ups.

Insert default categories too after creating the db.

Use transaction in create db, if available. Workaround for KexiDB PostgreSQL DateTime bug.

Fix SQLDB::Database::addToBlockList to call addBlockItems with relative paths.

Null-implement SQLDB::Database clipboard methods.

Optimize counting of any type media items by using simpler query.

Optimize searches of all media types by leaving media.type field out of the query.

Clean-up Query.h and Query.cpp.

Allow media type to specified as a mask.

So these functions can search Image, Movie or Both now.

Change DB::Movie from 16 to 2 (0x10 to 0x02). And add DB::anyMediaType to match all types.

Ported changes 553919:560100 from trunk

New class SQLMD5Map.

QueryHelper::Result: Delete cursor only in destructor.

Move database creating and such to own class -- DatabaseHandler.

Fix template parameter N to be same type as in for-loop.

Remove unused class: QueryUtil.

Remove #ifdef HASKEXIDB lines.

Make SQLImageInfo to save only if changed and save after configuring multiple images too.

Make QueryHelper::idForFilename to throw an error if file is not found.

Add classes for error handling.

Make ImageDate::operator!= const.

Optimize SQLDB::Database::imageList() to run only one query.

Makes startup faster.

Reimplement mergeUniqly so it can handle empty lists too.

Change some method signatures to use "const Class&".

Even though Qt shares most of its objects implicitly, passing objects
as a copy could add some overhead, so made this change just to be sure.

Implement SQLCategory::removeItem()

Remove unused method imageInfoList() from ImageDB.

Change table names (blockItem) to lowercase to avoid some problems.

Don't emit totalChanged or dirty if XMLDB::Database::addImages is called with empty list.

Change filename to relativePath in function bodys too. (Forgot that in r557917)

Add comment to remind about foreign key constraint.

Implement SQLDB::Database::deleteList() and call it from addToBlockList().

Change parameter filename to relativePath to make API more clear.

Add method QueryHelper::removeMediaItem()

Make browsing faster by providing optimized version of count() method for SQL database.

Don't do anything in ensureCurrentVisiblePart2() if _currentItem is null.

This prevents
ASSERT: "!fileName.isNull()" in ThumbnailWidget.cpp (535)
to show up when scrolling thumbnail view "too fast" with the scrollbar.

Handle type parameter of SQLDB::Database::classify().

Fix copy+paste error.

Save block items to database.

Add folders() method to QueryHelper.

Don't complain about special category NYI.

Use QFileInfo instead of QFile.

Handle requireOnDisk in SQLDB::Database::search().

Handle Folders category specially.

Add some comments to remind about needed contstraints

Database schema change: Split filename to dirId and filename

Set mediatype to 'video' for XML attribute "movie".

Make SQLImageInfo objects to return isNull() == false

Implement filesMatchingQuery()

Ported changes from trunk

Added license to script files

First step towards new SQL database schema with KexiDB

Text file, which lists compatibility issues with digiKam database

Check is KexiDB installed

Exit if setupSQLDB is called with no SQLDB support

Add comments

Add setter for mediaType

Add script which finds media items with some tag

Add hash and eq to Tag class

Fix typo

Use simplified schema

Simplified schema.

SQLDB_DATABSE typo fix

Ported changes (548215 to 548866) from trunk

Parse compressed member groups from XML

Added place and media type attributes to SQL db schema and changed script to handle them.

Updated ER-diagram

Adding ER diagram for documentation purposes

startDate->startTime, endDate->endTime

Changed Image to MediaItem everywhere.

datatypes.py:
Added classes Tag, MemberGroup and BlockItem.
Added __hash__ and __eq__ methods to Drawing class.

db.py:
Added isEmpty method.

mysqldb.py:
Added support for saving drawings and member groups.
Changed ItemNumMap to support holes in its integer range.

xmldb.py:
Chech version of XML file.
Parse member groups and block list.

renamed SQLDB class to Database to avoid collision with namespace

renamed XMLDB class to Database to avoid collision with namespace

renamed Settings class to SettingsData to avoid collision with namespace

renamed AnnotationDialog class to Dialog to avoid collision with namespace

renamed Viewer class to ViewerWidget to avoid collision with namespace

renamed ThumbnailView class to ThumbnailWidget to avoid collision with namespace

renamed MainWindow class to Window to avoid collision with namespace

renamed ImageManager class to Manager to avoid collision with namespace

renamed DateBar class to DateBarWidget to avoid collision with namespace

Support for reading drawings from XML

Added missing "("

Cleaning up sqldb.py

Split Database interface to reader and writer parts

Make RawImageDecoder to get linked in

Ported from trunk. (exit() definition)

Support for compressed index.xml

added module name to use of Error class (xmldb.Error)

Divided database conversion script to modules

When inserting new tag to db, insert also category, if not already present.

Better error handling. Detect compressed index.xml.

Ported .desktop files from trunk

moved files from the DB directory into a DB namespace.

Changed KPADOMConverter to KPADatabaseReader.
Moved database copying function to module level.

added charset conversion to db read statements

removed debug print command

Adding XML->MySQL conversion script under version control

Fixed typo (f -> if)

Finalized moving files into subdirectories.

Moved Image loading classes into subdirectory / namespace

Created directory/namespace Utilities

renamed Options to Settings, and moved it into a subdirectory / namespace.

ported from trunk

added == KPasswordDialog::Accepted

Two more #ifdef SQLDB_SUPPORT directives

Ask username and password when converting back-end

Read SQL username and password from config file

adding username and password parameters to SQLDB constructor

Branch for the google summer of code development.

branch for 2.2.x

for kphotoalbum branches