1.1 --- a/mainwindow.cpp	Tue Dec 15 09:14:59 2009 +0000
     1.2 +++ b/mainwindow.cpp	Mon Jan 04 20:36:06 2010 +0000
     1.3 @@ -411,9 +411,15 @@
     1.4  	connect( a, SIGNAL( triggered() ), this, SLOT( fileExportOOPresentation() ) );
     1.5  	fileExportMenu->addAction (a);
     1.6  
     1.7 -	a = new QAction(  "Webpage (XHTML)...",this );
     1.8 -	a->setShortcut (Qt::ALT + Qt::Key_X);			//Export XHTML
     1.9 +	a = new QAction(  "Webpage (HTML)...",this );
    1.10 +	a->setShortcut (Qt::ALT + Qt::Key_X);			//Export HTML
    1.11  	a->setStatusTip ( tr( "Export as %1","status tip file menu").arg(tr(" webpage (XHTML)","status tip file menu")));
    1.12 +	connect( a, SIGNAL( triggered() ), this, SLOT( fileExportHTML() ) );
    1.13 +	fileExportMenu->addAction (a);
    1.14 +
    1.15 +	a = new QAction(  "Webpage (XHTML)...",this );	//Export XHTML
    1.16 +
    1.17 +	//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")));
    1.18  	connect( a, SIGNAL( triggered() ), this, SLOT( fileExportXHTML() ) );
    1.19  	fileExportMenu->addAction (a);
    1.20  
    1.21 @@ -1040,7 +1046,7 @@
    1.22  	tb->setObjectName ("viewTB");
    1.23  	QMenu *viewMenu = menuBar()->addMenu ( tr( "&View" ));
    1.24  
    1.25 -	Switchboard switchboard;	//FIXME-1 testing...
    1.26 +	Switchboard switchboard;	//FIXME-2 testing...
    1.27  
    1.28  	QAction *a;
    1.29  	a = new QAction(QPixmap(iconPath+"viewmag-reset.png"), tr( "reset Zoom","View action" ), this);
    1.30 @@ -2218,6 +2224,12 @@
    1.31  	if (m) m->exportXML();
    1.32  }
    1.33  
    1.34 +void Main::fileExportHTML()	
    1.35 +{
    1.36 +	VymModel *m=currentModel();
    1.37 +	if (m) m->exportHTML();
    1.38 +}
    1.39 +
    1.40  
    1.41  void Main::fileExportXHTML()	
    1.42  {
    1.43 @@ -2833,7 +2845,11 @@
    1.44  void Main::editAddAttribute()
    1.45  {
    1.46  	VymModel *m=currentModel();
    1.47 -	if (m) m->addAttribute();
    1.48 +	if (m) 
    1.49 +	{
    1.50 +
    1.51 +		m->addAttribute();
    1.52 +	}
    1.53  }
    1.54  
    1.55  void Main::editAddMapCenter()