fix #3185 and #4689

jef-n · jef-n · commit 98f93fffcc21 · 2011-12-24T02:42:29.000+01:00
diff --git a/src/app/gps/qgsgpsinformationwidget.cpp b/src/app/gps/qgsgpsinformationwidget.cpp
@@ -391,7 +391,7 @@ void QgsGPSInformationWidget::connectGps()
 
   if ( mRadUserPath->isChecked() )
   {
-    port = mCboDevices->itemData( mCboDevices->currentIndex() ).toString();
+    port = mCboDevices->currentText();
 
     if ( port.isEmpty() )
     {
diff --git a/src/core/gps/qextserialport/qextserialenumerator.cpp b/src/core/gps/qextserialport/qextserialenumerator.cpp
@@ -104,7 +104,7 @@ QextSerialEnumerator::~QextSerialEnumerator( )
           infoList.append(info);
 
           CloseHandle( hPort );
-				}
+	}
 #endif
     }
 
diff --git a/src/core/gps/qgsgpsdetector.cpp b/src/core/gps/qgsgpsdetector.cpp
@@ -89,7 +89,7 @@ QList< QPair<QString, QString> > QgsGPSDetector::availablePorts()
 QgsGPSDetector::QgsGPSDetector( QString portName )
 {
   mConn = 0;
-  mBaudList << BAUD4800 << BAUD9600 << BAUD38400 << BAUD57600;  //add 57600 for SXBlueII GPS unit
+  mBaudList << BAUD4800 << BAUD9600 << BAUD38400 << BAUD57600 << BAUD115200;  //add 57600 for SXBlueII GPS unit
 
   if ( portName.isEmpty() )
   {
diff --git a/src/ui/qgsgpsinformationwidgetbase.ui b/src/ui/qgsgpsinformationwidgetbase.ui
@@ -691,6 +691,9 @@ gray = no data
                   <property name="enabled">
                    <bool>false</bool>
                   </property>
+                  <property name="editable">
+                   <bool>true</bool>
+                  </property>
                  </widget>
                 </item>
                 <item>

Original file line number	Diff line number	Diff line change
`@@ -391,7 +391,7 @@ void QgsGPSInformationWidget::connectGps()`
`391`	`391`
`392`	`392`	`if ( mRadUserPath->isChecked() )`
`393`	`393`	`{`
`394`		`- port = mCboDevices->itemData( mCboDevices->currentIndex() ).toString();`
	`394`	`+ port = mCboDevices->currentText();`
`395`	`395`
`396`	`396`	`if ( port.isEmpty() )`
`397`	`397`	`{`
Original file line number	Diff line number	Diff line change
`@@ -104,7 +104,7 @@ QextSerialEnumerator::~QextSerialEnumerator( )`
`104`	`104`	`infoList.append(info);`
`105`	`105`
`106`	`106`	`CloseHandle( hPort );`
`107`		`- }`
	`107`	`+ }`
`108`	`108`	`#endif`
`109`	`109`	`}`
`110`	`110`
Original file line number	Diff line number	Diff line change
`@@ -89,7 +89,7 @@ QList< QPair<QString, QString> > QgsGPSDetector::availablePorts()`
`89`	`89`	`QgsGPSDetector::QgsGPSDetector( QString portName )`
`90`	`90`	`{`
`91`	`91`	`mConn = 0;`
`92`		`- mBaudList << BAUD4800 << BAUD9600 << BAUD38400 << BAUD57600; //add 57600 for SXBlueII GPS unit`
	`92`	`+ mBaudList << BAUD4800 << BAUD9600 << BAUD38400 << BAUD57600 << BAUD115200; //add 57600 for SXBlueII GPS unit`
`93`	`93`
`94`	`94`	`if ( portName.isEmpty() )`
`95`	`95`	`{`