From 10b634bda8aef3f79597c1d9b06b49cd1457d715 Mon Sep 17 00:00:00 2001 From: Max Lapan Date: Tue, 9 Mar 2010 16:04:55 +0300 Subject: [PATCH] Device-less widget test infrastructure. This allows us to test our widget using any Qt development environment. Which is quite good, because scratchbox sucks. --- mainwidget.hpp | 7 ++++--- tests/tests.pro | 2 +- tests/widget/main.cpp | 13 +++++++++++++ tests/widget/widget.pro | 6 ++++++ yandex-traffic-core.pri | 2 +- yandex-traffic-gui.pri | 6 ++++++ 6 files changed, 31 insertions(+), 5 deletions(-) create mode 100644 tests/widget/main.cpp create mode 100644 tests/widget/widget.pro create mode 100644 yandex-traffic-gui.pri diff --git a/mainwidget.hpp b/mainwidget.hpp index eac62a9..e7c791f 100644 --- a/mainwidget.hpp +++ b/mainwidget.hpp @@ -21,8 +21,9 @@ public: const RegionInfo *ri; setAlignment(Qt::AlignCenter); +#ifdef Q_WS_MAEMO_5 setAttribute(Qt::WA_TranslucentBackground); - +#endif ri = _regions.lookup (_settings.regions ()[0]); setText (_settings.regions ().join (", ") + ", " + QString (ri ? ri->name () : "")); @@ -30,7 +31,7 @@ public: QSize sizeHint() const { - return 2 * QLabel::sizeHint(); + return QLabel::sizeHint() + QSize (20, 0); } protected: @@ -39,7 +40,7 @@ protected: QPainter p(this); p.setBrush(QColor(0, 0, 0, 128)); p.setPen(Qt::NoPen); - p.drawRoundedRect(rect(), 25, 25); + p.drawRoundedRect(rect(), 10, 10); p.end(); QLabel::paintEvent(event); diff --git a/tests/tests.pro b/tests/tests.pro index 8fdd3e6..191d687 100644 --- a/tests/tests.pro +++ b/tests/tests.pro @@ -1,2 +1,2 @@ TEMPLATE = subdirs -SUBDIRS = regions traffic +SUBDIRS = regions traffic widget diff --git a/tests/widget/main.cpp b/tests/widget/main.cpp new file mode 100644 index 0000000..f52aaba --- /dev/null +++ b/tests/widget/main.cpp @@ -0,0 +1,13 @@ +#include +#include + + +int main(int argc, char *argv[]) +{ + QApplication app (argc, argv); + MainWidget w; + + w.show (); + return app.exec (); +} + diff --git a/tests/widget/widget.pro b/tests/widget/widget.pro new file mode 100644 index 0000000..6c9a0eb --- /dev/null +++ b/tests/widget/widget.pro @@ -0,0 +1,6 @@ +TEMPLATE = app + +SOURCES += main.cpp + +include (../../yandex-traffic-core.pri) +include (../../yandex-traffic-gui.pri) diff --git a/yandex-traffic-core.pri b/yandex-traffic-core.pri index 8fd5d6e..6d6a881 100644 --- a/yandex-traffic-core.pri +++ b/yandex-traffic-core.pri @@ -3,4 +3,4 @@ SOURCES += $$PWD/regions.cpp $$PWD/settings.cpp $$PWD/traffic.cpp $$PWD/http_fet QT += network xml -INCLUDEPATH += $$PWD \ No newline at end of file +INCLUDEPATH += $$PWD diff --git a/yandex-traffic-gui.pri b/yandex-traffic-gui.pri new file mode 100644 index 0000000..c3d87e9 --- /dev/null +++ b/yandex-traffic-gui.pri @@ -0,0 +1,6 @@ +HEADERS += $$PWD/mainwidget.hpp +SOURCES += + +QT += network xml + +INCLUDEPATH += $$PWD -- 1.7.9.5