Index: src/app/qgsoptions.cpp
===================================================================
--- src/app/qgsoptions.cpp	(wersja 15347)
+++ src/app/qgsoptions.cpp	(kopia robocza)
@@ -188,10 +188,13 @@
   {
     radUseGlobalProjection->setChecked( true );
   }
-  txtGlobalWkt->setText( settings.value( "/Projections/defaultProjectionString", GEOPROJ4 ).toString() );
+  QString myLayerDefaultCrsString = settings.value( "/Projections/defaultProjectionString", GEOPROJ4 ).toString();
+  mLayerDefaultCrs.createFromProj4( myLayerDefaultCrsString );
+  leLayerGlobalProjString->setText( mLayerDefaultCrs.authid() + " - " +
+      mLayerDefaultCrs.description() );
   //on the fly CRS transformation settings
-  grpOtfTransform->setChecked( settings.value( "/Projections/otfTransformEnabled", 0 ).toBool() );
-  QString myDefaultSrsString = settings.value( "/Projections/defaultOTFProjectionString", GEOPROJ4 ).toString();
+  chkOtfTransform->setChecked( settings.value( "/Projections/otfTransformEnabled", 0 ).toBool() );
+  QString myDefaultSrsString = settings.value( "/Projections/projectDefaultProjectionString", GEOPROJ4 ).toString();
   mDefaultCrs.createFromProj4( myDefaultSrsString );
   //display the crs as friendly text rather than in wkt
   leGlobalOtfProjString->setText( mDefaultCrs.authid() + " - " +
@@ -635,11 +638,11 @@
     settings.setValue( "/Projections/defaultBehaviour", "useGlobal" );
   }
 
-  settings.setValue( "/Projections/defaultProjectionString", txtGlobalWkt->toPlainText() );
+  settings.setValue( "/Projections/defaultProjectionString", mLayerDefaultCrs.toProj4() );
 
   // save 'on the fly' CRS transformation settings
-  settings.setValue( "/Projections/otfTransformEnabled", grpOtfTransform->isChecked() );
-  settings.setValue( "/Projections/defaultOTFProjectionString", mDefaultCrs.toProj4() );
+  settings.setValue( "/Projections/otfTransformEnabled", chkOtfTransform->isChecked() );
+  settings.setValue( "/Projections/projectDefaultProjectionString", mDefaultCrs.toProj4() );
 
   settings.setValue( "/qgis/measure/ellipsoid", getEllipsoidAcronym( cmbEllipsoid->currentText() ) );
 
@@ -750,21 +753,19 @@
   QgsGenericProjectionSelector * mySelector = new QgsGenericProjectionSelector( this );
 
   //find out srs id of current proj4 string
-  QgsCoordinateReferenceSystem refSys;
-  if ( refSys.createFromProj4( txtGlobalWkt->toPlainText() ) )
-  {
-    mySelector->setSelectedCrsId( refSys.srsid() );
-  }
+  mySelector->setSelectedCrsId( mLayerDefaultCrs.srsid() );
 
   if ( mySelector->exec() )
   {
-    //! @todo changes this control name in gui to txtGlobalProjString
-    txtGlobalWkt->setText( mySelector->selectedProj4String() );
-    QgsDebugMsg( QString( "------ Global Default Projection Selection set to ----------\n%1" ).arg( txtGlobalWkt->toPlainText() ) );
+    mLayerDefaultCrs.createFromProj4( mySelector->selectedProj4String() );
+    QgsDebugMsg( QString( "Setting default project CRS to : %1").arg( mySelector->selectedProj4String() ) );
+    leLayerGlobalProjString->setText( mLayerDefaultCrs.authid() + " - " +
+      mLayerDefaultCrs.description() );
+    QgsDebugMsg( QString( "------ Global Layer Default Projection Selection set to ----------\n%1" ).arg( leLayerGlobalProjString->text() ) );
   }
   else
   {
-    QgsDebugMsg( "------ Global Default Projection Selection change cancelled ----------" );
+    QgsDebugMsg( "------ Global Layer Default Projection Selection change cancelled ----------" );
     QApplication::restoreOverrideCursor();
   }
 
