diff -r 5db8dfd30ea2 -r c2a05fa925a1 mainwindow.cpp
--- a/mainwindow.cpp	Thu Nov 23 16:18:26 2006 +0000
+++ b/mainwindow.cpp	Fri Dec 08 20:18:56 2006 +0000
@@ -169,9 +169,10 @@
 	// Save Settings
 	settings.setValue ( "/mainwindow/geometry/size", size() );
 	settings.setValue ( "/mainwindow/geometry/pos", pos() );
-
 	settings.setValue ("/mainwindow/state",saveState(0));
 
+	settings.setValue ("/mainwindow/view/AntiAlias",actionViewToggleAntiAlias->isOn());
+	settings.setValue ("/mainwindow/view/SmoothPixmapTransform",actionViewToggleSmoothPixmapTransform->isOn());
 	settings.setValue( "/version/version", vymVersion );
 	settings.setValue( "/version/builddate", vymBuildDate );
 
@@ -891,6 +892,12 @@
 	formatMenu->addAction (a);
     connect( a, SIGNAL( triggered() ), this, SLOT( formatSelectBackColor() ) );
     actionFormatBackColor=a;
+
+    a= new QAction( pix, tr( "Set &Background image" )+QString("..."), this );
+	a->setStatusTip (tr( "Set Background image" ));
+	formatMenu->addAction (a);
+    connect( a, SIGNAL( triggered() ), this, SLOT( formatSelectBackImage() ) );
+    actionFormatBackImage=a;
 }
 
 // View Actions
@@ -946,14 +953,30 @@
     connect( a, SIGNAL( triggered() ), this, SLOT(windowToggleHistory() ) );
 	actionViewToggleHistoryWindow=a;
 
+    a = new QAction(tr( "Antialiasing","View action" ),this );
+	a->setStatusTip ( tr( "Antialiasing" ));
+	a->setToggleAction(true);
+	a->setOn (settings.value("/mainwindow/view/AntiAlias",true).toBool());
+	viewMenu->addAction (a);
+    connect( a, SIGNAL( triggered() ), this, SLOT(windowToggleAntiAlias() ) );
+	actionViewToggleAntiAlias=a;
+
+    a = new QAction(tr( "Smooth pixmap transformations","View action" ),this );
+	a->setStatusTip (a->text());
+	a->setToggleAction(true);
+	a->setOn (settings.value("/mainwindow/view/SmoothPixmapTransformation",true).toBool());
+	viewMenu->addAction (a);
+    connect( a, SIGNAL( triggered() ), this, SLOT(windowToggleSmoothPixmap() ) );
+	actionViewToggleSmoothPixmapTransform=a;
+
     a = new QAction(tr( "Next Window","View action" ), this);
-	a->setStatusTip ( tr( "&Next Window" ) );
+	a->setStatusTip (a->text());
 	a->setShortcut (Qt::ALT + Qt::Key_N );
 	viewMenu->addAction (a);
     connect( a, SIGNAL( triggered() ), this, SLOT(windowNextEditor() ) );
 
     a = new QAction (tr( "Previous Window","View action" ), this );
-	a->setStatusTip (tr( "&Previous Window" ));
+	a->setStatusTip (a->text());
 	a->setShortcut (Qt::ALT + Qt::Key_P );
 	viewMenu->addAction (a);
     connect( a, SIGNAL( triggered() ), this, SLOT(windowPreviousEditor() ) );
@@ -1041,7 +1064,7 @@
 	standardFlagsDefault->setName ("standardFlagsDef");
 	standardFlagsDefault->setToolBar (tb);
 
-	fo->load(QPixmap(flagsPath+"flag-exclamationmark.png"));
+	fo->load(flagsPath+"flag-exclamationmark.png");
 	fo->setName ("exclamationmark");
 	fo->setGroup("standard-mark");
 	QAction *a=new QAction (fo->getPixmap(),fo->getName(),this);
@@ -1053,7 +1076,7 @@
 	connect (a, SIGNAL( triggered() ), this, SLOT( standardFlagChanged() ) );
 	standardFlagsDefault->addFlag (fo);	// makes deep copy
 	
