-rw-r--r-- | core/launcher/firstuse.cpp | 62 |
1 files changed, 30 insertions, 32 deletions
diff --git a/core/launcher/firstuse.cpp b/core/launcher/firstuse.cpp index 8344787..8c02ab0 100644 --- a/core/launcher/firstuse.cpp +++ b/core/launcher/firstuse.cpp | |||
@@ -1,24 +1,31 @@ | |||
1 | /********************************************************************** | 1 | /* |
2 | ** Copyright (C) 2000-2002 Trolltech AS. All rights reserved. | 2 | This file is part of the Opie Project |
3 | ** | 3 | =. (C) 2000-2002 Trolltech AS |
4 | ** This file is part of the Qtopia Environment. | 4 | .=l. (C) 2002-2005 The Opie Team <opie-devel@handhelds.org> |
5 | ** | 5 | .>+-= |
6 | ** This file may be distributed and/or modified under the terms of the | 6 | _;:, .> :=|. This program is free software; you can |
7 | ** GNU General Public License version 2 as published by the Free Software | 7 | .> <`_, > . <= redistribute it and/or modify it under |
8 | ** Foundation and appearing in the file LICENSE.GPL included in the | 8 | :`=1 )Y*s>-.-- : the terms of the GNU Library General Public |
9 | ** packaging of this file. | 9 | .="- .-=="i, .._ License as published by the Free Software |
10 | ** | 10 | - . .-<_> .<> Foundation; version 2 of the License. |
11 | ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE | 11 | ._= =} : |
12 | ** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. | 12 | .%`+i> _;_. |
13 | ** | 13 | .i_,=:_. -<s. This program is distributed in the hope that |
14 | ** See http://www.trolltech.com/gpl/ for GPL licensing information. | 14 | + . -:. = it will be useful, but WITHOUT ANY WARRANTY; |
15 | ** | 15 | : .. .:, . . . without even the implied warranty of |
16 | ** Contact info@trolltech.com if any conditions of this licensing are | 16 | =_ + =;=|` MERCHANTABILITY or FITNESS FOR A |
17 | ** not clear to you. | 17 | _.=:. : :=>`: PARTICULAR PURPOSE. See the GNU |
18 | ** | 18 | ..}^=.= = ; Library General Public License for more |
19 | **********************************************************************/ | 19 | ++= -. .` .: details. |
20 | : = ...= . :.=- | ||
21 | -. .:....=;==+<; You should have received a copy of the GNU | ||
22 | -_. . . )=. = Library General Public License along with | ||
23 | -- :-=` this library; see the file COPYING.LIB. | ||
24 | If not, write to the Free Software Foundation, | ||
25 | Inc., 59 Temple Place - Suite 330, | ||
26 | Boston, MA 02111-1307, USA. | ||
27 | */ | ||
20 | 28 | ||
21 | // I need access to some things you don't normally get access to. | 29 | // I need access to some things you don't normally get access to. |
22 | |||
23 | #ifndef _MSC_VER | 30 | #ifndef _MSC_VER |
24 | //### revise to allow removal of translators under MSVC | 31 | //### revise to allow removal of translators under MSVC |
@@ -35,5 +42,5 @@ | |||
35 | /* OPIE */ | 42 | /* OPIE */ |
36 | #include <opie2/odebug.h> | 43 | #include <opie2/odebug.h> |
37 | #include <qtopia/resource.h> | 44 | #include <opie2/oresource.h> |
38 | #include <qtopia/qcopenvelope_qws.h> | 45 | #include <qtopia/qcopenvelope_qws.h> |
39 | #include <qtopia/config.h> | 46 | #include <qtopia/config.h> |
@@ -242,10 +249,8 @@ void FirstUse::nextDialog() | |||
242 | config.setGroup( "Startup" ); | 249 | config.setGroup( "Startup" ); |
243 | config.writeEntry( "FirstUse", FALSE ); | 250 | config.writeEntry( "FirstUse", FALSE ); |
244 | QPixmap pix = Resource::loadPixmap("bigwait"); | 251 | QLabel *lblWait = new QLabel("Please Wait...", 0, "wait hack!", // No tr |
245 | QLabel *lblWait = new QLabel(0, "wait hack!", // No tr | ||
246 | QWidget::WStyle_Customize | QWidget::WDestructiveClose | | 252 | QWidget::WStyle_Customize | QWidget::WDestructiveClose | |
247 | QWidget::WStyle_NoBorder | QWidget::WStyle_Tool | | 253 | QWidget::WStyle_NoBorder | QWidget::WStyle_Tool | |
248 | QWidget::WStyle_StaysOnTop); | 254 | QWidget::WStyle_StaysOnTop); |
249 | lblWait->setPixmap( pix ); | ||
250 | lblWait->setAlignment( QWidget::AlignCenter ); | 255 | lblWait->setAlignment( QWidget::AlignCenter ); |
251 | lblWait->setGeometry( qApp->desktop()->geometry() ); | 256 | lblWait->setGeometry( qApp->desktop()->geometry() ); |
@@ -431,13 +436,6 @@ void FirstUse::paintEvent( QPaintEvent * ) | |||
431 | { | 436 | { |
432 | QPainter p( this ); | 437 | QPainter p( this ); |
433 | |||
434 | p.drawPixmap(0,0, splash); | 438 | p.drawPixmap(0,0, splash); |
435 | 439 | ||
436 | QFont f = p.font(); | ||
437 | f.setPointSize(15); | ||
438 | f.setItalic(FALSE); | ||
439 | f.setBold(FALSE); | ||
440 | p.setFont(f); | ||
441 | |||
442 | if ( currApp < 0 ) { | 440 | if ( currApp < 0 ) { |
443 | drawText(p, tr( "Tap anywhere on the screen to continue." )); | 441 | drawText(p, tr( "Tap anywhere on the screen to continue." )); |
@@ -452,5 +450,5 @@ void FirstUse::paintEvent( QPaintEvent * ) | |||
452 | void FirstUse::loadPixmaps() | 450 | void FirstUse::loadPixmaps() |
453 | { | 451 | { |
454 | splash.convertFromImage( Resource::loadImage("launcher/firstuse") | 452 | splash.convertFromImage( OResource::loadImage("launcher/firstuse", OResource::NoScale ) |
455 | .smoothScale( width(), height() ) ); | 453 | .smoothScale( width(), height() ) ); |
456 | 454 | ||