From 74febba2749d3a8eefc13c1f46a0f7f5fc095d5a Mon Sep 17 00:00:00 2001 From: zecke Date: Mon, 15 Nov 2004 14:45:23 +0000 Subject: -Make HELP_TEXT translatable -Make HelpWindow a QWidget --- (limited to 'noncore') diff --git a/noncore/games/sfcave/helpwindow.cpp b/noncore/games/sfcave/helpwindow.cpp index 8a5d034..bd6035a 100644 --- a/noncore/games/sfcave/helpwindow.cpp +++ b/noncore/games/sfcave/helpwindow.cpp @@ -23,55 +23,52 @@ #include "helpwindow.h" -#define HELP_TEXT \ -"

SFCave Help

" \ -"SFCave is a flying game for the Zaurus.

" \ -"The aim is to stay alive for as long as possible and get the highest score " \ -"you can.

" \ -"There are three game types currently - SFCave, Gates, and Fly.
" \ -"SFCave is a remake of the classic SFCave game - fly through the " \ -"cavern avoiding all the blocks that just happen to be hanging in " \ -"midair

" \ -"Gates is similar to SFCave but instead you must fly through the " \ -"without crashing.

" \ -"Fly is somewhat different to SFCave and above. Instead, you have " \ -"are flying in the open air above a scrolling landscape, and the aim is to " \ -"hug the ground - the closer to the land you fly the more points " \ -"scored.


" \ -"Basic instruction - Press Up or Down on the circle pad to " \ -"start a new game, press the middle of the pad to apply thrust (makes you " \ -"go up), and release the pad to remove thrust and drop down.

" \ -"Also, if playing the Fly game, you can press z to toggle the display " \ -"of the scoring zones. This will display 4 red lines at varying heights " \ -"above the landscape - if your ship falls into this zone, point are scored. " \ -"The closer to the landscape you get the more points you get.

" \ -"In addition, SFCave has replays - save and load too so you can show off to all " \ -"your friends (or vice versa). Currently, this is in its infancy but will improve.
" \ -"To use, once you have crashed, press 'r' to replay the last game.
" \ -"To save the replay press 's'.
" \ -"To load a saved replay press 'l' (after you've crashed at least once).

" \ -"Replays are currently saved to your home directory in a file called sfcave.replay." \ -"This file can be copied and given to others as long as it it put in their home directory.

" \ -"Have lots of fun.
" \ -"Andy" \ -"

" +static QString HELP_TEXT() { +return QObject::tr("

SFCave Help

" + "SFCave is a flying game for the Zaurus.

" + "The aim is to stay alive for as long as possible and get the highest score " + "you can.

" + "There are three game types currently - SFCave, Gates, and Fly.
" + "SFCave is a remake of the classic SFCave game - fly through the " + "cavern avoiding all the blocks that just happen to be hanging in " + "midair

" + "Gates is similar to SFCave but instead you must fly through the " + "without crashing.

" + "Fly is somewhat different to SFCave and above. Instead, you have " + "are flying in the open air above a scrolling landscape, and the aim is to " + "hug the ground - the closer to the land you fly the more points " + "scored.


" + "Basic instruction - Press Up or Down on the circle pad to " + "start a new game, press the middle of the pad to apply thrust (makes you " + "go up), and release the pad to remove thrust and drop down.

" + "Also, if playing the Fly game, you can press z to toggle the display " + "of the scoring zones. This will display 4 red lines at varying heights " + "above the landscape - if your ship falls into this zone, point are scored. " + "The closer to the landscape you get the more points you get.

" + "In addition, SFCave has replays - save and load too so you can show off to all " + "your friends (or vice versa). Currently, this is in its infancy but will improve.
" + "To use, once you have crashed, press 'r' to replay the last game.
" + "To save the replay press 's'.
" + "To load a saved replay press 'l' (after you've crashed at least once).

" + "Replays are currently saved to your home directory in a file called sfcave.replay." + "This file can be copied and given to others as long as it it put in their home directory.

" + "Have lots of fun.
" + "Andy" + "

"); +} -HelpWindow::HelpWindow( QWidget *parent, const char *name, bool modal, WFlags flags ) - : QDialog( parent, name, modal, flags ) +HelpWindow::HelpWindow( QWidget *parent, const char *name) + : QWidget( parent, name, WDestructiveClose ) { -// resize( 230, 280 ); - - setCaption( "Help for SFCave" ); + setCaption( tr("Help for SFCave") ); QVBoxLayout *layout = new QVBoxLayout( this ); - QString text = HELP_TEXT;; + QString text = HELP_TEXT();; QTextView *view = new QTextView( text, 0, this, "view" ); layout->insertSpacing( -1, 5 ); layout->insertWidget( -1, view ); layout->insertSpacing( -1, 5 ); - - QPEApplication::showDialog( this ); } HelpWindow::~HelpWindow() diff --git a/noncore/games/sfcave/helpwindow.h b/noncore/games/sfcave/helpwindow.h index edc1b6e..0aaba7e 100644 --- a/noncore/games/sfcave/helpwindow.h +++ b/noncore/games/sfcave/helpwindow.h @@ -24,10 +24,10 @@ *@author Andy Qua */ -class HelpWindow : public QDialog +class HelpWindow : public QWidget { public: - HelpWindow( QWidget *parent = 0, const char *name = 0, bool modal = true, WFlags flags = 0 ); + HelpWindow( QWidget *parent = 0, const char *name = 0); ~HelpWindow(); }; diff --git a/noncore/games/sfcave/sfcave.cpp b/noncore/games/sfcave/sfcave.cpp index d5aa38a..a6c92a0 100644 --- a/noncore/games/sfcave/sfcave.cpp +++ b/noncore/games/sfcave/sfcave.cpp @@ -4,10 +4,10 @@ #include #include +#include #include #include -#include #include #include "helpwindow.h" @@ -1139,9 +1139,8 @@ void SFCave :: dealWithMenuSelection() case MENU_HELP: { // Display Help Menu - HelpWindow *dlg = new HelpWindow( this ); - dlg->exec(); - delete dlg; + HelpWindow *win = new HelpWindow( ); + QPEApplication::showWidget( win ); break; } -- cgit v0.9.0.2