diff --git a/src/kubrick.h b/src/kubrick.h --- a/src/kubrick.h +++ b/src/kubrick.h @@ -19,6 +19,8 @@ #ifndef KUBRICK_H #define KUBRICK_H +#include + #include #include #include @@ -30,7 +32,6 @@ class QAction; class QSignalMapper; class QLineEdit; -class QLabel; class QAction; /** @@ -104,6 +105,7 @@ QLineEdit * singmasterMoves; // A place to display Singmaster moves. QLabel * singmasterLabel; + QLabel statusBarLabel; static const PuzzleItem easyItems []; static const PuzzleItem notSoEasyItems []; diff --git a/src/kubrick.cpp b/src/kubrick.cpp --- a/src/kubrick.cpp +++ b/src/kubrick.cpp @@ -20,20 +20,20 @@ #include "kubrick.h" // Qt includes. +#include #include #include -#include -#include #include +#include +#include // KDE includes. -#include -#include -#include #include -#include +#include +#include #include #include +#include // Local includes. #include "game.h" @@ -77,7 +77,9 @@ // Set up a status bar. statusBar()->show (); - //QT5 statusBar()->insertItem (i18n("Welcome to Kubrick"), 1001, 1); + statusBarLabel.setAlignment (Qt::AlignCenter); + statusBar()->addWidget (&statusBarLabel, 1); + statusBarLabel.setText (i18n("Welcome to Kubrick")); // Set a larger font than toolbar-default for the Singmaster-moves display. QFont f = statusBar()->font(); @@ -625,28 +627,28 @@ void Kubrick::easySelected (int index) { - //QT5 statusBar()->changeItem (i18n (easyItems [index].menuText), 1001); + statusBarLabel.setText (i18n (easyItems [index].menuText)); game->changePuzzle (easyItems [index]); } void Kubrick::notSoEasySelected (int index) { - //QT5 statusBar()->changeItem (i18n (notSoEasyItems [index].menuText), 1001); + statusBarLabel.setText (i18n (notSoEasyItems [index].menuText)); game->changePuzzle (notSoEasyItems [index]); } void Kubrick::hardSelected (int index) { - //QT5 statusBar()->changeItem (i18n (hardItems [index].menuText), 1001); + statusBarLabel.setText (i18n (hardItems [index].menuText)); game->changePuzzle (hardItems [index]); } void Kubrick::veryHardSelected (int index) { - //QT5 statusBar()->changeItem (i18n (veryHardItems [index].menuText), 1001); + statusBarLabel.setText (i18n (veryHardItems [index].menuText)); game->changePuzzle (veryHardItems [index]); } @@ -659,7 +661,7 @@ if (index > 0) { game->loadDemo (patterns[index].filename); - //QT5 statusBar()->changeItem (i18n (patterns[index].menuText), 1001); + statusBarLabel.setText (i18n (patterns[index].menuText)); } else { KMessageBox::information (this, @@ -677,7 +679,7 @@ if (index > 0) { game->loadDemo (solvingMoves[index].filename); - //QT5 statusBar()->changeItem (i18n (solvingMoves[index].menuText), 1001); + statusBarLabel.setText (i18n (solvingMoves[index].menuText)); } else { KMessageBox::information (this, @@ -702,7 +704,7 @@ descr = i18n ("%1x%2x%3 mat, %4 shuffling moves", xDim, yDim, zDim, shMoves); } - //QT5 statusBar()->changeItem (descr, 1001); + statusBarLabel.setText (descr); }