Commit e135ea54 authored by Sebastian Eichelbaum's avatar Sebastian Eichelbaum

[CHANGE] improved welcome dialog

parent 800f89df
<h1>Welcome to OpenWalnut %OW_LIB_VERSION% Development Version!</h1>
<a href="http://www.openwalnut.org/projects/openwalnut/wiki/ReleaseNotes">Release Notes</a>
<br>
<br>
Hello User! New to OpenWalnut? Have a look at <a href="http://www.openwalnut.org">http://www.openwalnut.org</a>!
<br>
We provide
<ul>
<li> <a href="http://www.openwalnut.org/projects/openwalnut/wiki/FirstSteps">a first steps tutorial</a>,
<li> a user documentation,
<li> programming tutorials,
<li> and the latest information on OpenWalnut.
</ul>
Do you have problems using OpenWalnut? Do not hesitate to ask:
<ul>
<li><a href="mailto:openwalnut@lists.informatik.uni-leipzig.de">Mailing list</a>
<li>IRC Chat on irc.freenode.net, channel #ow
</ul>
Found a bug? Do you have ideas for improvements? Please <a href="http://www.openwalnut.org/projects/openwalnut/wiki/Contribute">report</a> these issues! We can improve OpenWalnut only with your help and ideas.
<br><br>
<i>Thank you for using OpenWalnut!</i>
<div style='font-family:sans-serif;'>
<div style='padding:10px; border:0px solid #000; border-bottom-width: 10px;color:#fff;background:#0c67a8;'>
<h1>
Welcome to OpenWalnut!
</h1>
</div>
<div style='padding:10px; background:#ddd;'>
<h3>Version Information</h3>
This is %OW_VERSION%. This is the first release candidate for OpenWalnut 1.3. You can check out the
<a href="http://www.openwalnut.org/projects/openwalnut/wiki/ReleaseNotes">Release Notes</a> and the
<a href="http://www.openwalnut.org/versions/1">Changelog</a> for detailled information on fixed bugs, new features and other
improvements.
</div>
<div style='padding:10px; background:#eee;'>
<h3>Further Information</h3>
</div>
<div style='padding:10px; ;'>
Hello User! You see this dialog because you have started this version of OpenWalnut the first time.
Are you new to OpenWalnut? Have a look at <a href="http://www.openwalnut.org">http://www.openwalnut.org</a>!
<br>
<br>
We provide
<ul>
<li> <a href="http://www.openwalnut.org/projects/openwalnut/wiki/FirstSteps">a first steps tutorial</a>,
<li> a user documentation,
<li> programming tutorials,
<li> and the latest information on OpenWalnut.
</ul>
Do you have problems using OpenWalnut? Do not hesitate to ask:
<ul>
<li><a href="mailto:openwalnut@lists.informatik.uni-leipzig.de">Mailing list</a>
<li>IRC Chat on irc.freenode.net, channel #ow
</ul>
Found a bug? Do you have ideas for improvements? Please <a href="http://www.openwalnut.org/projects/openwalnut/wiki/Contribute">report</a> these issues! We can improve OpenWalnut only with your help and ideas.
<br><br>
<i>Thank you for using OpenWalnut!</i>
</div>
</div>
......@@ -1149,10 +1149,21 @@ void WMainWindow::showWelcomeDialog( bool force )
content = boost::regex_replace( content, reg1, std::string( W_LIB_VERSION ) );
content = boost::regex_replace( content, reg2, std::string( W_VERSION ) );
QWidget* w = NULL;
#ifndef QT4GUI_NOWEBKIT
QWebView* view = new QWebView( this );
view->setHtml( QString::fromStdString( content ) );
view->setMinimumWidth( 640 );
view->page()->setLinkDelegationPolicy( QWebPage::DelegateExternalLinks );
w = view;
#else
QLabel* l = new QLabel( QString::fromStdString( content ) );
l->setWordWrap( true );
l->setMinimumWidth( 640 );
WQtMessageDialog* msgDia = new WQtMessageDialog( msgID, "Welcome to OpenWalnut", l, getSettings(), this );
w = l;
#endif
WQtMessageDialog* msgDia = new WQtMessageDialog( msgID, "Welcome to OpenWalnut", w, getSettings(), this );
msgDia->show( force );
}
......
......@@ -44,8 +44,8 @@ WQtMessageDialog::WQtMessageDialog( QString msgID, QString title, QWidget* conte
// setup contents
QVBoxLayout* mainLayout = new QVBoxLayout();
// text widget
mainLayout->addWidget( m_content );
// text widget. Force stretching the content instead of the button bar
mainLayout->addWidget( m_content, 100 );
// dialog buttons and checkbox to bottom layout
QHBoxLayout* bottomLayout = new QHBoxLayout();
......
......@@ -256,7 +256,7 @@ WQtModuleMetaInfo::WQtModuleMetaInfo( WModule::SPtr module, QWidget* parent ):
// no webview. Use a text widget.
QTextEdit* view = new QTextEdit( this );
layout->addWidget( view );
view->setText( "This feature is not supported in your OpenWalnut build. Solution: Build OpenWalnut with Qt Webkit." );
view->setText( "This feature is not supported in your OpenWalnut build. Please build OpenWalnut with Qt Webkit." );
#endif
}
......
......@@ -51,7 +51,7 @@ PACKAGES="deb src"
# As we only need a source DEB, we do not build the deb for all supported distributions. The NeuroDebian project is doing this.
# DISTRIBUTIONS_DEB="sid wheezy squeeze lucid maverick natty"
DISTRIBUTIONS_DEB="sid precise"
DISTRIBUTIONS_DEB="sid wheezy precise oneiric"
# use these distributions to build binary tgz
#DISTRIBUTIONS_TGZ="sid wheezy squeeze lucid maverick natty"
......@@ -60,7 +60,7 @@ DISTRIBUTIONS_TGZ=""
# Architectures to build for
# NOTE: we need the debsrc package.
ARCHITECTURES_DEB="amd64"
ARCHITECTURES_DEB="i386 amd64"
# Build binary tgz for 386 and amd64
ARCHITECTURES_TGZ="amd64"
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment