diff -r db50e4164311 -r 21379539d952 aboutdialog.cpp --- a/aboutdialog.cpp Wed Jun 14 14:43:18 2006 +0000 +++ b/aboutdialog.cpp Wed Jul 05 10:29:54 2006 +0000 @@ -1,8 +1,6 @@ -#include -#include -//Added by qt3to4: -#include -#include +#include +#include +#include #include "aboutdialog.h" #include "version.h" @@ -23,7 +21,7 @@ tabs=new QTabWidget (this); credits=new AboutTextBrowser (parent,"credits"); - credits->setText ( + credits->setHtml( "
" "

VYM - View Your Mind

" "

A tool to put the things you have got in your mind into a map.

" @@ -52,13 +50,15 @@ "
  • Matt from www.satbp.com for Taskjuggler export
  • " "" ""); - credits->setFrameStyle( Q3Frame::Panel | Q3Frame::Plain ); + credits->setFrameStyle( QFrame::Panel | QFrame::Plain ); tabs->addTab (credits,"Credits"); license=new AboutTextBrowser (parent,"license"); license->setText ( + "
    " "

    VYM - View Your Mind

    " "

    Copyright (C) 2004-2005 Uwe Drechsel

    " + "
    " "

    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.

    " @@ -166,7 +166,7 @@ "

    END OF TERMS AND CONDITIONS

    " ); - credits->setFrameStyle( Q3Frame::Panel | Q3Frame::Plain ); + credits->setFrameStyle( QFrame::Panel | QFrame::Plain ); tabs->addTab (license,"License"); mainLayout->addWidget (tabs); @@ -182,24 +182,14 @@ } AboutTextBrowser::AboutTextBrowser(QWidget *parent, const char *name) - : Q3TextBrowser(parent, name) + : QTextBrowser(parent, name) { } -void AboutTextBrowser::setSource(const QString &name) +void AboutTextBrowser::setSource(const QUrl &url ) { - Q3MimeSourceFactory *factory = Q3MimeSourceFactory::defaultFactory(); - const QMimeSource *data = factory->data(name); - if (data) { - Q3TextBrowser::setSource(name); - } else { - Q3Process *proc = new Q3Process( this ); - proc->addArgument( settings.readEntry("/vym/mainwindow/readerURL" )); - proc->addArgument( name); - - if ( !proc->start() ) - if (mainWindow->settingsURL() ) - setSource(name); - } + QProcess *proc= new QProcess (); + proc->start( settings.readEntry("/vym/mainwindow/readerURL"),QStringList ()<waitForStarted() &&mainWindow->settingsURL() ) setSource(url); }