Index: src/app/qgsoptions.h
===================================================================
--- src/app/qgsoptions.h	(wersja 15347)
+++ src/app/qgsoptions.h	(kopia robocza)
@@ -131,6 +131,7 @@
   private:
     QStringList i18nList();
     QgsCoordinateReferenceSystem mDefaultCrs;
+    QgsCoordinateReferenceSystem mLayerDefaultCrs;
 };
 
 #endif // #ifndef QGSOPTIONS_H
Index: src/app/qgisapp.cpp
===================================================================
--- src/app/qgisapp.cpp	(wersja 15347)
+++ src/app/qgisapp.cpp	(kopia robocza)
@@ -3256,27 +3256,29 @@
   mMapCanvas->refresh();
   mMapCanvas->clearExtentHistory();
 
+  // set project CRS
+  QgsMapRenderer* myRenderer = mMapCanvas->mapRenderer();
+  QString projString = settings.value( "/Projections/projectDefaultProjectionString", GEOPROJ4 ).toString();
+  QgsCoordinateReferenceSystem srs;
+  srs.createFromProj4( projString );
+  myRenderer->setDestinationSrs( srs );
+  // write the projections _proj string_ to project settings
+  prj->writeEntry( "SpatialRefSys", "/ProjectCRSProj4String", projString );
+  prj->dirty( false );
+  if ( srs.mapUnits() != QGis::UnknownUnit )
+  {
+    myRenderer->setMapUnits( srs.mapUnits() );
+  }
+
   // enable OTF CRS transformation if necessary
   if ( settings.value( "/Projections/otfTransformEnabled", 0 ).toBool() )
   {
-    QgsMapRenderer* myRenderer = mMapCanvas->mapRenderer();
-    QString projString = settings.value( "/Projections/defaultOTFProjectionString", GEOPROJ4 ).toString();
-    QgsCoordinateReferenceSystem srs;
-    srs.createFromProj4( projString );
     myRenderer->setProjectionsEnabled( true );
-    myRenderer->setDestinationSrs( srs );
-    // write the projections _proj string_ to project settings
-    prj->writeEntry( "SpatialRefSys", "/ProjectCRSProj4String", projString );
-    prj->dirty( false );
-    if ( srs.mapUnits() != QGis::UnknownUnit )
-    {
-      myRenderer->setMapUnits( srs.mapUnits() );
-    }
     mOnTheFlyProjectionStatusButton->setIcon( getThemeIcon( "mIconProjectionEnabled.png" ) );
   }
   else
   {
-    mMapCanvas->mapRenderer()->setProjectionsEnabled( false );
+    myRenderer->setProjectionsEnabled( false );
   }
 
   // set the initial map tool
@@ -5528,25 +5530,26 @@
     double zoomFactor = mySettings.value( "/qgis/zoom_factor", 2 ).toDouble();
     mMapCanvas->setWheelAction(( QgsMapCanvas::WheelAction ) action, zoomFactor );
 
