author | mickeyl <mickeyl> | 2003-12-07 13:51:01 (UTC) |
---|---|---|
committer | mickeyl <mickeyl> | 2003-12-07 13:51:01 (UTC) |
commit | c648101ca50a9782911b58b5158b31e1d0427ab3 (patch) (unidiff) | |
tree | 0fcf5801e23d95e071c7f1b62230c5b15c6256ea /noncore/games/go | |
parent | 2d793ca674944241480f6939814e3f61d0a0e0fb (diff) | |
download | opie-c648101ca50a9782911b58b5158b31e1d0427ab3.zip opie-c648101ca50a9782911b58b5158b31e1d0427ab3.tar.gz opie-c648101ca50a9782911b58b5158b31e1d0427ab3.tar.bz2 |
s/QPEMenuBar/QMenuBar:
- remove usage of deprecated classses
- makes it easier to migrate to OMenuBar in the future
-rw-r--r-- | noncore/games/go/gowidget.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/noncore/games/go/gowidget.cpp b/noncore/games/go/gowidget.cpp index 1d38c9f..476f7ce1 100644 --- a/noncore/games/go/gowidget.cpp +++ b/noncore/games/go/gowidget.cpp | |||
@@ -17,97 +17,97 @@ | |||
17 | ** not clear to you. | 17 | ** not clear to you. |
18 | ** | 18 | ** |
19 | **********************************************************************/ | 19 | **********************************************************************/ |
20 | 20 | ||
21 | #include "gowidget.h" | 21 | #include "gowidget.h" |
22 | 22 | ||
23 | #include <qpe/config.h> | 23 | #include <qpe/config.h> |
24 | #include <qpe/resource.h> | 24 | #include <qpe/resource.h> |
25 | 25 | ||
26 | #include <qpainter.h> | 26 | #include <qpainter.h> |
27 | #include <qpixmap.h> | 27 | #include <qpixmap.h> |
28 | #include <qpe/qpetoolbar.h> | 28 | #include <qpe/qpetoolbar.h> |
29 | #include <qpe/qpemenubar.h> | 29 | #include <qpe/qpemenubar.h> |
30 | #include <qpopupmenu.h> | 30 | #include <qpopupmenu.h> |
31 | #include <qaction.h> | 31 | #include <qaction.h> |
32 | #include <qapplication.h> //processEvents() | 32 | #include <qapplication.h> //processEvents() |
33 | #include <qlabel.h> | 33 | #include <qlabel.h> |
34 | 34 | ||
35 | //#include <stdio.h> | 35 | //#include <stdio.h> |
36 | 36 | ||
37 | #include "amigo.h" | 37 | #include "amigo.h" |
38 | #include "goplayutils.h" | 38 | #include "goplayutils.h" |
39 | 39 | ||
40 | static const enum bVal computer_color = BLACK; | 40 | static const enum bVal computer_color = BLACK; |
41 | 41 | ||
42 | static int current_handicap = 1; | 42 | static int current_handicap = 1; |
43 | 43 | ||
44 | static QBrush *goBrush; | 44 | static QBrush *goBrush; |
45 | //static QImage *newBlackStone; | 45 | //static QImage *newBlackStone; |
46 | //static QImage *blackStone; | 46 | //static QImage *blackStone; |
47 | //static QImage *whiteStone; | 47 | //static QImage *whiteStone; |
48 | static QPixmap *newBlackStone; | 48 | static QPixmap *newBlackStone; |
49 | static QPixmap *blackStone; | 49 | static QPixmap *blackStone; |
50 | static QPixmap *whiteStone; | 50 | static QPixmap *whiteStone; |
51 | 51 | ||
52 | static bool smallStones = FALSE; | 52 | static bool smallStones = FALSE; |
53 | 53 | ||
54 | GoMainWidget::GoMainWidget( QWidget *parent, const char* name) : | 54 | GoMainWidget::GoMainWidget( QWidget *parent, const char* name) : |
55 | QMainWindow( parent, name ) | 55 | QMainWindow( parent, name ) |
56 | { | 56 | { |
57 | setToolBarsMovable( FALSE ); | 57 | setToolBarsMovable( FALSE ); |
58 | GoWidget *go = new GoWidget(this); | 58 | GoWidget *go = new GoWidget(this); |
59 | 59 | ||
60 | setCentralWidget(go); | 60 | setCentralWidget(go); |
61 | toolbar = new QPEToolBar(this); | 61 | toolbar = new QPEToolBar(this); |
62 | toolbar->setHorizontalStretchable( TRUE ); | 62 | toolbar->setHorizontalStretchable( TRUE ); |
63 | addToolBar(toolbar); | 63 | addToolBar(toolbar); |
64 | 64 | ||
65 | QPEMenuBar *mb = new QPEMenuBar( toolbar ); | 65 | QMenuBar *mb = new QMenuBar( toolbar ); |
66 | mb->setMargin(0); | 66 | mb->setMargin(0); |
67 | QPopupMenu *file = new QPopupMenu( this ); | 67 | QPopupMenu *file = new QPopupMenu( this ); |
68 | 68 | ||
69 | QAction *a = new QAction( tr( "New Game" ), QString::null, 0, this, 0 ); | 69 | QAction *a = new QAction( tr( "New Game" ), QString::null, 0, this, 0 ); |
70 | connect( a, SIGNAL( activated() ), go, SLOT( newGame() ) ); | 70 | connect( a, SIGNAL( activated() ), go, SLOT( newGame() ) ); |
71 | a->addTo( file ); | 71 | a->addTo( file ); |
72 | 72 | ||
73 | a = new QAction( tr( "Pass" ), Resource::loadPixmap( "pass" ), QString::null, 0, this, 0 ); | 73 | a = new QAction( tr( "Pass" ), Resource::loadPixmap( "pass" ), QString::null, 0, this, 0 ); |
74 | connect( a, SIGNAL( activated() ), go, SLOT( pass() ) ); | 74 | connect( a, SIGNAL( activated() ), go, SLOT( pass() ) ); |
75 | a->addTo( file ); | 75 | a->addTo( file ); |
76 | a->addTo( toolbar ); | 76 | a->addTo( toolbar ); |
77 | 77 | ||
78 | 78 | ||
79 | a = new QAction( tr( "Resign" ), Resource::loadPixmap( "reset" ), QString::null, 0, this, 0 ); | 79 | a = new QAction( tr( "Resign" ), Resource::loadPixmap( "reset" ), QString::null, 0, this, 0 ); |
80 | connect( a, SIGNAL( activated() ), go, SLOT( resign() ) ); | 80 | connect( a, SIGNAL( activated() ), go, SLOT( resign() ) ); |
81 | a->addTo( file ); | 81 | a->addTo( file ); |
82 | 82 | ||
83 | a = new QAction( tr( "Two player option" ), QString::null, 0, this, 0 ); | 83 | a = new QAction( tr( "Two player option" ), QString::null, 0, this, 0 ); |
84 | a->setToggleAction( TRUE ); | 84 | a->setToggleAction( TRUE ); |
85 | connect( a, SIGNAL( toggled(bool) ), go, SLOT( setTwoplayer(bool) ) ); | 85 | connect( a, SIGNAL( toggled(bool) ), go, SLOT( setTwoplayer(bool) ) ); |
86 | a->addTo( file ); | 86 | a->addTo( file ); |
87 | 87 | ||
88 | mb->insertItem( tr( "Game" ), file ); | 88 | mb->insertItem( tr( "Game" ), file ); |
89 | 89 | ||
90 | QLabel *turnLabel = new QLabel( toolbar ); | 90 | QLabel *turnLabel = new QLabel( toolbar ); |
91 | turnLabel->setBackgroundMode( PaletteButton ); | 91 | turnLabel->setBackgroundMode( PaletteButton ); |
92 | connect( go, SIGNAL(showTurn(const QPixmap&)), | 92 | connect( go, SIGNAL(showTurn(const QPixmap&)), |
93 | turnLabel, SLOT(setPixmap(const QPixmap&)) ); | 93 | turnLabel, SLOT(setPixmap(const QPixmap&)) ); |
94 | 94 | ||
95 | 95 | ||
96 | QLabel * scoreLabel = new QLabel( toolbar ); | 96 | QLabel * scoreLabel = new QLabel( toolbar ); |
97 | scoreLabel->setBackgroundMode( PaletteButton ); | 97 | scoreLabel->setBackgroundMode( PaletteButton ); |
98 | connect( go, SIGNAL(showScore(const QString&)), | 98 | connect( go, SIGNAL(showScore(const QString&)), |
99 | scoreLabel, SLOT(setText(const QString&)) ); | 99 | scoreLabel, SLOT(setText(const QString&)) ); |
100 | 100 | ||
101 | toolbar->setStretchableWidget( scoreLabel ); | 101 | toolbar->setStretchableWidget( scoreLabel ); |
102 | 102 | ||
103 | go->readConfig(); | 103 | go->readConfig(); |
104 | } | 104 | } |
105 | 105 | ||
106 | void GoMainWidget::resizeEvent( QResizeEvent * ) | 106 | void GoMainWidget::resizeEvent( QResizeEvent * ) |
107 | { | 107 | { |
108 | //### this won't work because of the text label... | 108 | //### this won't work because of the text label... |
109 | /* | 109 | /* |
110 | if ( width() > height() ) | 110 | if ( width() > height() ) |
111 | moveToolBar( toolbar, Left ); | 111 | moveToolBar( toolbar, Left ); |
112 | else | 112 | else |
113 | moveToolBar( toolbar, Top ); | 113 | moveToolBar( toolbar, Top ); |