Merge branch 'next' of ssh://git.openpilot.org/OpenPilot into next

ground/openpilotgcs/src/libs/utils/mylistwidget.h

@@ -42,7 +42,7 @@ class QTCREATOR_UTILS_EXPORT MyListWidget : public QListWidget
 {
     Q_OBJECT
 public:
-    MyListWidget(QWidget *parent) : QListWidget(parent), m_iconAbove(false) { }
+    MyListWidget(QWidget *parent) : QListWidget(parent), m_iconAbove(false) {}
     void setIconAbove(bool iconAbove) { m_iconAbove = iconAbove; }
 protected:
     QStyleOptionViewItem viewOptions() const;

ground/openpilotgcs/src/libs/utils/mytabbedstackwidget.cpp

@@ -48,20 +48,24 @@ MyTabbedStackWidget::MyTabbedStackWidget(QWidget *parent, bool isVertical, bool
         toplevelLayout->addWidget(m_stackWidget);
         m_listWidget->setFlow(QListView::TopToBottom);
         m_listWidget->setSizePolicy(QSizePolicy::Fixed, QSizePolicy::Expanding);
+        m_listWidget->setHorizontalScrollBarPolicy(Qt::ScrollBarAlwaysOff);
     } else {
         toplevelLayout = new QVBoxLayout;
         toplevelLayout->addWidget(m_stackWidget);
         toplevelLayout->addWidget(m_listWidget);
         m_listWidget->setFlow(QListView::LeftToRight);
         m_listWidget->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Fixed);
+        m_listWidget->setVerticalScrollBarPolicy(Qt::ScrollBarAlwaysOff);
     }
-    if (m_iconAbove && m_vertical)
+
+    if (m_iconAbove && m_vertical) {
         m_listWidget->setFixedWidth(90); // this should be computed instead
+    }
 
     toplevelLayout->setSpacing(0);
     toplevelLayout->setContentsMargins(0, 0, 0, 0);
-    m_listWidget->setSpacing(0);
     m_listWidget->setContentsMargins(0, 0, 0, 0);
+    m_listWidget->setSpacing(0);
     m_stackWidget->setContentsMargins(0, 0, 0, 0);
     setLayout(toplevelLayout);
 

ground/openpilotgcs/src/plugins/config/configgadget.qrc

@@ -1,23 +1,32 @@
 <RCC>
     <qresource prefix="/configgadget">
         <file>images/help2.png</file>
-        <file>images/Airframe.png</file>
-        <file>images/Servo.png</file>
         <file>images/ahrs-calib.svg</file>
-        <file>images/AHRS-v1.3.png</file>
         <file>images/paper-plane.svg</file>
         <file>images/curve-bg.svg</file>
         <file>images/multirotor-shapes.svg</file>
         <file>images/ccpm_setup.svg</file>
         <file>images/PipXtreme.png</file>
-        <file>images/Transmitter.png</file>
         <file>images/help.png</file>
         <file>images/coptercontrol.svg</file>
-        <file>images/hw_config.png</file>
-        <file>images/gyroscope.png</file>
-        <file>images/TX.svg</file>
         <file>images/TX2.svg</file>
-        <file>images/camera.png</file>
-        <file>images/txpid.png</file>
+        <file>images/output_selected.png</file>
+        <file>images/output_normal.png</file>
+        <file>images/input_selected.png</file>
+        <file>images/input_normal.png</file>
+        <file>images/hardware_normal.png</file>
+        <file>images/hardware_selected.png</file>
+        <file>images/vehicle_normal.png</file>
+        <file>images/vehicle_selected.png</file>
+        <file>images/ins_selected.png</file>
+        <file>images/ins_normal.png</file>
+        <file>images/stabilization_selected.png</file>
+        <file>images/stabilization_normal.png</file>
+        <file>images/autotune_selected.png</file>
+        <file>images/autotune_normal.png</file>
+        <file>images/txpid_selected.png</file>
+        <file>images/txpid_normal.png</file>
+        <file>images/camstab_selected.png</file>
+        <file>images/camstab_normal.png</file>
     </qresource>
 </RCC>

ground/openpilotgcs/src/plugins/config/configgadgetwidget.cpp

@@ -67,33 +67,61 @@ ConfigGadgetWidget::ConfigGadgetWidget(QWidget *parent) : QWidget(parent)
     // *********************
     QWidget *qwd;
 
+    QIcon *icon = new QIcon();
+    icon->addFile(":/configgadget/images/hardware_normal.png", QSize(), QIcon::Normal, QIcon::Off);
+    icon->addFile(":/configgadget/images/hardware_selected.png", QSize(), QIcon::Selected, QIcon::Off);
     qwd = new DefaultHwSettingsWidget(this);
