2 files changed, 17 insertions, 7 deletions
diff --git a/Swift/QtUI/QtSwift.cpp b/Swift/QtUI/QtSwift.cpp
index d4c306f..7830150 100644
--- a/Swift/QtUI/QtSwift.cpp
+++ b/Swift/QtUI/QtSwift.cpp
@@ -53,24 +53,25 @@ namespace Swift{
 #define SWIFT_APPCAST_URL "http://swift.im/appcast/swift-mac-dev.xml"
 #else 
 #define SWIFT_APPCAST_URL ""
 #endif
 
 po::options_description QtSwift::getOptionsDescription() {
 	po::options_description result("Options");
 	result.add_options()
 		("debug", "Turn on debug logging")
-		("help", "produce help message")
-		("netbook-mode", "use netbook mode display (unsupported)")
-		("no-tabs", "don't manage chat windows in tabs (unsupported)")
-		("latency-debug", "use latency debugging (unsupported)")
-		("multi-account", po::value<int>()->default_value(1), "number of accounts to open windows for (unsupported)")
-		("start-minimized", "don't show the login/roster window at startup")
+		("help", "Show this help message")
+		("version", "Show version information")
+		("netbook-mode", "Use netbook mode display (unsupported)")
+		("no-tabs", "Don't manage chat windows in tabs (unsupported)")
+		("latency-debug", "Use latency debugging (unsupported)")
+		("multi-account", po::value<int>()->default_value(1), "Number of accounts to open windows for (unsupported)")
+		("start-minimized", "Don't show the login/roster window at startup")
 		;
 	return result;
 }
 
 
 QtSwift::QtSwift(const po::variables_map& options) : networkFactories_(&clientMainThreadCaller_), autoUpdater_(NULL) {
 	if (options.count("netbook-mode")) {
 		splitter_ = new QSplitter();
 	} else {
diff --git a/Swift/QtUI/main.cpp b/Swift/QtUI/main.cpp
index de9d122..0146769 100644
--- a/Swift/QtUI/main.cpp
+++ b/Swift/QtUI/main.cpp
@@ -10,18 +10,19 @@
 #include <boost/version.hpp>
 #include <iostream>
 #include <QApplication>
 #include <QTextCodec>
 #include <QTranslator>
 #include <QLocale>
 
 #include <Swift/Controllers/Translator.h>
 #include <Swift/Controllers/ApplicationInfo.h>
+#include <Swift/Controllers/BuildVersion.h>
 #include <SwifTools/Application/PlatformApplicationPathProvider.h>
 
 #include "QtSwift.h"
 #include "QtTranslator.h"
 
 int main(int argc, char* argv[]) {
 	QApplication app(argc, argv);
 
 	QTextCodec::setCodecForCStrings(QTextCodec::codecForName("UTF-8"));
@@ -46,20 +47,28 @@ int main(int argc, char* argv[]) {
 	} catch (boost::program_options::unknown_option option) {
 #if BOOST_VERSION >= 104200
 		std::cout << "Ignoring unknown option " << option.get_option_name() << " but continuing." <<  std::endl;
 #else
 		std::cout << "Error: " << option.what() << " (continuing)" <<  std::endl;
 #endif
 	}
 	boost::program_options::notify(vm);
 	if (vm.count("help") > 0) {
-		std::cout << desc << "\n";
+		std::cout << SWIFT_APPLICATION_NAME << " is an instant messaging client for the XMPP network." << std::endl;
+		std::cout << std::endl;
+		std::cout << "Usage: " << argv[0] << " [OPTIONS]..." << std::endl;
+		std::cout << std::endl;
+		std::cout << desc << std::endl;
 		return 1;
 	}
+	if (vm.count("version") > 0) {
+		std::cout << SWIFT_APPLICATION_NAME << " " << buildVersion << std::endl;
+		return 0;
+	}
 
 	Swift::QtSwift swift(vm);
 	int result = app.exec();
 
 	Swift::Translator::setInstance(NULL);
 
 	return result;
 }