+    // set project CRS
+    QgsMapRenderer* myRenderer = mMapCanvas->mapRenderer();
+    QString projString = mySettings.value( "/Projections/projectDefaultProjectionString", GEOPROJ4 ).toString();
+    QgsCoordinateReferenceSystem srs;
+    srs.createFromProj4( projString );
+    myRenderer->setDestinationSrs( srs );
+    // write the projections _proj string_ to project settings
+    QgsProject::instance()->writeEntry( "SpatialRefSys", "/ProjectCRSProj4String", projString );
+    if ( srs.mapUnits() != QGis::UnknownUnit )
+    {
+      myRenderer->setMapUnits( srs.mapUnits() );
+    }
+
     //apply OTF CRS transformation if necessary
     if ( mySettings.value( "/Projections/otfTransformEnabled", 0 ).toBool() )
     {
-      QgsMapRenderer* myRenderer = mMapCanvas->mapRenderer();
-      QString projString = mySettings.value( "/Projections/defaultOTFProjectionString", GEOPROJ4 ).toString();
-      QgsCoordinateReferenceSystem srs;
-      srs.createFromProj4( projString );
       myRenderer->setProjectionsEnabled( true );
-      myRenderer->setDestinationSrs( srs );
-      // write the projections _proj string_ to project settings
-      QgsProject::instance()->writeEntry( "SpatialRefSys", "/ProjectCRSProj4String", projString );
-      if ( srs.mapUnits() != QGis::UnknownUnit )
-      {
-        myRenderer->setMapUnits( srs.mapUnits() );
-      }
     }
     else
     {
-      QgsMapRenderer* myRenderer = mMapCanvas->mapRenderer();
       myRenderer->setProjectionsEnabled( false );
     }
     mMapCanvas->refresh();
Index: src/ui/qgsoptionsbase.ui
===================================================================
--- src/ui/qgsoptionsbase.ui	(wersja 15347)
+++ src/ui/qgsoptionsbase.ui	(kopia robocza)
@@ -6,8 +6,8 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>804</width>
-    <height>567</height>
+    <width>820</width>
+    <height>573</height>
    </rect>
   </property>
   <property name="windowTitle">
@@ -20,7 +20,7 @@
    <bool>true</bool>
   </property>
   <layout class="QGridLayout" name="gridLayout_3">
-   <item row="1" column="0">
+   <item row="3" column="0">
     <widget class="QDialogButtonBox" name="buttonBox">
      <property name="orientation">
       <enum>Qt::Horizontal</enum>
@@ -30,7 +30,7 @@
      </property>
     </widget>
    </item>
-   <item row="0" column="0">
+   <item row="2" column="0">
     <widget class="QTabWidget" name="tabWidget">
      <property name="currentIndex">
       <number>0</number>
@@ -60,8 +60,8 @@
            <rect>
             <x>0</x>
             <y>0</y>
-            <width>746</width>
-            <height>862</height>
+            <width>775</width>
+            <height>755</height>
            </rect>
           </property>
           <layout class="QGridLayout" name="gridLayout_12">
@@ -499,8 +499,8 @@
            <rect>
             <x>0</x>
             <y>0</y>
-            <width>746</width>
-            <height>481</height>
+            <width>790</width>
+            <height>485</height>
            </rect>
           </property>
           <layout class="QGridLayout" name="gridLayout_8">
@@ -670,8 +670,8 @@
            <rect>
             <x>0</x>
             <y>0</y>
-            <width>746</width>
-            <height>500</height>
+            <width>790</width>
+            <height>485</height>
            </rect>
           </property>
           <layout class="QGridLayout" name="gridLayout_4">
@@ -950,8 +950,8 @@
            <rect>
             <x>0</x>
             <y>0</y>
-            <width>762</width>
-            <height>457</height>
+            <width>790</width>
+            <height>485</height>
            </rect>
           </property>
           <layout class="QGridLayout" name="gridLayout_10">
@@ -1025,8 +1025,8 @@
            <rect>
             <x>0</x>
             <y>0</y>
-            <width>837</width>
-            <height>454</height>
+            <width>790</width>
+            <height>485</height>
            </rect>
           </property>
           <layout class="QGridLayout" name="gridLayout_13">
@@ -1354,22 +1354,25 @@
           <property name="geometry">
            <rect>
             <x>0</x>
-            <y>-59</y>
-            <width>746</width>
-            <height>516</height>
+            <y>0</y>
+            <width>790</width>
+            <height>485</height>
            </rect>
           </property>
           <layout class="QGridLayout" name="gridLayout_15">
