1.1 --- a/mainwindow.cpp	Thu Mar 18 11:55:59 2010 +0000
     1.2 +++ b/mainwindow.cpp	Mon Mar 22 15:37:23 2010 +0000
     1.3 @@ -1182,7 +1182,7 @@
     1.4  	QAction *a;
     1.5  	a = new QAction(QPixmap(iconPath+"viewmag-reset.png"), tr( "reset Zoom","View action" ), this);
     1.6  	a->setStatusTip ( tr( "Zoom reset" ) );
     1.7 -	a->setShortcut (Qt::CTRL + Qt::Key_0);	// Reset zoom
     1.8 +	a->setShortcut (Qt::Key_Comma);	// Reset zoom
     1.9  	switchboard.addConnection(a,tr("View shortcuts","Shortcut group"));
    1.10  	a->addTo( tb );
    1.11  	viewMenu->addAction (a);
    1.12 @@ -1190,7 +1190,7 @@
    1.13  
    1.14  	a = new QAction( QPixmap(iconPath+"viewmag+.png"), tr( "Zoom in","View action" ), this);
    1.15  	a->setStatusTip (tr( "Zoom in" ));
    1.16 -	a->setShortcut(Qt::CTRL + Qt::Key_Plus);
    1.17 +	a->setShortcut(Qt::Key_Plus);
    1.18  	switchboard.addConnection(a,tr("View shortcuts","Shortcut group"));
    1.19  	a->addTo( tb );
    1.20  	viewMenu->addAction (a);
    1.21 @@ -1198,7 +1198,7 @@
    1.22  
    1.23  	a = new QAction( QPixmap(iconPath+"viewmag-.png"), tr( "Zoom out","View action" ), this);
    1.24  	a->setStatusTip (tr( "Zoom out" ));
    1.25 -	a->setShortcut(Qt::CTRL + Qt::Key_Minus);
    1.26 +	a->setShortcut(Qt::Key_Minus);
    1.27  	switchboard.addConnection(a,tr("View shortcuts","Shortcut group"));
    1.28  	a->addTo( tb );
    1.29  	viewMenu->addAction (a);
    1.30 @@ -3963,9 +3963,10 @@
    1.31  }
    1.32  
    1.33  
    1.34 -#include "attributeitem.h"
    1.35  void Main::testFunction1()
    1.36  {
    1.37 +/*
    1.38 +#include "attributeitem.h"
    1.39  	VymModel *m=currentModel();
    1.40  	if (!m) return;
    1.41  
    1.42 @@ -3981,11 +3982,9 @@
    1.43  		m->addAttribute (ai);
    1.44  	}
    1.45  	return;
    1.46 -
    1.47 -/*
    1.48 +*/
    1.49  	if (!currentMapEditor()) return;
    1.50  	currentMapEditor()->testFunction1();
    1.51 -*/
    1.52  }
    1.53  
    1.54  void Main::testFunction2()