1.1 --- a/mainwindow.cpp	Wed Jul 05 10:29:54 2006 +0000
     1.2 +++ b/mainwindow.cpp	Thu Jul 06 14:47:01 2006 +0000
     1.3 @@ -1,15 +1,14 @@
     1.4 +#include "mainwindow.h"
     1.5 +
     1.6  #include <QtGui>
     1.7 -
     1.8 -#include "mainwindow.h"
     1.9 -
    1.10 -#include <qpainter.h>
    1.11 -#include <qprinter.h>
    1.12 -#include <qfile.h>
    1.13 +#include <QPainter>
    1.14 +#include <QPrinter>
    1.15 +#include <QFile>
    1.16  #include <q3filedialog.h>
    1.17 -#include <qcolor.h>
    1.18 -#include <qcolordialog.h>
    1.19 -#include <qbitmap.h>
    1.20 -#include <qinputdialog.h>
    1.21 +#include <QColor>
    1.22 +#include <QColorDialog>
    1.23 +#include <QBitmap>
    1.24 +#include <QInputDialog>
    1.25  //Added by qt3to4:
    1.26  #include <Q3StrList>
    1.27  #include <QPixmap>
    1.28 @@ -2353,13 +2352,13 @@
    1.29  void Main::fileExportOOPresentation()
    1.30  {
    1.31  	ExportOOFileDialog *fd=new ExportOOFileDialog( this,__VYM " - "+tr("Export to")+" Open Office");
    1.32 -	// FIXME add extra info in dialog
    1.33 +	// TODO add preview in dialog
    1.34  	//ImagePreview *p =new ImagePreview (fd);
    1.35  	//fd->setContentsPreviewEnabled( TRUE );
    1.36  	//fd->setContentsPreview( p, p );
    1.37  	//fd->setPreviewMode( QFileDialog::Contents );
    1.38  	fd->setCaption(__VYM " - " +tr("Export to")+" Open Office");
    1.39 -	//fd->setDir (lastImageDir);
    1.40 +	fd->setDir (QDir().current());
    1.41  	fd->show();
    1.42  
    1.43  	if ( fd->exec() == QDialog::Accepted )