-	fo->load(QPixmap(flagsPath+"flag-questionmark.png"));
+	fo->load(flagsPath+"flag-questionmark.png");
 	fo->setName("questionmark");
 	fo->setGroup("standard-mark");
 	a=new QAction (fo->getPixmap(),fo->getName(),this);
@@ -1065,7 +1088,7 @@
 	connect (a, SIGNAL( triggered() ), this, SLOT( standardFlagChanged() ) );
 	standardFlagsDefault->addFlag (fo);	
 
-	fo->load(QPixmap(flagsPath+"flag-hook-green.png"));
+	fo->load(flagsPath+"flag-hook-green.png");
 	fo->setName("hook-green");
 	fo->setGroup("standard-hook");
 	a=new QAction (fo->getPixmap(),fo->getName(),this);
@@ -1077,7 +1100,7 @@
 	connect (a, SIGNAL( triggered() ), this, SLOT( standardFlagChanged() ) );
 	standardFlagsDefault->addFlag (fo);	
 
-	fo->load(QPixmap(flagsPath+"flag-cross-red.png"));
+	fo->load(flagsPath+"flag-cross-red.png");
 	fo->setName("cross-red");
 	fo->setGroup("standard-hook");
 	a=new QAction (fo->getPixmap(),fo->getName(),this);
@@ -1089,7 +1112,7 @@
 	connect (a, SIGNAL( triggered() ), this, SLOT( standardFlagChanged() ) );
 	standardFlagsDefault->addFlag (fo);	
 
-	fo->load(QPixmap(flagsPath+"flag-stopsign.png"));
+	fo->load(flagsPath+"flag-stopsign.png");
 	fo->setName("stopsign");
 	a=new QAction (fo->getPixmap(),fo->getName(),this);
 	tb->addAction (a);
@@ -1100,7 +1123,7 @@
 	connect (a, SIGNAL( triggered() ), this, SLOT( standardFlagChanged() ) );
 	standardFlagsDefault->addFlag (fo);	
 
-	fo->load(QPixmap(flagsPath+"flag-smiley-good.png"));
+	fo->load(flagsPath+"flag-smiley-good.png");
 	fo->setName("smiley-good");
 	fo->setGroup("standard-smiley");
 	a=new QAction (fo->getPixmap(),fo->getName(),this);
@@ -1112,7 +1135,7 @@
 	connect (a, SIGNAL( triggered() ), this, SLOT( standardFlagChanged() ) );
 	standardFlagsDefault->addFlag (fo);	
 
-	fo->load(QPixmap(flagsPath+"flag-smiley-sad.png"));
+	fo->load(flagsPath+"flag-smiley-sad.png");
 	fo->setName("smiley-sad");
 	fo->setGroup("standard-smiley");
 	a=new QAction (fo->getPixmap(),fo->getName(),this);
@@ -1124,7 +1147,7 @@
 	connect (a, SIGNAL( triggered() ), this, SLOT( standardFlagChanged() ) );
 	standardFlagsDefault->addFlag (fo);	
 
-	fo->load(QPixmap(flagsPath+"flag-smiley-omg.png"));
+	fo->load(flagsPath+"flag-smiley-omg.png");
 	// Original omg.png (in KDE emoticons)
 	fo->setName("smiley-omg");
 	fo->setGroup("standard-smiley");
@@ -1137,7 +1160,7 @@
 	connect (a, SIGNAL( triggered() ), this, SLOT( standardFlagChanged() ) );
 	standardFlagsDefault->addFlag (fo);	
 
-	fo->load(QPixmap(flagsPath+"flag-kalarm.png"));
+	fo->load(flagsPath+"flag-kalarm.png");
 	fo->setName("clock");
 	a=new QAction (fo->getPixmap(),fo->getName(),this);
 	tb->addAction (a);
@@ -1148,7 +1171,7 @@
 	connect (a, SIGNAL( triggered() ), this, SLOT( standardFlagChanged() ) );
 	standardFlagsDefault->addFlag (fo);	
 