-           <item row="0" column="0">
+           <item row="1" column="0">
             <widget class="QGroupBox" name="grpProjectionBehaviour">
+             <property name="sizePolicy">
+              <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
+               <horstretch>0</horstretch>
+               <verstretch>2</verstretch>
+              </sizepolicy>
+             </property>
              <property name="title">
-              <string>Default Coordinate Reference System</string>
+              <string>Coordinate Reference System for new layers</string>
              </property>
-             <layout class="QVBoxLayout">
-              <property name="margin">
-               <number>11</number>
-              </property>
-              <item>
+             <layout class="QGridLayout" name="gridLayout">
+              <item row="0" column="0" colspan="3">
                <widget class="QLabel" name="label_8">
                 <property name="text">
                  <string>When a new layer is created, or when a layer is loaded that has no coordinate reference system (CRS)</string>
@@ -1379,63 +1382,106 @@
                 </property>
                </widget>
               </item>
-              <item>
+              <item row="1" column="0">
                <widget class="QRadioButton" name="radPromptForProjection">
                 <property name="text">
                  <string>Prompt for CRS</string>
                 </property>
                </widget>
               </item>
-              <item>
+              <item row="2" column="0">
                <widget class="QRadioButton" name="radUseProjectProjection">
                 <property name="text">
-                 <string>Project wide default CRS will be used</string>
+                 <string>Use project CRS</string>
                 </property>
                </widget>
               </item>
-              <item>
+              <item row="3" column="0">
                <widget class="QRadioButton" name="radUseGlobalProjection">
                 <property name="text">
-                 <string>Global default CRS displa&amp;yed below will be used</string>
+                 <string>Use default CRS</string>
                 </property>
                </widget>
               </item>
+              <item row="3" column="1">
+               <widget class="QLineEdit" name="leLayerGlobalProjString">
+                <property name="readOnly">
+                 <bool>true</bool>
+                </property>
+               </widget>
+              </item>
+              <item row="3" column="2">
+               <widget class="QPushButton" name="pbnSelectProjection">
+                <property name="text">
+                 <string>Specify...</string>
+                </property>
+               </widget>
+              </item>
+              <item row="4" column="1">
+               <spacer name="verticalSpacer_2">
+                <property name="orientation">
+                 <enum>Qt::Vertical</enum>
+                </property>
+                <property name="sizeHint" stdset="0">
+                 <size>
+                  <width>20</width>
+                  <height>40</height>
+                 </size>
+                </property>
+               </spacer>
+              </item>
              </layout>
             </widget>
            </item>
-           <item row="1" column="0">
-            <widget class="QTextBrowser" name="txtGlobalWkt"/>
-           </item>
-           <item row="2" column="0">
-            <widget class="QPushButton" name="pbnSelectProjection">
-             <property name="text">
-              <string>Select Global Default ...</string>
+           <item row="0" column="0">
+            <widget class="QGroupBox" name="grpOtfTransform">
+             <property name="sizePolicy">
+              <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
+               <horstretch>0</horstretch>
+               <verstretch>1</verstretch>
+              </sizepolicy>
              </property>
-            </widget>
-           </item>
-           <item row="3" column="0">
-            <widget class="QGroupBox" name="grpOtfTransform">
              <property name="title">
-              <string>Always use 'on the fly' CRS transformation for new projects</string>
+              <string>Default Coordinate Reference System for new projects</string>
              </property>
              <property name="checkable">
-              <bool>true</bool>
+              <bool>false</bool>
              </property>
-             <layout class="QVBoxLayout" name="verticalLayout_3">
-              <item>
+             <layout class="QGridLayout" name="gridLayout_22">
+              <item row="0" column="0">
                <widget class="QLineEdit" name="leGlobalOtfProjString">
                 <property name="readOnly">
                  <bool>true</bool>
                 </property>
                </widget>
               </item>
