kde-cygwin--cvs

[Christian E. <che...@us...>]

Update of /cvsroot/kde-cygwin/qt-3/tools/linguist/linguist
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6831/tools/linguist/linguist

Modified Files:
      Tag: QT_WIN32_3_3_BRANCH
	about.ui main.cpp 
Log Message:
reapply patches which were lost during my not so good update to 3.3.5

Index: about.ui
===================================================================
RCS file: /cvsroot/kde-cygwin/qt-3/tools/linguist/linguist/about.ui,v
retrieving revision 1.1.1.9
retrieving revision 1.1.1.10
diff -u -r1.1.1.9 -r1.1.1.10
--- about.ui	22 Sep 2005 12:58:52 -0000	1.1.1.9
+++ about.ui	30 Sep 2005 16:58:32 -0000	1.1.1.10
@@ -108,7 +108,7 @@
                 </sizepolicy>
             </property>
             <property name="text">
-                <string>&lt;p&gt;Qt Commercial Edition license holders: This program is licensed to you under the terms of the Qt Commercial License Agreement. For details, see the file LICENSE that came with this software distribution.&lt;/p&gt;&lt;p&gt;&lt;/p&gt;&lt;p&gt;Qt Open Source Edition users: This program is licensed to you under the terms of the GNU General Public License Version 2. For details, see the file LICENSE.GPL that came with this software distribution.&lt;/p&gt;&lt;p&gt;The program is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.&lt;/p&gt;</string>
+                <string>&lt;p&gt;Qt Commercial Edition license holders: This program is licensed to you under the terms of the Qt Commercial License Agreement. For details, see the file LICENSE that came with this software distribution.&lt;/p&gt;&lt;p&gt;&lt;/p&gt;&lt;p&gt;Qt Free Edition users: This program is licensed to you under the terms of the GNU General Public License Version 2. For details, see the file LICENSE.GPL that came with this software distribution.&lt;/p&gt;&lt;p&gt;The program is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.&lt;/p&gt;</string>
             </property>
             <property name="alignment">
                 <set>WordBreak|AlignVCenter|AlignLeft</set>

Index: main.cpp
===================================================================
RCS file: /cvsroot/kde-cygwin/qt-3/tools/linguist/linguist/main.cpp,v
retrieving revision 1.1.1.9
retrieving revision 1.1.1.10
diff -u -r1.1.1.9 -r1.1.1.10
--- main.cpp	22 Sep 2005 12:58:52 -0000	1.1.1.9
+++ main.cpp	30 Sep 2005 16:58:32 -0000	1.1.1.10
@@ -47,6 +47,7 @@
 
     bool showSplash = TRUE;
 
+/* obsolate code 
     QString keybase("/Qt Linguist/3.1/");
     QSettings config;
     config.insertSearchPath( QSettings::Windows, "/Trolltech" );
@@ -56,7 +57,7 @@
     r.setY( config.readNumEntry( keybase + "Geometry/MainwindowY", r.y() ) );
     r.setWidth( config.readNumEntry( keybase + "Geometry/MainwindowWidth", r.width() ) );
     r.setHeight( config.readNumEntry( keybase + "Geometry/MainwindowHeight", r.height() ) );
-
+*/
     QSplashScreen *splash = 0;
     if ( showSplash ) {
 	splash = new QSplashScreen( QPixmap::fromMimeSource("splash.png"),
@@ -70,6 +71,14 @@
     if ( app.argc() > 1 )
 	tw->openFile( QString(app.argv()[app.argc() - 1]) );
 
+		//<-- this is duplicated from trwindow.cpp and should be moved to there 
+    QString keybase( "/Qt Linguist/" +
+		     QString::number( (QT_VERSION >> 16) & 0xff ) +
+		     "." + QString::number( (QT_VERSION >> 8) & 0xff ) + "/" );
+    QSettings config;
+
+    config.insertSearchPath( QSettings::Windows, "/Trolltech" );
+		//-->
     if ( config.readBoolEntry( keybase + "Geometry/MainwindowMaximized", FALSE ) )
 	tw->showMaximized();
     else