-	fo->load(QPixmap(flagsPath+"flag-phone.png"));
+	fo->load(flagsPath+"flag-phone.png");
 	fo->setName("phone");
 	a=new QAction (fo->getPixmap(),fo->getName(),this);
 	tb->addAction (a);
@@ -1159,7 +1182,7 @@
 	connect (a, SIGNAL( triggered() ), this, SLOT( standardFlagChanged() ) );
 	standardFlagsDefault->addFlag (fo);	
 
-	fo->load(QPixmap(flagsPath+"flag-lamp.png"));
+	fo->load(flagsPath+"flag-lamp.png");
 	fo->setName("lamp");
 	a=new QAction (fo->getPixmap(),fo->getName(),this);
 	tb->addAction (a);
@@ -1170,7 +1193,7 @@
 	connect (a, SIGNAL( triggered() ), this, SLOT( standardFlagChanged() ) );
 	standardFlagsDefault->addFlag (fo);	
 
-	fo->load(QPixmap(flagsPath+"flag-arrow-up.png"));
+	fo->load(flagsPath+"flag-arrow-up.png");
 	fo->setName("arrow-up");
 	fo->setGroup("standard-arrow");
 	a=new QAction (fo->getPixmap(),fo->getName(),this);
@@ -1182,7 +1205,7 @@
 	connect (a, SIGNAL( triggered() ), this, SLOT( standardFlagChanged() ) );
 	standardFlagsDefault->addFlag (fo);	
 
-	fo->load(QPixmap(flagsPath+"flag-arrow-down.png"));
+	fo->load(flagsPath+"flag-arrow-down.png");
 	fo->setName("arrow-down");
 	fo->setGroup("standard-arrow");
 	a=new QAction (fo->getPixmap(),fo->getName(),this);
@@ -1194,7 +1217,7 @@
 	connect (a, SIGNAL( triggered() ), this, SLOT( standardFlagChanged() ) );
 	standardFlagsDefault->addFlag (fo);	
 
-	fo->load(QPixmap(flagsPath+"flag-arrow-2up.png"));
+	fo->load(flagsPath+"flag-arrow-2up.png");
 	fo->setName("2arrow-up");
 	fo->setGroup("standard-arrow");
 	a=new QAction (fo->getPixmap(),fo->getName(),this);
@@ -1206,7 +1229,7 @@
 	connect (a, SIGNAL( triggered() ), this, SLOT( standardFlagChanged() ) );
 	standardFlagsDefault->addFlag (fo);	
 
-	fo->load(QPixmap(flagsPath+"flag-arrow-2down.png"));
+	fo->load(flagsPath+"flag-arrow-2down.png");
 	fo->setName("2arrow-down");
 	fo->setGroup("standard-arrow");
 	a=new QAction (fo->getPixmap(),fo->getName(),this);
@@ -1218,7 +1241,7 @@
 	connect (a, SIGNAL( triggered() ), this, SLOT( standardFlagChanged() ) );
 	standardFlagsDefault->addFlag (fo);	
 
-	fo->load(QPixmap(flagsPath+"flag-thumb-up.png"));
+	fo->load(flagsPath+"flag-thumb-up.png");
 	fo->setName("thumb-up");
 	fo->setGroup("standard-thumb");
 	a=new QAction (fo->getPixmap(),fo->getName(),this);
@@ -1230,7 +1253,7 @@
 	connect (a, SIGNAL( triggered() ), this, SLOT( standardFlagChanged() ) );
 	standardFlagsDefault->addFlag (fo);	
 
-	fo->load(QPixmap(flagsPath+"flag-thumb-down.png"));
+	fo->load(flagsPath+"flag-thumb-down.png");
 	fo->setName("thumb-down");
 	fo->setGroup("standard-thumb");
 	a=new QAction (fo->getPixmap(),fo->getName(),this);
@@ -1242,7 +1265,7 @@
 	connect (a, SIGNAL( triggered() ), this, SLOT( standardFlagChanged() ) );
 	standardFlagsDefault->addFlag (fo);	
 	
-	fo->load(QPixmap(flagsPath+"flag-rose.png"));
+	fo->load(flagsPath+"flag-rose.png");
 	fo->setName("rose");
 	a=new QAction (fo->getPixmap(),fo->getName(),this);
 	tb->addAction (a);
@@ -1253,7 +1276,7 @@
 	connect (a, SIGNAL( triggered() ), this, SLOT( standardFlagChanged() ) );
 	standardFlagsDefault->addFlag (fo);	
 
-	fo->load(QPixmap(flagsPath+"flag-heart.png"));
+	fo->load(flagsPath+"flag-heart.png");
 	fo->setName("heart");
 	a=new QAction (fo->getPixmap(),fo->getName(),this);
 	tb->addAction (a);
@@ -1263,7 +1286,7 @@
 	connect (a, SIGNAL( triggered() ), this, SLOT( standardFlagChanged() ) );
 	standardFlagsDefault->addFlag (fo);	
 
-	fo->load(QPixmap(flagsPath+"flag-present.png"));
+	fo->load(flagsPath+"flag-present.png");
 	fo->setName("present");
 	a=new QAction (fo->getPixmap(),fo->getName(),this);
 	tb->addAction (a);
@@ -1274,7 +1297,7 @@
 	connect (a, SIGNAL( triggered() ), this, SLOT( standardFlagChanged() ) );
 	standardFlagsDefault->addFlag (fo);	
 
-	fo->load(QPixmap(flagsPath+"flag-flash.png"));
+	fo->load(flagsPath+"flag-flash.png");
 	fo->setName("flash");
 	a=new QAction (fo->getPixmap(),fo->getName(),this);
 	tb->addAction (a);
@@ -1285,7 +1308,7 @@
 	connect (a, SIGNAL( triggered() ), this, SLOT( standardFlagChanged() ) );
 	standardFlagsDefault->addFlag (fo);	
 	
-	fo->load(QPixmap(flagsPath+"flag-info.png"));
+	fo->load(flagsPath+"flag-info.png");
 	// Original: xsldbg_output.png
 	fo->setName("info");
 	a=new QAction (fo->getPixmap(),fo->getName(),this);
@@ -1297,7 +1320,7 @@
 	connect (a, SIGNAL( triggered() ), this, SLOT( standardFlagChanged() ) );
 	standardFlagsDefault->addFlag (fo);	
 
-	fo->load(QPixmap(flagsPath+"flag-lifebelt.png"));
+	fo->load(flagsPath+"flag-lifebelt.png");
 	// Original khelpcenter.png
 	fo->setName("lifebelt");
 	a=new QAction (fo->getPixmap(),fo->getName(),this);
@@ -1507,6 +1530,7 @@
 	actionFormatLinkColorHint->addTo( canvasContextMenu );
 	actionFormatLinkColor->addTo( canvasContextMenu );
 	actionFormatBackColor->addTo( canvasContextMenu );
+	actionFormatBackImage->addTo( canvasContextMenu );
 
 	// Menu for last opened files
 	// Create actions
@@ -1620,12 +1644,15 @@
 void Main::fileNew()
 {
 	QString fn="unnamed";
-	MapEditor* medit = new MapEditor ( NULL);
-	tabWidget->addTab (medit,fn);
-	tabWidget->showPage(medit);
-	medit->viewport()->setFocus();
+	MapEditor* me = new MapEditor ( NULL);
+	tabWidget->addTab (me,fn);
+	tabWidget->showPage(me);
+	me->viewport()->setFocus();
+	me->setAntiAlias (actionViewToggleAntiAlias->isOn());
+	me->setSmoothPixmap(actionViewToggleSmoothPixmapTransform->isOn());
+	
 	// For the very first map we do not have flagrows yet...
-	medit->select("mc:");
+	me->select("mc:");
 }
 
 ErrorCode Main::fileLoad(QString fn, const LoadMode &lmode)
@@ -1692,6 +1719,8 @@
 			tabWidget->addTab (me,fn);
 			tabIndex=tabWidget->indexOf (me);
 			tabWidget->setCurrentPage (tabIndex);
+			me->setAntiAlias (actionViewToggleAntiAlias->isOn());
+			me->setSmoothPixmap(actionViewToggleSmoothPixmapTransform->isOn());
 		}
 		
 		// Check, if file exists (important for creating new files
