Mercurial Mercurial > hedgewars-draft / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
remove the svg dependency
authorkoda
Sat, 17 Oct 2009 13:40:59 +0000
changeset 2525 e6cdc0251cd1
parent 2524 0b075d38fee5
child 2526 009854c42f09
remove the svg dependency
QTfrontend/CMakeLists.txt file | annotate | diff | comparison | revisions
QTfrontend/about.cpp file | annotate | diff | comparison | revisions
QTfrontend/hedgewars.qrc file | annotate | diff | comparison | revisions
hedgewars/SDLh.pas file | annotate | diff | comparison | revisions
project_files/hedgewars.pro file | annotate | diff | comparison | revisions 
--- a/QTfrontend/CMakeLists.txt	Sat Oct 17 13:34:40 2009 +0000
+++ b/QTfrontend/CMakeLists.txt	Sat Oct 17 13:40:59 2009 +0000
@@ -4,7 +4,7 @@
 set(QT_USE_QTCORE TRUE)
 set(QT_USE_QTGUI TRUE)
 set(QT_USE_QTNETWORK TRUE)
-set(QT_USE_QTSVG TRUE)
+set(QT_USE_QTSVG FALSE)
 set(QT_USE_QTXML FALSE)
 set(QT_USE_QTOPENGL FALSE)
 set(QT_USE_QTMAIN TRUE)
--- a/QTfrontend/about.cpp	Sat Oct 17 13:34:40 2009 +0000
+++ b/QTfrontend/about.cpp	Sat Oct 17 13:40:59 2009 +0000
@@ -17,7 +17,6 @@
  */
 
 #include <QGridLayout>
-#include <QSvgWidget>
 #include <QLabel>
 #include <QTextBrowser>
 #include "about.h"
@@ -27,9 +26,17 @@
   QWidget(parent)
 {
 	QGridLayout *mainLayout = new QGridLayout(this);
-	QSvgWidget *hedgehog = new QSvgWidget(":/res/Hedgehog.svg", this);
-	hedgehog->setFixedSize(300, 329);
-	mainLayout->addWidget(hedgehog, 0, 0, 2, 1);
+        QLabel *imageLabel = new QLabel;
+        QImage image(":/res/Hedgehog.png");
+
+        imageLabel->setPixmap(QPixmap::fromImage(image));
+        imageLabel->setScaledContents(true);
+
+        imageLabel->setMinimumWidth(2.8);
+        imageLabel->setMaximumWidth(280);
+        imageLabel->setMinimumHeight(30);
+        imageLabel->setMaximumHeight(300);
+        mainLayout->addWidget(imageLabel, 0, 0, 2, 1);
 
 	QLabel *lbl1 = new QLabel(this);
 
--- a/QTfrontend/hedgewars.qrc	Sat Oct 17 13:34:40 2009 +0000
+++ b/QTfrontend/hedgewars.qrc	Sat Oct 17 13:40:59 2009 +0000
@@ -17,7 +17,7 @@
     <file>res/botlevels/net4.png</file>
     <file>res/botlevels/net5.png</file>
     <file>res/bonus.png</file>
-    <file>res/Hedgehog.svg</file>
+    <file>res/Hedgehog.png</file>
     <file>res/net.png</file>
     <file>res/About.png</file>
     <file>res/SimpleGame.png</file>
--- a/hedgewars/SDLh.pas	Sat Oct 17 13:34:40 2009 +0000
+++ b/hedgewars/SDLh.pas	Sat Oct 17 13:40:59 2009 +0000
@@ -41,7 +41,6 @@
 	{$linkframework SDL_image}
 	{$linkframework SDL_ttf}
 	{$linkframework SDL_mixer}
-	{$linklib openalbridge}
 	{$linklib SDLmain}
 	{$linklib gcc}
 {$ENDIF}
--- a/project_files/hedgewars.pro	Sat Oct 17 13:34:40 2009 +0000
+++ b/project_files/hedgewars.pro	Sat Oct 17 13:40:59 2009 +0000
@@ -8,7 +8,7 @@
 	RC_FILE	= ../QTfrontend/res/hedgewars.rc
 }
 
-QT += network svg xml
+QT += network
 
 HEADERS += ../QTfrontend/*.h
 SOURCES += ../QTfrontend/*.cpp
hedgewars-draft