-              <item>
+              <item row="2" column="0">
+               <widget class="QCheckBox" name="chkOtfTransform">
+                <property name="text">
+                 <string>Use 'on the fly' CRS transformation for new projects</string>
+                </property>
+               </widget>
+              </item>
+              <item row="0" column="1">
                <widget class="QPushButton" name="pbnSelectOtfProjection">
                 <property name="text">
-                 <string>Select CRS for 'on the fly' transformation ...</string>
+                 <string>Specify...</string>
                 </property>
                </widget>
               </item>
+              <item row="3" column="0" colspan="2">
+               <spacer name="verticalSpacer">
+                <property name="orientation">
+                 <enum>Qt::Vertical</enum>
+                </property>
+                <property name="sizeHint" stdset="0">
+                 <size>
+                  <width>20</width>
+                  <height>40</height>
+                 </size>
+                </property>
+               </spacer>
+              </item>
              </layout>
             </widget>
            </item>
@@ -1464,8 +1510,8 @@
            <rect>
             <x>0</x>
             <y>0</y>
-            <width>746</width>
-            <height>551</height>
+            <width>775</width>
+            <height>527</height>
            </rect>
           </property>
           <layout class="QGridLayout" name="gridLayout_17">
@@ -1555,8 +1601,8 @@
            <rect>
             <x>0</x>
             <y>0</y>
-            <width>746</width>
-            <height>548</height>
+            <width>790</width>
+            <height>485</height>
            </rect>
           </property>
           <layout class="QGridLayout" name="gridLayout_20">
@@ -1786,34 +1832,58 @@
  </customwidgets>
  <tabstops>
   <tabstop>tabWidget</tabstop>
+  <tabstop>scrollArea_2</tabstop>
   <tabstop>chbAskToSaveProjectChanges</tabstop>
   <tabstop>chbWarnOldProjectVersion</tabstop>
   <tabstop>pbnSelectionColor</tabstop>
   <tabstop>pbnCanvasColor</tabstop>
   <tabstop>cmbTheme</tabstop>
+  <tabstop>cmbSize</tabstop>
+  <tabstop>cmbLegendDoubleClickAction</tabstop>
   <tabstop>capitaliseCheckBox</tabstop>
   <tabstop>cbxLegendClassifiers</tabstop>
+  <tabstop>cbxCreateRasterLegendIcons</tabstop>
   <tabstop>cbxHideSplash</tabstop>
+  <tabstop>cbxShowTips</tabstop>
   <tabstop>cbxIdentifyResultsDocked</tabstop>
+  <tabstop>cbxSnappingOptionsDocked</tabstop>
   <tabstop>cbxAttributeTableDocked</tabstop>
   <tabstop>cbxAddPostgisDC</tabstop>
+  <tabstop>cbxAddNewLayersToCurrentGroup</tabstop>
+  <tabstop>cmbAttrTableBehaviour</tabstop>
+  <tabstop>leNullValue</tabstop>
+  <tabstop>mListPluginPaths</tabstop>
+  <tabstop>mBtnAddPluginPath</tabstop>
+  <tabstop>mBtnRemovePluginPath</tabstop>
+  <tabstop>buttonBox</tabstop>
+  <tabstop>scrollArea_3</tabstop>
   <tabstop>chkAddedVisibility</tabstop>
   <tabstop>spinBoxUpdateThreshold</tabstop>
   <tabstop>chkUseRenderCaching</tabstop>
   <tabstop>chkAntiAliasing</tabstop>
   <tabstop>chkUseQPixmap</tabstop>
+  <tabstop>chkUseSymbologyNG</tabstop>
+  <tabstop>mListSVGPaths</tabstop>
   <tabstop>mBtnAddSVGPath</tabstop>
   <tabstop>mBtnRemoveSVGPath</tabstop>
