diff --git a/Makefile.am b/Makefile.am
index f9c66c456d..b5edb97431 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,14 +1,14 @@
 
-SUBDIRS = lib kspread kpresenter kword kformula kdiagramm killustrator kimage kohtml tools plugins servicetypes koshell pics
+SUBDIRS = lib kspread kpresenter kword kformula kdiagramm killustrator kimage kimageshop kohtml tools plugins servicetypes koshell pics
 
 AUTOMAKE_OPTIONS = foreign # 1.4
 
 acinclude.m4: admin/acinclude.m4.in admin/libtool.m4.in
 	@cat $(top_srcdir)/admin/acinclude.m4.in $(top_srcdir)/admin/libtool.m4.in   > $(top_srcdir)/acinclude.m4
 
 messages:
 	make -f admin/Makefile.common package-messages
 
 dist-hook:
 	cd $(top_distdir) && perl $(top_srcdir)/admin/am_edit -padmin
 
diff --git a/configure.in b/configure.in
index 29b47c7d00..07fe0291b0 100644
--- a/configure.in
+++ b/configure.in
@@ -1,147 +1,149 @@
 
 dnl AC_PREREQ([2.13])
 
 dnl without this order in this file, autoconf will not work!
 dnl the argument is a source file out of your sources. But
 dnl acinclude.m4 makes the job for all programs ;-)
 AC_INIT(acinclude.m4)
 
 dnl This is so we can use kde-common
 AC_CONFIG_AUX_DIR(admin)
 
 dnl without this order in this file, automake will be confused!
 dnl the argument
 AM_CONFIG_HEADER(config.h)
 AC_CHECK_COMPILERS
 
 if test "$GCC" = "yes"; then
   CXXFLAGS="$CXXFLAGS"
 fi
 
 AM_INIT_AUTOMAKE(koffice, 0.1)
 
 dnl make $KDEDIR the default for the installation
 AC_PREFIX_DEFAULT(${KDEDIR:-/usr/local/kde})
 
 AM_ENABLE_SHARED(yes)
 AM_ENABLE_STATIC(no)
 KDE_PROG_LIBTOOL
 AC_PATH_KDE
 AM_KDE_WITH_NLS
 
 dnl Check for MICO. The argument is the minimal version required.
 KDE_CHECK_MICO(2.2.6)
 
 idldir="\$(includedir)/idl"
 AC_SUBST(idldir)
 
 KDE_CHECK_PYTHON(1.5)
 AC_CHECK_HEADERS(unistd.h sys/param.h floatingpoint.h)
 KDE_CHECK_KIMGIO
 AC_FIND_QIMGIO
 AC_C_BIGENDIAN
 AC_CHECK_KDEMAXPATHLEN
 
 KDE_CHECK_NEWLIBS
 
 KOML_INCLUDES='-I$(top_srcdir)/lib/koml -I$(top_builddir)/lib/koml'
 AC_SUBST(KOML_INCLUDES)
 
 KSTORE_INCLUDES='-I$(top_srcdir)/lib/store -I$(top_builddir)/lib/store'
 AC_SUBST(KSTORE_INCLUDES)
 
 KOFFICECORE_INCLUDES='-I$(top_srcdir)/lib/kofficecore -I$(top_builddir)/lib/kofficecore'
 AC_SUBST(KOFFICECORE_INCLUDES)
 
 KOFFICEUI_INCLUDES='-I$(top_srcdir)/lib/kofficeui -I$(top_builddir)/lib/kofficeui'
 AC_SUBST(KOFFICEUI_INCLUDES)
 
 LIB_KOFFICEUI='$(top_builddir)/lib/kofficeui/libkofficeui.la'
 LIB_KOFFICECORE='$(top_builddir)/lib/kofficecore/libkofficecore.la'
 LIB_KSTORE='$(top_builddir)/lib/store/libkstore.la'
 LIB_KOML='$(top_builddir)/lib/koml/libkoml.la'
 AC_SUBST(LIB_KOFFICEUI)
 AC_SUBST(LIB_KOFFICECORE)
 AC_SUBST(LIB_KSTORE)
 AC_SUBST(LIB_KOML)
 
 interfacedir='$(top_srcdir)/lib/interfaces'
 AC_SUBST(interfacedir)
 
 KOFFICE_LIBS='$(LIB_KOFFICEUI) $(LIB_KOFFICECORE) $(LIB_KSTORE) $(LIB_KOML) $(LIB_KDEUTIL)'
 AC_SUBST(KOFFICE_LIBS)
 
 KOFFICE_INCLUDES='-I$(top_srcdir)/lib $(KOFFICEUI_INCLUDES) $(KOFFICECORE_INCLUDES) $(KOML_INCLUDES) $(KSTORE_INCLUDES)'
 AC_SUBST(KOFFICE_INCLUDES)
 
 dnl add here all your Makefiles. These are created by configure
 AC_OUTPUT( \
 	Makefile \
 	kchart/Makefile	\
 	kchart/core/Makefile \
 	kchart/pics/Makefile \
 	kchart/ui/Makefile \
 	kformula/Makefile \
 	kformula/pics/Makefile \
 	killustrator/Makefile \
 	killustrator/doc/Makefile \
 	killustrator/filter/Makefile \
 	killustrator/koffice/Makefile \
 	killustrator/pics/Makefile \
 	killustrator/share/Makefile \
 	killustrator/standalone/Makefile \
 	killustrator/xmlutils/Makefile \
 	kohtml/Makefile \
 	kohtml/toolbar/Makefile \
 	kimage/Makefile \
 	kimage/pics/Makefile \
-	kpresenter/Makefile \
+    kimageshop/Makefile \
+    kimageshop/pics/Makefile \
+   	kpresenter/Makefile \
 	kpresenter/autoformEdit/Makefile \
 	kpresenter/autoforms/Makefile \
 	kpresenter/autoforms/Arrows/Makefile \
 	kpresenter/autoforms/Connections/Makefile \
 	kpresenter/pics/Makefile \
 	kpresenter/templates/Makefile \
 	kpresenter/templates/Screenpresentations/Makefile \
 	kpresenter/templates/Professional/Makefile \
 	kpresenter/toolbar/Makefile \
 	kpresenter/dtd/Makefile \
 	kpresenter/slideshow/Makefile \
 	kspread/Makefile \
 	kspread/pics/Makefile \
 	kspread/toolbar/Makefile \
 	kspread/scripts/Makefile \
 	kspread/dtd/Makefile \
 	kspread/filters/Makefile \
 	kspread/filters/komma/Makefile \
 	kword/Makefile \
 	kword/toolbar/Makefile \
 	kword/templates/Makefile \
 	kword/templates/Wordprocessing/Makefile \
 	kword/templates/DTP/Makefile \
 	kword/dtd/Makefile \
 	kword/filters/Makefile \
 	kword/filters/ascii/Makefile \
 	kword/filters/winword97/Makefile \
 	kdiagramm/Makefile \
 	kdiagramm/pics/Makefile \
 	koshell/Makefile \
 	lib/Makefile \
 	lib/kofficecore/Makefile \
 	lib/kofficeui/Makefile \
 	lib/kofficeui/pics/Makefile \
 	lib/kofficeui/test/Makefile \
 	lib/koml/Makefile \
 	lib/store/Makefile \
 	servicetypes/Makefile \
 	tools/Makefile \
 	tools/spell/Makefile \
 	plugins/Makefile \
 	plugins/recorder/Makefile \
 	plugins/recorder/pics/Makefile \
 	plugins/calc/Makefile \
 	plugins/calc/pics/Makefile \
 	pics/Makefile \
 	pics/toolbar/Makefile \
 	servicetypes/Makefile
  )
