diff --git a/ui/Help.ui b/ui/Help.ui index efeb7900..e559397b 100644 --- a/ui/Help.ui +++ b/ui/Help.ui @@ -88,5 +88,54 @@ qPixmapFromMimeSource - + + + buttonOk + clicked() + Help + accept() + + + 668 + 26 + + + 520 + 19 + + + + + forward + clicked() + textbox + forward() + + + 128 + 33 + + + 189 + 161 + + + + + back + clicked() + textbox + backward() + + + 57 + 25 + + + 61 + 254 + + + + diff --git a/widgets/MW_help.cpp b/widgets/MW_help.cpp index 9683f198..9a5cab2e 100644 --- a/widgets/MW_help.cpp +++ b/widgets/MW_help.cpp @@ -89,8 +89,8 @@ void MainWindow::about() QString cont; cont.sprintf("

XCA

" - "

Copyright 2002 - 2006 by Christian Hohnstädt - " - "version : " VER "" + "

Copyright 2002 - 2006 by Christian Hohnstädt\n" + "

Version : " VER "" "

%s
QT: %s" "


" "" @@ -106,8 +106,8 @@ void MainWindow::about() OPENSSL_VERSION_TEXT, QT_VERSION_STR ); about->setWindowTitle(tr(XCA_TITLE)); - //ui.image->setPixmap( *keyImg ); - //ui.image1->setPixmap( *certImg ); + ui.image->setPixmap( *keyImg ); + ui.image1->setPixmap( *certImg ); ui.textbox->setHtml(cont); about->exec(); } @@ -117,8 +117,11 @@ void MainWindow::help() QDialog *h = new QDialog(this, 0); Ui::Help ui; ui.setupUi(h); + QStringList path; + path << PREFIX "/share/xca"; + //ui.textbox->setSearchPaths(path); + ui.textbox->setSource(QUrl("file://" PREFIX "/share/xca/xca.html")); h->setWindowTitle(tr(XCA_TITLE)); - ui.textbox->setSource(QUrl("file://xca.html")); h->exec(); }
Christian Hohnstädt<christian@hohnstaedt.de>