Index: kphotoalbum/INSTALL
diff -c kphotoalbum/INSTALL:1.2 kphotoalbum/INSTALL:1.4
*** kphotoalbum/INSTALL:1.2	Mon Oct 30 22:02:46 2006
--- kphotoalbum/INSTALL	Tue Oct 31 18:14:45 2006
***************
*** 2,7 ****
--- 2,55 ----
  http://www.kphotoalbum.org. You may want to have a look there before
  proceeding compiling the sources yourself.
  
+ ========== prerequisites ==========
+ 
+ KPhotoAlbum supports different features which are realized using
+ external packages. All those packages are not strictly needed -
+ KPhotoAlbum can be build and will run withpout them, but the
+ corresponding features depend on them.
+ 
+ = "kipi" Plug-ins Support
+ You may among other things find plug-ins for:
+ - Writing images to cds or dvd's
+ - Adjusting timestamps on your images
+ - Making a calender with your images in it
+ - Uploading your images to flickr
+ The plug-in library is called KIPI, and may be downloaded from the
+ KIPI Home page (http://extragear.kde.org/apps/kipi)
+ 
+ = EXIF support
+ Images store information like date image was shot, angle it was shot
+ with, focal length, and shutter time in what is know as EXIF
+ information.
+ 
+ If you do not care about focal length, ISO speed, etc, then you might
+ well live without these features in KPhotoAlbum, be, however, aware
+ that KPhotoAlbum will then use the time stamp of the image files to
+ identify when the image was taken.  This time stamp might be wrong in
+ case you moved the image around for example.
+ 
+ KPhotoAlbum uses the EXIV2 library (http://freshmeat.net/projects/exiv2)
+ for reading EXIF information from images.
+ 
+ = SQL Database Support
+ KPhotoAlbum allows you to search using a certain number of EXIF
+ tags. For this KPhotoAlbum needs a Sqlite database. Unfortunately, for
+ this to work, you need to run Sqlite version 2.8.16, so please make
+ sure this is the right version installed on your system.
+ (you can get it from  http://www.sqlite.org/sqlite-2.8.16.tar.gz)
+ You can use CPPFLAGS and LDFLAGS to direct configure to an alternative
+ place for this version of sqlite
+ e.g.
+ > export CPPFLAGS="-I/.../sqlite2.8.16/include"
+ > export LDFLAGS="-L/.../sqlite/2.8.16/lib"
+ > ./configure ....
+ 
+ In addition the qt package for sqlite (e.g.qt-sql-sqlite) must be
+ installed.
+ 
+ ========== Installation: ==========
+ 
  To install KPhotoAlbum into your normal KDE setup, simply run
  ./configure
  make
***************
*** 18,23 ****
--- 66,75 ----
  Next modify your ~/.bashrc, ~/.zshrc, or whatever to include this line:
  export KDEDIRS=/opt/KPhotoAlbum:$KDEDIRS
  
+ You can check the status of the different features using
+ Help/KPhotoAlbum Feature Status
+ 
+ 
  In case of problems, please refer to the README file for further instructions.
  
  Kind Regards
Index: kphotoalbum/src/MainWindow/FeatureDialog.cpp
diff -c kphotoalbum/src/MainWindow/FeatureDialog.cpp:1.1 kphotoalbum/src/MainWindow/FeatureDialog.cpp:1.3
*** kphotoalbum/src/MainWindow/FeatureDialog.cpp:1.1	Mon Oct 30 19:35:14 2006
--- kphotoalbum/src/MainWindow/FeatureDialog.cpp	Tue Oct 31 18:14:56 2006
***************
*** 24,30 ****
  
                    "<p>If you compiled KPhotoAlbum yourself, then please review the sections below to learn what to install "
                    "to get the feature in question. If on the other hand you installed KPhotoAlbum from a binary package, please tell "
!                   "whoever made the package about this defeact, eventually including the information from the section below.<p>"
  
                    "<p>In case you are missing a feature and you did not compile KPhotoAlbum yourself, please do consider doing so. "
                    "It really isn't that hard. If you need help compiling KPhotoAlbum, feel free to ask on the "
--- 24,30 ----
  
                    "<p>If you compiled KPhotoAlbum yourself, then please review the sections below to learn what to install "
                    "to get the feature in question. If on the other hand you installed KPhotoAlbum from a binary package, please tell "
!                   "whoever made the package about this defect, eventually including the information from the section below.<p>"
  
                    "<p>In case you are missing a feature and you did not compile KPhotoAlbum yourself, please do consider doing so. "
                    "It really isn't that hard. If you need help compiling KPhotoAlbum, feel free to ask on the "
***************
*** 39,45 ****
      text += i18n( "<h1><a name=\"kipi\">Plug-ins Support</a></h1>"
                   "<p>KPhotoAlbum has a plug-in system with lots of extensions. You may among other things find plug-ins for:"
                    "<ul>"
!                   "<li>Writting images to cds or dvd's"
                    "<li>Adjusting timestamps on your images"
                    "<li>Making a calender with your images in it"
                    "<li>Uploading your images to flickr"
--- 39,45 ----
      text += i18n( "<h1><a name=\"kipi\">Plug-ins Support</a></h1>"
                   "<p>KPhotoAlbum has a plug-in system with lots of extensions. You may among other things find plug-ins for:"
                    "<ul>"
!                   "<li>Writing images to cds or dvd's"
                    "<li>Adjusting timestamps on your images"
                    "<li>Making a calender with your images in it"
                    "<li>Uploading your images to flickr"
***************
*** 54,60 ****
  
                    "<p>If you do not care about focal length, ISO speed, etc, then you might well live without these features in KPhotoAlbum, "
                    "be, however, aware that KPhotoAlbum will then use the time stamp of the image files to identify when the image was taken. "
!                   "This time stamp might be wrong in case you moved the image arround for example.</p>"
  
                    "<p>KPhotoAlbum uses the <a href=\"http://freshmeat.net/projects/exiv2/\">EXIV2 library</a> "
                    "for reading EXIF information from images</p>"
--- 54,60 ----
  
                    "<p>If you do not care about focal length, ISO speed, etc, then you might well live without these features in KPhotoAlbum, "
                    "be, however, aware that KPhotoAlbum will then use the time stamp of the image files to identify when the image was taken. "
!                   "This time stamp might be wrong in case you moved the image around for example.</p>"
  
                    "<p>KPhotoAlbum uses the <a href=\"http://freshmeat.net/projects/exiv2/\">EXIV2 library</a> "
                    "for reading EXIF information from images</p>"
***************
*** 64,70 ****
      text += i18n( "<h1><a name=\"database\">SQL Database Support</a></h1>"
                    "KPhotoAlbum allows you to search using a certain number of EXIF tags. For this KPhotoAlbum "
                    "needs a Sqlite database. Unfortunately, for this to work, you need to run Sqlite version 2.8.16, "
!                   "so please make sure this is the right version installed on your system." );
      edit->setText( text );
  
      resize( 800, 600 );
--- 64,71 ----
      text += i18n( "<h1><a name=\"database\">SQL Database Support</a></h1>"
                    "KPhotoAlbum allows you to search using a certain number of EXIF tags. For this KPhotoAlbum "
                    "needs a Sqlite database. Unfortunately, for this to work, you need to run Sqlite version 2.8.16, "
!                   "so please make sure this is the right version installed on your system."
! 		  "In addition the qt package for sqlite (e.g.qt-sql-sqlite) must be installed.");
      edit->setText( text );
  
      resize( 800, 600 );