diff --git a/kimageshop/Makefile.am b/kimageshop/Makefile.am
new file mode 100644
index 0000000000..f75a7d423d
--- /dev/null
+++ b/kimageshop/Makefile.am
@@ -0,0 +1,64 @@
+SUBDIRS   = pics
+
+INCLUDES  = $(MICO_INCLUDES) $(KOFFICE_INCLUDES) $(all_includes) -I$(idldir)
+LDFLAGS   = $(all_libraries) $(MICO_LDFLAGS) $(KDE_RPATH)
+LDADD     = $(LIB_KOFFICEUI) $(LIB_KIMGIO)
+
+####### Files
+
+bin_PROGRAMS = kimageshop
+
+kimageshop_SOURCES = \
+ kimageshop.cc \
+ kimageshop_main.cc \
+ kimageshop_shell.cc \
+ kimageshop_doc.cc \
+ kimageshop_view.cc \
+ preferencesdlg.cc \
+ zoomfactordlg.cc
+
+noinst_HEADERS = \
+ kimageshop.h \
+ kimageshop_main.h \
+ kimageshop_shell.h \
+ kimageshop_doc.h \
+ kimageshop_view.h \
+ preferencesdlg.h \
+ zoomfactordlg.h
+
+METASOURCES = \
+ kimageshop_main.moc \
+ kimageshop_shell.moc \
+ kimageshop_doc.moc \
+ kimageshop_view.moc \
+ preferencesdlg.moc \
+ zoomfactordlg.moc
+
+idl_DATA = kimageshop.idl
+idl_HEADERS = kimageshop.h
+
+DISTCLEANFILES = $(idl_DATA:.idl=.cc) $(idl_HEADERS) $(METASOURCES)
+
+kdelnk_DATA = kimageshop.desktop
+kdelnkdir = $(kde_appsdir)/KOffice
+
+####### Implicit rules
+
+####### Build rules
+
+IDL_FLAGS = --query-server-for-narrow --relative-paths -I$(top_srcdir)/lib/kofficecore -I$(top_srcdir)/lib/store -I$(interfacedir) -I$(idldir)
+
+messages:
+	(XGETTEXT) -C -ki18n -x $(includedir)/kde.pot *.cc && mv messages.po ../po/kimageshop.pot
+
+kimageshop.h: kimageshop.idl $(micodir)/include/CORBA.h
+	$(IDL) $(IDL_FLAGS) $(srcdir)/kimageshop.idl
+
+kimageshop.cc: kimageshop.h
+kimageshop_doc.cc: kimageshop.h
+kimageshop_main.cc: kimageshop.h
+kimageshop_shell.cc: kimageshop.h
+kimageshop_view.cc: kimageshop.h
+preferencesdlg.cc: preferencesdlg.h
+zoomfactordlg.cc: zoomfactordlg.h
+koShell.cc: koShell.h
diff --git a/kimageshop/kimageshop.desktop b/kimageshop/kimageshop.desktop
new file mode 100644
index 0000000000..55bf91abb7
--- /dev/null
+++ b/kimageshop/kimageshop.desktop
@@ -0,0 +1,12 @@
+[Desktop Entry]
+Name=KImageShop
+Exec=kimageshop
+CORBAExec=kimageshop --server
+Comment=Image processing application
+MimeType=application/x-kimageshop;image/gif
+X-KDE-RepoIds=IDL:KImageShop/DocumentFactory:1.0#KImageShop
+X-KDE-ActivationMode=shared
+Type=OpenPart
+Icon=image.xpm
+MiniIcon=image.xpm
+ServiceTypes=KOfficeDocument
diff --git a/kimageshop/kimageshop.idl b/kimageshop/kimageshop.idl
new file mode 100644
index 0000000000..449d946fc6
--- /dev/null
+++ b/kimageshop/kimageshop.idl
@@ -0,0 +1,53 @@
+/* This file is part of the KDE project
+   Copyright (C) 1998, 1999 Torben Weis <weis@kde.org>
+ 
+   This library is free software; you can redistribute it and/or
+   modify it under the terms of the GNU Library General Public
+   License as published by the Free Software Foundation; either
+   version 2 of the License, or (at your option) any later version.
+ 
+   This library is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   Library General Public License for more details.
+ 
+   You should have received a copy of the GNU Library General Public License
+   along with this library; see the file COPYING.LIB.  If not, write to
+   the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+   Boston, MA 02111-1307, USA.
+*/     
+
+#ifndef __kimageshop_idl__
+#define __kimageshop_idl__
+
+#include <openparts.idl>
+#include <koffice.idl>
+#include <openparts_ui.idl>
+
+module KImageShop
+{
+	interface View : KOffice::View
+	{
+	};
+
+	interface Document : KOffice::Document, KOffice::Print
+	{
+/*
+       // View menu
+       slot void viewZoomFactor();
+       slot void viewFitToView();
+       slot void viewFitWithProportions();
+       slot void viewOriginalSize();
+       slot void viewCentered();
+       slot void viewInfoImage();
+       slot void viewBackgroundColor();
+*/
+	};
+    
+	interface DocumentFactory : KOffice::DocumentFactory
+	{
+	};
+};
+
+#endif
+
diff --git a/kimageshop/kimageshop_doc.cc b/kimageshop/kimageshop_doc.cc
new file mode 100644
index 0000000000..1f4688c468
--- /dev/null
+++ b/kimageshop/kimageshop_doc.cc
@@ -0,0 +1,940 @@
+/* This file is part of the KDE project
+   Copyright (C) 1998, 1999 Torben Weis <weis@kde.org>
+
+   This library is free software; you can redistribute it and/or
+   modify it under the terms of the GNU Library General Public
+   License as published by the Free Software Foundation; either
+   version 2 of the License, or (at your option) any later version.
+
+   This library is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   Library General Public License for more details.
+
+   You should have received a copy of the GNU Library General Public License
+   along with this library; see the file COPYING.LIB.  If not, write to
+   the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+   Boston, MA 02111-1307, USA.
+*/
+
+#include <qprinter.h>
+#include <qdatetm.h>
+#include <qpainter.h>
+#include <qrect.h>
+
+#include <kapp.h>
+#include <kimgio.h>
+
+#include <komlParser.h>
+#include <komlStreamFeed.h>
+#include <komlWriter.h>
+#include <komlMime.h>
+
+#include <koStream.h>
+
+#include "kimageshop_doc.h"
+#include "kimageshop_shell.h"
+
+#define MM_TO_POINT 2.83465
+#define POINT_TO_MM 0.3527772388
+
+/*****************************************************************************
+ *
+ * KImageShopDoc
+ *
+ *****************************************************************************/
+
+KImageShopDoc::KImageShopDoc()
+{
+  ADD_INTERFACE("IDL:KOffice/Print:1.0");
+
+  m_bEmpty = true;
+  m_bModified = false;
+
+  m_leftBorder = 20.0;
+  m_rightBorder = 20.0;
+  m_topBorder = 20.0;
+  m_bottomBorder = 20.0;
+  m_paperFormat = PG_DIN_A4;
+  m_paperWidth = PG_A4_WIDTH;
+  m_paperHeight = PG_A4_HEIGHT;
+  calcPaperSize();
+  m_orientation = PG_PORTRAIT;
+
+  m_executeCommand = false;
+
+  kimgioRegister();
+
+  m_lstViews.setAutoDelete( false );
+}
+
+CORBA::Boolean KImageShopDoc::initDoc()
+{
+  return true;
+}
+
+void KImageShopDoc::cleanUp()
+{
+  kdebug( KDEBUG_INFO, 0, "CleanUp KImageShopDoc" );
+
+  if ( m_bIsClean )
+    return;
+
+  ASSERT( m_lstViews.count() == 0 );
+
+  m_lstAllChildren.clear();
+
+  KoDocument::cleanUp();
+}
+
+KOffice::MainWindow_ptr KImageShopDoc::createMainWindow()
+{
+  KImageShopShell* shell = new KImageShopShell;
+  shell->show();
+  shell->setDocument( this );
+
+  return KOffice::MainWindow::_duplicate( shell->koInterface() );
+}
+
+void KImageShopDoc::removeView( KImageShopView* _view )
+{
+  m_lstViews.removeRef( _view );
+}
+
+KImageShopView* KImageShopDoc::createImageView( QWidget* _parent )
+{
+  KImageShopView *p = new KImageShopView( _parent, 0L, this );
+
+  m_lstViews.append( p );
+  return p;
+}
+
+OpenParts::View_ptr KImageShopDoc::createView()
+{
+  return OpenParts::View::_duplicate( createImageView() );
+}
+
+void KImageShopDoc::viewList( OpenParts::Document::ViewList*& _list )
+{
+  _list->length( m_lstViews.count() );
+
+  int i = 0;
+  QListIterator<KImageShopView> it( m_lstViews );
+  for( ; it.current(); ++it )
+  {
+    (*_list)[i++] = OpenParts::View::_duplicate( it.current() );
+  }
+}
+
+int KImageShopDoc::viewCount()
+{
+  return m_lstViews.count();
+}
+
+bool KImageShopDoc::save( ostream& out, const char* /* format */ )
+{
+  out << "<?xml version=\"1.0\"?>" << endl;
+  out << otag << "<DOC author=\"" << "Torben Weis" << "\" email=\"" << "weis@kde.org" << "\" editor=\"" << "kimageshop"
+      << "\" mime=\"" << "application/x-kimageshop" << "\" >" << endl;
+
+  out << otag << "<PAPER format=\"" << paperFormatString().ascii() << "\" orientation=\"" << orientationString().ascii() << "\">" << endl;
+  out << indent << "<PAPERBORDERS left=\"" << leftBorder() << "\" top=\"" << topBorder() << "\" right=\"" << rightBorder()
+      << " bottom=\"" << bottomBorder() << "\"/>" << endl;
+  out << indent << "<HEAD left=\"" << headLeft().ascii() << "\" center=\"" << headMid().ascii() << "\" right=\"" << headRight().ascii() << "\"/>" << endl;
+  out << indent << "<FOOT left=\"" << footLeft().ascii() << "\" center=\"" << footMid().ascii() << "\" right=\"" << footRight().ascii() << "\"/>" << endl;
+  out << etag << "</PAPER>" << endl;
+
+  out << etag << "</DOC>" << endl;
+
+  setModified( FALSE );
+
+  return true;
+}
+
+bool KImageShopDoc::completeSaving( KOStore::Store_ptr _store )
+{
+  CORBA::String_var u = url();
+  QString u2 = u.in();
+  u2 += "/image";
+
+  _store->open( u2, "image/bmp" );
+  {
+    ostorestream out( _store );
+    out << m_image;
+    out.flush();
+  }
+  _store->close();
+
+  return true;
+}
+
+/*
+bool KImageShopDoc::loadBinary( istream& _stream, bool _randomaccess, KOStore::Store_ptr _store )
+{
+  kdebug( KDEBUG_INFO, 0, "------------------------ LOADING --------------------" );
+
+  // implement binary loading here.  
+
+  kdebug( KDEBUG_INFO, 0, "--------------------- LOADING DONE ------------------" );
+}
+*/
+
+bool KImageShopDoc::loadXML( KOMLParser& parser, KOStore::Store_ptr _store )
+{
+  kdebug( KDEBUG_INFO, 0, "------------------------ LOADING --------------------" );
+
+  string tag;
+  vector<KOMLAttrib> lst;
+  string name;
+
+  // DOC
+  if ( !parser.open( "DOC", tag ) )
+  {
+    kdebug( KDEBUG_INFO, 0, "Missing DOC" );
+    return false;
+  }
+
+  KOMLParser::parseTag( tag.c_str(), name, lst );
+  vector<KOMLAttrib>::const_iterator it = lst.begin();
+  for( ; it != lst.end(); it++ )
+  {
+    if ( it->m_strName == "mime" )
+    {
+      if ( it->m_strValue != "application/x-kimageshop" )
+      {
+		kdebug( KDEBUG_INFO, 0, "Unknown mime type %s", it->m_strValue.c_str() );
+		return false;
+      }
+    }
+  }
+
+  QString format = "A4", orientation = "Portrait";
+  float left = 20.0, right = 20.0, bottom = 20.0, top = 20.0;
+  QString hl="", hm="", hr="";
+  QString fl="", fm="", fr="";
+
+  // PAPER
+  while( parser.open( 0L, tag ) )
+  {
+    KOMLParser::parseTag( tag.c_str(), name, lst );
+
+    if ( name == "PAPER" )
+    {
+      KOMLParser::parseTag( tag.c_str(), name, lst );
+      vector<KOMLAttrib>::const_iterator it = lst.begin();
+      for( ; it != lst.end(); it++ )
+      {
+		if ( it->m_strName == "format" )
+		{
+		  format = it->m_strValue.c_str();
+		}
+		else if ( it->m_strName == "orientation" )
+		{
+		  orientation = it->m_strValue.c_str();
+		}
+		else
+		  kdebug( KDEBUG_INFO, 0, "Unknown attrib PAPER:'%s'",it->m_strName.c_str() );
+      }
+
+      // PAPERBORDERS, HEAD, FOOT
+      while( parser.open( 0L, tag ) )
+      {
+		KOMLParser::parseTag( tag.c_str(), name, lst );
+
+		if ( name == "PAPERBORDERS" )
+		{
+		  KOMLParser::parseTag( tag.c_str(), name, lst );
+		  vector<KOMLAttrib>::const_iterator it = lst.begin();
+		  for( ; it != lst.end(); it++ )
+		  {
+		    if ( it->m_strName == "left" )
+		    {
+		      left = atof( it->m_strValue.c_str() );
+		    }
+		    else if ( it->m_strName == "top" )
+		    {
+		      top = atof( it->m_strValue.c_str() );
+		    }
+		    else if ( it->m_strName == "right" )
+		    {
+		      right = atof( it->m_strValue.c_str() );
+		    }
+		    else if ( it->m_strName == "bottom" )
+		    {
+		      bottom = atof( it->m_strValue.c_str() );
+		    }
+		    else
+		      kdebug( KDEBUG_INFO, 0, "Unknown attrib 'PAPERBORDERS:%s'", it->m_strName.c_str() );
+		  }
+		}
+      	else if ( name == "HEAD" )
+		{
+		  KOMLParser::parseTag( tag.c_str(), name, lst );
+		  vector<KOMLAttrib>::const_iterator it = lst.begin();
+		  for( ; it != lst.end(); it++ )
+		  {
+		    if ( it->m_strName == "left" )
+		    {
+		      hl = it->m_strValue.c_str();
+		    }
+		    else if ( it->m_strName == "center" )
+		    {
+		      hm = it->m_strValue.c_str();
+		    }
+		    else if ( it->m_strName == "right" )
+		    {
+		      hr = it->m_strValue.c_str();
+		    }
+	        else
+	          kdebug( KDEBUG_INFO, 0, "Unknown attrib 'HEAD:%s'", it->m_strName.c_str() );
+	      }
+	    }
+        else if ( name == "FOOT" )
+	    {
+		  KOMLParser::parseTag( tag.c_str(), name, lst );
+		  vector<KOMLAttrib>::const_iterator it = lst.begin();
+		  for( ; it != lst.end(); it++ )
+		  {
+	 	    if ( it->m_strName == "left" )
+	        {
+	          fl = it->m_strValue.c_str();
+	        }
+	        else if ( it->m_strName == "center" )
+	        {
+	        	fm = it->m_strValue.c_str();
+	        }
+	        else if ( it->m_strName == "right" )
+	        {
+	          fr = it->m_strValue.c_str();
+	        }
+	        else
+	          kdebug( KDEBUG_INFO, 0, "Unknown attrib 'FOOT:%s'", it->m_strName.c_str() );
+	      }
+	    }
+	    else
+		  kdebug( KDEBUG_INFO, 0, "Unknown tag '%s' in PAPER", tag.c_str() );
+	
+	    if ( !parser.close( tag ) )
+        {
+	      kdebug( KDEBUG_INFO, 0, "ERROR: Closing PAPER" );
+	      return false;
+	    }
+      }
+    }
+    else
+      kdebug( KDEBUG_INFO, 0, "Unknown tag '%s' in DOC", tag.c_str() );
+
+    if ( !parser.close( tag ) )
+    {
+      kdebug( KDEBUG_INFO, 0, "ERROR: Closing DOC" );
+      return false;
+    }
+  }
+
+  parser.close( tag );
+
+  setPaperLayout( left, top, right, bottom, format, orientation );
+  setHeadFootLine( hl, hm, hr, fl, fm, fr );
+
+  kdebug( KDEBUG_INFO, 0, "------------------------ LOADING DONE --------------------" );
+
+  return true;
+}
+
+bool KImageShopDoc::completeLoading( KOStore::Store_ptr _store )
+{
+  kdebug( KDEBUG_INFO, 0, "------------------------ COMPLETION DONE --------------------" );
+
+  CORBA::String_var str = url();
+  QString u = str.in();
+  u += "/image";
+  _store->open( u, 0L );
+  {
+    istorestream in( _store );
+    in >> m_image;
+  }
+  _store->close();
+
+  m_bModified = false;
+  m_bEmpty = false;
+
+  emit sigUpdateView();
+
+  return true;
+}
+
+void KImageShopDoc::print( QPaintDevice* _dev )
+{
+  QPainter painter;
+  painter.begin( _dev );
+
+  // HACK
+  int pagenr = 1;
+  QString m_strName = "";
+
+  // print head line
+  QFont font( "Times", 10 );
+  painter.setFont( font );
+  QFontMetrics fm = painter.fontMetrics();
+  int w = fm.width( headLeft( pagenr, m_strName ) );
+  if ( w > 0 )
+    painter.drawText( (int)( MM_TO_POINT * leftBorder() ),
+		      (int)( MM_TO_POINT * 10.0 ), headLeft( pagenr, m_strName ) );
+  w = fm.width( headMid( pagenr, m_strName ) );
+  if ( w > 0 )
+    painter.drawText( (int)( MM_TO_POINT * leftBorder() +
+			     ( MM_TO_POINT * printableWidth() - (float)w ) / 2.0 ),
+		      (int)( MM_TO_POINT * 10.0 ), headMid( pagenr, m_strName ) );
+  w = fm.width( headRight( pagenr, m_strName ) );
+  if ( w > 0 )
+    painter.drawText( (int)( MM_TO_POINT * leftBorder() +
+			     MM_TO_POINT * printableWidth() - (float)w ),
+		      (int)( MM_TO_POINT * 10.0 ), headRight( pagenr, m_strName ) );
+
+  // print foot line
+  w = fm.width( footLeft( pagenr, m_strName ) );
+  if ( w > 0 )
+    painter.drawText( (int)( MM_TO_POINT * leftBorder() ),
+		      (int)( MM_TO_POINT * ( paperHeight() - 10.0 ) ),
+		      footLeft( pagenr, m_strName ) );
+  w = fm.width( footMid( pagenr, m_strName ) );
+  if ( w > 0 )
+    painter.drawText( (int)( MM_TO_POINT * leftBorder() +
+			     ( MM_TO_POINT * printableWidth() - (float)w ) / 2.0 ),
+		      (int)( MM_TO_POINT * ( paperHeight() - 10.0 ) ),
+		      footMid( pagenr, m_strName ) );
+  w = fm.width( footRight( pagenr, m_strName ) );
+  if ( w > 0 )
+    painter.drawText( (int)( MM_TO_POINT * leftBorder() +
+			     MM_TO_POINT * printableWidth() - (float)w ),
+		      (int)( MM_TO_POINT * ( paperHeight() - 10.0 ) ),
+		      footRight( pagenr, m_strName ) );
+
+  painter.translate( MM_TO_POINT * m_leftBorder, MM_TO_POINT * m_topBorder );
+
+  // Print centered
+  painter.drawImage( ( MM_TO_POINT * printableWidth() - m_image.width() ) / 2,
+		     ( MM_TO_POINT * printableHeight() - m_image.height() ) / 2,
+		     m_image );
+
+  painter.end();
+}
+
+void KImageShopDoc::draw( QPaintDevice* _dev, CORBA::Long _width, CORBA::Long _height,
+		      CORBA::Float _scale )
+{
+  kdebug( KDEBUG_INFO, 0, "DRAWING w=%li h=%li", _width, _height );
+
+  QPainter painter;
+  painter.begin( _dev );
+
+  if ( _scale != 1.0 )
+    painter.scale( _scale, _scale );
+
+  // Print centered
+  int x = ( _width - m_image.width() ) / 2;
+  int y = ( _height - m_image.height() ) / 2;
+  QPoint p( x, y );
+
+  QRect rect;
+  if ( x >= 0 )
+  {
+    rect.setLeft( 0 );
+    rect.setWidth( m_image.width() );
+  }
+  else
+  {
+    rect.setLeft( -x );
+    rect.setWidth( m_image.width() + 2*x );
+  }
+  if ( y >= 0 )
+  {
+    rect.setTop( 0 );
+    rect.setHeight( m_image.height() );
+  }
+  else
+  {
+    rect.setTop( -x );
+    rect.setHeight( m_image.height() + 2*x );
+  }
+
+  painter.drawImage( p, m_image, rect );
+
+  painter.end();
+}
+
+void KImageShopDoc::paperLayoutDlg()
+{
+  KoPageLayout pl;
+  pl.format = paperFormat();
+  pl.orientation = orientation();
+  pl.unit = PG_MM;
+  pl.width = m_paperWidth;
+  pl.height = m_paperHeight;
+  pl.left = leftBorder();
+  pl.right = rightBorder();
+  pl.top = topBorder();
+  pl.bottom = bottomBorder();
+
+  KoHeadFoot hf;
+  hf.headLeft = headLeft();
+  hf.headRight = headRight();
+  hf.headMid = headMid();
+  hf.footLeft = footLeft();
+  hf.footRight = footRight();
+  hf.footMid = footMid();
+
+  if ( !KoPageLayoutDia::pageLayout( pl, hf, FORMAT_AND_BORDERS | HEADER_AND_FOOTER ) )
+    return;
+
+  if ( pl.format == PG_CUSTOM )
+  {
+    m_paperWidth = pl.width;
+    m_paperHeight = pl.height;
+  }
+
+  setPaperLayout( pl.left, pl.top, pl.right, pl.bottom, pl.format, pl.orientation );
+
+  setHeadFootLine( hf.headLeft, hf.headMid, hf.headRight, hf.footLeft, hf.footMid, hf.footRight );
+
+  emit sigUpdateView();
+}
+
+void KImageShopDoc::setHeadFootLine( const char *_headl, const char *_headm, const char *_headr,
+				    const char *_footl, const char *_footm, const char *_footr )
+{
+  m_headLeft = _headl;
+  m_headRight = _headr;
+  m_headMid = _headm;
+  m_footLeft = _footl;
+  m_footRight = _footr;
+  m_footMid = _footm;
+
+  m_bModified = TRUE;
+}
+
+void KImageShopDoc::setPaperLayout( float _leftBorder, float _topBorder, float _rightBorder, float _bottomBorder,
+				const char * _paper, const char* _orientation )
+{
+    KoFormat f = paperFormat();
+    KoOrientation o = orientation();
+
+    if ( strcmp( "A3", _paper ) == 0L )
+	f = PG_DIN_A3;
+    else if ( strcmp( "A4", _paper ) == 0L )
+	f = PG_DIN_A4;
+    else if ( strcmp( "A5", _paper ) == 0L )
+	f = PG_DIN_A5;
+    else if ( strcmp( "B5", _paper ) == 0L )
+	f = PG_DIN_B5;
+    else if ( strcmp( "Executive", _paper ) == 0L )
+	f = PG_US_EXECUTIVE;
+    else if ( strcmp( "Letter", _paper ) == 0L )
+	f = PG_US_LETTER;
+    else if ( strcmp( "Legal", _paper ) == 0L )
+	f = PG_US_LEGAL;
+    else if ( strcmp( "Screen", _paper ) == 0L )
+	f = PG_SCREEN;
+    else if ( strcmp( "Custom", _paper ) == 0L )
+    {
+      m_paperWidth = 0.0;
+      m_paperHeight = 0.0;
+      f = PG_CUSTOM;
+      QString tmp( _paper );
+      m_paperWidth = atof( _paper );
+      int i = tmp.find( 'x' );
+      if ( i != -1 )
+	m_paperHeight = atof( tmp.data() + i + 1 );
+      if ( m_paperWidth < 10.0 )
+	m_paperWidth = PG_A4_WIDTH;
+      if ( m_paperHeight < 10.0 )
+	m_paperWidth = PG_A4_HEIGHT;
+    }
+
+    if ( strcmp( "Portrait", _orientation ) == 0L )
+	o = PG_PORTRAIT;
+    else if ( strcmp( "Landscape", _orientation ) == 0L )
+	o = PG_LANDSCAPE;
+
+    setPaperLayout( _leftBorder, _topBorder, _rightBorder, _bottomBorder, f, o );
+}
+
+void KImageShopDoc::setPaperLayout( float _leftBorder, float _topBorder, float _rightBorder, float _bottomBorder,
+				   KoFormat _paper, KoOrientation _orientation )
+{
+  m_leftBorder = _leftBorder;
+  m_rightBorder = _rightBorder;
+  m_topBorder = _topBorder;
+  m_bottomBorder = _bottomBorder;
+  m_orientation = _orientation;
+  m_paperFormat = _paper;
+
+  calcPaperSize();
+
+  m_bModified = TRUE;
+}
+
+QString KImageShopDoc::completeHeading( const char *_data, int _page, const char *_table )
+{
+  /* QString page;
+    page.sprintf( "%i", _page );
+    QString f = m_strFileURL.data();
+    if ( f.isNull() )
+	f = "";
+    QString n = "";
+    if ( f != "" )
+    {
+	KURL u( f.data() );
+	n = u.filename();
+	} */
+    QString t = QTime::currentTime().toString().copy();
+    QString d = QDate::currentDate().toString().copy();
+
+    QString tmp = _data;
+    int pos = 0;
+    /* while ( ( pos = tmp.find( "<file>", pos ) ) != -1 )
+       tmp.replace( pos, 6, f.data() ); */
+    pos = 0;
+    /* while ( ( pos = tmp.find( "<name>", pos ) ) != -1 )
+       tmp.replace( pos, 6, n.data() ); */
+    pos = 0;
+    while ( ( pos = tmp.find( "<time>", pos ) ) != -1 )
+	tmp.replace( pos, 6, t.data() );
+    pos = 0;
+    while ( ( pos = tmp.find( "<date>", pos ) ) != -1 )
+	tmp.replace( pos, 6, d.data() );
+    pos = 0;
+    while ( ( pos = tmp.find( "<author>", pos ) ) != -1 )
+	tmp.replace( pos, 8, "??" );
+    pos = 0;
+    while ( ( pos = tmp.find( "<email>", pos ) ) != -1 )
+	tmp.replace( pos, 7, "??" );
+
+    return QString( tmp.data() );
+}
+
+void KImageShopDoc::calcPaperSize()
+{
+    switch( m_paperFormat )
+    {
+    case PG_DIN_A5:
+        m_paperWidth = PG_A5_WIDTH;
+	m_paperHeight = PG_A5_HEIGHT;
+	break;
+    case PG_DIN_A4:
+	m_paperWidth = PG_A4_WIDTH;
+	m_paperHeight = PG_A4_HEIGHT;
+	break;
+    case PG_DIN_A3:
+	m_paperWidth = PG_A3_WIDTH;
+	m_paperHeight = PG_A3_HEIGHT;
+	break;
+    case PG_DIN_B5:
+	m_paperWidth = PG_B5_WIDTH;
+	m_paperHeight = PG_B5_HEIGHT;
+	break;
+    case PG_US_EXECUTIVE:
+	m_paperWidth = PG_US_EXECUTIVE_WIDTH;
+	m_paperHeight = PG_US_EXECUTIVE_HEIGHT;
+	break;
+    case PG_US_LETTER:
+	m_paperWidth = PG_US_LETTER_WIDTH;
+	m_paperHeight = PG_US_LETTER_HEIGHT;
+	break;
+    case PG_US_LEGAL:
+	m_paperWidth = PG_US_LEGAL_WIDTH;
+	m_paperHeight = PG_US_LEGAL_HEIGHT;
+	break;
+    case PG_SCREEN:
+        m_paperWidth = PG_SCREEN_WIDTH;
+        m_paperHeight = PG_SCREEN_HEIGHT;
+    case PG_CUSTOM:
+        return;
+    }
+}
+
+QString KImageShopDoc::paperFormatString()
+{
+  QString paperFormatStr;
+  
+  switch( m_paperFormat )
+  {
+    case PG_DIN_A5:
+	  paperFormatStr = "A5";
+	  break;
+    case PG_DIN_A4:
+	  paperFormatStr = "A4";
+	  break;
+    case PG_DIN_A3:
+	  paperFormatStr = "A3";
+	  break;
+    case PG_DIN_B5:
+	  paperFormatStr = "B5";
+	  break;
+    case PG_US_EXECUTIVE:
+	  paperFormatStr = "Executive";
+	  break;
+    case PG_US_LETTER:
+	  paperFormatStr = "Letter";
+	  break;
+    case PG_US_LEGAL:
+	  paperFormatStr = "Legal";
+	  break;
+    case PG_SCREEN:
+	  paperFormatStr = "Screen";
+	  break;
+    case PG_CUSTOM:
+      QString tmp;
+      tmp.sprintf( "%fx%f", m_paperWidth, m_paperHeight );
+      paperFormatStr = tmp;
+  }
+  return paperFormatStr;
+}
+
+QString KImageShopDoc::orientationString()
+{
+  QString orientationStr;
+  
+  switch( m_orientation )
+  {
+    case QPrinter::Portrait :
+      orientationStr = "Portrait";
+      break;
+    case QPrinter::Landscape :
+      orientationStr = "Landscape";
+      break;
+  }
+  return orientationStr;
+}
+
+bool KImageShopDoc::openDocument( const char *_filename, const char *_format )
+{
+  if ( !m_image.load( _filename, _format ) )
+    return false;
+
+  if ( _format )
+    m_strImageFormat = _format;
+  else
+    m_strImageFormat = QImage::imageFormat( _filename );
+
+  emit sigUpdateView();
+
+  m_bModified = true;
+  m_bEmpty = false;
+
+  return true;
+}
+
+bool KImageShopDoc::saveDocument( const char *_filename, const char *_format )
+{
+  ASSERT( !isEmpty() );
+
+  return m_image.save( _filename, m_strImageFormat );
+}
+
+void KImageShopDoc::transformImage( const QWMatrix& matrix )
+{
+  QPixmap pix, newpix;
+
+  pix.convertFromImage( m_image );
+  newpix = pix.xForm( matrix );
+  m_image = newpix.convertToImage();
+  emit sigUpdateView();
+  m_bModified = true;
+  m_bEmpty = false;
+
+  kdebug( KDEBUG_INFO, 0, "Image manipulated with matrix" );
+}
+
+char* KImageShopDoc::mimeType()
+{
+  return CORBA::string_dup( MIME_TYPE );
+}
+
+CORBA::Boolean KImageShopDoc::isModified()
+{
+  return m_bModified;
+}
+
+void KImageShopDoc::setModified( bool _c )
+{
+  m_bModified = _c;
+  if ( _c )
+  {
+    m_bEmpty = false;
+  }
+}
+
+bool KImageShopDoc::isEmpty()
+{
+  return m_bEmpty;
+}
+
+float KImageShopDoc::printableWidth()
+{
+  return m_paperWidth - m_leftBorder - m_rightBorder;
+}
+
+float KImageShopDoc::printableHeight()
+{
+  return m_paperHeight - m_topBorder - m_bottomBorder;
+}
+
+float KImageShopDoc::paperHeight()
+{
+  return m_paperHeight;
+}
+
+float KImageShopDoc::paperWidth()
+{
+  return m_paperWidth;
+}
+  
+float KImageShopDoc::leftBorder()
+{
+  return m_leftBorder;
+}
+
+float KImageShopDoc::rightBorder()
+{
+  return m_rightBorder;
+}
+
+float KImageShopDoc::topBorder()
+{
+  return m_topBorder;
+}
+
+float KImageShopDoc::bottomBorder()
+{
+  return m_bottomBorder;
+}
+
+KoOrientation KImageShopDoc::orientation()
+{
+  return m_orientation;
+}
+
+KoFormat KImageShopDoc::paperFormat()
+{
+  return m_paperFormat;
+}
+
+QString KImageShopDoc::headLeft( int _p, const char* _t )
+{
+  if( m_headLeft.isNull() )
+  {
+    return "";
+  }
+  return completeHeading( m_headLeft.data(), _p, _t );
+}
+
+QString KImageShopDoc::headRight( int _p, const char* _t )
+{
+  if( m_headRight.isNull() )
+  {
+    return "";
+  }
+  return completeHeading( m_headRight.data(), _p, _t );
+}
+
+QString KImageShopDoc::headMid( int _p, const char* _t )
+{
+  if( m_headMid.isNull() )
+  {
+    return "";
+  }
+  return completeHeading( m_headMid.data(), _p, _t );
+}
+
+QString KImageShopDoc::footLeft( int _p, const char* _t )
+{
+  if( m_footLeft.isNull() )
+  {
+    return "";
+  }
+  return completeHeading( m_footLeft.data(), _p, _t );
+}
+
+QString KImageShopDoc::footMid( int _p, const char* _t )
+{
+  if( m_footMid.isNull() )
+  {
+    return "";
+  }
+  return completeHeading( m_footMid.data(), _p, _t );
+}
+
+QString KImageShopDoc::footRight( int _p, const char* _t )
+{
+  if( m_footRight.isNull() )
+  {
+    return "";
+  }
+  return completeHeading( m_footRight.data(), _p, _t );
+}
+
+QString KImageShopDoc::headLeft()
+{
+  if( m_headLeft.isNull() )
+  {
+    return "";
+  }
+  return m_headLeft.data();
+}
+
+QString KImageShopDoc::headMid()
+{
+  if( m_headMid.isNull() )
+  {
+    return "";
+  }
+  return m_headMid.data();
+}
+
+QString KImageShopDoc::headRight()
+{
+  if( m_headRight.isNull() )
+  {
+    return "";
+  }
+  return m_headRight.data();
+}
+
+QString KImageShopDoc::footLeft()
+{
+  if( m_footLeft.isNull() )
+  {
+    return "";
+  }
+  return m_footLeft.data();
+}
+
+QString KImageShopDoc::footMid()
+{
+  if( m_footMid.isNull() )
+  {
+    return "";
+  }
+  return m_footMid.data();
+}
+
+QString KImageShopDoc::footRight()
+{
+  if( m_footRight.isNull() )
+  {
+    return "";
+  }
+  return m_footRight.data();
+}
+
+const QImage& KImageShopDoc::image()
+{
+  return m_image;
+}
+
+KImageShopDoc::~KImageShopDoc()
+{
+}
+
+#include "kimageshop_doc.moc"
diff --git a/kimageshop/kimageshop_doc.h b/kimageshop/kimageshop_doc.h
new file mode 100644
index 0000000000..057733768f
--- /dev/null
+++ b/kimageshop/kimageshop_doc.h
@@ -0,0 +1,263 @@
+/* This file is part of the KDE project
+   Copyright (C) 1998, 1999 Torben Weis <weis@kde.org>
+ 
+   This library is free software; you can redistribute it and/or
+   modify it under the terms of the GNU Library General Public
+   License as published by the Free Software Foundation; either
+   version 2 of the License, or (at your option) any later version.
+ 
+   This library is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   Library General Public License for more details.
+ 
+   You should have received a copy of the GNU Library General Public License
+   along with this library; see the file COPYING.LIB.  If not, write to
+   the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+   Boston, MA 02111-1307, USA.
+*/     
+
+#ifndef __kimageshop_doc_h__
+#define __kimageshop_doc_h__
+
+#include <qlist.h>
+#include <qobject.h>
+#include <qstring.h>
+#include <qimage.h>
+
+#include <koFrame.h>
+#include <koDocument.h>
+#include <koPrintExt.h>
+#include <koPageLayoutDia.h>
+
+#include "kimageshop.h"
+#include "kimageshop_view.h"
+
+#define MIME_TYPE "application/x-kimageshop"
+#define EDITOR "IDL:KImageShop/Document:1.0"
+
+class KImageShopDoc : public QObject,
+                  virtual public KoDocument,
+                  virtual public KoPrintExt,
+                  virtual public KImageShop::Document_skel
+{
+  Q_OBJECT
+
+public:
+  KImageShopDoc();
+  ~KImageShopDoc();
+
+  virtual bool save( ostream&, const char* _format );
+  virtual bool completeSaving( KOStore::Store_ptr _store );
+  virtual bool hasToWriteMultipart() { return true; }
+  virtual bool loadXML( KOMLParser&, KOStore::Store_ptr _store );
+  virtual void cleanUp();
+  virtual void removeView( KImageShopView* _view );
+
+  // C++
+  virtual KImageShopView* createImageView( QWidget* _parent = 0 );
+
+  virtual CORBA::Boolean initDoc();
+  virtual KOffice::MainWindow_ptr createMainWindow();
+
+  /**
+   * Wrapper for @ref #createImageView
+   */
+  virtual OpenParts::View_ptr createView();
+  virtual void viewList( OpenParts::Document::ViewList*& _list );
+  virtual char* mimeType();
+  virtual CORBA::Boolean isModified();
+  virtual int viewCount();
+  virtual void setModified( bool _c );
+  virtual bool isEmpty();
+  virtual void print( QPaintDevice* _dev );
+  virtual void draw( QPaintDevice* _dev, CORBA::Long _width, CORBA::Long _height, CORBA::Float _scale );
+  void paperLayoutDlg();
+
+  /**
+   * @return the printable width of the paper in millimeters.
+   */
+  float printableWidth();
+
+  /**
+   * @return the printable height of the paper in millimeters.
+   */
+  float printableHeight();
+  float paperHeight();
+  float paperWidth();
+  
+  /**
+   * @return the left border in millimeters
+   */
+  float leftBorder();
+  
+  /**
+   * @return the right border in millimeters
+   */
+  float rightBorder();
+  
+  /**
+   * @return the top border in millimeters
+   */
+  float topBorder();
+  
+  /**
+   * @return the bottom border in millimeters
+   */
+  float bottomBorder();
+  
+  /**
+   * @return the orientation of the paper.
+   */
+  KoOrientation orientation();
+  
+  /**
+   * @return the paper format.
+   */
+  KoFormat paperFormat();
+  
+  /**
+   * Changes the paper layout and repaints the currently displayed KSpreadTable.
+   */
+  void setPaperLayout( float _leftBorder, float _topBorder, float _rightBorder, float _bottomBoder, KoFormat _paper, KoOrientation orientation );
+  void setPaperLayout( float _leftBorder, float _topBorder, float _rightBorder, float _bottomBorder, const char * _paper, const char* _orientation );
+  void setHeadFootLine( const char* _headl, const char* _headm, const char* _headr,	const char* _footl, const char* _footm, const char* _footr );
+  QString headLeft( int _p, const char* _t );
+  QString headMid( int _p, const char* _t );
+  QString headRight( int _p, const char* _t );
+  QString footLeft( int _p, const char* _t );
+  QString footMid( int _p, const char* _t );
+  QString footRight( int _p, const char* _t );
+  QString completeHeading( const char* _data, int _page, const char* _table );
+  QString headLeft();
+  QString headMid();
+  QString headRight();
+  QString footLeft();
+  QString footMid();
+  QString footRight();
+  void calcPaperSize();
+  QString orientationString();
+  QString paperFormatString();
+  bool openDocument( const char* _filename, const char* _format = 0L );
+  bool saveDocument( const char* _filename, const char* _format = 0L );
+
+  /**
+   * Returns the image, that is stored in the document.
+   * 
+   * @result The returned image.
+   */
+  const QImage& image();
+
+  /**
+   * Transforms the image with the given matrix.
+   * 
+   * @param The matrix to transform the image.
+   */
+  void transformImage( const QWMatrix& matrix );
+  
+signals:
+  // Document signals
+  void sigUpdateView();
+  
+protected:
+  virtual bool completeLoading( KOStore::Store_ptr /* _store */ );
+
+  /**
+   * Indicates whether an image is loaded or not.
+   */
+  bool m_bEmpty;
+
+  /**
+   * List of views, that are connectet to the document.
+   */
+  QList<KImageShopView> m_lstViews;
+
+  /**
+   * The orientation of the paper.
+   */
+  KoOrientation m_orientation;
+
+  /**
+   * Tells about the currently seleced paper size.
+   */
+  KoFormat m_paperFormat;
+
+  /**
+   * The paper width in millimeters. Dont change this value, it is calculated by
+   * @ref #calcPaperSize from the value @ref #m_paperFormat.
+   */
+  float m_paperWidth;
+
+  /**
+   * The paper height in millimeters. Dont change this value, it is calculated by
+   * @ref #calcPaperSize from the value @ref #m_paperFormat.
+   */
+  float m_paperHeight;    
+
+  /**
+   * The left border in millimeters.
+   */
+  float m_leftBorder;
+
+  /**
+   * The right border in millimeters.
+   */
+  float m_rightBorder;
+
+  /**
+   * The top border in millimeters.
+   */
+  float m_topBorder;
+
+  /**
+   * The right border in millimeters.
+   */
+  float m_bottomBorder;
+
+  /**
+   * The text in the left field of the headline.
+   */
+  QString m_headLeft;
+
+  /**
+   * The text in the right field of the headline.
+   */
+  QString m_headRight;
+
+  /**
+   * The text in the middle field of the headline.
+   */
+  QString m_headMid;
+
+  /**
+   * The text in the left field of the footline.
+   */
+  QString m_footLeft;
+
+  /**
+   * The text in the right field of the footline.
+   */
+  QString m_footRight;
+
+  /**
+   * The text in the middle field of the footline.
+   */
+  QString m_footMid;
+
+  /**
+   * The image, that is stored in the document.
+   */
+  QImage m_image;
+
+  /**
+   * The image format of the image in the document.
+   */
+
+// TODO
+// make this private
+public:
+  QString m_strImageFormat;
+  bool m_executeCommand;
+};
+
+#endif
diff --git a/kimageshop/kimageshop_main.cc b/kimageshop/kimageshop_main.cc
new file mode 100644
index 0000000000..91b29163d9
--- /dev/null
+++ b/kimageshop/kimageshop_main.cc
@@ -0,0 +1,59 @@
+/* This file is part of the KDE project
+   Copyright (C) 1998, 1999 Torben Weis <weis@kde.org>
+ 
+   This library is free software; you can redistribute it and/or
+   modify it under the terms of the GNU Library General Public
+   License as published by the Free Software Foundation; either
+   version 2 of the License, or (at your option) any later version.
+ 
+   This library is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   Library General Public License for more details.
+ 
+   You should have received a copy of the GNU Library General Public License
+   along with this library; see the file COPYING.LIB.  If not, write to
+   the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+   Boston, MA 02111-1307, USA.
+*/     
+
+#include <qprinter.h>
+
+#include <opAutoLoader.h>
+
+#include <koIMR.h>
+#include <koFactory.h>
+#include <koDocument.h>
+#include <koQueryTypes.h>
+
+#include "kimageshop_shell.h"
+#include "kimageshop_main.h"
+#include "kimageshop_doc.h"
+#include "kimageshop.h"
+
+KOFFICE_DOCUMENT_FACTORY( KImageShopDoc, KImageShopFactory, KImageShop::DocumentFactory_skel )
+typedef OPAutoLoader<KImageShopFactory> KImageShopAutoLoader;
+
+KImageShopApp::KImageShopApp( int& argc, char** argv ) 
+  : KoApplication( argc, argv, "kimageshop" )
+{
+}
+
+KoMainWindow* KImageShopApp::createNewShell()
+{
+  return new KImageShopShell;
+}
+
+int main( int argc, char** argv )
+{
+  KImageShopAutoLoader loader( "IDL:KImageShop/DocumentFactory:1.0", "KImageShop" );
+  KImageShopApp app( argc, argv );
+
+  debug( "MICHAEL KOCH : TEST" );
+
+  app.exec();
+
+  return 0;
+}
+
+#include "kimageshop_main.moc"
diff --git a/kimageshop/kimageshop_main.h b/kimageshop/kimageshop_main.h
new file mode 100644
index 0000000000..82098b9bf1
--- /dev/null
+++ b/kimageshop/kimageshop_main.h
@@ -0,0 +1,38 @@
+/* This file is part of the KDE project
+   Copyright (C) 1998, 1999 Torben Weis <weis@kde.org>
+ 
+   This library is free software; you can redistribute it and/or
+   modify it under the terms of the GNU Library General Public
+   License as published by the Free Software Foundation; either
+   version 2 of the License, or (at your option) any later version.
+ 
+   This library is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   Library General Public License for more details.
+ 
+   You should have received a copy of the GNU Library General Public License
+   along with this library; see the file COPYING.LIB.  If not, write to
+   the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+   Boston, MA 02111-1307, USA.
+*/     
+
+#ifndef __kimageshop_main_h__
+#define __kimageshop_main_h__
+
+#include <koApplication.h>
+
+class KImageShopShell;
+
+class KImageShopApp : public KoApplication
+{
+  Q_OBJECT
+
+public:
+  KImageShopApp( int& argc, char** argv );
+  ~KImageShopApp() { };
+
+  virtual KoMainWindow* createNewShell();
+};
+
+#endif
diff --git a/kimageshop/kimageshop_shell.cc b/kimageshop/kimageshop_shell.cc
new file mode 100644
index 0000000000..4cde841821
--- /dev/null
+++ b/kimageshop/kimageshop_shell.cc
@@ -0,0 +1,398 @@
+/* This file is part of the KDE project
+   Copyright (C) 1998, 1999 Torben Weis <weis@kde.org>
+
+   This library is free software; you can redistribute it and/or
+   modify it under the terms of the GNU Library General Public
+   License as published by the Free Software Foundation; either
+   version 2 of the License, or (at your option) any later version.
+
+   This library is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   Library General Public License for more details.
+
+   You should have received a copy of the GNU Library General Public License
+   along with this library; see the file COPYING.LIB.  If not, write to
+   the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+   Boston, MA 02111-1307, USA.
+*/
+
+#include <qprinter.h>
+#include <qmsgbox.h>
+
+#include <qtimer.h>
+#include <qstring.h>
+
+#include <klocale.h>
+#include <kfiledialog.h>
+#include <kapp.h>
+#include <klocale.h>
+
+#include <opMainWindowIf.h>
+#include <koAboutDia.h>
+
+#include "kimageshop_shell.h"
+#include "kimageshop_doc.h"
+#include "kimageshop_view.h"
+
+QList<KImageShopShell>* KImageShopShell::s_lstShells = 0L;
+
+KImageShopShell::KImageShopShell()
+{
+  m_pDoc = 0L;
+  m_pView = 0L;
+
+  if ( s_lstShells == 0L )
+    s_lstShells = new QList<KImageShopShell>;
+
+  s_lstShells->append( this );
+}
+
+KImageShopShell::~KImageShopShell()
+{
+  kdebug( KDEBUG_INFO, 0, "KImageShopShell::~KImageShopShell()" );
+
+  cleanUp();
+
+  s_lstShells->removeRef( this );
+}
+
+bool KImageShopShell::isModified()
+{
+  if ( m_pDoc )
+    return (bool)m_pDoc->isModified();
+
+  return false;
+}
+
+bool KImageShopShell::requestClose()
+{
+  int res = QMessageBox::warning( 0L, i18n("Warning"), i18n("The document has been modified\nDo you want to save it ?" ),
+				  i18n("Yes"), i18n("No"), i18n("Cancel") );
+
+  if ( res == 0 )
+    return saveDocument( "", "" );
+
+  if ( res == 1 )
+    return true;
+
+  return false;
+}
+
+void KImageShopShell::cleanUp()
+{
+  releaseDocument();
+
+  KoMainWindow::cleanUp();
+}
+
+void KImageShopShell::setDocument( KImageShopDoc *_doc )
+{
+  if ( m_pDoc )
+    releaseDocument();
+
+  m_pDoc = _doc;
+  m_pDoc->_ref();
+  m_pView = _doc->createImageView( getFrame() );
+  m_pView->incRef();
+  m_pView->setMode( KOffice::View::RootMode );
+  m_pView->setMainWindow( interface() );
+
+  setRootPart( m_pView );
+  interface()->setActivePart( m_pView->id() );
+
+  if( m_pFileMenu )
+  {
+    m_pFileMenu->setItemEnabled( m_idMenuFile_Save, true );
+    m_pFileMenu->setItemEnabled( m_idMenuFile_SaveAs, true );
+    m_pFileMenu->setItemEnabled( m_idMenuFile_Close, true );
+    m_pFileMenu->setItemEnabled( m_idMenuFile_Print, true );
+  }
+
+  opToolBar()->setItemEnabled( TOOLBAR_PRINT, true );
+  opToolBar()->setItemEnabled( TOOLBAR_SAVE, true );
+}
+
+bool KImageShopShell::newDocument()
+{
+  if ( m_pDoc )
+  {
+    KImageShopShell *s = new KImageShopShell();
+    s->show();
+    s->newDocument();
+    return true;
+  }
+
+  m_pDoc = new KImageShopDoc;
+  if ( !m_pDoc->initDoc() )
+  {
+    releaseDocument();
+    kdebug( KDEBUG_FATAL, 0, "ERROR: Could not initialize document" );
+    return false;
+  }
+
+  m_pView = m_pDoc->createImageView( getFrame() );
+  m_pView->incRef();
+  m_pView->setMode( KOffice::View::RootMode );
+  kdebug( KDEBUG_INFO, 0, "*1) VIEW void KOMBase::refcnt() = %li", m_pView->_refcnt() );
+  m_pView->setMainWindow( interface() );
+
+  setRootPart( m_pView );
+  interface()->setActivePart( m_pView->id() );
+
+  if( m_pFileMenu )
+  {
+    m_pFileMenu->setItemEnabled( m_idMenuFile_Save, true );
+    m_pFileMenu->setItemEnabled( m_idMenuFile_SaveAs, true );
+    m_pFileMenu->setItemEnabled( m_idMenuFile_Close, true );
+    m_pFileMenu->setItemEnabled( m_idMenuFile_Print, true );
+  }
+
+  opToolBar()->setItemEnabled( TOOLBAR_PRINT, true );
+  opToolBar()->setItemEnabled( TOOLBAR_SAVE, true );
+
+  kdebug( KDEBUG_INFO, 0, "*2) VIEW void KOMBase::refcnt() = %li", m_pView->_refcnt() );
+
+  return true;
+}
+
+bool KImageShopShell::openDocument( const char *_url, const char *_format )
+{
+  if ( _format == 0L || *_format == 0 )
+    _format = "application/x-kimageshop";
+
+  if ( m_pDoc && m_pDoc->isEmpty() )
+    releaseDocument();
+  else if ( m_pDoc && !m_pDoc->isEmpty() )
+  {
+    KImageShopShell *s = new KImageShopShell();
+    s->show();
+    return s->openDocument( _url, _format );
+  }
+
+  kdebug( KDEBUG_INFO, 0, "Creating new document" );
+
+  m_pDoc = new KImageShopDoc;
+  if ( !m_pDoc->loadFromURL( _url, _format ) )
+    return false;
+
+  m_pView = m_pDoc->createImageView( getFrame() );
+  m_pView->incRef();
+  m_pView->setMode( KOffice::View::RootMode );
+  m_pView->setMainWindow( interface() );
+
+  setRootPart( m_pView );
+  interface()->setActivePart( m_pView->id() );
+
+  if ( m_pFileMenu )
+  {
+    m_pFileMenu->setItemEnabled( m_idMenuFile_SaveAs, true );
+    m_pFileMenu->setItemEnabled( m_idMenuFile_Save, true );
+    m_pFileMenu->setItemEnabled( m_idMenuFile_Close, true );
+    m_pFileMenu->setItemEnabled( m_idMenuFile_Print, true );
+  }
+
+  opToolBar()->setItemEnabled( TOOLBAR_PRINT, true );
+  opToolBar()->setItemEnabled( TOOLBAR_SAVE, true );
+
+  return true;
+}
+
+bool KImageShopShell::saveDocument( const char *_url, const char *_format )
+{
+  ASSERT( m_pDoc != 0L );
+
+  CORBA::String_var url;
+  if ( _url == 0L || *_url == 0 )
+  {
+    url = m_pDoc->url();
+    _url = url.in();
+  }
+
+  QString file;
+  if ( _url == 0L || *_url == 0 )
+  {
+    file = KFileDialog::getSaveFileName( getenv( "HOME" ) );
+
+    if ( file.isNull() )
+      return false;
+    _url = file.data();
+  }
+
+  if ( _format == 0L || *_format == 0 )
+    _format = "application/x-kimageshop";
+
+  return m_pDoc->saveToURL( _url, _format );
+}
+
+bool KImageShopShell::printDlg()
+{
+  ASSERT( m_pView != 0L );
+
+  return m_pView->printDlg();
+}
+
+void KImageShopShell::helpAbout()
+{
+  // KoAboutDia::about( KoAboutDia::KImageShop, "0.0.2" );
+}
+
+bool KImageShopShell::closeDocument()
+{
+  if ( isModified() )
+  {
+    if ( !requestClose() )
+      return false;
+  }
+
+  return true;
+}
+
+bool KImageShopShell::closeAllDocuments()
+{
+  KImageShopShell* s;
+  for( s = s_lstShells->first(); s != 0L; s = s_lstShells->next() )
+  {
+    if ( s->isModified() )
+    {
+      if ( !s->requestClose() )
+	return false;
+    }
+  }
+
+  return true;
+}
+
+int KImageShopShell::documentCount()
+{
+  return s_lstShells->count();
+}
+
+void KImageShopShell::releaseDocument()
+{
+  int views = 0;
+  if ( m_pDoc )
+    views = m_pDoc->viewCount();
+
+  setRootPart( (long unsigned int)(OpenParts::Id)0 );
+
+  interface()->setActivePart( 0 );
+
+  if ( m_pView )
+    m_pView->decRef();
+
+  /* if ( m_pView )
+    m_pView->cleanUp(); */
+
+  if ( m_pDoc && views <= 1 )
+    m_pDoc->cleanUp();
+  // if ( m_pView )
+  // CORBA::release( m_pView );
+  if ( m_pDoc )
+    CORBA::release( m_pDoc );
+  m_pView = 0L;
+  m_pDoc = 0L;
+
+  if ( m_pFileMenu )
+  {
+    m_pFileMenu->setItemEnabled( m_idMenuFile_SaveAs, false );
+    m_pFileMenu->setItemEnabled( m_idMenuFile_Save, false );
+    m_pFileMenu->setItemEnabled( m_idMenuFile_Close, false );
+    m_pFileMenu->setItemEnabled( m_idMenuFile_Print, false );
+  }
+
+  opToolBar()->setItemEnabled( TOOLBAR_PRINT, false );
+  opToolBar()->setItemEnabled( TOOLBAR_SAVE, false );
+}
+
+void KImageShopShell::slotFileNew()
+{
+  if ( !newDocument() )
+    QMessageBox::critical( this, i18n("KImageShop Error"), i18n("Could not create new document"), i18n("OK") );
+}
+
+void KImageShopShell::slotFileOpen()
+{
+  QString file = KFileDialog::getOpenFileName( getenv( "HOME" ) );
+
+  if ( file.isNull() )
+    return;
+
+  if ( !openDocument( file, "" ) )
+  {
+    QString tmp;
+    tmp.sprintf( i18n( "Could not open\n%s" ), file.data() );
+    QMessageBox::critical( this, i18n( "IO Error" ), tmp, i18n( "OK" ) );
+  }
+}
+
+void KImageShopShell::slotFileSave()
+{
+  ASSERT( m_pDoc != 0L );
+
+  CORBA::String_var url = m_pDoc->url();
+  if ( strlen( url.in() ) == 0 )
+  {
+    slotFileSaveAs();
+    return;
+  }
+
+  if ( !saveDocument( url.in(), "" ) )
+  {
+    QString tmp;
+    tmp.sprintf( i18n( "Could not save\n%s" ), url.in() );
+    QMessageBox::critical( this, i18n( "IO Error" ), tmp, i18n( "OK" ) );
+  }
+}
+
+void KImageShopShell::slotFileSaveAs()
+{
+  if ( !saveDocument( "", "" ) )
+  {
+    QString tmp;
+    tmp.sprintf( i18n( "Could not save file" ) );
+    QMessageBox::critical( this, i18n( "IO Error" ), tmp, i18n( "OK" ) );
+  }
+}
+
+void KImageShopShell::slotFileClose()
+{
+  if ( isModified() )
+    if ( !requestClose() )
+      return;
+
+  releaseDocument();
+}
+
+void KImageShopShell::slotFilePrint()
+{
+  ASSERT( m_pView );
+
+  (void)m_pView->printDlg();
+}
+
+void KImageShopShell::slotFileQuit()
+{
+  kdebug( KDEBUG_INFO, 0, "EXIT 1" );
+
+  if ( !closeAllDocuments() )
+    return;
+
+  kdebug( KDEBUG_INFO, 0, "EXIT 2" );
+
+  delete this;
+  kapp->exit();
+}
+
+KOffice::Document_ptr KImageShopShell::document()
+{
+  return KOffice::Document::_duplicate( m_pDoc );
+}
+
+KOffice::View_ptr KImageShopShell::view()
+{
+  return KOffice::View::_duplicate( m_pView );
+}
+
+#include "kimageshop_shell.moc"
+
diff --git a/kimageshop/kimageshop_shell.h b/kimageshop/kimageshop_shell.h
new file mode 100644
index 0000000000..a8b5bd9be2
--- /dev/null
+++ b/kimageshop/kimageshop_shell.h
@@ -0,0 +1,70 @@
+/* This file is part of the KDE project
+   Copyright (C) 1998, 1999 Torben Weis <weis@kde.org>
+ 
+   This library is free software; you can redistribute it and/or
+   modify it under the terms of the GNU Library General Public
+   License as published by the Free Software Foundation; either
+   version 2 of the License, or (at your option) any later version.
+ 
+   This library is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   Library General Public License for more details.
+ 
+   You should have received a copy of the GNU Library General Public License
+   along with this library; see the file COPYING.LIB.  If not, write to
+   the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+   Boston, MA 02111-1307, USA.
+*/     
+
+#ifndef __kimageshop_shell_h__
+#define __kimageshop_shell_h__
+
+#include <qlist.h>
+
+#include <koMainWindow.h>
+
+class KImageShopDoc;
+class KImageShopView;
+
+class KImageShopShell : public KoMainWindow
+{
+  Q_OBJECT
+
+public:
+  KImageShopShell();
+  ~KImageShopShell();
+  virtual void cleanUp();
+  void setDocument( KImageShopDoc* _doc );
+  virtual bool newDocument();
+  virtual bool openDocument( const char* _filename, const char* _format );
+  virtual bool saveDocument( const char* _file, const char* _format );
+  virtual bool closeDocument();
+  virtual bool closeAllDocuments();
+
+protected slots:
+  void slotFileNew();
+  void slotFileOpen();
+  void slotFileSave();
+  void slotFileSaveAs();
+  void slotFilePrint();
+  void slotFileClose();
+  void slotFileQuit();
+
+protected:
+  virtual KOffice::Document_ptr document();
+  virtual KOffice::View_ptr view();
+  virtual bool printDlg();
+  virtual void helpAbout();
+  virtual int documentCount();
+  bool isModified();
+  bool requestClose();
+  void releaseDocument();
+
+  KImageShopDoc* m_pDoc;
+  KImageShopView* m_pView;
+
+  static QList<KImageShopShell>* s_lstShells;
+};
+
+#endif
diff --git a/kimageshop/kimageshop_view.cc b/kimageshop/kimageshop_view.cc
new file mode 100644
index 0000000000..737aa30bb7
--- /dev/null
+++ b/kimageshop/kimageshop_view.cc
@@ -0,0 +1,354 @@
+/* This file is part of the KDE project
+   Copyright (C) 1998, 1999 Torben Weis <weis@kde.org>
+
+   This library is free software; you can redistribute it and/or
+   modify it under the terms of the GNU Library General Public
+   License as published by the Free Software Foundation; either
+   version 2 of the License, or (at your option) any later version.
+
+   This library is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   Library General Public License for more details.
+
+   You should have received a copy of the GNU Library General Public License
+   along with this library; see the file COPYING.LIB.  If not, write to
+   the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+   Boston, MA 02111-1307, USA.
+*/
+
+#include <qprinter.h>
+#include <qmsgbox.h>
+#include <qkeycode.h>
+#include <qprndlg.h>
+#include <qwmatrix.h>
+
+#include <kfiledialog.h>
+#include <kcolordlg.h>
+#include <klocale.h>
+#include <kglobal.h>
+#include <kiconloader.h>
+#include <klineeditdlg.h>
+#include <opUIUtils.h>
+#include <opMainWindow.h>
+#include <opMainWindowIf.h>
+
+#include <koPartSelectDia.h>
+#include <koPrintDia.h>
+#include <koAboutDia.h>
+
+#include "zoomfactordlg.h"
+#include "preferencesdlg.h"
+
+#include "kimageshop_doc.h"
+#include "kimageshop_view.h"
+#include "kimageshop_shell.h"
+
+#define CHECK_DOCUMENT \
+	if( m_pDoc->isEmpty() ) \
+	{ \
+	  kdebug( KDEBUG_INFO, 0, "Document is empty. Action won't be executed." ); \
+	  return; \
+	}
+
+#define CHECK_RUNNING \
+	if( m_pDoc->m_executeCommand ) \
+	{ \
+	  kdebug( KDEBUG_INFO, 0, "Document is empty. External command won't be executed." ); \
+	  return; \
+	}
+	
+#define CHECK_ALL \
+	CHECK_DOCUMENT \
+	CHECK_RUNNING
+
+/*****************************************************************************
+ *
+ * KImageShopView
+ *
+ *****************************************************************************/
+
+KImageShopView::KImageShopView( QWidget* _parent, const char* _name, KImageShopDoc* _doc )
+  : QWidget( _parent )
+  , KoViewIf( _doc )
+  , OPViewIf( _doc )
+  , KImageShop::View_skel()
+{
+  setWidget( this );
+
+  OPPartIf::setFocusPolicy( OpenParts::Part::ClickFocus );
+
+  m_pDoc = _doc;
+
+  QObject::connect( m_pDoc, SIGNAL( sigUpdateView() ), this, SLOT( slotUpdateView() ) );
+
+  slotUpdateView();
+}
+
+void KImageShopView::init()
+{
+  /******************************************************
+   * Menu
+   ******************************************************/
+
+  kdebug( KDEBUG_INFO, 0, "Registering menu as %li", id() );
+
+  OpenParts::MenuBarManager_var menu_bar_manager = m_vMainWindow->menuBarManager();
+  if ( !CORBA::is_nil( menu_bar_manager ) )
+    menu_bar_manager->registerClient( id(), this );
+  else
+    kdebug( KDEBUG_ERROR, 0, "Did not get a menu bar manager" );
+
+  /******************************************************
+   * Toolbar
+   ******************************************************/
+
+  OpenParts::ToolBarManager_var tool_bar_manager = m_vMainWindow->toolBarManager();
+  if ( !CORBA::is_nil( tool_bar_manager ) )
+    tool_bar_manager->registerClient( id(), this );
+  else
+    kdebug( KDEBUG_ERROR, 0, "Did not get a tool bar manager" );
+}
+
+KImageShopView::~KImageShopView()
+{
+  kdebug( KDEBUG_INFO, 0, "KImageShopView::~KImageShopView() %li", _refcnt() );
+
+  cleanUp();
+}
+
+void KImageShopView::cleanUp()
+{
+  kdebug( KDEBUG_INFO, 0, "void KImageShopView::cleanUp() " );
+
+  if ( m_bIsClean )
+  {
+    return;
+  }
+  
+  kdebug( KDEBUG_INFO, 0, "1b) Unregistering menu and toolbar" );
+
+  OpenParts::MenuBarManager_var menu_bar_manager = m_vMainWindow->menuBarManager();
+  if ( !CORBA::is_nil( menu_bar_manager ) )
+    menu_bar_manager->unregisterClient( id() );
+
+  OpenParts::ToolBarManager_var tool_bar_manager = m_vMainWindow->toolBarManager();
+  if ( !CORBA::is_nil( tool_bar_manager ) )
+    tool_bar_manager->unregisterClient( id() );
+
+  m_pDoc->removeView( this );
+
+  KoViewIf::cleanUp();
+}
+
+KImageShopDoc* KImageShopView::doc()
+{
+  return m_pDoc;
+}
+
+bool KImageShopView::event( const char* _event, const CORBA::Any& _value )
+{
+  EVENT_MAPPER( _event, _value );
+
+  MAPPING( OpenPartsUI::eventCreateMenuBar, OpenPartsUI::typeCreateMenuBar_var, mappingCreateMenubar );
+  MAPPING( OpenPartsUI::eventCreateToolBar, OpenPartsUI::typeCreateToolBar_var, mappingCreateToolbar );
+
+  END_EVENT_MAPPER;
+
+  return false;
+}
+
+#define TEXT( text ) Q2C( i18n( text ) )
+#define PIX( pix ) *OPUIUtils::convertPixmap( ICON( pix ) )
+ 
+#define MENU( menu, text ) _menubar->insertMenu( TEXT( text ), menu, -1, -1 );
+#define ITEM1( id, menu, text, func ) id = menu->insertItem( TEXT( text ), this, func, 0 );
+#define ITEM2( id, menu, text, func, key ) id = menu->insertItem4( TEXT( text ), this, func, key, -1, -1 );
+#define ITEM3( id, menu, pix, text, func ) id = menu->insertItem6( PIX( pix ), TEXT( text ), this, func, 0, -1, -1 );
+#define ITEM4( id, menu, pix, text, func, key ) id = menu->insertItem6( PIX( pix ), TEXT( text ), this, func, key, -1, -1 );
+#define MN_SEPARATOR( menu ) menu->insertSeparator( -1 );
+
+#define TOOLBAR( bar ) bar = _factory->create( OpenPartsUI::ToolBarFactory::Transient );
+#define BUTTON1( id, bar, pix, num, func, text ) id = bar->insertButton2( PIX( pix ), num, SIGNAL( clicked() ), this, func, true, TEXT( text ), -1 );
+#define TB_SEPARATOR( bar ) bar->insertSeparator( -1 );                 
+
+bool KImageShopView::mappingCreateToolbar( OpenPartsUI::ToolBarFactory_ptr _factory )
+{
+  kdebug( KDEBUG_INFO, 0, "bool KImageShopView::mappingCreateToolbar( OpenPartsUI::ToolBarFactory_ptr _factory )" );
+
+  if ( CORBA::is_nil( _factory ) )
+  {
+    kdebug( KDEBUG_INFO, 0, "Setting to nil" );
+    m_vToolBarEdit = 0L;
+    return true;
+  }
+
+  TOOLBAR( m_vToolBarEdit );
+/*
+  BUTTON1( m_idButtonEdit_Lines, m_vToolBarEdit, "fittoview.xpm", 1, "viewFitToView", "Fit image to view" );
+  BUTTON1( m_idButtonEdit_Areas, m_vToolBarEdit, "fitwithprops.xpm", 2, "viewFitWithProportions", "Fit to view and keep proportions" );
+  BUTTON1( m_idButtonEdit_Bars, m_vToolBarEdit, "originalsize.xpm", 3, "viewOriginalSize", "Keep original image size" );
+  TB_SEPARATOR( m_vToolBarEdit );
+//BUTTON1( m_idButtonEdit_Cakes, m_vToolBarEdit, "mini/unknown.xpm", 4, "editEditImage", "Edit image" );
+  BUTTON1( m_idButtonEdit_Cakes, m_vToolBarEdit, "undo.xpm", 4, "editEditImage", "Edit image" );
+  TB_SEPARATOR( m_vToolBarEdit );
+  BUTTON1( m_idButtonEdit_Cakes, m_vToolBarEdit, "undo.xpm", 5, "editUndo", "Undo" );
+  BUTTON1( m_idButtonEdit_Cakes, m_vToolBarEdit, "redo.xpm", 6, "editRedo", "Redo" );
+  TB_SEPARATOR( m_vToolBarEdit );
+  BUTTON1( m_idButtonEdit_Cakes, m_vToolBarEdit, "editpaste.xpm", 7, "editEditImage", "Edit image" );
+  BUTTON1( m_idButtonEdit_Cakes, m_vToolBarEdit, "areaselect.xpm", 8, "selectArea", "Select Area" );
+  BUTTON1( m_idButtonEdit_Cakes, m_vToolBarEdit, "airbrush.xpm", 9, "airbrush", "Airbrush" );
+  BUTTON1( m_idButtonEdit_Cakes, m_vToolBarEdit, "circle.xpm", 10, "circle", "Circle" );
+  BUTTON1( m_idButtonEdit_Cakes, m_vToolBarEdit, "eraser.xpm", 11, "eraser", "Eraser" );
+*/
+
+  m_vToolBarEdit->enable( OpenPartsUI::Show );
+
+  // Folgendes muss mit der zuletzt eingefuegten ToolBar gemacht werden.
+  // Wahrscheinlich ein Bug in den OpenPart
+
+  m_vToolBarEdit->enable(OpenPartsUI::Hide);
+  m_vToolBarEdit->setBarPos(OpenPartsUI::Floating);
+  m_vToolBarEdit->setBarPos(OpenPartsUI::Top);
+  m_vToolBarEdit->enable(OpenPartsUI::Show);                                         
+
+  return true;
+}
+
+bool KImageShopView::mappingCreateMenubar( OpenPartsUI::MenuBar_ptr _menubar )
+{
+  kdebug( KDEBUG_INFO, 0, "bool KImageShopView::mappingCreateMenubar( OpenPartsUI::MenuBar_ptr _menubar )" );
+
+  if ( CORBA::is_nil( _menubar ) )
+  {
+	kdebug( KDEBUG_INFO, 0, "Setting to nil" );
+    m_vMenuEdit = 0L;
+    m_vMenuView = 0L;
+    m_vMenuTransform = 0L;
+    m_vMenuFilter = 0L;
+    m_vMenuPlugIns = 0L;
+    m_vMenuExtras = 0L;
+    return true;
+  }
+
+  // Edit
+  MENU( m_vMenuEdit, "&Edit" )
+/*
+  ITEM3( m_idMenuEdit_Undo, m_vMenuEdit, "undo.xpm", "no Undo possible", "editUndo" )
+  ITEM3( m_idMenuEdit_Redo, m_vMenuEdit, "redo.xpm", "no Redo possible", "editRedo" )
+//ITEM3( m_idMenuEdit_Edit, m_vMenuEdit, "mini/unknown.xpm", "&Edit image", "editEditImage" )
+  ITEM3( m_idMenuEdit_Edit, m_vMenuEdit, "redo.xpm", "&Edit image", "editEditImage" )
+  MN_SEPARATOR( m_vMenuEdit )
+  ITEM2( m_idMenuEdit_Import, m_vMenuEdit, "&Import image", "editImportImage", CTRL + Key_I )
+  ITEM2( m_idMenuEdit_Export, m_vMenuEdit, "E&xport image", "editExportImage", CTRL + Key_X )
+  ITEM1( m_idMenuEdit_Export, m_vMenuEdit, "E&mbed Part", "editEmpedPart" )
+  MN_SEPARATOR( m_vMenuEdit )
+  ITEM2( m_idMenuEdit_Page, m_vMenuEdit, "&Page Layout", "editPageLayout", CTRL + Key_L )
+  ITEM1( m_idMenuEdit_Preferences, m_vMenuEdit, "P&references...", "editPreferences" )
+*/
+
+  // View
+  MENU( m_vMenuView, "&View" )
+/*
+  ITEM1( m_idMenuView_ZoomFactor, m_vMenuView, "Zoom...", "viewZoomFactor" )
+  ITEM4( m_idMenuView_FitToView, m_vMenuView, "fittoview.xpm", "Fit to &view", "viewFitToView", CTRL + Key_V )
+  ITEM4( m_idMenuView_FitWithProps, m_vMenuView, "fitwithprops.xpm", "Fit and keep &proportions", "viewFitWithProportions", CTRL + Key_P )
+  ITEM4( m_idMenuView_Original, m_vMenuView, "originalsize.xpm", "&Original size", "viewOriginalSize", CTRL + Key_O )
+  MN_SEPARATOR( m_vMenuView )
+  ITEM1( m_idMenuView_Center, m_vMenuView, "&Centered", "viewCentered" )
+  ITEM1( m_idMenuView_Info, m_vMenuView, "&Scrollbars", "viewScrollbars" )
+  ITEM1( m_idMenuView_Info, m_vMenuView, "I&nformations", "viewInfoImage" )
+  ITEM1( m_idMenuView_BackgroundColor, m_vMenuView, "Background color", "viewBackgroundColor" )
+*/
+
+  // Transform
+  MENU( m_vMenuTransform, "&Transform" )
+/*
+  ITEM1( m_idMenuTransform_RotateRight, m_vMenuTransform, "Rotate clockwise", "transformRotateRight" )
+  ITEM1( m_idMenuTransform_RotateLeft, m_vMenuTransform, "Rotate anti-clockwise", "transformRotateLeft" )
+  ITEM1( m_idMenuTransform_RotateAngle, m_vMenuTransform, "Rotate with angle...", "transformRotateAngle" )
+  ITEM1( m_idMenuTransform_FlipVertical, m_vMenuTransform, "Flip vertical", "transformFlipVertical" )
+  ITEM1( m_idMenuTransform_FlipHorizontal, m_vMenuTransform, "Flip honrizontal", "transformFlipHorizontal" )
+  MN_SEPARATOR( m_vMenuTransform )
+  ITEM1( m_idMenuTransform_ZoomFactor, m_vMenuTransform, "&Zoom...", "transformZoomFactor" )
+  ITEM1( m_idMenuTransform_ZoomIn10, m_vMenuTransform, "Zoom &in 10%", "transformZoomIn10" )
+  ITEM1( m_idMenuTransform_ZoomOut10, m_vMenuTransform, "Zoom &out 10%", "transformZoomOut10" )
+  ITEM1( m_idMenuTransform_ZoomDouble, m_vMenuTransform, "&Double size", "transformZoomDouble" )
+  ITEM1( m_idMenuTransform_ZoomHalf, m_vMenuTransform, "&Half size", "transformZoomHalf" )
+  ITEM1( m_idMenuTransform_ZoomMax, m_vMenuTransform, "&Max", "transformZoomMax" )
+  ITEM1( m_idMenuTransform_ZoomMaxAspect, m_vMenuTransform, "Max/&aspect", "transformZoomMaxAspect" )
+*/
+
+  // Filter
+  MENU( m_vMenuFilter, "&Filter" )
+
+  // PlugIns
+  MENU( m_vMenuPlugIns, "&Plug-Ins" )
+
+  // Extras
+  MENU( m_vMenuExtras, "&Extras" )
+/*
+  ITEM1( m_idMenuExtras_RunGimp, m_vMenuExtras, "Run &Gimp", "extrasRunGimp" )
+  ITEM1( m_idMenuExtras_RunXV, m_vMenuExtras, "Run &xv", "extrasRunXV" )
+  ITEM1( m_idMenuExtras_RunCommand, m_vMenuExtras, "Run &Command...", "extrasRunCommand" )
+*/
+
+  return true;
+}
+
+void KImageShopView::helpUsing()
+{
+  kapp->invokeHTMLHelp( "kimageshop/kimage.html", QString::null );
+}
+
+CORBA::Boolean KImageShopView::printDlg()
+{
+  QPrinter prt;
+
+  if( QPrintDialog::getPrinterSetup( &prt ) )
+  {
+    m_pDoc->print( &prt );
+  }
+  return true;
+}
+
+void KImageShopView::newView()
+{
+  ASSERT( m_pDoc != 0L );
+
+  KImageShopShell* shell = new KImageShopShell;
+  shell->show();
+  shell->setDocument( m_pDoc );
+}
+
+void KImageShopView::resizeEvent( QResizeEvent* )
+{
+  slotUpdateView();
+}
+
+void KImageShopView::slotUpdateView()
+{
+  if( m_pDoc->image().isNull() )
+  {
+    return;
+  }
+
+  m_pixmap.convertFromImage( m_pDoc->image() );
+  QWidget::update();
+}
+
+void KImageShopView::paintEvent( QPaintEvent *_ev )
+{
+  if( m_pixmap.isNull() )
+  {
+    return;
+  }
+  
+  QPainter painter;
+
+  painter.begin( this );
+  painter.drawPixmap( 0, 0, m_pixmap );
+  painter.end();
+}
+
+#include "kimageshop_view.moc"
diff --git a/kimageshop/kimageshop_view.h b/kimageshop/kimageshop_view.h
new file mode 100644
index 0000000000..2117907df6
--- /dev/null
+++ b/kimageshop/kimageshop_view.h
@@ -0,0 +1,80 @@
+/* This file is part of the KDE project
+   Copyright (C) 1998, 1999 Torben Weis <weis@kde.org>
+ 
+   This library is free software; you can redistribute it and/or
+   modify it under the terms of the GNU Library General Public
+   License as published by the Free Software Foundation; either
+   version 2 of the License, or (at your option) any later version.
+ 
+   This library is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   Library General Public License for more details.
+ 
+   You should have received a copy of the GNU Library General Public License
+   along with this library; see the file COPYING.LIB.  If not, write to
+   the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+   Boston, MA 02111-1307, USA.
+*/     
+
+#ifndef __kimageshop_gui_h__
+#define __kimageshop_gui_h__
+
+#include <qpixmap.h>
+#include <qwidget.h>
+
+#include <kprocess.h>
+ 
+#include <opMenu.h>
+#include <opToolBar.h>
+#include <openparts_ui.h>
+
+#include <koFrame.h>
+#include <koView.h>
+
+#include "kimageshop.h"
+
+class KImageShopDoc;
+
+class KImageShopView : public QWidget,
+		   virtual public KoViewIf,
+		   virtual public KImageShop::View_skel
+{
+  Q_OBJECT
+
+public:
+  KImageShopView( QWidget* _parent, const char* _name, KImageShopDoc* _doc );
+  ~KImageShopView();
+  KImageShopDoc* doc();
+
+  virtual void cleanUp();
+  CORBA::Boolean printDlg();
+
+public slots:
+  // Document signals
+  void slotUpdateView();
+
+protected:
+  virtual void init();
+  virtual bool event( const char* _event, const CORBA::Any& _value );
+  virtual bool mappingCreateMenubar( OpenPartsUI::MenuBar_ptr _menubar );
+  virtual bool mappingCreateToolbar( OpenPartsUI::ToolBarFactory_ptr _factory );
+  virtual void newView();
+  virtual void helpUsing();
+  virtual void resizeEvent( QResizeEvent* _ev );
+  virtual void paintEvent( QPaintEvent* _ev );
+
+  OpenPartsUI::ToolBar_var m_vToolBarEdit;
+  OpenPartsUI::Menu_var m_vMenuEdit;
+  OpenPartsUI::Menu_var m_vMenuView;
+  OpenPartsUI::Menu_var m_vMenuTransform;
+  OpenPartsUI::Menu_var m_vMenuPlugIns;
+  OpenPartsUI::Menu_var m_vMenuFilter;
+  OpenPartsUI::Menu_var m_vMenuExtras;
+  
+private:
+  KImageShopDoc* m_pDoc;  
+  QPixmap m_pixmap;
+};
+
+#endif
diff --git a/kimageshop/pics/Makefile.am b/kimageshop/pics/Makefile.am
new file mode 100644
index 0000000000..cb14c7deb4
--- /dev/null
+++ b/kimageshop/pics/Makefile.am
@@ -0,0 +1,10 @@
+
+datadir = $(prefix)/share/apps/kimageshop/pics
+
+data_DATA = add_point.xpm airbrush.xpm areaselect.xpm centrejust.xpm \
+	    circle.xpm delete.xpm edit_point.xpm editcopy.xpm editcut.xpm \
+            editpaste.xpm ellipse.xpm eraser.xpm exit.xpm filefloppy.xpm \
+            filenew.xpm fileopen.xpm line.xpm pen.xpm rectangle.xpm redo.xpm \
+            roundangle.xpm spraycan.xpm undo.xpm viewmag+.xpm viewmag-.xpm \
+            viewmag.xpm viewzoom.xpm originalsize.xpm fittoview.xpm \
+            fitwithprops.xpm
diff --git a/kimageshop/pics/add_point.xpm b/kimageshop/pics/add_point.xpm
new file mode 100644
index 0000000000..4098afa106
--- /dev/null
+++ b/kimageshop/pics/add_point.xpm
@@ -0,0 +1,33 @@
+/* XPM */
+/* Drawn  by Mark Donohoe for the K Desktop Environment */
+/* See http://www.kde.org */
+static char*add_point[]={
+"22 22 5 1",
+"a c #000000",
+"b c #ffffff",
+"# c #a0a0a4",
+"c c #dcdcdc",
+". c None",
+"......................",
+"......................",
+"........#aaaaaa#......",
+"......aaa......a......",
+".....a.........a#.....",
+"....a.........aaa#....",
+"....a........abaca#...",
+"...a.........ababa#...",
+"...a.........ababa#...",
+"..aaa.......abcacca#..",
+"..aaa#......abcacca#..",
+"..aaa#.....abcaaacca#.",
+"...a##.....abc#a#cca#.",
+"...a........accccca##.",
+"...a.........accca##..",
+"...a.........aaaaa#...",
+"...a.........a#aaa#...",
+"..a..........a#aaa#...",
+"..a..........a#aaa#...",
+".a...........a#aaa#...",
+"..............#####...",
+"......................"};
+
diff --git a/kimageshop/pics/airbrush.xpm b/kimageshop/pics/airbrush.xpm
new file mode 100644
index 0000000000..e35c5515c9
--- /dev/null
+++ b/kimageshop/pics/airbrush.xpm
@@ -0,0 +1,33 @@
+/* XPM */
+/* Drawn  by Mark Donohoe for the K Desktop Environment */
+/* See http://www.kde.org */
+static char*airbrush[]={
+"22 22 5 1",
+"# c #000000",
+"b c #ffffff",
+"a c #a0a0a4",
+"c c #dcdcdc",
+". c None",
+"......................",
+"......................",
+"......................",
+"................###...",
+"...............####a..",
+"..............#####a..",
+".............#####aa..",
+"............#####aa...",
+".......##..#####aa....",
+"......##..#####aa.....",
+"......#.######aa......",
+"........#b###aa.......",
+".......#bbc#aa........",
+"......#bbc#aa.........",
+".....#bbc##a.....##...",
+"....#bbc#aa#....#.....",
+"....#bc#aa.#....#.....",
+"...#b##aa...#..#......",
+"...##aaa.....##.......",
+"....aa................",
+"......................",
+"......................"};
+
diff --git a/kimageshop/pics/areaselect.xpm b/kimageshop/pics/areaselect.xpm
new file mode 100644
index 0000000000..437333208b
--- /dev/null
+++ b/kimageshop/pics/areaselect.xpm
@@ -0,0 +1,27 @@
+/* XPM */
+static char * rectangle_xpm[] = {
+"22 22 2 1",
+" 	c None",
+".	c #000000000000",
+"                      ",
+"                      ",
+"                      ",
+"                      ",
+"                      ",
+"  .. .. .. .. .. ..   ",
+"  .               .   ",
+"                      ",
+"  .               .   ",
+"  .               .   ",
+"                      ",
+"  .               .   ",
+"  .               .   ",
+"                      ",
+"  .               .   ",
+"  .. .. .. .. .. ..   ",
+"                      ",
+"                      ",
+"                      ",
+"                      ",
+"                      ",
+"                      "};
diff --git a/kimageshop/pics/centrejust.xpm b/kimageshop/pics/centrejust.xpm
new file mode 100644
index 0000000000..28edea096a
--- /dev/null
+++ b/kimageshop/pics/centrejust.xpm
@@ -0,0 +1,29 @@
+/* XPM */
+/* Drawn  by Mark Donohoe for the K Desktop Environment */
+/* See http://www.kde.org */
+static char*centrejust[]={
+"21 21 2 1",
+"# c #000000",
+". c None",
+".....................",
+".....................",
+".....................",
+".....................",
+"....#############....",
+".....................",
+".....############....",
+".....................",
+"......##########.....",
+".....................",
+"....#############....",
+".....................",
+".....############....",
+".....................",
+"....#############....",
+".....................",
+".......########......",
+".....................",
+".....................",
+".....................",
+"....................."};
+
diff --git a/kimageshop/pics/circle.xpm b/kimageshop/pics/circle.xpm
new file mode 100644
index 0000000000..b99daae4a1
--- /dev/null
+++ b/kimageshop/pics/circle.xpm
@@ -0,0 +1,27 @@
+/* XPM */
+static char * circle_xpm[] = {
+"22 22 2 1",
+" 	c None",
+".	c #000000000000",
+"                      ",
+"                      ",
+"                      ",
+"                      ",
+"        .....         ",
+"      ..     ..       ",
+"     .         .      ",
+"    .           .     ",
+"    .           .     ",
+"   .             .    ",
+"   .             .    ",
+"   .             .    ",
+"   .             .    ",
+"    .           .     ",
+"    .           .     ",
+"     .         .      ",
+"      ..     ..       ",
+"        .....         ",
+"                      ",
+"                      ",
+"                      ",
+"                      "};
diff --git a/kimageshop/pics/delete.xpm b/kimageshop/pics/delete.xpm
new file mode 100644
index 0000000000..8643204b4e
--- /dev/null
+++ b/kimageshop/pics/delete.xpm
@@ -0,0 +1,33 @@
+/* XPM */
+/* Drawn  by Mark Donohoe for the K Desktop Environment */
+/* See http://www.kde.org */
+static char*delete[]={
+"22 22 5 1",
+"# c #000000",
+"a c #808080",
+"b c #ffffff",
+"c c #c0c0c0",
+". c None",
+"......................",
+"......................",
+"......................",
+"......................",
+"......................",
+".............#........",
+".....##a....#b#a......",
+"......##a..#bbb#a.....",
+".......#b##bbc##aa....",
+"........#bbcc#aaaa....",
+".........#bc#aaa......",
+"........#bcc#aa.......",
+".......#b#a#b#a.......",
+"......#b#aa.#b#a......",
+".....#b#aa...##a......",
+".....##aa.....##a.....",
+".....#aa.......#a.....",
+".....aa........aa.....",
+"......................",
+"......................",
+"......................",
+"......................"};
+
diff --git a/kimageshop/pics/edit_point.xpm b/kimageshop/pics/edit_point.xpm
new file mode 100644
index 0000000000..38058d716f
--- /dev/null
+++ b/kimageshop/pics/edit_point.xpm
@@ -0,0 +1,32 @@
+/* XPM */
+/* Drawn  by Mark Donohoe for the K Desktop Environment */
+/* See http://www.kde.org */
+static char*edit_point[]={
+"22 22 4 1",
+"a c #000000",
+"b c #ffffff",
+"# c #a0a0a4",
+". c None",
+"......................",
+"..#aa#.....aaa........",
+"..aaaa...###.#a.......",
+"..aaaa...a....a.......",
+"..#aa#..#a....aba.....",
+"...a....#..ba..ba#....",
+"...a....a..ba#.ba#....",
+"...a....a..ba#.ba#....",
+"...##...a...baba##....",
+"....a..##...baba#.....",
+"....a..a.....baa#.....",
+"....a..a.....baa#.....",
+"....###a.....baba.....",
+"......a.....ba#ba.....",
+"............ba#.ba....",
+"...........ba##..baa..",
+"..........baa#..ba#ba.",
+".........ba#ba..ba#ba#",
+".........ba#ba#..baa##",
+"..........baa##....##.",
+"............##........",
+"......................"};
+
diff --git a/kimageshop/pics/editcopy.xpm b/kimageshop/pics/editcopy.xpm
new file mode 100644
index 0000000000..0b48777499
--- /dev/null
+++ b/kimageshop/pics/editcopy.xpm
@@ -0,0 +1,28 @@
+/* XPM */
+static char * editcopy_xpm[] = {
+"22 22 3 1",
+" 	c None",
+".	c #000000000000",
+"X	c #FFFFFFFFFFFF",
+"                      ",
+"                      ",
+"                      ",
+"                      ",
+"                      ",
+"    ......            ",
+"    .XXXX..           ",
+"    .XXXX.X.          ",
+"    .X..X.......      ",
+"    .XXXX .XXXX..     ",
+"    .X.....XXXX.X.    ",
+"    .XXXX .X..X....   ",
+"    .X.....XXXXXXX.   ",
+"    .XXXX .X.....X.   ",
+"    .......XXXXXXX.   ",
+"          .X.....X.   ",
+"          .XXXXXXX.   ",
+"          .........   ",
+"                      ",
+"                      ",
+"                      ",
+"                      "};
diff --git a/kimageshop/pics/editcut.xpm b/kimageshop/pics/editcut.xpm
new file mode 100644
index 0000000000..a88a4c89df
--- /dev/null
+++ b/kimageshop/pics/editcut.xpm
@@ -0,0 +1,31 @@
+/* XPM */
+static char * editcut_xpm[] = {
+"22 22 6 1",
+" 	c None",
+".	c #9E799A699E79",
+"X	c #618565956185",
+"o	c #30C230C230C2",
+"O	c #CF3CCF3CCF3C",
+"+	c #FFFFFFFFFFFF",
+"                      ",
+"                      ",
+"                      ",
+"                      ",
+"    .XoX.             ",
+"    o   X.     Xo.    ",
+"    X    o   .XoXX.   ",
+"    .XX XX  .XoX.     ",
+"     .oXo. .Xo.       ",
+"       .XXXoX.        ",
+"  XXXXXXXXOX.XXXXXX   ",
+"       .oXXXX+++++O   ",
+"     .XXX. .OO.       ",
+"    .Xo oX  OXoX.     ",
+"    X    o  +.XoXo.   ",
+"    o   X. +   XX.    ",
+"    .XoX.  +          ",
+"           O          ",
+"           +          ",
+"                      ",
+"                      ",
+"                      "};
diff --git a/kimageshop/pics/editpaste.xpm b/kimageshop/pics/editpaste.xpm
new file mode 100644
index 0000000000..54a9613420
--- /dev/null
+++ b/kimageshop/pics/editpaste.xpm
@@ -0,0 +1,28 @@
+/* XPM */
+static char * editpaste_xpm[] = {
+"22 22 3 1",
+" 	c None",
+".	c #000000000000",
+"X	c #FFFFFFFFFFFF",
+"                      ",
+"                      ",
+"                      ",
+"                      ",
+"                      ",
+"         ....         ",
+"     .....XX.....     ",
+"    .   .X..X.   .    ",
+"    .  .XXXXXX.  .    ",
+"    .  ........  .    ",
+"    .      .......    ",
+"    .      .XXXX..    ",
+"    .      .XXXX.X.   ",
+"    .      .X..X...   ",
+"    .      .XXXXXX.   ",
+"    .      .X....X.   ",
+"     .......XXXXXX.   ",
+"           ........   ",
+"                      ",
+"                      ",
+"                      ",
+"                      "};
diff --git a/kimageshop/pics/ellipse.xpm b/kimageshop/pics/ellipse.xpm
new file mode 100644
index 0000000000..c259d883fe
--- /dev/null
+++ b/kimageshop/pics/ellipse.xpm
@@ -0,0 +1,27 @@
+/* XPM */
+static char * ellipse_xpm[] = {
+"22 22 2 1",
+" 	c None",
+".	c #000000000000",
+"                      ",
+"                      ",
+"                      ",
+"                      ",
+"                      ",
+"                      ",
+"      .........       ",
+"    ..         ..     ",
+"  ..             ..   ",
+" .                 .  ",
+" .                 .  ",
+" .                 .  ",
+" .                 .  ",
+"  ..             ..   ",
+"    ..         ..     ",
+"      .........       ",
+"                      ",
+"                      ",
+"                      ",
+"                      ",
+"                      ",
+"                      "};
diff --git a/kimageshop/pics/eraser.xpm b/kimageshop/pics/eraser.xpm
new file mode 100644
index 0000000000..82a2ab0f92
--- /dev/null
+++ b/kimageshop/pics/eraser.xpm
@@ -0,0 +1,33 @@
+/* XPM */
+/* Drawn  by Mark Donohoe for the K Desktop Environment */
+/* See http://www.kde.org */
+static char*eraser[]={
+"22 22 5 1",
+"# c #000000",
+"a c #ffffff",
+"b c #a0a0a4",
+"c c #dcdcdc",
+". c None",
+"......................",
+"......................",
+"......................",
+"......................",
+"......................",
+"......................",
+"..........########....",
+".........#aaaaaa##b...",
+"........#aaaaaa#c#b...",
+".......#aaaaaa#cc#b...",
+"......#aaaaaa#cc#bb...",
+".....#aaaaaa#cc#bb....",
+"....#aaaaaa#cc#bb.....",
+"...########cc#bb......",
+"...#cccccc#c#bb.......",
+"...#cccccc##bb........",
+"...########bb.........",
+"....bbbbbbbb..........",
+"......................",
+"......................",
+"......................",
+"......................"};
+
diff --git a/kimageshop/pics/exit.xpm b/kimageshop/pics/exit.xpm
new file mode 100644
index 0000000000..f01a01c3a9
--- /dev/null
+++ b/kimageshop/pics/exit.xpm
@@ -0,0 +1,35 @@
+/* XPM */
+/* Drawn  by Mark Donohoe for the K Desktop Environment */
+/* See http://www.kde.org */
+static char*exit[]={
+"22 22 7 1",
+"# c #000000",
+"e c #808080",
+"b c #dcdcdc",
+"a c #ffffff",
+"d c #a0a0a4",
+"c c #dcdcdc",
+". c None",
+"......................",
+"......................",
+"......................",
+"......................",
+"......................",
+"........#####.........",
+"......##aaaaa##.......",
+".....#aabbbbbbb#......",
+"....c#abbb#bbbb#d.....",
+"....#abbbb#bbbbd#.....",
+"....#abbbb#bbbbd#d....",
+"....#abbbb#bbbbd#d....",
+"....#abbbb#bbbbd#d....",
+"....#abbbb#bbbbd#d....",
+".....#bbbb#bbbd#ed....",
+".....#bbbbbbbdd#d.....",
+"......##ddddd##dd.....",
+".......d#####ddd......",
+".........ddddd........",
+"......................",
+"......................",
+"......................"};
+
diff --git a/kimageshop/pics/filefloppy.xpm b/kimageshop/pics/filefloppy.xpm
new file mode 100644
index 0000000000..0ddfdc5d62
--- /dev/null
+++ b/kimageshop/pics/filefloppy.xpm
@@ -0,0 +1,30 @@
+/* XPM */
+static char * filefloppy_xpm[] = {
+"22 22 5 1",
+" 	c None",
+".	c #000000000000",
+"X	c #FFFFFFFFFFFF",
+"o	c #CB2BCB2BCB2B",
+"O	c #82077DF77DF7",
+"                      ",
+"                      ",
+"                      ",
+"                      ",
+"    ..............    ",
+"    . XXXXXXXXXo .O   ",
+"    . X.....XXXo .O   ",
+"    . XXXXXXXXXo .O   ",
+"    . X...XXXXXo .O   ",
+"    . XXXXXXXXXo .O   ",
+"    . XXXXXXXXXo .O   ",
+"    . oooooooooo .O   ",
+"    . OOOOOOOOOO .O   ",
+"    . OOOOOOOOOO .O   ",
+"    . OO     OOo .O   ",
+"    . OO  OO OOo .O   ",
+"    . OO  OO OOo .O   ",
+"    . OO     OOo .O   ",
+"    ..............O   ",
+"     OOOOOOOOOOOOOO   ",
+"                      ",
+"                      "};
diff --git a/kimageshop/pics/filenew.xpm b/kimageshop/pics/filenew.xpm
new file mode 100644
index 0000000000..3a69a7e437
--- /dev/null
+++ b/kimageshop/pics/filenew.xpm
@@ -0,0 +1,29 @@
+/* XPM */
+static char * filenew_xpm[] = {
+"22 22 4 1",
+" 	c None",
+".	c #000000000000",
+"X	c #FFFFFFFFFFFF",
+"o	c #DF7DDF7DDF7D",
+"                      ",
+"                      ",
+"                      ",
+"     ........         ",
+"     .XXXXXXo.        ",
+"     .XXXXXX o.       ",
+"     .XXXXXX Xo.      ",
+"     .XXXXXX ....     ",
+"     .XXXXXXX   .     ",
+"     .XXXXXXXXXo.     ",
+"     .XXXXXXXXXX.     ",
+"     .XXXXXXXXXX.     ",
+"     .XXXXXXXXXX.     ",
+"     .XXXXXXXXXX.     ",
+"     .XXXXXXXXXX.     ",
+"     .XXXXXXXXXX.     ",
+"     .XXXXXXXXXX.     ",
+"     .XXXXXXXXXX.     ",
+"     ............     ",
+"                      ",
+"                      ",
+"                      "};
diff --git a/kimageshop/pics/fileopen.xpm b/kimageshop/pics/fileopen.xpm
new file mode 100644
index 0000000000..dd384cadaf
--- /dev/null
+++ b/kimageshop/pics/fileopen.xpm
@@ -0,0 +1,30 @@
+/* XPM */
+static char * fileopen_xpm[] = {
+"22 22 5 1",
+" 	c None",
+".	c #000000000000",
+"X	c #D75CD75CD75C",
+"o	c #FFFFFFFFFFFF",
+"O	c #6DB66DB66DB6",
+"                      ",
+"                      ",
+"            ....      ",
+"               .. .   ",
+"                ...   ",
+"                ...   ",
+"               ....   ",
+"   ....               ",
+"   .XoX.......        ",
+"   .oXoXoXoXo.        ",
+"   .XoXoXoXoX.        ",
+"   .oXoXo ..........  ",
+"   .XoXo . O O O OO.  ",
+"   .oXo . O O OOOO.   ",
+"   .Xo .OO OOOOOO.    ",
+"   .o . O OOOOOO.     ",
+"   ... O OOOOOO.      ",
+"   ..OOOOOOOOO.       ",
+"   ...........        ",
+"                      ",
+"                      ",
+"                      "};
diff --git a/kimageshop/pics/fittoview.xpm b/kimageshop/pics/fittoview.xpm
new file mode 100644
index 0000000000..9d123f2237
--- /dev/null
+++ b/kimageshop/pics/fittoview.xpm
@@ -0,0 +1,21 @@
+/* XPM */
+static char*fittoview[]={
+"16 16 2 1",
+"# c #000000",
+". c None",
+"...........#....",
+"...........##...",
+"............##..",
+"...############.",
+"...#........##..",
+"...#.......##...",
+"##.#.##....#....",
+".#####..........",
+"..###...........",
+"...#............",
+"................",
+"................",
+"................",
+"................",
+"................",
+"................"};
diff --git a/kimageshop/pics/fitwithprops.xpm b/kimageshop/pics/fitwithprops.xpm
new file mode 100644
index 0000000000..eede46eccb
--- /dev/null
+++ b/kimageshop/pics/fitwithprops.xpm
@@ -0,0 +1,21 @@
+/* XPM */
+static char*fitwithprops[]={
+"16 16 2 1",
+"# c #000000",
+". c None",
+"...........#....",
+"...........##...",
+"............##..",
+"...############.",
+"...#........##..",
+"...#.......##...",
+"...#.......#....",
+"...#............",
+"...#............",
+"...#............",
+"...#............",
+"##.#.##.........",
+".#####..........",
+"..###...........",
+"...#............",
+"................"};
diff --git a/kimageshop/pics/line.xpm b/kimageshop/pics/line.xpm
new file mode 100644
index 0000000000..2c5f9e9195
--- /dev/null
+++ b/kimageshop/pics/line.xpm
@@ -0,0 +1,31 @@
+/* XPM */
+static const char *line[] = {
+/* width height num_colors chars_per_pixel */
+"    22    22        2            1",
+/* colors */
+". c #000000",
+"# c None",
+/* pixels */
+"######################",
+"#################.####",
+"#################.####",
+"###############.....##",
+"################..####",
+"###############.#.####",
+"##############.#######",
+"#############.########",
+"############.#########",
+"###########.##########",
+"##########.###########",
+"#########.############",
+"########.#############",
+"#######.##############",
+"######.###############",
+"###.#.################",
+"###..#################",
+"#.....################",
+"###.##################",
+"###.##################",
+"######################",
+"######################"
+};
diff --git a/kimageshop/pics/originalsize.xpm b/kimageshop/pics/originalsize.xpm
new file mode 100644
index 0000000000..33652aefb1
--- /dev/null
+++ b/kimageshop/pics/originalsize.xpm
@@ -0,0 +1,22 @@
+/* XPM */
+static char*originalsize[]={
+"16 16 3 1",
+"# c #000000",
+"a c #400000",
+". c None",
+"................",
+".##############.",
+".#............#.",
+".#............#.",
+".#............#.",
+".#.....aa.....#.",
+".#....aaa.....#.",
+".#....aaaaa...#.",
+".#...aaaaaaa..#.",
+".#..aaaaaaaa..#.",
+".#..aaaaaaaaa.#.",
+".#.aaaaaaaaaaa#.",
+".#aaaaaaaaaaaa#.",
+".#aaaaaaaaaaaa#.",
+".##############.",
+"................"};
diff --git a/kimageshop/pics/pen.xpm b/kimageshop/pics/pen.xpm
new file mode 100644
index 0000000000..6b52a404ba
--- /dev/null
+++ b/kimageshop/pics/pen.xpm
@@ -0,0 +1,27 @@
+/* XPM */
+static char * pen_xpm[] = {
+"22 22 2 1",
+" 	c None",
+".	c #000000000000",
+"                      ",
+"                      ",
+"                      ",
+"                      ",
+"                      ",
+"                      ",
+"  .       .....       ",
+"  .       .   ..      ",
+"  .      ..    ..     ",
+"  ..    ..      .     ",
+"   .    .       .     ",
+"   ..   .       ..    ",
+"    .. ..        .    ",
+"     ...         ..   ",
+"                  .   ",
+"                      ",
+"                      ",
+"                      ",
+"                      ",
+"                      ",
+"                      ",
+"                      "};
diff --git a/kimageshop/pics/rectangle.xpm b/kimageshop/pics/rectangle.xpm
new file mode 100644
index 0000000000..881e07bfc4
--- /dev/null
+++ b/kimageshop/pics/rectangle.xpm
@@ -0,0 +1,27 @@
+/* XPM */
+static char * rectangle_xpm[] = {
+"22 22 2 1",
+" 	c None",
+".	c #000000000000",
+"                      ",
+"                      ",
+"                      ",
+"                      ",
+"                      ",
+"                      ",
+"  .................   ",
+"  .               .   ",
+"  .               .   ",
+"  .               .   ",
+"  .               .   ",
+"  .               .   ",
+"  .               .   ",
+"  .               .   ",
+"  .               .   ",
+"  .................   ",
+"                      ",
+"                      ",
+"                      ",
+"                      ",
+"                      ",
+"                      "};
diff --git a/kimageshop/pics/redo.xpm b/kimageshop/pics/redo.xpm
new file mode 100644
index 0000000000..3a2f27ba50
--- /dev/null
+++ b/kimageshop/pics/redo.xpm
@@ -0,0 +1,31 @@
+/* XPM */
+/* Drawn  by Mark Donohoe for the K Desktop Environment */
+/* See http://www.kde.org */
+static char*redo[]={
+"22 22 3 1",
+"# c #000000",
+"a c #c0c0c0",
+". c None",
+"......................",
+"......................",
+"......................",
+"......................",
+"......................",
+"........####..........",
+"......########..#.....",
+"......##.....####.....",
+".....##......####.....",
+".....#.......#a##.....",
+".....#......#####.....",
+".....#................",
+".....#................",
+"......#...............",
+".......#..............",
+"........##............",
+"......................",
+"......................",
+"......................",
+"......................",
+"......................",
+"......................"};
+
diff --git a/kimageshop/pics/roundangle.xpm b/kimageshop/pics/roundangle.xpm
new file mode 100644
index 0000000000..2e5d26045a
--- /dev/null
+++ b/kimageshop/pics/roundangle.xpm
@@ -0,0 +1,27 @@
+/* XPM */
+static char * rectangle_xpm[] = {
+"22 22 2 1",
+" 	c None",
+".	c #000000000000",
+"                      ",
+"                      ",
+"                      ",
+"                      ",
+"                      ",
+"     ...........      ",
+"   ...         ...    ",
+"   .             .    ",
+"  .               .   ",
+"  .               .   ",
+"  .               .   ",
+"  .               .   ",
+"  .               .   ",
+"  .               .   ",
+"   .             .    ",
+"    ...       ...     ",
+"      .........       ",
+"                      ",
+"                      ",
+"                      ",
+"                      ",
+"                      "};
diff --git a/kimageshop/pics/spraycan.xpm b/kimageshop/pics/spraycan.xpm
new file mode 100644
index 0000000000..5b35c46db9
--- /dev/null
+++ b/kimageshop/pics/spraycan.xpm
@@ -0,0 +1,31 @@
+/* XPM */
+static const char *spraycan[] = {
+/* width height num_colors chars_per_pixel */
+"    22    22        2            1",
+/* colors */
+". c #000000",
+"# c None",
+/* pixels */
+"###################.##",
+"###############.#.####",
+"############.#.#.##.##",
+"#########..##.###..###",
+"#########..####.######",
+"########....#####.#.##",
+"######........#####.##",
+"######.######.########",
+"######.######.########",
+"######....###.########",
+"######.##.###.########",
+"######.##.###.########",
+"######.##.###.########",
+"######.##.###.########",
+"######.##.###.########",
+"######.##.###.########",
+"######....###.########",
+"######.######.########",
+"######.######.########",
+"######.######.########",
+"######........########",
+"######################"
+};
diff --git a/kimageshop/pics/undo.xpm b/kimageshop/pics/undo.xpm
new file mode 100644
index 0000000000..b639c11d58
--- /dev/null
+++ b/kimageshop/pics/undo.xpm
@@ -0,0 +1,31 @@
+/* XPM */
+/* Drawn  by Mark Donohoe for the K Desktop Environment */
+/* See http://www.kde.org */
+static char*undo[]={
+"22 22 3 1",
+"# c #000000",
+"a c #c0c0c0",
+". c None",
+"......................",
+"......................",
+"......................",
+"......................",
+"......................",
+"..........####........",
+".....#..########......",
+".....####.....##......",
+".....####......##.....",
+".....##a#.......#.....",
+".....#####......#.....",
+"................#.....",
+"................#.....",
+"...............#......",
+"..............#.......",
+"............##........",
+"......................",
+"......................",
+"......................",
+"......................",
+"......................",
+"......................"};
+
diff --git a/kimageshop/pics/viewmag+.xpm b/kimageshop/pics/viewmag+.xpm
new file mode 100644
index 0000000000..416cd8ade3
--- /dev/null
+++ b/kimageshop/pics/viewmag+.xpm
@@ -0,0 +1,28 @@
+/* XPM */
+static char * viewmag+_xpm[] = {
+"22 22 3 1",
+" 	c None",
+".	c #000000000000",
+"X	c #FFFFFFFFFFFF",
+"                      ",
+"                      ",
+"                      ",
+"                      ",
+"                      ",
+"       ....           ",
+"      .    .          ",
+"     .  X   .         ",
+"     . X    .         ",
+"     .      .         ",
+"     .      .         ",
+"      .    ..         ",
+"       .......        ",
+"            ...       ",
+"      .      ...      ",
+"      .       ...     ",
+"    .....      ..     ",
+"      .               ",
+"      .               ",
+"                      ",
+"                      ",
+"                      "};
diff --git a/kimageshop/pics/viewmag-.xpm b/kimageshop/pics/viewmag-.xpm
new file mode 100644
index 0000000000..ce86a936d9
--- /dev/null
+++ b/kimageshop/pics/viewmag-.xpm
@@ -0,0 +1,28 @@
+/* XPM */
+static char * viewmag__xpm[] = {
+"22 22 3 1",
+" 	c None",
+".	c #000000000000",
+"X	c #FFFFFFFFFFFF",
+"                      ",
+"                      ",
+"                      ",
+"                      ",
+"                      ",
+"       ....           ",
+"      .    .          ",
+"     .  X   .         ",
+"     . X    .         ",
+"     .      .         ",
+"     .      .         ",
+"      .    ..         ",
+"       .......        ",
+"            ...       ",
+"             ...      ",
+"              ...     ",
+"    .....      ..     ",
+"                      ",
+"                      ",
+"                      ",
+"                      ",
+"                      "};
diff --git a/kimageshop/pics/viewmag.xpm b/kimageshop/pics/viewmag.xpm
new file mode 100644
index 0000000000..308ece9904
--- /dev/null
+++ b/kimageshop/pics/viewmag.xpm
@@ -0,0 +1,33 @@
+/* XPM */
+/* Drawn  by Mark Donohoe for the K Desktop Environment */
+/* See http://www.kde.org */
+static char*viewmag[]={
+"22 22 5 1",
+"# c #000000",
+"c c #a0a0a4",
+"a c #dcdcdc",
+"b c #ffffff",
+". c None",
+"......................",
+"......................",
+"......................",
+"......................",
+"......................",
+".......####...........",
+"......#abba#..........",
+".....#abcbba#.........",
+".....#bcbbbb#.........",
+".....#bbbbbb#.........",
+".....#abbbba#.........",
+"......#abba##.........",
+".......#######........",
+"............###.......",
+".............###......",
+".....#........###.....",
+"....###..###...##.....",
+".....#................",
+"......................",
+"......................",
+"......................",
+"......................"};
+
diff --git a/kimageshop/pics/viewzoom.xpm b/kimageshop/pics/viewzoom.xpm
new file mode 100644
index 0000000000..9f4e8c825e
--- /dev/null
+++ b/kimageshop/pics/viewzoom.xpm
@@ -0,0 +1,33 @@
+/* XPM */
+/* Drawn  by Mark Donohoe for the K Desktop Environment */
+/* See http://www.kde.org */
+static char*viewzoom[]={
+"22 22 5 1",
+"# c #000000",
+"c c #a0a0a4",
+"a c #dcdcdc",
+"b c #ffffff",
+". c None",
+"......................",
+"......................",
+"......................",
+"......................",
+"......................",
+".......####...........",
+"......#abba#..........",
+".....#abcbba#.........",
+".....#bcbbbb#.........",
+".....#bbbbbb#.........",
+".....#abbbba#.........",
+"......#abba##.........",
+".......#######........",
+"............###.......",
+".............###......",
+".....#........###.....",
+"....###..###...##.....",
+".....#................",
+"......................",
+"......................",
+"......................",
+"......................"};
+
diff --git a/kimageshop/preferencesdlg.cc b/kimageshop/preferencesdlg.cc
new file mode 100644
index 0000000000..695d458516
--- /dev/null
+++ b/kimageshop/preferencesdlg.cc
@@ -0,0 +1,77 @@
+/* This file is part of the KDE project
+   Copyright (C) 1998, 1999 Torben Weis <weis@kde.org>
+
+   This library is free software; you can redistribute it and/or
+   modify it under the terms of the GNU Library General Public
+   License as published by the Free Software Foundation; either
+   version 2 of the License, or (at your option) any later version.
+
+   This library is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   Library General Public License for more details.
+
+   You should have received a copy of the GNU Library General Public License
+   along with this library; see the file COPYING.LIB.  If not, write to
+   the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+   Boston, MA 02111-1307, USA.
+*/
+
+#include <klocale.h>
+
+#include <qlabel.h>
+#include <qlayout.h>
+#include <qpushbutton.h>
+
+#include "preferencesdlg.h"
+
+/*****************************************************************************
+ *
+ * KImageShopPreferencesDialog
+ *
+ *****************************************************************************/
+
+KImageShopPreferencesDialog::KImageShopPreferencesDialog( QWidget* parent, const char* name, WFlags f )
+	: KDialog( parent, name, true, f )
+{
+	// Layout
+    QGridLayout* grid = new QGridLayout( this, 5, 5, 7, 15);
+
+	// Inputline
+	m_pLineEdit = new QLineEdit( this, "tempDir" );
+    grid->addMultiCellWidget( m_pLineEdit, 1, 1, 0, 4 );	
+
+	// Label
+	QLabel* label = new QLabel( m_pLineEdit, i18n( "Directory for temporary files" ) , this );
+	grid->addWidget( label, 0, 0 );
+	
+	// OK-Button
+    QPushButton* okButton = new QPushButton( this, "OKButton" );
+    okButton->setText( i18n( "&Ok" ) );
+    okButton->setAutoRepeat( false );
+    okButton->setAutoResize( false );
+    okButton->setAutoDefault( true );
+    okButton->setDefault( true );
+    connect( okButton, SIGNAL( clicked() ), this, SLOT( close() ) );
+    grid->addWidget( okButton, 3, 3 );
+        
+	// Cancel-Button
+
+	grid->setRowStretch( 0, 0);
+	grid->setRowStretch( 1, 0);
+	grid->setColStretch( 0, 0);
+	grid->setColStretch( 1, 0);
+}
+
+KImageShopPreferencesDialog::~KImageShopPreferencesDialog()
+{
+}
+
+QString KImageShopPreferencesDialog::getStr()
+{
+	QString tmp;
+
+	return tmp;
+}
+
+#include "preferencesdlg.moc"
diff --git a/kimageshop/preferencesdlg.h b/kimageshop/preferencesdlg.h
new file mode 100644
index 0000000000..990653d704
--- /dev/null
+++ b/kimageshop/preferencesdlg.h
@@ -0,0 +1,41 @@
+/* This file is part of the KDE project
+   Copyright (C) 1998, 1999 Torben Weis <weis@kde.org>
+ 
+   This library is free software; you can redistribute it and/or
+   modify it under the terms of the GNU Library General Public
+   License as published by the Free Software Foundation; either
+   version 2 of the License, or (at your option) any later version.
+ 
+   This library is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   Library General Public License for more details.
+ 
+   You should have received a copy of the GNU Library General Public License
+   along with this library; see the file COPYING.LIB.  If not, write to
+   the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+   Boston, MA 02111-1307, USA.
+*/     
+
+#ifndef __preferencesdlg_h__
+#define __preferencesdlg_h__
+
+#include <qlineedit.h>
+#include <kdialog.h>
+
+/**
+ */
+class KImageShopPreferencesDialog : public KDialog
+{
+    Q_OBJECT
+public:
+	KImageShopPreferencesDialog( QWidget* parent = 0, const char* name = 0, WFlags f = 0 );
+	~KImageShopPreferencesDialog();
+
+	static QString getStr();
+
+private:
+	QLineEdit* m_pLineEdit;
+};
+
+#endif
diff --git a/kimageshop/zoomfactordlg.cc b/kimageshop/zoomfactordlg.cc
new file mode 100644
index 0000000000..e9afc3f7e6
--- /dev/null
+++ b/kimageshop/zoomfactordlg.cc
@@ -0,0 +1,93 @@
+/* This file is part of the KDE project
+   Copyright (C) 1998, 1999 Torben Weis <weis@kde.org>
+
+   This library is free software; you can redistribute it and/or
+   modify it under the terms of the GNU Library General Public
+   License as published by the Free Software Foundation; either
+   version 2 of the License, or (at your option) any later version.
+
+   This library is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   Library General Public License for more details.
+
+   You should have received a copy of the GNU Library General Public License
+   along with this library; see the file COPYING.LIB.  If not, write to
+   the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+   Boston, MA 02111-1307, USA.
+*/
+
+#include <qlayout.h>
+#include <qpushbutton.h>
+#include <qlabel.h>
+
+#include <klocale.h>
+
+#include "zoomfactordlg.h"
+
+/**
+ *  KZoomFactorDialog
+ */
+
+KZoomFactorDialog::KZoomFactorDialog( QWidget* parent, const char* name, WFlags f )
+  : KDialog( parent, name, TRUE, f )
+{
+  // Layout
+  QGridLayout* grid = new QGridLayout( this, 6, 4, 15, 7 );
+
+  // Inputline X
+  m_pLineEditXFactor = new KIntLineEdit( this, i18n( "inputZoomX" ) );
+  grid->addMultiCellWidget( m_pLineEditXFactor, 1, 1, 0, 3 );
+  QLabel* label = new QLabel( m_pLineEditXFactor, i18n( "Zoom factor for width in % (1x = 100)" ), this );
+  grid->addWidget( label, 0, 0 );
+
+  // Inputline Y
+  m_pLineEditYFactor = new KIntLineEdit( this, i18n( "inputZoomX" ) );
+  grid->addMultiCellWidget( m_pLineEditYFactor, 3, 3, 0, 3 );
+  label = new QLabel( m_pLineEditYFactor, i18n( "Zoom factor for height in % (1x = 100)" ), this );
+  grid->addWidget( label, 2, 0 );
+
+  // OK-Button
+  QPushButton* buttonOK = new QPushButton( this, "ButtonOK" );
+  buttonOK->setText( i18n( "OK" ) );
+  connect( buttonOK, SIGNAL( clicked() ), this, SLOT( accept() ) );
+  grid->addWidget( buttonOK, 5, 2 );
+	
+  // Cancel-Button
+  QPushButton* buttonCancel = new QPushButton( this, "ButtonCancel" );
+  buttonCancel->setText( i18n( "Cancel" ) );
+  connect( buttonCancel, SIGNAL( clicked() ), this, SLOT( reject() ) );
+  grid->addWidget( buttonCancel, 5, 3 ); 
+
+   // Dialog
+   grid->setRowStretch( 4, 1 );
+   grid->setColStretch( 1, 1 );
+
+   setMinimumSize( label->sizeHint().width() + m_pLineEditXFactor->sizeHint().width() + buttonOK->sizeHint().width() + 30, 
+                   label->sizeHint().height() + buttonOK->sizeHint().height() + buttonCancel->sizeHint().height() + 40);
+}
+
+KZoomFactorDialog::~KZoomFactorDialog()
+{
+}
+
+void KZoomFactorDialog::setValue( const QPoint& theValue )
+{
+  m_pLineEditXFactor->setValue( theValue.x() );
+  m_pLineEditYFactor->setValue( theValue.y() );
+}
+
+int KZoomFactorDialog::getValue( QPoint& theValue)
+{
+  int result;
+
+  setValue( theValue );
+  result = exec();
+
+  if( result == Accepted )
+    theValue = QPoint( m_pLineEditXFactor->value(), m_pLineEditYFactor->value() );
+
+  return result;
+}
+
+#include "zoomfactordlg.moc"
diff --git a/kimageshop/zoomfactordlg.h b/kimageshop/zoomfactordlg.h
new file mode 100644
index 0000000000..dcc163d8ab
--- /dev/null
+++ b/kimageshop/zoomfactordlg.h
@@ -0,0 +1,44 @@
+/* This file is part of the KDE project
+   Copyright (C) 1998, 1999 Torben Weis <weis@kde.org>
+ 
+   This library is free software; you can redistribute it and/or
+   modify it under the terms of the GNU Library General Public
+   License as published by the Free Software Foundation; either
+   version 2 of the License, or (at your option) any later version.
+ 
+   This library is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   Library General Public License for more details.
+ 
+   You should have received a copy of the GNU Library General Public License
+   along with this library; see the file COPYING.LIB.  If not, write to
+   the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+   Boston, MA 02111-1307, USA.
+*/     
+
+#ifndef __kzoomfactordlg_h__
+#define __kzoomfactordlg_h__
+
+#include <knumlineedit.h>
+#include <kdialog.h>
+
+/**
+ */
+class KZoomFactorDialog : public KDialog
+{
+  Q_OBJECT
+
+public:
+  KZoomFactorDialog( QWidget* parent = 0, const char* name = 0, WFlags f = 0 );
+  ~KZoomFactorDialog();
+
+  void setValue( const QPoint& theValue ); 
+  int getValue( QPoint& theValue);
+
+private:
+  KIntLineEdit* m_pLineEditXFactor;
+  KIntLineEdit* m_pLineEditYFactor;
+};
+
+#endif