Revert to old renderer

This commit is contained in:
Romolo Manfredini
2014-01-19 08:10:28 +01:00
parent 9419f565aa
commit 0c0662711e
3 changed files with 9 additions and 23 deletions
-1
View File
@@ -39,7 +39,6 @@ ENDIF()
FIND_PACKAGE( Qt4 REQUIRED )
SET( QT_USE_QTNETWORK True )
SET( QT_USE_QTXML True )
SET( QT_USE_QTWEBKIT True )
INCLUDE( ${QT_USE_FILE} )
IF ( APPLE )
+6 -6
View File
@@ -70,8 +70,8 @@ contributorsDialog::contributorsDialog(QWidget *parent, int contest, QString rnu
str.append("<tr><td colspan=3 class=\"mycss\">"+tr("Thank you all !!!")+"</td></tr>");
str.append("</table>");
str.append("</body></html>");
ui->webBrowser->setHtml(str,QUrl(""));
ui->webBrowser->scroll(0,0);
ui->textEditor->setHtml(str);
ui->textEditor->scroll(0,0);
this->setWindowTitle(tr("Contributors"));
}
break;
@@ -79,9 +79,9 @@ contributorsDialog::contributorsDialog(QWidget *parent, int contest, QString rnu
case 1:{
QFile file(":/releasenotes.txt");
if(file.open( QIODevice::ReadOnly | QIODevice::Text ) ) {
ui->webBrowser->setHtml(file.readAll(),QUrl(""));
ui->textEditor->setHtml(file.readAll());
}
ui->webBrowser->scroll(0,0);
ui->textEditor->scroll(0,0);
this->setWindowTitle(tr("Companion9x Release Notes"));
}
break;
@@ -104,7 +104,7 @@ contributorsDialog::contributorsDialog(QWidget *parent, int contest, QString rnu
void contributorsDialog::showEvent ( QShowEvent * )
{
ui->webBrowser->scroll(0,0);
ui->textEditor->scroll(0,0);
}
contributorsDialog::~contributorsDialog()
@@ -114,7 +114,7 @@ contributorsDialog::~contributorsDialog()
void contributorsDialog::replyFinished(QNetworkReply * reply)
{
ui->webBrowser->setHtml(reply->readAll(),QUrl(""));
ui->textEditor->setHtml(reply->readAll());
}
void contributorsDialog::forceClose() {
+3 -16
View File
@@ -6,8 +6,8 @@
<rect>
<x>0</x>
<y>0</y>
<width>926</width>
<height>333</height>
<width>788</width>
<height>528</height>
</rect>
</property>
<property name="windowTitle">
@@ -19,23 +19,10 @@
</property>
<layout class="QGridLayout" name="gridLayout">
<item row="0" column="0">
<widget class="QWebView" name="webBrowser">
<property name="url">
<url>
<string>about:blank</string>
</url>
</property>
</widget>
<widget class="QTextEdit" name="textEditor"/>
</item>
</layout>
</widget>
<customwidgets>
<customwidget>
<class>QWebView</class>
<extends>QWidget</extends>
<header>QtWebKit/QWebView</header>
</customwidget>
</customwidgets>
<resources>
<include location="companion9x.qrc"/>
</resources>