r19161 by craig - #12185: Fix output of text for update checks. Update about date. Fix date in a plist file

[scribus-commit]

Author: craig
Date: Thu May 29 21:18:35 2014
New Revision: 19161

URL: http://scribus.net/websvn/listing.php?repname=Scribus&sc=1&rev=19161
Log:
#12185: Fix output of text for update checks. Update about date. Fix date in a plist file

Modified:
    trunk/Scribus/Scribus.app/Contents/Info.plist
    trunk/Scribus/scribus/ui/about.cpp
    trunk/Scribus/scribus/upgradechecker.cpp

Modified: trunk/Scribus/Scribus.app/Contents/Info.plist
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=19161&path=/trunk/Scribus/Scribus.app/Contents/Info.plist
==============================================================================
--- trunk/Scribus/Scribus.app/Contents/Info.plist (original)
+++ trunk/Scribus/Scribus.app/Contents/Info.plist Thu May 29 21:18:35 2014
@@ -57,7 +57,7 @@
 		</dict>
 	</array>
 	<key>CFBundleGetInfoString</key>
-	<string>Scribus/Aqua (c) 2005-2011 The Scribus Team</string>
+	<string>Scribus/Aqua (c) 2005-2014 The Scribus Team</string>
 	<key>CFBundleIconFile</key>
 	<string>Scribus.icns</string>
 	<key>CFBundleIdentifier</key>
@@ -67,7 +67,7 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.5.0svn</string>
+	<string>1.4.4</string>
 	<key>CFBundleSignature</key>
 	<string>OSCR</string>
 </dict>

Modified: trunk/Scribus/scribus/ui/about.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=19161&path=/trunk/Scribus/scribus/ui/about.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/about.cpp (original)
+++ trunk/Scribus/scribus/ui/about.cpp Thu May 29 21:18:35 2014
@@ -112,8 +112,8 @@
 	buildID = new QLabel( tab );
 	buildID->setAlignment(Qt::AlignCenter);
 	buildID->setTextInteractionFlags(Qt::TextSelectableByMouse);
-	QString BUILD_DAY = "15";
-	QString BUILD_MONTH = CommonStrings::april;
+	QString BUILD_DAY = "29";
+	QString BUILD_MONTH = CommonStrings::may;
 	QString BUILD_YEAR = "2014";
 	QString BUILD_TIME = "";
 	QString BUILD_TZ = "";

Modified: trunk/Scribus/scribus/upgradechecker.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=19161&path=/trunk/Scribus/scribus/upgradechecker.cpp
==============================================================================
--- trunk/Scribus/scribus/upgradechecker.cpp (original)
+++ trunk/Scribus/scribus/upgradechecker.cpp Thu May 29 21:18:35 2014
@@ -70,7 +70,7 @@
 	tempFile=ScPaths::getTempFileDir()+filename;
 
 	fin=false;
-	
+
 	rcvdFile=new QFile(tempFile);
 	networkManager=new QNetworkAccessManager(this);
 	if (networkManager!=0 && rcvdFile!=0)
@@ -286,9 +286,9 @@
 		wText.remove("<qt>");
 		wText.remove("</qt>");
 		if (noLineFeed)
-			w->setSimpleText("<qt>"+wText+text+"</qt>");
+			w->setHtml("<qt>"+wText+text+"</qt>");
 		else
-			w->setSimpleText("<qt>"+wText+text+"<br>"+"</qt>");
+			w->setHtml("<qt>"+wText+text+"<br>"+"</qt>");
 	}	
 }