1.1 --- a/aboutdialog.cpp	Tue Jul 04 12:10:56 2006 +0000
     1.2 +++ b/aboutdialog.cpp	Wed Jul 05 10:29:54 2006 +0000
     1.3 @@ -1,8 +1,6 @@
     1.4 -#include <qmime.h>
     1.5 -#include <q3process.h>
     1.6 -//Added by qt3to4:
     1.7 -#include <Q3VBoxLayout>
     1.8 -#include <Q3Frame>
     1.9 +#include <QProcess>
    1.10 +#include <QVBoxLayout>
    1.11 +#include <QFrame>
    1.12  
    1.13  #include "aboutdialog.h"
    1.14  #include "version.h"
    1.15 @@ -23,7 +21,7 @@
    1.16      tabs=new QTabWidget (this);
    1.17      credits=new AboutTextBrowser (parent,"credits");
    1.18  
    1.19 -    credits->setText (
    1.20 +    credits->setHtml(
    1.21  	"<center><img src=\""+iconPath+"vym-128x128.png\"></center>"
    1.22  	"<h3><center>VYM - View Your Mind </h3>"
    1.23  	"<p align=\"center\"> A tool to put the things you have got in your mind into a map.</p>"
    1.24 @@ -52,13 +50,15 @@
    1.25  	"<li>Matt from <a href=\"http://www.satbp.com\">www.satbp.com</a> for <a href=\"http://www.taskjuggler.org\">Taskjuggler</a> export</li>"
    1.26  	"</ul>"
    1.27  	"</li>");
    1.28 -    credits->setFrameStyle( Q3Frame::Panel | Q3Frame::Plain );
    1.29 +    credits->setFrameStyle( QFrame::Panel | QFrame::Plain );
    1.30      tabs->addTab (credits,"Credits");
    1.31  
    1.32      license=new AboutTextBrowser (parent,"license");
    1.33      license->setText (
    1.34 +	"<center>"
    1.35  	"<h3>VYM - View Your Mind</h3>"
    1.36      "<p>Copyright (C) 2004-2005  Uwe Drechsel</p>"  
    1.37 +	"</center>"
    1.38  
    1.39      "<p>This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version.</p>"
    1.40  
    1.41 @@ -166,7 +166,7 @@
    1.42  "<p align=\"center\">END OF TERMS AND CONDITIONS</p>"
    1.43  	
    1.44  	);
    1.45 -    credits->setFrameStyle( Q3Frame::Panel | Q3Frame::Plain );
    1.46 +    credits->setFrameStyle( QFrame::Panel | QFrame::Plain );
    1.47      tabs->addTab (license,"License");
    1.48  
    1.49      mainLayout->addWidget (tabs);
    1.50 @@ -182,24 +182,14 @@
    1.51  }
    1.52  
    1.53  AboutTextBrowser::AboutTextBrowser(QWidget *parent, const char *name)
    1.54 -    : Q3TextBrowser(parent, name)
    1.55 +    : QTextBrowser(parent, name)
    1.56  {
    1.57      
    1.58  }
    1.59  
    1.60 -void AboutTextBrowser::setSource(const QString &name)
    1.61 +void AboutTextBrowser::setSource(const QUrl &url )
    1.62  {
    1.63 -    Q3MimeSourceFactory *factory = Q3MimeSourceFactory::defaultFactory();
    1.64 -    const QMimeSource *data = factory->data(name);
    1.65 -    if (data) {
    1.66 -	Q3TextBrowser::setSource(name);
    1.67 -    } else {
    1.68 -	Q3Process *proc = new Q3Process( this );
    1.69 -	proc->addArgument( settings.readEntry("/vym/mainwindow/readerURL" ));
    1.70 -	proc->addArgument( name);
    1.71 -	
    1.72 -	if ( !proc->start() ) 
    1.73 -	    if (mainWindow->settingsURL() ) 
    1.74 -		setSource(name);
    1.75 -    }
    1.76 +	QProcess *proc= new QProcess ();
    1.77 +	proc->start( settings.readEntry("/vym/mainwindow/readerURL"),QStringList ()<<url.toString());
    1.78 +	if (!proc->waitForStarted() &&mainWindow->settingsURL() ) setSource(url);
    1.79  }