robomon: Checkboxes moved to Misc group box

diff --git a/src/robomon/RobomonAtlantis.cpp b/src/robomon/RobomonAtlantis.cpp
index 56f62c66c3777116d493450445258392efe5cf99..c43c2676f943e7f6228e9685667313ebb47c77e5 100644 (file)
--- a/src/robomon/RobomonAtlantis.cpp
+++ b/src/robomon/RobomonAtlantis.cpp
@@ -174,11 +174,15 @@ void RobomonAtlantis::createMiscGroupBox()
        miscGroupBox = new QGroupBox(tr("Miscellaneous"));
        QGridLayout *layout = new QGridLayout();
 
-       showMapPushButton = new QPushButton(tr("Show &map"));
+       showMapPushButton = new QCheckBox(tr("Show &map"));
        showMapPushButton->setShortcut(tr("m"));
 
-       layout->addWidget(showMapPushButton, 0, 0, 1, 2);
+       layout->addWidget(showMapPushButton, 0, 0);
        
+       obstacleSimulationCheckBox = new QCheckBox(tr("&Obstacle simulation"));
+       obstacleSimulationCheckBox->setShortcut(tr("o"));
+       layout->addWidget(obstacleSimulationCheckBox);
+
        miscGroupBox->setLayout(layout);
 }
 
@@ -382,12 +386,6 @@ void RobomonAtlantis::createSharpSensorsLayout()
        sharpSensorsLayout = new QVBoxLayout();
        QGridLayout *layout3 = new QGridLayout();
 
-       obstacleSimulationCheckBox = new QCheckBox(tr("&Obstacle simulation"));
-
-       obstacleSimulationCheckBox->setShortcut(tr("o"));
-
-       layout3->addWidget(obstacleSimulationCheckBox, 0, 1);
-
        sharpSensorsLayout->addLayout(layout3);
 }
 
@@ -564,8 +562,6 @@ void RobomonAtlantis::showMap()
        connect(mapTimer, SIGNAL(timeout()), this, SLOT(paintMap()));
        mapTimer->start(200);
 
-       showMapPushButton->setText(tr("Show Playground"));
-       showMapPushButton->setShortcut(tr("p"));
        disconnect(showMapPushButton, SIGNAL(clicked()), this, SLOT(showMap()));
        connect(showMapPushButton, SIGNAL(clicked()),
                                this, SLOT(showPlayground()));
@@ -577,10 +573,6 @@ void RobomonAtlantis::showPlayground()
        mapTimer->stop();
        disconnect(mapTimer, SIGNAL(timeout()), this, SLOT(paintMap()));
 
-       /* FIXME: */
-
-       showMapPushButton->setText(tr("Show &map"));
-       showMapPushButton->setShortcut(tr("m"));
        disconnect(showMapPushButton, SIGNAL(clicked()),
                                this, SLOT(showPlayground()));
        connect(showMapPushButton, SIGNAL(clicked()), this, SLOT(showMap()));

diff --git a/src/robomon/RobomonAtlantis.h b/src/robomon/RobomonAtlantis.h
index 20a7d46376d892e067dd07010c5e62de5ffa57b5..fdc5b2238cb2b1f772cd9422993510caace5f0b9 100644 (file)
--- a/src/robomon/RobomonAtlantis.h
+++ b/src/robomon/RobomonAtlantis.h
@@ -180,7 +180,7 @@ private:
 
        /* misc */
        QCheckBox *obstacleSimulationCheckBox;
-       QPushButton *showMapPushButton;
+       QCheckBox *showMapPushButton;
        QLabel *fsm_main_state;
        QLabel *fsm_act_state;
        QLabel *fsm_motion_state;