[GNUnet-SVN] r7579 - gnunet-qt/src/core

[gnunet]

Author: durner
Date: 2008-08-19 11:24:15 -0600 (Tue, 19 Aug 2008)
New Revision: 7579

Modified:
   gnunet-qt/src/core/main.cc
Log:
towards Mantis #1355

Modified: gnunet-qt/src/core/main.cc
===================================================================
--- gnunet-qt/src/core/main.cc  2008-08-19 13:03:27 UTC (rev 7578)
+++ gnunet-qt/src/core/main.cc  2008-08-19 17:24:15 UTC (rev 7579)
@@ -149,6 +149,8 @@
   }
 #endif
 
+static QPixmap *logIcons;
+
 typedef struct
 {
   QMutex lock;
@@ -159,23 +161,23 @@
 {
   Q_UNUSED(date)
 
-  QPixmap icon;
+  QPixmap *icon;
 
   if (kind & GNUNET_GE_DEBUG)
-    icon.load(":/pixmaps/debug.png");
+    icon = logIcons;
   else if (kind & GNUNET_GE_STATUS)
-    icon.load(":/pixmaps/stats.png");
+    icon = logIcons + 1;
   else if (kind & GNUNET_GE_INFO)
-    icon.load(":/pixmaps/info.png");
+    icon = logIcons + 2;
   else if (kind & GNUNET_GE_WARNING)
-    icon.load(":/pixmaps/warning.png");
+    icon = logIcons + 3;
   else if (kind & GNUNET_GE_ERROR)
-    icon.load(":/pixmaps/error.png");
+    icon = logIcons + 4;
   else if (kind & GNUNET_GE_FATAL)
-    icon.load(":/pixmaps/fatal.png");
+    icon = logIcons + 5;
 
   ((GLoggerClosure *) cls)->lock.lock();
-  ((GLoggerClosure *) cls)->mainWnd->setStatusText(icon, QString(msg));
+  ((GLoggerClosure *) cls)->mainWnd->setStatusText(*icon, QString(msg));
   ((GLoggerClosure *) cls)->lock.unlock();
 }
 
@@ -311,6 +313,14 @@
 
   app = new GApplication(argc, (char **) argv, cfg);
 
+  logIcons = new QPixmap[6];
+  logIcons[0].load(":/pixmaps/debug.png");
+  logIcons[1].load(":/pixmaps/stats.png");
+  logIcons[2].load(":/pixmaps/info.png");
+  logIcons[3].load(":/pixmaps/warning.png");
+  logIcons[4].load(":/pixmaps/error.png");
+  logIcons[5].load(":/pixmaps/fatal.png");
+
   logCls.mainWnd = app->getWindow();
   // FIXME: make mask configurable
   ectx = GNUNET_GE_create_context_callback((GNUNET_GE_KIND) (GNUNET_GE_USER | 
GNUNET_GE_ADMIN | GNUNET_GE_ERROR |
@@ -343,6 +353,7 @@
   delete app;
 
   GNUNET_GE_free_context(ectx);
+  delete [] logIcons;
   GNUNET_fini(stdECtx, cfg);
 
        return ret;