author | zecke <zecke> | 2004-10-11 19:00:29 (UTC) |
---|---|---|
committer | zecke <zecke> | 2004-10-11 19:00:29 (UTC) |
commit | 75fb192e17a3e55dc0c631dbd62b42796714b0dc (patch) (unidiff) | |
tree | c7551ec51368d1504e654a2fb3b2d6cbba747364 /core/applets/aboutapplet/about.cpp | |
parent | d3da21c01659c68dc2cf1dfff1608649977b6e05 (diff) | |
download | opie-75fb192e17a3e55dc0c631dbd62b42796714b0dc.zip opie-75fb192e17a3e55dc0c631dbd62b42796714b0dc.tar.gz opie-75fb192e17a3e55dc0c631dbd62b42796714b0dc.tar.bz2 |
-Remove AboutDialog
-Add the former AboutDialog as AboutWidget
-Update .cvsignore to ingore widget.h and widget.cpp
-Better way to show the Widget and create it delayed and onyl once
-Remove the Opie Logo
Diffstat (limited to 'core/applets/aboutapplet/about.cpp') (more/less context) (show whitespace changes)
-rw-r--r-- | core/applets/aboutapplet/about.cpp | 20 |
1 files changed, 9 insertions, 11 deletions
diff --git a/core/applets/aboutapplet/about.cpp b/core/applets/aboutapplet/about.cpp index 3952d0a..1dbd4c4 100644 --- a/core/applets/aboutapplet/about.cpp +++ b/core/applets/aboutapplet/about.cpp | |||
@@ -1,19 +1,20 @@ | |||
1 | #include "about.h" | 1 | #include "about.h" |
2 | #include "dialog.h" | 2 | #include "widget.h" |
3 | 3 | ||
4 | #include <qpe/qpeapplication.h> | 4 | #include <qpe/qpeapplication.h> |
5 | #include <qpe/resource.h> | 5 | #include <qpe/resource.h> |
6 | #include <qpe/qcopenvelope_qws.h> | 6 | #include <qpe/qcopenvelope_qws.h> |
7 | 7 | ||
8 | #include <qapplication.h> | ||
9 | #include <qlabel.h> | 8 | #include <qlabel.h> |
10 | 9 | ||
11 | AboutApplet::AboutApplet ( ) | 10 | AboutApplet::AboutApplet ( ) |
12 | : QObject ( 0, "AboutApplet" ) | 11 | : QObject ( 0, "AboutApplet" ), m_ad( 0l ) |
13 | {} | 12 | {} |
14 | 13 | ||
15 | AboutApplet::~AboutApplet ( ) | 14 | AboutApplet::~AboutApplet ( ) |
16 | {} | 15 | { |
16 | delete m_ad; | ||
17 | } | ||
17 | 18 | ||
18 | int AboutApplet::position ( ) const | 19 | int AboutApplet::position ( ) const |
19 | { | 20 | { |
@@ -57,13 +58,10 @@ QPopupMenu *AboutApplet::popup ( QWidget * ) const | |||
57 | 58 | ||
58 | void AboutApplet::activated() | 59 | void AboutApplet::activated() |
59 | { | 60 | { |
60 | AboutDialog* d = new AboutDialog( qApp->mainWidget(), "aboutDialog", true ); | 61 | if ( !m_ad ) |
61 | if ( qApp->desktop()->width() == 240 ) | 62 | m_ad = new AboutWidget( 0, "aboutDialog" ); |
62 | { | 63 | |
63 | d->logo->hide(); | 64 | QPEApplication::showWidget( m_ad ); |
64 | d->showMaximized(); | ||
65 | } | ||
66 | d->exec(); | ||
67 | } | 65 | } |
68 | 66 | ||
69 | QRESULT AboutApplet::queryInterface ( const QUuid &uuid, QUnknownInterface **iface ) | 67 | QRESULT AboutApplet::queryInterface ( const QUuid &uuid, QUnknownInterface **iface ) |