diff --git a/src/Makefile.am b/src/Makefile.am
index 4c3baba838e..1ecbeebfa6c 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -67,7 +67,9 @@ qgis_MOC = 	qgisappbase.moc.cpp \
 			qgsmessageviewer.moc.cpp\
 			qgspluginmanagerbase.moc.cpp\
 			qgsrasterlayer.moc.cpp\
-			qgsshapefilelayer.moc.cpp
+			qgsshapefilelayer.moc.cpp \
+			qgsmapserverexportbase.moc.cpp \
+			qgsmapserverexport.moc.cpp
 qgis_UI = qgisappbase.h\
 			qgisappbase.cpp\
 			qgslegenditembase.h\
@@ -83,7 +85,8 @@ qgis_UI = qgisappbase.h\
 			qgspluginmanagerbase.h\
 			qgspluginmanagerbase.cpp\
 			qgsmessageviewer.h\
-			qgsmessageviewer.cpp
+			qgsmessageviewer.cpp \
+ 			qgsmapserverexportbase.cpp
 
 # UI dependencies			
 qgisappbase.h: qgisappbase.ui
diff --git a/src/Makefile.in b/src/Makefile.in
index f17238c968d..4b7a00abcc2 100644
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -209,7 +209,9 @@ qgis_MOC = qgisappbase.moc.cpp \
 			qgsmessageviewer.moc.cpp\
 			qgspluginmanagerbase.moc.cpp\
 			qgsrasterlayer.moc.cpp\
-			qgsshapefilelayer.moc.cpp\
+			qgsshapefilelayer.moc.cpp \
+			qgsmapserverexportbase.moc.cpp \
+			qgsmapserverexport.moc.cpp\
 $(am__append_3)
 qgis_UI = qgisappbase.h\
 			qgisappbase.cpp\
@@ -226,7 +228,8 @@ qgis_UI = qgisappbase.h\
 			qgspluginmanagerbase.h\
 			qgspluginmanagerbase.cpp\
 			qgsmessageviewer.h\
-			qgsmessageviewer.cpp\
+			qgsmessageviewer.cpp \
+ 			qgsmapserverexportbase.cpp\
 $(am__append_2)
 
 #PostgreSQL files
@@ -275,18 +278,19 @@ am__qgis_SOURCES_DIST = qgisapp.cpp main.cpp qgisiface.cpp \
 	qgsidentifyresultsbase.cpp qgsattributetablebase.h \
 	qgsattributetablebase.cpp qgspluginmanagerbase.h \
 	qgspluginmanagerbase.cpp qgsmessageviewer.h \
-	qgsmessageviewer.cpp qgsdbsourceselectbase.h \
-	qgsdbsourceselectbase.cpp qgsnewconnectionbase.h \
-	qgsnewconnectionbase.cpp qgisappbase.moc.cpp qgisapp.moc.cpp \
-	qgisinterface.moc.cpp qgsabout.moc.cpp \
-	qgsattributetablebase.moc.cpp qgsattributetable.moc.cpp \
-	qgsidentifyresultsbase.moc.cpp qgslayerpropertiesbase.moc.cpp \
-	qgslegend.moc.cpp qgslegenditembase.moc.cpp \
-	qgslegenditem.moc.cpp qgslegendview.moc.cpp \
-	qgsmapcanvas.moc.cpp qgsmaplayer.moc.cpp \
+	qgsmessageviewer.cpp qgsmapserverexportbase.cpp \
+	qgsdbsourceselectbase.h qgsdbsourceselectbase.cpp \
+	qgsnewconnectionbase.h qgsnewconnectionbase.cpp \
+	qgisappbase.moc.cpp qgisapp.moc.cpp qgisinterface.moc.cpp \
+	qgsabout.moc.cpp qgsattributetablebase.moc.cpp \
+	qgsattributetable.moc.cpp qgsidentifyresultsbase.moc.cpp \
+	qgslayerpropertiesbase.moc.cpp qgslegend.moc.cpp \
+	qgslegenditembase.moc.cpp qgslegenditem.moc.cpp \
+	qgslegendview.moc.cpp qgsmapcanvas.moc.cpp qgsmaplayer.moc.cpp \
 	qgsmaplayerinterface.moc.cpp qgsmessageviewer.moc.cpp \
 	qgspluginmanagerbase.moc.cpp qgsrasterlayer.moc.cpp \
-	qgsshapefilelayer.moc.cpp qgsdbsourceselectbase.moc.cpp \
+	qgsshapefilelayer.moc.cpp qgsmapserverexportbase.moc.cpp \
+	qgsmapserverexport.moc.cpp qgsdbsourceselectbase.moc.cpp \
 	qgsdatabaselayer.moc.cpp qgsdbsourceselect.moc.cpp \
 	qgsnewconnection.moc.cpp qgsnewconnectionbase.moc.cpp \
 	qgsdbsourceselect.cpp qgsnewconnection.cpp qgsdatabaselayer.cpp
