From 2882749886f8499e100f0659b6fc61c571045a62 Mon Sep 17 00:00:00 2001
From: gsherman <gsherman@c8812cc2-4d05-0410-92ff-de0c093fc19c>
Date: Sat, 6 Jul 2002 19:37:47 +0000
Subject: [PATCH] *** empty log message ***

git-svn-id: http://svn.osgeo.org/qgis/trunk@15 c8812cc2-4d05-0410-92ff-de0c093fc19c
---
 src/qgisapp.cpp          |  6 ++++
 src/qgisicons.h          | 78 ++++++++++++++++++++++++++++++++++++++++
 src/qgsnewconnection.cpp |  2 +-
 3 files changed, 85 insertions(+), 1 deletion(-)

diff --git a/src/qgisapp.cpp b/src/qgisapp.cpp
index 17d5cc6ae4d..ff054cab4f3 100644
--- a/src/qgisapp.cpp
+++ b/src/qgisapp.cpp
@@ -20,6 +20,7 @@
 #include <qscrollview.h>
 #include <qstringlist.h>
 #include <qmessagebox.h>
+#include <qpixmap.h>
 #include <qsplitter.h>
 #include <qlayout.h>
 #include <qwmatrix.h>
@@ -27,8 +28,13 @@
 #include "qgsmapcanvas.h"
 #include "qgsdbsourceselect.h"
 #include "qgisapp.h"
+#include "qgisicons.h"
 
 QgisApp::QgisApp(QWidget *parent, const char * name, WFlags fl ) : QgisAppBase(parent, name, fl ){
+  QPixmap icon;
+  icon = QPixmap(appicon_xpm);
+  setIcon(icon);
+
   //add a canvas
   canvas = new QCanvas(1024,768);
   // resize it to fit in the frame
diff --git a/src/qgisicons.h b/src/qgisicons.h
index 409b18283cc..2ef0b0f274b 100644
--- a/src/qgisicons.h
+++ b/src/qgisicons.h
@@ -1,5 +1,83 @@
 #ifndef QGISICONS_H
 #define QGISICONS_H
+
+/* XPM */
+static const char * appicon_xpm[] = {
+"16 16 56 1",
+" 	c None",
+".	c #FFFFFF",
+"+	c #F5F7FE",
+"@	c #D5DDFD",
+"#	c #C7D0F5",
+"$	c #D6DBEE",
+"%	c #F6F6F7",
+"&	c #D6E0FE",
+"*	c #E6EDFF",
+"=	c #D3DFFF",
+"-	c #8EA2F6",
+";	c #697AC3",
+">	c #D3D6E1",
+",	c #FEFFFF",
+"'	c #EFF3FD",
+")	c #95A1D9",
+"!	c #445393",
+"~	c #EEEFF1",
+"{	c #FBFBFB",
+"]	c #BEC2D6",
+"^	c #4F5B92",
+"/	c #A9ADBD",
+"(	c #FDFEFF",
+"_	c #F9FBFE",
+":	c #ECECEF",
+"<	c #B3B6C3",
+"[	c #4F5882",
+"}	c #868A9D",
+"|	c #EAEBEE",
+"1	c #F4F5F6",
+"2	c #FAFBFD",
+"3	c #DFE5FC",
+"4	c #B1BDF0",
+"5	c #AAB2D0",
+"6	c #8389A3",
+"7	c #323C65",
+"8	c #A8ABBA",
+"9	c #F5F5F7",
+"0	c #B2B5C3",
+"a	c #D1D3D8",
+"b	c #A5AFD6",
+"c	c #5F72C3",
+"d	c #4B5CA3",
+"e	c #323E74",
+"f	c #30385C",
+"g	c #D3D5E1",
+"h	c #666E93",
+"i	c #5D6792",
+"j	c #3E4B82",
+"k	c #2A3565",
+"l	c #31395C",
+"m	c #CBCCD4",
+"n	c #F0F0F1",
+"o	c #B5B6BD",
+"p	c #93949B",
+"q	c #B7B7BA",
+"................",
+"................",
+"................",
+"................",
+"......+@#$%.....",
+"......&*=-;>....",
+"........,')!~...",
+".........{]^/...",
+".......(_:<[}...",
+"....|12345678...",
+"....90abcdef~...",
+".....ghijklm....",
+"......nopqn.....",
+"................",
+"................",
+"................"};
+
+
 /* XPM */
 static const char * layer_points[] = {
 "16 16 14 1",
diff --git a/src/qgsnewconnection.cpp b/src/qgsnewconnection.cpp
index 013900231b7..a2e21da3a4f 100644
--- a/src/qgsnewconnection.cpp
+++ b/src/qgsnewconnection.cpp
@@ -21,7 +21,7 @@ void QgsNewConnection::testConnection(){
 			       txtDatabase->text() +  " was successfull");
     }else{
       QMessageBox::information(this,"Test connection",
-			       "Connection failed - Check settings and try againto ");
+			       "Connection failed - Check settings and try again ");
     }