@@ -2629,7 +2658,7 @@
 			if (ok)
 			{
 #if defined(Q_OS_MACX)
-				p = currentMapEditor()->mapToGlobal( currentMapEditor()->worldMatrix().map( p));
+				p=currentMapEditor()->mapTo (this,p);
 				QDialog *d =new QDialog(NULL);
 				QLineEdit *le=new QLineEdit (d);
 				d->setWindowFlags (Qt::FramelessWindowHint);
@@ -2645,7 +2674,7 @@
 				delete (d);
 				editHeadingFinished();
 #else
-				p = currentMapEditor()->mapTo(this, currentMapEditor()->worldMatrix().map( p));
+				p=currentMapEditor()->mapTo (this,p);
 				lineedit->setGeometry(p.x(),p.y(),230,25);
 				lineedit->setText(s);
 				lineedit->setCursorPosition(1);
@@ -3011,6 +3040,12 @@
 		currentMapEditor()->selectMapBackgroundColor();
 }
 
+void Main::formatSelectBackImage()
+{
+	if (currentMapEditor())
+		currentMapEditor()->selectMapBackgroundImage();
+}
+
 void Main::formatSelectLinkColor()
 {
 	if (currentMapEditor())
@@ -3058,7 +3093,7 @@
 	{
 		QMatrix m;
 		m.reset();
-		currentMapEditor()->setWorldMatrix( m );
+		currentMapEditor()->setMatrix( m );
 		currentMapEditor()->setViewCenter();
 		currentMapEditor()->adjustCanvasSize();
 	}	
@@ -3068,9 +3103,9 @@
 {
 	if (currentMapEditor())
 	{
-		QMatrix m = currentMapEditor()->worldMatrix();
+		QMatrix m = currentMapEditor()->matrix();
 		m.scale( 1.25, 1.25 );
-		currentMapEditor()->setWorldMatrix( m );
+		currentMapEditor()->setMatrix( m );
 		currentMapEditor()->setViewCenter();
 		currentMapEditor()->adjustCanvasSize();
 	}	
@@ -3080,9 +3115,9 @@
 {
 	if (currentMapEditor())
 	{
-		QMatrix m = currentMapEditor()->worldMatrix();
+		QMatrix m = currentMapEditor()->matrix();
 		m.scale( 0.8, 0.8 );
-		currentMapEditor()->setWorldMatrix( m );
+		currentMapEditor()->setMatrix( m );
 		currentMapEditor()->setViewCenter();
 		currentMapEditor()->adjustCanvasSize();
 	}	
@@ -3142,6 +3177,31 @@
 
 }
 
+void Main::windowToggleAntiAlias()
+{
+	bool b=actionViewToggleAntiAlias->isOn();
+	MapEditor *me;
+	for (int i=0;i<tabWidget->count();i++)
+	{
+		
+		me=(MapEditor*)tabWidget->page(i);
+		me->setAntiAlias(b);
+	}	
+
+}
+
+void Main::windowToggleSmoothPixmap()
+{
+	bool b=actionViewToggleSmoothPixmapTransform->isOn();
+	MapEditor *me;
+	for (int i=0;i<tabWidget->count();i++)
+	{
+		
+		me=(MapEditor*)tabWidget->page(i);
+		me->setSmoothPixmap(b);
+	}	
+}
+
 void Main::updateHistory(SimpleSettings &undoSet)
 {
 	historyWindow->update (undoSet);
@@ -3457,12 +3517,12 @@
 	}
 	
 	QString docpath=docdir.path()+"/"+docname;
+	QStringList args;
 	Process *pdfProc = new Process();
-	pdfProc->clearArguments();
-	pdfProc->addArgument( settings.value("/mainwindow/readerPDF").toString());
-	pdfProc->addArgument( docpath);
-
-	if ( !pdfProc->start() ) 
+	args <<docpath;
+
+	pdfProc->start( settings.value("/mainwindow/readerPDF").toString());
+	if ( !pdfProc->waitForStarted() ) 
 	{
 		// error handling
 		QMessageBox::warning(0,