Introduce QtUiStyleSettings and make highlight color configurable again

[quassel.git] / src / common / global.cpp

diff --git a/src/common/global.cpp b/src/common/global.cpp
index a062886..13f242c 100644 (file)
--- a/src/common/global.cpp
+++ b/src/common/global.cpp
@@ -17,11 +17,11 @@
  *   Free Software Foundation, Inc.,                                       *
  *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
  ***************************************************************************/
+#include <QDateTime>
 #include <QObject>
 #include <QMetaType>
 
 #include "global.h"
-#include "logger.h"
 #include "message.h"
 #include "identity.h"
 #include "network.h"
@@ -102,21 +102,21 @@ void Global::registerMetaTypes() {
 void Global::setupVersion() {
 
 #  include "version.inc"
-#  ifdef HAVE_VERSION_GEN
-#    include "version.gen"
-#  endif
+#  include "version.gen"
 
   if(quasselGeneratedVersion.isEmpty()) {
-    quasselVersion = QString("v%1 (unknown rev)").arg(quasselBaseVersion);
+    if(quasselCommit.isEmpty())
+      quasselVersion = QString("v%1 (unknown rev)").arg(quasselBaseVersion);
+    else
+      quasselVersion = QString("v%1 (dist-%2, %3)").arg(quasselBaseVersion).arg(quasselCommit.left(7))
+                          .arg(QDateTime::fromTime_t(quasselArchiveDate).toLocalTime().toString("yyyy-MM-dd"));
   } else {
     QStringList parts = quasselGeneratedVersion.split(':');
-    if(parts.count() < 2) parts.append("unknown rev");
-    quasselVersion = QString("v%1 (%2)").arg(parts[0], parts[1]);
+    quasselVersion = QString("v%1").arg(parts[0]);
+    if(parts.count() >= 2) quasselVersion.append(QString(" (%1)").arg(parts[1]));
   }
-#  ifdef __DATE__
-    quasselBuildDate = __DATE__;
-#  endif
-
+  quasselBuildDate = __DATE__;
+  quasselBuildTime = __TIME__;
 }
 
 // Static variables
@@ -125,6 +125,9 @@ QString Global::quasselVersion;
 QString Global::quasselBaseVersion;
 QString Global::quasselGeneratedVersion;
 QString Global::quasselBuildDate;
+QString Global::quasselBuildTime;
+QString Global::quasselCommit;
+uint Global::quasselArchiveDate;
 uint Global::protocolVersion;
 uint Global::clientNeedsProtocol;
 uint Global::coreNeedsProtocol;
@@ -133,3 +136,4 @@ Global::RunMode Global::runMode;
 uint Global::defaultPort;
 
 bool Global::DEBUG;
+CliParser Global::parser;