diff -r 25ee6b988b73 -r 8f987e376035 mainwindow.cpp --- a/mainwindow.cpp Tue Dec 15 09:14:59 2009 +0000 +++ b/mainwindow.cpp Mon Jan 04 20:36:06 2010 +0000 @@ -411,9 +411,15 @@ connect( a, SIGNAL( triggered() ), this, SLOT( fileExportOOPresentation() ) ); fileExportMenu->addAction (a); - a = new QAction( "Webpage (XHTML)...",this ); - a->setShortcut (Qt::ALT + Qt::Key_X); //Export XHTML + a = new QAction( "Webpage (HTML)...",this ); + a->setShortcut (Qt::ALT + Qt::Key_X); //Export HTML a->setStatusTip ( tr( "Export as %1","status tip file menu").arg(tr(" webpage (XHTML)","status tip file menu"))); + connect( a, SIGNAL( triggered() ), this, SLOT( fileExportHTML() ) ); + fileExportMenu->addAction (a); + + a = new QAction( "Webpage (XHTML)...",this ); //Export XHTML + + //a->setShortcut (Qt::ALT + Qt::SHIFT + Qt::Key_X); a->setStatusTip ( tr( "Export as %1","status tip file menu").arg(tr(" webpage (XHTML)","status tip file menu"))); connect( a, SIGNAL( triggered() ), this, SLOT( fileExportXHTML() ) ); fileExportMenu->addAction (a); @@ -1040,7 +1046,7 @@ tb->setObjectName ("viewTB"); QMenu *viewMenu = menuBar()->addMenu ( tr( "&View" )); - Switchboard switchboard; //FIXME-1 testing... + Switchboard switchboard; //FIXME-2 testing... QAction *a; a = new QAction(QPixmap(iconPath+"viewmag-reset.png"), tr( "reset Zoom","View action" ), this); @@ -2218,6 +2224,12 @@ if (m) m->exportXML(); } +void Main::fileExportHTML() +{ + VymModel *m=currentModel(); + if (m) m->exportHTML(); +} + void Main::fileExportXHTML() { @@ -2833,7 +2845,11 @@ void Main::editAddAttribute() { VymModel *m=currentModel(); - if (m) m->addAttribute(); + if (m) + { + + m->addAttribute(); + } } void Main::editAddMapCenter()