-    ftw->insertTab(ConfigGadgetWidget::hardware, qwd, QIcon(":/configgadget/images/hw_config.png"), QString("HW Settings"));
+    ftw->insertTab(ConfigGadgetWidget::hardware, qwd, *icon, QString("Hardware"));
 
+    icon = new QIcon();
+    icon->addFile(":/configgadget/images/vehicle_normal.png", QSize(), QIcon::Normal, QIcon::Off);
+    icon->addFile(":/configgadget/images/vehicle_selected.png", QSize(), QIcon::Selected, QIcon::Off);
     qwd = new ConfigVehicleTypeWidget(this);
-    ftw->insertTab(ConfigGadgetWidget::aircraft, qwd, QIcon(":/configgadget/images/Airframe.png"), QString("Aircraft"));
+    ftw->insertTab(ConfigGadgetWidget::aircraft, qwd, *icon, QString("Vehicle"));
 
+    icon = new QIcon();
+    icon->addFile(":/configgadget/images/input_normal.png", QSize(), QIcon::Normal, QIcon::Off);
+    icon->addFile(":/configgadget/images/input_selected.png", QSize(), QIcon::Selected, QIcon::Off);
     qwd = new ConfigInputWidget(this);
-    ftw->insertTab(ConfigGadgetWidget::input, qwd, QIcon(":/configgadget/images/Transmitter.png"), QString("Input"));
+    ftw->insertTab(ConfigGadgetWidget::input, qwd, *icon, QString("Input"));
 
+    icon = new QIcon();
+    icon->addFile(":/configgadget/images/output_normal.png", QSize(), QIcon::Normal, QIcon::Off);
+    icon->addFile(":/configgadget/images/output_selected.png", QSize(), QIcon::Selected, QIcon::Off);
     qwd = new ConfigOutputWidget(this);
-    ftw->insertTab(ConfigGadgetWidget::output, qwd, QIcon(":/configgadget/images/Servo.png"), QString("Output"));
+    ftw->insertTab(ConfigGadgetWidget::output, qwd, *icon, QString("Output"));
 
+    icon = new QIcon();
+    icon->addFile(":/configgadget/images/ins_normal.png", QSize(), QIcon::Normal, QIcon::Off);
+    icon->addFile(":/configgadget/images/ins_selected.png", QSize(), QIcon::Selected, QIcon::Off);
     qwd = new DefaultAttitudeWidget(this);
-    ftw->insertTab(ConfigGadgetWidget::sensors, qwd, QIcon(":/configgadget/images/AHRS-v1.3.png"), QString("INS"));
+    ftw->insertTab(ConfigGadgetWidget::sensors, qwd, *icon, QString("INS"));
 
+    icon = new QIcon();
+    icon->addFile(":/configgadget/images/stabilization_normal.png", QSize(), QIcon::Normal, QIcon::Off);
+    icon->addFile(":/configgadget/images/stabilization_selected.png", QSize(), QIcon::Selected, QIcon::Off);
     qwd = new ConfigStabilizationWidget(this);
-    ftw->insertTab(ConfigGadgetWidget::stabilization, qwd, QIcon(":/configgadget/images/gyroscope.png"), QString("Stabilization"));
+    ftw->insertTab(ConfigGadgetWidget::stabilization, qwd, *icon, QString("Stabilization"));
 
+    icon = new QIcon();
+    icon->addFile(":/configgadget/images/autotune_normal.png", QSize(), QIcon::Normal, QIcon::Off);
+    icon->addFile(":/configgadget/images/autotune_selected.png", QSize(), QIcon::Selected, QIcon::Off);
     qwd = new ConfigAutotuneWidget(this);
-    ftw->insertTab(ConfigGadgetWidget::autotune, qwd, QIcon(":/configgadget/images/gyroscope.png"), QString("Autotune"));
+    ftw->insertTab(ConfigGadgetWidget::autotune, qwd, *icon, QString("Autotune"));
 
+    icon = new QIcon();
+    icon->addFile(":/configgadget/images/camstab_normal.png", QSize(), QIcon::Normal, QIcon::Off);
+    icon->addFile(":/configgadget/images/camstab_selected.png", QSize(), QIcon::Selected, QIcon::Off);
     qwd = new ConfigCameraStabilizationWidget(this);
-    ftw->insertTab(ConfigGadgetWidget::camerastabilization, qwd, QIcon(":/configgadget/images/camera.png"), QString("Camera Stab"));
+    ftw->insertTab(ConfigGadgetWidget::camerastabilization, qwd, *icon, QString("Camera Stab"));
 
