Created V0.3.x branch and moved the head into the trunk directory.

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@246 b45a01b8-16f6-495d-af2f-9b41ad6348cc

retroshare-gui/src/util/PixmapMerging.h

@@ -0,0 +1,53 @@
+/****************************************************************
+ *  RetroShare is distributed under the following license:
+ *
+ *  Copyright (C) 2006,2007 crypton
+ *
+ *  This program is free software; you can redistribute it and/or
+ *  modify it under the terms of the GNU General Public License
+ *  as published by the Free Software Foundation; either version 2
+ *  of the License, or (at your option) any later version.
+ *
+ *  This program 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 General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program; if not, write to the Free Software
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, 
+ *  Boston, MA  02110-1301, USA.
+ ****************************************************************/
+
+#ifndef PIXMAPMERGING_H
+#define PIXMAPMERGING_H
+
+#include <util/rsqtutildll.h>
+
+#include <util/NonCopyable.h>
+
+#include <string>
+
+class QPixmap;
+
+/**
+ * Merges 2 pixmaps together.
+ *
+ * 
+ */
+class PixmapMerging : NonCopyable {
+public:
+
+	/**
+	 * Merges 2 pixmaps together.
+	 *
+	 * Used to have a background picture (a cadre) and a picture inside it.
+	 * Currently used to a the avatar of a contact inside a nice background.
+	 *
+	 * @param foregroundPixmapData an 'array' with the foreground picture data
+	 * @param backgroundPixmapFilename background pixmap filename e.g ":/pics/avatar_background.png"
+	 */
+	RSQTUTIL_API static QPixmap merge(const std::string & foregroundPixmapData, const std::string & backgroundPixmapFilename);
+};
+
+#endif	//PIXMAPMERGING_H