@@ -297,7 +301,8 @@ am__objects_3 = qgisappbase.$(OBJEXT) qgslegenditembase.$(OBJEXT) \
 	qgsabout.$(OBJEXT) qgslayerpropertiesbase.$(OBJEXT) \
 	qgsidentifyresultsbase.$(OBJEXT) \
 	qgsattributetablebase.$(OBJEXT) qgspluginmanagerbase.$(OBJEXT) \
-	qgsmessageviewer.$(OBJEXT) $(am__objects_2)
+	qgsmessageviewer.$(OBJEXT) qgsmapserverexportbase.$(OBJEXT) \
+	$(am__objects_2)
 am__objects_4 = qgsdbsourceselectbase.moc.$(OBJEXT) \
 	qgsdatabaselayer.moc.$(OBJEXT) qgsdbsourceselect.moc.$(OBJEXT) \
 	qgsnewconnection.moc.$(OBJEXT) \
@@ -314,7 +319,9 @@ am__objects_6 = qgisappbase.moc.$(OBJEXT) qgisapp.moc.$(OBJEXT) \
 	qgsmaplayer.moc.$(OBJEXT) qgsmaplayerinterface.moc.$(OBJEXT) \
 	qgsmessageviewer.moc.$(OBJEXT) \
 	qgspluginmanagerbase.moc.$(OBJEXT) qgsrasterlayer.moc.$(OBJEXT) \
-	qgsshapefilelayer.moc.$(OBJEXT) $(am__objects_5)
+	qgsshapefilelayer.moc.$(OBJEXT) \
+	qgsmapserverexportbase.moc.$(OBJEXT) \
+	qgsmapserverexport.moc.$(OBJEXT) $(am__objects_5)
 am__objects_7 = qgsdbsourceselect.$(OBJEXT) qgsnewconnection.$(OBJEXT) \
 	qgsdatabaselayer.$(OBJEXT)
 @POSTGRESDB_TRUE@am__objects_8 = $(am__objects_7)
@@ -384,6 +391,9 @@ am__depfiles_maybe = depfiles
 @AMDEP_TRUE@	./$(DEPDIR)/qgsmaplayer.moc.Po \
 @AMDEP_TRUE@	./$(DEPDIR)/qgsmaplayerinterface.moc.Po \
 @AMDEP_TRUE@	./$(DEPDIR)/qgsmapserverexport.Po \
+@AMDEP_TRUE@	./$(DEPDIR)/qgsmapserverexport.moc.Po \
+@AMDEP_TRUE@	./$(DEPDIR)/qgsmapserverexportbase.Po \
+@AMDEP_TRUE@	./$(DEPDIR)/qgsmapserverexportbase.moc.Po \
 @AMDEP_TRUE@	./$(DEPDIR)/qgsmarkersymbol.Po \
 @AMDEP_TRUE@	./$(DEPDIR)/qgsmessageviewer.Po \
 @AMDEP_TRUE@	./$(DEPDIR)/qgsmessageviewer.moc.Po \
@@ -518,6 +528,9 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/qgsmaplayer.moc.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/qgsmaplayerinterface.moc.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/qgsmapserverexport.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/qgsmapserverexport.moc.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/qgsmapserverexportbase.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/qgsmapserverexportbase.moc.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/qgsmarkersymbol.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/qgsmessageviewer.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/qgsmessageviewer.moc.Po@am__quote@
diff --git a/src/qgisapp.cpp b/src/qgisapp.cpp
index ca55e1304a7..13aba1e5d84 100644
--- a/src/qgisapp.cpp
+++ b/src/qgisapp.cpp
@@ -62,6 +62,7 @@
 #include "qgslegendview.h"
 #include "qgsprojectio.h"
 #include "qgsmapserverexport.h"
+
 #ifdef POSTGRESQL
 #include <libpq++.h>
 #include "qgsdbsourceselect.h"
@@ -84,8 +85,8 @@ typedef QString name_t();
 typedef QString description_t();
 
 // version