-  <tabstop>mListSVGPaths</tabstop>
+  <tabstop>scrollArea</tabstop>
   <tabstop>cmbIdentifyMode</tabstop>
+  <tabstop>cbxAutoFeatureForm</tabstop>
   <tabstop>spinBoxIdentifyValue</tabstop>
   <tabstop>cmbEllipsoid</tabstop>
   <tabstop>pbnMeasureColor</tabstop>
+  <tabstop>mDecimalPlacesSpinBox</tabstop>
+  <tabstop>mKeepBaseUnitCheckBox</tabstop>
   <tabstop>radMeters</tabstop>
   <tabstop>radFeet</tabstop>
+  <tabstop>mDegreesRadioButton</tabstop>
+  <tabstop>mRadiansRadioButton</tabstop>
+  <tabstop>mGonRadioButton</tabstop>
   <tabstop>cmbWheelAction</tabstop>
   <tabstop>spinZoomFactor</tabstop>
+  <tabstop>scrollArea_4</tabstop>
   <tabstop>mOverlayAlgorithmComboBox</tabstop>
+  <tabstop>scrollArea_5</tabstop>
   <tabstop>mLineWidthSpinBox</tabstop>
   <tabstop>mLineColorToolButton</tabstop>
   <tabstop>mDefaultSnapModeComboBox</tabstop>
@@ -1821,25 +1891,39 @@
   <tabstop>mDefaultSnappingToleranceComboBox</tabstop>
   <tabstop>mSearchRadiusVertexEditSpinBox</tabstop>
   <tabstop>mSearchRadiusVertexEditComboBox</tabstop>
-  <tabstop>mMarkersOnlyForSelectedCheckBox</tabstop>
   <tabstop>mMarkerStyleComboBox</tabstop>
   <tabstop>mMarkerSizeSpinBox</tabstop>
+  <tabstop>chkReuseLastValues</tabstop>
   <tabstop>chkDisableAttributeValuesDlg</tabstop>
+  <tabstop>scrollArea_6</tabstop>
+  <tabstop>pbnSelectOtfProjection</tabstop>
+  <tabstop>leGlobalOtfProjString</tabstop>
+  <tabstop>chkOtfTransform</tabstop>
   <tabstop>radPromptForProjection</tabstop>
   <tabstop>radUseProjectProjection</tabstop>
   <tabstop>radUseGlobalProjection</tabstop>
-  <tabstop>txtGlobalWkt</tabstop>
+  <tabstop>leLayerGlobalProjString</tabstop>
   <tabstop>pbnSelectProjection</tabstop>
+  <tabstop>scrollArea_7</tabstop>
   <tabstop>grpLocale</tabstop>
   <tabstop>cboLocale</tabstop>
-  <tabstop>mNetworkTimeoutSpinBox</tabstop>
+  <tabstop>scrollArea_8</tabstop>
   <tabstop>grpProxy</tabstop>
   <tabstop>leProxyHost</tabstop>
   <tabstop>leProxyPort</tabstop>
   <tabstop>leProxyUser</tabstop>
   <tabstop>leProxyPassword</tabstop>
   <tabstop>mProxyTypeComboBox</tabstop>
-  <tabstop>buttonBox</tabstop>
+  <tabstop>mExcludeUrlListWidget</tabstop>
+  <tabstop>mAddUrlPushButton</tabstop>
+  <tabstop>mRemoveUrlPushButton</tabstop>
+  <tabstop>mCacheDirectory</tabstop>
+  <tabstop>mBrowseCacheDirectory</tabstop>
+  <tabstop>mCacheSize</tabstop>
+  <tabstop>mClearCache</tabstop>
+  <tabstop>leWmsSearch</tabstop>
+  <tabstop>mNetworkTimeoutSpinBox</tabstop>
+  <tabstop>mMarkersOnlyForSelectedCheckBox</tabstop>
  </tabstops>
  <resources>
   <include location="../../images/images.qrc"/>