Port status bar to QStatusBar.

defines.h

@@ -20,8 +20,8 @@
 
 // #include <qnamespace.h>
 
-#define IDS_PAUSE 1
-#define IDS_MAIN 2
+#define IDS_PAUSE 0
+#define IDS_MAIN 1
 
 #define PlayerKeyLeft  0
 #define PlayerKeyRight 1

mainview.h

@@ -25,7 +25,7 @@
 #include <QWidget>
 
 
-#include <krandomsequence.h>
+#include <KRandomSequence>
 class KToggleAction;
 class KActionCollection;
 class QGraphicsSimpleTextItem;

topwidget.cpp

@@ -18,20 +18,20 @@
 
 #include "topwidget.h"
 
-
+#include <QBoxLayout>
 #include <QIcon>
-#include <kshortcutsdialog.h>
+#include <QStatusBar>
+
+#include <KActionCollection>
 #include <KLocalizedString>
-#include <kstandardaction.h>
-#include <kstandardgameaction.h>
-#include <qstatusbar.h>
-#include <ktoggleaction.h>
-#include <kactioncollection.h>
+#include <KShortcutsDialog>
+#include <KStandardAction>
+#include <KStandardGameAction>
+#include <KToggleAction>
 
 #include "mainview.h"
 #include "playerinfo.h"
 
-#include <QBoxLayout>
 
 MyTopLevelWidget::MyTopLevelWidget()
 {
@@ -163,9 +163,16 @@ void MyTopLevelWidget::setupActions()
 
 void MyTopLevelWidget::initStatusBar( )
 {
-   //QT5 statusBar( )->insertItem(i18n(" paused "),IDS_PAUSE);
-   //QT5 statusBar( )->insertItem(QLatin1String( "   " ),IDS_MAIN ,1);
-   //QT5 statusBar( )->insertItem(QLatin1String( "" ),42);
+   for (auto &label : m_statusBarLabel)
+   {
+      label = new QLabel(this);
+      label->setAlignment(Qt::AlignCenter);
+      statusBar()->addWidget(label, 1);
+   }
+
+   m_statusBarLabel[IDS_PAUSE]->setText(i18n(" paused "));
+   m_statusBarLabel[IDS_MAIN]->setText(QLatin1String());
+   m_statusBarLabel[2]->setText(QLatin1String());
 }
 
 void MyTopLevelWidget::start()
@@ -175,7 +182,7 @@ void MyTopLevelWidget::start()
 
 void MyTopLevelWidget::setStatusText(const QString & str,int id)
 {
-   //QT5 statusBar( )->changeItem(str,id);
+   m_statusBarLabel[id]->setText(str);
 }
 
 void MyTopLevelWidget::keySetup()
@@ -183,5 +190,3 @@ void MyTopLevelWidget::keySetup()
    playfield->pause();
    KShortcutsDialog::configure( actionCollection( ), KShortcutsEditor::LetterShortcutsAllowed, this, true );
 }
-
-

topwidget.h

@@ -19,10 +19,11 @@
 #ifndef __MY_TOP_WIDGET_H
 #define __MY_TOP_WIDGET_H
 
-#include <kxmlguiwindow.h>
+#include <KXmlGuiWindow>
 
 class PlayerInfo;
 class MyMainView;
+class QLabel;
 
 class MyTopLevelWidget:public KXmlGuiWindow
 {
@@ -46,6 +47,8 @@ protected:
 private:
    PlayerInfo *playerinfo[2];
    MyMainView *playfield;
+
+   QLabel *m_statusBarLabel[3];
 };
 
 #endif