+    icon = new QIcon();
+    icon->addFile(":/configgadget/images/txpid_normal.png", QSize(), QIcon::Normal, QIcon::Off);
+    icon->addFile(":/configgadget/images/txpid_selected.png", QSize(), QIcon::Selected, QIcon::Off);
     qwd = new ConfigTxPIDWidget(this);
-    ftw->insertTab(ConfigGadgetWidget::txpid, qwd, QIcon(":/configgadget/images/txpid.png"), QString("TxPID"));
+    ftw->insertTab(ConfigGadgetWidget::txpid, qwd, *icon, QString("TxPID"));
 
+    ftw->setCurrentIndex(ConfigGadgetWidget::hardware);
     // *********************
     // Listen to autopilot connection events
 
@@ -103,8 +131,9 @@ ConfigGadgetWidget::ConfigGadgetWidget(QWidget *parent) : QWidget(parent)
     connect(telMngr, SIGNAL(disconnected()), this, SLOT(onAutopilotDisconnect()));
 
     // And check whether by any chance we are not already connected
-    if (telMngr->isConnected())
+    if (telMngr->isConnected()) {
         onAutopilotConnect();    
+    }
 
     help = 0;
     connect(ftw,SIGNAL(currentAboutToShow(int,bool*)),this,SLOT(tabAboutToChange(int,bool*)));//,Qt::BlockingQueuedConnection);
@@ -115,7 +144,7 @@ ConfigGadgetWidget::ConfigGadgetWidget(QWidget *parent) : QWidget(parent)
     if (pipxStatusObj != NULL ) {
         connect(pipxStatusObj, SIGNAL(objectUpdated(UAVObject*)), this, SLOT(updatePipXStatus(UAVObject*)));
     } else {
-	qDebug() << "Error: Object is unknown (PipXStatus).";
+        qDebug() << "Error: Object is unknown (PipXStatus).";
     }
 
     // Create the timer that is used to timeout the connection to the PipX.
@@ -126,8 +155,6 @@ ConfigGadgetWidget::ConfigGadgetWidget(QWidget *parent) : QWidget(parent)
 
 ConfigGadgetWidget::~ConfigGadgetWidget()
 {
-   // Do nothing
-
     // TODO: properly delete all the tabs in ftw before exiting
 }
 
