Merge lp:~juhapekka-piiroinen/ubuntu-qtcreator-plugins/add-deviceinfo-to-devices-tab into lp:ubuntu-qtcreator-plugins

[Juhapekka Piiroinen]

Add device information to Devices -tab.

=== modified file 'qtcreator/share/qtcreator/ubuntu/scripts/device_search'
--- qtcreator/share/qtcreator/ubuntu/scripts/device_search	2013-04-23 11:09:57 +0000
+++ qtcreator/share/qtcreator/ubuntu/scripts/device_search	2013-05-02 00:51:23 +0000
@@ -16,4 +16,4 @@
 # Author: Juhapekka Piiroinen <[e-mail]>
 set -e;
 
-adb devices
+adb devices -l

=== modified file 'qtcreator/src/plugins/ubuntu/ubuntudeviceswidget.cpp'
--- qtcreator/src/plugins/ubuntu/ubuntudeviceswidget.cpp	2013-05-01 22:36:21 +0000
+++ qtcreator/src/plugins/ubuntu/ubuntudeviceswidget.cpp	2013-05-02 00:51:23 +0000
@@ -85,15 +85,19 @@
         QStringList lines = m_reply.trimmed().split(QLatin1String("\n"));
         lines.takeFirst();
         foreach(QString line, lines) {
-            QStringList lineData = line.split(QLatin1String("\t"));
+            QStringList lineData = line.split(QLatin1String("       "));
             if (lineData.count() == 2) {
                 QString sSerialNumber = lineData.takeFirst();
+                QString sDeviceInfo = lineData.takeFirst();
                 //QString sDeviceName = lineData.takeFirst();
 
                 //ui->lblDeviceName->setText(sDeviceName.trimmed());
-                ui->comboBoxSerialNumber->addItem(sSerialNumber.trimmed());
+                ui->comboBoxSerialNumber->addItem(sSerialNumber.trimmed(),sDeviceInfo);
                 //ui->lblSerialnumber->setText(sSerialNumber.trimmed());
                 m_deviceSerialNumber = sSerialNumber.trimmed();
+
+            } else {
+                qDebug() << lineData.count() << lineData;
             }
         }
 
@@ -226,6 +230,7 @@
 void UbuntuDevicesWidget::on_comboBoxSerialNumber_currentIndexChanged( const QString & text ) {
     m_deviceSerialNumber = text;
     if (!text.isEmpty()) {
+        ui->lblDeviceInfo->setText(ui->comboBoxSerialNumber->itemData(ui->comboBoxSerialNumber->currentIndex()).toString());
         detectDeviceVersion();
     }
 }

=== modified file 'qtcreator/src/plugins/ubuntu/ubuntudeviceswidget.ui'
--- qtcreator/src/plugins/ubuntu/ubuntudeviceswidget.ui	2013-05-01 22:36:21 +0000
+++ qtcreator/src/plugins/ubuntu/ubuntudeviceswidget.ui	2013-05-02 00:51:23 +0000
@@ -182,6 +182,13 @@
             </widget>
            </item>
            <item>
+            <widget class="QLabel" name="lblDeviceInfo">
+             <property name="text">
+              <string/>
+             </property>
+            </widget>
+           </item>
+           <item>
             <spacer name="horizontalSpacer_2">
              <property name="orientation">
               <enum>Qt::Horizontal</enum>

=== modified file 'qtcreator/src/plugins/ubuntu/ubuntuprocess.cpp'
--- qtcreator/src/plugins/ubuntu/ubuntuprocess.cpp	2013-04-08 13:34:07 +0000
+++ qtcreator/src/plugins/ubuntu/ubuntuprocess.cpp	2013-05-02 00:51:23 +0000
@@ -71,7 +71,8 @@
 }
 
 void UbuntuProcess::processReadyRead() {
-    emit message(QString::fromLatin1(m_currentProcess.readAll()));
+    emit message(QString::fromLatin1(m_currentProcess.readAllStandardError()));
+    emit message(QString::fromLatin1(m_currentProcess.readAllStandardOutput()));
 }
 
 void UbuntuProcess::processCmdQueue() {