diff -r c13937960f1d -r 46553c106c52 mainwindow.cpp --- a/mainwindow.cpp Thu Mar 18 11:55:59 2010 +0000 +++ b/mainwindow.cpp Mon Mar 22 15:37:23 2010 +0000 @@ -1182,7 +1182,7 @@ QAction *a; a = new QAction(QPixmap(iconPath+"viewmag-reset.png"), tr( "reset Zoom","View action" ), this); a->setStatusTip ( tr( "Zoom reset" ) ); - a->setShortcut (Qt::CTRL + Qt::Key_0); // Reset zoom + a->setShortcut (Qt::Key_Comma); // Reset zoom switchboard.addConnection(a,tr("View shortcuts","Shortcut group")); a->addTo( tb ); viewMenu->addAction (a); @@ -1190,7 +1190,7 @@ a = new QAction( QPixmap(iconPath+"viewmag+.png"), tr( "Zoom in","View action" ), this); a->setStatusTip (tr( "Zoom in" )); - a->setShortcut(Qt::CTRL + Qt::Key_Plus); + a->setShortcut(Qt::Key_Plus); switchboard.addConnection(a,tr("View shortcuts","Shortcut group")); a->addTo( tb ); viewMenu->addAction (a); @@ -1198,7 +1198,7 @@ a = new QAction( QPixmap(iconPath+"viewmag-.png"), tr( "Zoom out","View action" ), this); a->setStatusTip (tr( "Zoom out" )); - a->setShortcut(Qt::CTRL + Qt::Key_Minus); + a->setShortcut(Qt::Key_Minus); switchboard.addConnection(a,tr("View shortcuts","Shortcut group")); a->addTo( tb ); viewMenu->addAction (a); @@ -3963,9 +3963,10 @@ } -#include "attributeitem.h" void Main::testFunction1() { +/* +#include "attributeitem.h" VymModel *m=currentModel(); if (!m) return; @@ -3981,11 +3982,9 @@ m->addAttribute (ai); } return; - -/* +*/ if (!currentMapEditor()) return; currentMapEditor()->testFunction1(); -*/ } void Main::testFunction2()