@@ -141,18 +168,25 @@ void ConfigGadgetWidget::startInputWizard()
 
 void ConfigGadgetWidget::resizeEvent(QResizeEvent *event)
 {
-
     QWidget::resizeEvent(event);
 }
 
 void ConfigGadgetWidget::onAutopilotDisconnect() {
     ftw->setCurrentIndex(ConfigGadgetWidget::hardware);
     ftw->removeTab(ConfigGadgetWidget::sensors);
+
+    QIcon *icon = new QIcon();
+    icon->addFile(":/configgadget/images/ins_normal.png", QSize(), QIcon::Normal, QIcon::Off);
+    icon->addFile(":/configgadget/images/ins_selected.png", QSize(), QIcon::Selected, QIcon::Off);
     QWidget *qwd = new DefaultAttitudeWidget(this);
-    ftw->insertTab(ConfigGadgetWidget::sensors, qwd, QIcon(":/configgadget/images/AHRS-v1.3.png"), QString("INS"));
+    ftw->insertTab(ConfigGadgetWidget::sensors, qwd, *icon, QString("INS"));
     ftw->removeTab(ConfigGadgetWidget::hardware);
+
+    icon = new QIcon();
+    icon->addFile(":/configgadget/images/hardware_normal.png", QSize(), QIcon::Normal, QIcon::Off);
+    icon->addFile(":/configgadget/images/hardware_selected.png", QSize(), QIcon::Selected, QIcon::Off);
     qwd = new DefaultHwSettingsWidget(this);
-    ftw->insertTab(ConfigGadgetWidget::hardware, qwd, QIcon(":/configgadget/images/hw_config.png"), QString("HW Settings"));
+    ftw->insertTab(ConfigGadgetWidget::hardware, qwd, *icon, QString("Hardware"));
     ftw->setCurrentIndex(ConfigGadgetWidget::hardware);
 
     emit autopilotDisconnected();
@@ -172,56 +206,64 @@ void ConfigGadgetWidget::onAutopilotConnect() {
             // Delete the INS panel, replace with CC Panel:
             ftw->setCurrentIndex(ConfigGadgetWidget::hardware);
             ftw->removeTab(ConfigGadgetWidget::sensors);
+
+            QIcon *icon = new QIcon();
+            icon->addFile(":/configgadget/images/ins_normal.png", QSize(), QIcon::Normal, QIcon::Off);
+            icon->addFile(":/configgadget/images/ins_selected.png", QSize(), QIcon::Selected, QIcon::Off);
             QWidget *qwd = new ConfigCCAttitudeWidget(this);
-            ftw->insertTab(ConfigGadgetWidget::sensors, qwd, QIcon(":/configgadget/images/AHRS-v1.3.png"), QString("Attitude"));
+            ftw->insertTab(ConfigGadgetWidget::sensors, qwd, *icon, QString("INS"));
             ftw->removeTab(ConfigGadgetWidget::hardware);
+
+            icon = new QIcon();
+            icon->addFile(":/configgadget/images/hardware_normal.png", QSize(), QIcon::Normal, QIcon::Off);
+            icon->addFile(":/configgadget/images/hardware_selected.png", QSize(), QIcon::Selected, QIcon::Off);
             qwd = new ConfigCCHWWidget(this);
-            ftw->insertTab(ConfigGadgetWidget::hardware, qwd, QIcon(":/configgadget/images/hw_config.png"), QString("HW Settings"));
+            ftw->insertTab(ConfigGadgetWidget::hardware, qwd, *icon, QString("Hardware"));
             ftw->setCurrentIndex(ConfigGadgetWidget::hardware);
-        } else if ((board & 0xff00) == 256 ) {
-            // Mainboard family
-            Q_ASSERT(0);
-            /*
-            ftw->setCurrentIndex(ConfigGadgetWidget::hardware);
-            ftw->removeTab(ConfigGadgetWidget::sensors);
-            QWidget *qwd = new ConfigAHRSWidget(this);
-            ftw->insertTab(ConfigGadgetWidget::sensors, qwd, QIcon(":/configgadget/images/AHRS-v1.3.png"), QString("INS"));
-            ftw->removeTab(ConfigGadgetWidget::hardware);
-            qwd = new ConfigProHWWidget(this);
-            ftw->insertTab(ConfigGadgetWidget::hardware, qwd, QIcon(":/configgadget/images/hw_config.png"), QString("HW Settings"));
-            ftw->setCurrentIndex(ConfigGadgetWidget::hardware);
-            */
         } else if ((board & 0xff00) == 0x0900) {
             // Revolution sensor calibration
             ftw->setCurrentIndex(ConfigGadgetWidget::hardware);
             ftw->removeTab(ConfigGadgetWidget::sensors);
+
+            QIcon *icon = new QIcon();
+            icon->addFile(":/configgadget/images/ins_normal.png", QSize(), QIcon::Normal, QIcon::Off);
+            icon->addFile(":/configgadget/images/ins_selected.png", QSize(), QIcon::Selected, QIcon::Off);
             QWidget *qwd = new ConfigRevoWidget(this);
-            ftw->insertTab(ConfigGadgetWidget::sensors, qwd, QIcon(":/configgadget/images/AHRS-v1.3.png"), QString("Revo"));
+            ftw->insertTab(ConfigGadgetWidget::sensors, qwd, *icon, QString("Revo"));
             ftw->removeTab(ConfigGadgetWidget::hardware);
+
+            icon = new QIcon();
+            icon->addFile(":/configgadget/images/hardware_normal.png", QSize(), QIcon::Normal, QIcon::Off);
+            icon->addFile(":/configgadget/images/hardware_selected.png", QSize(), QIcon::Normal, QIcon::On);
             qwd = new ConfigProHWWidget(this);
-            ftw->insertTab(ConfigGadgetWidget::hardware, qwd, QIcon(":/configgadget/images/hw_config.png"), QString("HW Settings"));
+            ftw->insertTab(ConfigGadgetWidget::hardware, qwd, *icon, QString("Hardware"));
             ftw->setCurrentIndex(ConfigGadgetWidget::hardware);
+        } else {
+            //Unknown board
+            Q_ASSERT(0);
         }
     }
     emit autopilotConnected();
 }
 
-void ConfigGadgetWidget::tabAboutToChange(int i,bool * proceed)
+void ConfigGadgetWidget::tabAboutToChange(int i, bool * proceed)
 {
     Q_UNUSED(i);
-    *proceed=true;
-    ConfigTaskWidget * wid=qobject_cast<ConfigTaskWidget *>(ftw->currentWidget());
-    if(!wid)
+    *proceed = true;
+    ConfigTaskWidget * wid = qobject_cast<ConfigTaskWidget *>(ftw->currentWidget());
+    if(!wid) {
         return;
+    }
     if(wid->isDirty())
     {
         int ans=QMessageBox::warning(this,tr("Unsaved changes"),tr("The tab you are leaving has unsaved changes,"
                                                            "if you proceed they will be lost."
                                                            "Do you still want to proceed?"),QMessageBox::Yes,QMessageBox::No);
-        if(ans==QMessageBox::No)
+        if(ans==QMessageBox::No) {
             *proceed=false;
-        else
+        } else {
             wid->setDirty(false);
+        }
     }
 }