[Qgis-cvs-commits] qgis/src qgslayerprojectionselectorbase.ui,1.5,1.6 qgsnewconnectionbase.ui,1.8,1.9 qgsoptionsbase.ui,1.19,1.20

[<tel...@us...>]

Update of /cvsroot/qgis/qgis/src
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3683

Modified Files:
	qgslayerprojectionselectorbase.ui qgsnewconnectionbase.ui 
	qgsoptionsbase.ui 
Log Message:
Three more files merged from 0.7.4


Index: qgslayerprojectionselectorbase.ui
===================================================================
RCS file: /cvsroot/qgis/qgis/src/qgslayerprojectionselectorbase.ui,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** qgslayerprojectionselectorbase.ui	15 May 2005 00:08:55 -0000	1.5
--- qgslayerprojectionselectorbase.ui	10 Nov 2005 07:14:41 -0000	1.6
***************
*** 57,60 ****
--- 57,68 ----
                  <cstring>textEdit1</cstring>
              </property>
+             <property name="sizePolicy">
+                 <sizepolicy>
+                     <hsizetype>5</hsizetype>
+                     <vsizetype>5</vsizetype>
+                     <horstretch>0</horstretch>
+                     <verstretch>0</verstretch>
+                 </sizepolicy>
+             </property>
              <property name="text">
                  <string>&lt;html&gt;&lt;head&gt;&lt;meta name="qrichtext" content="1" /&gt;&lt;/head&gt;&lt;body style="font-size:12pt;font-family:Bitstream Vera Sans"&gt;

Index: qgsnewconnectionbase.ui
===================================================================
RCS file: /cvsroot/qgis/qgis/src/qgsnewconnectionbase.ui,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** qgsnewconnectionbase.ui	20 Dec 2004 07:13:18 -0000	1.8
--- qgsnewconnectionbase.ui	10 Nov 2005 07:14:41 -0000	1.9
***************
*** 79,83 ****
                      </property>
                      <property name="enabled">
!                         <bool>false</bool>
                      </property>
                      <property name="text">
--- 79,83 ----
                      </property>
                      <property name="enabled">
!                         <bool>true</bool>
                      </property>
                      <property name="text">

Index: qgsoptionsbase.ui
===================================================================
RCS file: /cvsroot/qgis/qgis/src/qgsoptionsbase.ui,v
retrieving revision 1.19
retrieving revision 1.20
diff -C2 -d -r1.19 -r1.20
*** qgsoptionsbase.ui	21 Sep 2005 21:46:14 -0000	1.19
--- qgsoptionsbase.ui	10 Nov 2005 07:14:41 -0000	1.20
***************
*** 560,564 ****
                          <item>
                              <property name="text">
!                                 <string>firebird</string>
                              </property>
                          </item>
--- 560,569 ----
                          <item>
                              <property name="text">
!                                 <string>firefox</string>
!                             </property>
!                         </item>
!                         <item>
!                             <property name="text">
!                                 <string>mozilla-firefox</string>
                              </property>
                          </item>