More changes for V0.5.3a

- Updated English Email Invite (sorry guys, you'll have to redo translations).
 - Set OSX default style to "Cleanlooks" - as AQUA style hides some windows.
 - Updated Version strings to V0.5.3a. / 4874
 - Fixed missing headers for plugin manager.
 - Disabled ZEROCONF for OSX.
 


git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@4874 b45a01b8-16f6-495d-af2f-9b41ad6348cc

libretroshare/src/libretroshare.pro

@@ -313,6 +313,7 @@ mac {
                 HEADERS += upnp/upnputil.h
                 SOURCES += upnp/upnputil.c
 
+		# zeroconf disabled at the end of libretroshare.pro (but need the code)
 		CONFIG += zeroconf
 		CONFIG += zcnatassist
 
@@ -660,7 +661,8 @@ HEADERS +=	zeroconf/p3zeroconf.h \
 
 SOURCES +=	zeroconf/p3zeroconf.cc  \
 
-	DEFINES *= RS_ENABLE_ZEROCONF
+# Disable Zeroconf (we still need the code for zcnatassist
+#	DEFINES *= RS_ENABLE_ZEROCONF
 
 }
 

libretroshare/src/plugins/pluginmanager.cc

@@ -13,7 +13,8 @@
 #include <retroshare/rsplugin.h>
 #include <retroshare/rsfiles.h>
 #include <pqi/pqiservice.h>
-#include <plugins/pluginclasses.h>
+#include <plugins/rscacheservice.h>
+#include <plugins/rspqiservice.h>
 
 // lets disable the plugin system for now, as it's unfinished.
 #ifdef WINDOWS_SYS

libretroshare/src/util/rsversion.h

@@ -7,11 +7,11 @@
 
 #include <string>
 
-#define LIB_VERSION "0.5.2a"
-#define SVN_REVISION "Revision 4550"
+#define LIB_VERSION "0.5.3a"
+#define SVN_REVISION "Revision 4874"
 
 namespace RsUtil {
 
 	std::string retroshareVersion();
 
-}
+}

retroshare-gui/src/gui/GetStartedDialog.cpp

@@ -255,22 +255,27 @@ void GetStartedDialog::inviteFriends()
 
 	std::ostringstream out;
 
+
+
+
+
+
+
     	QString trstr;
-	trstr = tr("You are cordially invited to join the Retroshare Network,");
+	trstr = tr("Your friend has installed Retroshare, and would like you to try it out.");
 	out << trstr.toStdString() << std::endl;
 	out << std::endl;
-	trstr = tr("Retroshare is a Secure P2P Sharing Network");
-	out << trstr.toStdString() << std::endl;
-	trstr = tr("We use direct connections between you and your friends to maintain your Privacy");
+	trstr = tr("You can get Retroshare here: http://retroshare.sourceforge.net/download");
 	out << trstr.toStdString() << std::endl;
 	out << std::endl;
-	trstr = tr("Install the client to chat, share data and converse in the forums");
+	trstr = tr("Retroshare is a private Friend-2-Friend sharing network.");
+	out << trstr.toStdString() << std::endl;
+	trstr = tr("It has an many features, including built-in chat, messaging, "); 
+	out << trstr.toStdString() << std::endl;
+	trstr = tr("forums and channels, all of which are as secure as the file-sharing.");
 	out << trstr.toStdString() << std::endl;
 	out << std::endl;
 	out << std::endl;
-	trstr = tr("Get Retroshare here: http://retroshare.sourceforge.net/download");
-	out << trstr.toStdString() << std::endl;
-	out << std::endl;
 	trstr = tr("Below is your friends ID Certificate. Cut and paste this into your Retroshare client");
 	out << trstr.toStdString() << std::endl;
 	trstr = tr("and send them your ID Certificate to enable the secure connection");

retroshare-gui/src/main.cpp

@@ -219,7 +219,14 @@ int main(int argc, char *argv[])
 
 	splashScreen.showMessage(rshare.translate("SplashScreen", "Load configuration"), Qt::AlignHCenter | Qt::AlignBottom);
 
-	rsicontrol->StartupRetroShare();
+	/* stop Retroshare if startup fails */
+	if (!rsicontrol->StartupRetroShare())
+	{
+		std::cerr << "libretroshare failed to startup!" << std::endl;
+		return 1;
+	}
+
+
 	Rshare::initPlugins();
 
 	splashScreen.showMessage(rshare.translate("SplashScreen", "Create interface"), Qt::AlignHCenter | Qt::AlignBottom);
@@ -239,12 +246,23 @@ int main(int argc, char *argv[])
 		splashScreen.hide();
 
 		Settings->setValue(QString::fromUtf8("FirstRun"), false);
+
+#ifdef __APPLE__
+		/* For OSX, we set the default to "cleanlooks", as the AQUA style hides some input boxes 
+		 * only on the first run - as the user might want to change it ;)
+		 */
+		QString osx_style("cleanlooks");
+		Rshare::setStyle(osx_style);
+		Settings->setInterfaceStyle(osx_style);
+#endif
+
 // This is now disabled - as it doesn't add very much.
 // Need to make sure that defaults are sensible!
 #ifdef ENABLE_QUICKSTART_WIZARD
 		QuickStartWizard qstartWizard;
 		qstartWizard.exec();
 #endif
+
 	}
 
 	MainWindow *w = MainWindow::Create ();

retroshare-gui/src/util/rsversion.h

@@ -20,7 +20,7 @@
  ****************************************************************/
 
 
-#define GUI_VERSION "0.5.2a"
+#define GUI_VERSION "0.5.3a"
 
 #define GUI_REVISION "Revision: "