Made CTCP VERSION reply more verbose. Set a more reasonable default font.

diff --git a/src/core/ctcphandler.cpp b/src/core/ctcphandler.cpp
index 153f6c0..a3bd308 100644 (file)
--- a/src/core/ctcphandler.cpp
+++ b/src/core/ctcphandler.cpp
@@ -19,6 +19,7 @@
  ***************************************************************************/
 #include "ctcphandler.h"
 
  ***************************************************************************/
 #include "ctcphandler.h"
 

+#include "global.h"

 #include "util.h"
 #include "message.h"
 
 #include "util.h"
 #include "message.h"
 


@@ -152,7 +153,8 @@ void CtcpHandler::handleVersion(CtcpType ctcptype, QString prefix, QString targe
   Q_UNUSED(target)
   if(ctcptype == CtcpQuery) {
     // FIXME use real Info about quassel :)
   Q_UNUSED(target)
   if(ctcptype == CtcpQuery) {
     // FIXME use real Info about quassel :)

-    reply(nickFromMask(prefix), "VERSION", QString("Quassel IRC (Pre-Release) - http://www.quassel-irc.org"));
+    reply(nickFromMask(prefix), "VERSION", QString("Quassel IRC (v%1 build >= %2) -- http://www.quassel-irc.org")
+        .arg(Global::quasselVersion).arg(Global::quasselBuild));

     emit displayMsg(Message::Server, "", tr("Received CTCP VERSION request by %1").arg(prefix));
   } else {
     // display Version answer
     emit displayMsg(Message::Server, "", tr("Received CTCP VERSION request by %1").arg(prefix));
   } else {
     // display Version answer

diff --git a/src/uisupport/uistyle.cpp b/src/uisupport/uistyle.cpp
index 5f46331..ec7364e 100644 (file)
--- a/src/uisupport/uistyle.cpp
+++ b/src/uisupport/uistyle.cpp
@@ -25,7 +25,7 @@ UiStyle::UiStyle(const QString &settingsKey) : _settingsKey(settingsKey) {
   // Default format
   QTextCharFormat def;
   def.setForeground(QBrush("#000000"));
   // Default format
   QTextCharFormat def;
   def.setForeground(QBrush("#000000"));

-  def.setFont(QFont("Mono",12));
+  def.setFont(QFont("Courier", 10));

   _defaultFormats = QVector<QTextCharFormat>(NumFormatTypes, def);
   _customFormats = QVector<QTextCharFormat>(NumFormatTypes, QTextFormat().toCharFormat());
 
   _defaultFormats = QVector<QTextCharFormat>(NumFormatTypes, def);
   _customFormats = QVector<QTextCharFormat>(NumFormatTypes, QTextFormat().toCharFormat());