* Save the icm, resolution and description data with the image

* Fix tab order of two dialog widgets

svn path=/trunk/koffice/; revision=369420

krita/core/kis_doc.cc

@@ -74,7 +74,9 @@
 #include "kis_strategy_colorspace.h"
 #include "kis_colorspace_registry.h"
 #include "tiles/kistilemgr.h"
-
+#include "kis_profile.h"
+#include "kis_resource.h"
+#include "kis_resourceserver.h"
 #include "KIsDocIface.h"
 
 static const char *CURRENT_DTD_VERSION = "1.3";
@@ -534,6 +536,14 @@ QDomElement KisDoc::saveImage(QDomDocument& doc, KisImageSP img)
 	image.setAttribute("width", img -> width());
 	image.setAttribute("height", img -> height());
 	image.setAttribute("colorspacename", img -> colorStrategy() -> name());
+	kdDebug() << "Saving image with description " << img -> description() << "\n";
+	image.setAttribute("description", img -> description());
+	// XXX: Save profile as blob inside the image, instead of the product name.
+	if (img -> profile() -> valid())
+		image.setAttribute("profile", img -> profile() -> productName());
+	image.setAttribute("x-res", img -> xRes());
+	image.setAttribute("y-res", img -> yRes());
+
 	layers = img -> layers();
 
 	if (layers.size() > 0) {
@@ -560,14 +570,19 @@ KisImageSP KisDoc::loadImage(const QDomElement& element)
 	QString name;
 	Q_INT32 width;
 	Q_INT32 height;
+	QString description;
+	QString profileProductName;
+	double xres;
+	double yres;
 	QString colorspacename;
 	Q_INT32 colorspace_int; // used to keep compatibility with old document
+	KisProfileSP profile;
 
 	if ((attr = element.attribute("mime")) == NATIVE_MIMETYPE) {
 		if ((name = element.attribute("name")).isNull())
 			return 0;
 
-		if (namePresent(name))
+		if (!namePresent(name))
 			name = nextImageName();
 
 		if ((attr = element.attribute("width")).isNull())
@@ -582,6 +597,33 @@ KisImageSP KisDoc::loadImage(const QDomElement& element)
 		if ((height = attr.toInt()) < 0 || height > cfg.maxImgHeight())
 			return 0;
 
+		description = element.attribute("description");
+
+		if ((attr = element.attribute("x-res")).isNull()) 
+			xres = 100.0;
+		else if ((xres = attr.toInt()) < 0 || xres > cfg.maxImgHeight())
+			xres = 100.0;
+		
+		if ((attr = element.attribute("y-res")).isNull()) 
+			yres = 100.0;
+		else if ((yres = attr.toInt()) < 0 || yres > cfg.maxImgHeight())
+			yres = 100.0;
+		
+		if ((profileProductName = element.attribute("profile")).isNull()) {
+			profile = new KisProfile();
+		}
+		else {
+			QPtrList<KisResource> resourceslist = KisFactory::rServer() -> profiles();
+			KisResource * resource;
+			for ( resource = resourceslist.first(); resource; resource = resourceslist.next() ) {
+				Q_ASSERT(dynamic_cast<KisProfile*>(resource));
+				profile = static_cast<KisProfile*>(resource);
+				if (profile -> productName() == profileProductName)
+					break;
+				profile = new KisProfile(); // Create invalid default profile.
+			}
+		}
+
 		if ((colorspacename = element.attribute("colorspacename")).isNull())
 		{
 			// TODO: This code is used for compatibility with old files,
@@ -610,7 +652,11 @@ KisImageSP KisDoc::loadImage(const QDomElement& element)
 				return 0;
 			}
 		}
+
 		img = new KisImage(this, width, height, KisColorSpaceRegistry::instance()->colorSpace(colorspacename), name);
+		img -> setDescription(description);
+		img -> setResolution(xres, yres);
+		img -> setProfile(profile);
 
 		for (node = element.firstChild(); !node.isNull(); node = node.nextSibling()) {
 			if (node.isElement()) {

krita/core/resources/kis_resourceserver.cc

@@ -51,7 +51,7 @@ KisResourceServer::~KisResourceServer()
 	m_pipebrushes.clear();
 	m_patterns.clear();
 	m_gradients.clear();
-	m_profiles.clear();
+//	m_profiles.clear(); // Profiles are encapsulated in shared pointers
 }
 
 

krita/core/resources/kis_resourceserver.h

@@ -32,6 +32,7 @@
 #include "kis_gradient.h"
 #include "kis_profile.h"
 
+// XXX: Encapsulate resources in shared pointers.
 class KisResourceServer : public QObject {
 	typedef QObject super;
 	Q_OBJECT

krita/plugins/colorspaceconversion/wdgconvertcolorspace.ui

@@ -242,5 +242,13 @@ colors (Pantone, TruMatch, logo colors, ...)</string>
         </widget>
     </grid>
 </widget>
+<tabstops>
+    <tabstop>cmbColorSpaces</tabstop>
+    <tabstop>cmbSourceProfile</tabstop>
+    <tabstop>cmbDestProfile</tabstop>
+    <tabstop>cmbDepth</tabstop>
+    <tabstop>chkAlpha</tabstop>
+    <tabstop>radioPerceptual</tabstop>
+</tabstops>
 <layoutdefaults spacing="6" margin="11"/>
 </UI>

krita/ui/dialogs/wdgnewimage.ui

@@ -285,6 +285,15 @@
 </customwidgets>
 <tabstops>
     <tabstop>txtName</tabstop>
+    <tabstop>intWidth</tabstop>
+    <tabstop>intHeight</tabstop>
+    <tabstop>doubleResolution</tabstop>
+    <tabstop>cmbColorSpaces</tabstop>
+    <tabstop>cmbProfile</tabstop>
+    <tabstop>cmbDepth</tabstop>
+    <tabstop>cmbColor</tabstop>
+    <tabstop>sliderOpacity</tabstop>
+    <tabstop>txtDescription</tabstop>
 </tabstops>
 <layoutdefaults spacing="6" margin="11"/>
 <includehints>