author | imm <imm> | 2002-09-21 12:24:59 (UTC) |
---|---|---|
committer | imm <imm> | 2002-09-21 12:24:59 (UTC) |
commit | 99d546ce72f40e28b04f09201d92d58294401591 (patch) (unidiff) | |
tree | 4589ba17c622a114efb4811334e0adce02cedeca | |
parent | 279f025b03efdade9c211dd9441eec0c2a91ad94 (diff) | |
download | opie-99d546ce72f40e28b04f09201d92d58294401591.zip opie-99d546ce72f40e28b04f09201d92d58294401591.tar.gz opie-99d546ce72f40e28b04f09201d92d58294401591.tar.bz2 |
center widget
-rw-r--r-- | noncore/games/kpacman/kpacman.cpp | 21 | ||||
-rw-r--r-- | noncore/games/kpacman/kpacman.h | 18 | ||||
-rw-r--r-- | noncore/games/kpacman/kpacmanwidget.cpp | 9 | ||||
-rw-r--r-- | noncore/games/kpacman/referee.cpp | 4 | ||||
-rw-r--r-- | noncore/games/kpacman/score.cpp | 61 |
5 files changed, 13 insertions, 100 deletions
diff --git a/noncore/games/kpacman/kpacman.cpp b/noncore/games/kpacman/kpacman.cpp index 7df6ef0..d9d2d69 100644 --- a/noncore/games/kpacman/kpacman.cpp +++ b/noncore/games/kpacman/kpacman.cpp | |||
@@ -27,11 +27,13 @@ Kpacman::Kpacman(QWidget *parent, const char *name) | |||
27 | menu(); | 27 | menu(); |
28 | 28 | ||
29 | m_view = new QWidget( this, "m_view" ); | ||
30 | m_view->setBackgroundColor( black ); | ||
31 | m_layout = new QGridLayout( m_view ); | ||
32 | m_layout->setMargin( 7 ); | ||
33 | |||
29 | view = new KpacmanWidget( this, QString(name)+"widget"); | 34 | view = new KpacmanWidget( this, QString(name)+"widget"); |
35 | m_layout->addWidget( view, 0, 0 ); | ||
30 | 36 | ||
31 | #ifndef QWS | 37 | setCaption( "KPacman" ); |
32 | setFixedSize(view->width(), view->height()); | ||
33 | #else | ||
34 | setCaption( "Kpacman" ); | ||
35 | #endif | ||
36 | 38 | ||
37 | view->referee->setFocus(); | 39 | view->referee->setFocus(); |
@@ -64,12 +66,5 @@ Kpacman::Kpacman(QWidget *parent, const char *name) | |||
64 | toggleHideMouseCursor(); | 66 | toggleHideMouseCursor(); |
65 | 67 | ||
66 | #ifndef QWS | 68 | setCentralWidget( m_view ); |
67 | menuBar->show(); | ||
68 | view->show(); | ||
69 | setMenu(menuBar); | ||
70 | setView(view); | ||
71 | #else | ||
72 | setCentralWidget( view ); | ||
73 | #endif | ||
74 | } | 69 | } |
75 | 70 | ||
diff --git a/noncore/games/kpacman/kpacman.h b/noncore/games/kpacman/kpacman.h index d7de9de..2c1de70 100644 --- a/noncore/games/kpacman/kpacman.h +++ b/noncore/games/kpacman/kpacman.h | |||
@@ -8,14 +8,6 @@ | |||
8 | #include "portable.h" | 8 | #include "portable.h" |
9 | 9 | ||
10 | #if defined( KDE2_PORT ) | ||
11 | #include <kapp.h> | ||
12 | #include <klocale.h> | ||
13 | #include <ktmainwindow.h> | ||
14 | #include <kmenubar.h> | ||
15 | #elif defined( QPE_PORT ) | ||
16 | #include <qmainwindow.h> | 10 | #include <qmainwindow.h> |
17 | class QMenuBar; | 11 | class QMenuBar; |
18 | #endif | ||
19 | |||
20 | #include <qregexp.h> | 12 | #include <qregexp.h> |
21 | 13 | ||
@@ -26,16 +18,10 @@ class QMenuBar; | |||
26 | #include <qlist.h> | 18 | #include <qlist.h> |
27 | #include <qfileinf.h> | 19 | #include <qfileinf.h> |
20 | #include <qlayout.h> | ||
28 | 21 | ||
29 | #if defined( KDE2_PORT ) | ||
30 | #include <referee.h> | ||
31 | #include <status.h> | ||
32 | #include <score.h> | ||
33 | #include <keys.h> | ||
34 | #elif defined( QPE_PORT ) | ||
35 | #include "referee.h" | 22 | #include "referee.h" |
36 | #include "status.h" | 23 | #include "status.h" |
37 | #include "score.h" | 24 | #include "score.h" |
38 | #include "keys.h" | 25 | #include "keys.h" |
39 | #endif | ||
40 | 26 | ||
41 | class Kpacman : public KTMainWindow | 27 | class Kpacman : public KTMainWindow |
@@ -72,4 +58,6 @@ private: | |||
72 | int lookupSchemes(); | 58 | int lookupSchemes(); |
73 | 59 | ||
60 | QGridLayout *m_layout; | ||
61 | QWidget *m_view; | ||
74 | KMenuBar *_menuBar; | 62 | KMenuBar *_menuBar; |
75 | QPopupMenu *gamePopup; | 63 | QPopupMenu *gamePopup; |
diff --git a/noncore/games/kpacman/kpacmanwidget.cpp b/noncore/games/kpacman/kpacmanwidget.cpp index 215dcda..feb782c 100644 --- a/noncore/games/kpacman/kpacmanwidget.cpp +++ b/noncore/games/kpacman/kpacmanwidget.cpp | |||
@@ -34,9 +34,5 @@ KpacmanWidget::KpacmanWidget( QWidget *parent, const char *name) | |||
34 | status = new Status(this, name, scheme, mode); | 34 | status = new Status(this, name, scheme, mode); |
35 | 35 | ||
36 | #ifndef QWS | ||
37 | setFixedSize(referee->width(), bitfont->height()*3 + referee->height() + status->height()); | ||
38 | #else | ||
39 | setBackgroundColor( black ); | 36 | setBackgroundColor( black ); |
40 | #endif | ||
41 | } | 37 | } |
42 | 38 | ||
@@ -139,9 +135,4 @@ void KpacmanWidget::setScheme(int Scheme, int Mode) | |||
139 | status->setScheme(Scheme, Mode); | 135 | status->setScheme(Scheme, Mode); |
140 | 136 | ||
141 | #ifndef QWS | ||
142 | setFixedSize(referee->width(), | ||
143 | bitfont->height()*3 + referee->height() + status->height()); | ||
144 | #endif | ||
145 | |||
146 | score->repaint(FALSE); | 137 | score->repaint(FALSE); |
147 | referee->repaint(FALSE); | 138 | referee->repaint(FALSE); |
diff --git a/noncore/games/kpacman/referee.cpp b/noncore/games/kpacman/referee.cpp index 70916f0..81f331b 100644 --- a/noncore/games/kpacman/referee.cpp +++ b/noncore/games/kpacman/referee.cpp | |||
@@ -732,8 +732,8 @@ void Referee::keyPressEvent( QKeyEvent *k ) | |||
732 | play(); | 732 | play(); |
733 | else if ( !gameState.testBit(Playing) && | 733 | else if ( !gameState.testBit(Playing) && |
734 | key == Key_Up || | 734 | ( key == Key_Up || |
735 | key == Key_Down || | 735 | key == Key_Down || |
736 | key == Key_Right || | 736 | key == Key_Right || |
737 | key == Key_Left ) | 737 | key == Key_Left )) |
738 | play(); | 738 | play(); |
739 | // "Space" => pause | 739 | // "Space" => pause |
diff --git a/noncore/games/kpacman/score.cpp b/noncore/games/kpacman/score.cpp index 17dbf0a..b3ff3d9 100644 --- a/noncore/games/kpacman/score.cpp +++ b/noncore/games/kpacman/score.cpp | |||
@@ -479,32 +479,4 @@ void Score::read() | |||
479 | void Score::write() | 479 | void Score::write() |
480 | { | 480 | { |
481 | #ifndef QWS | ||
482 | if (!highscoreFile.exists() && highscoreFile.name() == systemHighscoreFileInfo.filePath()) | ||
483 | KMessageBox::information(0, | ||
484 | tr("You're going to create the highscore-file\n" | ||
485 | "'%1'\n" | ||
486 | "for your maschine, that should be used systemwide.\n" | ||
487 | "\n" | ||
488 | "To grant access to the other users, set the appropriate rights (a+w)\n" | ||
489 | "on that file or ask your systemadministator for that favor.\n" | ||
490 | "\n" | ||
491 | "To use a different directory or filename for the highscores," | ||
492 | "specify them in the configfile (kpacmanrc:highscoreFilePath)." | ||
493 | ).arg(systemHighscoreFileInfo.filePath())); | ||
494 | |||
495 | if (highscoreFile.name() == privateHighscoreFileInfo.filePath()) | ||
496 | KMessageBox::information(0, | ||
497 | tr("You're using a private highscore-file, that's mostly because of\n" | ||
498 | "missing write-access to the systemwide file\n" | ||
499 | "'%1' .\n" | ||
500 | "\n" | ||
501 | "Ask your systemadministrator for granting you access to that file,\n" | ||
502 | "by setting the appropriate rights (a+w) on it.\n" | ||
503 | "\n" | ||
504 | "To use a different directory or filename for the highscores," | ||
505 | "specify them in the configfile (kpacmanrc:highscoreFilePath)." | ||
506 | ).arg(systemHighscoreFileInfo.filePath()), | ||
507 | QString::null, "PrivateHighscore"); | ||
508 | #endif | ||
509 | if (highscoreFile.open(IO_WriteOnly)) { | 481 | if (highscoreFile.open(IO_WriteOnly)) { |
510 | QDataStream s(&highscoreFile); | 482 | QDataStream s(&highscoreFile); |
@@ -606,37 +578,4 @@ int Score::y(float row) | |||
606 | QFileInfo Score::locateHighscoreFilePath() | 578 | QFileInfo Score::locateHighscoreFilePath() |
607 | { | 579 | { |
608 | #ifndef QWS | ||
609 | QFileInfo systemHighscoreDirPath; | ||
610 | QStringList systemHighscoreDirs; | ||
611 | |||
612 | // Schreibfähige "private" highscore-Datei ermitteln für den fallback. | ||
613 | privateHighscoreFileInfo.setFile(KGlobal::dirs()->saveLocation("appdata")+highscoreName); | ||
614 | |||
615 | // FilePath aus der Konfigurationsdatei benutzen | ||
616 | systemHighscoreFileInfo.setFile(cfg->readEntry("HighscoreFilePath")); | ||
617 | |||
618 | // Kein Wert aus der Konfiguration erhalten, dann die "system"-Datei suchen. | ||
619 | if (systemHighscoreFileInfo.filePath().isEmpty()) | ||
620 | systemHighscoreDirs = KGlobal::dirs()->resourceDirs("appdata"); | ||
621 | else | ||
622 | systemHighscoreDirs = QStringList(systemHighscoreFileInfo.filePath()); | ||
623 | |||
624 | for (QStringList::Iterator i = systemHighscoreDirs.begin(); i != systemHighscoreDirs.end(); ++i) { | ||
625 | |||
626 | systemHighscoreFileInfo.setFile(*i); | ||
627 | if (systemHighscoreFileInfo.fileName().isEmpty()) | ||
628 | systemHighscoreFileInfo.setFile(systemHighscoreFileInfo.dirPath()+"/"+highscoreName); | ||
629 | |||
630 | // privateHighscoreFileInfo für die "system" Suche ignorieren | ||
631 | if (systemHighscoreFileInfo.filePath() != privateHighscoreFileInfo.filePath()) | ||
632 | if (!systemHighscoreFileInfo.exists()) { | ||
633 | systemHighscoreDirPath.setFile(systemHighscoreFileInfo.dirPath()); | ||
634 | if (systemHighscoreDirPath.exists() && systemHighscoreDirPath.isWritable()) | ||
635 | return systemHighscoreFileInfo; | ||
636 | } else | ||
637 | if (systemHighscoreFileInfo.isWritable()) | ||
638 | return systemHighscoreFileInfo; | ||
639 | } | ||
640 | #endif | ||
641 | return privateHighscoreFileInfo; | 580 | return privateHighscoreFileInfo; |
642 | } | 581 | } |