Show selected CRS. Fix #5563

NathanW2 · NathanW2 · commit 8cbf901b6a5c · 2013-05-26T12:42:05.000+10:00
diff --git a/src/gui/qgsprojectionselector.cpp b/src/gui/qgsprojectionselector.cpp
@@ -273,6 +273,7 @@ void QgsProjectionSelector::applySelection( int column, QString value )
     lstCoordinateSystems->clearSelection();
     lstRecent->clearSelection();
     teProjection->setText( "" );
+    teSelected->setText( "" );
   }
 }
 
@@ -720,6 +721,7 @@ void QgsProjectionSelector::on_lstCoordinateSystems_currentItemChanged( QTreeWid
     emit sridSelected( QString::number( selectedCrsId() ) );
 
     teProjection->setText( selectedProj4String() );
+    teSelected->setText( selectedName() );
 
     QList<QTreeWidgetItem*> nodes = lstRecent->findItems( current->text( QGIS_CRS_ID_COLUMN ), Qt::MatchExactly, QGIS_CRS_ID_COLUMN );
     if ( nodes.count() > 0 )
@@ -739,6 +741,7 @@ void QgsProjectionSelector::on_lstCoordinateSystems_currentItemChanged( QTreeWid
     // Not an CRS - remove the highlight so the user doesn't get too confused
     current->setSelected( false );
     teProjection->setText( "" );
+    teSelected->setText( "" );
     lstRecent->clearSelection();
   }
 }
@@ -775,6 +778,7 @@ void QgsProjectionSelector::hideDeprecated( QTreeWidgetItem *item )
     {
       item->setSelected( false );
       teProjection->setText( "" );
+      teSelected->setText( "" );
     }
   }
 
diff --git a/src/ui/qgsprojectionselectorbase.ui b/src/ui/qgsprojectionselectorbase.ui
@@ -25,33 +25,30 @@
    </iconset>
   </property>
   <layout class="QGridLayout" name="gridLayout_2">
-   <item row="0" column="0">
-    <layout class="QHBoxLayout" name="horizontalLayout">
+   <item row="3" column="0">
+    <layout class="QHBoxLayout" name="horizontalLayout_2">
      <item>
-      <widget class="QLabel" name="label_5">
+      <widget class="QLabel" name="label">
+       <property name="font">
+        <font>
+         <weight>75</weight>
+         <bold>true</bold>
+        </font>
+       </property>
        <property name="text">
-        <string>Filter</string>
+        <string>Selected CRS:</string>
        </property>
       </widget>
      </item>
      <item>
-      <widget class="QgsFilterLineEdit" name="leSearch"/>
+      <widget class="QLineEdit" name="teSelected">
+       <property name="readOnly">
+        <bool>true</bool>
+       </property>
+      </widget>
      </item>
     </layout>
    </item>
-   <item row="1" column="0">
-    <widget class="QLabel" name="label_3">
-     <property name="font">
-      <font>
-       <weight>75</weight>
-       <bold>true</bold>
-      </font>
-     </property>
-     <property name="text">
-      <string>Recently used coordinate reference systems</string>
-     </property>
-    </widget>
-   </item>
    <item row="2" column="0">
     <widget class="QSplitter" name="splitter">
      <property name="orientation">
@@ -189,7 +186,34 @@
      </widget>
     </widget>
    </item>
-   <item row="3" column="0">
+   <item row="0" column="0">
+    <layout class="QHBoxLayout" name="horizontalLayout">
+     <item>
+      <widget class="QLabel" name="label_5">
+       <property name="text">
+        <string>Filter</string>
+       </property>
+      </widget>
+     </item>
+     <item>
+      <widget class="QgsFilterLineEdit" name="leSearch"/>
+     </item>
+    </layout>
+   </item>
+   <item row="1" column="0">
+    <widget class="QLabel" name="label_3">
+     <property name="font">
+      <font>
+       <weight>75</weight>
+       <bold>true</bold>
+      </font>
+     </property>
+     <property name="text">
+      <string>Recently used coordinate reference systems</string>
+     </property>
+    </widget>
+   </item>
+   <item row="6" column="0">
     <widget class="QTextEdit" name="teProjection">
      <property name="minimumSize">
       <size>

Original file line number	Diff line number	Diff line change
`@@ -273,6 +273,7 @@ void QgsProjectionSelector::applySelection( int column, QString value )`
`273`	`273`	`lstCoordinateSystems->clearSelection();`
`274`	`274`	`lstRecent->clearSelection();`
`275`	`275`	`teProjection->setText( "" );`
	`276`	`+ teSelected->setText( "" );`
`276`	`277`	`}`
`277`	`278`	`}`
`278`	`279`
`@@ -720,6 +721,7 @@ void QgsProjectionSelector::on_lstCoordinateSystems_currentItemChanged( QTreeWid`
`720`	`721`	`emit sridSelected( QString::number( selectedCrsId() ) );`
`721`	`722`
`722`	`723`	`teProjection->setText( selectedProj4String() );`
	`724`	`+ teSelected->setText( selectedName() );`
`723`	`725`
`724`	`726`	`QList<QTreeWidgetItem*> nodes = lstRecent->findItems( current->text( QGIS_CRS_ID_COLUMN ), Qt::MatchExactly, QGIS_CRS_ID_COLUMN );`
`725`	`727`	`if ( nodes.count() > 0 )`
`@@ -739,6 +741,7 @@ void QgsProjectionSelector::on_lstCoordinateSystems_currentItemChanged( QTreeWid`
`739`	`741`	`// Not an CRS - remove the highlight so the user doesn't get too confused`
`740`	`742`	`current->setSelected( false );`
`741`	`743`	`teProjection->setText( "" );`
	`744`	`+ teSelected->setText( "" );`
`742`	`745`	`lstRecent->clearSelection();`
`743`	`746`	`}`
`744`	`747`	`}`
`@@ -775,6 +778,7 @@ void QgsProjectionSelector::hideDeprecated( QTreeWidgetItem *item )`
`775`	`778`	`{`
`776`	`779`	`item->setSelected( false );`
`777`	`780`	`teProjection->setText( "" );`
	`781`	`+ teSelected->setText( "" );`
`778`	`782`	`}`
`779`	`783`	`}`
`780`	`784`