-static const char *qgisVersion = "0.0.13 Development - September-October 2003";
-static const int qgisVersionInt = 13;
+//static const char *qgisVersion = "0.0.13 Development - September-October 2003";
+//static const int qgisVersionInt = 13;
 // cursors
 static unsigned char zoom_in_bits[] = {
 	0xf8, 0x00, 0x06, 0x03, 0x22, 0x02, 0x21, 0x04, 0x21, 0x04, 0xfd, 0x05,
@@ -181,7 +182,7 @@ QgisApp::QgisApp(QWidget * parent, const char *name, WFlags fl):QgisAppBase(pare
 	mapLegend->setMapCanvas(mapCanvas);
 	legendView->setResizeMode(QListView::AllColumns);
 	QString caption = "Quantum GIS - ";
-	caption += qgisVersion;
+	caption += QGis::qgisVersion;
 	setCaption(caption);
 	connect(mapCanvas, SIGNAL(xyCoordinates(QgsPoint &)), this, SLOT(showMouseCoordinate(QgsPoint &)));
 	connect(legendView, SIGNAL(doubleClicked(QListViewItem *)), this, SLOT(layerProperties(QListViewItem *)));
@@ -220,7 +221,7 @@ void QgisApp::about()
 {
 	QgsAbout *abt = new QgsAbout();
 	QString versionString = "Version ";
-	versionString += qgisVersion;
+	versionString += QGis::qgisVersion;
 	#ifdef POSTGRESQL
 		versionString += " with PostgreSQL support";
 	#else
@@ -230,7 +231,7 @@ void QgisApp::about()
 	QString urls = "Web Page: http://qgis.sourceforge.net\nSourceforge Project Page: http://sourceforge.net/projects/qgis";
 	abt->setURLs(urls);
 	QString watsNew = "Version ";
-	watsNew += qgisVersion;
+	watsNew += QGis::qgisVersion;
 	watsNew += "\n"
 	"**Multiple features displayed with the Identify tool\n" 
 	"**Identify function returns and displays attributes for multiple\n"
@@ -398,9 +399,13 @@ void QgisApp::fileSaveAs(){
 }
 
 void QgisApp::exportMapServer(){
-	QgsMapServerExport *mse = new QgsMapServerExport(mapCanvas, QgsProjectIo::SAVEAS);
-	mse->write();
+	
+	QgsMapserverExport *mse = new QgsMapserverExport(mapCanvas, this);
+	if(mse->exec()){
+		mse->write();
+	}
 	delete mse;
+	
 }
 void QgisApp::zoomIn()
 {
@@ -966,11 +971,11 @@ void QgisApp::socketConnectionClosed(){
 		// check the version from the  server against our version
 		QString versionInfo;
 		int currentVersion = parts[0].toInt();
-		if(currentVersion > qgisVersionInt){
+		if(currentVersion > QGis::qgisVersionInt){
 		// show version message from server
 			versionInfo = "There is a new version of QGIS available\n";
 		}else{
-			if(qgisVersionInt > currentVersion){
+			if(QGis::qgisVersionInt > currentVersion){
 				versionInfo = "You are running a development version of QGIS\n";
 			}else{
 			versionInfo = "You are running the current version of QGIS\n";
diff --git a/src/qgsprojectio.cpp b/src/qgsprojectio.cpp
index 06d3e0f2557..c14805c89d9 100644
--- a/src/qgsprojectio.cpp
+++ b/src/qgsprojectio.cpp
@@ -12,7 +12,7 @@
  *   (at your option) any later version.                                   *
  *                                                                         *
  ***************************************************************************/
-/* qgsprojectio.cpp,v 1.10 2003/11/11 06:34:27 gsherman Exp */
+/* qgsprojectio.cpp,v 1.11 2003/11/12 04:44:37 gsherman Exp */
  #include <iostream>
  #include <fstream>
  #include <qfiledialog.h>
@@ -50,7 +50,8 @@ bool QgsProjectIo::write(){
 	//QMessageBox::information(0,"Full Path",fullPath);
 	int okToSave = 0;
 	if(QFile::exists(fullPath) && (action == SAVEAS)){
-		okToSave = QMessageBox::warning(0,"Overwrite File?",fullPath + " exists. \nDo you want to overwrite it?", "Yes", "No");
+		okToSave = QMessageBox::warning(0,"Overwrite File?",fullPath + 
+			" exists. \nDo you want to overwrite it?", "Yes", "No");
 	}
 	if(okToSave == 0){
 	// write the project information to the selected file
@@ -189,11 +190,13 @@ if(action == SAVE && fullPath.isEmpty()){
 	}
 switch(action){
 	case OPEN:
-	fullPath = QFileDialog::getOpenFileName("./", "QGis files (*.qgs)", 0,  0, "Choose a file to open" );
+	fullPath = QFileDialog::getOpenFileName("./", "QGis files (*.qgs)", 0,  0, 
+		"Choose a file to open" );
   
 	break;
 	case SAVEAS:
-		fullPath = QFileDialog::getSaveFileName("./", "QGis files (*.qgs)", 0,  0, "Choose a filename  to save" );
+		fullPath = QFileDialog::getSaveFileName("./", "QGis files (*.qgs)", 0,
+			0, "Choose a filename  to save" );
 	break;
 	}
 	return fullPath;
@@ -248,7 +251,8 @@ void QgsProjectIo::writeXML(){
 			xml << "\">\n";
 			if(isDatabase){
 				// cast the layer to a qgsdatabaselayer
-				// TODO fix this so database layers are properly saved/restored when name is changed in legend
+				// TODO fix this so database layers are properly saved/restored 
+				// when name is changed in legend
 				/* QgsDatabaseLayer *dblyr = (QgsDatabaseLayer *)lyr;
 				xml << "\t\t<layername>" + dblyr->schemaName() << "." <<
 					dblyr->geometryTableName() << "</layername>\n"; */